Commit 836cf9e2 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 09766253
......@@ -105,6 +105,7 @@ GenericName[ca]=Centre d'ajuda
GenericName[ca@valencia]=Centre d'ajuda
GenericName[cs]=Centrum nápovědy
GenericName[el]=Κέντρο αρωγής
GenericName[en_GB]=Help Centre
GenericName[es]=Centro de ayuda
......@@ -128,6 +129,7 @@ Comment=Browse and search documentation
Comment[ca]=Explora i cerca documentació
Comment[ca@valencia]=Explora i cerca documentació
Comment[de]=Dokumentation lesen und durchsuchen
Comment[el]=Περιήγηση και αναζήτηση στην τεκμηρίωση
Comment[en_GB]=Browse and search documentation
Comment[es]=Explorar y buscar documentación
Comment[fi]=Selaa dokumentaatiota ja etsi sieltä
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