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 · a55c0da004
parent 41fc0b0a3c
commit a55c0da004
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -24,6 +24,7 @@ Name[et]=Keel
 Name[fi]=Kieli
 Name[fr]=Langage
 Name[he]=שפה
+Name[hu]=Nyelv
 Name[it]=Lingua
 Name[ko]=언어
 Name[nl]=Taal