dolphin/src/settings/kcm/kcmdolphingeneral.json, branch master Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=master 2026-02-06T01:41:48Z 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 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-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" SVN_SILENT made messages (.desktop file) - always resolve ours 2024-07-19T01:21:28Z l10n daemon script scripty@kde.org 2024-07-19T01:21:28Z urn:sha1:8560c73e677186572a134ba427443924eeda9646 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-06-28T01:27:14Z l10n daemon script scripty@kde.org 2024-06-28T01:27:14Z urn:sha1:08347a59c0a442c42b6c97c692b6d4aabb2e70df 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-01-17T01:13:46Z l10n daemon script scripty@kde.org 2024-01-17T01:13:46Z urn:sha1:18cd42837f746984ae603513995c07fac8636b75 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-01-10T02:08:59Z l10n daemon script scripty@kde.org 2024-01-10T02:08:59Z urn:sha1:7e02110c64b178f16519ee3be6a4d460e967236d 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-01-05T02:08:48Z l10n daemon script scripty@kde.org 2024-01-05T02:08:48Z urn:sha1:e13a47f01ff96e3de87d59dc6d5da61009bba563 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"