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"

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"

With frameworks/plasma-framework!46,
checkboxes will be able to have an icon property defined internally, no
need for a separate SVG. So if and when that lands, we can use that and
discard the bespoke SwitchButton component.

This is an alternative to
!13.

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"

they are used like titles in the KCM

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"

This reverts commit 6d6ffa93

Tested; no regressions. The new remaining things that still need PC2 are
now labeled with the reason in the import line so you can easily see by
doing a `grep org.kde.plasma.components 2.0` in the repo.

We have a standardized component for this, so we can save some code and
avoid looking inconsistent. Also there's no need for two messages; one
can handle all of the text by simply adjusting the text conditional.

If there is a openvpn activated the applet crashed when clicking on the
system tray icon.

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"

It can be useful to know if the connection is currently on "eth1" or "eth2".
Given the KCM talks about "Restrict to this device", the label "Device" rather than "Interface"
is used here as well.

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"

This fixes a security regression introduced with the ExpandableListItem
port which allowed styled text for the networ name. Unfortunately Qt's
styled text allows network access, and people could put malicious text
in SSID names.

The ExpandableListItem component has no way to allow styled text for the
subtitle but not the title, which is what the previous version did.
However styled text in the subtitle is only being used for colorizing
the arrows, which doesn't even work anymore because the colored arrows
get replaced with Emojis for most people now that distros are shipping
Emoji font support to make the Emoji Picker introduces in Plasma 5.18
work.

Because of this, we can fix the issue by turning off styled text support
entirely, and removing the arrow colorization. There won't even be any
visual changes for most people.

BUG: 423020
FIXED-IN: 5.19.2

BUG: 423093
FIXED-IN: 5.20

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

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"

We take the first 'remote' line as the connection's remote. If a
different 'remote' line specifies the use of TCP, that should not
pertain to the line that was chosen.

We take the first 'remote' line as the connection's remote. If a
different 'remote' line specifies the use of TCP, that should not
pertain to the line that was chosen.

1. Increased the spacing between them so they don't blend into one
   another so much
2. Made the terminolgy in the Wi-Fi tooltip match how it's phrased
   elsewhere
3. Added some explanatory text for the airplane tooltip so it's more
   obvious what it does

BUG: 421371
FIXED-In: 5.20

The privacy flag is not used all the time and for some security types it
might not be set by newer NetworkManager versions. Instead add additional
checks for WPA and RSN flags.

BUG:422740

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"