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 · 79196d7096
parent 64045dbddc
commit 79196d7096
2 changed files with 2 additions and 0 deletions
--- a/kcms/translations/kcm_translations.desktop
+++ b/kcms/translations/kcm_translations.desktop
@ -17,6 +17,7 @@ Name[ca@valencia]=Idioma
 Name[de]=Sprache
 Name[es]=Idioma
 Name[fr]=Langue
+Name[gl]=Idioma
 Name[id]=Language
 Name[it]=Lingua
 Name[nl]=Taal
--- a/kcms/translations/package/metadata.desktop
+++ b/kcms/translations/package/metadata.desktop
@ -5,6 +5,7 @@ Name[ca@valencia]=Idioma
 Name[de]=Sprache
 Name[es]=Idioma
 Name[fr]=Langue
+Name[gl]=Idioma
 Name[id]=Language
 Name[it]=Lingua
 Name[nl]=Taal