Skip to content

Commit

Permalink
SVN_SILENT made messages (.desktop file) - always resolve ours
Browse files Browse the repository at this point in the history
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"
  • Loading branch information
l10n daemon script committed Mar 15, 2017
1 parent b9aecd6 commit 252ecd2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 0 deletions.
1 change: 1 addition & 0 deletions khelpcenter.desktop
Expand Up @@ -122,6 +122,7 @@ Comment[sr@ijekavian]=Помоћ за програме
Comment[sr@ijekavianlatin]=Pomoć za programe
Comment[sr@latin]=Pomoć za programe
Comment[sv]=Hjälp om program
Comment[tr]=Uygulamalar için yardım
Comment[uk]=Довідка до програм
Comment[x-test]=xxHelp for applicationsxx
Comment[zh_CN]=应用程序帮助
Expand Down
2 changes: 2 additions & 0 deletions org.kde.Help.desktop
Expand Up @@ -129,6 +129,7 @@ GenericName[sr@ijekavian]=Центар помоћи
GenericName[sr@ijekavianlatin]=Centar pomoći
GenericName[sr@latin]=Centar pomoći
GenericName[sv]=Hjälpcentral
GenericName[tr]=Yardım Merkezi
GenericName[uk]=Центр довідки
GenericName[x-test]=xxHelp Centerxx
GenericName[zh_CN]=帮助中心
Expand Down Expand Up @@ -164,6 +165,7 @@ Comment[sr@ijekavian]=Прегледајте и претражујте доку
Comment[sr@ijekavianlatin]=Pregledajte i pretražujte dokumentaciju
Comment[sr@latin]=Pregledajte i pretražujte dokumentaciju
Comment[sv]=Bläddra och sök i dokumentation
Comment[tr]=Belgelendirmede gezin veya arama yap
Comment[uk]=Перегляд документації та пошук у ній
Comment[x-test]=xxBrowse and search documentationxx
Comment[zh_CN]=浏览搜索文档
Expand Down
1 change: 1 addition & 0 deletions plugins/fundamentals.desktop
Expand Up @@ -32,6 +32,7 @@ Name[sr@ijekavian]=Основе
Name[sr@ijekavianlatin]=Osnove
Name[sr@latin]=Osnove
Name[sv]=Grunder
Name[tr]=Temeller
Name[uk]=Основи
Name[x-test]=xxFundamentalsxx
Name[zh_CN]=基础
Expand Down

0 comments on commit 252ecd2

Please sign in to comment.