Commit e90b8cc6 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 81ba6da4
......@@ -64,11 +64,13 @@ 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[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[sl]=Nastavite integracijo posodobitev programja
Comment[sv]=Anpassa integrering av uppdateringar av programvara
Comment[uk]=Налаштовування інтеграції оновлення програм
Comment[x-test]=xxConfigure software updates integrationxx
Comment[zh_CN]=配置软件更新集成功能
Categories=Qt;KDE;
......@@ -11,12 +11,14 @@ Name[eu]=Software eguneratzeak
Name[fr]=Mises à jour des logiciels
Name[hu]=Szoftverfrissítések
Name[ia]=Actualisationes de Software
Name[it]=Aggiornamenti software
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
Name[zh_CN]=软件更新
Icon=system-software-update
Type=Service
......
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