Skip to content

Commit 3618461

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/master' into circuitpython-nickzoic-1042-nrf-nvm-bytearray-2
2 parents 18908c2 + f115ec2 commit 3618461

File tree

101 files changed

+615
-415
lines changed

Some content is hidden

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

101 files changed

+615
-415
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ git:
2222
# just try to make the builds "about equal in run time"
2323
env:
2424
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm:nrf
25-
- TRAVIS_BOARDS="metro_m0_express metro_m4_express metro_m4_airlift_lite pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo" TRAVIS_SDK=arm
25+
- TRAVIS_BOARDS="metro_m0_express metro_m4_express metro_m4_airlift_lite pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo bast_pro_mini_m0" TRAVIS_SDK=arm
2626
- TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip" TRAVIS_SDK=arm
2727
- TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10" TRAVIS_SDK=arm
2828
- TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev pybadge" TRAVIS_SDK=arm

‎locale/ID.po‎

Lines changed: 4 additions & 12 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: 2019-04-04 13:37-0700\n"
11+
"POT-Creation-Date: 2019-04-08 16: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"
@@ -924,17 +924,9 @@ msgstr "Tidak ada pin TX"
924924
msgid "No available clocks"
925925
msgstr ""
926926

927-
#: supervisor/shared/board_busses.c
928-
msgid "No default I2C bus"
929-
msgstr "Tidak ada standar bus I2C"
930-
931-
#: supervisor/shared/board_busses.c
932-
msgid "No default SPI bus"
933-
msgstr "Tidak ada standar bus SPI"
934-
935-
#: supervisor/shared/board_busses.c
936-
msgid "No default UART bus"
937-
msgstr "Tidak ada standar bus UART"
927+
#: shared-bindings/board/__init__.c
928+
msgid "No default %q bus"
929+
msgstr "Tidak ada standar bus %q"
938930

939931
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
940932
msgid "No free GCLKs"

‎locale/circuitpython.pot‎

Lines changed: 3 additions & 11 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: 2019-04-04 13:37-0700\n"
11+
"POT-Creation-Date: 2019-04-08 16: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"
@@ -899,16 +899,8 @@ msgstr ""
899899
msgid "No available clocks"
900900
msgstr ""
901901

902-
#: supervisor/shared/board_busses.c
903-
msgid "No default I2C bus"
904-
msgstr ""
905-
906-
#: supervisor/shared/board_busses.c
907-
msgid "No default SPI bus"
908-
msgstr ""
909-
910-
#: supervisor/shared/board_busses.c
911-
msgid "No default UART bus"
902+
#: shared-bindings/board/__init__.c
903+
msgid "No default %q bus"
912904
msgstr ""
913905

914906
#: ports/atmel-samd/common-hal/touchio/TouchIn.c

‎locale/de_DE.po‎

Lines changed: 4 additions & 12 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: 2019-04-04 13:37-0700\n"
10+
"POT-Creation-Date: 2019-04-08 16:48-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -912,17 +912,9 @@ msgstr "Kein TX Pin"
912912
msgid "No available clocks"
913913
msgstr ""
914914

915-
#: supervisor/shared/board_busses.c
916-
msgid "No default I2C bus"
917-
msgstr "Kein Standard I2C Bus"
918-
919-
#: supervisor/shared/board_busses.c
920-
msgid "No default SPI bus"
921-
msgstr "Kein Standard SPI Bus"
922-
923-
#: supervisor/shared/board_busses.c
924-
msgid "No default UART bus"
925-
msgstr "Kein Standard UART Bus"
915+
#: shared-bindings/board/__init__.c
916+
msgid "No default %q bus"
917+
msgstr "Kein Standard %q Bus"
926918

927919
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
928920
msgid "No free GCLKs"

‎locale/en_US.po‎

Lines changed: 3 additions & 11 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: 2019-04-04 13:37-0700\n"
10+
"POT-Creation-Date: 2019-04-08 16:48-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -899,16 +899,8 @@ msgstr ""
899899
msgid "No available clocks"
900900
msgstr ""
901901

902-
#: supervisor/shared/board_busses.c
903-
msgid "No default I2C bus"
904-
msgstr ""
905-
906-
#: supervisor/shared/board_busses.c
907-
msgid "No default SPI bus"
908-
msgstr ""
909-
910-
#: supervisor/shared/board_busses.c
911-
msgid "No default UART bus"
902+
#: shared-bindings/board/__init__.c
903+
msgid "No default %q bus"
912904
msgstr ""
913905

914906
#: ports/atmel-samd/common-hal/touchio/TouchIn.c

‎locale/en_x_pirate.po‎

Lines changed: 3 additions & 11 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: 2019-04-04 13:37-0700\n"
10+
"POT-Creation-Date: 2019-04-08 16:48-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -903,16 +903,8 @@ msgstr ""
903903
msgid "No available clocks"
904904
msgstr ""
905905

906-
#: supervisor/shared/board_busses.c
907-
msgid "No default I2C bus"
908-
msgstr ""
909-
910-
#: supervisor/shared/board_busses.c
911-
msgid "No default SPI bus"
912-
msgstr ""
913-
914-
#: supervisor/shared/board_busses.c
915-
msgid "No default UART bus"
906+
#: shared-bindings/board/__init__.c
907+
msgid "No default %q bus"
916908
msgstr ""
917909

918910
#: ports/atmel-samd/common-hal/touchio/TouchIn.c

‎locale/es.po‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: \n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-04-04 13:37-0700\n"
11+
"POT-Creation-Date: 2019-04-08 16:48-0700\n"
1212
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -937,17 +937,9 @@ msgstr "Sin pin TX"
937937
msgid "No available clocks"
938938
msgstr "Relojes no disponibles"
939939

940-
#: supervisor/shared/board_busses.c
941-
msgid "No default I2C bus"
942-
msgstr "Sin bus I2C por defecto"
943-
944-
#: supervisor/shared/board_busses.c
945-
msgid "No default SPI bus"
946-
msgstr "Sin bus SPI por defecto"
947-
948-
#: supervisor/shared/board_busses.c
949-
msgid "No default UART bus"
950-
msgstr "Sin bus UART por defecto"
940+
#: shared-bindings/board/__init__.c
941+
msgid "No default %q bus"
942+
msgstr "Sin bus %q por defecto"
951943

952944
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
953945
msgid "No free GCLKs"

‎locale/fil.po‎

Lines changed: 4 additions & 12 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: 2019-04-04 13:37-0700\n"
10+
"POT-Creation-Date: 2019-04-08 16: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"
@@ -933,17 +933,9 @@ msgstr "Walang TX pin"
933933
msgid "No available clocks"
934934
msgstr ""
935935

936-
#: supervisor/shared/board_busses.c
937-
msgid "No default I2C bus"
938-
msgstr "Walang default na I2C bus"
939-
940-
#: supervisor/shared/board_busses.c
941-
msgid "No default SPI bus"
942-
msgstr "Walang default SPI bus"
943-
944-
#: supervisor/shared/board_busses.c
945-
msgid "No default UART bus"
946-
msgstr "Walang default UART bus"
936+
#: shared-bindings/board/__init__.c
937+
msgid "No default %q bus"
938+
msgstr "Walang default na %q bus"
947939

948940
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
949941
msgid "No free GCLKs"

‎locale/fr.po‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-04-04 13:37-0700\n"
10+
"POT-Creation-Date: 2019-04-08 16:48-0700\n"
1111
"PO-Revision-Date: 2018-12-23 20:05+0100\n"
1212
"Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n"
1313
"Language-Team: fr\n"
@@ -936,17 +936,9 @@ msgstr "Pas de broche TX"
936936
msgid "No available clocks"
937937
msgstr ""
938938

939-
#: supervisor/shared/board_busses.c
940-
msgid "No default I2C bus"
941-
msgstr "Pas de bus I2C par défaut"
942-
943-
#: supervisor/shared/board_busses.c
944-
msgid "No default SPI bus"
945-
msgstr "Pas de bus SPI par défaut"
946-
947-
#: supervisor/shared/board_busses.c
948-
msgid "No default UART bus"
949-
msgstr "Pas de bus UART par défaut"
939+
#: shared-bindings/board/__init__.c
940+
msgid "No default %q bus"
941+
msgstr "Pas de bus %q par défaut"
950942

951943
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
952944
msgid "No free GCLKs"

‎locale/it_IT.po‎

Lines changed: 4 additions & 12 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: 2019-04-04 13:37-0700\n"
11+
"POT-Creation-Date: 2019-04-08 16:48-0700\n"
1212
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
1313
"Last-Translator: Enrico Paganin <enrico.paganin@mail.com>\n"
1414
"Language-Team: \n"
@@ -932,17 +932,9 @@ msgstr "Nessun pin TX"
932932
msgid "No available clocks"
933933
msgstr ""
934934

935-
#: supervisor/shared/board_busses.c
936-
msgid "No default I2C bus"
937-
msgstr "Nessun bus I2C predefinito"
938-
939-
#: supervisor/shared/board_busses.c
940-
msgid "No default SPI bus"
941-
msgstr "Nessun bus SPI predefinito"
942-
943-
#: supervisor/shared/board_busses.c
944-
msgid "No default UART bus"
945-
msgstr "Nessun bus UART predefinito"
935+
#: shared-bindings/board/__init__.c
936+
msgid "No default %q bus"
937+
msgstr "Nessun bus %q predefinito"
946938

947939
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
948940
msgid "No free GCLKs"

0 commit comments

Comments
 (0)