l10n daemon script 7e82501c2b 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"		2025-09-01 01:35:07 +00:00
..
contents/ui	Ensure i18n is used with double quotes and add CI check	2025-08-11 18:19:41 -04:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2025-09-01 01:35:07 +00:00