Skip to content

Commit 733bfbc

Browse files
microdev1microdev1
committed
Merge branch 'main' into set_mac
2 parents 31d45a3 + 18b3e6c commit 733bfbc

27 files changed

Lines changed: 555 additions & 322 deletions

File tree

‎locale/zh_Latn_pinyin.po‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgstr ""
77
"Project-Id-Version: circuitpython-cn\n"
88
"Report-Msgid-Bugs-To: \n"
99
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
10-
"PO-Revision-Date: 2021-11-05 04:07+0000\n"
11-
"Last-Translator: hexthat <hexthat@gmail.com>\n"
10+
"PO-Revision-Date: 2021-11-12 18:46+0000\n"
11+
"Last-Translator: River Wang <urfdvw@gmail.com>\n"
1212
"Language-Team: Chinese Hanyu Pinyin\n"
1313
"Language: zh_Latn_pinyin\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=1; plural=0;\n"
18-
"X-Generator: Weblate 4.9-dev\n"
18+
"X-Generator: Weblate 4.9.1-dev\n"
1919

2020
#: main.c
2121
msgid ""
@@ -31,7 +31,7 @@ msgid ""
3131
"Code stopped by auto-reload.\n"
3232
msgstr ""
3333
"\n"
34-
"zì dòng chóng xīn jiā zǎi tíng zhǐ de dài mǎ.\n"
34+
"dàimǎ de yùnxíng yīnwéi zìdòng chóngxīn jiāzǎi ér tíngzhǐ.\n"
3535

3636
#: supervisor/shared/safe_mode.c
3737
msgid ""
@@ -49,7 +49,7 @@ msgstr " Wénjiàn \"%q\""
4949

5050
#: py/obj.c
5151
msgid " File \"%q\", line %d"
52-
msgstr " Wénjiàn \"%q\", dì %d xíng"
52+
msgstr " Wénjiàn \"%q\", dì %d háng"
5353

5454
#: py/builtinhelp.c
5555
msgid " is of type %q\n"
@@ -119,7 +119,7 @@ msgstr "%q bì xū wéi %d-%d"
119119

120120
#: py/argcheck.c shared-bindings/gifio/GifWriter.c
121121
msgid "%q must be <= %d"
122-
msgstr ""
122+
msgstr "%q bì xū <= %d"
123123

124124
#: py/argcheck.c
125125
msgid "%q must be >= %d"
@@ -160,7 +160,7 @@ msgstr "%q bì xū shì 2 de gōng lǜ"
160160

161161
#: shared-bindings/wifi/Monitor.c
162162
msgid "%q out of bounds"
163-
msgstr ""
163+
msgstr "%q chāo chū jiè xiàn"
164164

165165
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
166166
#: shared-bindings/canio/Match.c
@@ -569,8 +569,9 @@ msgid "Bit depth must be multiple of 8."
569569
msgstr "Bǐtè shēndù bìxū shì 8 bèi yǐshàng."
570570

571571
#: shared-bindings/bitmaptools/__init__.c
572+
#, fuzzy
572573
msgid "Bitmap size and bits per value must match"
573-
msgstr ""
574+
msgstr "wèi tú dà xiǎo hé měi gè zhí de bǐ tè wèi bì xū pǐ pèi"
574575

575576
#: supervisor/shared/safe_mode.c
576577
msgid "Boot device must be first device (interface #0)."
@@ -1008,7 +1009,7 @@ msgstr "FFT jǐn wéi ndarrays dìng yì"
10081009

10091010
#: extmod/ulab/code/numpy/fft/fft_tools.c
10101011
msgid "FFT is implemented for linear arrays only"
1011-
msgstr "FFT jǐn shì yòng yú xiàn xìng zhèn liè"
1012+
msgstr "FFT jǐn shì yòng yú yī wéi shù zǔ"
10121013

10131014
#: ports/espressif/common-hal/ssl/SSLSocket.c
10141015
msgid "Failed SSL handshake"
@@ -1097,10 +1098,13 @@ msgstr "gù jiàn yìng xiàng wú xiào"
10971098
#: shared-bindings/bitmaptools/__init__.c
10981099
msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
10991100
msgstr ""
1101+
"zài L8 sè yù zhōng, měi gè shū rù de xiàng sù bì xū shì 8 wèi (8 bit) shù jù"
11001102

11011103
#: shared-bindings/bitmaptools/__init__.c
11021104
msgid "For RGB colorspaces, input bitmap must have 16 bits per pixel"
11031105
msgstr ""
1106+
"zài GRB sè yù zhōng, měi gè shū rù de xiàng sù bì xū shì 16 wèi (16 bit) shù "
1107+
"jù"
11041108

11051109
#: ports/cxd56/common-hal/camera/Camera.c
11061110
msgid "Format not supported"
@@ -2308,7 +2312,7 @@ msgstr "bù kě yòng chù mō bào jǐng qì"
23082312

23092313
#: py/obj.c
23102314
msgid "Traceback (most recent call last):\n"
2311-
msgstr "Traceback (Zuìjìn yīcì dǎ diànhuà):\n"
2315+
msgstr "Traceback (Zuìjìn yīcì diàoyòng zhǐlìng):\n"
23122316

23132317
#: shared-bindings/time/__init__.c
23142318
msgid "Tuple or struct_time argument required"
@@ -2352,7 +2356,7 @@ msgstr "USB cuò wù"
23522356

23532357
#: shared-bindings/_bleio/UUID.c
23542358
msgid "UUID integer value must be 0-0xffff"
2355-
msgstr "UUID zhěngshù zhí bìxū wèi 0-0xffff"
2359+
msgstr "UUID de zhí bì xū shì 0-0xffff fàn wéi nèi de zhěng shù"
23562360

23572361
#: shared-bindings/_bleio/UUID.c
23582362
msgid "UUID string not 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
@@ -2385,11 +2389,11 @@ msgstr "Wúfǎ zhǎodào miǎnfèi de GCLK"
23852389

23862390
#: py/parse.c
23872391
msgid "Unable to init parser"
2388-
msgstr "Wúfǎ chūshǐ jiěxī qì"
2392+
msgstr "Wúfǎ chūshǐhuà jiěxī qì"
23892393

23902394
#: shared-module/displayio/OnDiskBitmap.c
23912395
msgid "Unable to read color palette data"
2392-
msgstr "Wúfǎ dòu qǔ sè tiáo shùjù"
2396+
msgstr "Wúfǎ dúqǔ tiáosèbǎn shùjù"
23932397

23942398
#: shared-bindings/nvm/ByteArray.c
23952399
msgid "Unable to write to nvm."
@@ -2453,7 +2457,7 @@ msgstr "Bù zhīchí de baudrate"
24532457

24542458
#: shared-bindings/bitmaptools/__init__.c
24552459
msgid "Unsupported colorspace"
2456-
msgstr ""
2460+
msgstr "bú zhī chí de sè cǎi kōng jiān"
24572461

24582462
#: shared-module/displayio/display_core.c
24592463
msgid "Unsupported display bus type"
@@ -2686,7 +2690,7 @@ msgstr "èrjìnzhì bǎn qián bǎn %q wèi zhíxíng"
26862690

26872691
#: shared-bindings/bitmaptools/__init__.c
26882692
msgid "bitmap sizes must match"
2689-
msgstr ""
2693+
msgstr "wèi tú dà xiǎo bì xū pǐ pèi"
26902694

26912695
#: extmod/modurandom.c
26922696
msgid "bits must be 32 or less"
@@ -3587,7 +3591,7 @@ msgstr "jǔzhèn bùshì zhèngdìng de"
35873591
#: ports/nrf/common-hal/_bleio/Descriptor.c
35883592
#, c-format
35893593
msgid "max_length must be 0-%d when fixed_length is %s"
3590-
msgstr "Dāng gùdìng chángdù wèi %s shí, zuìdà chángdù bìxū wèi 0-%d"
3594+
msgstr "dāng fixed_length de zhí wéi %s shí, max_length bì xū wéi 0-%d"
35913595

35923596
#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
35933597
msgid "max_length must be >= 0"
@@ -3636,7 +3640,7 @@ msgstr "zhǎo bù dào mókuài"
36363640

36373641
#: ports/espressif/common-hal/wifi/Monitor.c
36383642
msgid "monitor init failed"
3639-
msgstr ""
3643+
msgstr "jiān shì qì chū shǐ huà shī bài"
36403644

36413645
#: extmod/ulab/code/numpy/poly.c
36423646
msgid "more degrees of freedom than data points"
@@ -4195,14 +4199,17 @@ msgstr "yuán miànbǎn tài dà"
41954199
#: shared-bindings/bitmaptools/__init__.c
41964200
msgid "source_bitmap must have value_count of 2 or 65536"
41974201
msgstr ""
4202+
"yuán wèi tú (source_bitmap) de zhí de shù mù (value_count) bì xū shì 2 huò "
4203+
"zhě 65536"
41984204

41994205
#: shared-bindings/bitmaptools/__init__.c
42004206
msgid "source_bitmap must have value_count of 65536"
42014207
msgstr ""
4208+
"yuán wèi tú (source_bitmap) de zhí de shù mù (value_count) bì xū shì 65536"
42024209

42034210
#: shared-bindings/bitmaptools/__init__.c
42044211
msgid "source_bitmap must have value_count of 8"
4205-
msgstr ""
4212+
msgstr "yuán wèi tú (source_bitmap) de zhí de shù mù (value_count) bì xū shì 8"
42064213

42074214
#: py/objstr.c
42084215
msgid "start/end indices"
@@ -4450,11 +4457,11 @@ msgstr "bù zhīchí de Xtensa zhǐlìng '%s', shǐyòng %d cānshù"
44504457

44514458
#: shared-module/gifio/GifWriter.c
44524459
msgid "unsupported colorspace for GifWriter"
4453-
msgstr ""
4460+
msgstr "GifWriter bú zhī chí cǐ sè cǎi kōng jiān"
44544461

44554462
#: shared-bindings/bitmaptools/__init__.c
44564463
msgid "unsupported colorspace for dither"
4457-
msgstr ""
4464+
msgstr "dither bú zhī chí cǐ sè cǎi kōng jiān"
44584465

44594466
#: py/objstr.c
44604467
#, c-format

‎ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ CHIP_FAMILY = samd21
99
INTERNAL_FLASH_FILESYSTEM = 1
1010
LONGINT_IMPL = NONE
1111
CIRCUITPY_FULL_BUILD = 0
12+
13+
CIRCUITPY_ONEWIREIO = 0

‎ports/espressif/boards/adafruit_feather_esp32s2_nopsram/board.c‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)