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

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"

Screen layouts rarely change for desktop systems, making this feature
unnecessary there. So for the multi-screen case, ler's only make the
applet active if we're a laptop, where screens tend to be more transient
and there's a higher likelihood of it being useful. Laptops that are
docked 100% of the time are a rarer use case, and not easily detectable,
so for those, users can manually disable this applet if they find that
it annoys them.

KScreen ships this little applet that's all set up to appear in the
System Tray, and it even includes logic to only appear in the active
area when you have more than one screen connected, and otherwise appear
only in the inactive area. But, the applet is disabled by default, so
none of these things ever happen.

This seems a bit odd; let's change that so that the applet appears in
the inactive area when there's only one screen, and become active with
more than one.

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"

Right now we have a "frames within frames" effect stemming from the
output panel being a framed view within the main view. This is
unnecessary; we can make it touch the view edged on all sides but the
bottom, and then just add a separator to keep it away from the bottom.

load() was called twice and cause use-after-free.

BUG: 463485