dolphin/src/settings/kcm/kcmdolphinnavigation.json, branch master Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=master 2023-08-18T07:07:48Z Dolphin settings revamp 2023-08-18T07:07:48Z Dimosthenis Krallis sandboxgamergr@hotmail.com 2023-08-18T07:07:48Z urn:sha1:489b56b68bb29e81337e115c490eea4403001b71 It includes a move of the settings in the Navigation and Startup sections to the Interface (formerly Behavior) section. It also includes a new tab in the View (formerly View Mode) section, called General where some settings regarding Display style, Browsing and Miscellaneous settings The Interface section has new tabs named Folders & Tabs and Status & Location bars respectively where most of the Startup and Navigation settings moved. The `dolphin/kcms/kcm_dolphinnavigation` kcm is removed. SVN_SILENT made messages (.desktop file) - always resolve ours 2023-07-28T01:43:52Z l10n daemon script scripty@kde.org 2023-07-28T01:43:52Z urn:sha1:2f0369b333ac5c714d59b74665e76a41a5936042 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 metadata from KCM json files 2023-03-04T08:22:06Z Alexander Lohnau alexander.lohnau@gmx.de 2023-03-04T08:20:13Z urn:sha1:f8a6aba49099223a436880bd7c70a07e2f376144 We only load them in Konqueror, there are only the name, icon and doc path used. The ServiceTypes are only a leftover from before the json conversion Task: https://phabricator.kde.org/T14730 SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-02T02:25:05Z l10n daemon script scripty@kde.org 2023-03-02T02:25:05Z urn:sha1:6adbb73b992c6196e4c46023aafcf245574702e7 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" SVN_SILENT made messages (.desktop file) - always resolve ours 2023-01-30T02:05:00Z l10n daemon script scripty@kde.org 2023-01-30T02:05:00Z urn:sha1:572f4d2e9ac5dcb188630281227b545af41275bb 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-01-22T02:03:57Z l10n daemon script scripty@kde.org 2023-01-22T02:03:57Z urn:sha1:83964c2071893b65e6fd8dc96bad5388107c8ef3 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-01-02T02:34:18Z l10n daemon script scripty@kde.org 2023-01-02T02:34:18Z urn:sha1:d11d4781487243dddc3a3899bd65d21542a93383 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-12-30T02:12:34Z l10n daemon script scripty@kde.org 2022-12-30T02:12:34Z urn:sha1:36fda229fef526ae306c6efbaa5b26ec5e8dcfce 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-12-28T02:03:50Z l10n daemon script scripty@kde.org 2022-12-28T02:03:50Z urn:sha1:df11f2f168911c3d350216ddb013daac94b9fde4 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"