Skip to content

Commit 689ec86

Browse files
tannewttannewt
authored
Merge pull request #4754 from dhalbert/fix-endpoint-checking
Fix endpoint checking; Clean up safe mode printing
2 parents 274b2bf + c65986f commit 689ec86

File tree

41 files changed

+269
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+269
-187
lines changed

‎locale/ID.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4581,7 +4581,7 @@ msgstr ""
45814581
#~ msgstr "Berjalan di mode aman(safe mode)! Auto-reload tidak aktif.\n"
45824582

45834583
#~ msgid "Running in safe mode! Not running saved code.\n"
4584-
#~ msgstr ""
4584+
#~ msgstr "Berjalan di mode aman(safe mode)! Tidak menjalankan kode yang disimpan.\n"
45854585
#~ "Berjalan di mode aman(safe mode)! tidak menjalankan kode yang tersimpan.\n"
45864586

45874587
#~ msgid "'async for' or 'async with' outside async function"

‎locale/circuitpython.pot

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -710,13 +710,7 @@ msgid "CircuitPython core code crashed hard. Whoops!\n"
710710
msgstr ""
711711

712712
#: supervisor/shared/safe_mode.c
713-
msgid ""
714-
"CircuitPython is in safe mode because you pressed the reset button during "
715-
"boot. Press again to exit safe mode.\n"
716-
msgstr ""
717-
718-
#: supervisor/shared/safe_mode.c
719-
msgid "CircuitPython was unable to allocate the heap.\n"
713+
msgid "CircuitPython was unable to allocate the heap."
720714
msgstr ""
721715

722716
#: shared-module/bitbangio/SPI.c
@@ -1638,10 +1632,6 @@ msgstr ""
16381632
msgid "Not playing"
16391633
msgstr ""
16401634

1641-
#: main.c
1642-
msgid "Not running saved code.\n"
1643-
msgstr ""
1644-
16451635
#: shared-bindings/_bleio/__init__.c
16461636
msgid "Not settable"
16471637
msgstr ""
@@ -1964,7 +1954,7 @@ msgid "Row entry must be digitalio.DigitalInOut"
19641954
msgstr ""
19651955

19661956
#: main.c
1967-
msgid "Running in safe mode! "
1957+
msgid "Running in safe mode! Not running saved code.\n"
19681958
msgstr ""
19691959

19701960
#: shared-module/sdcardio/SDCard.c
@@ -2089,13 +2079,13 @@ msgstr ""
20892079
#: supervisor/shared/safe_mode.c
20902080
msgid ""
20912081
"The CircuitPython heap was corrupted because the stack was too small.\n"
2092-
"Please increase the stack size if you know how, or if not:"
2082+
"Increase the stack size if you know how. If not:"
20932083
msgstr ""
20942084

20952085
#: supervisor/shared/safe_mode.c
20962086
msgid ""
20972087
"The `microcontroller` module was used to boot into safe mode. Press reset to "
2098-
"exit safe mode.\n"
2088+
"exit safe mode."
20992089
msgstr ""
21002090

21012091
#: shared-bindings/rgbmatrix/RGBMatrix.c
@@ -2106,7 +2096,7 @@ msgstr ""
21062096
msgid ""
21072097
"The microcontroller's power dipped. Make sure your power supply provides\n"
21082098
"enough power for the whole circuit and press reset (after ejecting "
2109-
"CIRCUITPY).\n"
2099+
"CIRCUITPY)."
21102100
msgstr ""
21112101

21122102
#: shared-module/audiomixer/MixerVoice.c
@@ -2404,7 +2394,12 @@ msgid "Writes not supported on Characteristic"
24042394
msgstr ""
24052395

24062396
#: supervisor/shared/safe_mode.c
2407-
msgid "You are in safe mode: something unanticipated happened.\n"
2397+
msgid "You are in safe mode because:\n"
2398+
msgstr ""
2399+
2400+
#: supervisor/shared/safe_mode.c
2401+
msgid ""
2402+
"You pressed the reset button during boot. Press again to exit safe mode."
24082403
msgstr ""
24092404

24102405
#: supervisor/shared/safe_mode.c

‎locale/de_DE.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ msgstr ""
732732
"zu verlassen.\n"
733733

734734
#: supervisor/shared/safe_mode.c
735-
msgid "CircuitPython was unable to allocate the heap.\n"
736-
msgstr "CircuitPython war es nicht möglich heap-Speicher zu allozieren.\n"
735+
msgid "CircuitPython was unable to allocate the heap."
736+
msgstr "CircuitPython war es nicht möglich heap-Speicher zu allozieren."
737737

738738
#: shared-module/bitbangio/SPI.c
739739
msgid "Clock pin init failed."

‎locale/en_GB.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -729,8 +729,8 @@ msgstr ""
729729
"boot. Press again to exit safe mode.\n"
730730

731731
#: supervisor/shared/safe_mode.c
732-
msgid "CircuitPython was unable to allocate the heap.\n"
733-
msgstr "CircuitPython was unable to allocate the heap.\n"
732+
msgid "CircuitPython was unable to allocate the heap."
733+
msgstr "CircuitPython was unable to allocate the heap."
734734

735735
#: shared-module/bitbangio/SPI.c
736736
msgid "Clock pin init failed."

‎locale/es.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -738,8 +738,8 @@ msgstr ""
738738
"durante el arranque. Presione nuevamente para salir del modo seguro.\n"
739739

740740
#: supervisor/shared/safe_mode.c
741-
msgid "CircuitPython was unable to allocate the heap.\n"
742-
msgstr "CircuitPython no puedo encontrar el montículo.\n"
741+
msgid "CircuitPython was unable to allocate the heap."
742+
msgstr "CircuitPython no puedo encontrar el montículo."
743743

744744
#: shared-module/bitbangio/SPI.c
745745
msgid "Clock pin init failed."
@@ -4820,7 +4820,7 @@ msgstr "zi debe ser una forma (n_section,2)"
48204820
#~ msgstr "Ejecutando en modo seguro! La auto-recarga esta deshabilitada.\n"
48214821

48224822
#~ msgid "Running in safe mode! Not running saved code.\n"
4823-
#~ msgstr ""
4823+
#~ msgstr "Ejecutando en modo seguro! No ejecutando el código almacenado.\n"
48244824
#~ "Ejecutando en modo seguro! No se esta ejecutando el código guardado.\n"
48254825

48264826
#~ msgid "__init__() should return None, not '%s'"

‎locale/fr.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,8 +745,8 @@ msgstr ""
745745
"mode sans échec.\n"
746746

747747
#: supervisor/shared/safe_mode.c
748-
msgid "CircuitPython was unable to allocate the heap.\n"
749-
msgstr "CircuitPython n'as pu faire l'allocation de la pile.\n"
748+
msgid "CircuitPython was unable to allocate the heap."
749+
msgstr "CircuitPython n'as pu faire l'allocation de la pile."
750750

751751
#: shared-module/bitbangio/SPI.c
752752
msgid "Clock pin init failed."

‎locale/hi.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -716,7 +716,7 @@ msgid ""
716716
msgstr ""
717717

718718
#: supervisor/shared/safe_mode.c
719-
msgid "CircuitPython was unable to allocate the heap.\n"
719+
msgid "CircuitPython was unable to allocate the heap."
720720
msgstr ""
721721

722722
#: shared-module/bitbangio/SPI.c

‎locale/ja.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -727,8 +727,8 @@ msgstr ""
727727
"度押すとセーフモードを終了します。\n"
728728

729729
#: supervisor/shared/safe_mode.c
730-
msgid "CircuitPython was unable to allocate the heap.\n"
731-
msgstr "CircuitPythonはヒープを確保できませんでした\n"
730+
msgid "CircuitPython was unable to allocate the heap."
731+
msgstr "CircuitPythonはヒープを確保できませんでした"
732732

733733
#: shared-module/bitbangio/SPI.c
734734
msgid "Clock pin init failed."
@@ -1980,8 +1980,8 @@ msgid "Row entry must be digitalio.DigitalInOut"
19801980
msgstr "Rowの各要素は digitalio.DigitalInOut でなければなりません"
19811981

19821982
#: main.c
1983-
msgid "Running in safe mode! "
1984-
msgstr "セーフモードで実行中！ "
1983+
msgid "Running in safe mode! Not running saved code.\n"
1984+
msgstr "セーフモードで実行中！ 保存されたコードは実行していません。\n"
19851985

19861986
#: shared-module/sdcardio/SDCard.c
19871987
msgid "SD card CSD format not supported"

‎locale/nl.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,8 +725,8 @@ msgstr ""
725725
"het opstarten. Druk nogmaals om veilige modus te verlaten\n"
726726

727727
#: supervisor/shared/safe_mode.c
728-
msgid "CircuitPython was unable to allocate the heap.\n"
729-
msgstr "CircuitPython kon het heap geheugen niet toewijzen.\n"
728+
msgid "CircuitPython was unable to allocate the heap."
729+
msgstr "CircuitPython kon het heap geheugen niet toewijzen."
730730

731731
#: shared-module/bitbangio/SPI.c
732732
msgid "Clock pin init failed."

‎locale/pl.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,8 +725,8 @@ msgstr ""
725725
"przycisk resetowania. Naciśnij ponownie, aby wyjść z trybu awaryjnego.\n"
726726

727727
#: supervisor/shared/safe_mode.c
728-
msgid "CircuitPython was unable to allocate the heap.\n"
729-
msgstr "CircuitPython nie mógł przydzielić sterty.\n"
728+
msgid "CircuitPython was unable to allocate the heap."
729+
msgstr "CircuitPython nie mógł przydzielić sterty."
730730

731731
#: shared-module/bitbangio/SPI.c
732732
msgid "Clock pin init failed."

0 commit comments

Comments
 (0)