l10n daemon script 2f53c54157 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"		2023-05-21 02:19:12 +00:00
..
contents/ui
Messages.sh
metadata.json