Commit 77308b8c 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 017270a1
......@@ -62,6 +62,7 @@ Comment[ca]=Configura la integració de les actualitzacions de programari
Comment[es]=Configurar la integración de las actualizaciones de software
Comment[eu]=Konfiguratu software eguneratzeen bategitea
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[nl]=Integratie van software bijwerken configureren
Comment[pt]=Configurar a integração com as actualizações de aplicações
Comment[sl]=Nastavite integracijo posodobitev programja
......
......@@ -8,6 +8,7 @@ Name[ca]=Actualitzacions de programari
Name[es]=Actualizaciones de software
Name[eu]=Software eguneratzeak
Name[fr]=Mises à jour des logiciels
Name[hu]=Szoftverfrissítések
Name[nl]=Elementen voor software bijwerken
Name[pt]=Actualizações de Aplicações
Name[sl]=Posodobitve programja
......
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