GitLab

(cherry picked from commit 8eea5523)

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

(cherry picked from commit 8cfefc03)

(cherry picked from commit ed8ebb3e)

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"

- For #ffffff (white) text, hslHue() returns -1 which makes sense
  because the angle doesn't matter when saturation is 0, but that
  makes the slider display -1 degree, which is weird because you
  can't get that normally.
  Bound the angle instead.

- "color deficiencies" isn't an English phrase for "deficiencies in
  color vision or color perception", but it's not necessary to
  emphasize color-perception anyway: there's other visual challenges
  that make strong contrast important as well. So drop that, and
  emphasize that good contrast is readable and accessible in the
  widest sense of the word.