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"

src/plasma/packagestructure/containmentactions-packagestructure.json

@@ -34,6 +34,7 @@
         "Name[uk]": "Дії з контейнерами", 
         "Name[x-test]": "xxContainment Actionsxx", 
         "Name[zh_CN]": "容器动作", 
+        "Name[zh_TW]": "遏止動作", 
         "ServiceTypes": [
             "KPackage/PackageStructure"
         ], 

src/plasma/packagestructure/dataengine-packagestructure.json

@@ -35,6 +35,7 @@
         "Name[uk]": "Рушій даних", 
         "Name[x-test]": "xxData Enginexx", 
         "Name[zh_CN]": "数据引擎", 
+        "Name[zh_TW]": "資料引擎", 
         "ServiceTypes": [
             "KPackage/PackageStructure"
         ], 

src/plasma/packagestructure/plasmageneric-packagestructure.json

@@ -36,6 +36,7 @@
         "Name[uk]": "Загальний", 
         "Name[x-test]": "xxGenericxx", 
         "Name[zh_CN]": "常规", 
+        "Name[zh_TW]": "一般", 
         "ServiceTypes": [
             "KPackage/PackageStructure"
         ], 

src/plasma/packagestructure/plasmatheme-packagestructure.json

@@ -35,6 +35,7 @@
         "Name[uk]": "Тема Плазми", 
         "Name[x-test]": "xxPlasma Themexx", 
         "Name[zh_CN]": "Plasma 主题", 
+        "Name[zh_TW]": "Plasma 主題", 
         "ServiceTypes": [
             "KPackage/PackageStructure"
         ], 

src/plasma/packagestructure/plasmoid-packagestructure.json

@@ -27,6 +27,7 @@
         "Name[uk]": "Плазмоїд", 
         "Name[x-test]": "xxPlasmoidxx", 
         "Name[zh_CN]": "小部件", 
+        "Name[zh_TW]": "元件", 
         "ServiceTypes": [
             "KPackage/PackageStructure"
         ],