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"

Reviewers: dfaure

Reviewed By: dfaure

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

* QT_USE_FAST_OPERATOR_PLUS is subset of set QT_USE_QSTRINGBUILDER
* QT_USE_FAST_CONCATENATION got dropped pre-Qt5

Summary: Introduces an optional dependency on libssh

Test Plan: Connect to VNC servers both via SSH tunnel and via regular connection

Reviewers: dfaure, uwolfer

Reviewed By: dfaure, uwolfer

Subscribers: dfaure, acelankao, uwolfer, #kde_applications

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

And add override markers as needed

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:
Huge title "KDE Remote Desktop Client" is senseless.
"Enter or select the address..." tip practically duplicates
the placeholder text in the address line edit.

Reviewers: #kde_applications, aacid

Reviewed By: #kde_applications, aacid

Subscribers: aacid

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

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"