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/clipboard/kdeconnect_clipboard.json

@@ -121,7 +121,7 @@
         "Name[uk]": "Буфер обміну",
         "Name[x-test]": "xxClipboardxx",
         "Name[zh_CN]": "剪切板",
-        "Name[zh_TW]": "剪貼板",
+        "Name[zh_TW]": "剪貼簿",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],

plugins/ping/kdeconnect_ping.json

@@ -120,7 +120,7 @@
         "Name[uk]": "Луна-імпульс",
         "Name[x-test]": "xxPingxx",
         "Name[zh_CN]": "Ping",
-        "Name[zh_TW]": "Ping回應封包",
+        "Name[zh_TW]": "Ping 回應封包",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],

plugins/presenter/kdeconnect_presenter.json

@@ -56,6 +56,7 @@
         "Name[sv]": "Presentatör",
         "Name[uk]": "Презентатор",
         "Name[x-test]": "xxPresenterxx",
+        "Name[zh_TW]": "提供者",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ]

plugins/share/kdeconnect_share.json

@@ -119,7 +119,7 @@
         "Name[uk]": "Оприлюднення і отримання",
         "Name[x-test]": "xxShare and receivexx",
         "Name[zh_CN]": "分享和接收",
-        "Name[zh_TW]": "共享與接收",
+        "Name[zh_TW]": "分享及接收",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],

plugins/telephony/kdeconnect_telephony.json

@@ -105,7 +105,7 @@
         "Name[uk]": "Інтеграція з системою телефонії",
         "Name[x-test]": "xxTelephony integrationxx",
         "Name[zh_CN]": "Telephony 集成",
-        "Name[zh_TW]": "集成電話",
+        "Name[zh_TW]": "電話整合",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],