dolphin/src/org.kde.dolphin.desktop, branch pixelated-scaling-option Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom/src/org.kde.dolphin.desktop?h=pixelated-scaling-option 2026-06-02T02:07:16Z SVN_SILENT made messages (.desktop file) - always resolve ours 2026-06-02T02:07:16Z l10n daemon script scripty@kde.org 2026-06-02T02:07:16Z urn:sha1:4d74e6555482dc289f5b2c2e1c7c0af2f80399d5 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-04-09T01:50:12Z l10n daemon script scripty@kde.org 2026-04-09T01:50:12Z urn:sha1:b6e66e90d71a49a2ad2040a79fecd670425d375f 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-03-21T01:42:09Z l10n daemon script scripty@kde.org 2026-03-21T01:42:09Z urn:sha1:57a3dbe6b1913af0788a7b8ec98b93c149aa5d0e 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-03-01T01:45:03Z l10n daemon script scripty@kde.org 2026-03-01T01:45:03Z urn:sha1:d342f3528f1161fe349fc74e80bf7fc8e2cacf55 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-25T01:43:55Z l10n daemon script scripty@kde.org 2026-02-25T01:43:55Z urn:sha1:c8f6833bbab22da2d1ad73c74437dffcda277593 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-11T01:42:12Z l10n daemon script scripty@kde.org 2026-02-11T01:42:12Z urn:sha1:9014e2651cbbfc5e5baa3b6ce9f53d495dbaae2c 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-05T01:41:49Z l10n daemon script scripty@kde.org 2026-02-05T01:41:49Z urn:sha1:84476434514a201f2354c53489f1fd677b099404 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-16T01:39:59Z l10n daemon script scripty@kde.org 2026-01-16T01:39:59Z urn:sha1:c4f8f736e480b81822c9e816167ff51e9d04131b 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-12-12T01:36:36Z l10n daemon script scripty@kde.org 2025-12-12T01:36:36Z urn:sha1:69a98144f385dae4fcdd77fb1565364d3ab9079d 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"