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/bigscreen/kdeconnect_bigscreen.json

@@ -51,6 +51,7 @@
         "Description[sv]": "Insticksprogram för storskärm",
         "Description[uk]": "Додаток для великих екранів",
         "Description[x-test]": "xxBigscreen Pluginxx",
+        "Description[zh_CN]": "大屏幕插件",
         "EnabledByDefault": true,
         "Icon": "tvtrusted",
         "Id": "kdeconnect_bigscreen",
@@ -78,6 +79,7 @@
         "Name[sv]": "Storskärm",
         "Name[uk]": "Великий екран",
         "Name[x-test]": "xxBigscreenxx",
+        "Name[zh_CN]": "大屏幕",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],

urlhandler/org.kde.kdeconnect.handler.desktop

@@ -17,6 +17,7 @@ Name[pt_BR]=Tratamento de URLs do KDE Connect
 Name[sv]=KDE-anslut webbadresshanterare
 Name[uk]=Обробник адрес KDE Connect
 Name[x-test]=xxKDE Connect URL Handlerxx
+Name[zh_CN]=KDE Connect URL 处理程序
 Exec=kdeconnect-handler %U
 Icon=kdeconnect
 Type=Application