shift-shell/quicksettings/airplanemode
l10n daemon script ccbd4d03b7 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-02-24 02:05:19 +00:00
..
contents/ui panel: Refactor panel and implement blue ocean mockups 2021-12-22 23:29:00 +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 2023-02-24 02:05:19 +00:00