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 · c874e5d6b6
parent af384b0258
commit c874e5d6b6
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[he]=שפה
 Name[it]=Lingua
+Name[ko]=언어
 Name[nl]=Taal
 Name[nn]=Språk
 Name[pa]=ਭਾਸ਼ਾ