Commit graph

10 commits

Author SHA1 Message Date
l10n daemon script
23afd2e767 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-29 01:35:56 +00:00
l10n daemon script
66a0c38d2c 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-28 01:36:44 +00:00
l10n daemon script
47a930b466 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-26 01:36:15 +00:00
l10n daemon script
c31895f622 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-24 01:34:18 +00:00
l10n daemon script
bf92eb9354 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-23 01:36:01 +00:00
l10n daemon script
05ba3b7aa9 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-22 01:35:33 +00:00
Sebastian Kügler
9b30adf533 fix kscreenosd quicksetting
Somehow the part that enables and disabled this quicksetting got lost
while everything needed is in place. So add it, which fixes showing and
hiding this quicksettings button.

Signed-off-by: Sebastian Kügler <sebas@kde.org>
2025-08-21 11:54:26 +02:00
l10n daemon script
3ae0436da1 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-21 01:36:27 +00:00
l10n daemon script
d2e03281dc 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-20 01:36:17 +00:00
Sebastian Kügler
b849fb98ab kscreenosd quicksetting
This quicksetting plugion allows the user to open the KScreen OSD which
makes it easy to reconfigure a multiscreen setup. It's only available
when more than one monitor is connected.

Signed-off-by: Sebastian Kügler <sebas@kde.org>
2025-08-18 10:59:49 +02:00