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"

oioi 555 authored Aug 09, 2022 and Nate Graham committed Aug 09, 2022

Fixed "user" combobox to match saved value.  
Fixed the "user" and "session" comboboxes to work with the "Reset" button.  

BUG: 454528
FIXED-IN: 5.26

Nicolas Fella authored Aug 10, 2022 and Nate Graham committed Aug 09, 2022

The information is read from the JSON metadata

oioi 555 authored Jun 05, 2022 and Nate Graham committed Aug 09, 2022

Clarify whether the Apply button is enabled or disabled based on the saved result.

BUG:437423

David Edmundson authored Aug 09, 2022 and Nate Graham committed Aug 09, 2022

CMAKE_INSTALL_FULL_SYSCONFDIR has unexpected behaviour when used with
prefixes.

>   read-only single-machine data (etc, or /etc if CMAKE_INSTALL_PREFIX
is /usr)

This is typically because prompting for root every install would be
annoying. Our use case here is not to install files but to refer to a
file in a known location once installed, so we do not want this
behaviour.

BUG: 440564
FIXED-IN: 5.26

Those are shown to the user so they should be translated.

Use the lazy variant since they are shown via the same codepath that handles the errors from the helper which have to use the lazy variant

Regular i18n does not seem to work for strings in the helper process, presumably due to it being run with elevated priviledges.

Instead use the lazy variant to only extract the strings and call i18n later when we are not in the helper any more

BUG: 441726

It's still based on KDE4

This de-duplicates the translations needed for the KCMs.

Task: https://phabricator.kde.org/T15609

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"

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"

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"

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"

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"

GIT_SILENT

GIT_SILENT

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"

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"

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"

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"

Rather than just hardcoding breeze, we check if the theme was installed using the sddmthemeinstaller.
In case that was done, we have an entry in the config file with the file path.

BUG: 454874

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"

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"

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"

BUG: 454884

The syncing process simply writes files to the SDDM user's homedir; it
doesn't do any of the fancy notifying that can happen when you change
settings in a running session. As a result, old cached stuff can be kept
around and leak into the user's settings.

Let's always clear the cache at the beginning of a sync to make sure
that we return to a fresh clean state.

BUG: 440957
FIXED-IN: 5.24.6

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"

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"

oioi 555 authored May 27, 2022 and Nate Graham committed May 27, 2022

Allow user to know that save could not be done.

BUG: 429348
FIXED-IN: 5.25

oioi 555 authored May 22, 2022 and Nate Graham committed May 24, 2022

If the message is empty, hides the error box.

BUG:413032

GIT_SILENT

GIT_SILENT

oioi 555 authored May 12, 2022 and Nate Graham committed May 12, 2022

Commands can now be typed in, in addition to selecting a file

Example: /usr/bin/systemctl poweroff  
So the command text or arguments can be edited.

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"

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"