Commit 57812509 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 403514e4
......@@ -116,6 +116,7 @@ Comment[sr@latin]=Pomoć za programe
Comment[sv]=Hjälp om program
Comment[uk]=Довідка до програм
Comment[x-test]=xxHelp for applicationsxx
Comment[zh_CN]=应用程序帮助
Icon=help-browser
X-DocPath=khelpcenter/index.html
Type=Service
......
......@@ -108,6 +108,7 @@ GenericName[de]=Hilfezentrum
GenericName[en_GB]=Help Centre
GenericName[es]=Centro de ayuda
GenericName[fi]=Ohjekeskus
GenericName[it]=Centro documentazione
GenericName[nl]=Helpcentrum
GenericName[pl]=Ośrodek Pomocy
GenericName[pt]=Centro de Ajuda
......@@ -122,6 +123,7 @@ GenericName[sr@latin]=Centar pomoći
GenericName[sv]=Hjälpcentral
GenericName[uk]=Центр довідки
GenericName[x-test]=xxHelp Centerxx
GenericName[zh_CN]=帮助中心
Comment=Browse and search documentation
Comment[ca]=Explora i cerca documentació
Comment[ca@valencia]=Explora i cerca documentació
......@@ -129,6 +131,7 @@ Comment[de]=Dokumentation lesen und durchsuchen
Comment[en_GB]=Browse and search documentation
Comment[es]=Explorar y buscar documentación
Comment[fi]=Selaa dokumentaatiota ja etsi sieltä
Comment[it]=Sfoglia e cerca nella documentazione
Comment[nl]=Blader in en doorzoek documentatie
Comment[pl]=Przeglądarka i wyszukiwarka dokumentacji
Comment[pt]=Navegar e pesquisar a documentação
......@@ -143,6 +146,7 @@ Comment[sr@latin]=Pregledajte i pretražujte dokumentaciju
Comment[sv]=Bläddra och sök i dokumentation
Comment[uk]=Перегляд документації та пошук у ній
Comment[x-test]=xxBrowse and search documentationxx
Comment[zh_CN]=浏览搜索文档
Categories=Qt;KDE;Core;
OnlyShowIn=KDE;
......
......@@ -26,3 +26,4 @@ Name[sr@latin]=Osnove
Name[sv]=Grunder
Name[uk]=Основи
Name[x-test]=xxFundamentalsxx
Name[zh_CN]=基础
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