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 · bb4c89a20a
parent 74f50ec30c
commit bb4c89a20a
1 changed files with 1 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -19,6 +19,7 @@ Name[de]=Sprache
 Name[el]=Γλώσσα
 Name[en_GB]=Language
 Name[es]=Idioma
+Name[et]=Keel
 Name[it]=Lingua
 Name[nl]=Taal
 Name[nn]=Språk