Skip to content

Commit b0384b5

Browse files
authored
Merge branch 'adafruit:main' into settings-toml-pystack
2 parents d42aa41 + 9941779 commit b0384b5

File tree

29 files changed

+324
-78
lines changed

29 files changed

+324
-78
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ body:
66
- type: markdown
77
attributes:
88
value: >-
9-
Thanks! for testing out CircuitPython. Now that you have encountered a
9+
Thanks for testing out CircuitPython! Now that you have encountered a
1010
bug... you can file a report for it.
1111
- type: textarea
1212
id: firmware

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,11 @@ clean-nrf:
323323
clean-stm:
324324
$(MAKE) -C ports/stm BOARD=feather_stm32f405_express clean
325325

326+
327+
# This update will fail because the commits we need aren't the latest on the
328+
# branch. We can ignore that though because we fix it with the second command.
329+
# (Only works for git servers that allow sha fetches.)
326330
.PHONY: fetch-submodules
327331
fetch-submodules:
328-
# This update will fail because the commits we need aren't the latest on the
329-
# branch. We can ignore that though because we fix it with the second command.
330-
# (Only works for git servers that allow sha fetches.)
331332
git submodule update --init -N --depth 1 || true
332333
git submodule foreach 'git fetch --tags --depth 1 origin $$sha1 && git checkout -q $$sha1'

locale/ID.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,6 @@ msgid "All SPI peripherals are in use"
453453
msgstr "Semua perangkat SPI sedang digunakan"
454454

455455
#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
456-
#: ports/raspberrypi/common-hal/busio/UART.c
457456
msgid "All UART peripherals are in use"
458457
msgstr "Semua perangkat UART sedang digunakan"
459458

@@ -2137,6 +2136,10 @@ msgstr ""
21372136
msgid "UART init"
21382137
msgstr ""
21392138

2139+
#: ports/raspberrypi/common-hal/busio/UART.c
2140+
msgid "UART peripheral in use"
2141+
msgstr ""
2142+
21402143
#: ports/stm/common-hal/busio/UART.c
21412144
msgid "UART re-init"
21422145
msgstr ""

locale/circuitpython.pot

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,6 @@ msgid "All SPI peripherals are in use"
458458
msgstr ""
459459

460460
#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
461-
#: ports/raspberrypi/common-hal/busio/UART.c
462461
msgid "All UART peripherals are in use"
463462
msgstr ""
464463

@@ -2119,6 +2118,10 @@ msgstr ""
21192118
msgid "UART init"
21202119
msgstr ""
21212120

2121+
#: ports/raspberrypi/common-hal/busio/UART.c
2122+
msgid "UART peripheral in use"
2123+
msgstr ""
2124+
21222125
#: ports/stm/common-hal/busio/UART.c
21232126
msgid "UART re-init"
21242127
msgstr ""
@@ -2392,6 +2395,10 @@ msgstr ""
23922395
msgid "You pressed the BOOT button at start up"
23932396
msgstr ""
23942397

2398+
#: ports/espressif/boards/adafruit_huzzah32_breakout/mpconfigboard.h
2399+
msgid "You pressed the GPIO0 button at start up."
2400+
msgstr ""
2401+
23952402
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
23962403
msgid "You pressed the SW38 button at start up."
23972404
msgstr ""

locale/cs.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,6 @@ msgid "All SPI peripherals are in use"
454454
msgstr "Všechny SPI periferie jsou používány"
455455

456456
#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
457-
#: ports/raspberrypi/common-hal/busio/UART.c
458457
msgid "All UART peripherals are in use"
459458
msgstr "Všechny UART periferie jsou používány"
460459

@@ -2126,6 +2125,10 @@ msgstr ""
21262125
msgid "UART init"
21272126
msgstr ""
21282127

2128+
#: ports/raspberrypi/common-hal/busio/UART.c
2129+
msgid "UART peripheral in use"
2130+
msgstr ""
2131+
21292132
#: ports/stm/common-hal/busio/UART.c
21302133
msgid "UART re-init"
21312134
msgstr ""

locale/de_DE.po

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ msgstr ""
66
"Project-Id-Version: \n"
77
"Report-Msgid-Bugs-To: \n"
88
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9-
"PO-Revision-Date: 2023-01-13 18:51+0000\n"
9+
"PO-Revision-Date: 2023-02-20 03:39+0000\n"
1010
"Last-Translator: Ettore Atalan <[email protected]>\n"
1111
"Language: de_DE\n"
1212
"MIME-Version: 1.0\n"
1313
"Content-Type: text/plain; charset=UTF-8\n"
1414
"Content-Transfer-Encoding: 8bit\n"
1515
"Plural-Forms: nplurals=2; plural=n != 1;\n"
16-
"X-Generator: Weblate 4.15.1-dev\n"
16+
"X-Generator: Weblate 4.16-dev\n"
1717

1818
#: main.c
1919
msgid ""
@@ -49,6 +49,8 @@ msgid ""
4949
"\n"
5050
"You are in safe mode because:\n"
5151
msgstr ""
52+
"\n"
53+
"Sie befinden sich im abgesicherten Modus, weil:\n"
5254

5355
#: py/obj.c
5456
msgid " File \"%q\""
@@ -457,7 +459,6 @@ msgid "All SPI peripherals are in use"
457459
msgstr "Alle SPI-Peripheriegeräte sind in Benutzung"
458460

459461
#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
460-
#: ports/raspberrypi/common-hal/busio/UART.c
461462
msgid "All UART peripherals are in use"
462463
msgstr "Alle UART-Peripheriegeräte sind in Benutzung"
463464

@@ -2159,6 +2160,10 @@ msgstr "UART wird de-initialisiert"
21592160
msgid "UART init"
21602161
msgstr "UART-Initialisierung"
21612162

2163+
#: ports/raspberrypi/common-hal/busio/UART.c
2164+
msgid "UART peripheral in use"
2165+
msgstr ""
2166+
21622167
#: ports/stm/common-hal/busio/UART.c
21632168
msgid "UART re-init"
21642169
msgstr "UART wird erneut Initialisiert"

locale/el.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,6 @@ msgid "All SPI peripherals are in use"
459459
msgstr "Όλα τα SPI περιφεριακά είναι σε χρήση"
460460

461461
#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
462-
#: ports/raspberrypi/common-hal/busio/UART.c
463462
msgid "All UART peripherals are in use"
464463
msgstr "Όλα τα UART περιφεριακά ειναι σε χρήση"
465464

@@ -2134,6 +2133,10 @@ msgstr ""
21342133
msgid "UART init"
21352134
msgstr ""
21362135

2136+
#: ports/raspberrypi/common-hal/busio/UART.c
2137+
msgid "UART peripheral in use"
2138+
msgstr ""
2139+
21372140
#: ports/stm/common-hal/busio/UART.c
21382141
msgid "UART re-init"
21392142
msgstr ""

locale/en_GB.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,6 @@ msgid "All SPI peripherals are in use"
457457
msgstr "All SPI peripherals are in use"
458458

459459
#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
460-
#: ports/raspberrypi/common-hal/busio/UART.c
461460
msgid "All UART peripherals are in use"
462461
msgstr "All UART peripherals are in use"
463462

@@ -2132,6 +2131,10 @@ msgstr ""
21322131
msgid "UART init"
21332132
msgstr ""
21342133

2134+
#: ports/raspberrypi/common-hal/busio/UART.c
2135+
msgid "UART peripheral in use"
2136+
msgstr ""
2137+
21352138
#: ports/stm/common-hal/busio/UART.c
21362139
msgid "UART re-init"
21372140
msgstr ""

locale/es.po

Lines changed: 30 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
11-
"PO-Revision-Date: 2023-02-16 19:15+0000\n"
11+
"PO-Revision-Date: 2023-02-20 03:39+0000\n"
1212
"Last-Translator: Jose David M <[email protected]>\n"
1313
"Language-Team: \n"
1414
"Language: es\n"
@@ -40,18 +40,25 @@ msgid ""
4040
"Please file an issue with your program at https://github.com/adafruit/"
4141
"circuitpython/issues."
4242
msgstr ""
43+
"\n"
44+
"Por favor describa su problema en https://github.com/adafruit/circuitpython/"
45+
"issues."
4346

4447
#: supervisor/shared/safe_mode.c
4548
msgid ""
4649
"\n"
4750
"Press reset to exit safe mode.\n"
4851
msgstr ""
52+
"\n"
53+
"Presione reset para salir de safe mode.\n"
4954

5055
#: supervisor/shared/safe_mode.c
5156
msgid ""
5257
"\n"
5358
"You are in safe mode because:\n"
5459
msgstr ""
60+
"\n"
61+
"Estas in safe mode porque:\n"
5562

5663
#: py/obj.c
5764
msgid " File \"%q\""
@@ -458,7 +465,6 @@ msgid "All SPI peripherals are in use"
458465
msgstr "Todos los periféricos SPI están siendo usados"
459466

460467
#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
461-
#: ports/raspberrypi/common-hal/busio/UART.c
462468
msgid "All UART peripherals are in use"
463469
msgstr "Todos los periféricos UART están siendo usados"
464470

@@ -603,7 +609,7 @@ msgstr "El tamaño del mapa de bits y los bits por valor deben cotejar"
603609

604610
#: supervisor/shared/safe_mode.c
605611
msgid "Boot device must be first (interface #0)."
606-
msgstr ""
612+
msgstr "El dispositivo de inicialización debe estar primero (interface #0)."
607613

608614
#: ports/mimxrt10xx/common-hal/busio/UART.c
609615
msgid "Both RX and TX required for flow control"
@@ -945,7 +951,7 @@ msgstr "Error en regex"
945951

946952
#: supervisor/shared/safe_mode.c
947953
msgid "Error in safemode.py."
948-
msgstr ""
954+
msgstr "Error en safemode.py."
949955

950956
#: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
951957
msgid "Error: Failure to bind"
@@ -1021,7 +1027,7 @@ msgstr "Error al escribir el flash interno."
10211027

10221028
#: supervisor/shared/safe_mode.c
10231029
msgid "Fault detected by hardware."
1024-
msgstr ""
1030+
msgstr "Falló detectado por el hardware."
10251031

10261032
#: py/moduerrno.c
10271033
msgid "File exists"
@@ -1116,12 +1122,13 @@ msgstr "Hardware en uso, pruebe pines alternativos"
11161122

11171123
#: supervisor/shared/safe_mode.c
11181124
msgid "Heap allocation when VM not running."
1119-
msgstr ""
1125+
msgstr "Alocación del Heap cuando la VM no esta corriendo."
11201126

11211127
#: supervisor/shared/safe_mode.c
11221128
msgid ""
11231129
"Heap was corrupted because the stack was too small. Increase stack size."
11241130
msgstr ""
1131+
"El Heap está corrupto, ya que la pila era muy pequeña. Incremente el tamaño."
11251132

11261133
#: extmod/vfs_posix_file.c py/objstringio.c
11271134
msgid "I/O operation on closed file"
@@ -1248,7 +1255,7 @@ msgstr "El temporizador interno watchdog terminó."
12481255

12491256
#: supervisor/shared/safe_mode.c
12501257
msgid "Interrupt error."
1251-
msgstr ""
1258+
msgstr "Error de interrupción."
12521259

12531260
#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
12541261
msgid "Invalid %q"
@@ -2058,6 +2065,7 @@ msgstr "Lectura de temperatura expirada"
20582065
#: supervisor/shared/safe_mode.c
20592066
msgid "The `microcontroller` module was used to boot into safe mode."
20602067
msgstr ""
2068+
"El modulo `microcontrolador` fue usado para inicializar en modo seguro."
20612069

20622070
#: py/obj.c
20632071
msgid "The above exception was the direct cause of the following exception:"
@@ -2070,6 +2078,7 @@ msgstr "La longitud de rgb_pins debe ser 6, 12, 18, 24, o 30"
20702078
#: supervisor/shared/safe_mode.c
20712079
msgid "The power dipped. Make sure you are providing enough power."
20722080
msgstr ""
2081+
"La potencia calló. Asegúrese que está suministrando suficiente energía."
20732082

20742083
#: shared-module/audiomixer/MixerVoice.c
20752084
msgid "The sample's bits_per_sample does not match the mixer's"
@@ -2089,7 +2098,7 @@ msgstr "El signo del sample no iguala al del mixer"
20892098

20902099
#: supervisor/shared/safe_mode.c
20912100
msgid "Third-party firmware fatal error."
2092-
msgstr ""
2101+
msgstr "Error gráve del firmware de un tercero."
20932102

20942103
#: shared-module/imagecapture/ParallelImageCapture.c
20952104
msgid "This microcontroller does not support continuous capture."
@@ -2171,6 +2180,10 @@ msgstr "Desinicialización de UART"
21712180
msgid "UART init"
21722181
msgstr "Inicialización de UART"
21732182

2183+
#: ports/raspberrypi/common-hal/busio/UART.c
2184+
msgid "UART peripheral in use"
2185+
msgstr "Periférico UART en uso"
2186+
21742187
#: ports/stm/common-hal/busio/UART.c
21752188
msgid "UART re-init"
21762189
msgstr "Re-inicialización de UART"
@@ -2220,7 +2233,7 @@ msgstr "No se pudieron asignar buffers para la conversión con signo"
22202233

22212234
#: supervisor/shared/safe_mode.c
22222235
msgid "Unable to allocate the heap."
2223-
msgstr ""
2236+
msgstr "Imposible de asignar el heap."
22242237

22252238
#: ports/espressif/common-hal/busio/I2C.c
22262239
msgid "Unable to create lock"
@@ -2442,40 +2455,40 @@ msgstr "Escrituras no admitidas en Characteristic"
24422455
#: ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h
24432456
#: ports/atmel-samd/boards/meowmeow/mpconfigboard.h
24442457
msgid "You pressed both buttons at start up."
2445-
msgstr ""
2458+
msgstr "Usted presionó ambos botones al iniciar."
24462459

24472460
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
24482461
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
24492462
#: ports/espressif/boards/m5stack_stick_c/mpconfigboard.h
24502463
msgid "You pressed button A at start up."
2451-
msgstr ""
2464+
msgstr "Usted presionó el boton A al iniciar."
24522465

24532466
#: supervisor/shared/safe_mode.c
24542467
msgid "You pressed the BOOT button at start up"
2455-
msgstr ""
2468+
msgstr "Usted presionó el boton BOOT al iniciar"
24562469

24572470
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
24582471
msgid "You pressed the SW38 button at start up."
2459-
msgstr ""
2472+
msgstr "Usted presionó el boton SW38 al iniciar."
24602473

24612474
#: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
24622475
msgid "You pressed the VOLUME button at start up."
2463-
msgstr ""
2476+
msgstr "Usted presionó el boton de Volumén al iniciar."
24642477

24652478
#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
24662479
#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
24672480
#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
24682481
#: ports/espressif/boards/m5stack_atom_u/mpconfigboard.h
24692482
msgid "You pressed the central button at start up."
2470-
msgstr ""
2483+
msgstr "Usted presionó el boton central al iniciar."
24712484

24722485
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
24732486
msgid "You pressed the left button at start up."
2474-
msgstr ""
2487+
msgstr "Usted presionó el boton izquierdo al iniciar."
24752488

24762489
#: supervisor/shared/safe_mode.c
24772490
msgid "You pressed the reset button during boot."
2478-
msgstr ""
2491+
msgstr "Usted presionó el boton izquierdo al iniciar."
24792492

24802493
#: supervisor/shared/micropython.c
24812494
msgid "[truncated due to length]"

locale/fil.po

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,6 @@ msgid "All SPI peripherals are in use"
452452
msgstr "Lahat ng SPI peripherals ay ginagamit"
453453

454454
#: ports/espressif/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
455-
#: ports/raspberrypi/common-hal/busio/UART.c
456455
#, fuzzy
457456
msgid "All UART peripherals are in use"
458457
msgstr "Lahat ng I2C peripherals ginagamit"
@@ -2127,6 +2126,10 @@ msgstr ""
21272126
msgid "UART init"
21282127
msgstr ""
21292128

2129+
#: ports/raspberrypi/common-hal/busio/UART.c
2130+
msgid "UART peripheral in use"
2131+
msgstr ""
2132+
21302133
#: ports/stm/common-hal/busio/UART.c
21312134
msgid "UART re-init"
21322135
msgstr ""

0 commit comments

Comments
 (0)