GitLab

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"

Summary:
At the moment we were merging two different concepts into a same KCM and it was
too confusing.
Simplify making the kcm only about Plasma by removing the kill switch and
making sure the text only affects Plasma components.

Reviewers: #plasma, vkrause, davidedmundson, ngraham

Reviewed By: #plasma, davidedmundson, ngraham

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D24733

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"

We don't want to be described as system settings but as Plasma.

And make it the default.
Kill Switch is only for when you think something off is happening or you
don't feel in control.

Reviewed by David Edmundson (see D24635)

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"

Summary:
Instead of a combo box, which is a bit harder on the wording.
Also get more texts from kuserfeedback itself, no reason to translate twice.

Test Plan: Tested manually

Reviewers: #plasma, ngraham, broulik

Reviewed By: #plasma, ngraham, broulik

Subscribers: broulik, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D24470

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"

Original intention was that we would be globally off by default.
When enabling it would have a default setting for Plasma ready

That doesn't quite work out just yet.

See bug for details

This is a precautionary temporary fix just to be extra safe

CCBUG: 412913

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"

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"

Summary:
It offers 2 main features:
- Configure the system-wide KUserFeedback kill-switch
- Provide a setting for how much information we want our Plasma to be sending

Test Plan:
Tested it together with Discover, works fine.

{F7497259}

Reviewers: #plasma, vkrause, ngraham

Reviewed By: ngraham

Subscribers: aspotashev, ngraham, bcooksley, davidedmundson, ognarb, broulik, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D24011