Skip to content

Commit a192f1c

Browse files
dhalbertdhalbert
committed
merge from upstream
2 parents 1803a6a + a4d6452 commit a192f1c

File tree

35 files changed

+640
-206
lines changed

35 files changed

+640
-206
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ jobs:
485485
- "atmegazero_esp32s2"
486486
- "electroniccats_bastwifi"
487487
- "espressif_kaluga_1"
488+
- "espressif_kaluga_1.3"
488489
- "espressif_saola_1_wroom"
489490
- "espressif_saola_1_wrover"
490491
- "franzininho_wifi_wroom"

‎locale/ID.po

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3094,6 +3094,10 @@ msgstr ""
30943094
msgid "first argument to super() must be type"
30953095
msgstr ""
30963096

3097+
#: extmod/ulab/code/scipy/linalg/linalg.c
3098+
msgid "first two arguments must be ndarrays"
3099+
msgstr ""
3100+
30973101
#: extmod/ulab/code/ndarray.c
30983102
msgid "flattening order must be either 'C', or 'F'"
30993103
msgstr ""
@@ -3273,10 +3277,11 @@ msgid "input matrix is asymmetric"
32733277
msgstr ""
32743278

32753279
#: extmod/ulab/code/numpy/linalg/linalg.c
3280+
#: extmod/ulab/code/scipy/linalg/linalg.c
32763281
msgid "input matrix is singular"
32773282
msgstr ""
32783283

3279-
#: extmod/ulab/code/user/user.c
3284+
#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
32803285
msgid "input must be a dense ndarray"
32813286
msgstr ""
32823287

@@ -3317,7 +3322,7 @@ msgid "integer required"
33173322
msgstr ""
33183323

33193324
#: extmod/ulab/code/numpy/approx/approx.c
3320-
msgid "interp is defined for 1D arrays of equal length"
3325+
msgid "interp is defined for 1D iterables of equal length"
33213326
msgstr ""
33223327

33233328
#: shared-bindings/_bleio/Adapter.c
@@ -3862,14 +3867,16 @@ msgstr ""
38623867
#: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h
38633868
#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h
38643869
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
3870+
#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h
38653871
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
38663872
#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
38673873
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
38683874
#: ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h
38693875
#: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h
38703876
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
38713877
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
3872-
#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
3878+
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
3879+
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h
38733880
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
38743881
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
38753882
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
@@ -4172,11 +4179,11 @@ msgid "too many values to unpack (expected %d)"
41724179
msgstr ""
41734180

41744181
#: extmod/ulab/code/numpy/approx/approx.c
4175-
msgid "trapz is defined for 1D arrays"
4182+
msgid "trapz is defined for 1D arrays of equal length"
41764183
msgstr ""
41774184

41784185
#: extmod/ulab/code/numpy/approx/approx.c
4179-
msgid "trapz is defined for 1D arrays of equal length"
4186+
msgid "trapz is defined for 1D iterables"
41804187
msgstr ""
41814188

41824189
#: py/obj.c
@@ -4359,10 +4366,6 @@ msgstr "jumlah argumen salah"
43594366
msgid "wrong number of values to unpack"
43604367
msgstr ""
43614368

4362-
#: extmod/ulab/code/ndarray.c
4363-
msgid "wrong operand type"
4364-
msgstr ""
4365-
43664369
#: extmod/ulab/code/numpy/vector/vector.c
43674370
msgid "wrong output type"
43684371
msgstr ""

‎locale/circuitpython.pot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3825,6 +3825,7 @@ msgstr ""
38253825
#: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h
38263826
#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h
38273827
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
3828+
#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h
38283829
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
38293830
#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
38303831
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h

‎locale/cs.po

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3055,6 +3055,10 @@ msgstr ""
30553055
msgid "first argument to super() must be type"
30563056
msgstr ""
30573057

3058+
#: extmod/ulab/code/scipy/linalg/linalg.c
3059+
msgid "first two arguments must be ndarrays"
3060+
msgstr ""
3061+
30583062
#: extmod/ulab/code/ndarray.c
30593063
msgid "flattening order must be either 'C', or 'F'"
30603064
msgstr ""
@@ -3234,10 +3238,11 @@ msgid "input matrix is asymmetric"
32343238
msgstr ""
32353239

32363240
#: extmod/ulab/code/numpy/linalg/linalg.c
3241+
#: extmod/ulab/code/scipy/linalg/linalg.c
32373242
msgid "input matrix is singular"
32383243
msgstr ""
32393244

3240-
#: extmod/ulab/code/user/user.c
3245+
#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
32413246
msgid "input must be a dense ndarray"
32423247
msgstr ""
32433248

@@ -3278,7 +3283,7 @@ msgid "integer required"
32783283
msgstr ""
32793284

32803285
#: extmod/ulab/code/numpy/approx/approx.c
3281-
msgid "interp is defined for 1D arrays of equal length"
3286+
msgid "interp is defined for 1D iterables of equal length"
32823287
msgstr ""
32833288

32843289
#: shared-bindings/_bleio/Adapter.c
@@ -3822,14 +3827,16 @@ msgstr ""
38223827
#: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h
38233828
#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h
38243829
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
3830+
#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h
38253831
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
38263832
#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
38273833
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
38283834
#: ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h
38293835
#: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h
38303836
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
38313837
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
3832-
#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
3838+
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
3839+
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h
38333840
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
38343841
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
38353842
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
@@ -4132,11 +4139,11 @@ msgid "too many values to unpack (expected %d)"
41324139
msgstr ""
41334140

41344141
#: extmod/ulab/code/numpy/approx/approx.c
4135-
msgid "trapz is defined for 1D arrays"
4142+
msgid "trapz is defined for 1D arrays of equal length"
41364143
msgstr ""
41374144

41384145
#: extmod/ulab/code/numpy/approx/approx.c
4139-
msgid "trapz is defined for 1D arrays of equal length"
4146+
msgid "trapz is defined for 1D iterables"
41404147
msgstr ""
41414148

41424149
#: py/obj.c
@@ -4319,10 +4326,6 @@ msgstr ""
43194326
msgid "wrong number of values to unpack"
43204327
msgstr ""
43214328

4322-
#: extmod/ulab/code/ndarray.c
4323-
msgid "wrong operand type"
4324-
msgstr ""
4325-
43264329
#: extmod/ulab/code/numpy/vector/vector.c
43274330
msgid "wrong output type"
43284331
msgstr ""

‎locale/de_DE.po

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3112,6 +3112,10 @@ msgstr "Das erste Argument muss ein Ndarray sein"
31123112
msgid "first argument to super() must be type"
31133113
msgstr "Das erste Argument für super() muss type sein"
31143114

3115+
#: extmod/ulab/code/scipy/linalg/linalg.c
3116+
msgid "first two arguments must be ndarrays"
3117+
msgstr ""
3118+
31153119
#: extmod/ulab/code/ndarray.c
31163120
msgid "flattening order must be either 'C', or 'F'"
31173121
msgstr "Die Abflachungsreihenfolge muss entweder \"C\" oder \"F\" sein"
@@ -3293,10 +3297,11 @@ msgid "input matrix is asymmetric"
32933297
msgstr "Eingabematrix ist asymmetrisch"
32943298

32953299
#: extmod/ulab/code/numpy/linalg/linalg.c
3300+
#: extmod/ulab/code/scipy/linalg/linalg.c
32963301
msgid "input matrix is singular"
32973302
msgstr "Eingabematrix ist singulär"
32983303

3299-
#: extmod/ulab/code/user/user.c
3304+
#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
33003305
msgid "input must be a dense ndarray"
33013306
msgstr ""
33023307

@@ -3337,7 +3342,7 @@ msgid "integer required"
33373342
msgstr "integer erforderlich"
33383343

33393344
#: extmod/ulab/code/numpy/approx/approx.c
3340-
msgid "interp is defined for 1D arrays of equal length"
3345+
msgid "interp is defined for 1D iterables of equal length"
33413346
msgstr ""
33423347

33433348
#: shared-bindings/_bleio/Adapter.c
@@ -3891,14 +3896,16 @@ msgstr "pow () mit 3 Argumenten erfordert Integer"
38913896
#: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h
38923897
#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h
38933898
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
3899+
#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h
38943900
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
38953901
#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
38963902
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
38973903
#: ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h
38983904
#: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h
38993905
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
39003906
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
3901-
#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
3907+
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
3908+
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h
39023909
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
39033910
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
39043911
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
@@ -4204,11 +4211,11 @@ msgid "too many values to unpack (expected %d)"
42044211
msgstr "zu viele Werte zum Auspacken (erwartet %d)"
42054212

42064213
#: extmod/ulab/code/numpy/approx/approx.c
4207-
msgid "trapz is defined for 1D arrays"
4214+
msgid "trapz is defined for 1D arrays of equal length"
42084215
msgstr ""
42094216

42104217
#: extmod/ulab/code/numpy/approx/approx.c
4211-
msgid "trapz is defined for 1D arrays of equal length"
4218+
msgid "trapz is defined for 1D iterables"
42124219
msgstr ""
42134220

42144221
#: py/obj.c
@@ -4395,10 +4402,6 @@ msgstr "falsche Anzahl an Argumenten"
43954402
msgid "wrong number of values to unpack"
43964403
msgstr "falsche Anzahl zu entpackender Werte"
43974404

4398-
#: extmod/ulab/code/ndarray.c
4399-
msgid "wrong operand type"
4400-
msgstr "falscher Operandentyp"
4401-
44024405
#: extmod/ulab/code/numpy/vector/vector.c
44034406
msgid "wrong output type"
44044407
msgstr "Falscher Ausgabetyp"
@@ -4435,6 +4438,9 @@ msgstr ""
44354438
msgid "zi must be of shape (n_section, 2)"
44364439
msgstr ""
44374440

4441+
#~ msgid "wrong operand type"
4442+
#~ msgstr "falscher Operandentyp"
4443+
44384444
#~ msgid ""
44394445
#~ "CircuitPython is in safe mode because you pressed the reset button during "
44404446
#~ "boot. Press again to exit safe mode.\n"

‎locale/el.po

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3052,6 +3052,10 @@ msgstr ""
30523052
msgid "first argument to super() must be type"
30533053
msgstr ""
30543054

3055+
#: extmod/ulab/code/scipy/linalg/linalg.c
3056+
msgid "first two arguments must be ndarrays"
3057+
msgstr ""
3058+
30553059
#: extmod/ulab/code/ndarray.c
30563060
msgid "flattening order must be either 'C', or 'F'"
30573061
msgstr ""
@@ -3231,10 +3235,11 @@ msgid "input matrix is asymmetric"
32313235
msgstr ""
32323236

32333237
#: extmod/ulab/code/numpy/linalg/linalg.c
3238+
#: extmod/ulab/code/scipy/linalg/linalg.c
32343239
msgid "input matrix is singular"
32353240
msgstr ""
32363241

3237-
#: extmod/ulab/code/user/user.c
3242+
#: extmod/ulab/code/scipy/linalg/linalg.c extmod/ulab/code/user/user.c
32383243
msgid "input must be a dense ndarray"
32393244
msgstr ""
32403245

@@ -3275,7 +3280,7 @@ msgid "integer required"
32753280
msgstr ""
32763281

32773282
#: extmod/ulab/code/numpy/approx/approx.c
3278-
msgid "interp is defined for 1D arrays of equal length"
3283+
msgid "interp is defined for 1D iterables of equal length"
32793284
msgstr ""
32803285

32813286
#: shared-bindings/_bleio/Adapter.c
@@ -3819,14 +3824,16 @@ msgstr ""
38193824
#: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h
38203825
#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h
38213826
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
3827+
#: ports/esp32s2/boards/espressif_kaluga_1.3/mpconfigboard.h
38223828
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
38233829
#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h
38243830
#: ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.h
38253831
#: ports/esp32s2/boards/franzininho_wifi_wroom/mpconfigboard.h
38263832
#: ports/esp32s2/boards/franzininho_wifi_wrover/mpconfigboard.h
38273833
#: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
38283834
#: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h
3829-
#: ports/esp32s2/boards/muselab_nanoesp32_s2/mpconfigboard.h
3835+
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
3836+
#: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h
38303837
#: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h
38313838
#: ports/esp32s2/boards/targett_module_clip_wrover/mpconfigboard.h
38323839
#: ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h
@@ -4129,11 +4136,11 @@ msgid "too many values to unpack (expected %d)"
41294136
msgstr ""
41304137

41314138
#: extmod/ulab/code/numpy/approx/approx.c
4132-
msgid "trapz is defined for 1D arrays"
4139+
msgid "trapz is defined for 1D arrays of equal length"
41334140
msgstr ""
41344141

41354142
#: extmod/ulab/code/numpy/approx/approx.c
4136-
msgid "trapz is defined for 1D arrays of equal length"
4143+
msgid "trapz is defined for 1D iterables"
41374144
msgstr ""
41384145

41394146
#: py/obj.c
@@ -4316,10 +4323,6 @@ msgstr ""
43164323
msgid "wrong number of values to unpack"
43174324
msgstr ""
43184325

4319-
#: extmod/ulab/code/ndarray.c
4320-
msgid "wrong operand type"
4321-
msgstr ""
4322-
43234326
#: extmod/ulab/code/numpy/vector/vector.c
43244327
msgid "wrong output type"
43254328
msgstr ""

0 commit comments

Comments
 (0)