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/findmyphone/kdeconnect_findmyphone.json

@@ -111,6 +111,7 @@
         "Description[tr]": "Bir alarm sesi çalarak kayıp telefonunuzu bulun    ",
         "Description[uk]": "Знайти загублений телефон, наказавши йому відтворити дзвінок",
         "Description[x-test]": "xxFind your lost phone by making it play an alarm soundxx",
+        "Description[zh_CN]": "通过播放闹铃声来找到您不见的手机",
         "Description[zh_TW]": "讓您的手機發出警報聲，讓您找到您遺失的手機。",
         "EnabledByDefault": true,
         "Icon": "edit-find",

plugins/ping/kdeconnect_ping.json

@@ -73,6 +73,7 @@
         "Description[tr]": "Ping gönder ve al",
         "Description[uk]": "Надсилання і отримання сигналів підтримання зв’язку",
         "Description[x-test]": "xxSend and receive pingsxx",
+        "Description[zh_CN]": "发送和接受ping",
         "Description[zh_TW]": "傳送與接收 Ping 回應封包",
         "EnabledByDefault": true,
         "Icon": "dialog-ok",

plugins/sftp/kdeconnect_sftp.json

@@ -114,6 +114,7 @@
         "Name[tr]": "Uzak dosya sistemi tarayıcısı",
         "Name[uk]": "Перегляд віддалених файлових систем",
         "Name[x-test]": "xxRemote filesystem browserxx",
+        "Name[zh_CN]": "远程文件系统浏览器",
         "Name[zh_TW]": "遠端檔案瀏覽器",
         "ServiceTypes": [
             "KdeConnect/Plugin"