Skip to content

Commit 1ca29ec

Browse files
committed
Merge remote-tracking branch 'origin/main' into audioout-esp32
2 parents e20c65d + 047708e commit 1ca29ec

File tree

75 files changed

+1672
-408
lines changed

Some content is hidden

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

75 files changed

+1672
-408
lines changed

.github/workflows/pre-commit.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v1
1717
- uses: actions/setup-python@v1
18+
- name: Install deps
19+
run: sudo apt-get update && sudo apt-get install -y gettext
20+
- name: Populate selected submodules
21+
run: git submodule update --init extmod/ulab
1822
- name: set PY
1923
run: echo >>$GITHUB_ENV PY="$(python -c 'import hashlib, sys;print(hashlib.sha256(sys.version.encode()+sys.executable.encode()).hexdigest())')"
2024
- uses: actions/cache@v1

.pre-commit-config.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@ repos:
1111
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/esp32s2/esp-idf-config/.*|ports/esp32s2/boards/.*/sdkconfig)'
1212
- id: trailing-whitespace
1313
exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*)'
14+
- repo: local
15+
hooks:
16+
- id: translations
17+
name: Check Translations
18+
entry: sh -c "make translate"
19+
language: system
20+
always_run: true

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ pseudoxml:
222222
all-source:
223223

224224
locale/circuitpython.pot: all-source
225-
find $(TRANSLATE_SOURCES) -type d \( $(TRANSLATE_SOURCES_EXC) \) -prune -o -type f \( -iname "*.c" -o -iname "*.h" \) -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
225+
find $(TRANSLATE_SOURCES) -type d \( $(TRANSLATE_SOURCES_EXC) \) -prune -o -type f \( -iname "*.c" -o -iname "*.h" \) -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o - | sed -e '/"POT-Creation-Date: /d' > $@
226226

227227
# Historically, `make translate` updated the .pot file and ran msgmerge.
228228
# However, this was a frequent source of merge conflicts. Weblate can perform

conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
# Add any extra paths that contain custom files (such as robots.txt or
277277
# .htaccess) here, relative to this directory. These files are copied
278278
# directly to the root of the documentation.
279-
#html_extra_path = []
279+
html_extra_path = ["docs/robots.txt"]
280280

281281
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
282282
# using the given strftime format.

docs/robots.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
User-agent: *
2+
Allow: /*/latest/
3+
Allow: /en/latest/ # Fallback for bots that don't understand wildcards
4+
Allow: /*/6.0.x/
5+
Allow: /en/6.0.x/ # Fallback for bots that don't understand wildcards
6+
Disallow: /

lib/tinyusb

Submodule tinyusb updated 40 files

locale/ID.po

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: PACKAGE VERSION\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-12-22 22:54+0530\n"
9-
"PO-Revision-Date: 2020-12-30 22:25+0000\n"
8+
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
9+
"PO-Revision-Date: 2021-01-03 05:29+0000\n"
1010
"Last-Translator: oon arfiandwi <[email protected]>\n"
1111
"Language-Team: LANGUAGE <[email protected]>\n"
1212
"Language: ID\n"
@@ -1850,11 +1850,11 @@ msgstr "Tingkat sampel dari sampel tidak cocok dengan mixer"
18501850

18511851
#: shared-module/audiomixer/MixerVoice.c
18521852
msgid "The sample's signedness does not match the mixer's"
1853-
msgstr ""
1853+
msgstr "signedness dari sampel tidak cocok dengan mixer"
18541854

18551855
#: shared-bindings/displayio/TileGrid.c
18561856
msgid "Tile height must exactly divide bitmap height"
1857-
msgstr ""
1857+
msgstr "Tinggi tile harus persis membagi tinggi bitmap"
18581858

18591859
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
18601860
msgid "Tile index out of bounds"
@@ -1903,13 +1903,9 @@ msgid "Total data to write is larger than outgoing_packet_length"
19031903
msgstr ""
19041904
"Total data yang akan ditulis lebih besar daripada outgoing_packet_length"
19051905

1906-
#: ports/esp32s2/common-hal/alarm/touch/TouchAlarm.c
1907-
msgid "TouchAlarm not available in light sleep"
1908-
msgstr ""
1909-
19101906
#: py/obj.c
19111907
msgid "Traceback (most recent call last):\n"
1912-
msgstr ""
1908+
msgstr "Traceback (bagian terakhir dari panggilan terkini):\n"
19131909

19141910
#: shared-bindings/time/__init__.c
19151911
msgid "Tuple or struct_time argument required"
@@ -1945,15 +1941,15 @@ msgstr "Kesalahan USB"
19451941

19461942
#: shared-bindings/_bleio/UUID.c
19471943
msgid "UUID integer value must be 0-0xffff"
1948-
msgstr ""
1944+
msgstr "Nilai integer UUID harus 0-0xffff"
19491945

19501946
#: shared-bindings/_bleio/UUID.c
19511947
msgid "UUID string not 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
1952-
msgstr ""
1948+
msgstr "String UUID bukan 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
19531949

19541950
#: shared-bindings/_bleio/UUID.c
19551951
msgid "UUID value is not str, int or byte buffer"
1956-
msgstr ""
1952+
msgstr "Nilai UUID bukan str, int atau byte buffer"
19571953

19581954
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
19591955
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
@@ -1967,7 +1963,7 @@ msgstr ""
19671963
#: shared-module/displayio/I2CDisplay.c
19681964
#, c-format
19691965
msgid "Unable to find I2C Display at %x"
1970-
msgstr ""
1966+
msgstr "Tidak dapat menemukan Tampilan I2C di %x"
19711967

19721968
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
19731969
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
@@ -1976,23 +1972,23 @@ msgstr "Tidak dapat menemukan GCLK yang kosong"
19761972

19771973
#: py/parse.c
19781974
msgid "Unable to init parser"
1979-
msgstr ""
1975+
msgstr "Tidak dapat memulai parser"
19801976

19811977
#: shared-module/displayio/OnDiskBitmap.c
19821978
msgid "Unable to read color palette data"
1983-
msgstr ""
1979+
msgstr "Tidak dapat membaca data palet warna"
19841980

19851981
#: shared-bindings/nvm/ByteArray.c
19861982
msgid "Unable to write to nvm."
1987-
msgstr ""
1983+
msgstr "Tidak dapat menulis ke nvm."
19881984

19891985
#: shared-bindings/alarm/SleepMemory.c
19901986
msgid "Unable to write to sleep_memory."
19911987
msgstr ""
19921988

19931989
#: ports/nrf/common-hal/_bleio/UUID.c
19941990
msgid "Unexpected nrfx uuid type"
1995-
msgstr ""
1991+
msgstr "Tipe urf nrfx tak sesuai"
19961992

19971993
#: ports/esp32s2/common-hal/socketpool/Socket.c
19981994
#, c-format
@@ -2550,6 +2546,10 @@ msgstr ""
25502546
msgid "data must be of equal length"
25512547
msgstr ""
25522548

2549+
#: extmod/ulab/code/ndarray.c
2550+
msgid "data type not understood"
2551+
msgstr ""
2552+
25532553
#: py/parsenum.c
25542554
msgid "decimal numbers not supported"
25552555
msgstr ""
@@ -2860,7 +2860,7 @@ msgid "input and output shapes are not compatible"
28602860
msgstr ""
28612861

28622862
#: extmod/ulab/code/ulab_create.c
2863-
msgid "input argument must be an integer or a 2-tuple"
2863+
msgid "input argument must be an integer, a tuple, or a list"
28642864
msgstr ""
28652865

28662866
#: extmod/ulab/code/fft/fft.c
@@ -3103,6 +3103,10 @@ msgstr ""
31033103
msgid "maxiter should be > 0"
31043104
msgstr ""
31053105

3106+
#: extmod/ulab/code/numerical/numerical.c
3107+
msgid "median argument must be an ndarray"
3108+
msgstr ""
3109+
31063110
#: py/runtime.c
31073111
#, c-format
31083112
msgid "memory allocation failed, allocating %u bytes"
@@ -3333,10 +3337,6 @@ msgstr ""
33333337
msgid "operation is implemented for 1D Boolean arrays only"
33343338
msgstr ""
33353339

3336-
#: extmod/ulab/code/numerical/numerical.c
3337-
msgid "operation is not implemented for flattened array"
3338-
msgstr ""
3339-
33403340
#: extmod/ulab/code/numerical/numerical.c
33413341
msgid "operation is not implemented on ndarrays"
33423342
msgstr ""
@@ -3681,6 +3681,10 @@ msgstr ""
36813681
msgid "too many arguments provided with the given format"
36823682
msgstr ""
36833683

3684+
#: extmod/ulab/code/ulab_create.c
3685+
msgid "too many dimensions"
3686+
msgstr ""
3687+
36843688
#: extmod/ulab/code/ndarray.c
36853689
msgid "too many indices"
36863690
msgstr ""
@@ -3690,6 +3694,10 @@ msgstr ""
36903694
msgid "too many values to unpack (expected %d)"
36913695
msgstr ""
36923696

3697+
#: extmod/ulab/code/approx/approx.c
3698+
msgid "trapz is defined for 1D arrays"
3699+
msgstr ""
3700+
36933701
#: extmod/ulab/code/approx/approx.c
36943702
msgid "trapz is defined for 1D arrays of equal length"
36953703
msgstr ""
@@ -3698,10 +3706,6 @@ msgstr ""
36983706
msgid "trigger level must be 0 or 1"
36993707
msgstr ""
37003708

3701-
#: extmod/ulab/code/linalg/linalg.c
3702-
msgid "tuple index out of range"
3703-
msgstr ""
3704-
37053709
#: py/obj.c
37063710
msgid "tuple/list has wrong length"
37073711
msgstr ""

locale/circuitpython.pot

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2021-01-07 14:11-0600\n"
1211
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1312
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1413
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -281,6 +280,10 @@ msgstr ""
281280
msgid "3-arg pow() not supported"
282281
msgstr ""
283282

283+
#: shared-module/msgpack/__init__.c
284+
msgid "64 bit types"
285+
msgstr ""
286+
284287
#: ports/atmel-samd/common-hal/countio/Counter.c
285288
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
286289
msgid "A hardware interrupt channel is already in use"
@@ -1567,7 +1570,7 @@ msgstr ""
15671570
msgid "ParallelBus not yet supported"
15681571
msgstr ""
15691572

1570-
#: ports/esp32s2/i2s_common.c
1573+
#: ports/esp32s2/common-hal/audiobusio/__init__.c
15711574
msgid "Peripheral in use"
15721575
msgstr ""
15731576

@@ -2484,6 +2487,10 @@ msgstr ""
24842487
msgid "circle can only be registered in one parent"
24852488
msgstr ""
24862489

2490+
#: shared-bindings/msgpack/ExtType.c
2491+
msgid "code outside range 0~127"
2492+
msgstr ""
2493+
24872494
#: shared-bindings/displayio/Palette.c
24882495
msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
24892496
msgstr ""
@@ -2568,6 +2575,10 @@ msgstr ""
25682575
msgid "default 'except' must be last"
25692576
msgstr ""
25702577

2578+
#: shared-bindings/msgpack/__init__.c
2579+
msgid "default is not a function"
2580+
msgstr ""
2581+
25712582
#: shared-bindings/audiobusio/PDMIn.c
25722583
msgid ""
25732584
"destination buffer must be a bytearray or array of type 'B' for bit_depth = 8"
@@ -2667,6 +2678,10 @@ msgstr ""
26672678
msgid "expecting key:value for dict"
26682679
msgstr ""
26692680

2681+
#: shared-bindings/msgpack/__init__.c
2682+
msgid "ext_hook is not a function"
2683+
msgstr ""
2684+
26702685
#: py/argcheck.c
26712686
msgid "extra keyword arguments given"
26722687
msgstr ""
@@ -3199,6 +3214,10 @@ msgstr ""
31993214
msgid "no binding for nonlocal found"
32003215
msgstr ""
32013216

3217+
#: shared-module/msgpack/__init__.c
3218+
msgid "no default packer"
3219+
msgstr ""
3220+
32023221
#: py/builtinimport.c
32033222
msgid "no module named '%q'"
32043223
msgstr ""
@@ -3532,6 +3551,10 @@ msgstr ""
35323551
msgid "shape must be a tuple"
35333552
msgstr ""
35343553

3554+
#: shared-module/msgpack/__init__.c
3555+
msgid "short read"
3556+
msgstr ""
3557+
35353558
#: py/objstr.c
35363559
msgid "sign not allowed in string format specifier"
35373560
msgstr ""
@@ -3904,7 +3927,7 @@ msgstr ""
39043927
msgid "x value out of bounds"
39053928
msgstr ""
39063929

3907-
#: ports/esp32s2/i2s_common.c
3930+
#: ports/esp32s2/common-hal/audiobusio/__init__.c
39083931
msgid "xTaskCreate failed"
39093932
msgstr ""
39103933

0 commit comments

Comments
 (0)