M  B  authored Feb 13, 2022 and Laurent Montel committed Feb 13, 2022

Note: "Event Viewer" is the name of the equivalent application in Microsoft Windows

(cherry picked from commit 6656895a)

(cherry picked from commit f7c4ccd2)

(cherry picked from commit b58f5928)

(cherry picked from commit 77cbfd6a)

BUG: 442741

(cherry picked from commit 0ea59e6d)

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 49745b9d)