Commit 86c9685c 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 836cf9e2
......@@ -95,6 +95,7 @@ Comment=Help for applications
Comment[ast]=Ayuda p'aplicaciones
Comment[ca]=Ajuda per les aplicacions
Comment[ca@valencia]=Ajuda per les aplicacions
Comment[cs]=Nápověda pro aplikace
Comment[de]=Handbücher für Anwendungen
Comment[el]=Βοήθεια για τις εφαρμογές
Comment[en_GB]=Help for applications
......
......@@ -128,6 +128,7 @@ GenericName[zh_CN]=帮助中心
Comment=Browse and search documentation
Comment[ca]=Explora i cerca documentació
Comment[ca@valencia]=Explora i cerca documentació
Comment[cs]=Procházejte a prohledávejte dokumentaci
Comment[de]=Dokumentation lesen und durchsuchen
Comment[el]=Περιήγηση και αναζήτηση στην τεκμηρίωση
Comment[en_GB]=Browse and search documentation
......
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