dolphin/src/settings/kcm/kcmdolphinviewmodes.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-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" Remove unneeded KCM plugin keyword stuff 2021-07-23T10:15:06Z Nicolas Fella nicolas.fella@gmx.de 2021-07-21T19:41:12Z urn:sha1:6e56cc328636e3e6ae933843c56cfe179cc269f1 Fix X-DocPath entries 2021-06-18T15:01:41Z Ahmad Samir a.samirh78@gmail.com 2021-06-14T13:14:57Z urn:sha1:5e79f27aec817a44606e9e4f32b055d78eeb280c This way they're more correct, which means they can work with KHelpCenter and when falling back to opening the relevant page at docs.kde.org in any web browser. See https://invent.kde.org/graphics/okular/-/merge_requests/441 for more details.