l10n daemon script b70c26604e 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-08-12 03:54:49 +00:00
..
contents	desktop: Do not overwrite wallpaper-provided accent color	2026-08-11 12:55:20 +00:00
Messages.sh	Don’t extract QML text as Java strings	2024-07-10 21:30:18 +02:00
metadata.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2026-08-12 03:54:49 +00:00