Commit ad58868d 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 7ce03ba2
......@@ -57,11 +57,13 @@ Name[x-test]=xxUpdatesxx
Comment=Configure software updates integration
Comment[az]=Proqram təminatı inteqrasiyasını tənzimləyin
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[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
Comment[sv]=Anpassa integrering av uppdateringar av programvara
Comment[uk]=Налаштовування інтеграції оновлення програм
Comment[x-test]=xxConfigure software updates integrationxx
......@@ -9,6 +9,7 @@ Name[es]=Actualizaciones de software
Name[eu]=Software eguneratzeak
Name[nl]=Elementen voor software bijwerken
Name[pt]=Actualizações de Aplicações
Name[sl]=Posodobitve programja
Name[sv]=Uppdateringar av programvara
Name[uk]=Оновлення програм
Name[x-test]=xxSoftware Updatesxx
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