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"
8 years ago · 26c156c27b
parent efbc2be184
commit 26c156c27b
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -27,6 +27,7 @@ Name[fr]=Langage
 Name[gl]=Idioma
 Name[he]=שפה
 Name[hu]=Nyelv
+Name[id]=Bahasa
 Name[it]=Lingua
 Name[ja]=言語
 Name[ko]=언어