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"

data/kdeconnect-thunar.desktop

@@ -21,4 +21,5 @@ Name[pt]=Enviar pelo KDE Connect
 Name[sv]=Skicka via KDE-anslut
 Name[uk]=Надіслати за допомогою KDE Connect
 Name[x-test]=xxSend via KDE Connectxx
+Name[zh_CN]=通过 KDE Connect 发送
 Name[zh_TW]=使用 KDE Connect 傳送

plugins/clipboard/kdeconnect_clipboard.json

@@ -115,7 +115,7 @@
         "Name[tr]": "Geçici taşıma panosu",
         "Name[uk]": "Буфер обміну",
         "Name[x-test]": "xxClipboardxx",
-        "Name[zh_CN]": "剪贴板",
+        "Name[zh_CN]": "剪切板",
         "Name[zh_TW]": "剪貼板",
         "ServiceTypes": [
             "KdeConnect/Plugin"

plugins/kdeconnect.notifyrc

@@ -278,7 +278,7 @@ Name[sv]=Missat samtal
 Name[tr]=Cevapsız Çağrı
 Name[uk]=Пропущений дзвінок
 Name[x-test]=xxMissed Callxx
-Name[zh_CN]=未接来电
+Name[zh_CN]=错过的呼叫
 Name[zh_TW]=未接來電
 Comment=You have a missed call
 Comment[ar]=لقد فاتتك مكالمة
@@ -602,7 +602,7 @@ Name[sv]=Generell underrättelse
 Name[tr]=Genel Bildirim
 Name[uk]=Загальне сповіщення
 Name[x-test]=xxGeneric Notificationxx
-Name[zh_CN]=常规通知
+Name[zh_CN]=一般通知
 Name[zh_TW]=通用通知
 Comment=Notification received
 Comment[ar]=استُلم إخطار

plugins/remotesystemvolume/kdeconnect_remotesystemvolume.json

@@ -43,6 +43,7 @@
         "Description[sv]": "Kontrollera volymen på ansluten apparat",
         "Description[uk]": "Керування томом сховища даних на з'єднаному пристрої",
         "Description[x-test]": "xxControl the volume of the connected devicexx",
+        "Description[zh_CN]": "控制连接设备的音量",
         "Description[zh_TW]": "控制連線裝置的音量",
         "EnabledByDefault": true,
         "Icon": "player-volume",
@@ -65,6 +66,7 @@
         "Name[sv]": "Fjärrsystemvolym",
         "Name[uk]": "Віддалений системний том",
         "Name[x-test]": "xxRemote system volumexx",
+        "Name[zh_CN]": "远程系统音量",
         "Name[zh_TW]": "遠端系統音量",
         "ServiceTypes": [
             "KdeConnect/Plugin"