Commit 916f6155 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 3b5a6eef
......@@ -100,7 +100,25 @@ Name[x-test]=xxHelpxx
Name[zh_CN]=帮助
Name[zh_TW]=求助
GenericName=Help Center
GenericName[ca]=Centre d'ajuda
GenericName[de]=Hilfezentrum
GenericName[nl]=Helpcentrum
GenericName[pt]=Centro de Ajuda
GenericName[pt_BR]=Centro de ajuda
GenericName[sk]=Pomocník KDE
GenericName[sv]=Hjälpcentral
GenericName[uk]=Центр довідки
GenericName[x-test]=xxHelp Centerxx
Comment=Browse and search documentation
Comment[ca]=Explora i cerca documentació
Comment[de]=Dokumentation lesen und durchsuchen
Comment[nl]=Blader in en doorzoek documentatie
Comment[pt]=Navegar e pesquisar a documentação
Comment[pt_BR]=Navegue e pesquise na documentação
Comment[sk]=Prehliadať a hľadať dokumentáciu
Comment[sv]=Bläddra och sök i dokumentation
Comment[uk]=Перегляд документації та пошук у ній
Comment[x-test]=xxBrowse and search documentationxx
Categories=Qt;KDE;Core;
OnlyShowIn=KDE;
......
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