From d47b27f9cd4fa886ea4a69fd8de727142aedf6e6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 5 Aug 2021 01:15:06 +0000
Subject: [PATCH] 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"
---
 .../kpackage/aurorae/kwin-packagestructure-aurorae.json       | 4 ++--
 .../kpackage/decoration/kwin-packagestructure-decoration.json | 4 ++--
 src/plugins/kpackage/effect/kwin-packagestructure-effect.json | 4 ++--
 .../kpackage/scripts/kwin-packagestructure-scripts.json       | 4 ++--
 .../windowswitcher/kwin-packagestructure-windowswitcher.json  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json b/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
index 08c59cc40e..7b8091ef8b 100644
--- a/src/plugins/kpackage/aurorae/kwin-packagestructure-aurorae.json
+++ b/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"
+    }
 }
diff --git a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json b/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
index c2e2780bfa..e2cce3fc9a 100644
--- a/src/plugins/kpackage/decoration/kwin-packagestructure-decoration.json
+++ b/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"
+    }
 }
diff --git a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json b/src/plugins/kpackage/effect/kwin-packagestructure-effect.json
index a99d955ecd..0133936b21 100644
--- a/src/plugins/kpackage/effect/kwin-packagestructure-effect.json
+++ b/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"
+    }
 }
diff --git a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json b/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
index c61150aab2..da2414c494 100644
--- a/src/plugins/kpackage/scripts/kwin-packagestructure-scripts.json
+++ b/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"
+    }
 }
diff --git a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json b/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
index 8c0b833e21..5f12c44ab4 100644
--- a/src/plugins/kpackage/windowswitcher/kwin-packagestructure-windowswitcher.json
+++ b/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"
+    }
 }