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"

* Update date and version numbers
* Remove final whitespaces
* Capitalization and punctuation

(cherry picked from commit 54e29720)

(cherry picked from commit b23571bf)

GIT_SILENT

GIT_SILENT

(cherry picked from commit 49e63334)

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 03116f86)

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

(cherry picked from commit a4412f55)

GIT_SILENT

(cherry picked from commit f6702051)

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

GIT_SILENT

Also add/move license files as required by REUSE specification

GIT_SILENT

(cherry picked from commit 57a112aa)