l10n daemon script f4460d43a4 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-07-23 01:40:11 +00:00
..
contents	PanelConfiguration: adapt to the new api panel.moveToScreen()	2026-07-16 12:11:32 +02: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-07-23 01:40:11 +00:00