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"
10 years ago · 3499e59a56
parent c8b4c064cc
commit 3499e59a56
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -43,5 +43,6 @@ Name[sv]=Språk
 Name[uk]=Мова
 Name[x-test]=xxLanguagexx
 Name[zh_CN]=语言
+Name[zh_TW]=語言

 Categories=Qt;KDE;X-KDE-settings-translations;