Skip to content

Commit 19fd910

Browse files
CDariusCDarius
committed
Merded with main branch
2 parents 7282bd9 + a0f389e commit 19fd910

File tree

39 files changed

+191
-76
lines changed

39 files changed

+191
-76
lines changed

‎extmod/moduasyncio.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,18 @@ STATIC mp_obj_t task_getiter(mp_obj_t self_in, mp_obj_iter_buf_t *iter_buf);
7373
#define _TICKS_PERIOD (1lu << 29)
7474
#define _TICKS_MAX (_TICKS_PERIOD - 1)
7575
#define _TICKS_HALFPERIOD (_TICKS_PERIOD >> 1)
76-
76+
#if !CIRCUITPY || (defined(__unix__) || defined(__APPLE__))
7777
STATIC mp_obj_t ticks(void) {
7878
return MP_OBJ_NEW_SMALL_INT(mp_hal_ticks_ms() & _TICKS_MAX);
7979
}
80+
#else
81+
// We don't share the implementation above because our supervisor_ticks_ms
82+
// starts the epoch about 65 seconds before the first overflow (see
83+
// shared-bindings/supervisor/__init__.c). We assume/require that
84+
// supervisor.ticks_ms is picked as the ticks implementation under
85+
// CircuitPython for the Python-coded bits of asyncio.
86+
#define ticks() MP_OBJ_NEW_SMALL_INT(supervisor_ticks_ms())
87+
#endif
8088

8189
STATIC mp_int_t ticks_diff(mp_obj_t t1_in, mp_obj_t t0_in) {
8290
mp_uint_t t0 = MP_OBJ_SMALL_INT_VALUE(t0_in);

‎locale/ID.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2673,7 +2673,7 @@ msgstr ""
26732673
msgid "can't set 512 block size"
26742674
msgstr ""
26752675

2676-
#: py/objnamedtuple.c
2676+
#: py/objexcept.c py/objnamedtuple.c
26772677
msgid "can't set attribute"
26782678
msgstr ""
26792679

@@ -3876,6 +3876,11 @@ msgstr ""
38763876
msgid "pressing both buttons at start up.\n"
38773877
msgstr ""
38783878

3879+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3880+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3881+
msgid "pressing button A at start up.\n"
3882+
msgstr ""
3883+
38793884
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
38803885
msgid "pressing the left button at start up\n"
38813886
msgstr ""

‎locale/circuitpython.pot

100644100755
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3848,6 +3848,11 @@ msgstr ""
38483848
msgid "pressing central button at start up.\n"
38493849
msgstr ""
38503850

3851+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3852+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3853+
msgid "pressing button A at start up.\n"
3854+
msgstr ""
3855+
38513856
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
38523857
msgid "pressing the left button at start up\n"
38533858
msgstr ""

‎locale/cs.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2660,7 +2660,7 @@ msgstr ""
26602660
msgid "can't set 512 block size"
26612661
msgstr ""
26622662

2663-
#: py/objnamedtuple.c
2663+
#: py/objexcept.c py/objnamedtuple.c
26642664
msgid "can't set attribute"
26652665
msgstr ""
26662666

@@ -3862,6 +3862,11 @@ msgstr ""
38623862
msgid "pressing both buttons at start up.\n"
38633863
msgstr ""
38643864

3865+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3866+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3867+
msgid "pressing button A at start up.\n"
3868+
msgstr ""
3869+
38653870
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
38663871
msgid "pressing the left button at start up\n"
38673872
msgstr ""

‎locale/de_DE.po

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ msgstr "%q Initialisierung ist gescheitert"
128128

129129
#: shared-bindings/dualbank/__init__.c
130130
msgid "%q is %q"
131-
msgstr ""
131+
msgstr "%q ist %q"
132132

133133
#: py/argcheck.c
134134
msgid "%q length must be %d"
@@ -174,6 +174,7 @@ msgstr "%q muss >= %d sein"
174174
#: shared-bindings/audiocore/RawSample.c
175175
msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
176176
msgstr ""
177+
"%q muss ein Byte-Array oder ein array vom Typ 'h', 'H', 'b', oder 'B' sein"
177178

178179
#: py/argcheck.c
179180
msgid "%q must be a string"
@@ -1030,16 +1031,16 @@ msgstr "Filter zu komplex"
10301031

10311032
#: ports/espressif/common-hal/dualbank/__init__.c
10321033
msgid "Firmware is duplicate"
1033-
msgstr ""
1034+
msgstr "Die Firmware ist doppelt vorhanden"
10341035

10351036
#: ports/espressif/common-hal/dualbank/__init__.c
10361037
msgid "Firmware is invalid"
1037-
msgstr ""
1038+
msgstr "Die Firmware ist ungültig"
10381039

10391040
#: ports/espressif/common-hal/coproc/Coproc.c
10401041
#: ports/espressif/common-hal/dualbank/__init__.c
10411042
msgid "Firmware is too big"
1042-
msgstr ""
1043+
msgstr "Die Firmware ist zu groß"
10431044

10441045
#: shared-bindings/bitmaptools/__init__.c
10451046
msgid "For L8 colorspace, input bitmap must have 8 bits per pixel"
@@ -1657,7 +1658,7 @@ msgstr ""
16571658
#: ports/espressif/common-hal/alarm/coproc/CoprocAlarm.c
16581659
#: ports/espressif/common-hal/alarm/touch/TouchAlarm.c
16591660
msgid "Only one %q can be set in deep sleep."
1660-
msgstr ""
1661+
msgstr "Nur ein %q kann im Deep-Sleep gesetzt werden."
16611662

16621663
#: ports/espressif/common-hal/i2ctarget/I2CTarget.c
16631664
#: ports/raspberrypi/common-hal/i2ctarget/I2CTarget.c
@@ -2224,7 +2225,7 @@ msgstr "mDNS-Abfrage kann nicht gestartet werden"
22242225

22252226
#: shared-bindings/coproc/CoprocMemory.c
22262227
msgid "Unable to write"
2227-
msgstr ""
2228+
msgstr "Schreiben nicht möglich"
22282229

22292230
#: shared-bindings/nvm/ByteArray.c
22302231
msgid "Unable to write to nvm."
@@ -2717,7 +2718,7 @@ msgstr ""
27172718
msgid "can't set 512 block size"
27182719
msgstr "Kann Blockgröße von 512 nicht setzen"
27192720

2720-
#: py/objnamedtuple.c
2721+
#: py/objexcept.c py/objnamedtuple.c
27212722
msgid "can't set attribute"
27222723
msgstr "kann Attribut nicht setzen"
27232724

@@ -2988,6 +2989,8 @@ msgid ""
29882989
"esp32_camera.Camera requires reserved PSRAM to be configured. See the "
29892990
"documentation for instructions."
29902991
msgstr ""
2992+
"esp32_camera.Camera benötigt reservierten PSRAM um konfiguriert werden zu "
2993+
"können. Sieh in der Dokumentation für eine Anleitung nach."
29912994

29922995
#: py/runtime.c
29932996
msgid "exceptions must derive from BaseException"
@@ -3940,6 +3943,11 @@ msgstr "Drücken der Boot-Taste beim Start.\n"
39403943
msgid "pressing both buttons at start up.\n"
39413944
msgstr "Drücken Sie beim Start beide Tasten.\n"
39423945

3946+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3947+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3948+
msgid "pressing button A at start up.\n"
3949+
msgstr ""
3950+
39433951
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
39443952
msgid "pressing the left button at start up\n"
39453953
msgstr "Drücken der linken Taste beim Einschalten\n"
@@ -4391,7 +4399,7 @@ msgstr "wifi ist nicht aktiviert"
43914399

43924400
#: ports/raspberrypi/common-hal/wifi/Monitor.c
43934401
msgid "wifi.Monitor not available"
4394-
msgstr ""
4402+
msgstr "wifi.Monitor nicht verfügbar"
43954403

43964404
#: shared-bindings/_bleio/Adapter.c
43974405
msgid "window must be <= interval"
@@ -4510,7 +4518,7 @@ msgstr "zi muss die Form (n_section, 2) haben"
45104518
#~ "sample_source buffer must be a bytearray or array of type 'h', 'H', 'b' "
45114519
#~ "or 'B'"
45124520
#~ msgstr ""
4513-
#~ "sample_source buffer muss ein Bytearray oder ein Array vom Typ 'h', 'H', "
4521+
#~ "sample_source buffer muss ein Byte-Array oder ein Array vom Typ 'h', 'H', "
45144522
#~ "'b' oder 'B' sein"
45154523

45164524
#~ msgid "Expected an alarm"

‎locale/el.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2669,7 +2669,7 @@ msgstr ""
26692669
msgid "can't set 512 block size"
26702670
msgstr ""
26712671

2672-
#: py/objnamedtuple.c
2672+
#: py/objexcept.c py/objnamedtuple.c
26732673
msgid "can't set attribute"
26742674
msgstr ""
26752675

@@ -3871,6 +3871,11 @@ msgstr ""
38713871
msgid "pressing both buttons at start up.\n"
38723872
msgstr ""
38733873

3874+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3875+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3876+
msgid "pressing button A at start up.\n"
3877+
msgstr ""
3878+
38743879
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
38753880
msgid "pressing the left button at start up\n"
38763881
msgstr ""

‎locale/en_GB.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2676,7 +2676,7 @@ msgstr "can't send non-None value to a just-started generator"
26762676
msgid "can't set 512 block size"
26772677
msgstr "can't set 512 block size"
26782678

2679-
#: py/objnamedtuple.c
2679+
#: py/objexcept.c py/objnamedtuple.c
26802680
msgid "can't set attribute"
26812681
msgstr "can't set attribute"
26822682

@@ -3881,6 +3881,11 @@ msgstr "pressing boot button at start up.\n"
38813881
msgid "pressing both buttons at start up.\n"
38823882
msgstr "pressing both buttons at start up.\n"
38833883

3884+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3885+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3886+
msgid "pressing button A at start up.\n"
3887+
msgstr ""
3888+
38843889
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
38853890
msgid "pressing the left button at start up\n"
38863891
msgstr "pressing the left button at start up\n"

‎locale/es.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2713,7 +2713,7 @@ msgstr ""
27132713
msgid "can't set 512 block size"
27142714
msgstr "no se puede definir un tamaño de bloque de 512"
27152715

2716-
#: py/objnamedtuple.c
2716+
#: py/objexcept.c py/objnamedtuple.c
27172717
msgid "can't set attribute"
27182718
msgstr "no se puede asignar el atributo"
27192719

@@ -3928,6 +3928,11 @@ msgstr "presionando botón de arranque al inicio.\n"
39283928
msgid "pressing both buttons at start up.\n"
39293929
msgstr "presionando ambos botones al inicio.\n"
39303930

3931+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3932+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3933+
msgid "pressing button A at start up.\n"
3934+
msgstr ""
3935+
39313936
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
39323937
msgid "pressing the left button at start up\n"
39333938
msgstr "presione el botón izquierdo al arranque\n"

‎locale/fil.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2664,7 +2664,7 @@ msgstr "hindi mapadala ang non-None value sa isang kaka umpisang generator"
26642664
msgid "can't set 512 block size"
26652665
msgstr ""
26662666

2667-
#: py/objnamedtuple.c
2667+
#: py/objexcept.c py/objnamedtuple.c
26682668
msgid "can't set attribute"
26692669
msgstr "hindi ma i-set ang attribute"
26702670

@@ -3881,6 +3881,11 @@ msgstr ""
38813881
msgid "pressing both buttons at start up.\n"
38823882
msgstr ""
38833883

3884+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3885+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3886+
msgid "pressing button A at start up.\n"
3887+
msgstr ""
3888+
38843889
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
38853890
msgid "pressing the left button at start up\n"
38863891
msgstr ""

‎locale/fr.po

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2746,7 +2746,7 @@ msgstr ""
27462746
msgid "can't set 512 block size"
27472747
msgstr "impossible de définir une taille de bloc de 512"
27482748

2749-
#: py/objnamedtuple.c
2749+
#: py/objexcept.c py/objnamedtuple.c
27502750
msgid "can't set attribute"
27512751
msgstr "attribut non modifiable"
27522752

@@ -3970,6 +3970,11 @@ msgstr "bouton boot appuyé lors du démarrage.\n"
39703970
msgid "pressing both buttons at start up.\n"
39713971
msgstr "les deux boutons appuyés lors du démarrage.\n"
39723972

3973+
#: ports/espressif/boards/m5stack_core_basic/mpconfigboard.h
3974+
#: ports/espressif/boards/m5stack_core_fire/mpconfigboard.h
3975+
msgid "pressing button A at start up.\n"
3976+
msgstr ""
3977+
39733978
#: ports/nrf/boards/aramcon2_badge/mpconfigboard.h
39743979
msgid "pressing the left button at start up\n"
39753980
msgstr "appuyer le bouton de gauche au démarage\n"

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy