dolphin/src/itemactions/setfoldericonitemaction.json, branch master Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=master 2026-02-26T01:41:19Z SVN_SILENT made messages (.desktop file) - always resolve ours 2026-02-26T01:41:19Z l10n daemon script scripty@kde.org 2026-02-26T01:41:19Z urn:sha1:a4fbadd0db961694cb57f75a8752e538cfe3f263 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-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 2026-01-17T01:39:38Z l10n daemon script scripty@kde.org 2026-01-17T01:39:38Z urn:sha1:137097be34a041d457624939e4d9eea25ed58f14 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-12-14T01:36:01Z l10n daemon script scripty@kde.org 2025-12-14T01:36:01Z urn:sha1:0f90a2855896a25cb773870817d05c0ee0842f6e 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-12-13T01:38:58Z l10n daemon script scripty@kde.org 2025-12-13T01:38:58Z urn:sha1:fb9561c457207d5c1661a9ffc7fafdd0710c7ff1 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-17T01:36:00Z l10n daemon script scripty@kde.org 2025-09-17T01:36:00Z urn:sha1:7be1e4aa5f1dd257ac1ad9f811e2e7665d8751a4 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-24T01:34:51Z l10n daemon script scripty@kde.org 2025-08-24T01:34:51Z urn:sha1:aa289451e6d82cc6dea266d98236ac0f8a47f2fe 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"