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/sms/kdeconnect_sms.json

@@ -45,6 +45,7 @@
         "Description[uk]": "Надсилання і отримання SMS",
         "Description[x-test]": "xxSend and receive SMSxx",
         "Description[zh_CN]": "发送和接收短信",
+        "Description[zh_TW]": "傳送和接收文字簡訊",
         "EnabledByDefault": true,
         "Icon": "mail-message-new-list",
         "Id": "kdeconnect_sms",
@@ -67,6 +68,7 @@
         "Name[uk]": "SMS",
         "Name[x-test]": "xxSMSxx",
         "Name[zh_CN]": "短信",
+        "Name[zh_TW]": "文字簡訊",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],

plugins/systemvolume/kdeconnect_systemvolume.json

@@ -22,7 +22,8 @@
                 "Name[sv]": "Nicolas Fella",
                 "Name[uk]": "Nicolas Fella",
                 "Name[x-test]": "xxNicolas Fellaxx",
-                "Name[zh_CN]": "Nicolas Fella"
+                "Name[zh_CN]": "Nicolas Fella",
+                "Name[zh_TW]": "Nicolas Fella"
             }
         ],
         "Description": "Control the system volume from your phone",
@@ -43,6 +44,7 @@
         "Description[uk]": "Керування системним томом з вашого телефону",
         "Description[x-test]": "xxControl the system volume from your phonexx",
         "Description[zh_CN]": "用手机控制电脑音量",
+        "Description[zh_TW]": "控制手機的系統音量",
         "EnabledByDefault": true,
         "Icon": "audio-volume-high",
         "Id": "kdeconnect_systemvolume",
@@ -65,6 +67,7 @@
         "Name[uk]": "Системний том",
         "Name[x-test]": "xxSystem volumexx",
         "Name[zh_CN]": "系统音量",
+        "Name[zh_TW]": "系統音量",
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ],