Skip to content

Commit 80a752d

Browse files
tannewttannewt
committed
Merge latest adafruit/master in.
1 parent 1d0c616 commit 80a752d

File tree

17 files changed

+616
-503
lines changed

17 files changed

+616
-503
lines changed

‎README.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Contributors who follow the `Code of
6363
Conduct <https://github.com/adafruit/circuitpython/blob/master/CODE_OF_CONDUCT.md>`__
6464
are welcome to submit pull requests and they will be promptly reviewed
6565
by project admins. Please join the
66-
`Discord <https://discord.gg/nBQh6qu>`__ too.
66+
`Discord <https://adafru.it/discord>`__ too.
6767

6868
Branding
6969
------------

‎locale/ID.po

+48-40
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,20 @@ msgstr "buffers harus mempunyai panjang yang sama"
6262
msgid "%q should be an int"
6363
msgstr ""
6464

65-
#: py/objnamedtuple.c py/bc.c
65+
#: py/bc.c py/objnamedtuple.c
6666
msgid "%q() takes %d positional arguments but %d were given"
6767
msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan"
6868

6969
#: py/argcheck.c
7070
msgid "'%q' argument required"
7171
msgstr "'%q' argumen dibutuhkan"
7272

73-
#: py/emitinlinextensa.c py/emitinlinethumb.c
73+
#: py/emitinlinethumb.c py/emitinlinextensa.c
7474
#, c-format
7575
msgid "'%s' expects a label"
7676
msgstr ""
7777

78-
#: py/emitinlinextensa.c py/emitinlinethumb.c
78+
#: py/emitinlinethumb.c py/emitinlinextensa.c
7979
#, c-format
8080
msgid "'%s' expects a register"
8181
msgstr "'%s' mengharapkan sebuah register"
@@ -95,7 +95,7 @@ msgstr "'%s' mengharapkan sebuah FPU register"
9595
msgid "'%s' expects an address of the form [a, b]"
9696
msgstr "'%s' mengharapkan sebuah alamat dengan bentuk [a, b]"
9797

98-
#: py/emitinlinextensa.c py/emitinlinethumb.c
98+
#: py/emitinlinethumb.c py/emitinlinextensa.c
9999
#, c-format
100100
msgid "'%s' expects an integer"
101101
msgstr "'%s' mengharapkan integer"
@@ -139,7 +139,7 @@ msgstr ""
139139
msgid "'%s' object is not an iterator"
140140
msgstr ""
141141

142-
#: py/runtime.c py/objtype.c
142+
#: py/objtype.c py/runtime.c
143143
#, c-format
144144
msgid "'%s' object is not callable"
145145
msgstr ""
@@ -245,7 +245,7 @@ msgstr "Semua perangkat I2C sedang digunakan"
245245
msgid "All event channels in use"
246246
msgstr "Semua channel event sedang digunakan"
247247

248-
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c
248+
#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c
249249
msgid "All sync event channels in use"
250250
msgstr "Semua channel event yang disinkronisasi sedang digunakan"
251251

@@ -326,7 +326,7 @@ msgstr ""
326326
msgid "Buffer incorrect size. Should be %d bytes."
327327
msgstr ""
328328

329-
#: shared-bindings/busio/I2C.c shared-bindings/bitbangio/I2C.c
329+
#: shared-bindings/bitbangio/I2C.c shared-bindings/busio/I2C.c
330330
msgid "Buffer must be at least length 1"
331331
msgstr ""
332332

@@ -490,8 +490,8 @@ msgstr ""
490490
msgid "Data chunk must follow fmt chunk"
491491
msgstr ""
492492

493-
#: ports/nrf/common-hal/bleio/Peripheral.c
494493
#: ports/nrf/common-hal/bleio/Broadcaster.c
494+
#: ports/nrf/common-hal/bleio/Peripheral.c
495495
#, fuzzy
496496
msgid "Data too large for advertisement packet"
497497
msgstr "Tidak bisa menyesuaikan data ke dalam paket advertisment"
@@ -522,17 +522,18 @@ msgstr "Channel EXTINT sedang digunakan"
522522
msgid "Error in regex"
523523
msgstr "Error pada regex"
524524

525-
#: shared-bindings/microcontroller/Pin.c shared-bindings/terminalio/Terminal.c
525+
#: shared-bindings/microcontroller/Pin.c
526526
#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
527+
#: shared-bindings/terminalio/Terminal.c
527528
msgid "Expected a %q"
528529
msgstr ""
529530

530531
#: shared-bindings/bleio/CharacteristicBuffer.c
531532
msgid "Expected a Characteristic"
532533
msgstr ""
533534

534-
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Service.c
535-
#: shared-bindings/bleio/Descriptor.c
535+
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
536+
#: shared-bindings/bleio/Service.c
536537
msgid "Expected a UUID"
537538
msgstr ""
538539

@@ -656,8 +657,8 @@ msgstr "Gagal untuk melepaskan mutex, status: 0x%08lX"
656657
msgid "Failed to start advertising"
657658
msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
658659

659-
#: ports/nrf/common-hal/bleio/Peripheral.c
660660
#: ports/nrf/common-hal/bleio/Broadcaster.c
661+
#: ports/nrf/common-hal/bleio/Peripheral.c
661662
#, fuzzy, c-format
662663
msgid "Failed to start advertising, err 0x%04x"
663664
msgstr "Gagal untuk memulai advertisement, status: 0x%08lX"
@@ -677,8 +678,8 @@ msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"
677678
msgid "Failed to stop advertising"
678679
msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
679680

680-
#: ports/nrf/common-hal/bleio/Peripheral.c
681681
#: ports/nrf/common-hal/bleio/Broadcaster.c
682+
#: ports/nrf/common-hal/bleio/Peripheral.c
682683
#, fuzzy, c-format
683684
msgid "Failed to stop advertising, err 0x%04x"
684685
msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
@@ -719,8 +720,8 @@ msgstr ""
719720
msgid "Frequency captured is above capability. Capture Paused."
720721
msgstr ""
721722

722-
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
723723
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
724+
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
724725
msgid "Function requires lock"
725726
msgstr ""
726727

@@ -796,11 +797,11 @@ msgstr ""
796797
msgid "Invalid format chunk size"
797798
msgstr ""
798799

799-
#: shared-bindings/busio/SPI.c shared-bindings/bitbangio/SPI.c
800+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
800801
msgid "Invalid number of bits"
801802
msgstr ""
802803

803-
#: shared-bindings/busio/SPI.c shared-bindings/bitbangio/SPI.c
804+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
804805
msgid "Invalid phase"
805806
msgstr ""
806807

@@ -818,14 +819,15 @@ msgstr "Pin untuk channel kiri tidak valid"
818819
msgid "Invalid pin for right channel"
819820
msgstr "Pin untuk channel kanan tidak valid"
820821

821-
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
822-
#: ports/atmel-samd/common-hal/busio/UART.c
823822
#: ports/atmel-samd/common-hal/busio/I2C.c
824-
#: ports/atmel-samd/common-hal/busio/SPI.c ports/nrf/common-hal/busio/I2C.c
823+
#: ports/atmel-samd/common-hal/busio/SPI.c
824+
#: ports/atmel-samd/common-hal/busio/UART.c
825+
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
826+
#: ports/nrf/common-hal/busio/I2C.c
825827
msgid "Invalid pins"
826828
msgstr "Pin-pin tidak valid"
827829

828-
#: shared-bindings/busio/SPI.c shared-bindings/bitbangio/SPI.c
830+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
829831
msgid "Invalid polarity"
830832
msgstr ""
831833

@@ -897,8 +899,8 @@ msgstr ""
897899
msgid "No DAC on chip"
898900
msgstr "Tidak ada DAC (Digital Analog Converter) di dalam chip"
899901

900-
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
901902
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
903+
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
902904
msgid "No DMA channel found"
903905
msgstr "tidak ada channel DMA ditemukan"
904906

@@ -944,7 +946,7 @@ msgstr ""
944946
msgid "Not connected"
945947
msgstr "Tidak dapat menyambungkan ke AP"
946948

947-
#: shared-bindings/audioio/AudioOut.c shared-bindings/audiobusio/I2SOut.c
949+
#: shared-bindings/audiobusio/I2SOut.c shared-bindings/audioio/AudioOut.c
948950
msgid "Not playing"
949951
msgstr ""
950952

@@ -1083,8 +1085,8 @@ msgstr "Serializer sedang digunakan"
10831085
msgid "Slice and value different lengths."
10841086
msgstr ""
10851087

1086-
#: shared-bindings/displayio/TileGrid.c shared-bindings/displayio/Group.c
1087-
#: shared-bindings/displayio/Bitmap.c shared-bindings/pulseio/PulseIn.c
1088+
#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c
1089+
#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c
10881090
msgid "Slices not supported"
10891091
msgstr ""
10901092

@@ -1114,6 +1116,12 @@ msgid ""
11141116
"your CIRCUITPY drive:\n"
11151117
msgstr ""
11161118

1119+
#: supervisor/shared/safe_mode.c
1120+
msgid ""
1121+
"The `microcontroller` module was used to boot into safe mode. Press reset to "
1122+
"exit safe mode.\n"
1123+
msgstr ""
1124+
11171125
#: supervisor/shared/safe_mode.c
11181126
#, fuzzy
11191127
msgid ""
@@ -1203,8 +1211,8 @@ msgstr ""
12031211
msgid "UUID value is not str, int or byte buffer"
12041212
msgstr ""
12051213

1206-
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
12071214
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
1215+
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
12081216
msgid "Unable to allocate buffers for signed conversion"
12091217
msgstr "Tidak dapat mengalokasikan buffer untuk signed conversion"
12101218

@@ -1337,8 +1345,8 @@ msgstr ""
13371345
msgid "argument has wrong type"
13381346
msgstr ""
13391347

1340-
#: py/argcheck.c shared-bindings/gamepad/GamePad.c
1341-
#: shared-bindings/digitalio/DigitalInOut.c shared-bindings/_stage/__init__.c
1348+
#: py/argcheck.c shared-bindings/_stage/__init__.c
1349+
#: shared-bindings/digitalio/DigitalInOut.c shared-bindings/gamepad/GamePad.c
13421350
msgid "argument num/types mismatch"
13431351
msgstr "argumen num/types tidak cocok"
13441352

@@ -1408,7 +1416,7 @@ msgstr ""
14081416
msgid "buffer size must match format"
14091417
msgstr "buffers harus mempunyai panjang yang sama"
14101418

1411-
#: shared-bindings/busio/SPI.c shared-bindings/bitbangio/SPI.c
1419+
#: shared-bindings/bitbangio/SPI.c shared-bindings/busio/SPI.c
14121420
msgid "buffer slices must be of equal length"
14131421
msgstr ""
14141422

@@ -1651,7 +1659,7 @@ msgstr ""
16511659
msgid "complex division by zero"
16521660
msgstr ""
16531661

1654-
#: py/parsenum.c py/objfloat.c
1662+
#: py/objfloat.c py/parsenum.c
16551663
msgid "complex values not supported"
16561664
msgstr ""
16571665

@@ -1692,7 +1700,7 @@ msgstr ""
16921700
msgid "dict update sequence has wrong length"
16931701
msgstr ""
16941702

1695-
#: py/runtime.c py/objint_longlong.c py/objfloat.c py/objint_mpz.c py/modmath.c
1703+
#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c
16961704
#: shared-bindings/math/__init__.c
16971705
msgid "division by zero"
16981706
msgstr ""
@@ -1803,7 +1811,7 @@ msgstr "fungsi tidak dapat mengambil argumen keyword"
18031811
msgid "function expected at most %d arguments, got %d"
18041812
msgstr "fungsi diharapkan setidaknya %d argumen, hanya mendapatkan %d"
18051813

1806-
#: py/objnamedtuple.c py/bc.c
1814+
#: py/bc.c py/objnamedtuple.c
18071815
msgid "function got multiple values for argument '%q'"
18081816
msgstr "fungsi mendapatkan nilai ganda untuk argumen '%q'"
18091817

@@ -1825,7 +1833,7 @@ msgstr "fungsi kehilangan argumen keyword '%q' yang dibutuhkan"
18251833
msgid "function missing required positional argument #%d"
18261834
msgstr "fungsi kehilangan argumen posisi #%d yang dibutuhkan"
18271835

1828-
#: py/objnamedtuple.c py/argcheck.c py/bc.c
1836+
#: py/argcheck.c py/bc.c py/objnamedtuple.c
18291837
#, c-format
18301838
msgid "function takes %d positional arguments but %d were given"
18311839
msgstr "fungsi mengambil posisi argumen %d tapi %d yang diberikan"
@@ -1972,7 +1980,7 @@ msgstr "argumen keyword belum diimplementasi - gunakan args normal"
19721980
msgid "keywords must be strings"
19731981
msgstr "keyword harus berupa string"
19741982

1975-
#: py/emitinlinextensa.c py/emitinlinethumb.c
1983+
#: py/emitinlinethumb.c py/emitinlinextensa.c
19761984
msgid "label '%q' not defined"
19771985
msgstr ""
19781986

@@ -2079,11 +2087,11 @@ msgstr ""
20792087
msgid "need more than %d values to unpack"
20802088
msgstr ""
20812089

2082-
#: py/runtime.c py/objint_longlong.c py/objint_mpz.c
2090+
#: py/objint_longlong.c py/objint_mpz.c py/runtime.c
20832091
msgid "negative power with no float support"
20842092
msgstr ""
20852093

2086-
#: py/runtime.c py/objint_mpz.c
2094+
#: py/objint_mpz.c py/runtime.c
20872095
msgid "negative shift count"
20882096
msgstr ""
20892097

@@ -2160,7 +2168,7 @@ msgstr ""
21602168
msgid "object not an iterator"
21612169
msgstr ""
21622170

2163-
#: py/runtime.c py/objtype.c
2171+
#: py/objtype.c py/runtime.c
21642172
msgid "object not callable"
21652173
msgstr ""
21662174

@@ -2190,7 +2198,7 @@ msgstr "panjang data string memiliki keganjilan (odd-length)"
21902198
msgid "offset out of bounds"
21912199
msgstr "modul tidak ditemukan"
21922200

2193-
#: py/objstr.c py/objstrunicode.c py/objarray.c py/objtuple.c
2201+
#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c
21942202
#: shared-bindings/nvm/ByteArray.c
21952203
msgid "only slices with step=1 (aka None) are supported"
21962204
msgstr ""
@@ -2208,7 +2216,7 @@ msgstr ""
22082216
msgid "overflow converting long int to machine word"
22092217
msgstr ""
22102218

2211-
#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c
2219+
#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c
22122220
msgid "palette must be 32 bytes long"
22132221
msgstr ""
22142222

@@ -2499,7 +2507,7 @@ msgstr ""
24992507
msgid "unexpected keyword argument"
25002508
msgstr "argumen keyword tidak diharapkan"
25012509

2502-
#: py/objnamedtuple.c py/bc.c
2510+
#: py/bc.c py/objnamedtuple.c
25032511
msgid "unexpected keyword argument '%q'"
25042512
msgstr "keyword argumen '%q' tidak diharapkan"
25052513

@@ -2543,7 +2551,7 @@ msgstr ""
25432551
msgid "unmatched '{' in format"
25442552
msgstr ""
25452553

2546-
#: py/runtime.c py/objtype.c
2554+
#: py/objtype.c py/runtime.c
25472555
msgid "unreadable attribute"
25482556
msgstr ""
25492557

0 commit comments

Comments
 (0)