l10n daemon script 0dc7e3fe53 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"		2016-03-10 09:53:33 +00:00
..
contents
metadata.desktop