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/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json

@@ -1,4 +1,5 @@
 {
+    "KPackageStructure": "KWin/Aurorae",
     "KPlugin": {
         "Authors": [
             {
@@ -36,6 +37,5 @@
         "Name[vi]": "Aurorae của KWin",
         "Name[x-test]": "xxKWin Auroraexx",
         "Version": "1"
-    },
-    "KPackageStructure": "KWin/Aurorae"
+    }
 }

src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json

@@ -1,4 +1,5 @@
 {
+    "KPackageStructure": "KWin/Decoration",
     "KPlugin": {
         "Authors": [
             {
@@ -36,6 +37,5 @@
         "Name[vi]": "Trang trí KWin",
         "Name[x-test]": "xxKWin Decorationxx",
         "Version": "1"
-    },
-    "KPackageStructure": "KWin/Decoration"
+    }
 }

src/plugins/kpackage/effect/kwin-packagestructure-effect.json

@@ -1,4 +1,5 @@
 {
+    "KPackageStructure": "KWin/Effect",
     "KPlugin": {
         "Authors": [
             {
@@ -36,6 +37,5 @@
         "Name[vi]": "Hiệu ứng KWin",
         "Name[x-test]": "xxKWin Effectxx",
         "Version": "1"
-    },
-    "KPackageStructure": "KWin/Effect"
+    }
 }

src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json

@@ -1,4 +1,5 @@
 {
+    "KPackageStructure": "KWin/Script",
     "KPlugin": {
         "Authors": [
             {
@@ -36,6 +37,5 @@
         "Name[vi]": "Kịch bản KWin",
         "Name[x-test]": "xxKWin Scriptxx",
         "Version": "1"
-    },
-    "KPackageStructure": "KWin/Script"
+    }
 }

src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json

@@ -1,4 +1,5 @@
 {
+    "KPackageStructure": "KWin/WindowSwitcher",
     "KPlugin": {
         "Authors": [
             {
@@ -36,6 +37,5 @@
         "Name[vi]": "Trình chuyển cửa sổ KWin",
         "Name[x-test]": "xxKWin Window Switcherxx",
         "Version": "1"
-    },
-    "KPackageStructure": "KWin/WindowSwitcher"
+    }
 }