Skip to content

Commit ba724ff

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/master' into esp32s2_digitalio
2 parents fd0420d + 916ca9f commit ba724ff

39 files changed

Lines changed: 3606 additions & 45 deletions

File tree

‎conf.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import os
1919

2020
import recommonmark
21+
import subprocess
2122

2223
# If extensions (or modules to document with autodoc) are in another directory,
2324
# add these directories to sys.path here. If the directory is relative to the
@@ -67,6 +68,7 @@
6768
'.md': 'markdown',
6869
}
6970

71+
subprocess.check_output(["make", "stubs"])
7072
extensions.append('autoapi.extension')
7173

7274
autoapi_type = 'python'

‎docs/requirements.txt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
sphinx==1.8.5
2-
recommonmark==0.5.0
1+
sphinx<3
2+
recommonmark==0.6.0
33
sphinxcontrib-svg2pdfconverter==0.1.0
4+
astroid
5+
sphinx-autoapi

‎locale/ID.po‎

Lines changed: 6 additions & 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-05-20 08:55-0700\n"
11+
"POT-Creation-Date: 2020-05-20 10:48-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"
@@ -1493,6 +1493,11 @@ msgstr ""
14931493
msgid "Tile width must exactly divide bitmap width"
14941494
msgstr ""
14951495

1496+
#: ports/nrf/common-hal/_bleio/Adapter.c
1497+
#, c-format
1498+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1499+
msgstr ""
1500+
14961501
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14971502
msgid "Too many channels in sample."
14981503
msgstr "Terlalu banyak channel dalam sampel"

‎locale/circuitpython.pot‎

Lines changed: 6 additions & 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-05-20 08:55-0700\n"
11+
"POT-Creation-Date: 2020-05-20 10:48-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"
@@ -1477,6 +1477,11 @@ msgstr ""
14771477
msgid "Tile width must exactly divide bitmap width"
14781478
msgstr ""
14791479

1480+
#: ports/nrf/common-hal/_bleio/Adapter.c
1481+
#, c-format
1482+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1483+
msgstr ""
1484+
14801485
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14811486
msgid "Too many channels in sample."
14821487
msgstr ""

‎locale/cs.po‎

Lines changed: 6 additions & 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-05-20 08:55-0700\n"
11+
"POT-Creation-Date: 2020-05-20 10:48-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"
@@ -1477,6 +1477,11 @@ msgstr ""
14771477
msgid "Tile width must exactly divide bitmap width"
14781478
msgstr ""
14791479

1480+
#: ports/nrf/common-hal/_bleio/Adapter.c
1481+
#, c-format
1482+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1483+
msgstr ""
1484+
14801485
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14811486
msgid "Too many channels in sample."
14821487
msgstr ""

‎locale/de_DE.po‎

Lines changed: 6 additions & 1 deletion
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-20 08:55-0700\n"
10+
"POT-Creation-Date: 2020-05-20 10:48-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/"
@@ -1503,6 +1503,11 @@ msgstr ""
15031503
msgid "Tile width must exactly divide bitmap width"
15041504
msgstr ""
15051505

1506+
#: ports/nrf/common-hal/_bleio/Adapter.c
1507+
#, c-format
1508+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1509+
msgstr ""
1510+
15061511
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15071512
msgid "Too many channels in sample."
15081513
msgstr "Zu viele Kanäle im sample"

‎locale/en_US.po‎

Lines changed: 6 additions & 1 deletion
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-20 08:55-0700\n"
10+
"POT-Creation-Date: 2020-05-20 10:48-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1477,6 +1477,11 @@ msgstr ""
14771477
msgid "Tile width must exactly divide bitmap width"
14781478
msgstr ""
14791479

1480+
#: ports/nrf/common-hal/_bleio/Adapter.c
1481+
#, c-format
1482+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1483+
msgstr ""
1484+
14801485
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14811486
msgid "Too many channels in sample."
14821487
msgstr ""

‎locale/en_x_pirate.po‎

Lines changed: 6 additions & 1 deletion
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-20 08:55-0700\n"
10+
"POT-Creation-Date: 2020-05-20 10:48-0700\n"
1111
"PO-Revision-Date: 2020-03-30 22:11+0000\n"
1212
"Last-Translator: Tannewt <devnull@unpythonic.net>\n"
1313
"Language-Team: English <https://later.unpythonic.net/projects/circuitpython/"
@@ -1486,6 +1486,11 @@ msgstr ""
14861486
msgid "Tile width must exactly divide bitmap width"
14871487
msgstr ""
14881488

1489+
#: ports/nrf/common-hal/_bleio/Adapter.c
1490+
#, c-format
1491+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1492+
msgstr ""
1493+
14891494
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14901495
msgid "Too many channels in sample."
14911496
msgstr ""

‎locale/es.po‎

Lines changed: 6 additions & 1 deletion
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-20 08:55-0700\n"
10+
"POT-Creation-Date: 2020-05-20 10:48-0700\n"
1111
"PO-Revision-Date: 2020-05-17 20:56+0000\n"
1212
"Last-Translator: Jeff Epler <jepler@gmail.com>\n"
1313
"Language-Team: \n"
@@ -1495,6 +1495,11 @@ msgstr ""
14951495
msgid "Tile width must exactly divide bitmap width"
14961496
msgstr "Ancho del Tile debe dividir exactamente el ancho de mapa de bits"
14971497

1498+
#: ports/nrf/common-hal/_bleio/Adapter.c
1499+
#, c-format
1500+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1501+
msgstr ""
1502+
14981503
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
14991504
msgid "Too many channels in sample."
15001505
msgstr "Demasiados canales en sample."

‎locale/fil.po‎

Lines changed: 6 additions & 1 deletion
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-20 08:55-0700\n"
10+
"POT-Creation-Date: 2020-05-20 10:48-0700\n"
1111
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1212
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
1313
"Language-Team: fil\n"
@@ -1500,6 +1500,11 @@ msgstr ""
15001500
msgid "Tile width must exactly divide bitmap width"
15011501
msgstr ""
15021502

1503+
#: ports/nrf/common-hal/_bleio/Adapter.c
1504+
#, c-format
1505+
msgid "Timeout is too long: Maximum timeout length is %d seconds"
1506+
msgstr ""
1507+
15031508
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
15041509
msgid "Too many channels in sample."
15051510
msgstr "Sobra ang channels sa sample."

0 commit comments

Comments
 (0)