dolphin/src/views/versioncontrol/fileviewversioncontrolplugin.desktop, branch master Patched KDE Dolphin with Pixel Scaling https://fiftyfourth.xyz/git/dolphin/atom?h=master 2022-07-30T15:47:40Z Remove service type file for vcs plugins 2022-07-30T15:47:40Z Nicolas Fella nicolas.fella@gmx.de 2022-07-30T15:47:40Z urn:sha1:d7ca76799be58ee2a08dfa5653ebb159e0258ea1 We don't support old-style plugins any more, so no need to install this SVN_SILENT made messages (.desktop file) - always resolve ours 2022-07-02T02:06:49Z l10n daemon script scripty@kde.org 2022-07-02T02:06:49Z urn:sha1:58a7772a19204f467432d098253a32f0fc705b34 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-06-13T02:41:50Z l10n daemon script scripty@kde.org 2022-06-13T02:41:50Z urn:sha1:6401e69a4fff3de68fd372e3e0db0a99eba27bde 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-06-09T02:11:47Z l10n daemon script scripty@kde.org 2022-06-09T02:11:47Z urn:sha1:eb4a3cb45a18a46649da9145cbe2fef73fd38ca6 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-06-07T02:25:10Z l10n daemon script scripty@kde.org 2022-06-07T02:25:10Z urn:sha1:e406bc197fc0116d7fd8bb62086b41c52417c948 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-05T01:48:28Z l10n daemon script scripty@kde.org 2022-03-05T01:48:28Z urn:sha1:3366f62b0979752249a7e38769c318c72100aac6 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-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"