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"

kcms/translations/kcm_translations.desktop

@@ -13,10 +13,12 @@ X-KDE-Weight=40
 
 Name=Language
 Name[ca]=Idioma
+Name[ca@valencia]=Idioma
 Name[nl]=Taal
 Name[pt]=Língua
 Name[sv]=Språk
 Name[uk]=Мова
 Name[x-test]=xxLanguagexx
+Name[zh_TW]=語言
 
 Categories=Qt;KDE;X-KDE-settings-translations;

kcms/translations/package/metadata.desktop

@@ -1,11 +1,13 @@
 [Desktop Entry]
 Name=Language
 Name[ca]=Idioma
+Name[ca@valencia]=Idioma
 Name[nl]=Taal
 Name[pt]=Língua
 Name[sv]=Språk
 Name[uk]=Мова
 Name[x-test]=xxLanguagexx
+Name[zh_TW]=語言
 
 Icon=preferences-desktop-locale
 Type=Service