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"

Aleix Pol Gonzalez authored Apr 18, 2021 and Aleix Pol Gonzalez committed Apr 22, 2021

It mimicks the behaviour of X11.

BUG: 410156

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"

(cherry picked from commit 784a15a9f0e847013969bc026a6efbdf17d45d38)

Aleix Pol Gonzalez authored Mar 03, 2021 and Aleix Pol Gonzalez committed Apr 07, 2021

Copies over David's implementation in Klipper and integrates it in the
plugin. To do so it splits the ClipboardListener class into 2
subclasses: one that uses QClipboard and the other that uses the
DataControl classes.

BUG: 359747

Aleix Pol Gonzalez authored Mar 03, 2021 and Aleix Pol Gonzalez committed Apr 07, 2021

This way we can use std::make_unique

The percentage sign in strings like ‘%1% charging’ couldn’t
be properly translated in the resulting POT file. For example,
translating it to ‘%1 % charging’ (some languages use a space
before the percentage sign) resulted in an invalid Java printf
string (but a valid QML string), which was reject by msgfmt.

(cherry picked from commit 6811816ac005175c67a2d0176616ded1ca83f2ea)

It is used in a header so consumers need to link it too

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"

Fixed the link pointing to the GitLab repository in the CONTRIBUTING.md file to the moved repository

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"

Bharadwaj Raju authored Feb 01, 2021 and Nicolas Fella committed Mar 20, 2021

Ensures the reply window is raised using Qt::WindowActive state. This
properly raises the window reliably (including from plasmoid, which
didn't work at all before) and focuses the reply textbox.

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 means that they are not deleted automatically on timeout and thus can be interacted with from Plasma's history.

The KNotification is parented to the Notification so it gets deleted when the notification is dismissed from the phone or the Plasmoid.

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"

On Plasma qqc2-desktop-style is used automatically, but not on other
DEs. Set it as a default and allow overriding it via environment
variables.

Also add it as a runtime dep so distros actually ship it.

The notification spec does not specify that the server must support <br> and thus it can show up literally in the notification. Since we already have a \n we can simply remove it

It can make use of Plasma's native quick reply. If that is not available then it get's turned into a regular action that we hook up with

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"

Otherwise the style may be incorrect

BUG: 434197

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"