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"

initialstart/modules/wifi/package/metadata.json

@@ -82,6 +82,7 @@
         "Name[tr]": "Wi-Fi",
         "Name[uk]": "WiFi",
         "Name[x-test]": "xxWiFixx",
+        "Name[zh_CN]": "WiFi",
         "ServiceTypes": [
             "KPackage/GenericQML"
         ],

kcms/hotspot/kcm_mobile_hotspot.json

@@ -23,7 +23,8 @@
                 "Name[sl]": "Tobias Fella",
                 "Name[tr]": "Tobias Fella",
                 "Name[uk]": "Tobias Fella",
-                "Name[x-test]": "xxTobias Fellaxx"
+                "Name[x-test]": "xxTobias Fellaxx",
+                "Name[zh_CN]": "Tobias Fella"
             }
         ],
         "Category": "System Information",

kwin/scripts/convergentwindows/metadata.json

@@ -24,7 +24,8 @@
                 "Name[sl]": "Plata Hill",
                 "Name[tr]": "Plata Hill",
                 "Name[uk]": "Plata Hill",
-                "Name[x-test]": "xxPlata Hillxx"
+                "Name[x-test]": "xxPlata Hillxx",
+                "Name[zh_CN]": "Plata Hill"
             }
         ],
         "Description": "Removes window decorations and maximizes windows on the first screen only.",

lookandfeel/metadata.json

@@ -52,6 +52,7 @@
         "Description[tr]": "Taşınabilir aygıtlar için Plasma",
         "Description[uk]": "Плазма для мобільних пристроїв",
         "Description[x-test]": "xxPlasma for mobile devicesxx",
+        "Description[zh_CN]": "针对手机设备设计的 Plasma 环境",
         "Id": "org.kde.breeze.mobile",
         "License": "GPLv2+",
         "Name": "Plasma Mobile Breeze",
@@ -75,6 +76,7 @@
         "Name[tr]": "Plasma Cep Esinti",
         "Name[uk]": "Breeze для мобільної Плазми",
         "Name[x-test]": "xxPlasma Mobile Breezexx",
+        "Name[zh_CN]": "Plasma Mobile Breeze 微风",
         "Version": "2.0",
         "Website": "https://www.kde.org"
     },

quicksettings/hotspot/metadata.json

@@ -23,7 +23,8 @@
                 "Name[sl]": "Yari Polla",
                 "Name[tr]": "Yari Polla",
                 "Name[uk]": "Yari Polla",
-                "Name[x-test]": "xxYari Pollaxx"
+                "Name[x-test]": "xxYari Pollaxx",
+                "Name[zh_CN]": "Yari Polla"
             }
         ],
         "Description": "Hotspot quick setting for Plasma Mobile",