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 · 77a7cb6a29
parent 610b162393
commit 77a7cb6a29
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -26,6 +26,7 @@ Name[fi]=Kieli
 Name[fr]=Langage
 Name[he]=שפה
 Name[it]=Lingua
+Name[ja]=言語
 Name[ko]=언어
 Name[nl]=Taal
 Name[nn]=Språk