shift-shell/quicksettings/battery
l10n daemon script bba776a5fb 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"
2024-01-05 02:08:21 +00:00
..
contents/ui Port mobileshell plugins to ecm_add_qml_module 2023-11-02 11:08:17 +00: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 2024-01-05 02:08:21 +00:00