dolphin/src/settings/kcm/kcmdolphinviewmodes.json, branch pixelated-scaling-option Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=pixelated-scaling-option 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-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 2023-11-08T09:18:27Z l10n daemon script scripty@kde.org 2023-11-08T09:18:27Z urn:sha1:3fde6cbeb0b2df48a91870c74c4ef74462a82058 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 2023-11-07T03:15:28Z l10n daemon script scripty@kde.org 2023-11-07T03:15:28Z urn:sha1:d558c9a5dd8082488ea884feece22c1add1ea6cd 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 2023-11-04T12:00:15Z l10n daemon script scripty@kde.org 2023-11-04T12:00:15Z urn:sha1:d1f4e8d1e79814f6ddf56e56c7d121c9f1838b4e 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"