Author: l10n daemon script
Revision Date: 2018-08-17 03:52:47 UTC

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"

Author: Burkhard Lück
Revision Date: 2013-09-21 13:44:07 UTC

fix wrong catalogname
(cherry picked from commit 50321711fff65cf5d7ecafab162d2eb2ac75af6b)
backport from master