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/cellularnetwork/kcm_cellular_network.json

@@ -102,6 +102,7 @@
     "X-KDE-Keywords[tr]": "mobil,cep,taşınabilir,veri,ağ",
     "X-KDE-Keywords[uk]": "mobile,data,network,мобільний,дані,мережа",
     "X-KDE-Keywords[x-test]": "xxmobilexx,xxdataxx,xxnetworkxx",
+    "X-KDE-Keywords[zh_CN]": "mobile,data,network,yidong,shuju,wangluo,fengwo,shouji,liuliang,移动,数据,流量,网络,蜂窝,手机",
     "X-KDE-System-Settings-Parent-Category": "network",
     "X-KDE-Weight": 70
 }

kcms/info/kcm_mobile_info.json

@@ -104,5 +104,6 @@
     "X-KDE-Keywords[tr]": "bilgi,dağıtım,distro,sistem",
     "X-KDE-Keywords[uk]": "info, distro, system, інфо, відомості, дистрибутив, система",
     "X-KDE-Keywords[x-test]": "xxinfoxx,xx distroxx,xx systemxx",
+    "X-KDE-Keywords[zh_CN]": "info, distro, system, xinxi, faxingban, xitong, 信息, 发行版, 系统",
     "X-KDE-System-Settings-Parent-Category": "system-administration"
 }

kcms/mobileshell/kcm_mobileshell.json

@@ -161,5 +161,6 @@
     "X-KDE-Keywords[tr]": "sistem,kabuk,panel",
     "X-KDE-Keywords[uk]": "system,shell,panel,система,оболонка,панель",
     "X-KDE-Keywords[x-test]": "xxsystemxx,xxshellxx,xxpanelxx",
+    "X-KDE-Keywords[zh_CN]": "system,shell,panel,xitong,waike,mianban,系统,外壳,系统外壳,外壳程序,系统外壳程序,面板,",
     "X-KDE-System-Settings-Parent-Category": "personalization"
 }

kcms/powermanagement/kcm_mobile_power.json

@@ -102,6 +102,7 @@
     "X-KDE-Keywords[tr]": "video,monitör,ekran,görüntü,grafik,zaman aşımı,uyku,kilit,ekran kilidi,ekran koruyucusu",
     "X-KDE-Keywords[uk]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, відео, монітор, графіка, час очікування, присипляння, блокування, збереження, екран",
     "X-KDE-Keywords[x-test]": "xxvideoxx,xx monitorxx,xx graphicsxx,xx timeoutxx,xx sleepxx,xx lockxx,xx screenlockerxx,xx screensaverxx",
+    "X-KDE-Keywords[zh_CN]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, shipin, xianshiqi, jianshiqi, tuxing, tuxiang, chaoshi, shuimian, suoping, pingmubaohu, pingmusuoding, pingbao, suoding, 视频, 显示器, 监视器, 图形, 图像, 超时, 睡眠, 锁屏, 屏幕保护, 屏幕锁定, 屏保, 锁定",
     "X-KDE-System-Settings-Parent-Category": "system-administration",
     "X-KDE-Weight": 20
 }

kcms/time/kcm_mobile_time.json

@@ -104,6 +104,7 @@
     "X-KDE-Keywords[tr]": "tema,görünüm,görünüş,his,bakış",
     "X-KDE-Keywords[uk]": "theme,look,feel,тема,вигляд,поведінка",
     "X-KDE-Keywords[x-test]": "xxthemexx,xx lookxx,xx feelxx",
+    "X-KDE-Keywords[zh_CN]": "theme, look, feel, zhuti, waiguan, shijuexiaoguo, xianshixiaoguo, yangshi, 主题, 外观, 视觉效果, 显示效果, 样式",
     "X-KDE-System-Settings-Parent-Category": "regionalsettings",
     "X-KDE-Weight": 70
 }

kcms/virtualkeyboard/kcm_mobile_onscreenkeyboard.json

@@ -143,5 +143,6 @@
     "X-KDE-Keywords[tr]": "ekran üzeri,ekran,osk,osd,sanal klavye,klavye,düğme",
     "X-KDE-Keywords[uk]": "onscreen,osk,virtualkeyboard,keyboard,екранна,екран,клавіатура",
     "X-KDE-Keywords[x-test]": "xxonscreenxx,xxoskxx,xxvirtualkeyboardxx,xxkeyboardxx",
+    "X-KDE-Keywords[zh_CN]": "onscreen,osk,virtualkeyboard,keyboard,pingmujianpan,pingmujianpan,pingshangjianpan,xunijianpan,jianpan,屏幕键盘,屏幕显示,屏上键盘,虚拟键盘,键盘",
     "X-KDE-System-Settings-Parent-Category": "input-devices"
 }

kcms/wifi/kcm_mobile_wifi.json

@@ -108,6 +108,7 @@
     "X-KDE-Keywords[tr]": "wifi,wi-fi,ağ",
     "X-KDE-Keywords[uk]": "wifi,network,вайфай,мережа",
     "X-KDE-Keywords[x-test]": "xxwifixx,xxnetworkxx",
+    "X-KDE-Keywords[zh_CN]": "wifi,network,wangluo,wuxian,网络,无线",
     "X-KDE-System-Settings-Parent-Category": "network",
     "X-KDE-Weight": 70
 }