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"

translations.desktop

@@ -16,6 +16,7 @@ Name[ast]=Llingua
 Name[ca]=Idioma
 Name[ca@valencia]=Idioma
 Name[cs]=Jazyk
+Name[da]=Sprog
 Name[de]=Sprache
 Name[el]=Γλώσσα
 Name[en_GB]=Language
@@ -28,6 +29,7 @@ Name[nn]=Språk
 Name[pa]=ਭਾਸ਼ਾ
 Name[pl]=Język
 Name[pt]=Língua
+Name[ru]=Язык
 Name[sk]=Jazyk
 Name[sl]=Jezik
 Name[sr]=Језик