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 · e99f359906
parent 00eebe09e0
commit e99f359906
1 changed files with 2 additions and 0 deletions
--- a/translations.desktop
+++ b/translations.desktop
@ -16,10 +16,12 @@ Name[ca]=Idioma
 Name[ca@valencia]=Idioma
 Name[cs]=Jazyk
 Name[es]=Idioma
+Name[it]=Lingua
 Name[nl]=Taal
 Name[nn]=Språk
 Name[pl]=Język
 Name[pt]=Língua
+Name[sl]=Jezik
 Name[sv]=Språk
 Name[uk]=Мова
 Name[x-test]=xxLanguagexx