l10n daemon script acc6431029 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-03-01 23:48:55 +00:00
..
contents/ui	mmplugin: Cleanup signals	2022-10-23 15:33:47 -04:00
Messages.sh	Ensure all packages have translations enabled	2022-12-19 12:39:51 -05:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-03-01 23:48:55 +00:00