GitLab

(cherry picked from commit acd72e36)

(cherry picked from commit 0adc56c1)

(cherry picked from commit c9ce640c)

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 00cc7857)

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

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

(cherry picked from commit 3cbb375c)

(cherry picked from commit b3b45f4b)

* Update date and version numbers
* Remove final whitespaces
* Re-indent some sections
* GUI sync

(cherry picked from commit cd8cfe54)