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"

effects/fade/package/metadata.desktop

@@ -76,7 +76,7 @@ Name[uz@cyrillic]=Сўниш
 Name[vi]=Mờ dần
 Name[wa]=Blåwe
 Name[x-test]=xxFadexx
-Name[zh_CN]=淡入淡出
+Name[zh_CN]=淡入
 Name[zh_TW]=淡出
 Icon=preferences-system-windows-effect-fade
 Comment=Make windows smoothly fade in and out when they are shown or hidden

effects/invert/invert_config.desktop

@@ -85,6 +85,6 @@ Name[uz@cyrillic]=Тескари
 Name[vi]=Đảo ngược
 Name[wa]=Å rvier
 Name[x-test]=xxInvertxx
-Name[zh_CN]=反转
+Name[zh_CN]=反向选择
 Name[zh_TW]=反轉
 

effects/login/package/metadata.desktop

@@ -82,7 +82,7 @@ Name[uz@cyrillic]=Кириш
 Name[vi]=Đăng nhập
 Name[wa]=Elodjaedje
 Name[x-test]=xxLoginxx
-Name[zh_CN]=登录
+Name[zh_CN]=登录时
 Name[zh_TW]=登入
 Icon=preferences-system-windows-effect-login
 Comment=Smoothly fade to the desktop when logging in

effects/maximize/package/metadata.desktop

@@ -94,7 +94,7 @@ Name[tr]=Ekranı Kapla
 Name[ug]=چوڭايت
 Name[uk]=Максимізація
 Name[x-test]=xxMaximizexx
-Name[zh_CN]=最大化效果
+Name[zh_CN]=最大化
 Name[zh_TW]=最大化
 Type=Service
 X-KDE-ParentApp=

effects/resize/resize_config.desktop

@@ -71,5 +71,5 @@ Name[ug]=كۆزنەك چوڭلۇقىنى ئۆزگەرت
 Name[uk]=Зміна розмірів вікон
 Name[wa]=Candjî l' grandeu del finiesse
 Name[x-test]=xxResize Windowxx
-Name[zh_CN]=缩放窗口
+Name[zh_CN]=更改窗口大小
 Name[zh_TW]=重新調整視窗大小

effects/scale/package/metadata.desktop

@@ -26,7 +26,7 @@ Name[sk]=Škálovať
 Name[sv]=Skala
 Name[uk]=Масштабування
 Name[x-test]=xxScalexx
-Name[zh_CN]=缩放
+Name[zh_CN]=比例
 Name[zh_TW]=縮放
 Icon=preferences-system-windows-effect-scale
 Comment=Make windows smoothly scale in and out when they are shown or hidden

effects/translucency/package/metadata.desktop

@@ -79,7 +79,7 @@ Name[uz@cyrillic]=Шаффофлик
 Name[vi]=Trong mờ
 Name[wa]=Transparince
 Name[x-test]=xxTranslucencyxx
-Name[zh_CN]=半透明
+Name[zh_CN]=透明度
 Name[zh_TW]=半透明
 Icon=preferences-system-windows-effect-translucency
 Comment=Make windows translucent under different conditions

kcmkwin/kwinoptions/kwinactions.desktop

@@ -96,7 +96,7 @@ Name[vi]=Hành động
 Name[wa]=Accions
 Name[xh]=Iintshukumo
 Name[x-test]=xxActionsxx
-Name[zh_CN]=动作
+Name[zh_CN]=操作
 Name[zh_TW]=動作
 
 Comment=Mouse Actions on Windows

kcmkwin/kwinoptions/kwinfocus.desktop

@@ -93,7 +93,7 @@ Name[vi]=Tập trung
 Name[wa]=Focus
 Name[xh]=Focus
 Name[x-test]=xxFocusxx
-Name[zh_CN]=焦点
+Name[zh_CN]=对焦
 Name[zh_TW]=焦點
 
 Comment=Active Window Policy

kcmkwin/kwinoptions/kwinmoving.desktop

@@ -94,7 +94,7 @@ Name[vi]=Di chuyển
 Name[wa]=Bodjî
 Name[xh]=Iyahamba
 Name[x-test]=xxMovingxx
-Name[zh_CN]=移动
+Name[zh_CN]=移动中
 Name[zh_TW]=移動
 
 Comment=Window Moving

plugins/scenes/qpainter/qpainter.json

@@ -32,7 +32,7 @@
         "Description[tr]": "QPainter üzerinden KWin Dizgici eklentisi oluşturma",
         "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням QPainter",
         "Description[x-test]": "xxKWin Compositor plugin rendering through QPainterxx",
-        "Description[zh_CN]": "使用 QPainter 渲染的 KWin 合成插件",
+        "Description[zh_CN]": "使用 QPainter 渲染的 KWin 混成插件",
         "Description[zh_TW]": "透過 QPainter 繪製 KWin 合成器附加元件",
         "Id": "KWinSceneQPainter",
         "Name": "SceneQPainter",

plugins/scenes/xrender/xrender.json

@@ -32,7 +32,7 @@
         "Description[tr]": "XRender üzerinden KWin Dizgici eklentisi oluşturma",
         "Description[uk]": "Додаток засобу композиції KWin для обробки з використанням XRender",
         "Description[x-test]": "xxKWin Compositor plugin rendering through XRenderxx",
-        "Description[zh_CN]": "使用 XRender 渲染的 KWin 合成插件",
+        "Description[zh_CN]": "使用 XRender 渲染的 KWin 混成插件",
         "Description[zh_TW]": "透過 XRender 繪製 KWin 合成器附加元件",
         "Id": "KWinSceneXRender",
         "Name": "SceneXRender",