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/mobileshell/package/metadata.desktop

@@ -19,6 +19,7 @@ Name[sl]=Shell
 Name[sv]=Skal
 Name[uk]=Оболонка
 Name[x-test]=xxShellxx
+Name[zh_CN]=外壳程序
 Comment=Configure the system shell
 Comment[az]=Sistem 
 Comment[ca]=Configura l'intèrpret d'ordres del sistema
@@ -36,6 +37,7 @@ Comment[sl]=Nastavi sistemski shell
 Comment[sv]=Anpassa systemskalet
 Comment[uk]=Налаштувати командну оболонку системи
 Comment[x-test]=xxConfigure the system shellxx
+Comment[zh_CN]=配置系统外壳程序
 Encoding=UTF-8
 Type=Service
 Icon=preferences-desktop-plasma
@@ -69,5 +71,6 @@ X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča
 X-KDE-Keywords[sv]=system,skal,panel
 X-KDE-Keywords[uk]=system,shell,panel,система,оболонка,панель
 X-KDE-Keywords[x-test]=xxsystemxx,xxshellxx,xxpanelxx
+X-KDE-Keywords[zh_CN]=system,shell,panel,系统,外壳,系统外壳,外壳程序,系统外壳程序,面板,
 X-KDE-ParentApp=kcontrol
 X-KDE-PluginInfo-Name=kcm_mobileshell

quicksettings/keyboardtoggle/metadata.desktop

@@ -16,6 +16,7 @@ Name[sl]=Preklop navidezne tipkovnice
 Name[sv]=Visa eller dölj virtuellt tangentbord
 Name[uk]=Перемикання віртуальної клавіатури
 Name[x-test]=xxVirtual Keyboard Togglexx
+Name[zh_CN]=虚拟键盘开关
 Icon=input-keyboard-virtual
 
 Type=Service

shell/metadata.desktop

@@ -77,7 +77,7 @@ Comment[sl]=Plasma shell za telefone
 Comment[sv]=Plasma skal för telefoner
 Comment[uk]=Оболонка Плазми для телефонів
 Comment[x-test]=xxPlasma shell for phonesxx
-Comment[zh_CN]=适配手机的 Plasma 外壳
+Comment[zh_CN]=适配手机的 Plasma 外壳程序
 Comment[zh_TW]=適用於手機的 Plasma Shell
 Type=Service