Files
l10n daemon script a8cd99a139 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-12-01 01:36:23 +00:00
..
2023-12-23 16:34:33 +00:00