Skip to content

Commit 9152659

Browse files
committed
Merge remote-tracking branch 'adafruit/main' into cache_config_desc
2 parents 59e6cab + d57f3c8 commit 9152659

File tree

26 files changed

+162
-130
lines changed

26 files changed

+162
-130
lines changed

docs/shared_bindings_matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def get_settings_from_makefile(port_dir, board_name):
177177
in this script, something that has proved error-prone
178178
"""
179179
contents = subprocess.run(
180-
["make", "-C", port_dir, "-f", "Makefile", f"BOARD={board_name}", "print-CFLAGS", "print-CIRCUITPY_BUILD_EXTENSIONS", "print-FROZEN_MPY_DIRS"],
180+
["make", "-C", port_dir, "-f", "Makefile", f"BOARD={board_name}", "print-CFLAGS", "print-CIRCUITPY_BUILD_EXTENSIONS", "print-FROZEN_MPY_DIRS", "print-SRC_PATTERNS"],
181181
encoding="utf-8",
182182
errors="replace",
183183
stdout=subprocess.PIPE,

locale/ID.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3287,6 +3287,10 @@ msgstr ""
32873287
msgid "input dtype must be float or complex"
32883288
msgstr ""
32893289

3290+
#: extmod/ulab/code/numpy/poly.c
3291+
msgid "input is not iterable"
3292+
msgstr ""
3293+
32903294
#: extmod/ulab/code/numpy/linalg/linalg.c
32913295
msgid "input matrix is asymmetric"
32923296
msgstr ""
@@ -3332,10 +3336,6 @@ msgstr ""
33323336
msgid "input vectors must be of equal length"
33333337
msgstr ""
33343338

3335-
#: extmod/ulab/code/numpy/poly.c
3336-
msgid "inputs are not iterable"
3337-
msgstr ""
3338-
33393339
#: extmod/ulab/code/numpy/approx.c
33403340
msgid "interp is defined for 1D iterables of equal length"
33413341
msgstr ""

locale/circuitpython.pot

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1540,6 +1540,10 @@ msgstr ""
15401540
msgid "No timer available"
15411541
msgstr ""
15421542

1543+
#: shared-module/usb/core/Device.c
1544+
msgid "No usb host port initialized"
1545+
msgstr ""
1546+
15431547
#: ports/nrf/common-hal/_bleio/__init__.c
15441548
msgid "Nordic system firmware out of memory"
15451549
msgstr ""
@@ -3263,6 +3267,10 @@ msgstr ""
32633267
msgid "input dtype must be float or complex"
32643268
msgstr ""
32653269

3270+
#: extmod/ulab/code/numpy/poly.c
3271+
msgid "input is not iterable"
3272+
msgstr ""
3273+
32663274
#: extmod/ulab/code/numpy/linalg/linalg.c
32673275
msgid "input matrix is asymmetric"
32683276
msgstr ""
@@ -3308,10 +3316,6 @@ msgstr ""
33083316
msgid "input vectors must be of equal length"
33093317
msgstr ""
33103318

3311-
#: extmod/ulab/code/numpy/poly.c
3312-
msgid "inputs are not iterable"
3313-
msgstr ""
3314-
33153319
#: extmod/ulab/code/numpy/approx.c
33163320
msgid "interp is defined for 1D iterables of equal length"
33173321
msgstr ""

locale/cs.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3274,6 +3274,10 @@ msgstr ""
32743274
msgid "input dtype must be float or complex"
32753275
msgstr ""
32763276

3277+
#: extmod/ulab/code/numpy/poly.c
3278+
msgid "input is not iterable"
3279+
msgstr ""
3280+
32773281
#: extmod/ulab/code/numpy/linalg/linalg.c
32783282
msgid "input matrix is asymmetric"
32793283
msgstr ""
@@ -3319,10 +3323,6 @@ msgstr ""
33193323
msgid "input vectors must be of equal length"
33203324
msgstr ""
33213325

3322-
#: extmod/ulab/code/numpy/poly.c
3323-
msgid "inputs are not iterable"
3324-
msgstr ""
3325-
33263326
#: extmod/ulab/code/numpy/approx.c
33273327
msgid "interp is defined for 1D iterables of equal length"
33283328
msgstr ""

locale/de_DE.po

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3347,6 +3347,10 @@ msgstr "Eingabedaten müssen iterierbar sein"
33473347
msgid "input dtype must be float or complex"
33483348
msgstr "Eingabe dtype muss float oder complex sein"
33493349

3350+
#: extmod/ulab/code/numpy/poly.c
3351+
msgid "input is not iterable"
3352+
msgstr ""
3353+
33503354
#: extmod/ulab/code/numpy/linalg/linalg.c
33513355
msgid "input matrix is asymmetric"
33523356
msgstr "Eingabematrix ist asymmetrisch"
@@ -3392,10 +3396,6 @@ msgstr "Die Eingabe muss Tupel, Liste, Bereich oder Ndarray sein"
33923396
msgid "input vectors must be of equal length"
33933397
msgstr "Eingabevektoren müssen gleich lang sein"
33943398

3395-
#: extmod/ulab/code/numpy/poly.c
3396-
msgid "inputs are not iterable"
3397-
msgstr "Eingaben sind nicht iterierbar"
3398-
33993399
#: extmod/ulab/code/numpy/approx.c
34003400
msgid "interp is defined for 1D iterables of equal length"
34013401
msgstr "interp ist für 1D-Iterables gleicher Länge definiert"
@@ -4463,6 +4463,9 @@ msgstr "zi muss eine Gleitkommazahl sein"
44634463
msgid "zi must be of shape (n_section, 2)"
44644464
msgstr "zi muss die Form (n_section, 2) haben"
44654465

4466+
#~ msgid "inputs are not iterable"
4467+
#~ msgstr "Eingaben sind nicht iterierbar"
4468+
44664469
#~ msgid "Too many display busses"
44674470
#~ msgstr "Zu viele Anzeigebusse"
44684471

locale/el.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3288,6 +3288,10 @@ msgstr ""
32883288
msgid "input dtype must be float or complex"
32893289
msgstr ""
32903290

3291+
#: extmod/ulab/code/numpy/poly.c
3292+
msgid "input is not iterable"
3293+
msgstr ""
3294+
32913295
#: extmod/ulab/code/numpy/linalg/linalg.c
32923296
msgid "input matrix is asymmetric"
32933297
msgstr ""
@@ -3333,10 +3337,6 @@ msgstr ""
33333337
msgid "input vectors must be of equal length"
33343338
msgstr ""
33353339

3336-
#: extmod/ulab/code/numpy/poly.c
3337-
msgid "inputs are not iterable"
3338-
msgstr ""
3339-
33403340
#: extmod/ulab/code/numpy/approx.c
33413341
msgid "interp is defined for 1D iterables of equal length"
33423342
msgstr ""

locale/en_GB.po

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3302,6 +3302,10 @@ msgstr "input data must be an iterable"
33023302
msgid "input dtype must be float or complex"
33033303
msgstr "input dtype must be float or complex"
33043304

3305+
#: extmod/ulab/code/numpy/poly.c
3306+
msgid "input is not iterable"
3307+
msgstr ""
3308+
33053309
#: extmod/ulab/code/numpy/linalg/linalg.c
33063310
msgid "input matrix is asymmetric"
33073311
msgstr "input matrix is asymmetric"
@@ -3347,10 +3351,6 @@ msgstr "input must be tuple, list, range, or ndarray"
33473351
msgid "input vectors must be of equal length"
33483352
msgstr "input vectors must be of equal length"
33493353

3350-
#: extmod/ulab/code/numpy/poly.c
3351-
msgid "inputs are not iterable"
3352-
msgstr "inputs are not iterable"
3353-
33543354
#: extmod/ulab/code/numpy/approx.c
33553355
msgid "interp is defined for 1D iterables of equal length"
33563356
msgstr "interp is defined for 1D iterables of equal length"
@@ -4404,6 +4404,9 @@ msgstr "zi must be of float type"
44044404
msgid "zi must be of shape (n_section, 2)"
44054405
msgstr "zi must be of shape (n_section, 2)"
44064406

4407+
#~ msgid "inputs are not iterable"
4408+
#~ msgstr "inputs are not iterable"
4409+
44074410
#~ msgid "Too many display busses"
44084411
#~ msgstr "Too many display busses"
44094412

locale/es.po

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3350,6 +3350,10 @@ msgstr "los datos de entrada deben ser iterables"
33503350
msgid "input dtype must be float or complex"
33513351
msgstr "dtype de entrada debe ser float o complex"
33523352

3353+
#: extmod/ulab/code/numpy/poly.c
3354+
msgid "input is not iterable"
3355+
msgstr ""
3356+
33533357
#: extmod/ulab/code/numpy/linalg/linalg.c
33543358
msgid "input matrix is asymmetric"
33553359
msgstr "la matriz de entrada es asimétrica"
@@ -3395,10 +3399,6 @@ msgstr "la entrada debe ser una tupla, lista, rango o ndarray"
33953399
msgid "input vectors must be of equal length"
33963400
msgstr "los vectores de entrada deben ser de igual tamaño"
33973401

3398-
#: extmod/ulab/code/numpy/poly.c
3399-
msgid "inputs are not iterable"
3400-
msgstr "Entradas no son iterables"
3401-
34023402
#: extmod/ulab/code/numpy/approx.c
34033403
msgid "interp is defined for 1D iterables of equal length"
34043404
msgstr "interp está definido para iterables 1D de igual tamaño"
@@ -4460,6 +4460,9 @@ msgstr "zi debe ser de tipo flotante"
44604460
msgid "zi must be of shape (n_section, 2)"
44614461
msgstr "zi debe ser una forma (n_section,2)"
44624462

4463+
#~ msgid "inputs are not iterable"
4464+
#~ msgstr "Entradas no son iterables"
4465+
44634466
#~ msgid "Too many display busses"
44644467
#~ msgstr "Demasiados buses de pantalla"
44654468

locale/fil.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3289,6 +3289,10 @@ msgstr ""
32893289
msgid "input dtype must be float or complex"
32903290
msgstr ""
32913291

3292+
#: extmod/ulab/code/numpy/poly.c
3293+
msgid "input is not iterable"
3294+
msgstr ""
3295+
32923296
#: extmod/ulab/code/numpy/linalg/linalg.c
32933297
msgid "input matrix is asymmetric"
32943298
msgstr ""
@@ -3334,10 +3338,6 @@ msgstr ""
33343338
msgid "input vectors must be of equal length"
33353339
msgstr ""
33363340

3337-
#: extmod/ulab/code/numpy/poly.c
3338-
msgid "inputs are not iterable"
3339-
msgstr ""
3340-
33413341
#: extmod/ulab/code/numpy/approx.c
33423342
msgid "interp is defined for 1D iterables of equal length"
33433343
msgstr ""

0 commit comments

Comments
 (0)