Skip to content

Commit 959f729

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/master' into wdt-nrf
2 parents 323cca8 + e889287 commit 959f729

File tree

29 files changed

+777
-219
lines changed

29 files changed

+777
-219
lines changed

‎extmod/ulab

‎locale/ID.po

Lines changed: 42 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-05-27 20:51-0500\n"
11+
"POT-Creation-Date: 2020-06-01 08:56-0500\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -885,7 +885,7 @@ msgstr ""
885885
msgid "Invalid DAC pin supplied"
886886
msgstr ""
887887

888-
#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c
888+
#: ports/stm/common-hal/busio/I2C.c
889889
msgid "Invalid I2C pin selection"
890890
msgstr ""
891891

@@ -975,7 +975,8 @@ msgstr "Pin untuk channel kanan tidak valid"
975975
#: ports/atmel-samd/common-hal/busio/UART.c
976976
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
977977
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
978-
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/SPI.c
978+
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/I2C.c
979+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
979980
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
980981
msgid "Invalid pins"
981982
msgstr "Pin-pin tidak valid"
@@ -1372,7 +1373,8 @@ msgid "Running in safe mode! Not running saved code.\n"
13721373
msgstr ""
13731374
"Berjalan di mode aman(safe mode)! tidak menjalankan kode yang tersimpan.\n"
13741375

1375-
#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
1376+
#: ports/atmel-samd/common-hal/busio/I2C.c
1377+
#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
13761378
msgid "SDA or SCL needs a pull up"
13771379
msgstr "SDA atau SCL membutuhkan pull up"
13781380

@@ -2109,6 +2111,14 @@ msgstr ""
21092111
msgid "could not invert Vandermonde matrix"
21102112
msgstr ""
21112113

2114+
#: extmod/ulab/code/approx.c
2115+
msgid "data must be iterable"
2116+
msgstr ""
2117+
2118+
#: extmod/ulab/code/approx.c
2119+
msgid "data must be of equal length"
2120+
msgstr ""
2121+
21122122
#: extmod/ulab/code/numerical.c
21132123
msgid "ddof must be smaller than length of data set"
21142124
msgstr ""
@@ -2241,6 +2251,14 @@ msgstr ""
22412251
msgid "filesystem must provide mount method"
22422252
msgstr ""
22432253

2254+
#: extmod/ulab/code/vectorise.c
2255+
msgid "first argument must be a callable"
2256+
msgstr ""
2257+
2258+
#: extmod/ulab/code/approx.c
2259+
msgid "first argument must be a function"
2260+
msgstr ""
2261+
22442262
#: extmod/ulab/code/ndarray.c
22452263
msgid "first argument must be an iterable"
22462264
msgstr ""
@@ -2294,6 +2312,10 @@ msgstr "fungsi diharapkan setidaknya %d argumen, hanya mendapatkan %d"
22942312
msgid "function got multiple values for argument '%q'"
22952313
msgstr "fungsi mendapatkan nilai ganda untuk argumen '%q'"
22962314

2315+
#: extmod/ulab/code/approx.c
2316+
msgid "function has the same sign at the ends of interval"
2317+
msgstr ""
2318+
22972319
#: extmod/ulab/code/compare.c
22982320
msgid "function is implemented for scalars and ndarrays only"
22992321
msgstr ""
@@ -2380,6 +2402,10 @@ msgstr ""
23802402
msgid "indices must be integers, slices, or Boolean lists"
23812403
msgstr ""
23822404

2405+
#: extmod/ulab/code/approx.c
2406+
msgid "initial values must be iterable"
2407+
msgstr ""
2408+
23832409
#: py/compile.c
23842410
msgid "inline assembler must be a function"
23852411
msgstr "inline assembler harus sebuah fungsi"
@@ -2424,6 +2450,10 @@ msgstr ""
24242450
msgid "integer required"
24252451
msgstr ""
24262452

2453+
#: extmod/ulab/code/approx.c
2454+
msgid "interp is defined for 1D arrays of equal length"
2455+
msgstr ""
2456+
24272457
#: shared-bindings/_bleio/Adapter.c
24282458
#, c-format
24292459
msgid "interval must be in range %s-%s"
@@ -3220,6 +3250,10 @@ msgstr ""
32203250
msgid "wrong index type"
32213251
msgstr ""
32223252

3253+
#: extmod/ulab/code/vectorise.c
3254+
msgid "wrong input type"
3255+
msgstr ""
3256+
32233257
#: py/objstr.c
32243258
msgid "wrong number of arguments"
32253259
msgstr ""
@@ -3232,6 +3266,10 @@ msgstr ""
32323266
msgid "wrong operand type"
32333267
msgstr ""
32343268

3269+
#: extmod/ulab/code/vectorise.c
3270+
msgid "wrong output type"
3271+
msgstr ""
3272+
32353273
#: shared-module/displayio/Shape.c
32363274
msgid "x value out of bounds"
32373275
msgstr ""

‎locale/circuitpython.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-06-01 15:17-0700\n"
11+
"POT-Creation-Date: 2020-06-01 16:52-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"

‎locale/cs.po

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: PACKAGE VERSION\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-29 10:15-0700\n"
10+
"POT-Creation-Date: 2020-06-01 08:56-0500\n"
1111
"PO-Revision-Date: 2020-05-24 03:22+0000\n"
1212
"Last-Translator: dronecz <[email protected]>\n"
1313
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -882,7 +882,7 @@ msgstr ""
882882
msgid "Invalid DAC pin supplied"
883883
msgstr ""
884884

885-
#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c
885+
#: ports/stm/common-hal/busio/I2C.c
886886
msgid "Invalid I2C pin selection"
887887
msgstr ""
888888

@@ -972,7 +972,8 @@ msgstr ""
972972
#: ports/atmel-samd/common-hal/busio/UART.c
973973
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
974974
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
975-
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/SPI.c
975+
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/I2C.c
976+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
976977
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
977978
msgid "Invalid pins"
978979
msgstr ""
@@ -1364,7 +1365,8 @@ msgstr ""
13641365
msgid "Running in safe mode! Not running saved code.\n"
13651366
msgstr ""
13661367

1367-
#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
1368+
#: ports/atmel-samd/common-hal/busio/I2C.c
1369+
#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
13681370
msgid "SDA or SCL needs a pull up"
13691371
msgstr ""
13701372

@@ -1658,26 +1660,6 @@ msgstr ""
16581660
msgid "WARNING: Your code filename has two extensions\n"
16591661
msgstr ""
16601662

1661-
#: shared-bindings/watchdog/WatchDogTimer.c
1662-
msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET"
1663-
msgstr ""
1664-
1665-
#: shared-bindings/watchdog/WatchDogTimer.c
1666-
msgid "WatchDogTimer is not currently running"
1667-
msgstr ""
1668-
1669-
#: shared-bindings/watchdog/WatchDogTimer.c
1670-
msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
1671-
msgstr ""
1672-
1673-
#: shared-bindings/watchdog/WatchDogTimer.c
1674-
msgid "WatchDogTimer.timeout must be greater than 0"
1675-
msgstr ""
1676-
1677-
#: supervisor/shared/safe_mode.c
1678-
msgid "Watchdog timer expired."
1679-
msgstr ""
1680-
16811663
#: py/builtinhelp.c
16821664
#, c-format
16831665
msgid ""
@@ -2113,6 +2095,14 @@ msgstr ""
21132095
msgid "could not invert Vandermonde matrix"
21142096
msgstr ""
21152097

2098+
#: extmod/ulab/code/approx.c
2099+
msgid "data must be iterable"
2100+
msgstr ""
2101+
2102+
#: extmod/ulab/code/approx.c
2103+
msgid "data must be of equal length"
2104+
msgstr ""
2105+
21162106
#: extmod/ulab/code/numerical.c
21172107
msgid "ddof must be smaller than length of data set"
21182108
msgstr ""
@@ -2245,6 +2235,14 @@ msgstr ""
22452235
msgid "filesystem must provide mount method"
22462236
msgstr ""
22472237

2238+
#: extmod/ulab/code/vectorise.c
2239+
msgid "first argument must be a callable"
2240+
msgstr ""
2241+
2242+
#: extmod/ulab/code/approx.c
2243+
msgid "first argument must be a function"
2244+
msgstr ""
2245+
22482246
#: extmod/ulab/code/ndarray.c
22492247
msgid "first argument must be an iterable"
22502248
msgstr ""
@@ -2298,6 +2296,10 @@ msgstr ""
22982296
msgid "function got multiple values for argument '%q'"
22992297
msgstr ""
23002298

2299+
#: extmod/ulab/code/approx.c
2300+
msgid "function has the same sign at the ends of interval"
2301+
msgstr ""
2302+
23012303
#: extmod/ulab/code/compare.c
23022304
msgid "function is implemented for scalars and ndarrays only"
23032305
msgstr ""
@@ -2384,6 +2386,10 @@ msgstr ""
23842386
msgid "indices must be integers, slices, or Boolean lists"
23852387
msgstr ""
23862388

2389+
#: extmod/ulab/code/approx.c
2390+
msgid "initial values must be iterable"
2391+
msgstr ""
2392+
23872393
#: py/compile.c
23882394
msgid "inline assembler must be a function"
23892395
msgstr ""
@@ -2428,6 +2434,10 @@ msgstr ""
24282434
msgid "integer required"
24292435
msgstr ""
24302436

2437+
#: extmod/ulab/code/approx.c
2438+
msgid "interp is defined for 1D arrays of equal length"
2439+
msgstr ""
2440+
24312441
#: shared-bindings/_bleio/Adapter.c
24322442
#, c-format
24332443
msgid "interval must be in range %s-%s"
@@ -3057,10 +3067,6 @@ msgstr ""
30573067
msgid "time.struct_time() takes a 9-sequence"
30583068
msgstr ""
30593069

3060-
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
3061-
msgid "timeout duration exceeded the maximum supported value"
3062-
msgstr ""
3063-
30643070
#: shared-bindings/busio/UART.c
30653071
msgid "timeout must be 0.0-100.0 seconds"
30663072
msgstr ""
@@ -3214,10 +3220,6 @@ msgstr ""
32143220
msgid "value_count must be > 0"
32153221
msgstr ""
32163222

3217-
#: shared-bindings/watchdog/WatchDogTimer.c
3218-
msgid "watchdog timeout must be greater than 0"
3219-
msgstr ""
3220-
32213223
#: shared-bindings/_bleio/Adapter.c
32223224
msgid "window must be <= interval"
32233225
msgstr ""
@@ -3230,6 +3232,10 @@ msgstr ""
32303232
msgid "wrong index type"
32313233
msgstr ""
32323234

3235+
#: extmod/ulab/code/vectorise.c
3236+
msgid "wrong input type"
3237+
msgstr ""
3238+
32333239
#: py/objstr.c
32343240
msgid "wrong number of arguments"
32353241
msgstr ""
@@ -3242,6 +3248,10 @@ msgstr ""
32423248
msgid "wrong operand type"
32433249
msgstr ""
32443250

3251+
#: extmod/ulab/code/vectorise.c
3252+
msgid "wrong output type"
3253+
msgstr ""
3254+
32453255
#: shared-module/displayio/Shape.c
32463256
msgid "x value out of bounds"
32473257
msgstr ""

0 commit comments

Comments
 (0)