diff options
| author | l10n daemon script <[email protected]> | 2024-09-27 01:25:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2024-09-27 01:25:00 +0000 |
| commit | 5242d0ce3866b96a100e620b6f52277cd48e8730 (patch) | |
| tree | 262be6dee3ad1460b83f72f8af1d06b44e0efbb0 /src/dolphinpart.json.in | |
| parent | 36dc660a4699df0179b8fa5cb7473e95df0545d1 (diff) | |
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"
Diffstat (limited to 'src/dolphinpart.json.in')
| -rw-r--r-- | src/dolphinpart.json.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index e47e14e2a..4adb3b6b6 100644 --- 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" } |