Skip to content

Commit 664f699

Browse files
mariopeschmariopesch
authored
Merge branch 'adafruit:main' into main
2 parents be52243 + 5f76281 commit 664f699

File tree

29 files changed

+560
-586
lines changed

29 files changed

+560
-586
lines changed

‎locale/ID.po

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -675,10 +675,6 @@ msgstr "Buffer terlalu pendek untuk %d byte"
675675
msgid "Buffer too small"
676676
msgstr ""
677677

678-
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
679-
msgid "Buffers must be same size"
680-
msgstr ""
681-
682678
#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c
683679
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
684680
#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c
@@ -773,10 +769,6 @@ msgstr "Tidak dapat merekam ke file"
773769
msgid "Cannot remount '/' when visible via USB."
774770
msgstr ""
775771

776-
#: ports/espressif/common-hal/socketpool/Socket.c
777-
msgid "Cannot set socket options"
778-
msgstr ""
779-
780772
#: shared-bindings/digitalio/DigitalInOut.c
781773
msgid "Cannot set value when direction is input."
782774
msgstr "Tidak dapat menetapkan nilai saat arah input."
@@ -928,7 +920,7 @@ msgstr "Error pada regex"
928920
msgid "Error in safemode.py."
929921
msgstr ""
930922

931-
#: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
923+
#: shared-bindings/ssl/SSLSocket.c
932924
msgid "Error: Failure to bind"
933925
msgstr ""
934926

@@ -949,10 +941,6 @@ msgstr "FFT didefinisikan hanya untuk ndarrays"
949941
msgid "FFT is implemented for linear arrays only"
950942
msgstr ""
951943

952-
#: ports/espressif/common-hal/ssl/SSLSocket.c
953-
msgid "Failed SSL handshake"
954-
msgstr ""
955-
956944
#: shared-bindings/ps2io/Ps2.c
957945
msgid "Failed sending command."
958946
msgstr "Gagal mengirim perintah."
@@ -1160,7 +1148,6 @@ msgstr ""
11601148
msgid "Internal define error"
11611149
msgstr "Kesalahan definisi internal"
11621150

1163-
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
11641151
#: shared-bindings/pwmio/PWMOut.c shared-module/os/getenv.c
11651152
msgid "Internal error"
11661153
msgstr ""
@@ -1263,8 +1250,7 @@ msgstr ""
12631250
msgid "Invalid size"
12641251
msgstr ""
12651252

1266-
#: ports/espressif/common-hal/ssl/SSLContext.c
1267-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
1253+
#: shared-module/ssl/SSLSocket.c
12681254
msgid "Invalid socket for TLS"
12691255
msgstr ""
12701256

@@ -1439,10 +1425,6 @@ msgstr ""
14391425
msgid "No bootloader present"
14401426
msgstr ""
14411427

1442-
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
1443-
msgid "No capture in progress"
1444-
msgstr ""
1445-
14461428
#: shared-module/usb/core/Device.c
14471429
msgid "No configuration set"
14481430
msgstr ""
@@ -1819,7 +1801,7 @@ msgstr "Kesalahan pembuatan nomor acak"
18191801
#: shared-bindings/_bleio/__init__.c
18201802
#: shared-bindings/memorymonitor/AllocationSize.c
18211803
#: shared-bindings/pulseio/PulseIn.c shared-module/bitmaptools/__init__.c
1822-
#: shared-module/displayio/Bitmap.c
1804+
#: shared-module/displayio/Bitmap.c shared-module/displayio/Group.c
18231805
msgid "Read-only"
18241806
msgstr "Baca-saja"
18251807

@@ -2163,11 +2145,6 @@ msgstr ""
21632145
msgid "Unexpected nrfx uuid type"
21642146
msgstr "Tipe urf nrfx tak sesuai"
21652147

2166-
#: ports/espressif/common-hal/ssl/SSLSocket.c
2167-
#, c-format
2168-
msgid "Unhandled ESP TLS error %d %d %x %d"
2169-
msgstr ""
2170-
21712148
#: ports/espressif/common-hal/_bleio/__init__.c
21722149
#, c-format
21732150
msgid "Unknown BLE error at %s:%d: %d"
@@ -2347,6 +2324,10 @@ msgstr ""
23472324
msgid "You pressed the VOLUME button at start up."
23482325
msgstr ""
23492326

2327+
#: ports/espressif/boards/adafruit_itsybitsy_esp32/mpconfigboard.h
2328+
msgid "You pressed the boot button at start up."
2329+
msgstr ""
2330+
23502331
#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
23512332
#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
23522333
#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
@@ -3293,7 +3274,7 @@ msgstr ""
32933274
msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
32943275
msgstr ""
32953276

3296-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
3277+
#: shared-module/ssl/SSLSocket.c
32973278
msgid "invalid cert"
32983279
msgstr "cert tidak valid"
32993280

@@ -3319,7 +3300,7 @@ msgstr ""
33193300
msgid "invalid hostname"
33203301
msgstr ""
33213302

3322-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
3303+
#: shared-module/ssl/SSLSocket.c
33233304
msgid "invalid key"
33243305
msgstr "key tidak valid"
33253306

‎locale/circuitpython.pot

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -670,10 +670,6 @@ msgstr ""
670670
msgid "Buffer too small"
671671
msgstr ""
672672

673-
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
674-
msgid "Buffers must be same size"
675-
msgstr ""
676-
677673
#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c
678674
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
679675
#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c
@@ -766,10 +762,6 @@ msgstr ""
766762
msgid "Cannot remount '/' when visible via USB."
767763
msgstr ""
768764

769-
#: ports/espressif/common-hal/socketpool/Socket.c
770-
msgid "Cannot set socket options"
771-
msgstr ""
772-
773765
#: shared-bindings/digitalio/DigitalInOut.c
774766
msgid "Cannot set value when direction is input."
775767
msgstr ""
@@ -920,7 +912,7 @@ msgstr ""
920912
msgid "Error in safemode.py."
921913
msgstr ""
922914

923-
#: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
915+
#: shared-bindings/ssl/SSLSocket.c
924916
msgid "Error: Failure to bind"
925917
msgstr ""
926918

@@ -941,10 +933,6 @@ msgstr ""
941933
msgid "FFT is implemented for linear arrays only"
942934
msgstr ""
943935

944-
#: ports/espressif/common-hal/ssl/SSLSocket.c
945-
msgid "Failed SSL handshake"
946-
msgstr ""
947-
948936
#: shared-bindings/ps2io/Ps2.c
949937
msgid "Failed sending command."
950938
msgstr ""
@@ -1152,7 +1140,6 @@ msgstr ""
11521140
msgid "Internal define error"
11531141
msgstr ""
11541142

1155-
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
11561143
#: shared-bindings/pwmio/PWMOut.c shared-module/os/getenv.c
11571144
msgid "Internal error"
11581145
msgstr ""
@@ -1255,8 +1242,7 @@ msgstr ""
12551242
msgid "Invalid size"
12561243
msgstr ""
12571244

1258-
#: ports/espressif/common-hal/ssl/SSLContext.c
1259-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
1245+
#: shared-module/ssl/SSLSocket.c
12601246
msgid "Invalid socket for TLS"
12611247
msgstr ""
12621248

@@ -1431,10 +1417,6 @@ msgstr ""
14311417
msgid "No bootloader present"
14321418
msgstr ""
14331419

1434-
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
1435-
msgid "No capture in progress"
1436-
msgstr ""
1437-
14381420
#: shared-module/usb/core/Device.c
14391421
msgid "No configuration set"
14401422
msgstr ""
@@ -1801,7 +1783,7 @@ msgstr ""
18011783
#: shared-bindings/_bleio/__init__.c
18021784
#: shared-bindings/memorymonitor/AllocationSize.c
18031785
#: shared-bindings/pulseio/PulseIn.c shared-module/bitmaptools/__init__.c
1804-
#: shared-module/displayio/Bitmap.c
1786+
#: shared-module/displayio/Bitmap.c shared-module/displayio/Group.c
18051787
msgid "Read-only"
18061788
msgstr ""
18071789

@@ -2143,11 +2125,6 @@ msgstr ""
21432125
msgid "Unexpected nrfx uuid type"
21442126
msgstr ""
21452127

2146-
#: ports/espressif/common-hal/ssl/SSLSocket.c
2147-
#, c-format
2148-
msgid "Unhandled ESP TLS error %d %d %x %d"
2149-
msgstr ""
2150-
21512128
#: ports/espressif/common-hal/_bleio/__init__.c
21522129
#, c-format
21532130
msgid "Unknown BLE error at %s:%d: %d"
@@ -2325,6 +2302,10 @@ msgstr ""
23252302
msgid "You pressed the VOLUME button at start up."
23262303
msgstr ""
23272304

2305+
#: ports/espressif/boards/adafruit_itsybitsy_esp32/mpconfigboard.h
2306+
msgid "You pressed the boot button at start up."
2307+
msgstr ""
2308+
23282309
#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
23292310
#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
23302311
#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
@@ -3271,7 +3252,7 @@ msgstr ""
32713252
msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
32723253
msgstr ""
32733254

3274-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
3255+
#: shared-module/ssl/SSLSocket.c
32753256
msgid "invalid cert"
32763257
msgstr ""
32773258

@@ -3297,7 +3278,7 @@ msgstr ""
32973278
msgid "invalid hostname"
32983279
msgstr ""
32993280

3300-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
3281+
#: shared-module/ssl/SSLSocket.c
33013282
msgid "invalid key"
33023283
msgstr ""
33033284

‎locale/cs.po

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -683,10 +683,6 @@ msgstr "Buffer je příliš krátký o %d bajtů"
683683
msgid "Buffer too small"
684684
msgstr "Buffer příliš malý"
685685

686-
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
687-
msgid "Buffers must be same size"
688-
msgstr "Buffery musí mít stejnou velikost"
689-
690686
#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c
691687
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
692688
#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c
@@ -782,10 +778,6 @@ msgstr "Nelze nahrávat do souboru"
782778
msgid "Cannot remount '/' when visible via USB."
783779
msgstr "Není možné znovu připojit '/', pokud je viditelné pomocí USB."
784780

785-
#: ports/espressif/common-hal/socketpool/Socket.c
786-
msgid "Cannot set socket options"
787-
msgstr "Nelze nastavit možnosti socketu"
788-
789781
#: shared-bindings/digitalio/DigitalInOut.c
790782
msgid "Cannot set value when direction is input."
791783
msgstr "Nelze nastavit hodnotu, když směr je vstup."
@@ -938,7 +930,7 @@ msgstr "Chyba v regulárním výrazu"
938930
msgid "Error in safemode.py."
939931
msgstr "Chyba v safemode.py."
940932

941-
#: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c
933+
#: shared-bindings/ssl/SSLSocket.c
942934
msgid "Error: Failure to bind"
943935
msgstr "Chyba: nepodařilo se nabindovat port"
944936

@@ -959,10 +951,6 @@ msgstr "FFT lze použít pouze pro ndarrays"
959951
msgid "FFT is implemented for linear arrays only"
960952
msgstr "FFT je implementován pouze pro lineární pole"
961953

962-
#: ports/espressif/common-hal/ssl/SSLSocket.c
963-
msgid "Failed SSL handshake"
964-
msgstr "SSL handshake selhal"
965-
966954
#: shared-bindings/ps2io/Ps2.c
967955
msgid "Failed sending command."
968956
msgstr "Nepodařilo se odeslat příkaz."
@@ -1172,7 +1160,6 @@ msgstr "Interní audio buffer je příliš malý"
11721160
msgid "Internal define error"
11731161
msgstr ""
11741162

1175-
#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
11761163
#: shared-bindings/pwmio/PWMOut.c shared-module/os/getenv.c
11771164
msgid "Internal error"
11781165
msgstr "Interní chyba"
@@ -1275,8 +1262,7 @@ msgstr "Chybná multicastová MAC adresa"
12751262
msgid "Invalid size"
12761263
msgstr "Chybná velikost"
12771264

1278-
#: ports/espressif/common-hal/ssl/SSLContext.c
1279-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
1265+
#: shared-module/ssl/SSLSocket.c
12801266
msgid "Invalid socket for TLS"
12811267
msgstr "Chybný soket pro TLS"
12821268

@@ -1451,10 +1437,6 @@ msgstr "Není IP"
14511437
msgid "No bootloader present"
14521438
msgstr ""
14531439

1454-
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
1455-
msgid "No capture in progress"
1456-
msgstr "Žádné aktivní zachytávání"
1457-
14581440
#: shared-module/usb/core/Device.c
14591441
msgid "No configuration set"
14601442
msgstr "Konfigurace není nastavena"
@@ -1826,7 +1808,7 @@ msgstr "Chyba generování náhodných čísel"
18261808
#: shared-bindings/_bleio/__init__.c
18271809
#: shared-bindings/memorymonitor/AllocationSize.c
18281810
#: shared-bindings/pulseio/PulseIn.c shared-module/bitmaptools/__init__.c
1829-
#: shared-module/displayio/Bitmap.c
1811+
#: shared-module/displayio/Bitmap.c shared-module/displayio/Group.c
18301812
msgid "Read-only"
18311813
msgstr "Pouze pro čtení"
18321814

@@ -2169,11 +2151,6 @@ msgstr "Nelze zapsat do sleep_memory."
21692151
msgid "Unexpected nrfx uuid type"
21702152
msgstr ""
21712153

2172-
#: ports/espressif/common-hal/ssl/SSLSocket.c
2173-
#, c-format
2174-
msgid "Unhandled ESP TLS error %d %d %x %d"
2175-
msgstr "Neošetřená chyba ESP TLS: %d %d %x %d"
2176-
21772154
#: ports/espressif/common-hal/_bleio/__init__.c
21782155
#, c-format
21792156
msgid "Unknown BLE error at %s:%d: %d"
@@ -2356,6 +2333,10 @@ msgstr "Při spuštění jsi stiskl tlačítko SW38."
23562333
msgid "You pressed the VOLUME button at start up."
23572334
msgstr "Při spuštění jsi stiskl tlačítko VOLUME."
23582335

2336+
#: ports/espressif/boards/adafruit_itsybitsy_esp32/mpconfigboard.h
2337+
msgid "You pressed the boot button at start up."
2338+
msgstr ""
2339+
23592340
#: ports/espressif/boards/m5stack_atom_echo/mpconfigboard.h
23602341
#: ports/espressif/boards/m5stack_atom_lite/mpconfigboard.h
23612342
#: ports/espressif/boards/m5stack_atom_matrix/mpconfigboard.h
@@ -3302,7 +3283,7 @@ msgstr ""
33023283
msgid "invalid bits_per_pixel %d, must be, 1, 2, 4, 8, 16, 24, or 32"
33033284
msgstr "chybné bits_per_pixel %d, musí být 1, 2, 4, 8, 16, 24, or 32"
33043285

3305-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
3286+
#: shared-module/ssl/SSLSocket.c
33063287
msgid "invalid cert"
33073288
msgstr "špatný certifikár"
33083289

@@ -3328,7 +3309,7 @@ msgstr ""
33283309
msgid "invalid hostname"
33293310
msgstr "špatný hostname"
33303311

3331-
#: ports/raspberrypi/common-hal/ssl/SSLSocket.c
3312+
#: shared-module/ssl/SSLSocket.c
33323313
msgid "invalid key"
33333314
msgstr "špatný klíč"
33343315

@@ -4359,6 +4340,22 @@ msgstr ""
43594340
msgid "zi must be of shape (n_section, 2)"
43604341
msgstr ""
43614342

4343+
#~ msgid "Buffers must be same size"
4344+
#~ msgstr "Buffery musí mít stejnou velikost"
4345+
4346+
#~ msgid "Cannot set socket options"
4347+
#~ msgstr "Nelze nastavit možnosti socketu"
4348+
4349+
#~ msgid "Failed SSL handshake"
4350+
#~ msgstr "SSL handshake selhal"
4351+
4352+
#~ msgid "No capture in progress"
4353+
#~ msgstr "Žádné aktivní zachytávání"
4354+
4355+
#, c-format
4356+
#~ msgid "Unhandled ESP TLS error %d %d %x %d"
4357+
#~ msgstr "Neošetřená chyba ESP TLS: %d %d %x %d"
4358+
43624359
#~ msgid "All PCNT units in use"
43634360
#~ msgstr "Všechny PCNT jednotky jsou používány"
43644361

0 commit comments

Comments
 (0)