<feed xmlns='http://www.w3.org/2005/Atom'>
<title>dolphin/src/dolphinpart.desktop.in, 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>2022-08-01T16:35:35Z</updated>
<entry>
<title>Install dolphinpart actions as standalone file</title>
<updated>2022-08-01T16:35:35Z</updated>
<author>
<name>Alexander Lohnau</name>
<email>alexander.lohnau@gmx.de</email>
</author>
<published>2022-08-01T16:35:35Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=f506666540981b9e46c4b5d6c7add179f3c4c709'/>
<id>urn:sha1:f506666540981b9e46c4b5d6c7add179f3c4c709</id>
<content type='text'>
This will allow Konqueror to use it without relying on the KPart being loaded using KService
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2022-07-02T02:06:49Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2022-07-02T02:06:49Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=58a7772a19204f467432d098253a32f0fc705b34'/>
<id>urn:sha1:58a7772a19204f467432d098253a32f0fc705b34</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>2022-03-29T02:21:23Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2022-03-29T02:21:23Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=447c35868c6268789e8f2ae0abecd28df02029d8'/>
<id>urn:sha1:447c35868c6268789e8f2ae0abecd28df02029d8</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>2021-10-09T01:19:17Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2021-10-09T01:19:17Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=1937681d50d12a8c1a7f21c854aa99d3f4b0277b'/>
<id>urn:sha1:1937681d50d12a8c1a7f21c854aa99d3f4b0277b</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>2021-09-20T01:28:18Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2021-09-20T01:28:18Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=f8c292c556b87a19e9099cc98bf0ab88424472b2'/>
<id>urn:sha1:f8c292c556b87a19e9099cc98bf0ab88424472b2</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>2021-08-23T01:28:23Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2021-08-23T01:28:23Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=e76bf5cb18ca46a0adc84ead3801726814cf6fd3'/>
<id>urn:sha1:e76bf5cb18ca46a0adc84ead3801726814cf6fd3</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>2021-08-09T01:11:30Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2021-08-09T01:11:30Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=cb9142a9bbabe0d4adc65253ede01bc998cf0edb'/>
<id>urn:sha1:cb9142a9bbabe0d4adc65253ede01bc998cf0edb</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>2021-07-04T01:17:03Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2021-07-04T01:17:03Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=7f562433c03534933d118b3b4abd6ab85bb4cabb'/>
<id>urn:sha1:7f562433c03534933d118b3b4abd6ab85bb4cabb</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>2021-04-23T01:19:55Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2021-04-23T01:19:55Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=020ba2c3fc94336545f6b8d7c13c9a615000482a'/>
<id>urn:sha1:020ba2c3fc94336545f6b8d7c13c9a615000482a</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>2021-01-21T06:07:06Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2021-01-21T06:07:06Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=aac6a5245f48194828283fe5ed81a212ede6bc3c'/>
<id>urn:sha1:aac6a5245f48194828283fe5ed81a212ede6bc3c</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>
