dolphin/src/org.kde.dolphin.desktop, branch master Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=master 2026-03-01T01:45:03Z 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2025-09-16T01:35:02Z l10n daemon script scripty@kde.org 2025-09-16T01:35:02Z urn:sha1:ccce1c123fad5d668e44a705f629eccfdbea2048 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-08T02:03:45Z l10n daemon script scripty@kde.org 2025-09-08T02:03:45Z urn:sha1:ae7a57ecbf7e2375fa79a910fdf74bf97e69b3ad 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-23T01:36:30Z l10n daemon script scripty@kde.org 2025-08-23T01:36:30Z urn:sha1:2f93755e135e799b8de753a0ac17d4389593657f 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"