From 4b74b294abffb14dddc9c5d2c4ad2a7b2ae718c4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 2 Oct 2015 10:17:30 +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"
---
 backends/drm/drm.json               | 10 +++++-----
 backends/fbdev/fbdev.json           | 10 +++++-----
 backends/hwcomposer/hwcomposer.json | 10 +++++-----
 backends/wayland/wayland.json       | 10 +++++-----
 backends/x11/x11.json               | 10 +++++-----
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/backends/drm/drm.json b/backends/drm/drm.json
index 843cff6e05..cea798c3d9 100644
--- a/backends/drm/drm.json
+++ b/backends/drm/drm.json
@@ -1,8 +1,8 @@
 {
     "KPlugin": {
-        "Id": "KWinWaylandDrmBackend",
-        "Name": "drm",
-        "Description": "Render through drm node."
-    },
+        "Description": "Render through drm node.", 
+        "Id": "KWinWaylandDrmBackend", 
+        "Name": "drm"
+    }, 
     "input": false
-}
+}
\ No newline at end of file
diff --git a/backends/fbdev/fbdev.json b/backends/fbdev/fbdev.json
index 0bcb7bc990..ff0b7e18cb 100644
--- a/backends/fbdev/fbdev.json
+++ b/backends/fbdev/fbdev.json
@@ -1,8 +1,8 @@
 {
     "KPlugin": {
-        "Id": "KWinWaylandFbdevBackend",
-        "Name": "framebuffer",
-        "Description": "Render to framebuffer."
-    },
+        "Description": "Render to framebuffer.", 
+        "Id": "KWinWaylandFbdevBackend", 
+        "Name": "framebuffer"
+    }, 
     "input": false
-}
+}
\ No newline at end of file
diff --git a/backends/hwcomposer/hwcomposer.json b/backends/hwcomposer/hwcomposer.json
index e15108c9e7..646d906fc6 100644
--- a/backends/hwcomposer/hwcomposer.json
+++ b/backends/hwcomposer/hwcomposer.json
@@ -1,8 +1,8 @@
 {
     "KPlugin": {
-        "Id": "KWinWaylandHwcomposerBackend",
-        "Name": "hwcomposer",
-        "Description": "Render through hwcomposer through libhybris."
-    },
+        "Description": "Render through hwcomposer through libhybris.", 
+        "Id": "KWinWaylandHwcomposerBackend", 
+        "Name": "hwcomposer"
+    }, 
     "input": true
-}
+}
\ No newline at end of file
diff --git a/backends/wayland/wayland.json b/backends/wayland/wayland.json
index 95e707b4c9..a82ffc8362 100644
--- a/backends/wayland/wayland.json
+++ b/backends/wayland/wayland.json
@@ -1,8 +1,8 @@
 {
     "KPlugin": {
-        "Id": "KWinWaylandWaylandBackend",
-        "Name": "wayland",
-        "Description": "Render to a nested window on running Wayland compositor."
-    },
+        "Description": "Render to a nested window on running Wayland compositor.", 
+        "Id": "KWinWaylandWaylandBackend", 
+        "Name": "wayland"
+    }, 
     "input": true
-}
+}
\ No newline at end of file
diff --git a/backends/x11/x11.json b/backends/x11/x11.json
index 0d5ef5b598..8d7916fa30 100644
--- a/backends/x11/x11.json
+++ b/backends/x11/x11.json
@@ -1,8 +1,8 @@
 {
     "KPlugin": {
-        "Id": "KWinWaylandX11Backend",
-        "Name": "x11",
-        "Description": "Render to a nested window on X11 windowing system."
-    },
+        "Description": "Render to a nested window on X11 windowing system.", 
+        "Id": "KWinWaylandX11Backend", 
+        "Name": "x11"
+    }, 
     "input": true
-}
+}
\ No newline at end of file