l10n daemon script a600ff9aa0 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"		2018-10-15 05:39:14 +02:00
..
contents	Templates: consistent naming, fix translation catalog names & more	2018-05-21 14:08:04 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-15 05:39:14 +02:00