Commit 5e48cd43 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 e102c369
......@@ -59,6 +59,7 @@ Name[zh_TW]=更新
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[en_GB]=Configure software updates integration
Comment[es]=Configurar la integración de las actualizaciones de software
Comment[eu]=Konfiguratu software eguneratzeen bategitea
Comment[fr]=Configurer l'intégration avec les mises à jour des logiciels
......
......@@ -7,6 +7,7 @@ Name=Software Updates
Name[az]=Proqram Təminatı Yenilənmələri
Name[ca]=Actualitzacions de programari
Name[cs]=Aktualizace software
Name[en_GB]=Software Updates
Name[es]=Actualizaciones de software
Name[eu]=Software eguneratzeak
Name[fr]=Mises à jour des logiciels
......
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