dolphin/src/dolphinpart.desktop, branch master Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=master 2020-12-07T22:09:58Z dolphinpart: port to new KPluginMetaData-based KParts API 2020-12-07T22:09:58Z Friedrich W. H. Kossebau kossebau@kde.org 2020-11-28T10:24:29Z urn:sha1:9826d810340d1f6fe135a300a66d689f37add41e dolphinpart: add JSON metadata to plugin, install into kf5/parts subdir 2020-12-07T22:09:58Z Friedrich W. H. Kossebau kossebau@kde.org 2020-11-28T09:47:39Z urn:sha1:07b7f76f7c66b3cdf8d5a04dcd3a629e5993b21c SVN_SILENT made messages (.desktop file) - always resolve ours 2020-11-03T05:20:03Z l10n daemon script scripty@kde.org 2020-11-03T05:20:03Z urn:sha1:af1e13f9fa86c6a7f9bf397269559eda38e7aec6 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 2020-09-03T04:10:45Z l10n daemon script scripty@kde.org 2020-09-03T04:10:45Z urn:sha1:a1d5d75bea304aad11eb4ae08198f552e7f8f0a1 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 2020-09-01T04:25:15Z l10n daemon script scripty@kde.org 2020-09-01T04:25:15Z urn:sha1:f15f74e241ec4bd1f271e2dd7245509c565e6c02 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 2020-06-18T03:48:38Z l10n daemon script scripty@kde.org 2020-06-18T03:48:38Z urn:sha1:aea6128fe66171a411172089dcba85c90b89953f 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 2020-06-17T12:16:01Z l10n daemon script scripty@kde.org 2020-06-17T12:16:01Z urn:sha1:9c43e3de7d989bed1798c8f529136316e1b45e0c 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 2020-06-13T03:34:06Z l10n daemon script scripty@kde.org 2020-06-13T03:34:06Z urn:sha1:799c532d239c2c04cb7fe5014aceba449268fd3d 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 2020-03-02T04:36:51Z l10n daemon script scripty@kde.org 2020-03-02T04:36:51Z urn:sha1:b10a84c770d17e06bf3e2999e935ff4dd3a203af 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 2019-11-11T04:17:33Z l10n daemon script scripty@kde.org 2019-11-11T04:17:33Z urn:sha1:b9a2df09fcb5f7e1e62b742d32e961437a988da8 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"