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"

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index e47e14e2a0f38923163b4704f4a3bafd023b3a56..4adb3b6b627c9a14e82689689250b6869b063536 100644 (file)
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -1,4 +1,10 @@
 {
+    "KParts": {
+        "Capabilities": [
+            "ReadOnly",
+            "BrowserView"
+        ]
+    },
     "KPlugin": {
         "Icon": "view-list-icons",
         "InitialPreference": 7,
@@ -69,11 +75,5 @@
     "MimeType": "inode/directory;",
     "X-KDE-BrowserView-Built-Into": "konqueror",
     "X-KDE-BrowserView-HideFromMenus": true,
-    "X-Konqueror-Actions-File": "@KDE_INSTALL_FULL_DATADIR@/dolphin/dolphinpartactions.desktop",
-    "KParts": {
-        "Capabilities": [
-            "ReadOnly",
-            "BrowserView"
-        ]
-    }
+    "X-Konqueror-Actions-File": "@KDE_INSTALL_FULL_DATADIR@/dolphin/dolphinpartactions.desktop"
 }