l10n daemon script fb082759e1 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"		2026-01-29 01:40:16 +00:00
..
contents/ui	waydroid: Migrate to DBus backend implementations	2025-09-11 11:03:55 +02:00
Messages.sh	quicksettings: Add quicksettings for Waydroid	2025-07-12 15:08:51 +02:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2026-01-29 01:40:16 +00:00