Skip to content

Commit 198f957

Browse files
xobsxobs
authored
Merge pull request adafruit#1 from tannewt/wdt-nrf
Merge and a few final tweaks
2 parents aa04452 + 1ed4978 commit 198f957

26 files changed

Lines changed: 387 additions & 242 deletions

File tree

‎locale/ID.po‎

Lines changed: 12 additions & 8 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 11:28+0800\n"
11+
"POT-Creation-Date: 2020-05-27 10:46-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 <LL@li.org>\n"
@@ -372,6 +372,10 @@ msgstr "Bit clock dan word harus memiliki kesamaan pada clock unit"
372372
msgid "Bit depth must be multiple of 8."
373373
msgstr ""
374374

375+
#: ports/mimxrt10xx/common-hal/busio/UART.c
376+
msgid "Both RX and TX required for flow control"
377+
msgstr ""
378+
375379
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
376380
msgid "Both pins must support hardware interrupts"
377381
msgstr "Kedua pin harus mendukung hardware interrut"
@@ -812,7 +816,7 @@ msgstr ""
812816
msgid "Hardware busy, try alternative pins"
813817
msgstr ""
814818

815-
#: ports/stm/common-hal/busio/UART.c
819+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
816820
msgid "Hardware in use, try alternative pins"
817821
msgstr ""
818822

@@ -891,11 +895,11 @@ msgstr ""
891895
msgid "Invalid PWM frequency"
892896
msgstr "Frekuensi PWM tidak valid"
893897

894-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
898+
#: ports/stm/common-hal/busio/SPI.c
895899
msgid "Invalid SPI pin selection"
896900
msgstr ""
897901

898-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
902+
#: ports/stm/common-hal/busio/UART.c
899903
msgid "Invalid UART pin selection"
900904
msgstr ""
901905

@@ -971,7 +975,8 @@ msgstr "Pin untuk channel kanan tidak valid"
971975
#: ports/atmel-samd/common-hal/busio/UART.c
972976
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
973977
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
974-
#: ports/cxd56/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
978+
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/SPI.c
979+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
975980
msgid "Invalid pins"
976981
msgstr "Pin-pin tidak valid"
977982

@@ -1430,7 +1435,7 @@ msgstr ""
14301435
msgid "Stream missing readinto() or write() method."
14311436
msgstr ""
14321437

1433-
#: ports/stm/common-hal/busio/UART.c
1438+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
14341439
msgid "Supply at least one UART pin"
14351440
msgstr ""
14361441

@@ -3111,8 +3116,7 @@ msgstr ""
31113116
msgid "tuple/list required on RHS"
31123117
msgstr ""
31133118

3114-
#: ports/atmel-samd/common-hal/busio/UART.c
3115-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3119+
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
31163120
#: shared-bindings/busio/UART.c
31173121
msgid "tx and rx cannot both be None"
31183122
msgstr "tx dan rx keduanya tidak boleh kosong"

‎locale/circuitpython.pot‎

Lines changed: 12 additions & 8 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 11:28+0800\n"
11+
"POT-Creation-Date: 2020-05-27 10:46-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 <LL@li.org>\n"
@@ -368,6 +368,10 @@ msgstr ""
368368
msgid "Bit depth must be multiple of 8."
369369
msgstr ""
370370

371+
#: ports/mimxrt10xx/common-hal/busio/UART.c
372+
msgid "Both RX and TX required for flow control"
373+
msgstr ""
374+
371375
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
372376
msgid "Both pins must support hardware interrupts"
373377
msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
801805
msgid "Hardware busy, try alternative pins"
802806
msgstr ""
803807

804-
#: ports/stm/common-hal/busio/UART.c
808+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
805809
msgid "Hardware in use, try alternative pins"
806810
msgstr ""
807811

@@ -880,11 +884,11 @@ msgstr ""
880884
msgid "Invalid PWM frequency"
881885
msgstr ""
882886

883-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
887+
#: ports/stm/common-hal/busio/SPI.c
884888
msgid "Invalid SPI pin selection"
885889
msgstr ""
886890

887-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
891+
#: ports/stm/common-hal/busio/UART.c
888892
msgid "Invalid UART pin selection"
889893
msgstr ""
890894

@@ -960,7 +964,8 @@ msgstr ""
960964
#: ports/atmel-samd/common-hal/busio/UART.c
961965
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
962966
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
963-
#: ports/cxd56/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
967+
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/SPI.c
968+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
964969
msgid "Invalid pins"
965970
msgstr ""
966971

@@ -1414,7 +1419,7 @@ msgstr ""
14141419
msgid "Stream missing readinto() or write() method."
14151420
msgstr ""
14161421

1417-
#: ports/stm/common-hal/busio/UART.c
1422+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
14181423
msgid "Supply at least one UART pin"
14191424
msgstr ""
14201425

@@ -3085,8 +3090,7 @@ msgstr ""
30853090
msgid "tuple/list required on RHS"
30863091
msgstr ""
30873092

3088-
#: ports/atmel-samd/common-hal/busio/UART.c
3089-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3093+
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
30903094
#: shared-bindings/busio/UART.c
30913095
msgid "tx and rx cannot both be None"
30923096
msgstr ""

‎locale/cs.po‎

Lines changed: 12 additions & 8 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 11:28+0800\n"
11+
"POT-Creation-Date: 2020-05-27 10:46-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 <LL@li.org>\n"
@@ -368,6 +368,10 @@ msgstr ""
368368
msgid "Bit depth must be multiple of 8."
369369
msgstr ""
370370

371+
#: ports/mimxrt10xx/common-hal/busio/UART.c
372+
msgid "Both RX and TX required for flow control"
373+
msgstr ""
374+
371375
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
372376
msgid "Both pins must support hardware interrupts"
373377
msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
801805
msgid "Hardware busy, try alternative pins"
802806
msgstr ""
803807

804-
#: ports/stm/common-hal/busio/UART.c
808+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
805809
msgid "Hardware in use, try alternative pins"
806810
msgstr ""
807811

@@ -880,11 +884,11 @@ msgstr ""
880884
msgid "Invalid PWM frequency"
881885
msgstr ""
882886

883-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
887+
#: ports/stm/common-hal/busio/SPI.c
884888
msgid "Invalid SPI pin selection"
885889
msgstr ""
886890

887-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
891+
#: ports/stm/common-hal/busio/UART.c
888892
msgid "Invalid UART pin selection"
889893
msgstr ""
890894

@@ -960,7 +964,8 @@ msgstr ""
960964
#: ports/atmel-samd/common-hal/busio/UART.c
961965
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
962966
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
963-
#: ports/cxd56/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
967+
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/SPI.c
968+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
964969
msgid "Invalid pins"
965970
msgstr ""
966971

@@ -1414,7 +1419,7 @@ msgstr ""
14141419
msgid "Stream missing readinto() or write() method."
14151420
msgstr ""
14161421

1417-
#: ports/stm/common-hal/busio/UART.c
1422+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
14181423
msgid "Supply at least one UART pin"
14191424
msgstr ""
14201425

@@ -3085,8 +3090,7 @@ msgstr ""
30853090
msgid "tuple/list required on RHS"
30863091
msgstr ""
30873092

3088-
#: ports/atmel-samd/common-hal/busio/UART.c
3089-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3093+
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
30903094
#: shared-bindings/busio/UART.c
30913095
msgid "tx and rx cannot both be None"
30923096
msgstr ""

‎locale/de_DE.po‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-27 11:28+0800\n"
10+
"POT-Creation-Date: 2020-05-27 10:46-0700\n"
1111
"PO-Revision-Date: 2020-05-18 02:48+0000\n"
1212
"Last-Translator: Jeff Epler <jepler@gmail.com>\n"
1313
"Language-Team: German <https://later.unpythonic.net/projects/circuitpython/"
@@ -379,6 +379,10 @@ msgstr "Bit clock und word select müssen eine clock unit teilen"
379379
msgid "Bit depth must be multiple of 8."
380380
msgstr "Bit depth muss ein Vielfaches von 8 sein."
381381

382+
#: ports/mimxrt10xx/common-hal/busio/UART.c
383+
msgid "Both RX and TX required for flow control"
384+
msgstr ""
385+
382386
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
383387
msgid "Both pins must support hardware interrupts"
384388
msgstr "Beide pins müssen Hardware Interrupts unterstützen"
@@ -814,7 +818,7 @@ msgstr "Gruppe voll"
814818
msgid "Hardware busy, try alternative pins"
815819
msgstr ""
816820

817-
#: ports/stm/common-hal/busio/UART.c
821+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
818822
msgid "Hardware in use, try alternative pins"
819823
msgstr ""
820824

@@ -895,11 +899,11 @@ msgstr ""
895899
msgid "Invalid PWM frequency"
896900
msgstr "Ungültige PWM Frequenz"
897901

898-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
902+
#: ports/stm/common-hal/busio/SPI.c
899903
msgid "Invalid SPI pin selection"
900904
msgstr ""
901905

902-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
906+
#: ports/stm/common-hal/busio/UART.c
903907
msgid "Invalid UART pin selection"
904908
msgstr ""
905909

@@ -975,7 +979,8 @@ msgstr "Ungültiger Pin für rechten Kanal"
975979
#: ports/atmel-samd/common-hal/busio/UART.c
976980
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
977981
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
978-
#: ports/cxd56/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
982+
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/SPI.c
983+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
979984
msgid "Invalid pins"
980985
msgstr "Ungültige Pins"
981986

@@ -1438,7 +1443,7 @@ msgstr "Die Stackgröße sollte mindestens 256 sein"
14381443
msgid "Stream missing readinto() or write() method."
14391444
msgstr "Stream fehlt readinto() oder write() Methode."
14401445

1441-
#: ports/stm/common-hal/busio/UART.c
1446+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
14421447
msgid "Supply at least one UART pin"
14431448
msgstr ""
14441449

@@ -3133,8 +3138,7 @@ msgstr "tupel/list hat falsche Länge"
31333138
msgid "tuple/list required on RHS"
31343139
msgstr ""
31353140

3136-
#: ports/atmel-samd/common-hal/busio/UART.c
3137-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3141+
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
31383142
#: shared-bindings/busio/UART.c
31393143
msgid "tx and rx cannot both be None"
31403144
msgstr "tx und rx können nicht beide None sein"

‎locale/en_US.po‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-27 11:28+0800\n"
10+
"POT-Creation-Date: 2020-05-27 10:46-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -368,6 +368,10 @@ msgstr ""
368368
msgid "Bit depth must be multiple of 8."
369369
msgstr ""
370370

371+
#: ports/mimxrt10xx/common-hal/busio/UART.c
372+
msgid "Both RX and TX required for flow control"
373+
msgstr ""
374+
371375
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
372376
msgid "Both pins must support hardware interrupts"
373377
msgstr ""
@@ -801,7 +805,7 @@ msgstr ""
801805
msgid "Hardware busy, try alternative pins"
802806
msgstr ""
803807

804-
#: ports/stm/common-hal/busio/UART.c
808+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
805809
msgid "Hardware in use, try alternative pins"
806810
msgstr ""
807811

@@ -880,11 +884,11 @@ msgstr ""
880884
msgid "Invalid PWM frequency"
881885
msgstr ""
882886

883-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/stm/common-hal/busio/SPI.c
887+
#: ports/stm/common-hal/busio/SPI.c
884888
msgid "Invalid SPI pin selection"
885889
msgstr ""
886890

887-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
891+
#: ports/stm/common-hal/busio/UART.c
888892
msgid "Invalid UART pin selection"
889893
msgstr ""
890894

@@ -960,7 +964,8 @@ msgstr ""
960964
#: ports/atmel-samd/common-hal/busio/UART.c
961965
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
962966
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
963-
#: ports/cxd56/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
967+
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/SPI.c
968+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
964969
msgid "Invalid pins"
965970
msgstr ""
966971

@@ -1414,7 +1419,7 @@ msgstr ""
14141419
msgid "Stream missing readinto() or write() method."
14151420
msgstr ""
14161421

1417-
#: ports/stm/common-hal/busio/UART.c
1422+
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
14181423
msgid "Supply at least one UART pin"
14191424
msgstr ""
14201425

@@ -3085,8 +3090,7 @@ msgstr ""
30853090
msgid "tuple/list required on RHS"
30863091
msgstr ""
30873092

3088-
#: ports/atmel-samd/common-hal/busio/UART.c
3089-
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
3093+
#: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
30903094
#: shared-bindings/busio/UART.c
30913095
msgid "tx and rx cannot both be None"
30923096
msgstr ""

0 commit comments

Comments
 (0)