l10n daemon script 5fda0b61e6 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"		2017-05-27 05:29:51 +02:00
..
contents/ui	[Applet] Make "no device available" heading consistent with other applets	2017-02-07 22:02:38 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-05-27 05:29:51 +02:00