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"

plugins/connectivity-report/kdeconnect_connectivity_report.json

@@ -23,7 +23,8 @@
                 "Name[sv]": "David Shlemayev",
                 "Name[tr]": "David Shlemayev",
                 "Name[uk]": "Давид Шлемаєв",
-                "Name[x-test]": "xxDavid Shlemayevxx"
+                "Name[x-test]": "xxDavid Shlemayevxx",
+                "Name[zh_CN]": "David Shlemayev"
             }
         ],
         "Description": "Show your phone's network signal strength",
@@ -46,6 +47,7 @@
         "Description[tr]": "Telefonunuzun ağ sinyal gücünü gösterin",
         "Description[uk]": "Показ потужності сигналу мережі на вашому телефоні",
         "Description[x-test]": "xxShow your phone's network signal strengthxx",
+        "Description[zh_CN]": "显示您手机的网络信号强度",
         "EnabledByDefault": true,
         "Icon": "network-wireless",
         "Id": "kdeconnect_connectivity_report",
@@ -71,6 +73,7 @@
         "Name[tr]": "Bağlantı monitörü",
         "Name[uk]": "Монітор з'єднання",
         "Name[x-test]": "xxConnectivity monitorxx",
+        "Name[zh_CN]": "信号监视器",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],