Author: l10n daemon script
Revision Date: 2018-10-10 04:37:21 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: Richard Lärkäng
Revision Date: 2013-09-02 19:16:53 UTC

Backport:
Fix Ogg/Vorbis support because HAVE_VORBIS is no longer set to 2
(since as far as I can see, the change to cmake)
See http://lists.kde.org/?l=kde-multimedia&m=134903246822765