Commit ff2dc4a8 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 52250821
......@@ -22,7 +22,7 @@ X-KDE-Keywords[et]=teave,distributsioon,distro,süsteem,kernel,qt,kde
X-KDE-Keywords[eu]=informazioa,banaketa,distribuzioa,distro,sistema,muina,kernela,qt,kde
X-KDE-Keywords[fi]=tietoja,tietoa,tiedot,info,jakelu,distribuutio,distro,järjestelmä,ydin,käyttöjärjestelmäydin,qt,kde,information,distribution,system,kernel
X-KDE-Keywords[fr]=information,distribution,distro,system,kernel,qt,kde
X-KDE-Keywords[gl]=información,distribución,sistema,information,distribution,distro,system,kernel,qt,kde
X-KDE-Keywords[gl]=información,distribución,sistema,information,distribution,distro,system,kernel,qt,kde
X-KDE-Keywords[he]=information,distribution,distro,system,kernel,qt,kde,מידע,הפצה,מערכת,ליבה,פלזמה
X-KDE-Keywords[hu]=információk,disztribúció,disztró,rendszer,kernel,qt,kde
X-KDE-Keywords[it]=informazioni,distribuzione,distro,sistema,kernel,qt,kde
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment