GitLab

CCBUGS: 443824

(cherry picked from commit 442420d4)

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"

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 02277b51)

(cherry picked from commit 3b0e0e13)

Since we don't allow users to enter a numbered number bigger than it
either

BUGS: 444188

(cherry picked from commit dad86d71)

(cherry picked from commit dac0d7c5)

(cherry picked from commit 1bbfb83e)