Commit 9ac2e94a 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 e90b8cc6
......@@ -67,6 +67,7 @@ Comment[ia]=Configura integration de actualisation de software
Comment[it]=Configura l'integrazione degli aggiornamenti software
Comment[nl]=Integratie van software bijwerken configureren
Comment[pt]=Configurar a integração com as actualizações de aplicações
Comment[sk]=Konfigurácia integrácie aktualizácií softvéru
Comment[sl]=Nastavite integracijo posodobitev programja
Comment[sv]=Anpassa integrering av uppdateringar av programvara
Comment[uk]=Налаштовування інтеграції оновлення програм
......
......@@ -14,6 +14,7 @@ Name[ia]=Actualisationes de Software
Name[it]=Aggiornamenti software
Name[nl]=Elementen voor software bijwerken
Name[pt]=Actualizações de Aplicações
Name[sk]=Aktualizácie softvéru
Name[sl]=Posodobitve programja
Name[sv]=Uppdateringar av programvara
Name[uk]=Оновлення програм
......
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