Skip to content

Commit e00696d

Browse files
dhalbertdhalbert
committed
merge from upstream and make translate
2 parents 58d29fe + 42143ca commit e00696d

50 files changed

Lines changed: 513 additions & 123 deletions

Some content is hidden

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

‎.travis.yml‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,32 @@ git:
1212
# pip packages, and so forth. By gathering activities together in optimal
1313
# ways, the "run time" and "total time" of the travis jobs can be minimized.
1414
#
15-
# Since at the time of writing Travis generally starts 5 or 6 jobs, the
16-
# builds have been organized into 5 groups of *approximately* equal durations.
17-
# Additionally, the jobs that need extra SDKs are also organized together.
15+
# Builds are organized so some will complete quickly, and others are of
16+
# approximately equal size. Try not to freeze out other Travis users.
17+
#
18+
# Board names are in alphabetical order for easy finding, but grouped by
19+
# Adafruit/modified-Adafruit and Other. Ideally they'd be separated into
20+
# separate jobs, but there are too many.
1821
#
1922
# When adding new boards, take a look on the travis CI page
2023
# https://travis-ci.org/adafruit/circuitpython to which build that installs
2124
# that SDK is shortest and add it there. In the case of major re-organizations,
2225
# just try to make the builds "about equal in run time"
2326
env:
24-
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="trinket_m0_haxpress circuitplayground_express mini_sam_m4 grandcentral_m4_express capablerobot_usbhub pygamer pca10056 pca10059 feather_nrf52840_express metro_nrf52840_express circuitplayground_bluefruit makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini electronut_labs_papyr electronut_labs_blip" 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 bast_pro_mini_m0 datum_distance pyruler" TRAVIS_SDK=arm
26-
- TRAVIS_BOARDS="cp32-m4 feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip escornabot_makech pygamer_advance datum_imu snekboard" TRAVIS_SDK=arm
27-
- TRAVIS_BOARDS="feather_m0_supersized feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10 kicksat-sprite ugame10 robohatmm1_m0 robohatmm1_m4 datum_light" TRAVIS_SDK=arm
28-
- TRAVIS_BOARDS="datalore_ip_m4 circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev pybadge pybadge_airlift datum_weather pyportal_titano" TRAVIS_SDK=arm
27+
# Non-board tasks
28+
- TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS=""
29+
# Adafruit and Nordic nRF boards
30+
- TRAVIS_BOARDS="circuitplayground_bluefruit feather_nrf52840_express metro_nrf52840_express pca10056 pca10059" TRAVIS_SDK=arm
31+
# Other nRF boards
32+
- TRAVIS_BOARDS="electronut_labs_blip electronut_labs_papyr makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_argon particle_boron particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm
33+
# Adafruit and modified Adafruit SAMD21 (M0) + Other SAMD21 (M0)
34+
- TRAVIS_BOARDS="circuitplayground_express circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m0_supersized feather_radiofruit_zigbee gemma_m0 hallowing_m0_express " TRAVIS_SDK=arm
35+
- TRAVIS_BOARDS="itsybitsy_m0_express metro_m0_express pirkey_m0 pyruler trinket_m0 trinket_m0_haxpress arduino_mkr1300 arduino_mkrzero arduino_zero bast_pro_mini_m0 catwan_usbstick datum_distance datum_imu datum_weather" TRAVIS_SDK=arm
36+
- TRAVIS_BOARDS="escornabot_makech meowmeow pewpew10 robohatmm1_m0 snekboard sparkfun_lumidrive sparkfun_redboard_turbo sparkfun_samd21_dev sparkfun_samd21_mini uchip ugame10" TRAVIS_SDK=arm
37+
# Adafruit SAMD51 (M4) + Other SAMD51
38+
- TRAVIS_BOARDS="feather_m4_express grandcentral_m4_express itsybitsy_m4_express metro_m4_airlift_lite metro_m4_express pybadge pybadge_airlift pygamer pygamer_advance" TRAVIS_SDK=arm
39+
- TRAVIS_BOARDS="pyportal pyportal_titano trellis_m4_express capablerobot_usbhub cp32-m4 datalore_ip_m4 datum_light kicksat-sprite mini_sam_m4 robohatmm1_m4 sam32" TRAVIS_SDK=arm
40+
2941

3042
addons:
3143
artifacts:

‎locale/ID.po‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ msgid "Slices not supported"
11381138
msgstr ""
11391139

11401140
#: ports/nrf/common-hal/bleio/Adapter.c
1141-
#, c-format
1141+
#, fuzzy, c-format
11421142
msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
11431143
msgstr "Dukungan soft device, id: 0x%08lX, pc: 0x%08l"
11441144

@@ -2284,6 +2284,14 @@ msgstr "panjang data string memiliki keganjilan (odd-length)"
22842284
msgid "offset out of bounds"
22852285
msgstr "modul tidak ditemukan"
22862286

2287+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2288+
msgid "only bit_depth=16 is supported"
2289+
msgstr ""
2290+
2291+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2292+
msgid "only sample_rate=16000 is supported"
2293+
msgstr ""
2294+
22872295
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
22882296
#: shared-bindings/nvm/ByteArray.c
22892297
msgid "only slices with step=1 (aka None) are supported"

‎locale/circuitpython.pot‎

Lines changed: 9 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: 2019-08-20 13:01-0400\n"
11+
"POT-Creation-Date: 2019-08-20 13:06-0400\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"
@@ -2248,6 +2248,14 @@ msgstr ""
22482248
msgid "offset out of bounds"
22492249
msgstr ""
22502250

2251+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2252+
msgid "only bit_depth=16 is supported"
2253+
msgstr ""
2254+
2255+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2256+
msgid "only sample_rate=16000 is supported"
2257+
msgstr ""
2258+
22512259
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
22522260
#: shared-bindings/nvm/ByteArray.c
22532261
msgid "only slices with step=1 (aka None) are supported"

‎locale/de_DE.po‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2295,6 +2295,14 @@ msgstr "String mit ungerader Länge"
22952295
msgid "offset out of bounds"
22962296
msgstr "offset außerhalb der Grenzen"
22972297

2298+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2299+
msgid "only bit_depth=16 is supported"
2300+
msgstr ""
2301+
2302+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2303+
msgid "only sample_rate=16000 is supported"
2304+
msgstr ""
2305+
22982306
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
22992307
#: shared-bindings/nvm/ByteArray.c
23002308
msgid "only slices with step=1 (aka None) are supported"

‎locale/en_US.po‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2248,6 +2248,14 @@ msgstr ""
22482248
msgid "offset out of bounds"
22492249
msgstr ""
22502250

2251+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2252+
msgid "only bit_depth=16 is supported"
2253+
msgstr ""
2254+
2255+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2256+
msgid "only sample_rate=16000 is supported"
2257+
msgstr ""
2258+
22512259
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
22522260
#: shared-bindings/nvm/ByteArray.c
22532261
msgid "only slices with step=1 (aka None) are supported"

‎locale/en_x_pirate.po‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2252,6 +2252,14 @@ msgstr ""
22522252
msgid "offset out of bounds"
22532253
msgstr ""
22542254

2255+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2256+
msgid "only bit_depth=16 is supported"
2257+
msgstr ""
2258+
2259+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2260+
msgid "only sample_rate=16000 is supported"
2261+
msgstr ""
2262+
22552263
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
22562264
#: shared-bindings/nvm/ByteArray.c
22572265
msgid "only slices with step=1 (aka None) are supported"

‎locale/es.po‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ msgstr "No se puede leer el valor del atributo. err 0x%02x"
635635

636636
#: ports/nrf/common-hal/bleio/Characteristic.c
637637
#: ports/nrf/common-hal/bleio/Descriptor.c
638-
#, c-format
638+
#, fuzzy, c-format
639639
msgid "Failed to read attribute value, err 0x%04x"
640640
msgstr "Error al leer valor del atributo, err 0x%04"
641641

@@ -2311,6 +2311,14 @@ msgstr "string de longitud impar"
23112311
msgid "offset out of bounds"
23122312
msgstr "address fuera de límites"
23132313

2314+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2315+
msgid "only bit_depth=16 is supported"
2316+
msgstr ""
2317+
2318+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2319+
msgid "only sample_rate=16000 is supported"
2320+
msgstr ""
2321+
23142322
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
23152323
#: shared-bindings/nvm/ByteArray.c
23162324
msgid "only slices with step=1 (aka None) are supported"

‎locale/fil.po‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2320,6 +2320,14 @@ msgstr "odd-length string"
23202320
msgid "offset out of bounds"
23212321
msgstr "wala sa sakop ang address"
23222322

2323+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2324+
msgid "only bit_depth=16 is supported"
2325+
msgstr ""
2326+
2327+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2328+
msgid "only sample_rate=16000 is supported"
2329+
msgstr ""
2330+
23232331
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
23242332
#: shared-bindings/nvm/ByteArray.c
23252333
msgid "only slices with step=1 (aka None) are supported"

‎locale/fr.po‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2356,6 +2356,14 @@ msgstr "chaîne de longueur impaire"
23562356
msgid "offset out of bounds"
23572357
msgstr "adresse hors limites"
23582358

2359+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2360+
msgid "only bit_depth=16 is supported"
2361+
msgstr ""
2362+
2363+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2364+
msgid "only sample_rate=16000 is supported"
2365+
msgstr ""
2366+
23592367
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
23602368
#: shared-bindings/nvm/ByteArray.c
23612369
msgid "only slices with step=1 (aka None) are supported"

‎locale/it_IT.po‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ msgid "'%s' expects {r0, r1, ...}"
112112
msgstr "'%s' aspetta un registro"
113113

114114
#: py/emitinlinextensa.c
115-
#, c-format
115+
#, fuzzy, c-format
116116
msgid "'%s' integer %d is not within range %d..%d"
117117
msgstr "intero '%s' non è nell'intervallo %d..%d"
118118

@@ -1566,7 +1566,7 @@ msgid "can't assign to expression"
15661566
msgstr "impossibile assegnare all'espressione"
15671567

15681568
#: py/obj.c
1569-
#, c-format
1569+
#, fuzzy, c-format
15701570
msgid "can't convert %s to complex"
15711571
msgstr "non è possibile convertire a complex"
15721572

@@ -2316,6 +2316,14 @@ msgstr "stringa di lunghezza dispari"
23162316
msgid "offset out of bounds"
23172317
msgstr "indirizzo fuori limite"
23182318

2319+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2320+
msgid "only bit_depth=16 is supported"
2321+
msgstr ""
2322+
2323+
#: ports/nrf/common-hal/audiobusio/PDMIn.c
2324+
msgid "only sample_rate=16000 is supported"
2325+
msgstr ""
2326+
23192327
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
23202328
#: shared-bindings/nvm/ByteArray.c
23212329
msgid "only slices with step=1 (aka None) are supported"
@@ -2637,7 +2645,7 @@ msgid "unindent does not match any outer indentation level"
26372645
msgstr ""
26382646

26392647
#: py/objstr.c
2640-
#, c-format
2648+
#, fuzzy, c-format
26412649
msgid "unknown conversion specifier %c"
26422650
msgstr "specificatore di conversione %s sconosciuto"
26432651

0 commit comments

Comments
 (0)