dolphin/src/settings/kcm/kcmdolphingeneral.desktop, branch master Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=master 2022-04-24T20:58:47Z Convert desktop files of plugins to json 2022-04-24T20:58:47Z Alexander Lohnau alexander.lohnau@gmx.de 2022-04-16T11:03:38Z urn:sha1:1618a3ed21761648b20a14d7477aa065a2239fa7 Task: https://phabricator.kde.org/T14564 SVN_SILENT made messages (.desktop file) - always resolve ours 2022-04-19T01:48:03Z l10n daemon script scripty@kde.org 2022-04-19T01:48:03Z urn:sha1:0dfa3611de7a0292f1d61ad132328df8ac776b12 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 2022-04-07T01:45:45Z l10n daemon script scripty@kde.org 2022-04-07T01:45:45Z urn:sha1:9a334caf7d46f5d87079545bd2e67df13a56ed56 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 2022-03-29T02:21:23Z l10n daemon script scripty@kde.org 2022-03-29T02:21:23Z urn:sha1:447c35868c6268789e8f2ae0abecd28df02029d8 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 2022-03-20T02:14:36Z l10n daemon script scripty@kde.org 2022-03-20T02:14:36Z urn:sha1:fa72ae8577d7bae31cd92c8d393893a1ec214f80 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" Install KCMs in dolphin/kcms namespace 2021-10-09T12:14:27Z Alexander Lohnau alexander.lohnau@gmx.de 2021-09-02T18:11:11Z urn:sha1:2f5e4cb02933e3317098bdf090b3f6103061d4ae This will allow consumers to load the plugin from this namespace without KServiceTypeTrader being involved. SVN_SILENT made messages (.desktop file) - always resolve ours 2021-10-09T01:19:17Z l10n daemon script scripty@kde.org 2021-10-09T01:19:17Z urn:sha1:1937681d50d12a8c1a7f21c854aa99d3f4b0277b 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 2021-09-20T01:28:18Z l10n daemon script scripty@kde.org 2021-09-20T01:28:18Z urn:sha1:f8c292c556b87a19e9099cc98bf0ab88424472b2 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 2021-08-23T01:28:23Z l10n daemon script scripty@kde.org 2021-08-23T01:28:23Z urn:sha1:e76bf5cb18ca46a0adc84ead3801726814cf6fd3 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 2021-08-09T01:11:30Z l10n daemon script scripty@kde.org 2021-08-09T01:11:30Z urn:sha1:cb9142a9bbabe0d4adc65253ede01bc998cf0edb 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"