<feed xmlns='http://www.w3.org/2005/Atom'>
<title>dolphin/src/itemactions, 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>2026-03-04T01:42:19Z</updated>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2026-03-04T01:42:19Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2026-03-04T01:42:19Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=e0a5805b3ee63d83248c6ada71728eac39136909'/>
<id>urn:sha1:e0a5805b3ee63d83248c6ada71728eac39136909</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-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-13T01:41:32Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2026-02-13T01:41:32Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=8d74542b11d1c4afc7f61707be34b2794ad0ffed'/>
<id>urn:sha1:8d74542b11d1c4afc7f61707be34b2794ad0ffed</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>clang-tidy: avoid copy, use const references</title>
<updated>2026-01-22T15:27:11Z</updated>
<author>
<name>Méven Car</name>
<email>meven@kde.org</email>
</author>
<published>2026-01-22T15:15:09Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=1acd0dfe09a34817d8daf58db2c53b2262eec7b7'/>
<id>urn:sha1:1acd0dfe09a34817d8daf58db2c53b2262eec7b7</id>
<content type='text'>
</content>
</entry>
<entry>
<title>SVN_SILENT made messages (.desktop file) - always resolve ours</title>
<updated>2026-01-17T01:39:38Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2026-01-17T01:39:38Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=137097be34a041d457624939e4d9eea25ed58f14'/>
<id>urn:sha1:137097be34a041d457624939e4d9eea25ed58f14</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-12-14T01:36:01Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2025-12-14T01:36:01Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=0f90a2855896a25cb773870817d05c0ee0842f6e'/>
<id>urn:sha1:0f90a2855896a25cb773870817d05c0ee0842f6e</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-12-13T01:38:58Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2025-12-13T01:38:58Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=fb9561c457207d5c1661a9ffc7fafdd0710c7ff1'/>
<id>urn:sha1:fb9561c457207d5c1661a9ffc7fafdd0710c7ff1</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-11-15T01:35:35Z</updated>
<author>
<name>l10n daemon script</name>
<email>scripty@kde.org</email>
</author>
<published>2025-11-15T01:35:35Z</published>
<link rel='alternate' type='text/html' href='https://fiftyfourth.xyz/git/dolphin/commit/?id=3bd5568dd17b677f45dcb1e2b2b120c143536b84'/>
<id>urn:sha1:3bd5568dd17b677f45dcb1e2b2b120c143536b84</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>
