Author: l10n daemon script
Revision Date: 2019-05-22 03:21:13 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: Marcus Meissner
Revision Date: 2013-07-25 06:39:08 UTC

handle unset values, which would result in a NULL string
compare crash ( https://bugs.kde.org/show_bug.cgi?id=244891 )