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"
7 years ago · 4aa3fb6bcd
parent fc2d0c4f56
commit 4aa3fb6bcd
2 changed files with 2 additions and 0 deletions
--- a/kcms/translations/kcm_translations.desktop
+++ b/kcms/translations/kcm_translations.desktop
@ -21,6 +21,7 @@ Name[gl]=Idioma
 Name[id]=Language
 Name[it]=Lingua
 Name[nl]=Taal
+Name[nn]=Språk
 Name[pl]=Język
 Name[pt]=Língua
 Name[ru]=Язык
--- a/kcms/translations/package/metadata.desktop
+++ b/kcms/translations/package/metadata.desktop
@ -9,6 +9,7 @@ Name[gl]=Idioma
 Name[id]=Language
 Name[it]=Lingua
 Name[nl]=Taal
+Name[nn]=Språk
 Name[pl]=Język
 Name[pt]=Língua
 Name[ru]=Язык