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"

(cherry picked from commit 21560bc9)

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 d22e38fe)

(cherry picked from commit 94ae939c)

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 b02cf51f)

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: There's a series of things that should be done differently nowadays on Android.

Test Plan: Tested the application on my Android phone.

Reviewers: #android, vkrause

Reviewed By: #android, vkrause

Subscribers: vatra, vkrause, kde-edu

Tags: #kde_edu

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

- use https
- use canonical docs.kde.org help location
- use canonical cdn screenshot location
- improve donation URL

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 manually merge release versions from release/19.12 branch, in future this will be cherry picked along with the branch commit