dolphin/src/dolphinpart.json.in, branch master Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=master 2026-02-12T01:41:25Z SVN_SILENT made messages (.desktop file) - always resolve ours 2026-02-12T01:41:25Z l10n daemon script scripty@kde.org 2026-02-12T01:41:25Z urn:sha1:d8461fc02ed4eac062840f0dbd3eee9fe3047101 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2026-02-06T01:41:48Z l10n daemon script scripty@kde.org 2026-02-06T01:41:48Z urn:sha1:0a18c04e19da3d94e3c885237c9d4d2a9fc822e1 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2025-09-25T01:35:17Z l10n daemon script scripty@kde.org 2025-09-25T01:35:17Z urn:sha1:0778b805cd823172f179809f535048c41bccef8d 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2025-09-09T02:12:34Z l10n daemon script scripty@kde.org 2025-09-09T02:12:34Z urn:sha1:d22a837edd132b29535810c01aacfcc1a004c10a 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2025-08-27T01:36:52Z l10n daemon script scripty@kde.org 2025-08-27T01:36:52Z urn:sha1:391c55f0a86a151b9f45d7a65f92db713bcc7013 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2025-06-25T01:35:28Z l10n daemon script scripty@kde.org 2025-06-25T01:35:28Z urn:sha1:c7d4b19b88237551bd7cefe0f79670427f1c90c9 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2024-12-14T01:47:37Z l10n daemon script scripty@kde.org 2024-12-14T01:47:37Z urn:sha1:517cc98e1574fdff4944f256d14ff10543b7c718 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2024-09-27T01:25:00Z l10n daemon script scripty@kde.org 2024-09-27T01:25:00Z urn:sha1:5242d0ce3866b96a100e620b6f52277cd48e8730 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" Dolphinpart: Define KPart capabilities instead of deprecated ServiceTypes 2024-09-26T06:34:43Z Alexander Lohnau alexander.lohnau@gmx.de 2024-09-16T19:31:22Z urn:sha1:36dc660a4699df0179b8fa5cb7473e95df0545d1 By now, Konqueror uses the new mechanism introduced in https://invent.kde.org/frameworks/kparts/-/merge_requests/86. Thus, we can avoid using the deprecated SeviceTypes which are also removed from the official KPluginMetaData API. SVN_SILENT made messages (.desktop file) - always resolve ours 2024-08-28T01:32:24Z l10n daemon script scripty@kde.org 2024-08-28T01:32:24Z urn:sha1:6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5 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"