diff --git a/config.rc.in b/config.rc.in index 091fbc9..f23be5f 100644 --- a/config.rc.in +++ b/config.rc.in @@ -29,3 +29,8 @@ log_duty = true # minumum number of samples of button down to count as a press button_debounce = 1 + +[system] +# the presence of files with these names on removable media means that an +# upgrade is available +sysupgrade = [ 'sysupgrade', 'sysupgrade.sh' ] diff --git a/ui/locale/README.txt b/ui/locale/README.txt index c49ce68..f151ed8 100644 --- a/ui/locale/README.txt +++ b/ui/locale/README.txt @@ -23,6 +23,9 @@ any such tweaks to an autotranslated PO, you must then separately remake the corresponding MO, e.g.: pybabel compile -f -D canute -d . -l en_GB.UTF-8@ueb1 -i en_GB.UTF-8@ueb1/LC_MESSAGES/canute.po + pybabel compile -f -D canute -d . -l en_GB.UTF-8@ueb2 -i en_GB.UTF-8@ueb2/LC_MESSAGES/canute.po + pybabel compile -f -D canute -d . -l de_DE.UTF-8@ueb1 -i de_DE.UTF-8@ueb1/LC_MESSAGES/canute.po + pybabel compile -f -D canute -d . -l de_DE.UTF-8@ueb2 -i de_DE.UTF-8@ueb2/LC_MESSAGES/canute.po To see tweaks applied in the past, check the git diff. ___ diff --git a/ui/locale/canute.pot b/ui/locale/canute.pot index e725ed8..7bc969b 100644 --- a/ui/locale/canute.pot +++ b/ui/locale/canute.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-05-20 18:54+0100\n" +"POT-Creation-Date: 2024-05-24 17:37+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -258,43 +258,56 @@ msgid "" "files in the library." msgstr "" -#: ui/system_menu/view.py:15 -msgid "run in standalone mode" +#: ui/system_menu/system.py:6 +msgid "release:" msgstr "" -#: ui/system_menu/view.py:19 -msgid "emulated" +#: ui/system_menu/system.py:7 +msgid "serial:" msgstr "" -#: ui/system_menu/view.py:34 -msgid "shutdown" +#. TRANSLATORS: This message is first line of a two line +#. message shown in place of the release and serial number +#. when the Canute 360 is connected to the console +#: ui/system_menu/system.py:13 +msgid "Unplug from Console for release" msgstr "" -#: ui/system_menu/view.py:35 -msgid "select language and code" +#. TRANSLATORS: This is the second line of the two line +#. message shown when connected to the console +#: ui/system_menu/system.py:16 +msgid "and serial numbers" msgstr "" -#: ui/system_menu/view.py:36 -msgid "choose BRF encoding" +#: ui/system_menu/system.py:29 +msgid "emulated" msgstr "" -#: ui/system_menu/view.py:37 -msgid "backup log to USB stick" +#: ui/system_menu/view.py:17 +msgid "start console mode" msgstr "" -#: ui/system_menu/view.py:38 -msgid "install upgrade from " +#: ui/system_menu/view.py:18 +msgid "shutdown" msgstr "" -#: ui/system_menu/view.py:40 -msgid "release:" +#: ui/system_menu/view.py:19 +msgid "choose BRF encoding" msgstr "" -#: ui/system_menu/view.py:41 -msgid "serial:" +#: ui/system_menu/view.py:20 +msgid "select language and code" +msgstr "" + +#: ui/system_menu/view.py:21 +msgid "backup log to USB stick" +msgstr "" + +#: ui/system_menu/view.py:22 +msgid "install upgrade from " msgstr "" -#: ui/system_menu/view.py:49 +#: ui/system_menu/view.py:32 msgid "system menu" msgstr "" diff --git a/ui/locale/de_DE.UTF-8@ueb1/LC_MESSAGES/canute.mo b/ui/locale/de_DE.UTF-8@ueb1/LC_MESSAGES/canute.mo index 5e1e1e7..7986c48 100644 Binary files a/ui/locale/de_DE.UTF-8@ueb1/LC_MESSAGES/canute.mo and b/ui/locale/de_DE.UTF-8@ueb1/LC_MESSAGES/canute.mo differ diff --git a/ui/locale/de_DE.UTF-8@ueb1/LC_MESSAGES/canute.po b/ui/locale/de_DE.UTF-8@ueb1/LC_MESSAGES/canute.po index 8ac8a8f..ddebb5d 100644 --- a/ui/locale/de_DE.UTF-8@ueb1/LC_MESSAGES/canute.po +++ b/ui/locale/de_DE.UTF-8@ueb1/LC_MESSAGES/canute.po @@ -6,8 +6,8 @@ msgstr "" "Last-Translator: Ulf Beckmann \n" "Language-Team: German (Germany) (https://www.transifex.com/bristol-braille-technology/teams/87456/de_DE/)\n" "Language: de_DE\n" -"POT-Creation-Date: 2024-05-20 18:54+0100\n" -"PO-Revision-Date: 2024-05-20 17:58+0000\n" +"POT-Creation-Date: 2024-05-24 17:37+0100\n" +"PO-Revision-Date: 2024-05-24 17:07+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -294,226 +294,55 @@ msgstr "" "⠛⠑⠜⠝⠙⠑⠗⠞⠀⠺⠊⠗⠙⠂⠀⠝⠊⠹⠞⠀⠚⠑⠙⠕⠹⠀⠙⠬⠀⠎⠏⠗⠁⠹⠑\n" "⠕⠙⠑⠗⠀⠙⠑⠗⠀⠉⠕⠙⠑⠀⠧⠕⠝⠀⠙⠁⠞⠩⠑⠝⠀⠊⠝⠀⠙⠑⠗⠃⠊⠃⠇⠊⠕⠞⠓⠑⠅⠄" -#: ui/system_menu/view.py:15 -msgid "run in standalone mode" -msgstr "⠁⠗⠃⠩⠞⠑⠀⠊⠍⠀⠾⠁⠝⠙⠁⠇⠕⠝⠑⠍⠕⠙⠑" +#: ui/system_menu/system.py:6 +msgid "release:" +msgstr "⠗⠑⠇⠑⠁⠎⠑⠒" -#: ui/system_menu/view.py:19 +#: ui/system_menu/system.py:7 +msgid "serial:" +msgstr "⠎⠑⠗⠊⠑⠝⠝⠥⠍⠍⠑⠗" + +#. TRANSLATORS: This message is first line of a two line +#. message shown in place of the release and serial number +#. when the Canute 360 is connected to the console +#: ui/system_menu/system.py:13 +msgid "Unplug from Console for release" +msgstr "⠗⠑⠇⠑⠁⠎⠑⠒⠀⠁⠗⠃⠩⠞⠑⠀⠊⠍⠀⠾⠁⠝⠙⠁⠇⠕⠝⠑⠍⠕⠙⠑" + +#. TRANSLATORS: This is the second line of the two line +#. message shown when connected to the console +#: ui/system_menu/system.py:16 +msgid "and serial numbers" +msgstr "⠎⠑⠗⠊⠑⠝⠝⠥⠍⠍⠑⠗⠀⠁⠗⠃⠩⠞⠑⠀⠊⠍⠀⠾⠁⠝⠙⠁⠇⠕⠝⠑⠍⠕⠙⠑" + +#: ui/system_menu/system.py:29 msgid "emulated" msgstr "⠑⠍⠥⠇⠬⠗⠑⠝" -#: ui/system_menu/view.py:34 +#: ui/system_menu/view.py:17 +msgid "start console mode" +msgstr "⠾⠁⠗⠞⠀⠉⠕⠝⠎⠕⠇⠑⠀⠍⠕⠙⠑" + +#: ui/system_menu/view.py:18 msgid "shutdown" msgstr "⠡⠎⠱⠁⠇⠞⠑⠝" -#: ui/system_menu/view.py:35 -msgid "select language and code" -msgstr "⠛⠑⠺⠜⠓⠇⠞⠑⠀⠎⠏⠗⠁⠹⠑⠀⠥⠝⠙⠀⠅⠕⠙⠑" - -#: ui/system_menu/view.py:36 +#: ui/system_menu/view.py:19 msgid "choose BRF encoding" msgstr "⠺⠜⠓⠇⠑⠀⠃⠗⠋⠀⠅⠕⠙⠬⠗⠥⠝⠃⠛" -#: ui/system_menu/view.py:37 +#: ui/system_menu/view.py:20 +msgid "select language and code" +msgstr "⠛⠑⠺⠜⠓⠇⠞⠑⠀⠎⠏⠗⠁⠹⠑⠀⠥⠝⠙⠀⠅⠕⠙⠑" + +#: ui/system_menu/view.py:21 msgid "backup log to USB stick" msgstr "⠏⠗⠕⠞⠕⠅⠕⠇⠇⠀⠡⠋⠀⠥⠎⠃⠤⠾⠊⠉⠅⠀⠎⠊⠹⠑⠗⠝" -#: ui/system_menu/view.py:38 +#: ui/system_menu/view.py:22 msgid "install upgrade from " msgstr "⠊⠝⠾⠁⠇⠇⠬⠗⠑⠀⠩⠝⠀⠥⠏⠙⠁⠞⠑⠀⠧⠕⠝⠀" -#: ui/system_menu/view.py:40 -msgid "release:" -msgstr "⠗⠑⠇⠑⠁⠎⠑" - -#: ui/system_menu/view.py:41 -msgid "serial:" -msgstr "⠎⠑⠗⠊⠑⠝⠝⠥⠍⠍⠑⠗" - -#: ui/system_menu/view.py:49 +#: ui/system_menu/view.py:32 msgid "system menu" msgstr "⠎⠽⠾⠑⠍⠍⠑⠝⠳" - -#: ui/manual.py:6 -msgid " canute quick help" -msgstr "⠉⠁⠝⠥⠞⠑⠀⠱⠝⠑⠇⠇⠓⠊⠇⠋⠑" - -#: ui/manual.py:8 -msgid "you can also acess these German" -msgstr "⠎⠬⠀⠅⠪⠝⠝⠑⠝⠀⠙⠬⠎⠑⠀⠓⠊⠇⠋⠑⠀⠡⠹⠀⠊⠝⠀⠙⠣⠞⠱" - -#: ui/manual.py:9 -msgid "help texts from anywhere by pressing" -msgstr "⠧⠑⠗⠺⠑⠝⠙⠑⠝⠀⠙⠥⠗⠹⠀⠙⠗⠳⠉⠅⠑⠝⠀⠙⠑⠗⠀⠓⠊⠇⠋⠑⠞⠁⠾⠑" - -#: ui/manual.py:10 -msgid "the topmost side button on the left" -msgstr "⠕⠃⠑⠝⠀⠇⠊⠝⠅⠎⠀⠡⠋⠀⠙⠑⠍⠀⠛⠑⠗⠜⠞⠄" - -#: ui/manual.py:16 -msgid " book and home menu" -msgstr "⠀⠃⠥⠹⠀⠥⠝⠙⠀⠾⠁⠗⠞⠍⠑⠝⠳" - -#: ui/manual.py:18 -msgid "Move through the book by pressing the" -msgstr "⠙⠥⠗⠹⠀⠙⠁⠎⠀⠃⠥⠹⠀⠃⠑⠺⠑⠛⠑⠝⠀⠙⠥⠗⠹⠀⠙⠗⠳⠉⠅⠑⠝⠀⠧⠕⠝" - -#: ui/manual.py:19 -msgid "arrow buttons on the front of the" -msgstr "⠙⠑⠗⠀⠏⠋⠩⠇⠞⠁⠾⠑⠝⠀⠁⠝⠀⠙⠑⠗⠀⠧⠕⠗⠙⠑⠗⠎⠩⠞⠑⠀⠙⠑⠎" - -#: ui/manual.py:20 -msgid "machine. Hold them down to move #e" -msgstr "⠛⠑⠗⠜⠞⠎⠄⠀⠙⠗⠳⠉⠅⠑⠀⠎⠬⠀⠙⠬⠎⠑⠀⠥⠍⠀⠼⠑" - -#: ui/manual.py:21 -msgid "pages at a time. The home menu shows" -msgstr "⠎⠩⠞⠑⠝⠀⠵⠥⠀⠺⠑⠹⠎⠑⠇⠝⠄⠀⠙⠁⠎⠀⠍⠑⠝⠳⠀⠵⠩⠛⠞" - -#: ui/manual.py:22 -msgid "what you can do with the side buttons" -msgstr "⠺⠁⠎⠀⠎⠬⠀⠍⠊⠞⠀⠙⠑⠝⠀⠎⠩⠞⠑⠝⠞⠁⠾⠑⠝⠀⠍⠁⠹⠑⠝⠀⠅⠪⠝⠝⠑⠝⠄" - -#: ui/manual.py:23 -msgid "from the home menu or the book. View" -msgstr "⠧⠕⠍⠀⠾⠁⠗⠞⠍⠑⠝⠳⠀⠕⠙⠑⠗⠀⠧⠕⠍⠀⠃⠥⠹⠄⠀⠵⠩⠛⠞" - -#: ui/manual.py:24 -msgid "this by pressing the middle button on" -msgstr "⠑⠎⠀⠙⠥⠗⠹⠀⠙⠗⠳⠉⠅⠑⠝⠀⠙⠑⠗⠀⠍⠊⠞⠞⠇⠑⠗⠑⠀⠞⠁⠾⠑" - -#: ui/manual.py:26 -msgid "the front. Pressing this button again" -msgstr "⠧⠕⠗⠝⠀⠁⠍⠀⠛⠑⠗⠜⠞⠄⠀⠙⠥⠗⠹⠀⠝⠕⠹⠍⠁⠇⠊⠛⠑⠎⠀⠙⠗⠳⠉⠅⠑⠝" - -#: ui/manual.py:27 -msgid "will always return you to your book." -msgstr "⠛⠑⠇⠁⠝⠛⠑⠝⠀⠎⠬⠀⠊⠍⠍⠑⠗⠀⠵⠥⠀⠊⠓⠗⠑⠍⠀⠃⠥⠹⠄" - -#: ui/manual.py:30 -msgid " bookmarks" -msgstr "⠀⠇⠑⠎⠑⠵⠩⠹⠑⠝" - -#: ui/manual.py:32 -msgid "Add a bookmark by pressing button #e" -msgstr "⠇⠑⠎⠑⠵⠩⠹⠑⠝⠀⠓⠊⠝⠵⠥⠋⠳⠛⠑⠝⠀⠍⠊⠞⠀⠞⠁⠾⠑⠀⠼⠑⠀" - -#: ui/manual.py:33 -msgid "while in a book. Bookmarks are listed" -msgstr "⠊⠝⠝⠑⠗⠓⠁⠇⠃⠀⠙⠑⠎⠀⠃⠥⠹⠎⠄⠀⠑⠎⠀⠅⠕⠍⠍⠞⠀⠩⠝⠑⠀⠇⠊⠾⠑" - -#: ui/manual.py:36 -msgid "starts with the Canute page number based" -msgstr "⠃⠑⠛⠊⠝⠝⠞⠀⠍⠊⠞⠀⠙⠑⠗⠀⠎⠩⠞⠑⠝⠝⠥⠍⠍⠑⠗⠀⠃⠁⠎⠬⠗⠑⠝⠙" - -#: ui/manual.py:37 -msgid "on its #i line page. Go to the page by" -msgstr "⠡⠋⠀⠙⠑⠗⠀⠼⠊⠄⠀⠵⠩⠇⠑⠄⠀⠛⠑⠓⠑⠀⠡⠋⠀⠎⠩⠞⠑⠀⠙⠥⠗⠹" - -#: ui/manual.py:38 -msgid "selecting a bookmark by pressing one of" -msgstr "⠺⠁⠓⠇⠀⠩⠝⠑⠎⠀⠇⠑⠎⠑⠵⠩⠹⠑⠝⠎⠀⠙⠥⠗⠹⠀⠙⠗⠳⠉⠅⠑⠝" - -#: ui/manual.py:39 -msgid "the side buttons. Holding the button" -msgstr "⠩⠝⠑⠗⠀⠎⠩⠞⠑⠝⠞⠁⠾⠑⠄⠀⠓⠁⠇⠞⠑⠝⠀⠙⠑⠗⠀⠞⠁⠾⠑" - -#: ui/manual.py:40 -msgid "down will delete the bookmark." -msgstr "⠺⠊⠗⠙⠀⠙⠁⠎⠀⠇⠑⠎⠑⠵⠩⠹⠑⠝⠀⠇⠪⠱⠑⠝⠄" - -#: ui/manual.py:46 -msgid " go to page menu" -msgstr "⠀⠵⠥⠍⠀⠎⠩⠞⠑⠝⠍⠑⠝⠳⠀⠛⠑⠓⠑⠝" - -#: ui/manual.py:48 -msgid "Go to a page number by keying it in with" -msgstr "⠛⠑⠓⠑⠀⠵⠥⠗⠀⠎⠩⠞⠑⠀⠙⠥⠗⠹⠀⠙⠗⠳⠉⠅⠑⠝⠀⠙⠑⠗" - -#: ui/manual.py:49 -msgid "the side number buttons and pressing" -msgstr "⠎⠩⠞⠑⠝⠞⠁⠾⠑⠝⠀⠥⠝⠙⠀⠙⠗⠳⠉⠅⠑⠝⠀⠧⠕⠝⠀⠧⠕⠗⠺⠜⠗⠞⠎" - -#: ui/manual.py:50 -msgid "forward. Pages are numbered based on the" -msgstr "⠎⠩⠞⠑⠝⠀⠎⠊⠝⠙⠀⠝⠥⠍⠑⠗⠬⠗⠞⠀⠙⠥⠗⠹" - -#: ui/manual.py:51 -msgid "#i line page height of the Canute. You" -msgstr "⠼⠊⠀⠵⠩⠇⠑⠝⠀⠚⠑⠀⠎⠩⠞⠑⠀⠙⠑⠎⠀⠉⠁⠝⠥⠞⠑⠄⠀⠎⠬" - -#: ui/manual.py:52 -msgid "can delete entered numbers by pressing" -msgstr "⠅⠪⠝⠝⠑⠝⠀⠙⠬⠀⠩⠝⠛⠑⠛⠑⠃⠑⠝⠑⠀⠁⠝⠵⠁⠓⠇⠀⠙⠥⠗⠹" - -#: ui/manual.py:53 -msgid "or holding the back button. As always" -msgstr "⠙⠗⠳⠉⠅⠑⠝⠀⠕⠙⠑⠗⠀⠓⠁⠇⠞⠑⠝⠀⠙⠑⠗⠀⠵⠥⠗⠳⠉⠅⠞⠁⠾⠑⠄" - -#: ui/manual.py:54 -msgid "you can go back to your current page by" -msgstr "⠍⠊⠞⠀⠙⠑⠗⠀⠍⠑⠝⠳⠞⠁⠾⠑⠀⠅⠪⠝⠝⠑⠝⠀⠎⠬⠀⠵⠥⠗" - -#: ui/manual.py:56 -msgid "pressing the menu button." -msgstr "⠁⠅⠞⠊⠧⠑⠝⠀⠎⠬⠞⠑⠀⠵⠥⠗⠳⠉⠅⠀⠅⠑⠓⠗⠑⠝⠄" - -#: ui/manual.py:59 -msgid " library menu" -msgstr "⠀⠃⠊⠃⠇⠊⠕⠞⠓⠑⠅⠀⠍⠑⠝⠳" - -#: ui/manual.py:61 -msgid "Choose the book you wish to read by" -msgstr "⠺⠜⠓⠇⠑⠀⠙⠁⠎⠀⠛⠑⠺⠳⠝⠱⠞⠑⠀⠃⠥⠹⠀⠙⠥⠗⠹" - -#: ui/manual.py:62 -msgid "pressing the button to the left of the" -msgstr "⠙⠗⠳⠉⠅⠑⠝⠀⠙⠑⠗⠀⠞⠁⠾⠑⠀⠝⠑⠃⠑⠝⠀⠙⠑⠍⠀⠞⠊⠞⠑⠇⠄" - -#: ui/manual.py:63 -msgid "title. Use the arrow buttons to page" -msgstr "⠝⠥⠞⠵⠑⠀⠙⠬⠀⠏⠋⠩⠇⠞⠁⠾⠑⠝⠀⠵⠥⠍⠀⠃⠇⠜⠞⠞⠑⠗⠝" - -#: ui/manual.py:64 -msgid "through the library. You can change the" -msgstr "⠙⠥⠗⠹⠀⠙⠬⠀⠃⠊⠃⠇⠊⠕⠞⠓⠑⠅⠄⠀⠎⠬⠀⠅⠪⠝⠝⠑⠝⠀⠙⠬" - -#: ui/manual.py:66 -msgid "ordering of the books in the system" -msgstr "⠗⠩⠓⠑⠝⠋⠕⠇⠛⠑⠀⠙⠑⠗⠀⠃⠳⠹⠑⠗⠀⠊⠍⠀⠎⠽⠾⠑⠍⠄" - -#: ui/manual.py:67 -msgid "menu." -msgstr "⠍⠑⠝⠳⠄" - -#: ui/manual.py:70 -msgid " system menu" -msgstr "⠀⠎⠽⠾⠑⠍⠀⠍⠑⠝⠳" - -#: ui/manual.py:72 -msgid "Configure your preference on the sorting" -msgstr "⠅⠕⠝⠋⠊⠛⠥⠗⠬⠗⠑⠝⠀⠎⠬⠀⠙⠬⠀⠗⠩⠓⠑⠝⠋⠕⠇⠛⠑" - -#: ui/manual.py:73 -msgid "order of books in the library and" -msgstr "⠙⠑⠗⠀⠃⠳⠹⠑⠗⠀⠊⠝⠀⠙⠑⠗⠀⠃⠊⠃⠇⠊⠕⠞⠓⠑⠅⠀⠥⠝⠙" - -#: ui/manual.py:74 -msgid "bookmarks through the menu options. To" -msgstr "⠇⠑⠎⠑⠵⠩⠹⠑⠝⠀⠊⠍⠀⠍⠑⠝⠳⠀⠕⠏⠞⠊⠕⠝⠑⠝⠄" - -#: ui/manual.py:76 -msgid "shutdown the Canute safely, select the" -msgstr "⠵⠥⠍⠀⠎⠊⠹⠑⠗⠑⠝⠀⠁⠃⠱⠁⠇⠞⠑⠝⠀⠺⠜⠓⠇⠑⠝⠀⠎⠬" - -#: ui/manual.py:77 -msgid "shutdown option and wait for #cj" -msgstr "⠡⠎⠱⠁⠇⠞⠑⠝⠀⠥⠝⠙⠀⠺⠁⠗⠞⠑⠝⠀⠋⠳⠗⠀⠼⠉⠚" - -#: ui/manual.py:78 -msgid "seconds before unplugging it." -msgstr "⠎⠑⠅⠥⠝⠙⠑⠝⠀⠃⠊⠎⠀⠵⠥⠗⠀⠞⠗⠑⠝⠝⠥⠝⠛" - -#: ui/manual.py:96 -msgid "canute manual" -msgstr "⠉⠁⠝⠥⠞⠑⠀⠓⠁⠝⠙⠃⠥⠹" diff --git a/ui/locale/de_DE.UTF-8@ueb2/LC_MESSAGES/canute.mo b/ui/locale/de_DE.UTF-8@ueb2/LC_MESSAGES/canute.mo index f6da3c3..b6fc1b5 100644 Binary files a/ui/locale/de_DE.UTF-8@ueb2/LC_MESSAGES/canute.mo and b/ui/locale/de_DE.UTF-8@ueb2/LC_MESSAGES/canute.mo differ diff --git a/ui/locale/de_DE.UTF-8@ueb2/LC_MESSAGES/canute.po b/ui/locale/de_DE.UTF-8@ueb2/LC_MESSAGES/canute.po index 86d378d..2ba11d3 100644 --- a/ui/locale/de_DE.UTF-8@ueb2/LC_MESSAGES/canute.po +++ b/ui/locale/de_DE.UTF-8@ueb2/LC_MESSAGES/canute.po @@ -6,8 +6,8 @@ msgstr "" "Last-Translator: Ulf Beckmann \n" "Language-Team: German (Germany) (https://www.transifex.com/bristol-braille-technology/teams/87456/de_DE/)\n" "Language: de_DE\n" -"POT-Creation-Date: 2024-05-20 18:54+0100\n" -"PO-Revision-Date: 2024-05-20 17:58+0000\n" +"POT-Creation-Date: 2024-05-24 17:37+0100\n" +"PO-Revision-Date: 2024-05-24 17:07+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -272,110 +272,55 @@ msgstr "" "⠗⠀⠃⠗⠁⠊⠟⠑⠠⠉⠕⠙⠑⠀⠯⠐⠻⠞⠀⠺⠙⠂⠀⠝⠀⠚⠹⠀⠬⠀⠎⠏⠑⠀⠕⠀⠗\n" "⠠⠉⠕⠙⠑⠀⠧⠀⠙⠁⠞⠩⠉⠀⠔⠀⠗⠀⠃⠊⠃⠇⠊⠕⠞⠓⠑⠅⠄" -#: ui/system_menu/view.py:15 -msgid "run in standalone mode" -msgstr "⠴⠃⠑⠀⠤⠀⠂⠾⠒⠕⠝⠷⠕⠙⠑" +#: ui/system_menu/system.py:6 +msgid "release:" +msgstr "⠗⠽⠑⠁⠎⠑" -#: ui/system_menu/view.py:19 +#: ui/system_menu/system.py:7 +msgid "serial:" +msgstr "⠎⠻⠊⠉⠝⠥⠭⠻" + +#. TRANSLATORS: This message is first line of a two line +#. message shown in place of the release and serial number +#. when the Canute 360 is connected to the console +#: ui/system_menu/system.py:13 +msgid "Unplug from Console for release" +msgstr "⠗⠽⠑⠁⠎⠑⠀⠴⠃⠑⠀⠤⠀⠂⠾⠒⠕⠝⠷⠕⠙⠑" + +#. TRANSLATORS: This is the second line of the two line +#. message shown when connected to the console +#: ui/system_menu/system.py:16 +msgid "and serial numbers" +msgstr "⠎⠻⠊⠉⠝⠥⠭⠻⠀⠴⠃⠑⠀⠤⠀⠂⠾⠒⠕⠝⠷⠕⠙⠑" + +#: ui/system_menu/system.py:29 msgid "emulated" msgstr "⠷⠥⠇⠬⠗⠉" -#: ui/system_menu/view.py:34 +#: ui/system_menu/view.py:17 +msgid "start console mode" +msgstr "⠾⠴⠞⠀⠠⠉⠕⠝⠎⠕⠇⠑⠀⠍⠕⠙⠑" + +#: ui/system_menu/view.py:18 msgid "shutdown" msgstr "⠌⠱⠒⠞⠉" -#: ui/system_menu/view.py:35 -msgid "select language and code" -msgstr "⠯⠺⠜⠓⠇⠦⠀⠎⠏⠑⠀⠥⠀⠅⠕⠙⠑" - -#: ui/system_menu/view.py:36 +#: ui/system_menu/view.py:19 msgid "choose BRF encoding" msgstr "⠺⠜⠓⠇⠑⠀⠃⠗⠋⠀⠅⠕⠙⠬⠗⠲⠃⠛" -#: ui/system_menu/view.py:37 +#: ui/system_menu/view.py:20 +msgid "select language and code" +msgstr "⠯⠺⠜⠓⠇⠦⠀⠎⠏⠑⠀⠥⠀⠅⠕⠙⠑" + +#: ui/system_menu/view.py:21 msgid "backup log to USB stick" msgstr "⠟⠞⠕⠅⠕⠟⠀⠡⠀⠥⠎⠃⠤⠾⠊⠨⠀⠎⠼⠻⠝" -#: ui/system_menu/view.py:38 +#: ui/system_menu/view.py:22 msgid "install upgrade from " msgstr "⠔⠾⠁⠟⠬⠗⠑⠀⠫⠀⠥⠏⠙⠁⠦⠀⠧⠀" -#: ui/system_menu/view.py:40 -msgid "release:" -msgstr "⠗⠽⠑⠁⠎⠑" - -#: ui/system_menu/view.py:41 -msgid "serial:" -msgstr "⠎⠻⠊⠉⠝⠥⠭⠻" - -#: ui/system_menu/view.py:49 +#: ui/system_menu/view.py:32 msgid "system menu" msgstr "⠎⠠⠽⠾⠷⠍⠉⠳" - -#: ui/manual.py:6 -msgid " canute quick help" -msgstr "⠀⠠⠉⠖⠥⠦⠀⠱⠝⠑⠟⠓⠊⠇⠋⠑" - -#: ui/manual.py:8 -msgid "you can also acess these German" -msgstr "⠎⠀⠂⠅⠉⠀⠬⠑⠀⠓⠊⠇⠋⠑⠀⠌⠀⠔⠀⠙⠱⠀⠧⠀⠂⠳⠁⠟" - -#: ui/manual.py:9 -msgid "help texts from anywhere by pressing" -msgstr "⠤⠺⠉⠙⠉⠀⠹⠀⠐⠙⠨⠉⠀⠗⠀⠓⠊⠇⠋⠑⠞⠁⠾⠑" - -#: ui/manual.py:10 -msgid "the topmost side button on the left" -msgstr "⠕⠃⠉⠀⠇⠔⠅⠎⠀⠡⠀⠷⠀⠯⠗⠜⠞⠄" - -#: ui/manual.py:16 -msgid " book and home menu" -msgstr "⠀⠃⠥⠹⠀⠥⠀⠾⠴⠞⠍⠉⠳" - -#: ui/manual.py:18 -msgid "Move through the book by pressing the" -msgstr "⠹⠀⠙⠀⠃⠥⠹⠀⠆⠺⠛⠉⠀⠹⠀⠐⠙⠨⠉⠀⠧" - -#: ui/manual.py:19 -msgid "arrow buttons on the front of the" -msgstr "⠗⠀⠏⠋⠩⠇⠞⠁⠾⠉⠀⠖⠀⠗⠀⠂⠢⠙⠻⠎⠩⠦⠀⠄" - -#: ui/manual.py:20 -msgid "machine. Hold them down to move #e" -msgstr "⠯⠗⠜⠞⠎⠄⠀⠐⠙⠨⠑⠀⠎⠀⠬⠑⠀⠥⠍⠀⠼⠑" - -#: ui/manual.py:21 -msgid "pages at a time. The home menu shows" -msgstr "⠎⠩⠞⠉⠀⠵⠀⠺⠑⠹⠎⠽⠝⠄⠀⠙⠀⠍⠉⠳⠀⠵⠩⠛⠞" - -#: ui/manual.py:22 -msgid "what you can do with the side buttons" -msgstr "⠺⠀⠎⠀⠞⠀⠑⠀⠎⠩⠞⠉⠞⠁⠾⠉⠀⠍⠰⠉⠀⠂⠅⠉⠄" - -#: ui/manual.py:23 -msgid "from the home menu or the book. View" -msgstr "⠧⠍⠀⠾⠴⠞⠍⠉⠳⠀⠕⠀⠧⠍⠀⠃⠥⠹⠄⠀⠵⠩⠛⠞" - -#: ui/manual.py:24 -msgid "this by pressing the middle button on" -msgstr "⠿⠀⠹⠀⠐⠙⠨⠉⠀⠗⠀⠍⠊⠞⠞⠇⠻⠑⠀⠞⠁⠾⠑" - -#: ui/manual.py:26 -msgid "the front. Pressing this button again" -msgstr "⠂⠢⠝⠀⠁⠍⠀⠯⠗⠜⠞⠄⠀⠹⠀⠝⠹⠍⠘⠿⠀⠐⠙⠨⠉" - -#: ui/manual.py:27 -msgid "will always return you to your book." -msgstr "⠯⠇⠛⠉⠀⠎⠀⠭⠀⠵⠀⠊⠷⠀⠃⠥⠹⠄" - -#: ui/manual.py:30 -msgid " bookmarks" -msgstr "⠇⠿⠑⠵⠩⠹⠉" - -#: ui/manual.py:32 -msgid "Add a bookmark by pressing button #e" -msgstr "⠇⠿⠑⠵⠩⠹⠉⠀⠓⠔⠂⠵⠋⠳⠛⠉⠀⠞⠀⠞⠁⠾⠑⠀⠼⠑" - -#: ui/manual.py:33 -msgid "while in a book. Bookmarks are listed" -msgstr "⠔⠝⠻⠓⠒⠃⠀⠄⠀⠃⠥⠹⠎⠄⠀⠿⠀⠅⠭⠞⠀⠫⠑⠀⠇⠊⠾⠑" diff --git a/ui/locale/en_GB.UTF-8@ueb1/LC_MESSAGES/canute.mo b/ui/locale/en_GB.UTF-8@ueb1/LC_MESSAGES/canute.mo index 5d30a58..6e6e774 100644 Binary files a/ui/locale/en_GB.UTF-8@ueb1/LC_MESSAGES/canute.mo and b/ui/locale/en_GB.UTF-8@ueb1/LC_MESSAGES/canute.mo differ diff --git a/ui/locale/en_GB.UTF-8@ueb1/LC_MESSAGES/canute.po b/ui/locale/en_GB.UTF-8@ueb1/LC_MESSAGES/canute.po index 87e6a58..843d429 100644 --- a/ui/locale/en_GB.UTF-8@ueb1/LC_MESSAGES/canute.po +++ b/ui/locale/en_GB.UTF-8@ueb1/LC_MESSAGES/canute.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-05-20 18:54+0100\n" -"PO-Revision-Date: 2024-05-20 17:58+0000\n" +"POT-Creation-Date: 2024-05-24 17:37+0100\n" +"PO-Revision-Date: 2024-05-24 17:07+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -351,43 +351,55 @@ msgstr "" "⠇⠁⠝⠛⠥⠁⠛⠑ ⠕⠗ ⠉⠕⠙⠑ ⠕⠋ ⠁⠝⠽ ⠋⠊⠇⠑⠎ ⠊⠝ ⠞⠓⠑\n" "⠇⠊⠃⠗⠁⠗⠽⠲" -#: ui/system_menu/system_menu.py:52 -#: ui/system_menu/view.py:15 -msgid "run in standalone mode" -msgstr "⠗⠥⠝⠀⠊⠝⠀⠎⠞⠁⠝⠙⠁⠇⠕⠝⠑⠀⠍⠕⠙⠑" +#: ui/system_menu/system.py:6 +msgid "release:" +msgstr "⠗⠑⠇⠑⠁⠎⠑⠒" -#: ui/system_menu/view.py:19 +#: ui/system_menu/system.py:7 +msgid "serial:" +msgstr "⠎⠑⠗⠊⠁⠇⠒" + +#. TRANSLATORS: This message is first line of a two line +#. message shown in place of the release and serial number +#. when the Canute 360 is connected to the console +#: ui/system_menu/system.py:13 +msgid "Unplug from Console for release" +msgstr "⠠⠥⠝⠏⠇⠥⠛⠀⠋⠗⠕⠍⠀⠠⠉⠕⠝⠎⠕⠇⠑⠀⠋⠕⠗⠀⠗⠑⠇⠑⠁⠎⠑" + +#. TRANSLATORS: This is the second line of the two line +#. message shown when connected to the console +#: ui/system_menu/system.py:16 +msgid "and serial numbers" +msgstr "⠁⠝⠙⠀⠎⠑⠗⠊⠁⠇⠀⠝⠥⠍⠃⠑⠗⠎" + +#: ui/system_menu/system.py:29 msgid "emulated" msgstr "⠑⠍⠥⠇⠁⠞⠑⠙" -#: ui/system_menu/view.py:34 +#: ui/system_menu/view.py:17 +msgid "start console mode" +msgstr "⠎⠞⠁⠗⠞⠀⠉⠕⠝⠎⠕⠇⠑⠀⠍⠕⠙⠑" + +#: ui/system_menu/view.py:18 msgid "shutdown" msgstr "⠎⠓⠥⠞⠙⠕⠺⠝" -#: ui/system_menu/view.py:35 -msgid "select language and code" -msgstr "⠎⠑⠇⠑⠉⠞⠀⠇⠁⠝⠛⠥⠁⠛⠑⠀⠁⠝⠙⠀⠉⠕⠙⠑" - -#: ui/system_menu/view.py:36 +#: ui/system_menu/view.py:19 msgid "choose BRF encoding" msgstr "⠉⠓⠕⠕⠎⠑⠀⠠⠠⠃⠗⠋⠀⠑⠝⠉⠕⠙⠊⠝⠛" -#: ui/system_menu/view.py:37 +#: ui/system_menu/view.py:20 +msgid "select language and code" +msgstr "⠎⠑⠇⠑⠉⠞⠀⠇⠁⠝⠛⠥⠁⠛⠑⠀⠁⠝⠙⠀⠉⠕⠙⠑" + +#: ui/system_menu/view.py:21 msgid "backup log to USB stick" msgstr "⠃⠁⠉⠅⠥⠏⠀⠇⠕⠛⠀⠞⠕⠀⠠⠠⠥⠎⠃⠀⠎⠞⠊⠉⠅" -#: ui/system_menu/view.py:38 +#: ui/system_menu/view.py:22 msgid "install upgrade from " msgstr "⠊⠝⠎⠞⠁⠇⠇⠀⠥⠏⠛⠗⠁⠙⠑⠀⠋⠗⠕⠍⠀" -#: ui/system_menu/view.py:40 -msgid "release:" -msgstr "⠗⠑⠇⠑⠁⠎⠑⠒" - -#: ui/system_menu/view.py:41 -msgid "serial:" -msgstr "⠎⠑⠗⠊⠁⠇⠒" - -#: ui/system_menu/view.py:49 +#: ui/system_menu/view.py:32 msgid "system menu" -msgstr "⠎⠽⠎⠞⠑⠍ ⠍⠑⠝⠥" +msgstr "⠎⠽⠎⠞⠑⠍⠀⠍⠑⠝⠥" diff --git a/ui/locale/en_GB.UTF-8@ueb2/LC_MESSAGES/canute.mo b/ui/locale/en_GB.UTF-8@ueb2/LC_MESSAGES/canute.mo index ce505de..1c49269 100644 Binary files a/ui/locale/en_GB.UTF-8@ueb2/LC_MESSAGES/canute.mo and b/ui/locale/en_GB.UTF-8@ueb2/LC_MESSAGES/canute.mo differ diff --git a/ui/locale/en_GB.UTF-8@ueb2/LC_MESSAGES/canute.po b/ui/locale/en_GB.UTF-8@ueb2/LC_MESSAGES/canute.po index 8c4b83c..a9a66eb 100644 --- a/ui/locale/en_GB.UTF-8@ueb2/LC_MESSAGES/canute.po +++ b/ui/locale/en_GB.UTF-8@ueb2/LC_MESSAGES/canute.po @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2024-05-20 18:54+0100\n" -"PO-Revision-Date: 2024-05-20 17:58+0000\n" +"POT-Creation-Date: 2024-05-24 17:37+0100\n" +"PO-Revision-Date: 2024-05-24 17:07+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -324,42 +324,55 @@ msgstr "" "⠡⠁⠝⠛⠑ ⠮ ⠎⠽⠌⠑⠍ ⠇⠁⠝⠛⠥⠁⠛⠑ ⠕⠗ ⠠⠃⠗⠇ ⠉⠕⠙⠑⠂ ⠝ ⠮\n" "⠇⠁⠝⠛⠥⠁⠛⠑ ⠕⠗ ⠉⠕⠙⠑ ⠷ ⠁⠝⠽ ⠋⠊⠇⠑⠎ ⠔ ⠮ ⠇⠊⠃⠗⠜⠽⠲" -#: ui/system_menu/view.py:15 -msgid "run in standalone mode" -msgstr "⠗⠥⠝⠀⠔⠀⠌⠯⠁⠇⠐⠕⠀⠍⠕⠙⠑" +#: ui/system_menu/system.py:6 +msgid "release:" +msgstr "⠗⠑⠇⠂⠎⠑⠒" -#: ui/system_menu/view.py:19 +#: ui/system_menu/system.py:7 +msgid "serial:" +msgstr "⠎⠻⠊⠁⠇⠒" + +#. TRANSLATORS: This message is first line of a two line +#. message shown in place of the release and serial number +#. when the Canute 360 is connected to the console +#: ui/system_menu/system.py:13 +msgid "Unplug from Console for release" +msgstr "⠠⠥⠝⠏⠇⠥⠛⠀⠋⠀⠠⠒⠎⠕⠇⠑⠀⠿⠀⠗⠑⠇⠂⠎⠑" + +#. TRANSLATORS: This is the second line of the two line +#. message shown when connected to the console +#: ui/system_menu/system.py:16 +msgid "and serial numbers" +msgstr "⠯⠀⠎⠻⠊⠁⠇⠀⠝⠥⠍⠃⠻⠎" + +#: ui/system_menu/system.py:29 msgid "emulated" msgstr "⠑⠍⠥⠇⠁⠞⠫" -#: ui/system_menu/view.py:34 +#: ui/system_menu/view.py:17 +msgid "start console mode" +msgstr "⠌⠜⠞⠀⠒⠎⠕⠇⠑⠀⠍⠕⠙⠑" + +#: ui/system_menu/view.py:18 msgid "shutdown" msgstr "⠩⠥⠞⠙⠪⠝" -#: ui/system_menu/view.py:35 -msgid "select language and code" -msgstr "⠎⠑⠇⠑⠉⠞⠀⠇⠁⠝⠛⠥⠁⠛⠑⠀⠯⠀⠉⠕⠙⠑" - -#: ui/system_menu/view.py:36 +#: ui/system_menu/view.py:19 msgid "choose BRF encoding" msgstr "⠡⠕⠕⠎⠑⠀⠠⠠⠃⠗⠋⠀⠢⠉⠕⠙⠬" -#: ui/system_menu/view.py:37 +#: ui/system_menu/view.py:20 +msgid "select language and code" +msgstr "⠎⠑⠇⠑⠉⠞⠀⠇⠁⠝⠛⠥⠁⠛⠑⠀⠯⠀⠉⠕⠙⠑" + +#: ui/system_menu/view.py:21 msgid "backup log to USB stick" msgstr "⠃⠁⠉⠅⠥⠏⠀⠇⠕⠛⠀⠞⠕⠀⠠⠠⠥⠎⠃⠀⠌⠊⠉⠅" -#: ui/system_menu/view.py:38 +#: ui/system_menu/view.py:22 msgid "install upgrade from " msgstr "⠔⠌⠁⠇⠇⠀⠥⠏⠛⠗⠁⠙⠑⠀⠋⠀" -#: ui/system_menu/view.py:40 -msgid "release:" -msgstr "⠗⠑⠇⠂⠎⠑⠒" - -#: ui/system_menu/view.py:41 -msgid "serial:" -msgstr "⠎⠻⠊⠁⠇⠒" - -#: ui/system_menu/view.py:49 +#: ui/system_menu/view.py:32 msgid "system menu" -msgstr "⠎⠽⠌⠑⠍ ⠍⠢⠥" +msgstr "⠎⠽⠌⠑⠍⠀⠍⠢⠥" diff --git a/ui/system_menu/buttons.py b/ui/system_menu/buttons.py index 95916b2..2f07181 100644 --- a/ui/system_menu/buttons.py +++ b/ui/system_menu/buttons.py @@ -1,28 +1,37 @@ +import os from ..state import state from . import upgrade +from .system import console + +def exit_to_console(): + if console: + os.system('sudo systemctl start brltty@canute.path') def install_upgrade(): if upgrade.available: upgrade.upgrade() + buttons = { 'single': { - '2': state.app.shutdown, - '3': state.app.go_to_language_menu, + '2': exit_to_console, + '3': state.app.shutdown, '4': state.app.go_to_encoding_menu, - '5': state.backup_log, - '6': install_upgrade, + '5': state.app.go_to_language_menu, + '6': state.backup_log, + '7': install_upgrade, 'R': state.app.help_menu.toggle, '>': state.app.next_page, '<': state.app.previous_page, 'L': state.app.close_menu, }, 'long': { - '2': state.app.shutdown, - '3': state.app.go_to_language_menu, + '2': exit_to_console, + '3': state.app.shutdown, '4': state.app.go_to_encoding_menu, - '5': state.backup_log, - '6': install_upgrade, + '5': state.app.go_to_language_menu, + '6': state.backup_log, + '7': install_upgrade, 'R': state.app.help_menu.toggle, '>': state.app.next_page, '<': state.app.previous_page, diff --git a/ui/system_menu/system.py b/ui/system_menu/system.py new file mode 100644 index 0000000..69764a4 --- /dev/null +++ b/ui/system_menu/system.py @@ -0,0 +1,31 @@ +import os +from ..config_loader import load +from ..braille import brailleify + +console = load().get('system', {}).get('console', False) +release = _('release:') + ' ' +serial = _('serial:') + ' ' + +if console: + # TRANSLATORS: This message is first line of a two line + # message shown in place of the release and serial number + # when the Canute 360 is connected to the console + release = _('Unplug from Console for release') + # TRANSLATORS: This is the second line of the two line + # message shown when connected to the console + serial = _('and serial numbers') + +# This exists on a Pi and reading it yields a useful board identifier. +# But existence will do for right now. +elif os.path.exists('/sys/firmware/devicetree/base/model'): + if os.path.exists('/etc/canute_release'): + with open('/etc/canute_release') as x: + release += brailleify(x.read().strip()) + with open('/etc/canute_serial') as x: + serial += brailleify(x.read().strip()) + +# Otherwise assume we're being emulated. +else: + emulated = _('emulated') + release += emulated + serial += emulated diff --git a/ui/system_menu/upgrade.py b/ui/system_menu/upgrade.py index 3b30f5f..a0ec542 100644 --- a/ui/system_menu/upgrade.py +++ b/ui/system_menu/upgrade.py @@ -11,10 +11,14 @@ def mounted_paths(): if source_dir.get('mountpoint', False) and os.path.ismount(source_path): yield source_path, source_dir.get('name') +def upgrade_files(): + config = load() + return config.get('system', {}).get('sysupgrade', []) + available = False source_paths = mounted_paths() for source_path, source_name in source_paths: - for upgrade in ['sysupgrade', 'sysupgrade.sh']: + for upgrade in upgrade_files(): upgrade_file = os.path.join(source_path, upgrade) if os.path.exists(upgrade_file): available = True diff --git a/ui/system_menu/view.py b/ui/system_menu/view.py index ba72c62..6a11295 100644 --- a/ui/system_menu/view.py +++ b/ui/system_menu/view.py @@ -1,24 +1,7 @@ -import os -from ..braille import format_title, brailleify, from_unicode, alphas_to_unicodes +from ..braille import format_title, from_unicode, alphas_to_unicodes from . import upgrade from .help import render_help - -# This exists on a Pi and reading it yields a useful board identifier. -# But existence will do for right now. -if os.path.exists('/sys/firmware/devicetree/base/model'): - if os.path.exists('/etc/canute_release'): - with open('/etc/canute_release') as x: - release = brailleify(x.read().strip()) - with open('/etc/canute_serial') as x: - serial = brailleify(x.read().strip()) - else: - release = _('run in standalone mode') - serial = release -else: - # Assume we're being emulated. - release = _('emulated') - serial = release - +from .system import console, release, serial async def render(width, height, state): if state.app.help_menu.visible: @@ -31,14 +14,14 @@ async def render(width, height, state): return page menu_titles = tuple(map(from_unicode, ( + _('start console mode') if console else '', _('shutdown'), - _('select language and code'), _('choose BRF encoding'), + _('select language and code'), _('backup log to USB stick'), _('install upgrade from ') + alphas_to_unicodes(upgrade.source_name) if upgrade.available else '', - '', - _('release:') + ' ' + release, - _('serial:') + ' ' + serial, + release, + serial, ))) page = state.app.system_menu.page