Author: l10n daemon script
Revision Date: 2016-09-18 09:33:40 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: Mikhail Ivchenko
Revision Date: 2013-12-09 17:42:29 UTC

Fix wikipedia link (In What's interesting -> Settings -> Light Pollution) behavior

REVIEW: 113948
Acked by Samikshan Bairagya