Commit b415c281 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 57dc3b72
......@@ -66,6 +66,7 @@ Comment[hu]=A szoftverfrissítések integrációjának beállítása
Comment[ia]=Configura integration de actualisation de software
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[sk]=Konfigurácia integrácie aktualizácií softvéru
Comment[sl]=Nastavite integracijo posodobitev programja
......
......@@ -4,6 +4,7 @@
[Desktop Entry]
Name=Software Updates
Name[az]=Proqram Təminatı Yenilənmələri
Name[ca]=Actualitzacions de programari
Name[cs]=Aktualizace software
Name[es]=Actualizaciones de software
......@@ -13,6 +14,7 @@ Name[hu]=Szoftverfrissítések
Name[ia]=Actualisationes de Software
Name[it]=Aggiornamenti software
Name[nl]=Elementen voor software bijwerken
Name[nn]=Program­oppdateringar
Name[pt]=Actualizações de Aplicações
Name[sk]=Aktualizácie softvéru
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