8000 Merge pull request #27 from adafruit/main · tannewt/circuitpython@ecd8d49 · GitHub
[go: up one dir, main page]
Skip to content

Commit ecd8d49

Browse files
DavePutzDavePutz
authored
Merge pull request micropython#27 from adafruit/main
Update from adafruit/main
2 parents 43d5892 + 3d8bac5 commit ecd8d49

File tree

55 files changed

+4673
-357
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+4673
-357
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ jobs:
275275
- "pyportal"
276276
- "pyportal_titano"
277277
- "pyruler"
278+
- "qtpy_m0"
278279
- "raytac_mdbt50q-db-40"
279280
- "robohatmm1_m4"
280281
- "sam32"

‎devices/ble_hci/common-hal/_bleio/att.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1748,6 +1748,7 @@ void check_att_err(uint8_t err) {
17481748
break;
17491749
case BT_ATT_ERR_ENCRYPTION_KEY_SIZE:
17501750
msg = translate("Encryption key size");
1751+
break;
17511752
case BT_ATT_ERR_INVALID_ATTRIBUTE_LEN:
17521753
msg = translate("Invalid attribute length");
17531754
break;

‎extmod/re1.5/recursiveloop.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ recursiveloop(char *pc, const char *sp, Subject *input, const char **subp, int n
2222
case Char:
2323
if(*sp != *pc++)
2424
return 0;
25+
/* FALLTHROUGH */
2526
case Any:
2627
sp++;
2728
continue;

‎locale/ID.po

Lines changed: 55 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-08-30 14:38-0400\n"
8+
"POT-Creation-Date: 2020-09-13 14:21-0500\n"
99
"PO-Revision-Date: 2020-07-06 18:10+0000\n"
1010
"Last-Translator: oon arfiandwi <oon.arfiandwi@gmail.com>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,14 +34,6 @@ msgstr ""
3434
"Harap ajukan masalah dengan konten drive CIRCUITPY Anda di\n"
3535
"https://github.com/adafruit/circuitpython/issues\n"
3636

37-
#: supervisor/shared/safe_mode.c
38-
msgid ""
39-
"\n"
40-
"To exit, please reset the board without "
41-
msgstr ""
42-
"\n"
43-
"Untuk keluar, harap setel ulang papan tanpa"
44-
4537
#: py/obj.c
4638
msgid " File \"%q\""
4739
msgstr " File \"%q\""
@@ -279,7 +271,7 @@ msgstr "pow() 3-arg tidak didukung"
279271
msgid "A hardware interrupt channel is already in use"
280272
msgstr "Sebuah channel hardware interrupt sedang digunakan"
281273

282-
#: shared-bindings/_bleio/Address.c
274+
#: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
283275
#, c-format
284276
msgid "Address must be %d bytes long"
285277
msgstr "Alamat harus sepanjang %d byte"
@@ -377,6 +369,10 @@ msgstr ""
377369
msgid "Attempted heap allocation when MicroPython VM not running."
378370
msgstr "Mencoba alokasi heap ketika MicroPython VM tidak berjalan."
379371

372+
#: shared-bindings/wifi/Radio.c
373+
msgid "Authentication failure"
374+
msgstr ""
375+
380376
#: main.c
381377
msgid "Auto-reload is off.\n"
382378
msgstr "Auto-reload tidak aktif.\n"
@@ -596,6 +592,10 @@ msgstr ""
596592
"CircuitPython dalam mode aman karena Anda menekan tombol reset saat boot. "
597593
"Tekan lagi untuk keluar dari mode aman.\n"
598594

595+
#: supervisor/shared/safe_mode.c
596+
msgid "CircuitPython was unable to allocate the heap.\n"
597+
msgstr ""
598+
599599
#: shared-module/bitbangio/SPI.c
600600
msgid "Clock pin init failed."
601601
msgstr "Init pin clock gagal."
@@ -1244,6 +1244,10 @@ msgstr ""
12441244
msgid "No more timers available on this pin."
12451245
msgstr ""
12461246

1247+
#: shared-bindings/wifi/Radio.c
1248+
msgid "No network with that ssid"
1249+
msgstr ""
1250+
12471251
#: shared-module/touchio/TouchIn.c
12481252
msgid "No pulldown on pin; 1Mohm recommended"
12491253
msgstr ""
@@ -1264,6 +1268,10 @@ msgstr ""
12641268
msgid "Nordic Soft Device failure assertion."
12651269
msgstr ""
12661270

1271+
#: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c
1272+
msgid "Not a valid IP string"
1273+
msgstr ""
1274+
12671275
#: ports/nrf/common-hal/_bleio/__init__.c
12681276
#: shared-bindings/_bleio/CharacteristicBuffer.c
12691277
#, fuzzy
@@ -1309,6 +1317,10 @@ msgid ""
13091317
"%d bpp given"
13101318
msgstr ""
13111319

1320+
#: shared-bindings/ipaddress/__init__.c
1321+
msgid "Only raw int supported for ip"
1322+
msgstr ""
1323+
13121324
#: shared-bindings/audiobusio/PDMIn.c
13131325
msgid "Oversample must be multiple of 8."
13141326
msgstr ""
@@ -1508,6 +1520,10 @@ msgstr ""
15081520
msgid "Serializer in use"
15091521
msgstr "Serializer sedang digunakan"
15101522

1523+
#: shared-bindings/ssl/SSLContext.c
1524+
msgid "Server side context cannot have hostname"
1525+
msgstr ""
1526+
15111527
#: shared-bindings/nvm/ByteArray.c
15121528
msgid "Slice and value different lengths."
15131529
msgstr ""
@@ -1608,6 +1624,10 @@ msgid ""
16081624
"Timer was reserved for internal use - declare PWM pins earlier in the program"
16091625
msgstr ""
16101626

1627+
#: supervisor/shared/safe_mode.c
1628+
msgid "To exit, please reset the board without "
1629+
msgstr "Untuk keluar, silahkan reset board tanpa "
1630+
16111631
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
16121632
msgid "Too many channels in sample."
16131633
msgstr "Terlalu banyak channel dalam sampel"
@@ -1703,6 +1723,10 @@ msgstr ""
17031723
msgid "Unexpected nrfx uuid type"
17041724
msgstr ""
17051725

1726+
#: shared-bindings/wifi/Radio.c
1727+
msgid "Unknown failure"
1728+
msgstr ""
1729+
17061730
#: ports/nrf/common-hal/_bleio/__init__.c
17071731
#, c-format
17081732
msgid "Unknown gatt error: 0x%04x"
@@ -1813,6 +1837,10 @@ msgstr ""
18131837
"\n"
18141838
"Untuk menampilkan modul built-in silahkan ketik `help(\"modules\")`.\n"
18151839

1840+
#: shared-bindings/wifi/Radio.c
1841+
msgid "WiFi password must be between 8 and 63 characters"
1842+
msgstr ""
1843+
18161844
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
18171845
msgid "Writes not supported on Characteristic"
18181846
msgstr ""
@@ -1927,7 +1955,7 @@ msgstr ""
19271955
msgid "bad format string"
19281956
msgstr ""
19291957

1930-
#: py/binary.c
1958+
#: py/binary.c py/objarray.c
19311959
msgid "bad typecode"
19321960
msgstr "typecode buruk"
19331961

@@ -1981,6 +2009,10 @@ msgstr ""
19812009
msgid "bytes > 8 bits not supported"
19822010
msgstr "byte > 8 bit tidak didukung"
19832011

2012+
#: py/objarray.c
2013+
msgid "bytes length not a multiple of item size"
2014+
msgstr ""
2015+
19842016
#: py/objstr.c
19852017
msgid "bytes value out of range"
19862018
msgstr ""
@@ -2947,6 +2979,11 @@ msgstr ""
29472979
msgid "overflow converting long int to machine word"
29482980
msgstr ""
29492981

2982+
#: py/modstruct.c
2983+
#, c-format
2984+
msgid "pack expected %d items for packing (got %d)"
2985+
msgstr ""
2986+
29502987
#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c
29512988
msgid "palette must be 32 bytes long"
29522989
msgstr ""
@@ -3421,6 +3458,13 @@ msgstr ""
34213458
msgid "zi must be of shape (n_section, 2)"
34223459
msgstr ""
34233460

3461+
#~ msgid ""
3462+
#~ "\n"
3463+
#~ "To exit, please reset the board without "
3464+
#~ msgstr ""
3465+
#~ "\n"
3466+
#~ "Untuk keluar, harap setel ulang papan tanpa"
3467+
34243468
#~ msgid "%q indices must be integers, not %s"
34253469
#~ msgstr "indeks %q harus bilangan bulat, bukan %s"
34263470

@@ -3680,9 +3724,6 @@ msgstr ""
36803724
#~ "Tegangan dari mikrokontroler turun atau mati. Pastikan sumber tegangan "
36813725
#~ "memberikan daya\n"
36823726

3683-
#~ msgid "To exit, please reset the board without "
3684-
#~ msgstr "Untuk keluar, silahkan reset board tanpa "
3685-
36863727
#~ msgid "UART(%d) does not exist"
36873728
#~ msgstr "UART(%d) tidak ada"
36883729

‎locale/cs.po

Lines changed: 55 additions & 11 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-08-30 14:38-0400\n"
8+
"POT-Creation-Date: 2020-09-13 14:21-0500\n"
99
"PO-Revision-Date: 2020-05-24 03:22+0000\n"
1010
"Last-Translator: dronecz <mzuzelka@gmail.com>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,14 +34,6 @@ msgstr ""
3434
"Založte prosím problém s obsahem vaší jednotky CIRCUITPY na adrese\n"
3535
"https://github.com/adafruit/circuitpython/issues\n"
3636

37-
#: supervisor/shared/safe_mode.c
38-
msgid ""
39-
"\n"
40-
"To exit, please reset the board without "
41-
msgstr ""
42-
"\n"
43-
"Pro ukončení, prosím resetujte desku bez "
44-
4537
#: py/obj.c
4638
msgid " File \"%q\""
4739
msgstr " Soubor \"%q\""
@@ -279,7 +271,7 @@ msgstr ""
279271
msgid "A hardware interrupt channel is already in use"
280272
msgstr ""
281273

282-
#: shared-bindings/_bleio/Address.c
274+
#: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
283275
#, c-format
284276
msgid "Address must be %d bytes long"
285277
msgstr ""
@@ -377,6 +369,10 @@ msgstr ""
377369
msgid "Attempted heap allocation when MicroPython VM not running."
378370
msgstr ""
379371

372+
#: shared-bindings/wifi/Radio.c
373+
msgid "Authentication failure"
374+
msgstr ""
375+
380376
#: main.c
381377
msgid "Auto-reload is off.\n"
382378
msgstr ""
@@ -584,6 +580,10 @@ msgid ""
584580
"boot. Press again to exit safe mode.\n"
585581
msgstr ""
586582

583+
#: supervisor/shared/safe_mode.c
584+
msgid "CircuitPython was unable to allocate the heap.\n"
585+
msgstr ""
586+
587587
#: shared-module/bitbangio/SPI.c
588588
msgid "Clock pin init failed."
589589
msgstr ""
@@ -1227,6 +1227,10 @@ msgstr ""
12271227
msgid "No more timers available on this pin."
12281228
msgstr ""
12291229

1230+
#: shared-bindings/wifi/Radio.c
1231+
msgid "No network with that ssid"
1232+
msgstr ""
1233+
12301234
#: shared-module/touchio/TouchIn.c
12311235
msgid "No pulldown on pin; 1Mohm recommended"
12321236
msgstr ""
@@ -1247,6 +1251,10 @@ msgstr ""
12471251
msgid "Nordic Soft Device failure assertion."
12481252
msgstr ""
12491253

1254+
#: shared-bindings/ipaddress/IPv4Address.c shared-bindings/ipaddress/__init__.c
1255+
msgid "Not a valid IP string"
1256+
msgstr ""
1257+
12501258
#: ports/nrf/common-hal/_bleio/__init__.c
12511259
#: shared-bindings/_bleio/CharacteristicBuffer.c
12521260
msgid "Not connected"
@@ -1291,6 +1299,10 @@ msgid ""
12911299
"%d bpp given"
12921300
msgstr ""
12931301

1302+
#: shared-bindings/ipaddress/__init__.c
1303+
msgid "Only raw int supported for ip"
1304+
msgstr ""
1305+
12941306
#: shared-bindings/audiobusio/PDMIn.c
12951307
msgid "Oversample must be multiple of 8."
12961308
msgstr ""
@@ -1487,6 +1499,10 @@ msgstr ""
14871499
msgid "Serializer in use"
14881500
msgstr ""
14891501

1502+
#: shared-bindings/ssl/SSLContext.c
1503+
msgid "Server side context cannot have hostname"
1504+
msgstr ""
1505+
14901506
#: shared-bindings/nvm/ByteArray.c
14911507
msgid "Slice and value different lengths."
14921508
msgstr ""
@@ -1587,6 +1603,10 @@ msgid ""
15871603
"Timer was reserved for internal use - declare PWM pins earlier in the program"
15881604
msgstr ""
15891605

1606+
#: supervisor/shared/safe_mode.c
1607+
msgid "To exit, please reset the board without "
1608+
msgstr ""
1609+
15901610
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15911611
msgid "Too many channels in sample."
15921612
msgstr ""
@@ -1682,6 +1702,10 @@ msgstr ""
16821702
msgid "Unexpected nrfx uuid type"
16831703
msgstr ""
16841704

1705+
#: shared-bindings/wifi/Radio.c
1706+
msgid "Unknown failure"
1707+
msgstr ""
1708+
16851709
#: ports/nrf/common-hal/_bleio/__init__.c
16861710
#, c-format
16871711
msgid "Unknown gatt error: 0x%04x"
@@ -1785,6 +1809,10 @@ msgid ""
17851809
"To list built-in modules please do `help(\"modules\")`.\n"
17861810
msgstr ""
17871811

1812+
#: shared-bindings/wifi/Radio.c
1813+
msgid "WiFi password must be between 8 and 63 characters"
1814+
msgstr ""
1815+
17881816
#: ports/nrf/common-hal/_bleio/PacketBuffer.c
17891817
msgid "Writes not supported on Characteristic"
17901818
msgstr ""
@@ -1899,7 +1927,7 @@ msgstr ""
18991927
msgid "bad format string"
19001928
msgstr ""
19011929

1902-
#: py/binary.c
1930+
#: py/binary.c py/objarray.c
19031931
msgid "bad typecode"
19041932
msgstr ""
19051933

@@ -1952,6 +1980,10 @@ msgstr ""
19521980
msgid "bytes > 8 bits not supported"
19531981
msgstr ""
19541982

1983+
#: py/objarray.c
1984+
msgid "bytes length not a multiple of item size"
1985+
msgstr ""
1986+
19551987
#: py/objstr.c
19561988
msgid "bytes value out of range"
19571989
msgstr ""
@@ -2917,6 +2949,11 @@ msgstr ""
29172949
msgid "overflow converting long int to machine word"
29182950
msgstr ""
29192951

2952+
#: py/modstruct.c
2953+
#, c-format
2954+
msgid "pack expected %d items for packing (got %d)"
2955+
msgstr ""
2956+
29202957
#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c
29212958
msgid "palette must be 32 bytes long"
29222959
msgstr ""
@@ -3390,5 +3427,12 @@ msgstr ""
33903427
msgid "zi must be of shape (n_section, 2)"
33913428
msgstr ""
33923429

3430+
#~ msgid ""
3431+
#~ "\n"
3432+
#~ "To exit, please reset the board without "
3433+
#~ msgstr ""
3434+
#~ "\n"
3435+
#~ "Pro ukončení, prosím resetujte desku bez "
3436+
33933437
#~ msgid "%q indices must be integers, not %s"
33943438
#~ msgstr "Indexy %q musí být celá čísla, nikoli %s"

0 commit comments

Comments
 (0)
0