GitLab

(cherry picked from commit 062794ab)

(cherry picked from commit 293f570a)

(cherry picked from commit 61a1678d)

(cherry picked from commit d4caa3b8)

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

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"

Snehit Sah authored Jan 09, 2022 and Carl Schwan committed Jan 09, 2022

Added content rating tag in appdata.xml

The dependency list was only for 'Linux' so it wasn't bringing any deps at
all on BSD.

(cherry picked from commit 76d430bb)

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 795278aa)

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

(cherry picked from commit 6f6e8ced)

(cherry picked from commit 6501405b)