8000 Merge branch 'adafruit:main' into main · domdfcoding/circuitpython@a37c36c · GitHub
[go: up one dir, main page]
Skip to content

Commit a37c36c

Browse files
droneczdronecz
authored
Merge branch 'adafruit:main' into main
2 parents 11ce074 + aee6cea commit a37c36c

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

+2500
-936
lines changed

‎lib/protomatter

‎locale/ID.po

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,6 @@ msgstr "%q sedang digunakan"
116116
msgid "%q index out of range"
117117
msgstr "%q indeks di luar batas"
118118

119-
#: py/obj.c
120-
msgid "%q indices must be integers, not %s"
121-
msgstr "indeks %q harus bilangan bulat, bukan %s"
122-
123119
#: shared-module/bitbangio/SPI.c
124120
msgid "%q init failed"
125121
msgstr ""
@@ -2372,10 +2368,6 @@ msgstr ""
23722368
msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
23732369
msgstr ""
23742370

2375-
#: shared-bindings/watchdog/WatchDogTimer.c
2376-
msgid "WatchDogTimer.timeout must be greater than 0"
2377-
msgstr ""
2378-
23792371
#: py/builtinhelp.c
23802372
#, c-format
23812373
msgid ""
@@ -3197,10 +3189,6 @@ msgstr ""
31973189
msgid "index out of range"
31983190
msgstr "index keluar dari jangkauan"
31993191

3200-
#: py/obj.c
3201-
msgid "indices must be integers"
3202-
msgstr ""
3203-
32043192
#: extmod/ulab/code/ndarray.c
32053193
msgid "indices must be integers, slices, or Boolean lists"
32063194
msgstr ""
@@ -3617,10 +3605,6 @@ msgstr ""
36173605
msgid "no such attribute"
36183606
msgstr ""
36193607

3620-
#: shared-bindings/usb_hid/__init__.c
3621-
msgid "non-Device in %q"
3622-
msgstr ""
3623-
36243608
#: ports/espressif/common-hal/_bleio/Connection.c
36253609
#: ports/nrf/common-hal/_bleio/Connection.c
36263610
msgid "non-UUID found in service_uuids_whitelist"
@@ -3746,10 +3730,20 @@ msgid "offset out of bounds"
37463730
msgstr "modul tidak ditemukan"
37473731

37483732
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3733+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37493734
msgid "only bit_depth=16 is supported"
37503735
msgstr ""
37513736

3737+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3738+
msgid "only mono is supported"
3739+
msgstr ""
3740+
3741+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3742+
msgid "only oversample=64 is supported"
3743+
msgstr ""
3744+
37523745
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3746+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37533747
msgid "only sample_rate=16000 is supported"
37543748
msgstr ""
37553749

@@ -3895,11 +3889,6 @@ msgstr ""
38953889
msgid "relative import"
38963890
msgstr "relative import"
38973891

3898-
#: py/obj.c
3899-
#, c-format
3900-
msgid "requested length %d but object has length %d"
3901-
msgstr ""
3902-
39033892
#: extmod/ulab/code/ndarray_operators.c
39043893
msgid "results cannot be cast to specified type"
39053894
msgstr ""
@@ -3963,10 +3952,6 @@ msgstr ""
39633952
msgid "sign not allowed with integer format specifier 'c'"
39643953
msgstr ""
39653954

3966-
#: py/objstr.c
3967-
msgid "single '}' encountered in format string"
3968-
msgstr ""
3969-
39703955
#: extmod/ulab/code/ulab_tools.c
39713956
msgid "size is defined for ndarrays only"
39723957
msgstr ""
@@ -4079,10 +4064,6 @@ msgstr "sintaksis error pada JSON"
40794064
msgid "syntax error in uctypes descriptor"
40804065
msgstr "sintaksis error pada pendeskripsi uctypes"
40814066

4082-
#: shared-bindings/touchio/TouchIn.c
4083-
msgid "threshold must be in the range 0-65536"
4084-
msgstr ""
4085-
40864067
#: shared-bindings/time/__init__.c
40874068
msgid "time.struct_time() takes a 9-sequence"
40884069
msgstr ""
@@ -4094,10 +4075,6 @@ msgstr ""
40944075
msgid "timeout duration exceeded the maximum supported value"
40954076
msgstr ""
40964077

4097-
#: shared-bindings/busio/UART.c
4098-
msgid "timeout must be 0.0-100.0 seconds"
4099-
msgstr ""
4100-
41014078
#: ports/nrf/common-hal/_bleio/Adapter.c
41024079
msgid "timeout must be < 655.35 secs"
41034080
msgstr ""
@@ -4151,10 +4128,6 @@ msgstr ""
41514128
msgid "trapz is defined for 1D iterables"
41524129
msgstr ""
41534130

4154-
#: py/obj.c
4155-
msgid "tuple/list has wrong length"
4156-
msgstr ""
4157-
41584131
#: ports/espressif/common-hal/canio/CAN.c
41594132
#, c-format
41604133
msgid "twai_driver_install returned esp-idf error #%d"
@@ -4233,7 +4206,8 @@ msgid "unknown type '%q'"
42334206
msgstr ""
42344207

42354208
#: py/objstr.c
4236-
msgid "unmatched '{' in format"
4209+
#, c-format
4210+
msgid "unmatched '%c' in format"
42374211
msgstr ""
42384212

42394213
#: py/objtype.c py/runtime.c
@@ -4304,10 +4278,6 @@ msgstr ""
43044278
msgid "watchdog not initialized"
43054279
msgstr ""
43064280

4307-
#: shared-bindings/watchdog/WatchDogTimer.c
4308-
msgid "watchdog timeout must be greater than 0"
4309-
msgstr ""
4310-
43114281
#: shared-bindings/is31fl3741/FrameBuffer.c
43124282
msgid "width must be greater than zero"
43134283
msgstr ""
@@ -4395,6 +4365,9 @@ msgstr "zi harus berjenis float"
43954365
msgid "zi must be of shape (n_section, 2)"
43964366
msgstr "Zi harus berbentuk (n_section, 2)"
43974367

4368+
#~ msgid "%q indices must be integers, not %s"
4369+
#~ msgstr "indeks %q harus bilangan bulat, bukan %s"
4370+
43984371
#~ msgid "To exit, please reset the board without "
43994372
#~ msgstr "Untuk keluar, silahkan reset board tanpa "
44004373

‎locale/circuitpython.pot

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3698,10 +3698,20 @@ msgid "offset out of bounds"
36983698
msgstr ""
36993699

37003700
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3701+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37013702
msgid "only bit_depth=16 is supported"
37023703
msgstr ""
37033704

3705+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3706+
msgid "only mono is supported"
3707+
msgstr ""
3708+
3709+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3710+
msgid "only oversample=64 is supported"
3711+
msgstr ""
3712+
37043713
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3714+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37053715
msgid "only sample_rate=16000 is supported"
37063716
msgstr ""
37073717

‎locale/cs.po

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ msgstr "%q se právě používá"
117117
msgid "%q index out of range"
118118
msgstr "Index %q je mimo rozsah"
119119

120-
#: py/obj.c
121-
msgid "%q indices must be integers, not %s"
122-
msgstr "Indexy %q musí být celá čísla, nikoli %s"
123-
124120
#: shared-module/bitbangio/SPI.c
125121
msgid "%q init failed"
126122
msgstr "Inicializace %q selhala"
@@ -2359,10 +2355,6 @@ msgstr ""
23592355
msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
23602356
msgstr ""
23612357

2362-
#: shared-bindings/watchdog/WatchDogTimer.c
2363-
msgid "WatchDogTimer.timeout must be greater than 0"
2364-
msgstr ""
2365-
23662358
#: py/builtinhelp.c
23672359
#, c-format
23682360
msgid ""
@@ -3184,10 +3176,6 @@ msgstr ""
31843176
msgid "index out of range"
31853177
msgstr ""
31863178

3187-
#: py/obj.c
3188-
msgid "indices must be integers"
3189-
msgstr ""
3190-
31913179
#: extmod/ulab/code/ndarray.c
31923180
msgid "indices must be integers, slices, or Boolean lists"
31933181
msgstr ""
@@ -3604,10 +3592,6 @@ msgstr ""
36043592
msgid "no such attribute"
36053593
msgstr ""
36063594

3607-
#: shared-bindings/usb_hid/__init__.c
3608-
msgid "non-Device in %q"
3609-
msgstr ""
3610-
36113595
#: ports/espressif/common-hal/_bleio/Connection.c
36123596
#: ports/nrf/common-hal/_bleio/Connection.c
36133597
msgid "non-UUID found in service_uuids_whitelist"
@@ -3732,10 +3716,20 @@ msgid "offset out of bounds"
37323716
msgstr ""
37333717

37343718
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3719+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37353720
msgid "only bit_depth=16 is supported"
37363721
msgstr ""
37373722

3723+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3724+
msgid "only mono is supported"
3725+
msgstr ""
3726+
3727+
#: ports/stm/common-hal/audiobusio/PDMIn.c
3728+
msgid "only oversample=64 is supported"
3729+
msgstr ""
3730+
37383731
#: ports/nrf/common-hal/audiobusio/PDMIn.c
3732+
#: ports/stm/common-hal/audiobusio/PDMIn.c
37393733
msgid "only sample_rate=16000 is supported"
37403734
msgstr ""
37413735

@@ -3881,11 +3875,6 @@ msgstr ""
38813875
msgid "relative import"
38823876
msgstr ""
38833877

3884-
#: py/obj.c
3885-
#, c-format
3886-
msgid "requested length %d but object has length %d"
3887-
msgstr ""
3888-
38893878
#: extmod/ulab/code/ndarray_operators.c
38903879
msgid "results cannot be cast to specified type"
38913880
msgstr ""
@@ -3949,10 +3938,6 @@ msgstr ""
39493938
msgid "sign not allowed with integer format specifier 'c'"
39503939
msgstr ""
39513940

3952-
#: py/objstr.c
3953-
msgid "single '}' encountered in format string"
3954-
msgstr ""
3955-
39563941
#: extmod/ulab/code/ulab_tools.c
39573942
msgid "size is defined for ndarrays only"
39583943
msgstr ""
@@ -4065,10 +4050,6 @@ msgstr ""
40654050
msgid "syntax error in uctypes descriptor"
40664051
msgstr ""
40674052

4068-
#: shared-bindings/touchio/TouchIn.c
4069-
msgid "threshold must be in the range 0-65536"
4070-
msgstr ""
4071-
40724053
#: shared-bindings/time/__init__.c
40734054
msgid "time.struct_time() takes a 9-sequence"
40744055
msgstr ""
@@ -4080,10 +4061,6 @@ msgstr ""
40804061
msgid "timeout duration exceeded the maximum supported value"
40814062
msgstr ""
40824063

4083-
#: shared-bindings/busio/UART.c
4084-
msgid "timeout must be 0.0-100.0 seconds"
4085-
msgstr ""
4086-
40874064
#: ports/nrf/common-hal/_bleio/Adapter.c
40884065
msgid "timeout must be < 655.35 secs"
40894066
msgstr ""
@@ -4137,10 +4114,6 @@ msgstr ""
41374114
msgid "trapz is defined for 1D iterables"
41384115
msgstr ""
41394116

4140-
#: py/obj.c
4141-
msgid "tuple/list has wrong length"
4142-
msgstr ""
4143-
41444117
#: ports/espressif/common-hal/canio/CAN.c
41454118
#, c-format
41464119
msgid "twai_driver_install returned esp-idf error #%d"
@@ -4219,7 +4192,8 @@ msgid "unknown type '%q'"
42194192
msgstr ""
42204193

42214194
#: py/objstr.c
4222-
msgid "unmatched '{' in format"
4195+
#, c-format
4196+
msgid "unmatched '%c' in format"
42234197
msgstr ""
42244198

42254199
#: py/objtype.c py/runtime.c
@@ -4290,10 +4264,6 @@ msgstr ""
42904264
msgid "watchdog not initialized"
42914265
msgstr ""
42924266

4293-
#: shared-bindings/watchdog/WatchDogTimer.c
4294-
msgid "watchdog timeout must be greater than 0"
4295-
msgstr ""
4296-
42974267
#: shared-bindings/is31fl3741/FrameBuffer.c
42984268
msgid "width must be greater than zero"
42994269
msgstr ""
@@ -4381,6 +4351,9 @@ msgstr ""
43814351
msgid "zi must be of shape (n_section, 2)"
43824352
msgstr ""
43834353

4354+
#~ msgid "%q indices must be integers, not %s"
4355+
#~ msgstr "Indexy %q musí být celá čísla, nikoli %s"
4356+
43844357
#~ msgid "Firmware image is invalid"
43854358
#~ msgstr "Obraz firmwaru je nevalidní"
43864359

0 commit comments

Comments
 (0)
0