Author: l10n daemon script
Revision Date: 2019-10-20 03:14: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: Jaime Torres
Revision Date: 2013-12-29 09:36:56 UTC

Initialize two member variables

It reduces the chance of bug 168657 to happen, but does not fix it
completely.

REVIEW: 114620