Commit 039887c7 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 576dcbf6
......@@ -66,6 +66,7 @@ Comment[fi]=Aseta ohjelmapäivitysten eheytys
Comment[fr]=Configurer l'intégration avec les mises à jour des logiciels
Comment[hu]=A szoftverfrissítések integrációjának beállítása
Comment[ia]=Configura integration de actualisation de software
Comment[id]=Konfigurasi integrasi pembaruan perangkat lunak
Comment[it]=Configura l'integrazione degli aggiornamenti software
Comment[nl]=Integratie van software bijwerken configureren
Comment[nn]=Set opp integrering med programoppdateringar
......
......@@ -15,6 +15,7 @@ Name[fi]=Ohjelmapäivitykset
Name[fr]=Mises à jour des logiciels
Name[hu]=Szoftverfrissítések
Name[ia]=Actualisationes de Software
Name[id]=Pembaruan Perangkat Lunak
Name[it]=Aggiornamenti software
Name[nl]=Elementen voor software bijwerken
Name[nn]=Program­oppdateringar
......
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