SVN_SILENT made messages (.desktop file) - always resolve ours

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"
1 job for v20.11.80
latest
Status Name Job ID Coverage
  Build
canceled build_clazy_clang_tidy #78042