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

@@ -1,8 +1,8 @@
 {
     "KPlugin": {
+        "Description": "Render through drm node.", 
         "Id": "KWinWaylandDrmBackend", 
-        "Name": "drm",
+        "Name": "drm"
-        "Description": "Render through drm node."
     }, 
     "input": false
 }

backends/fbdev/fbdev.json

@@ -1,8 +1,8 @@
 {
     "KPlugin": {
+        "Description": "Render to framebuffer.", 
         "Id": "KWinWaylandFbdevBackend", 
-        "Name": "framebuffer",
+        "Name": "framebuffer"
-        "Description": "Render to framebuffer."
     }, 
     "input": false
 }

backends/hwcomposer/hwcomposer.json

@@ -1,8 +1,8 @@
 {
     "KPlugin": {
+        "Description": "Render through hwcomposer through libhybris.", 
         "Id": "KWinWaylandHwcomposerBackend", 
-        "Name": "hwcomposer",
+        "Name": "hwcomposer"
-        "Description": "Render through hwcomposer through libhybris."
     }, 
     "input": true
 }

backends/wayland/wayland.json

@@ -1,8 +1,8 @@
 {
     "KPlugin": {
+        "Description": "Render to a nested window on running Wayland compositor.", 
         "Id": "KWinWaylandWaylandBackend", 
-        "Name": "wayland",
+        "Name": "wayland"
-        "Description": "Render to a nested window on running Wayland compositor."
     }, 
     "input": true
 }

backends/x11/x11.json

@@ -1,8 +1,8 @@
 {
     "KPlugin": {
+        "Description": "Render to a nested window on X11 windowing system.", 
         "Id": "KWinWaylandX11Backend", 
-        "Name": "x11",
+        "Name": "x11"
-        "Description": "Render to a nested window on X11 windowing system."
     }, 
     "input": true
 }