Commit graph

8 commits

Author SHA1 Message Date
l10n daemon script
bc4f9d9f81 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2025-08-04 01:34:10 +00:00
l10n daemon script
af8460c208 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2025-08-01 01:36:35 +00:00
l10n daemon script
8ae745aa42 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2025-07-29 01:32:54 +00:00
l10n daemon script
2e4386402b SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2025-07-27 01:33:55 +00:00
l10n daemon script
cb19e54df4 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2025-07-26 01:33:44 +00:00
l10n daemon script
eaedc79233 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2025-07-25 01:34:06 +00:00
l10n daemon script
bb333f0768 SVN_SILENT made messages (.desktop file) - always resolve ours
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"
2025-07-24 01:33:37 +00:00
Florian RICHER
c42758b335 quicksettings: Move Flashlight write to KAuth 2025-07-23 11:34:33 +02:00