Author: l10n daemon script
Revision Date: 2020-01-09 04:43:22 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: Jose Manuel Santamaria Lema
Revision Date: 2013-10-30 13:26:04 UTC

Delay the initialization of the init scripts.

This fixes a bug (the plugins weren't listed in the Scripts menu) and also
improves performance.

REVIEW: 113501
BUG: 326798