shift-shell/quicksettings/battery
l10n daemon script 1ab9d8827e 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-04-24 02:56:05 +00:00
..
contents/ui quicksettings: Extract out from mobileshell into separate plugin 2023-03-16 19:44:36 -07: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-04-24 02:56:05 +00:00