Skip to content

Commit 596e0e4

Browse files
dhalbertdhalbert
committed
merge from upstream
2 parents e308a9e + bd87201 commit 596e0e4

29 files changed

Lines changed: 511 additions & 329 deletions

File tree

‎README.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,14 @@ Behavior
114114
finishes or is interrupted. After it is done running, the vm and
115115
hardware is reinitialized. **This means you cannot read state from**
116116
``code.py`` **in the REPL anymore.** CircuitPython's goal for this
117-
change includes reduce confusion about pins and memory being used.
117+
change includes reducing confusion about pins and memory being used.
118118
- After ``code.py`` the REPL can be entered by pressing any key. It no
119119
longer shares state with ``code.py`` so it is a fresh vm.
120120
- Autoreload state will be maintained across reload.
121121
- Adds a safe mode that does not run user code after a hard crash or
122122
brown out. The hope is that this will make it easier to fix code that
123123
causes nasty crashes by making it available through mass storage
124-
after the crash. A reset (the button) is needed after its fixed to
124+
after the crash. A reset (the button) is needed after it's fixed to
125125
get back into normal mode.
126126
- RGB status LED indicating CircuitPython state, and errors through a sequence of colored flashes.
127127
- Re-runs ``code.py`` or other main file after file system writes over USB mass storage. (Disable with

‎locale/ID.po‎

Lines changed: 12 additions & 5 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-11-23 10:10-0600\n"
8+
"POT-Creation-Date: 2020-11-24 15:40-0500\n"
99
"PO-Revision-Date: 2020-10-10 23:51+0000\n"
1010
"Last-Translator: oon arfiandwi <oon.arfiandwi@gmail.com>\n"
1111
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -301,6 +301,7 @@ msgid "All I2C peripherals are in use"
301301
msgstr "Semua perangkat I2C sedang digunakan"
302302

303303
#: ports/esp32s2/common-hal/countio/Counter.c
304+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
304305
#: ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
305306
msgid "All PCNT units in use"
306307
msgstr ""
@@ -337,6 +338,7 @@ msgstr "Semua timer untuk pin ini sedang digunakan"
337338
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
338339
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
339340
#: ports/cxd56/common-hal/pulseio/PulseOut.c
341+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
340342
#: ports/esp32s2/common-hal/neopixel_write/__init__.c
341343
#: ports/esp32s2/common-hal/pulseio/PulseIn.c
342344
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
@@ -1107,6 +1109,7 @@ msgid "Invalid byteorder string"
11071109
msgstr "String byteorder tidak valid"
11081110

11091111
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
1112+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
11101113
msgid "Invalid capture period. Valid range: 1 - 500"
11111114
msgstr "Periode penangkapan tidak valid. Kisaran yang valid: 1 - 500"
11121115

@@ -1283,6 +1286,10 @@ msgstr "Harus menyediakan pin MISO atau MOSI"
12831286
msgid "Must use a multiple of 6 rgb pins, not %d"
12841287
msgstr "Harus menggunakan kelipatan 6 pin rgb, bukan %d"
12851288

1289+
#: ports/esp32s2/common-hal/nvm/ByteArray.c
1290+
msgid "NVS Error"
1291+
msgstr ""
1292+
12861293
#: py/parse.c
12871294
msgid "Name too long"
12881295
msgstr "Nama terlalu panjang"
@@ -1435,14 +1442,14 @@ msgstr "Parity ganjil tidak didukung"
14351442
msgid "Only 8 or 16 bit mono with "
14361443
msgstr "Hanya 8 atau 16 bit mono dengan "
14371444

1438-
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1439-
msgid "Only IPv4 SOCK_STREAM sockets supported"
1440-
msgstr ""
1441-
14421445
#: ports/esp32s2/common-hal/wifi/__init__.c
14431446
msgid "Only IPv4 addresses supported"
14441447
msgstr ""
14451448

1449+
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1450+
msgid "Only IPv4 sockets supported"
1451+
msgstr ""
1452+
14461453
#: shared-module/displayio/OnDiskBitmap.c
14471454
#, c-format
14481455
msgid ""

‎locale/circuitpython.pot‎

Lines changed: 6 additions & 38 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-11-27 16:03-0500\n"
11+
"POT-Creation-Date: 2020-11-24 15:40-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 <LL@li.org>\n"
@@ -1427,14 +1427,14 @@ msgstr ""
14271427
msgid "Only 8 or 16 bit mono with "
14281428
msgstr ""
14291429

1430-
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1431-
msgid "Only IPv4 SOCK_STREAM sockets supported"
1432-
msgstr ""
1433-
14341430
#: ports/esp32s2/common-hal/wifi/__init__.c
14351431
msgid "Only IPv4 addresses supported"
14361432
msgstr ""
14371433

1434+
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1435+
msgid "Only IPv4 sockets supported"
1436+
msgstr ""
1437+
14381438
#: shared-module/displayio/OnDiskBitmap.c
14391439
#, c-format
14401440
msgid ""
@@ -1448,10 +1448,6 @@ msgid ""
14481448
"%d bpp given"
14491449
msgstr ""
14501450

1451-
#: ports/esp32s2/common-hal/alarm/__init__.c
1452-
msgid "Only one alarm.time alarm can be set."
1453-
msgstr ""
1454-
14551451
#: shared-module/displayio/ColorConverter.c
14561452
msgid "Only one color can be transparent at a time"
14571453
msgstr ""
@@ -1509,10 +1505,6 @@ msgstr ""
15091505
msgid "Pin number already reserved by EXTI"
15101506
msgstr ""
15111507

1512-
#: ports/esp32s2/common-hal/alarm/__init__.c
1513-
msgid "PinAlarm not yet implemented"
1514-
msgstr ""
1515-
15161508
#: shared-bindings/rgbmatrix/RGBMatrix.c
15171509
#, c-format
15181510
msgid ""
@@ -1574,7 +1566,7 @@ msgstr ""
15741566
msgid "RTC calibration is not supported on this board"
15751567
msgstr ""
15761568

1577-
#: shared-bindings/alarm/time/TimeAlarm.c shared-bindings/time/__init__.c
1569+
#: shared-bindings/time/__init__.c
15781570
msgid "RTC is not supported on this board"
15791571
msgstr ""
15801572

@@ -1720,10 +1712,6 @@ msgstr ""
17201712
msgid "Supply at least one UART pin"
17211713
msgstr ""
17221714

1723-
#: shared-bindings/alarm/time/TimeAlarm.c
1724-
msgid "Supply one of monotonic_time or epoch_time"
1725-
msgstr ""
1726-
17271715
#: shared-bindings/gnss/GNSS.c
17281716
msgid "System entry must be gnss.SatelliteSystem"
17291717
msgstr ""
@@ -1787,10 +1775,6 @@ msgstr ""
17871775
msgid "Tile width must exactly divide bitmap width"
17881776
msgstr ""
17891777

1790-
#: shared-bindings/alarm/time/TimeAlarm.c
1791-
msgid "Time is in the past."
1792-
msgstr ""
1793-
17941778
#: ports/nrf/common-hal/_bleio/Adapter.c
17951779
#, c-format
17961780
msgid "Timeout is too long: Maximum timeout length is %d seconds"
@@ -2505,10 +2489,6 @@ msgstr ""
25052489
msgid "end_x should be an int"
25062490
msgstr ""
25072491

2508-
#: shared-bindings/alarm/time/TimeAlarm.c
2509-
msgid "epoch_time not supported on this board"
2510-
msgstr ""
2511-
25122492
#: ports/nrf/common-hal/busio/UART.c
25132493
#, c-format
25142494
msgid "error = 0x%08lX"
@@ -2878,10 +2858,6 @@ msgstr ""
28782858
msgid "invalid syntax for number"
28792859
msgstr ""
28802860

2881-
#: ports/esp32s2/common-hal/alarm/pin/__init__.c
2882-
msgid "io must be rtc io"
2883-
msgstr ""
2884-
28852861
#: py/objtype.c
28862862
msgid "issubclass() arg 1 must be a class"
28872863
msgstr ""
@@ -3569,10 +3545,6 @@ msgstr ""
35693545
msgid "trapz is defined for 1D arrays of equal length"
35703546
msgstr ""
35713547

3572-
#: ports/esp32s2/common-hal/alarm/pin/__init__.c
3573-
msgid "trigger level must be 0 or 1"
3574-
msgstr ""
3575-
35763548
#: extmod/ulab/code/linalg/linalg.c
35773549
msgid "tuple index out of range"
35783550
msgstr ""
@@ -3715,10 +3687,6 @@ msgstr ""
37153687
msgid "vectors must have same lengths"
37163688
msgstr ""
37173689

3718-
#: ports/esp32s2/common-hal/alarm/pin/__init__.c
3719-
msgid "wakeup conflict"
3720-
msgstr ""
3721-
37223690
#: ports/esp32s2/common-hal/watchdog/WatchDogTimer.c
37233691
msgid "watchdog not initialized"
37243692
msgstr ""

‎locale/cs.po‎

Lines changed: 12 additions & 5 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-11-23 10:10-0600\n"
8+
"POT-Creation-Date: 2020-11-24 15:40-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"
@@ -301,6 +301,7 @@ msgid "All I2C peripherals are in use"
301301
msgstr ""
302302

303303
#: ports/esp32s2/common-hal/countio/Counter.c
304+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
304305
#: ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
305306
msgid "All PCNT units in use"
306307
msgstr ""
@@ -337,6 +338,7 @@ msgstr ""
337338
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
338339
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
339340
#: ports/cxd56/common-hal/pulseio/PulseOut.c
341+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
340342
#: ports/esp32s2/common-hal/neopixel_write/__init__.c
341343
#: ports/esp32s2/common-hal/pulseio/PulseIn.c
342344
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
@@ -1090,6 +1092,7 @@ msgid "Invalid byteorder string"
10901092
msgstr ""
10911093

10921094
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
1095+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
10931096
msgid "Invalid capture period. Valid range: 1 - 500"
10941097
msgstr ""
10951098

@@ -1266,6 +1269,10 @@ msgstr ""
12661269
msgid "Must use a multiple of 6 rgb pins, not %d"
12671270
msgstr ""
12681271

1272+
#: ports/esp32s2/common-hal/nvm/ByteArray.c
1273+
msgid "NVS Error"
1274+
msgstr ""
1275+
12691276
#: py/parse.c
12701277
msgid "Name too long"
12711278
msgstr ""
@@ -1416,14 +1423,14 @@ msgstr ""
14161423
msgid "Only 8 or 16 bit mono with "
14171424
msgstr ""
14181425

1419-
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1420-
msgid "Only IPv4 SOCK_STREAM sockets supported"
1421-
msgstr ""
1422-
14231426
#: ports/esp32s2/common-hal/wifi/__init__.c
14241427
msgid "Only IPv4 addresses supported"
14251428
msgstr ""
14261429

1430+
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1431+
msgid "Only IPv4 sockets supported"
1432+
msgstr ""
1433+
14271434
#: shared-module/displayio/OnDiskBitmap.c
14281435
#, c-format
14291436
msgid ""

‎locale/de_DE.po‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: \n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-11-23 10:10-0600\n"
9-
"PO-Revision-Date: 2020-06-16 18:24+0000\n"
10-
"Last-Translator: Andreas Buchen <andreas.buchen@gmail.com>\n"
8+
"POT-Creation-Date: 2020-11-24 15:40-0500\n"
9+
"PO-Revision-Date: 2020-11-26 03:11+0000\n"
10+
"Last-Translator: Daniel Bravo Darriba <bravodarriba@gmail.com>\n"
1111
"Language: de_DE\n"
1212
"MIME-Version: 1.0\n"
1313
"Content-Type: text/plain; charset=UTF-8\n"
1414
"Content-Transfer-Encoding: 8bit\n"
1515
"Plural-Forms: nplurals=2; plural=n != 1;\n"
16-
"X-Generator: Weblate 4.1.1-dev\n"
16+
"X-Generator: Weblate 4.4-dev\n"
1717

1818
#: main.c
1919
msgid ""
@@ -57,7 +57,7 @@ msgstr "%d Adress-Pins und %d rgb-Pins zeigen eine Höhe von %d, nicht von %d"
5757

5858
#: ports/atmel-samd/common-hal/sdioio/SDCard.c
5959
msgid "%q failure: %d"
60-
msgstr ""
60+
msgstr "%q Fehler: %d"
6161

6262
#: shared-bindings/microcontroller/Pin.c
6363
msgid "%q in use"
@@ -300,6 +300,7 @@ msgid "All I2C peripherals are in use"
300300
msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
301301

302302
#: ports/esp32s2/common-hal/countio/Counter.c
303+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
303304
#: ports/esp32s2/common-hal/rotaryio/IncrementalEncoder.c
304305
msgid "All PCNT units in use"
305306
msgstr ""
@@ -336,6 +337,7 @@ msgstr "Alle timer für diesen Pin werden bereits benutzt"
336337
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
337338
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
338339
#: ports/cxd56/common-hal/pulseio/PulseOut.c
340+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
339341
#: ports/esp32s2/common-hal/neopixel_write/__init__.c
340342
#: ports/esp32s2/common-hal/pulseio/PulseIn.c
341343
#: ports/esp32s2/common-hal/pulseio/PulseOut.c
@@ -1107,6 +1109,7 @@ msgid "Invalid byteorder string"
11071109
msgstr "Ungültige Byteorder String"
11081110

11091111
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
1112+
#: ports/esp32s2/common-hal/frequencyio/FrequencyIn.c
11101113
msgid "Invalid capture period. Valid range: 1 - 500"
11111114
msgstr "Ungültiger Aufnahmezeitraum. Gültiger Bereich: 1 - 500"
11121115

@@ -1285,6 +1288,10 @@ msgstr "Muss MISO- oder MOSI-Pin bereitstellen"
12851288
msgid "Must use a multiple of 6 rgb pins, not %d"
12861289
msgstr "Muss ein Vielfaches von 6 RGB-Pins verwenden, nicht %d"
12871290

1291+
#: ports/esp32s2/common-hal/nvm/ByteArray.c
1292+
msgid "NVS Error"
1293+
msgstr ""
1294+
12881295
#: py/parse.c
12891296
msgid "Name too long"
12901297
msgstr "Name zu lang"
@@ -1437,14 +1444,14 @@ msgstr "Eine ungerade Parität wird nicht unterstützt"
14371444
msgid "Only 8 or 16 bit mono with "
14381445
msgstr "Nur 8 oder 16 bit mono mit "
14391446

1440-
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1441-
msgid "Only IPv4 SOCK_STREAM sockets supported"
1442-
msgstr ""
1443-
14441447
#: ports/esp32s2/common-hal/wifi/__init__.c
14451448
msgid "Only IPv4 addresses supported"
14461449
msgstr ""
14471450

1451+
#: ports/esp32s2/common-hal/socketpool/SocketPool.c
1452+
msgid "Only IPv4 sockets supported"
1453+
msgstr ""
1454+
14481455
#: shared-module/displayio/OnDiskBitmap.c
14491456
#, c-format
14501457
msgid ""

0 commit comments

Comments
 (0)