Author: l10n daemon script
Revision Date: 2020-10-09 04:19:56 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: Albert Astals Cid
Revision Date: 2013-12-09 22:51:43 UTC

Moxico and Namibe where swiched :-S

Thanks to Hayden Taylor and the Google Code-In program