l10n daemon script 7c6cabf4a1 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"		2020-12-20 06:16:31 +01:00
..
contents/ui	window close gesture	2019-12-12 23:02:49 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-12-20 06:16:31 +01:00