Skip to content

Commit 14e2a02

Browse files
jerryneedelljerryneedell
committed
Merge remote-tracking branch 'upstream/main' into jerryn_feathers2_led
2 parents ec02102 + 7e59ff3 commit 14e2a02

File tree

22 files changed

+416
-267
lines changed

22 files changed

+416
-267
lines changed

‎extmod/ulab

Submodule ulab updated 101 files

‎locale/ID.po

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-12-22 22:54+0530\n"
9-
"PO-Revision-Date: 2020-12-30 22:25+0000\n"
8+
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9+
"PO-Revision-Date: 2021-01-03 05:29+0000\n"
1010
"Last-Translator: oon arfiandwi <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
1212
"Language: ID\n"
@@ -1850,11 +1850,11 @@ msgstr "Tingkat sampel dari sampel tidak cocok dengan mixer"
18501850

18511851
#: shared-module/audiomixer/MixerVoice.c
18521852
msgid "The sample's signedness does not match the mixer's"
1853-
msgstr ""
1853+
msgstr "signedness dari sampel tidak cocok dengan mixer"
18541854

18551855
#: shared-bindings/displayio/TileGrid.c
18561856
msgid "Tile height must exactly divide bitmap height"
1857-
msgstr ""
1857+
msgstr "Tinggi tile harus persis membagi tinggi bitmap"
18581858

18591859
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
18601860
msgid "Tile index out of bounds"
@@ -1903,13 +1903,9 @@ msgid "Total data to write is larger than outgoing_packet_length"
19031903
msgstr ""
19041904
"Total data yang akan ditulis lebih besar daripada outgoing_packet_length"
19051905

1906-
#: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c
1907-
msgid "TouchAlarm not available in light sleep"
1908-
msgstr ""
1909-
19101906
#: py/obj.c
19111907
msgid "Traceback (most recent call last):\n"
1912-
msgstr ""
1908+
msgstr "Traceback (bagian terakhir dari panggilan terkini):\n"
19131909

19141910
#: shared-bindings/time/__init__.c
19151911
msgid "Tuple or struct_time argument required"
@@ -1945,15 +1941,15 @@ msgstr "Kesalahan USB"
19451941

19461942
#: shared-bindings/_bleio/UUID.c
19471943
msgid "UUID integer value must be 0-0xffff"
1948-
msgstr ""
1944+
msgstr "Nilai integer UUID harus 0-0xffff"
19491945

19501946
#: shared-bindings/_bleio/UUID.c
19511947
msgid "UUID string not 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
1952-
msgstr ""
1948+
msgstr "String UUID bukan 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
19531949

19541950
#: shared-bindings/_bleio/UUID.c
19551951
msgid "UUID value is not str, int or byte buffer"
1956-
msgstr ""
1952+
msgstr "Nilai UUID bukan str, int atau byte buffer"
19571953

19581954
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
19591955
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
@@ -1967,7 +1963,7 @@ msgstr ""
19671963
#: shared-module/displayio/I2CDisplay.c
19681964
#, c-format
19691965
msgid "Unable to find I2C Display at %x"
1970-
msgstr ""
1966+
msgstr "Tidak dapat menemukan Tampilan I2C di %x"
19711967

19721968
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
19731969
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -1976,23 +1972,23 @@ msgstr "Tidak dapat menemukan GCLK yang kosong"
19761972

19771973
#: py/parse.c
19781974
msgid "Unable to init parser"
1979-
msgstr ""
1975+
msgstr "Tidak dapat memulai parser"
19801976

19811977
#: shared-module/displayio/OnDiskBitmap.c
19821978
msgid "Unable to read color palette data"
1983-
msgstr ""
1979+
msgstr "Tidak dapat membaca data palet warna"
19841980

19851981
#: shared-bindings/nvm/ByteArray.c
19861982
msgid "Unable to write to nvm."
1987-
msgstr ""
1983+
msgstr "Tidak dapat menulis ke nvm."
19881984

19891985
#: shared-bindings/alarm/SleepMemory.c
19901986
msgid "Unable to write to sleep_memory."
19911987
msgstr ""
19921988

19931989
#: ports/nrf/common-hal/_bleio/UUID.c
19941990
msgid "Unexpected nrfx uuid type"
1995-
msgstr ""
1991+
msgstr "Tipe urf nrfx tak sesuai"
19961992

19971993
#: ports/esp32s2/common-hal/socketpool/Socket.c
19981994
#, c-format
@@ -2550,6 +2546,10 @@ msgstr ""
25502546
msgid "data must be of equal length"
25512547
msgstr ""
25522548

2549+
#: extmod/ulab/code/ndarray.c
2550+
msgid "data type not understood"
2551+
msgstr ""
2552+
25532553
#: py/parsenum.c
25542554
msgid "decimal numbers not supported"
25552555
msgstr ""
@@ -2860,7 +2860,7 @@ msgid "input and output shapes are not compatible"
28602860
msgstr ""
28612861

28622862
#: extmod/ulab/code/ulab_create.c
2863-
msgid "input argument must be an integer or a 2-tuple"
2863+
msgid "input argument must be an integer, a tuple, or a list"
28642864
msgstr ""
28652865

28662866
#: extmod/ulab/code/fft/fft.c
@@ -3103,6 +3103,10 @@ msgstr ""
31033103
msgid "maxiter should be > 0"
31043104
msgstr ""
31053105

3106+
#: extmod/ulab/code/numerical/numerical.c
3107+
msgid "median argument must be an ndarray"
3108+
msgstr ""
3109+
31063110
#: py/runtime.c
31073111
#, c-format
31083112
msgid "memory allocation failed, allocating %u bytes"
@@ -3333,10 +3337,6 @@ msgstr ""
33333337
msgid "operation is implemented for 1D Boolean arrays only"
33343338
msgstr ""
33353339

3336-
#: extmod/ulab/code/numerical/numerical.c
3337-
msgid "operation is not implemented for flattened array"
3338-
msgstr ""
3339-
33403340
#: extmod/ulab/code/numerical/numerical.c
33413341
msgid "operation is not implemented on ndarrays"
33423342
msgstr ""
@@ -3681,6 +3681,10 @@ msgstr ""
36813681
msgid "too many arguments provided with the given format"
36823682
msgstr ""
36833683

3684+
#: extmod/ulab/code/ulab_create.c
3685+
msgid "too many dimensions"
3686+
msgstr ""
3687+
36843688
#: extmod/ulab/code/ndarray.c
36853689
msgid "too many indices"
36863690
msgstr ""
@@ -3690,6 +3694,10 @@ msgstr ""
36903694
msgid "too many values to unpack (expected %d)"
36913695
msgstr ""
36923696

3697+
#: extmod/ulab/code/approx/approx.c
3698+
msgid "trapz is defined for 1D arrays"
3699+
msgstr ""
3700+
36933701
#: extmod/ulab/code/approx/approx.c
36943702
msgid "trapz is defined for 1D arrays of equal length"
36953703
msgstr ""
@@ -3698,10 +3706,6 @@ msgstr ""
36983706
msgid "trigger level must be 0 or 1"
36993707
msgstr ""
37003708

3701-
#: extmod/ulab/code/linalg/linalg.c
3702-
msgid "tuple index out of range"
3703-
msgstr ""
3704-
37053709
#: py/obj.c
37063710
msgid "tuple/list has wrong length"
37073711
msgstr ""

‎locale/circuitpython.pot

Lines changed: 18 additions & 14 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-12-22 22:54+0530\n"
11+
"POT-Creation-Date: 2021-01-04 12:55-0600\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"
@@ -1863,10 +1863,6 @@ msgstr ""
18631863
msgid "Total data to write is larger than outgoing_packet_length"
18641864
msgstr ""
18651865

1866-
#: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c
1867-
msgid "TouchAlarm not available in light sleep"
1868-
msgstr ""
1869-
18701866
#: py/obj.c
18711867
msgid "Traceback (most recent call last):\n"
18721868
msgstr ""
@@ -2502,6 +2498,10 @@ msgstr ""
25022498
msgid "data must be of equal length"
25032499
msgstr ""
25042500

2501+
#: extmod/ulab/code/ndarray.c
2502+
msgid "data type not understood"
2503+
msgstr ""
2504+
25052505
#: py/parsenum.c
25062506
msgid "decimal numbers not supported"
25072507
msgstr ""
@@ -2812,7 +2812,7 @@ msgid "input and output shapes are not compatible"
28122812
msgstr ""
28132813

28142814
#: extmod/ulab/code/ulab_create.c
2815-
msgid "input argument must be an integer or a 2-tuple"
2815+
msgid "input argument must be an integer, a tuple, or a list"
28162816
msgstr ""
28172817

28182818
#: extmod/ulab/code/fft/fft.c
@@ -3055,6 +3055,10 @@ msgstr ""
30553055
msgid "maxiter should be > 0"
30563056
msgstr ""
30573057

3058+
#: extmod/ulab/code/numerical/numerical.c
3059+
msgid "median argument must be an ndarray"
3060+
msgstr ""
3061+
30583062
#: py/runtime.c
30593063
#, c-format
30603064
msgid "memory allocation failed, allocating %u bytes"
@@ -3284,10 +3288,6 @@ msgstr ""
32843288
msgid "operation is implemented for 1D Boolean arrays only"
32853289
msgstr ""
32863290

3287-
#: extmod/ulab/code/numerical/numerical.c
3288-
msgid "operation is not implemented for flattened array"
3289-
msgstr ""
3290-
32913291
#: extmod/ulab/code/numerical/numerical.c
32923292
msgid "operation is not implemented on ndarrays"
32933293
msgstr ""
@@ -3631,6 +3631,10 @@ msgstr ""
36313631
msgid "too many arguments provided with the given format"
36323632
msgstr ""
36333633

3634+
#: extmod/ulab/code/ulab_create.c
3635+
msgid "too many dimensions"
3636+
msgstr ""
3637+
36343638
#: extmod/ulab/code/ndarray.c
36353639
msgid "too many indices"
36363640
msgstr ""
@@ -3640,6 +3644,10 @@ msgstr ""
36403644
msgid "too many values to unpack (expected %d)"
36413645
msgstr ""
36423646

3647+
#: extmod/ulab/code/approx/approx.c
3648+
msgid "trapz is defined for 1D arrays"
3649+
msgstr ""
3650+
36433651
#: extmod/ulab/code/approx/approx.c
36443652
msgid "trapz is defined for 1D arrays of equal length"
36453653
msgstr ""
@@ -3648,10 +3656,6 @@ msgstr ""
36483656
msgid "trigger level must be 0 or 1"
36493657
msgstr ""
36503658

3651-
#: extmod/ulab/code/linalg/linalg.c
3652-
msgid "tuple index out of range"
3653-
msgstr ""
3654-
36553659
#: py/obj.c
36563660
msgid "tuple/list has wrong length"
36573661
msgstr ""

‎locale/cs.po

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-12-22 22:54+0530\n"
8+
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
99
"PO-Revision-Date: 2020-12-04 18:33+0000\n"
1010
"Last-Translator: vkuthan <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1865,10 +1865,6 @@ msgstr ""
18651865
msgid "Total data to write is larger than outgoing_packet_length"
18661866
msgstr ""
18671867

1868-
#: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c
1869-
msgid "TouchAlarm not available in light sleep"
1870-
msgstr ""
1871-
18721868
#: py/obj.c
18731869
msgid "Traceback (most recent call last):\n"
18741870
msgstr ""
@@ -2504,6 +2500,10 @@ msgstr ""
25042500
msgid "data must be of equal length"
25052501
msgstr ""
25062502

2503+
#: extmod/ulab/code/ndarray.c
2504+
msgid "data type not understood"
2505+
msgstr ""
2506+
25072507
#: py/parsenum.c
25082508
msgid "decimal numbers not supported"
25092509
msgstr ""
@@ -2814,7 +2814,7 @@ msgid "input and output shapes are not compatible"
28142814
msgstr ""
28152815

28162816
#: extmod/ulab/code/ulab_create.c
2817-
msgid "input argument must be an integer or a 2-tuple"
2817+
msgid "input argument must be an integer, a tuple, or a list"
28182818
msgstr ""
28192819

28202820
#: extmod/ulab/code/fft/fft.c
@@ -3057,6 +3057,10 @@ msgstr ""
30573057
msgid "maxiter should be > 0"
30583058
msgstr ""
30593059

3060+
#: extmod/ulab/code/numerical/numerical.c
3061+
msgid "median argument must be an ndarray"
3062+
msgstr ""
3063+
30603064
#: py/runtime.c
30613065
#, c-format
30623066
msgid "memory allocation failed, allocating %u bytes"
@@ -3286,10 +3290,6 @@ msgstr ""
32863290
msgid "operation is implemented for 1D Boolean arrays only"
32873291
msgstr ""
32883292

3289-
#: extmod/ulab/code/numerical/numerical.c
3290-
msgid "operation is not implemented for flattened array"
3291-
msgstr ""
3292-
32933293
#: extmod/ulab/code/numerical/numerical.c
32943294
msgid "operation is not implemented on ndarrays"
32953295
msgstr ""
@@ -3633,6 +3633,10 @@ msgstr ""
36333633
msgid "too many arguments provided with the given format"
36343634
msgstr ""
36353635

3636+
#: extmod/ulab/code/ulab_create.c
3637+
msgid "too many dimensions"
3638+
msgstr ""
3639+
36363640
#: extmod/ulab/code/ndarray.c
36373641
msgid "too many indices"
36383642
msgstr ""
@@ -3642,6 +3646,10 @@ msgstr ""
36423646
msgid "too many values to unpack (expected %d)"
36433647
msgstr ""
36443648

3649+
#: extmod/ulab/code/approx/approx.c
3650+
msgid "trapz is defined for 1D arrays"
3651+
msgstr ""
3652+
36453653
#: extmod/ulab/code/approx/approx.c
36463654
msgid "trapz is defined for 1D arrays of equal length"
36473655
msgstr ""
@@ -3650,10 +3658,6 @@ msgstr ""
36503658
msgid "trigger level must be 0 or 1"
36513659
msgstr ""
36523660

3653-
#: extmod/ulab/code/linalg/linalg.c
3654-
msgid "tuple index out of range"
3655-
msgstr ""
3656-
36573661
#: py/obj.c
36583662
msgid "tuple/list has wrong length"
36593663
msgstr ""

0 commit comments

Comments
 (0)