<feed xmlns='http://www.w3.org/2005/Atom'>
<title>dolphin/src/settings/kcm/kcmdolphinservices.desktop, branch master</title>
<subtitle>Patched KDE Dolphin with Pixel Scaling
</subtitle>
<id>https://fiftyfourth.xyz/git/dolphin/atom?h=master</id>
<link rel='self' href='https://fiftyfourth.xyz/git/dolphin/atom?h=master'/>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/'/>
<updated>2020-12-28T20:18:31Z</updated>
<entry>
<title>Add options to hide some context menu entries</title>
<updated>2020-12-28T20:18:31Z</updated>
<author>
<name>Duong Do Minh Chau</name>
<email>duongdominhchau@gmail.com</email>
</author>
<published>2020-11-12T09:38:44Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=a512176b4bdbf0f0471a9b9089f4a936c14e2732'/>
<id>urn:sha1:a512176b4bdbf0f0471a9b9089f4a936c14e2732</id>
<content type='text'>
This commit add options to hide the following context menu entries:
- Add to Places
- Copy Location
- Duplicate Here
- Open in New Tab and Open in New Tabs
- Open in New Window
- Sort By
- View Mode

The Services settings page is renamed to Context Menu

ShowCopyMoveMenu option is moved from GeneralSettings to ContextMenuSettings

BUG: 314594
</content>
</entry>
<entry>
<title>Do not expose KCMs in application launchers</title>
<updated>2020-11-07T14:51:20Z</updated>
<author>
<name>Alexander Lohnau</name>
<email>alexander.lohnau@gmx.de</email>
</author>
<published>2020-11-06T21:57:47Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=801fb7e0fd8e16afc8aed164a57a5fa563ccf5a4'/>
<id>urn:sha1:801fb7e0fd8e16afc8aed164a57a5fa563ccf5a4</id>
<content type='text'>
We still need to build them, because they
are also loaded on konqueror.
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2020-11-03T05:20:03Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2020-11-03T05:20:03Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=af1e13f9fa86c6a7f9bf397269559eda38e7aec6'/>
<id>urn:sha1:af1e13f9fa86c6a7f9bf397269559eda38e7aec6</id>
<content type='text'>
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"
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2020-09-14T04:15:19Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2020-09-14T04:15:19Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=1d47e9691330ad40113e3652ab2f158a25665ece'/>
<id>urn:sha1:1d47e9691330ad40113e3652ab2f158a25665ece</id>
<content type='text'>
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"
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2020-09-10T04:35:50Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2020-09-10T04:35:50Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=98acc7f1932ddc7d5f07e6e5ed05b04c7a6ddd2e'/>
<id>urn:sha1:98acc7f1932ddc7d5f07e6e5ed05b04c7a6ddd2e</id>
<content type='text'>
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"
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2020-09-09T04:36:13Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2020-09-09T04:36:13Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=ddccf4f3201d04bb9343a098bc882f1c17a85ad0'/>
<id>urn:sha1:ddccf4f3201d04bb9343a098bc882f1c17a85ad0</id>
<content type='text'>
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"
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2020-09-03T04:10:45Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2020-09-03T04:10:45Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=a1d5d75bea304aad11eb4ae08198f552e7f8f0a1'/>
<id>urn:sha1:a1d5d75bea304aad11eb4ae08198f552e7f8f0a1</id>
<content type='text'>
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"
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2020-09-01T04:25:15Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2020-09-01T04:25:15Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=f15f74e241ec4bd1f271e2dd7245509c565e6c02'/>
<id>urn:sha1:f15f74e241ec4bd1f271e2dd7245509c565e6c02</id>
<content type='text'>
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"
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2020-06-18T03:48:38Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2020-06-18T03:48:38Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=aea6128fe66171a411172089dcba85c90b89953f'/>
<id>urn:sha1:aea6128fe66171a411172089dcba85c90b89953f</id>
<content type='text'>
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"
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2020-06-17T12:16:01Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2020-06-17T12:16:01Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=9c43e3de7d989bed1798c8f529136316e1b45e0c'/>
<id>urn:sha1:9c43e3de7d989bed1798c8f529136316e1b45e0c</id>
<content type='text'>
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"
</content>
</entry>
</feed>
