<feed xmlns='http://www.w3.org/2005/Atom'>
<title>dolphin/src/settings/kcm, branch pixelated-scaling-option</title>
<subtitle>Patched KDE Dolphin with Pixel Scaling
</subtitle>
<id>https://fiftyfourth.xyz/git/dolphin/atom?h=pixelated-scaling-option</id>
<link rel='self' href='https://fiftyfourth.xyz/git/dolphin/atom?h=pixelated-scaling-option'/>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/'/>
<updated>2026-02-12T01:41:25Z</updated>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2026-02-12T01:41:25Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2026-02-12T01:41:25Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=d8461fc02ed4eac062840f0dbd3eee9fe3047101'/>
<id>urn:sha1:d8461fc02ed4eac062840f0dbd3eee9fe3047101</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>2026-02-06T01:41:48Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2026-02-06T01:41:48Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=0a18c04e19da3d94e3c885237c9d4d2a9fc822e1'/>
<id>urn:sha1:0a18c04e19da3d94e3c885237c9d4d2a9fc822e1</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>clang-tidy: use default for trivial constructor</title>
<updated>2026-01-22T15:14:16Z</updated>
<author>
<name>Méven Car</name>
<email>meven@kde.org</email>
</author>
<published>2026-01-22T15:04:09Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=174bc684603326de15e933b3bb24ffb739f3291e'/>
<id>urn:sha1:174bc684603326de15e933b3bb24ffb739f3291e</id>
<content type='text'>
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2025-09-25T01:35:17Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2025-09-25T01:35:17Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=0778b805cd823172f179809f535048c41bccef8d'/>
<id>urn:sha1:0778b805cd823172f179809f535048c41bccef8d</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>GIT_SILENT: Don't duplicate headers between .h/.cpp</title>
<updated>2025-09-23T05:21:04Z</updated>
<author>
<name>Laurent Montel</name>
<email>montel@kde.org</email>
</author>
<published>2025-09-21T18:37:49Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=25f8d44aa01d13e616d74b5a745fda4b51dc6deb'/>
<id>urn:sha1:25f8d44aa01d13e616d74b5a745fda4b51dc6deb</id>
<content type='text'>
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2025-09-09T02:12:34Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2025-09-09T02:12:34Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=d22a837edd132b29535810c01aacfcc1a004c10a'/>
<id>urn:sha1:d22a837edd132b29535810c01aacfcc1a004c10a</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>2024-12-14T01:47:37Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2024-12-14T01:47:37Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=517cc98e1574fdff4944f256d14ff10543b7c718'/>
<id>urn:sha1:517cc98e1574fdff4944f256d14ff10543b7c718</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>Make settings tabbar expanding</title>
<updated>2024-08-28T07:13:27Z</updated>
<author>
<name>Carl Schwan</name>
<email>carl@carlschwan.eu</email>
</author>
<published>2024-08-27T22:16:59Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=ad632de61ac9aab8bc03e3cf8cbdc7525543626f'/>
<id>urn:sha1:ad632de61ac9aab8bc03e3cf8cbdc7525543626f</id>
<content type='text'>
Allow to use https://invent.kde.org/plasma/breeze/-/merge_requests/478
but even without the breeze MR, it look better and similar to what we do
with other settings page.
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2024-08-28T01:32:24Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2024-08-28T01:32:24Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5'/>
<id>urn:sha1:6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5</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>2024-07-19T01:21:28Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2024-07-19T01:21:28Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=8560c73e677186572a134ba427443924eeda9646'/>
<id>urn:sha1:8560c73e677186572a134ba427443924eeda9646</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>
