l10n daemon script ef88e5a7f2 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-03-15 01:41:15 +00:00
..
package
plugin
CMakeLists.txt