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"

plugins/scenes/qpainter/qpainter.json

@@ -1,9 +1,8 @@
 {
+    "CompositingType": 4,
     "KPlugin": {
         "Description": "KWin Compositor plugin rendering through QPainter",
         "Id": "KWinSceneQPainter",
         "Name": "SceneQPainter"
-    },
-    "CompositingType": 4
+    }
 }
-

plugins/scenes/xrender/xrender.json

@@ -1,8 +1,8 @@
 {
+    "CompositingType": 2,
     "KPlugin": {
         "Description": "KWin Compositor plugin rendering through XRender",
         "Id": "KWinSceneXRender",
         "Name": "SceneXRender"
-    },
-    "CompositingType": 2
+    }
 }