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"
9 years ago · 1bcab9dc25
parent 19b4d64107
commit 1bcab9dc25
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -43,6 +43,7 @@ Name[sr@ijekavian]=Језик
 Name[sr@ijekavianlatin]=Jezik
 Name[sr@latin]=Jezik
 Name[sv]=Språk
+Name[tr]=Dil
 Name[uk]=Мова
 Name[x-test]=xxLanguagexx
 Name[zh_CN]=语言