<feed xmlns='http://www.w3.org/2005/Atom'>
<title>dolphin/src/itemactions/movetonewfolderitemaction.json, 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-26T01:41:19Z</updated>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2026-02-26T01:41:19Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2026-02-26T01:41:19Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=a4fbadd0db961694cb57f75a8752e538cfe3f263'/>
<id>urn:sha1:a4fbadd0db961694cb57f75a8752e538cfe3f263</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-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>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>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>2025-08-27T01:36:52Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2025-08-27T01:36:52Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=391c55f0a86a151b9f45d7a65f92db713bcc7013'/>
<id>urn:sha1:391c55f0a86a151b9f45d7a65f92db713bcc7013</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>movetonewfolder: allow to move folders</title>
<updated>2025-07-11T07:49:34Z</updated>
<author>
<name>Méven Car</name>
<email>meven@kde.org</email>
</author>
<published>2025-07-10T09:45:44Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=50b2bce82d6604702e327f594448c7fee0f85a4a'/>
<id>urn:sha1:50b2bce82d6604702e327f594448c7fee0f85a4a</id>
<content type='text'>
 * Set a widget parent for the job.
 * Better deduce the current working directory

BUG: 506612
</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>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2024-12-02T01:33:32Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2024-12-02T01:33:32Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=fb5c292555513f047fbc3a9963ad40bd81a4b96f'/>
<id>urn:sha1:fb5c292555513f047fbc3a9963ad40bd81a4b96f</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-10-29T01:24:40Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2024-10-29T01:24:40Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=99c3c8be59bf1828ab1b9e8827a7c82baddc7501'/>
<id>urn:sha1:99c3c8be59bf1828ab1b9e8827a7c82baddc7501</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>
