l10n daemon script e2ace4e65c 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-01-09 02:00:52 +00:00
..
contents/ui	quicksettings: Add caffeine quicksetting	2022-02-10 23:20:04 -05: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-01-09 02:00:52 +00:00