Skip to content

Commit 238b07c

Browse files
mahollimaholli
committed
Fixed merge conflict for circuitpython.pot
2 parents 9e26820 + f13db0d commit 238b07c

File tree

150 files changed

+5197
-664
lines changed

Some content is hidden

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

150 files changed

+5197
-664
lines changed

‎.github/workflows/pre-commit.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ jobs:
1717
- name: Install deps
1818
run: |
1919
sudo apt-add-repository -y -u ppa:pybricks/ppa
20-
sudo apt-get install -y black gettext uncrustify
21-
pip3 install -r requirements-dev.txt
20+
sudo apt-get install -y gettext uncrustify
21+
pip3 install black polib pyyaml
2222
- name: Populate selected submodules
2323
run: git submodule update --init extmod/ulab
2424
- name: Set PY
@@ -28,3 +28,12 @@ jobs:
2828
path: ~/.cache/pre-commit
2929
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
3030
- uses: pre-commit/[email protected]
31+
- name: Make patch
32+
if: failure()
33+
run: git diff > ~/pre-commit.patch
34+
- name: Upload patch
35+
if: failure()
36+
uses: actions/upload-artifact@v2
37+
with:
38+
name: patch
39+
path: ~/pre-commit.patch

‎extmod/modubinascii.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,3 +235,5 @@ const mp_obj_module_t mp_module_ubinascii = {
235235
.base = { &mp_type_module },
236236
.globals = (mp_obj_dict_t *)&mp_module_binascii_globals,
237237
};
238+
239+
MP_REGISTER_MODULE(MP_QSTR_binascii, mp_module_ubinascii, MICROPY_PY_UBINASCII);

‎extmod/modujson.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,4 +375,6 @@ const mp_obj_module_t mp_module_ujson = {
375375
.globals = (mp_obj_dict_t *)&mp_module_ujson_globals,
376376
};
377377

378+
MP_REGISTER_MODULE(MP_QSTR_json, mp_module_ujson, MICROPY_PY_UJSON);
379+
378380
#endif // MICROPY_PY_UJSON

‎extmod/modure.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,8 @@ const mp_obj_module_t mp_module_ure = {
469469
.base = { &mp_type_module },
470470
.globals = (mp_obj_dict_t *)&mp_module_re_globals,
471471
};
472+
473+
MP_REGISTER_MODULE(MP_QSTR_re, mp_module_ure, MICROPY_PY_URE);
472474
#endif
473475

474476
// Source files #include'd here to make sure they're compiled in

‎frozen/circuitpython-stage

‎locale/ID.po

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ msgstr "pin %q tidak valid"
172172
msgid "%q should be an int"
173173
msgstr "%q harus berupa int"
174174

175+
#: shared-bindings/usb_hid/Device.c
176+
msgid "%q with a report ID of 0 must be of length 1"
177+
msgstr ""
178+
175179
#: py/bc.c py/objnamedtuple.c
176180
msgid "%q() takes %d positional arguments but %d were given"
177181
msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan"
@@ -376,7 +380,9 @@ msgstr "Jenis alamat di luar batas"
376380
msgid "All CAN peripherals are in use"
377381
msgstr ""
378382

379-
#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
383+
#: ports/espressif/common-hal/busio/I2C.c
384+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
385+
#: ports/nrf/common-hal/busio/I2C.c
380386
msgid "All I2C peripherals are in use"
381387
msgstr "Semua perangkat I2C sedang digunakan"
382388

@@ -1321,8 +1327,11 @@ msgstr "Frekuensi PWM tidak valid"
13211327
msgid "Invalid Pin"
13221328
msgstr ""
13231329

1324-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1325-
#: py/moduerrno.c shared-module/rgbmatrix/RGBMatrix.c
1330+
#: ports/espressif/bindings/espidf/__init__.c
1331+
#: ports/espressif/common-hal/busio/I2C.c
1332+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1333+
#: ports/espressif/esp_error.c py/moduerrno.c
1334+
#: shared-module/rgbmatrix/RGBMatrix.c
13261335
msgid "Invalid argument"
13271336
msgstr "Argumen tidak valid"
13281337

@@ -1370,10 +1379,6 @@ msgstr "File tidak valid"
13701379
msgid "Invalid format chunk size"
13711380
msgstr "Ukuran potongan format tidak valid"
13721381

1373-
#: ports/espressif/common-hal/busio/I2C.c
1374-
msgid "Invalid frequency"
1375-
msgstr ""
1376-
13771382
#: supervisor/shared/safe_mode.c
13781383
msgid "Invalid memory access."
13791384
msgstr "Akses memori tidak valid."
@@ -1414,6 +1419,7 @@ msgstr "Pin untuk channel kanan tidak valid"
14141419
#: ports/espressif/common-hal/busio/SPI.c
14151420
#: ports/espressif/common-hal/busio/UART.c
14161421
#: ports/espressif/common-hal/canio/CAN.c
1422+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
14171423
#: ports/mimxrt10xx/common-hal/busio/I2C.c
14181424
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/I2C.c
14191425
#: ports/raspberrypi/common-hal/busio/I2C.c
@@ -1796,6 +1802,10 @@ msgstr ""
17961802
msgid "Only one TouchAlarm can be set in deep sleep."
17971803
msgstr ""
17981804

1805+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1806+
msgid "Only one address is allowed"
1807+
msgstr ""
1808+
17991809
#: ports/espressif/common-hal/alarm/time/TimeAlarm.c
18001810
#: ports/nrf/common-hal/alarm/time/TimeAlarm.c
18011811
#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -1920,10 +1930,13 @@ msgstr ""
19201930
"konstruktor"
19211931

19221932
#: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
1923-
#: ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
19241933
msgid "Pins must be sequential"
19251934
msgstr "Pin harus berurutan"
19261935

1936+
#: ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
1937+
msgid "Pins must be sequential GPIO pins"
1938+
msgstr ""
1939+
19271940
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
19281941
msgid "Pins must share PWM slice"
19291942
msgstr ""
@@ -3976,6 +3989,7 @@ msgstr ""
39763989
#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
39773990
#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
39783991
#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
3992+
#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
39793993
#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h
39803994
#: ports/espressif/boards/artisense_rd00/mpconfigboard.h
39813995
#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h
@@ -3994,6 +4008,7 @@ msgstr ""
39944008
#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
39954009
#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
39964010
#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
4011+
#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
39974012
#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h
39984013
#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h
39994014
#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h

‎locale/cs.po

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,10 @@ msgstr "Pin %q není platný"
168168
msgid "%q should be an int"
169169
msgstr "%q by měl být int"
170170

171+
#: shared-bindings/usb_hid/Device.c
172+
msgid "%q with a report ID of 0 must be of length 1"
173+
msgstr ""
174+
171175
#: py/bc.c py/objnamedtuple.c
172176
msgid "%q() takes %d positional arguments but %d were given"
173177
msgstr "%q() vyžaduje %d pozičních argumentů, ale %d jich bylo zadáno"
@@ -372,7 +376,9 @@ msgstr ""
372376
msgid "All CAN peripherals are in use"
373377
msgstr ""
374378

375-
#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
379+
#: ports/espressif/common-hal/busio/I2C.c
380+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
381+
#: ports/nrf/common-hal/busio/I2C.c
376382
msgid "All I2C peripherals are in use"
377383
msgstr ""
378384

@@ -1304,8 +1310,11 @@ msgstr ""
13041310
msgid "Invalid Pin"
13051311
msgstr ""
13061312

1307-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1308-
#: py/moduerrno.c shared-module/rgbmatrix/RGBMatrix.c
1313+
#: ports/espressif/bindings/espidf/__init__.c
1314+
#: ports/espressif/common-hal/busio/I2C.c
1315+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1316+
#: ports/espressif/esp_error.c py/moduerrno.c
1317+
#: shared-module/rgbmatrix/RGBMatrix.c
13091318
msgid "Invalid argument"
13101319
msgstr ""
13111320

@@ -1353,10 +1362,6 @@ msgstr ""
13531362
msgid "Invalid format chunk size"
13541363
msgstr ""
13551364

1356-
#: ports/espressif/common-hal/busio/I2C.c
1357-
msgid "Invalid frequency"
1358-
msgstr ""
1359-
13601365
#: supervisor/shared/safe_mode.c
13611366
msgid "Invalid memory access."
13621367
msgstr ""
@@ -1397,6 +1402,7 @@ msgstr ""
13971402
#: ports/espressif/common-hal/busio/SPI.c
13981403
#: ports/espressif/common-hal/busio/UART.c
13991404
#: ports/espressif/common-hal/canio/CAN.c
1405+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
14001406
#: ports/mimxrt10xx/common-hal/busio/I2C.c
14011407
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/I2C.c
14021408
#: ports/raspberrypi/common-hal/busio/I2C.c
@@ -1774,6 +1780,10 @@ msgstr ""
17741780
msgid "Only one TouchAlarm can be set in deep sleep."
17751781
msgstr ""
17761782

1783+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1784+
msgid "Only one address is allowed"
1785+
msgstr ""
1786+
17771787
#: ports/espressif/common-hal/alarm/time/TimeAlarm.c
17781788
#: ports/nrf/common-hal/alarm/time/TimeAlarm.c
17791789
#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -1893,10 +1903,13 @@ msgid ""
18931903
msgstr ""
18941904

18951905
#: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
1896-
#: ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
18971906
msgid "Pins must be sequential"
18981907
msgstr ""
18991908

1909+
#: ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
1910+
msgid "Pins must be sequential GPIO pins"
1911+
msgstr ""
1912+
19001913
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
19011914
msgid "Pins must share PWM slice"
19021915
msgstr ""
@@ -3936,6 +3949,7 @@ msgstr ""
39363949
#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
39373950
#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
39383951
#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
3952+
#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
39393953
#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h
39403954
#: ports/espressif/boards/artisense_rd00/mpconfigboard.h
39413955
#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h
@@ -3954,6 +3968,7 @@ msgstr ""
39543968
#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
39553969
#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
39563970
#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
3971+
#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
39573972
#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h
39583973
#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h
39593974
#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h

‎locale/de_DE.po

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ msgstr "%q Pin ungültig"
173173
msgid "%q should be an int"
174174
msgstr "%q sollte ein integer sein"
175175

176+
#: shared-bindings/usb_hid/Device.c
177+
msgid "%q with a report ID of 0 must be of length 1"
178+
msgstr ""
179+
176180
#: py/bc.c py/objnamedtuple.c
177181
msgid "%q() takes %d positional arguments but %d were given"
178182
msgstr ""
@@ -378,7 +382,9 @@ msgstr "Adresstyp außerhalb des zulässigen Bereichs"
378382
msgid "All CAN peripherals are in use"
379383
msgstr "Alle CAN Schnittstellen sind in Benutzung"
380384

381-
#: ports/espressif/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
385+
#: ports/espressif/common-hal/busio/I2C.c
386+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
387+
#: ports/nrf/common-hal/busio/I2C.c
382388
msgid "All I2C peripherals are in use"
383389
msgstr "Alle I2C-Peripheriegeräte sind in Benutzung"
384390

@@ -1321,8 +1327,11 @@ msgstr "Ungültige PWM Frequenz"
13211327
msgid "Invalid Pin"
13221328
msgstr "Ungültiger Pin"
13231329

1324-
#: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
1325-
#: py/moduerrno.c shared-module/rgbmatrix/RGBMatrix.c
1330+
#: ports/espressif/bindings/espidf/__init__.c
1331+
#: ports/espressif/common-hal/busio/I2C.c
1332+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1333+
#: ports/espressif/esp_error.c py/moduerrno.c
1334+
#: shared-module/rgbmatrix/RGBMatrix.c
13261335
msgid "Invalid argument"
13271336
msgstr "Ungültiges Argument"
13281337

@@ -1370,10 +1379,6 @@ msgstr "Ungültige Datei"
13701379
msgid "Invalid format chunk size"
13711380
msgstr "Ungültige format chunk size"
13721381

1373-
#: ports/espressif/common-hal/busio/I2C.c
1374-
msgid "Invalid frequency"
1375-
msgstr "Ungültige Frequenz"
1376-
13771382
#: supervisor/shared/safe_mode.c
13781383
msgid "Invalid memory access."
13791384
msgstr "Ungültiger Speicherzugriff."
@@ -1414,6 +1419,7 @@ msgstr "Ungültiger Pin für rechten Kanal"
14141419
#: ports/espressif/common-hal/busio/SPI.c
14151420
#: ports/espressif/common-hal/busio/UART.c
14161421
#: ports/espressif/common-hal/canio/CAN.c
1422+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
14171423
#: ports/mimxrt10xx/common-hal/busio/I2C.c
14181424
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/I2C.c
14191425
#: ports/raspberrypi/common-hal/busio/I2C.c
@@ -1798,6 +1804,10 @@ msgstr ""
17981804
msgid "Only one TouchAlarm can be set in deep sleep."
17991805
msgstr ""
18001806

1807+
#: ports/espressif/common-hal/i2cperipheral/I2CPeripheral.c
1808+
msgid "Only one address is allowed"
1809+
msgstr ""
1810+
18011811
#: ports/espressif/common-hal/alarm/time/TimeAlarm.c
18021812
#: ports/nrf/common-hal/alarm/time/TimeAlarm.c
18031813
#: ports/raspberrypi/common-hal/alarm/time/TimeAlarm.c
@@ -1920,10 +1930,13 @@ msgstr ""
19201930
"allow_inefficient = True an den Konstruktor"
19211931

19221932
#: ports/raspberrypi/common-hal/imagecapture/ParallelImageCapture.c
1923-
#: ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
19241933
msgid "Pins must be sequential"
19251934
msgstr ""
19261935

1936+
#: ports/raspberrypi/common-hal/rotaryio/IncrementalEncoder.c
1937+
msgid "Pins must be sequential GPIO pins"
1938+
msgstr ""
1939+
19271940
#: ports/raspberrypi/common-hal/audiopwmio/PWMAudioOut.c
19281941
msgid "Pins must share PWM slice"
19291942
msgstr ""
@@ -4005,6 +4018,7 @@ msgstr "pow() mit 3 Argumenten erfordert Integer"
40054018
#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h
40064019
#: ports/espressif/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
40074020
#: ports/espressif/boards/adafruit_metro_esp32s2/mpconfigboard.h
4021+
#: ports/espressif/boards/ai_thinker_esp32-c3s/mpconfigboard.h
40084022
#: ports/espressif/boards/ai_thinker_esp_12k_nodemcu/mpconfigboard.h
40094023
#: ports/espressif/boards/artisense_rd00/mpconfigboard.h
40104024
#: ports/espressif/boards/atmegazero_esp32s2/mpconfigboard.h
@@ -4023,6 +4037,7 @@ msgstr "pow() mit 3 Argumenten erfordert Integer"
40234037
#: ports/espressif/boards/gravitech_cucumber_rs/mpconfigboard.h
40244038
#: ports/espressif/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h
40254039
#: ports/espressif/boards/lolin_s2_mini/mpconfigboard.h
4040+
#: ports/espressif/boards/microdev_micro_c3/mpconfigboard.h
40264041
#: ports/espressif/boards/microdev_micro_s2/mpconfigboard.h
40274042
#: ports/espressif/boards/morpheans_morphesp-240/mpconfigboard.h
40284043
#: ports/espressif/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h
@@ -4564,6 +4579,9 @@ msgstr ""
45644579
msgid "zi must be of shape (n_section, 2)"
45654580
msgstr ""
45664581

4582+
#~ msgid "Invalid frequency"
4583+
#~ msgstr "Ungültige Frequenz"
4584+
45674585
#~ msgid "Data 0 pin must be byte aligned."
45684586
#~ msgstr "Data 0 Pin muss Byte aligned sein."
45694587

0 commit comments

Comments
 (0)