shift-shell/quicksettings/caffeine
l10n daemon script cc7fac30e8 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"
2023-03-11 02:59:39 +00:00
..
contents/ui Port dataengine usage to plasma5support 2023-03-08 14:26:36 +01:00
Messages.sh Ensure all packages have translations enabled 2022-12-19 12:39:51 -05:00
metadata.json SVN_SILENT made messages (.desktop file) - always resolve ours 2023-03-11 02:59:39 +00:00