2 commits

Author	SHA1	Message	Date
l10n daemon script	9655dcdc6d	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"	2022-07-23 01:48:30 +00:00
Alexander Lohnau	9f2133ea32	quicksettings: Convert desktop file to JSON ... Task: https://phabricator.kde.org/T14558	2022-07-21 19:30:11 +00:00