dolphin/src/dolphinpartactions.desktop, branch pixelated-scaling-option Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=pixelated-scaling-option 2026-02-05T01:41:49Z 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 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 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-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 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2023-06-16T01:40:55Z l10n daemon script scripty@kde.org 2023-06-16T01:40:55Z urn:sha1:51fcd600a8adb235bd510724fb3b8f8df9e0c6b6 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-03-06T01:43:29Z l10n daemon script scripty@kde.org 2023-03-06T01:43:29Z urn:sha1:7b2a09511d5e2cb0ba85da33043007c9269ecad7 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-02-12T02:02:18Z l10n daemon script scripty@kde.org 2023-02-12T02:02:18Z urn:sha1:d185e218871f7fb8016291994564bf266dd5df70 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"