Commit fb29a540 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 ba0d6544
......@@ -102,6 +102,8 @@ Name[zh_TW]=求助
GenericName=Help Center
GenericName[ast]=Centru d'ayuda
GenericName[ca]=Centre d'ajuda
GenericName[ca@valencia]=Centre d'ajuda
GenericName[cs]=Centrum nápovědy
GenericName[de]=Hilfezentrum
GenericName[en_GB]=Help Centre
GenericName[es]=Centro de ayuda
......@@ -121,6 +123,7 @@ GenericName[uk]=Центр довідки
GenericName[x-test]=xxHelp Centerxx
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[en_GB]=Browse and search documentation
Comment[es]=Explorar y buscar documentación
......
......@@ -4,6 +4,7 @@ Icon=system-help
Name=Fundamentals
Name[ca]=Fonaments
Name[ca@valencia]=Fonaments
Name[cs]=Základy
Name[de]=Grundlagen
Name[el]=Βασικά
Name[en_GB]=Fundamentals
......
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