Commit 4eb15ab6 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 2b792515
......@@ -68,6 +68,7 @@ Comment[it]=Configura l'integrazione degli aggiornamenti software
Comment[nl]=Integratie van software bijwerken configureren
Comment[nn]=Set opp integrering med programoppdateringar
Comment[pt]=Configurar a integração com as actualizações de aplicações
Comment[ru]=Параметры службы обновления программ
Comment[sk]=Konfigurácia integrácie aktualizácií softvéru
Comment[sl]=Nastavite integracijo posodobitev programja
Comment[sv]=Anpassa integrering av uppdateringar av programvara
......@@ -16,6 +16,7 @@ Name[it]=Aggiornamenti software
Name[nl]=Elementen voor software bijwerken
Name[pt]=Actualizações de Aplicações
Name[ru]=Обновления программ
Name[sk]=Aktualizácie softvéru
Name[sl]=Posodobitve programja
Name[sv]=Uppdateringar av programvara
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