From 55874b64707953361a74099cb1965c66ca904fc2 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 25 Oct 2023 08:14:13 +0200 Subject: [PATCH 01/11] Rename compressed_string_t to mp_rom_error_text_t to match upstream --- devices/ble_hci/common-hal/_bleio/att.c | 2 +- ports/espressif/common-hal/espidf/__init__.c | 2 +- ports/espressif/common-hal/wifi/Monitor.c | 2 +- py/compile.c | 2 +- py/emitinlinethumb.c | 2 +- py/emitinlinextensa.c | 2 +- py/maketranslationdata.py | 2 +- py/misc.h | 13 ++--- py/moderrno.c | 2 +- py/mpprint.c | 6 +-- py/mpprint.h | 7 ++- py/obj.c | 8 ++-- py/obj.h | 9 ++-- py/objexcept.c | 6 +-- py/runtime.c | 38 +++++++-------- py/runtime.h | 48 +++++++++---------- shared-bindings/_bleio/__init__.c | 6 +-- shared-bindings/_bleio/__init__.h | 6 +-- shared-bindings/memorymonitor/__init__.c | 2 +- shared-bindings/memorymonitor/__init__.h | 2 +- shared-bindings/usb/core/__init__.c | 2 +- shared-bindings/usb/core/__init__.h | 2 +- shared-module/os/getenv.c | 4 +- shared-module/sdcardio/SDCard.c | 12 ++--- supervisor/shared/safe_mode.c | 2 +- .../shared/translate/compressed_string.h | 10 ++-- supervisor/shared/translate/translate.c | 6 +-- supervisor/shared/translate/translate.h | 2 +- supervisor/shared/translate/translate_impl.h | 4 +- 29 files changed, 100 insertions(+), 111 deletions(-) diff --git a/devices/ble_hci/common-hal/_bleio/att.c b/devices/ble_hci/common-hal/_bleio/att.c index 08d37c0feb55..6a95126864cc 100644 --- a/devices/ble_hci/common-hal/_bleio/att.c +++ b/devices/ble_hci/common-hal/_bleio/att.c @@ -1722,7 +1722,7 @@ void att_process_data(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { // FIX Do we need all of these? static void check_att_err(uint8_t err) { - const compressed_string_t *msg = NULL; + const mp_rom_error_text_t *msg = NULL; switch (err) { case 0: return; diff --git a/ports/espressif/common-hal/espidf/__init__.c b/ports/espressif/common-hal/espidf/__init__.c index bd5cd51884bf..4d1a24c9ea04 100644 --- a/ports/espressif/common-hal/espidf/__init__.c +++ b/ports/espressif/common-hal/espidf/__init__.c @@ -122,7 +122,7 @@ intptr_t common_hal_espidf_get_psram_end(void) { } void raise_esp_error(esp_err_t err) { - const compressed_string_t *msg = NULL; + const mp_rom_error_text_t *msg = NULL; const mp_obj_type_t *exception_type = &mp_type_espidf_IDFError; switch (err) { case ESP_FAIL: diff --git a/ports/espressif/common-hal/wifi/Monitor.c b/ports/espressif/common-hal/wifi/Monitor.c index b37219d67bc4..ff3700af57a0 100644 --- a/ports/espressif/common-hal/wifi/Monitor.c +++ b/ports/espressif/common-hal/wifi/Monitor.c @@ -78,7 +78,7 @@ static void wifi_monitor_cb(void *recv_buf, wifi_promiscuous_pkt_type_t type) { } void common_hal_wifi_monitor_construct(wifi_monitor_obj_t *self, uint8_t channel, size_t queue) { - const compressed_string_t *monitor_mode_init_error = translate("monitor init failed"); + const mp_rom_error_text_t *monitor_mode_init_error = translate("monitor init failed"); self->queue = xQueueCreate(queue, sizeof(monitor_packet_t)); if (!self->queue) { diff --git a/py/compile.c b/py/compile.c index b1ee2c5529dd..07e7d1a8f451 100644 --- a/py/compile.c +++ b/py/compile.c @@ -255,7 +255,7 @@ STATIC void compile_error_set_line(compiler_t *comp, mp_parse_node_t pn) { } } -STATIC void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, const compressed_string_t *msg) { +STATIC void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, const mp_rom_error_text_t *msg) { // only register the error if there has been no other error if (comp->compile_error == MP_OBJ_NULL) { comp->compile_error = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg); diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c index 8f9f6a1bd6d1..ea19b31686e9 100644 --- a/py/emitinlinethumb.c +++ b/py/emitinlinethumb.c @@ -75,7 +75,7 @@ static inline bool emit_inline_thumb_allow_float(emit_inline_asm_t *emit) { #endif // CIRCUITPY-CHANGE -STATIC void emit_inline_thumb_error_msg(emit_inline_asm_t *emit, const compressed_string_t *msg) { +STATIC void emit_inline_thumb_error_msg(emit_inline_asm_t *emit, const mp_rom_error_text_t *msg) { *emit->error_slot = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg); } diff --git a/py/emitinlinextensa.c b/py/emitinlinextensa.c index eddc6bf9f90d..72f59e515e90 100644 --- a/py/emitinlinextensa.c +++ b/py/emitinlinextensa.c @@ -44,7 +44,7 @@ struct _emit_inline_asm_t { }; // CIRCUITPY-CHANGE -STATIC void emit_inline_xtensa_error_msg(emit_inline_asm_t *emit, const compressed_string_t *msg) { +STATIC void emit_inline_xtensa_error_msg(emit_inline_asm_t *emit, const mp_rom_error_text_t *msg) { *emit->error_slot = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg); } diff --git a/py/maketranslationdata.py b/py/maketranslationdata.py index 0be618763c00..3d6ef03d310c 100644 --- a/py/maketranslationdata.py +++ b/py/maketranslationdata.py @@ -595,7 +595,7 @@ def output_translation_data(encoding_table, i18ns, out): decompressed = decompressed.replace(c, C_ESCAPES[c]) formatted = ["{:d}".format(x) for x in compressed] out.write( - "const compressed_string_t translation{} = {{ .data = {}, .tail = {{ {} }} }}; // {}\n".format( + "const mp_rom_error_text_t translation{} = {{ .data = {}, .tail = {{ {} }} }}; // {}\n".format( i, formatted[0], ", ".join(formatted[1:]), original, decompressed ) ) diff --git a/py/misc.h b/py/misc.h index b3b5a6449145..37c6caa4aeb6 100644 --- a/py/misc.h +++ b/py/misc.h @@ -330,6 +330,8 @@ inline MP_ALWAYSINLINE const char *MP_COMPRESSED_ROM_TEXT(const char *msg) { #endif +#elif CIRCUITPY +#include "supervisor/shared/translate/translate.h" #else // Compression not enabled, just make it a no-op. @@ -337,15 +339,6 @@ inline MP_ALWAYSINLINE const char *MP_COMPRESSED_ROM_TEXT(const char *msg) { typedef const char *mp_rom_error_text_t; #define MP_COMPRESSED_ROM_TEXT(x) x -#endif // MICROPY_ROM_TEXT_COMPRESSION - -// Might add more types of compressed text in the future. -// For now, forward directly to MP_COMPRESSED_ROM_TEXT. -// CIRCUITPY-CHANGE: MP_ERROR_TEXT() -> translate() -#if CIRCUITPY -#include "supervisor/shared/translate/translate.h" -#else -#define MP_ERROR_TEXT(x) (mp_rom_error_text_t)MP_COMPRESSED_ROM_TEXT(x) -#endif +#endif // MICROPY_ROM_TEXT_COMPRESSION // CIRCUITPY #endif // MICROPY_INCLUDED_PY_MISC_H diff --git a/py/moderrno.c b/py/moderrno.c index 405bcb22bb9e..07fa31e005c0 100644 --- a/py/moderrno.c +++ b/py/moderrno.c @@ -127,7 +127,7 @@ const char *mp_common_errno_to_str(mp_obj_t errno_val, char *buf, size_t len) { return NULL; } - const compressed_string_t *desc = NULL; + const mp_rom_error_text_t *desc = NULL; switch (MP_OBJ_SMALL_INT_VALUE(errno_val)) { case EPERM: desc = MP_ERROR_TEXT("Operation not permitted"); diff --git a/py/mpprint.c b/py/mpprint.c index d0be449119f4..cb55f150cb9d 100644 --- a/py/mpprint.c +++ b/py/mpprint.c @@ -496,7 +496,7 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) { break; } case 'S': { - compressed_string_t *arg = va_arg(args, compressed_string_t *); + mp_rom_error_text_t *arg = va_arg(args, mp_rom_error_text_t *); size_t len_with_nul = decompress_length(arg); size_t len = len_with_nul - 1; char str[len_with_nul]; @@ -593,7 +593,7 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) { return chrs; } -int mp_cprintf(const mp_print_t *print, const compressed_string_t *compressed_fmt, ...) { +int mp_cprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, ...) { va_list ap; va_start(ap, compressed_fmt); int ret = mp_vcprintf(print, compressed_fmt, ap); @@ -601,7 +601,7 @@ int mp_cprintf(const mp_print_t *print, const compressed_string_t *compressed_fm return ret; } -int mp_vcprintf(const mp_print_t *print, const compressed_string_t *compressed_fmt, va_list args) { +int mp_vcprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, va_list args) { char fmt[decompress_length(compressed_fmt)]; // TODO: Optimise this to format-while-decompressing (and not require the temp stack space). decompress(compressed_fmt, fmt); diff --git a/py/mpprint.h b/py/mpprint.h index ccf794ab5b06..f5e61e172741 100644 --- a/py/mpprint.h +++ b/py/mpprint.h @@ -27,6 +27,7 @@ #define MICROPY_INCLUDED_PY_MPPRINT_H #include "py/mpconfig.h" +#include "py/misc.h" #define PF_FLAG_LEFT_ADJUST (0x001) #define PF_FLAG_SHOW_SIGN (0x002) @@ -79,11 +80,9 @@ int mp_printf(const mp_print_t *print, const char *fmt, ...); int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args); #endif -// CIRCUITPY-CHANGE -struct compressed_string; -int mp_cprintf(const mp_print_t *print, const struct compressed_string *compressed_fmt, ...); +int mp_cprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, ...); #ifdef va_start -int mp_vcprintf(const mp_print_t *print, const struct compressed_string *compressed_fmt, va_list args); +int mp_vcprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, va_list args); #endif #endif // MICROPY_INCLUDED_PY_MPPRINT_H diff --git a/py/obj.c b/py/obj.c index c43e59d2c3bb..fa5f97a2e40e 100644 --- a/py/obj.c +++ b/py/obj.c @@ -147,7 +147,7 @@ void mp_obj_print(mp_obj_t o_in, mp_print_kind_t kind) { static void mp_obj_print_inner_exception(const mp_print_t *print, mp_obj_t self_in, mp_int_t limit) { #if MICROPY_CPYTHON_EXCEPTION_CHAIN mp_obj_exception_t *self = mp_obj_exception_get_native(self_in); - const compressed_string_t *msg = MP_ERROR_TEXT("During handling of the above exception, another exception occurred:"); + const mp_rom_error_text_t *msg = MP_ERROR_TEXT("During handling of the above exception, another exception occurred:"); mp_obj_exception_t *inner = NULL; if (self->cause) { msg = MP_ERROR_TEXT("The above exception was the direct cause of the following exception:"); @@ -177,11 +177,11 @@ void mp_obj_print_exception_with_limit(const mp_print_t *print, mp_obj_t exc, mp if (n > 0) { assert(n % 3 == 0); #if MICROPY_ENABLE_SOURCE_LINE - const compressed_string_t *frame = MP_ERROR_TEXT(" File \"%q\", line %d"); + const mp_rom_error_text_t *frame = MP_ERROR_TEXT(" File \"%q\", line %d"); #else - const compressed_string_t *frame = MP_ERROR_TEXT(" File \"%q\""); + const mp_rom_error_text_t *frame = MP_ERROR_TEXT(" File \"%q\""); #endif - const compressed_string_t *block_fmt = MP_ERROR_TEXT(", in %q\n"); + const mp_rom_error_text_t *block_fmt = MP_ERROR_TEXT(", in %q\n"); // Set traceback formatting // Default: Print full traceback diff --git a/py/obj.h b/py/obj.h index a32971904b99..1b1e8e5a8391 100644 --- a/py/obj.h +++ b/py/obj.h @@ -34,9 +34,6 @@ #include "py/mpprint.h" #include "py/runtime0.h" -// CIRCUITPY-CHANGE -#include "supervisor/shared/translate/compressed_string.h" - // This is the definition of the opaque MicroPython object type. // All concrete objects have an encoding within this type and the // particular encoding is specified by MICROPY_OBJ_REPR. @@ -1037,12 +1034,12 @@ mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, #define mp_obj_new_exception_msg_varg(exc_type, ...) mp_obj_new_exception(exc_type) #else // CIRCUITPY-CHANGE -mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, const compressed_string_t *msg); -mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...); // counts args by number of % symbols in fmt, excluding %%; can only handle void* sizes (ie no float/double!) +mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg); +mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...); // counts args by number of % symbols in fmt, excluding %%; can only handle void* sizes (ie no float/double!) #endif #ifdef va_start // CIRCUITPY-CHANGE -mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, va_list arg); // same fmt restrictions as above +mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, va_list arg); // same fmt restrictions as above #endif mp_obj_t mp_obj_new_gen_wrap(mp_obj_t fun); mp_obj_t mp_obj_new_closure(mp_obj_t fun, size_t n_closed, const mp_obj_t *closed); diff --git a/py/objexcept.c b/py/objexcept.c index 0f7dd06e3de8..c13e8d526c56 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -479,7 +479,7 @@ mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, } #if MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_NONE -mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, const compressed_string_t *msg) { +mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg) { // CIRCUITPY-CHANGE: is different here and for many lines below. return mp_obj_new_exception_msg_varg(exc_type, msg); } @@ -517,7 +517,7 @@ STATIC void exc_add_strn(void *data, const char *str, size_t len) { pr->len += len; } -mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...) { +mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...) { va_list args; va_start(args, fmt); mp_obj_t exc = mp_obj_new_exception_msg_vlist(exc_type, fmt, args); @@ -525,7 +525,7 @@ mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, const comp return exc; } -mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, va_list ap) { +mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, va_list ap) { assert(fmt != NULL); // Check that the given type is an exception type diff --git a/py/runtime.c b/py/runtime.c index 5b205cd76445..4a842e1864b6 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -1744,7 +1744,7 @@ NORETURN MP_COLD void mp_raise_NotImplementedError_no_msg(void) { #else -NORETURN MP_COLD void mp_raise_msg(const mp_obj_type_t *exc_type, const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg) { if (msg == NULL) { nlr_raise(mp_obj_new_exception(exc_type)); } else { @@ -1752,12 +1752,12 @@ NORETURN MP_COLD void mp_raise_msg(const mp_obj_type_t *exc_type, const compress } } -NORETURN MP_COLD void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, va_list argptr) { +NORETURN MP_COLD void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, va_list argptr) { mp_obj_t exception = mp_obj_new_exception_msg_vlist(exc_type, fmt, argptr); nlr_raise(exception); } -NORETURN MP_COLD void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(exc_type, fmt, argptr); @@ -1772,59 +1772,59 @@ NORETURN MP_COLD void mp_raise_msg_str(const mp_obj_type_t *exc_type, const char } } -NORETURN MP_COLD void mp_raise_AttributeError(const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_AttributeError(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_AttributeError, msg); } -NORETURN MP_COLD void mp_raise_RuntimeError(const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_RuntimeError(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_RuntimeError, msg); } -NORETURN MP_COLD void mp_raise_RuntimeError_varg(const compressed_string_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_RuntimeError_varg(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_RuntimeError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_ImportError(const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_ImportError(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_ImportError, msg); } -NORETURN MP_COLD void mp_raise_IndexError(const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_IndexError(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_IndexError, msg); } -NORETURN MP_COLD void mp_raise_IndexError_varg(const compressed_string_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_IndexError_varg(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_IndexError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_ValueError(const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_ValueError(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_ValueError, msg); } -NORETURN MP_COLD void mp_raise_ValueError_varg(const compressed_string_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_ValueError_varg(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_ValueError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_TypeError(const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_TypeError(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_TypeError, msg); } -NORETURN MP_COLD void mp_raise_TypeError_varg(const compressed_string_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_TypeError_varg(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_TypeError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_OSError_msg(const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_OSError_msg(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_OSError, msg); } @@ -1836,14 +1836,14 @@ NORETURN MP_COLD void mp_raise_OSError_errno_str(int errno_, mp_obj_t str) { nlr_raise(mp_obj_new_exception_args(&mp_type_OSError, 2, args)); } -NORETURN MP_COLD void mp_raise_OSError_msg_varg(const compressed_string_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_OSError_msg_varg(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_OSError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_ConnectionError(const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_ConnectionError(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_ConnectionError, msg); } @@ -1851,11 +1851,11 @@ NORETURN MP_COLD void mp_raise_BrokenPipeError(void) { mp_raise_type_arg(&mp_type_BrokenPipeError, MP_OBJ_NEW_SMALL_INT(MP_EPIPE)); } -NORETURN MP_COLD void mp_raise_NotImplementedError(const compressed_string_t *msg) { +NORETURN MP_COLD void mp_raise_NotImplementedError(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_NotImplementedError, msg); } -NORETURN MP_COLD void mp_raise_NotImplementedError_varg(const compressed_string_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_NotImplementedError_varg(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_NotImplementedError, fmt, argptr); @@ -1863,7 +1863,7 @@ NORETURN MP_COLD void mp_raise_NotImplementedError_varg(const compressed_string_ } -NORETURN MP_COLD void mp_raise_OverflowError_varg(const compressed_string_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_OverflowError_varg(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_OverflowError, fmt, argptr); diff --git a/py/runtime.h b/py/runtime.h index 3cb2881eb2c6..b6a3e48fb61a 100644 --- a/py/runtime.h +++ b/py/runtime.h @@ -242,44 +242,44 @@ NORETURN void mp_raise_NotImplementedError_no_msg(void); #define mp_raise_NotImplementedError(msg) mp_raise_NotImplementedError_no_msg() #else #define mp_raise_type(exc_type) mp_raise_msg(exc_type, NULL) -NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const compressed_string_t *msg); -NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...); -NORETURN void mp_raise_ValueError(const compressed_string_t *msg); -NORETURN void mp_raise_TypeError(const compressed_string_t *msg); -NORETURN void mp_raise_NotImplementedError(const compressed_string_t *msg); +NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg); +NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...); +NORETURN void mp_raise_ValueError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_TypeError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_NotImplementedError(const mp_rom_error_text_t *msg); #endif NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg); -NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const compressed_string_t *msg); -NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const compressed_string_t *fmt +NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg); +NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt , ...); -NORETURN void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, va_list argptr); +NORETURN void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, va_list argptr); // Only use this string version in native mpy files. Otherwise, use the compressed string version. NORETURN void mp_raise_msg_str(const mp_obj_type_t *exc_type, const char *msg); -NORETURN void mp_raise_AttributeError(const compressed_string_t *msg); +NORETURN void mp_raise_AttributeError(const mp_rom_error_text_t *msg); NORETURN void mp_raise_BrokenPipeError(void); -NORETURN void mp_raise_ConnectionError(const compressed_string_t *msg); -NORETURN void mp_raise_ImportError(const compressed_string_t *msg); -NORETURN void mp_raise_IndexError(const compressed_string_t *msg); -NORETURN void mp_raise_IndexError_varg(const compressed_string_t *msg, ...); -NORETURN void mp_raise_NotImplementedError(const compressed_string_t *msg); -NORETURN void mp_raise_NotImplementedError_varg(const compressed_string_t *fmt, ...); +NORETURN void mp_raise_ConnectionError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_ImportError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_IndexError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_IndexError_varg(const mp_rom_error_text_t *msg, ...); +NORETURN void mp_raise_NotImplementedError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_NotImplementedError_varg(const mp_rom_error_text_t *fmt, ...); NORETURN void mp_raise_OSError_errno_str(int errno_, mp_obj_t str); NORETURN void mp_raise_OSError(int errno_); -NORETURN void mp_raise_OSError_msg(const compressed_string_t *msg); -NORETURN void mp_raise_OSError_msg_varg(const compressed_string_t *fmt, ...); +NORETURN void mp_raise_OSError_msg(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_OSError_msg_varg(const mp_rom_error_text_t *fmt, ...); NORETURN void mp_raise_OSError_with_filename(int errno_, const char *filename); -NORETURN void mp_raise_OverflowError_varg(const compressed_string_t *fmt, ...); +NORETURN void mp_raise_OverflowError_varg(const mp_rom_error_text_t *fmt, ...); NORETURN void mp_raise_recursion_depth(void); -NORETURN void mp_raise_RuntimeError(const compressed_string_t *msg); -NORETURN void mp_raise_RuntimeError_varg(const compressed_string_t *fmt, ...); +NORETURN void mp_raise_RuntimeError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_RuntimeError_varg(const mp_rom_error_text_t *fmt, ...); NORETURN void mp_raise_StopIteration(mp_obj_t arg); -NORETURN void mp_raise_TypeError(const compressed_string_t *msg); -NORETURN void mp_raise_TypeError_varg(const compressed_string_t *fmt, ...); +NORETURN void mp_raise_TypeError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_TypeError_varg(const mp_rom_error_text_t *fmt, ...); NORETURN void mp_raise_TypeError_int_conversion(mp_const_obj_t arg); -NORETURN void mp_raise_ValueError(const compressed_string_t *msg); -NORETURN void mp_raise_ValueError_varg(const compressed_string_t *fmt, ...); +NORETURN void mp_raise_ValueError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_ValueError_varg(const mp_rom_error_text_t *fmt, ...); NORETURN void mp_raise_ZeroDivisionError(void); #if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG diff --git a/shared-bindings/_bleio/__init__.c b/shared-bindings/_bleio/__init__.c index ab41f8ff6fbe..949fcae86759 100644 --- a/shared-bindings/_bleio/__init__.c +++ b/shared-bindings/_bleio/__init__.c @@ -66,7 +66,7 @@ //| ... //| MP_DEFINE_BLEIO_EXCEPTION(BluetoothError, Exception) -NORETURN void mp_raise_bleio_BluetoothError(const compressed_string_t *fmt, ...) { +NORETURN void mp_raise_bleio_BluetoothError(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_obj_t exception = mp_obj_new_exception_msg_vlist(&mp_type_bleio_BluetoothError, fmt, argptr); @@ -81,7 +81,7 @@ NORETURN void mp_raise_bleio_BluetoothError(const compressed_string_t *fmt, ...) //| ... //| MP_DEFINE_BLEIO_EXCEPTION(RoleError, bleio_BluetoothError) -NORETURN void mp_raise_bleio_RoleError(const compressed_string_t *msg) { +NORETURN void mp_raise_bleio_RoleError(const mp_rom_error_text_t *msg) { mp_raise_msg(&mp_type_bleio_RoleError, msg); } @@ -91,7 +91,7 @@ NORETURN void mp_raise_bleio_RoleError(const compressed_string_t *msg) { //| ... //| MP_DEFINE_BLEIO_EXCEPTION(SecurityError, bleio_BluetoothError) -NORETURN void mp_raise_bleio_SecurityError(const compressed_string_t *fmt, ...) { +NORETURN void mp_raise_bleio_SecurityError(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_obj_t exception = mp_obj_new_exception_msg_vlist(&mp_type_bleio_SecurityError, fmt, argptr); diff --git a/shared-bindings/_bleio/__init__.h b/shared-bindings/_bleio/__init__.h index 1a917793eb4c..b980421a52d7 100644 --- a/shared-bindings/_bleio/__init__.h +++ b/shared-bindings/_bleio/__init__.h @@ -62,9 +62,9 @@ void bleio_reset(void); extern mp_obj_t bleio_set_adapter(mp_obj_t adapter_obj); -NORETURN void mp_raise_bleio_BluetoothError(const compressed_string_t *msg, ...); -NORETURN void mp_raise_bleio_RoleError(const compressed_string_t *msg); -NORETURN void mp_raise_bleio_SecurityError(const compressed_string_t *msg, ...); +NORETURN void mp_raise_bleio_BluetoothError(const mp_rom_error_text_t *msg, ...); +NORETURN void mp_raise_bleio_RoleError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_bleio_SecurityError(const mp_rom_error_text_t *msg, ...); bleio_adapter_obj_t *common_hal_bleio_allocate_adapter_or_raise(void); void common_hal_bleio_check_connected(uint16_t conn_handle); diff --git a/shared-bindings/memorymonitor/__init__.c b/shared-bindings/memorymonitor/__init__.c index b7ed7566a4d1..72dfd53a0156 100644 --- a/shared-bindings/memorymonitor/__init__.c +++ b/shared-bindings/memorymonitor/__init__.c @@ -43,7 +43,7 @@ //| MP_DEFINE_MEMORYMONITOR_EXCEPTION(AllocationError, Exception) -NORETURN void mp_raise_memorymonitor_AllocationError(const compressed_string_t *fmt, ...) { +NORETURN void mp_raise_memorymonitor_AllocationError(const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_obj_t exception = mp_obj_new_exception_msg_vlist(&mp_type_memorymonitor_AllocationError, fmt, argptr); diff --git a/shared-bindings/memorymonitor/__init__.h b/shared-bindings/memorymonitor/__init__.h index 5d9dfddbe275..4d79c8f54235 100644 --- a/shared-bindings/memorymonitor/__init__.h +++ b/shared-bindings/memorymonitor/__init__.h @@ -44,6 +44,6 @@ void memorymonitor_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_pr extern const mp_obj_type_t mp_type_memorymonitor_AllocationError; -NORETURN void mp_raise_memorymonitor_AllocationError(const compressed_string_t *msg, ...); +NORETURN void mp_raise_memorymonitor_AllocationError(const mp_rom_error_text_t *msg, ...); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_MEMORYMONITOR___INIT___H diff --git a/shared-bindings/usb/core/__init__.c b/shared-bindings/usb/core/__init__.c index 0212ae8f3031..236b33acfc00 100644 --- a/shared-bindings/usb/core/__init__.c +++ b/shared-bindings/usb/core/__init__.c @@ -48,7 +48,7 @@ //| ... //| MP_DEFINE_USB_CORE_EXCEPTION(USBError, OSError) -NORETURN void mp_raise_usb_core_USBError(const compressed_string_t *fmt, ...) { +NORETURN void mp_raise_usb_core_USBError(const mp_rom_error_text_t *fmt, ...) { mp_obj_t exception; if (fmt == NULL) { exception = mp_obj_new_exception(&mp_type_usb_core_USBError); diff --git a/shared-bindings/usb/core/__init__.h b/shared-bindings/usb/core/__init__.h index 86b944dfb2d2..85b929871a5a 100644 --- a/shared-bindings/usb/core/__init__.h +++ b/shared-bindings/usb/core/__init__.h @@ -45,7 +45,7 @@ void usb_core_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_k extern const mp_obj_type_t mp_type_usb_core_USBError; extern const mp_obj_type_t mp_type_usb_core_USBTimeoutError; -NORETURN void mp_raise_usb_core_USBError(const compressed_string_t *fmt, ...); +NORETURN void mp_raise_usb_core_USBError(const mp_rom_error_text_t *fmt, ...); NORETURN void mp_raise_usb_core_USBTimeoutError(void); // Find is all Python object oriented so we don't need a separate common-hal API diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c index 7fba52225655..74e01e07bf7c 100644 --- a/shared-module/os/getenv.c +++ b/shared-module/os/getenv.c @@ -314,7 +314,7 @@ STATIC os_getenv_err_t os_getenv_buf_terminated(const char *key, char *value, si return result; } -STATIC void print_dont_raise(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...) { +STATIC void print_dont_raise(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_vcprintf(&mp_plat_print, fmt, argptr); @@ -322,7 +322,7 @@ STATIC void print_dont_raise(const mp_obj_type_t *exc_type, const compressed_str va_end(argptr); } -STATIC void handle_getenv_error(os_getenv_err_t error, void (*handle)(const mp_obj_type_t *exc_type, const compressed_string_t *fmt, ...)) { +STATIC void handle_getenv_error(os_getenv_err_t error, void (*handle)(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...)) { if (error == GETENV_OK) { return; } diff --git a/shared-module/sdcardio/SDCard.c b/shared-module/sdcardio/SDCard.c index 182eb0eed91d..f9c31d0f6696 100644 --- a/shared-module/sdcardio/SDCard.c +++ b/shared-module/sdcardio/SDCard.c @@ -199,7 +199,7 @@ STATIC int block_cmd(sdcardio_sdcard_obj_t *self, int cmd_, int block, void *res return cmd(self, cmd_, block * self->cdv, response_buf, response_len, true, true); } -STATIC const compressed_string_t *init_card_v1(sdcardio_sdcard_obj_t *self) { +STATIC const mp_rom_error_text_t *init_card_v1(sdcardio_sdcard_obj_t *self) { for (int i = 0; i < CMD_TIMEOUT; i++) { if (cmd(self, 41, 0, NULL, 0, true, true) == 0) { return NULL; @@ -208,7 +208,7 @@ STATIC const compressed_string_t *init_card_v1(sdcardio_sdcard_obj_t *self) { return translate("timeout waiting for v1 card"); } -STATIC const compressed_string_t *init_card_v2(sdcardio_sdcard_obj_t *self) { +STATIC const mp_rom_error_text_t *init_card_v2(sdcardio_sdcard_obj_t *self) { for (int i = 0; i < CMD_TIMEOUT; i++) { uint8_t ocr[4]; common_hal_time_delay_ms(50); @@ -225,7 +225,7 @@ STATIC const compressed_string_t *init_card_v2(sdcardio_sdcard_obj_t *self) { return translate("timeout waiting for v2 card"); } -STATIC const compressed_string_t *init_card(sdcardio_sdcard_obj_t *self) { +STATIC const mp_rom_error_text_t *init_card(sdcardio_sdcard_obj_t *self) { clock_card(self, 10); common_hal_digitalio_digitalinout_set_value(&self->cs, false); @@ -256,12 +256,12 @@ STATIC const compressed_string_t *init_card(sdcardio_sdcard_obj_t *self) { uint8_t rb7[4]; int response = cmd(self, 8, 0x1AA, rb7, sizeof(rb7), false, true); if (response == R1_IDLE_STATE) { - const compressed_string_t *result = init_card_v2(self); + const mp_rom_error_text_t *result = init_card_v2(self); if (result != NULL) { return result; } } else if (response == (R1_IDLE_STATE | R1_ILLEGAL_COMMAND)) { - const compressed_string_t *result = init_card_v1(self); + const mp_rom_error_text_t *result = init_card_v1(self); if (result != NULL) { return result; } @@ -314,7 +314,7 @@ void common_hal_sdcardio_sdcard_construct(sdcardio_sdcard_obj_t *self, busio_spi self->baudrate = 250000; lock_bus_or_throw(self); - const compressed_string_t *result = init_card(self); + const mp_rom_error_text_t *result = init_card(self); extraclock_and_unlock_bus(self); if (result != NULL) { diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c index 6e1cc740842a..c7ead7ac5373 100644 --- a/supervisor/shared/safe_mode.c +++ b/supervisor/shared/safe_mode.c @@ -148,7 +148,7 @@ void print_safe_mode_message(safe_mode_t reason) { serial_write_compressed(translate("\nYou are in safe mode because:\n")); - const compressed_string_t *message = NULL; + const mp_rom_error_text_t *message = NULL; // First check for safe mode reasons that do not necessarily reflect bugs. diff --git a/supervisor/shared/translate/compressed_string.h b/supervisor/shared/translate/compressed_string.h index 8b0ce3d01860..efc2c65634ba 100644 --- a/supervisor/shared/translate/compressed_string.h +++ b/supervisor/shared/translate/compressed_string.h @@ -94,12 +94,12 @@ typedef struct compressed_string { uint8_t data; const uint8_t tail[]; -} compressed_string_t; +} mp_rom_error_text_t; // Return the compressed, translated version of a source string // Usually, due to LTO, this is optimized into a load of a constant // pointer. -// const compressed_string_t *translate(const char *c); -void serial_write_compressed(const compressed_string_t *compressed); -char *decompress(const compressed_string_t *compressed, char *decompressed); -uint16_t decompress_length(const compressed_string_t *compressed); +// const mp_rom_error_text_t *translate(const char *c); +void serial_write_compressed(const mp_rom_error_text_t *compressed); +char *decompress(const mp_rom_error_text_t *compressed, char *decompressed); +uint16_t decompress_length(const mp_rom_error_text_t *compressed); diff --git a/supervisor/shared/translate/translate.c b/supervisor/shared/translate/translate.c index 7d57ab3bf2e2..244497dfe0c2 100644 --- a/supervisor/shared/translate/translate.c +++ b/supervisor/shared/translate/translate.c @@ -39,7 +39,7 @@ #include "py/mpprint.h" #include "supervisor/serial.h" -void serial_write_compressed(const compressed_string_t *compressed) { +void serial_write_compressed(const mp_rom_error_text_t *compressed) { mp_printf(MP_PYTHON_PRINTER, "%S", compressed); } @@ -90,7 +90,7 @@ STATIC int put_utf8(char *buf, int u) { } } -uint16_t decompress_length(const compressed_string_t *compressed) { +uint16_t decompress_length(const mp_rom_error_text_t *compressed) { #ifndef NO_QSTR #if (compress_max_length_bits <= 8) return 1 + (compressed->data >> (8 - compress_max_length_bits)); @@ -123,7 +123,7 @@ static int get_nbits(bitstream_state_t *st, int n) { return r; } -char *decompress(const compressed_string_t *compressed, char *decompressed) { +char *decompress(const mp_rom_error_text_t *compressed, char *decompressed) { bitstream_state_t b = { .ptr = &(compressed->data) + (compress_max_length_bits >> 3), .bit = 1 << (7 - ((compress_max_length_bits) & 0x7)), diff --git a/supervisor/shared/translate/translate.h b/supervisor/shared/translate/translate.h index 8779fb631090..49d5b5a64250 100644 --- a/supervisor/shared/translate/translate.h +++ b/supervisor/shared/translate/translate.h @@ -49,5 +49,5 @@ #else // In link time optimized (LTO) builds, we can compile this once into a .o and // at link time the calls will be optimized. -const compressed_string_t *translate(const char *c); +const mp_rom_error_text_t *translate(const char *c); #endif diff --git a/supervisor/shared/translate/translate_impl.h b/supervisor/shared/translate/translate_impl.h index 13da8c656b5c..e1a295a0db78 100644 --- a/supervisor/shared/translate/translate_impl.h +++ b/supervisor/shared/translate/translate_impl.h @@ -34,7 +34,7 @@ #ifndef NO_QSTR #define QDEF(id, hash, len, str) -#define TRANSLATION(english_id, number) extern compressed_string_t translation##number; +#define TRANSLATION(english_id, number) extern mp_rom_error_text_t translation##number; #include "genhdr/qstrdefs.generated.h" #undef TRANSLATION #undef QDEF @@ -50,7 +50,7 @@ __attribute__((always_inline)) #endif // Prevent instrumenting this because that disables the inlining we rely of for code size // optimization. -__attribute__((no_instrument_function)) const compressed_string_t *translate(const char *original) { +__attribute__((no_instrument_function)) const mp_rom_error_text_t *translate(const char *original) { #ifndef NO_QSTR #define QDEF(id, hash, len, str) #define TRANSLATION(english_id, number) if (strcmp(original, english_id) == 0) { return &translation##number; } else From acf350a1b7d5341fc03e66c556aa3957027250ac Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 25 Oct 2023 08:19:31 +0200 Subject: [PATCH 02/11] In py/ use MP_ERROR_TEXT instead of translate --- py/argcheck.c | 36 ++++++++++++++++++------------------ py/builtinhelp.c | 8 ++++---- py/compile.c | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/py/argcheck.c b/py/argcheck.c index 8c34a681febd..ad39b2fcd8f9 100644 --- a/py/argcheck.c +++ b/py/argcheck.c @@ -179,28 +179,28 @@ NORETURN void mp_arg_error_unimpl_kw(void) { mp_int_t mp_arg_validate_int(mp_int_t i, mp_int_t required_i, qstr arg_name) { if (i != required_i) { - mp_raise_ValueError_varg(translate("%q must be %d"), arg_name, required_i); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be %d"), arg_name, required_i); } return i; } mp_int_t mp_arg_validate_int_min(mp_int_t i, mp_int_t min, qstr arg_name) { if (i < min) { - mp_raise_ValueError_varg(translate("%q must be >= %d"), arg_name, min); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be >= %d"), arg_name, min); } return i; } mp_int_t mp_arg_validate_int_max(mp_int_t i, mp_int_t max, qstr arg_name) { if (i > max) { - mp_raise_ValueError_varg(translate("%q must be <= %d"), arg_name, max); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be <= %d"), arg_name, max); } return i; } mp_int_t mp_arg_validate_int_range(mp_int_t i, mp_int_t min, mp_int_t max, qstr arg_name) { if (i < min || i > max) { - mp_raise_ValueError_varg(translate("%q must be %d-%d"), arg_name, min, max); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be %d-%d"), arg_name, min, max); } return i; } @@ -208,7 +208,7 @@ mp_int_t mp_arg_validate_int_range(mp_int_t i, mp_int_t min, mp_int_t max, qstr mp_float_t mp_arg_validate_type_float(mp_obj_t obj, qstr arg_name) { mp_float_t a_float; if (!mp_obj_get_float_maybe(obj, &a_float)) { - mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, MP_QSTR_float, mp_obj_get_type(obj)->name); + mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q, not %q"), arg_name, MP_QSTR_float, mp_obj_get_type(obj)->name); } return a_float; } @@ -220,7 +220,7 @@ mp_float_t mp_arg_validate_obj_float_range(mp_obj_t float_in, mp_int_t min, mp_i mp_float_t mp_arg_validate_float_range(mp_float_t f, mp_int_t min, mp_int_t max, qstr arg_name) { if (f < (mp_float_t)min || f > (mp_float_t)max) { - mp_raise_ValueError_varg(translate("%q must be %d-%d"), arg_name, min, max); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be %d-%d"), arg_name, min, max); } return f; } @@ -230,35 +230,35 @@ mp_float_t mp_arg_validate_obj_float_non_negative(mp_obj_t float_in, mp_float_t ? default_for_null : mp_arg_validate_type_float(float_in, arg_name); if (f < (mp_float_t)0.0) { - mp_raise_ValueError_varg(translate("%q must be >= %d"), arg_name, 0); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q must be >= %d"), arg_name, 0); } return f; } mp_uint_t mp_arg_validate_length_range(mp_uint_t length, mp_uint_t min, mp_uint_t max, qstr arg_name) { if (length < min || length > max) { - mp_raise_ValueError_varg(translate("%q length must be %d-%d"), arg_name, min, max); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q length must be %d-%d"), arg_name, min, max); } return length; } mp_uint_t mp_arg_validate_length_min(mp_uint_t length, mp_uint_t min, qstr arg_name) { if (length < min) { - mp_raise_ValueError_varg(translate("%q length must be >= %d"), arg_name, min); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q length must be >= %d"), arg_name, min); } return length; } mp_uint_t mp_arg_validate_length_max(mp_uint_t length, mp_uint_t max, qstr arg_name) { if (length > max) { - mp_raise_ValueError_varg(translate("%q length must be <= %d"), arg_name, max); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q length must be <= %d"), arg_name, max); } return length; } mp_uint_t mp_arg_validate_length(mp_uint_t length, mp_uint_t required_length, qstr arg_name) { if (length != required_length) { - mp_raise_ValueError_varg(translate("%q length must be %d"), arg_name, required_length); + mp_raise_ValueError_varg(MP_ERROR_TEXT("%q length must be %d"), arg_name, required_length); } return length; } @@ -266,35 +266,35 @@ mp_uint_t mp_arg_validate_length(mp_uint_t length, mp_uint_t required_length, qs // int instead of uint because an index can be negative in some cases. mp_int_t mp_arg_validate_index_range(mp_int_t index, mp_int_t min, mp_int_t max, qstr arg_name) { if (index < min || index > max) { - mp_raise_IndexError_varg(translate("%q out of range"), arg_name, min, max); + mp_raise_IndexError_varg(MP_ERROR_TEXT("%q out of range"), arg_name, min, max); } return index; } mp_obj_t mp_arg_validate_type(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_name) { if (!mp_obj_is_type(obj, type)) { - mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, type->name, mp_obj_get_type(obj)->name); + mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q, not %q"), arg_name, type->name, mp_obj_get_type(obj)->name); } return obj; } mp_obj_t mp_arg_validate_type_in(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_name) { if (!mp_obj_is_type(obj, type)) { - mp_raise_TypeError_varg(translate("%q in %q must be of type %q, not %q"), MP_QSTR_object, arg_name, type->name, mp_obj_get_type(obj)->name); + mp_raise_TypeError_varg(MP_ERROR_TEXT("%q in %q must be of type %q, not %q"), MP_QSTR_object, arg_name, type->name, mp_obj_get_type(obj)->name); } return obj; } mp_obj_t mp_arg_validate_type_or_none(mp_obj_t obj, const mp_obj_type_t *type, qstr arg_name) { if (obj != mp_const_none && !mp_obj_is_type(obj, type)) { - mp_raise_TypeError_varg(translate("%q must be of type %q or %q, not %q"), arg_name, type->name, MP_QSTR_None, mp_obj_get_type(obj)->name); + mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q or %q, not %q"), arg_name, type->name, MP_QSTR_None, mp_obj_get_type(obj)->name); } return obj; } mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name) { if (!mp_obj_is_str(obj)) { - mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, MP_QSTR_str, mp_obj_get_type(obj)->name); + mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q, not %q"), arg_name, MP_QSTR_str, mp_obj_get_type(obj)->name); } return obj; } @@ -302,11 +302,11 @@ mp_obj_t mp_arg_validate_type_string(mp_obj_t obj, qstr arg_name) { mp_int_t mp_arg_validate_type_int(mp_obj_t obj, qstr arg_name) { mp_int_t an_int; if (!mp_obj_get_int_maybe(obj, &an_int)) { - mp_raise_TypeError_varg(translate("%q must be of type %q, not %q"), arg_name, MP_QSTR_int, mp_obj_get_type(obj)->name); + mp_raise_TypeError_varg(MP_ERROR_TEXT("%q must be of type %q, not %q"), arg_name, MP_QSTR_int, mp_obj_get_type(obj)->name); } return an_int; } NORETURN void mp_arg_error_invalid(qstr arg_name) { - mp_raise_ValueError_varg(translate("Invalid %q"), arg_name); + mp_raise_ValueError_varg(MP_ERROR_TEXT("Invalid %q"), arg_name); } diff --git a/py/builtinhelp.c b/py/builtinhelp.c index f545656ea561..fe7653b9a26f 100644 --- a/py/builtinhelp.c +++ b/py/builtinhelp.c @@ -122,7 +122,7 @@ STATIC void mp_help_print_modules(void) { #if MICROPY_ENABLE_EXTERNAL_IMPORT // let the user know there may be other modules available from the filesystem - serial_write_compressed(translate("Plus any modules on the filesystem\n")); + serial_write_compressed(MP_ERROR_TEXT("Plus any modules on the filesystem\n")); #endif } #endif @@ -138,10 +138,10 @@ STATIC void mp_help_print_obj(const mp_obj_t obj) { const mp_obj_type_t *type = mp_obj_get_type(obj); // try to print something sensible about the given object - mp_cprintf(MP_PYTHON_PRINTER, translate("object ")); + mp_cprintf(MP_PYTHON_PRINTER, MP_ERROR_TEXT("object ")); mp_obj_print(obj, PRINT_STR); - mp_cprintf(MP_PYTHON_PRINTER, translate(" is of type %q\n"), type->name); + mp_cprintf(MP_PYTHON_PRINTER, MP_ERROR_TEXT(" is of type %q\n"), type->name); mp_map_t *map = NULL; if (type == &mp_type_module) { @@ -168,7 +168,7 @@ STATIC mp_obj_t mp_builtin_help(size_t n_args, const mp_obj_t *args) { if (n_args == 0) { // print a general help message. Translate only works on single strings on one line. mp_cprintf(MP_PYTHON_PRINTER, - translate("Welcome to Adafruit CircuitPython %s!\n\nVisit circuitpython.org for more information.\n\nTo list built-in modules type `help(\"modules\")`.\n"), + MP_ERROR_TEXT("Welcome to Adafruit CircuitPython %s!\n\nVisit circuitpython.org for more information.\n\nTo list built-in modules type `help(\"modules\")`.\n"), MICROPY_GIT_TAG); } else { // try to print something sensible about the given object diff --git a/py/compile.c b/py/compile.c index 07e7d1a8f451..e233d846e3c9 100644 --- a/py/compile.c +++ b/py/compile.c @@ -2740,7 +2740,7 @@ STATIC void compile_yield_expr(compiler_t *comp, mp_parse_node_struct_t *pns) { pns = (mp_parse_node_struct_t *)pns->nodes[0]; #if MICROPY_PY_ASYNC_AWAIT if (comp->scope_cur->scope_flags & MP_SCOPE_FLAG_ASYNC) { - compile_syntax_error(comp, (mp_parse_node_t)pns, translate("'yield from' inside async function")); + compile_syntax_error(comp, (mp_parse_node_t)pns, MP_ERROR_TEXT("'yield from' inside async function")); return; } #endif From 54a5878ee049abbd044d796043c5933bb39a0afb Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 25 Oct 2023 21:24:52 +0200 Subject: [PATCH 03/11] WIP --- py/misc.h | 10 ++++++---- supervisor/shared/translate/compressed_string.h | 2 +- supervisor/shared/translate/translate.h | 4 +--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/py/misc.h b/py/misc.h index 37c6caa4aeb6..e17616b16a82 100644 --- a/py/misc.h +++ b/py/misc.h @@ -297,7 +297,6 @@ typedef union _mp_float_union_t { // So leave MP_COMPRESSED_ROM_TEXT in place for makeqstrdefs.py / makecompresseddata.py to find them. #else - // Compression enabled and doing a regular build. // Map MP_COMPRESSED_ROM_TEXT to the compressed strings. @@ -327,10 +326,9 @@ inline MP_ALWAYSINLINE const char *MP_COMPRESSED_ROM_TEXT(const char *msg) { return msg; } - #endif -#elif CIRCUITPY +#elif defined(CIRCUITPY) #include "supervisor/shared/translate/translate.h" #else @@ -339,6 +337,10 @@ inline MP_ALWAYSINLINE const char *MP_COMPRESSED_ROM_TEXT(const char *msg) { typedef const char *mp_rom_error_text_t; #define MP_COMPRESSED_ROM_TEXT(x) x -#endif // MICROPY_ROM_TEXT_COMPRESSION // CIRCUITPY +#endif // MICROPY_ROM_TEXT_COMPRESSION + +// Might add more types of compressed text in the future. +// For now, forward directly to MP_COMPRESSED_ROM_TEXT. +#define MP_ERROR_TEXT(x) (mp_rom_error_text_t)MP_COMPRESSED_ROM_TEXT(x) #endif // MICROPY_INCLUDED_PY_MISC_H diff --git a/supervisor/shared/translate/compressed_string.h b/supervisor/shared/translate/compressed_string.h index efc2c65634ba..1174121068b1 100644 --- a/supervisor/shared/translate/compressed_string.h +++ b/supervisor/shared/translate/compressed_string.h @@ -94,7 +94,7 @@ typedef struct compressed_string { uint8_t data; const uint8_t tail[]; -} mp_rom_error_text_t; +} *mp_rom_error_text_t; // Return the compressed, translated version of a source string // Usually, due to LTO, this is optimized into a load of a constant diff --git a/supervisor/shared/translate/translate.h b/supervisor/shared/translate/translate.h index 49d5b5a64250..be8467077606 100644 --- a/supervisor/shared/translate/translate.h +++ b/supervisor/shared/translate/translate.h @@ -33,9 +33,7 @@ #include "supervisor/shared/translate/compressed_string.h" // Map MicroPython's error messages to our translations. -#if !defined(MICROPY_ENABLE_DYNRUNTIME) || !MICROPY_ENABLE_DYNRUNTIME -#define MP_ERROR_TEXT(x) translate(x) -#endif +#define MP_COMPRESSED_ROM_TEXT(x) translate(x) // translate() is a giant function with many strcmp calls. The assumption is // that the build process will optimize this away and replace it with the From de541cf15560ef82ba6804791b894b271dd1c044 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Wed, 25 Oct 2023 21:40:11 +0200 Subject: [PATCH 04/11] Fix pointer-ness, const-ness of compressed messages micropython puts the pointer-ness into the typedef; we can put the const-ness there too. this reduces the delta to micropython; for instance, emitinlinextensa and emitinlinethumb now match upstream. --- devices/ble_hci/common-hal/_bleio/att.c | 2 +- ports/espressif/common-hal/espidf/__init__.c | 2 +- ports/espressif/common-hal/wifi/Monitor.c | 2 +- py/compile.c | 2 +- py/emitinlinethumb.c | 3 +- py/emitinlinextensa.c | 3 +- py/maketranslationdata.py | 2 +- py/moderrno.c | 2 +- py/mpprint.c | 6 +-- py/mpprint.h | 1 - py/obj.c | 8 ++-- py/obj.h | 6 +-- py/objexcept.c | 6 +-- py/qstr.c | 2 +- py/qstr.h | 2 +- py/runtime.c | 38 +++++++-------- py/runtime.h | 48 +++++++++---------- shared-bindings/_bleio/__init__.c | 6 +-- shared-bindings/_bleio/__init__.h | 6 +-- shared-bindings/memorymonitor/__init__.c | 2 +- shared-bindings/memorymonitor/__init__.h | 2 +- shared-bindings/usb/core/__init__.c | 2 +- shared-bindings/usb/core/__init__.h | 2 +- shared-module/os/getenv.c | 4 +- shared-module/sdcardio/SDCard.c | 12 ++--- supervisor/shared/safe_mode.c | 2 +- .../shared/translate/compressed_string.h | 10 ++-- supervisor/shared/translate/translate.c | 6 +-- supervisor/shared/translate/translate.h | 10 +++- supervisor/shared/translate/translate_impl.h | 6 +-- 30 files changed, 104 insertions(+), 101 deletions(-) diff --git a/devices/ble_hci/common-hal/_bleio/att.c b/devices/ble_hci/common-hal/_bleio/att.c index 6a95126864cc..05099ec7185a 100644 --- a/devices/ble_hci/common-hal/_bleio/att.c +++ b/devices/ble_hci/common-hal/_bleio/att.c @@ -1722,7 +1722,7 @@ void att_process_data(uint16_t conn_handle, uint8_t dlen, uint8_t data[]) { // FIX Do we need all of these? static void check_att_err(uint8_t err) { - const mp_rom_error_text_t *msg = NULL; + mp_rom_error_text_t msg = NULL; switch (err) { case 0: return; diff --git a/ports/espressif/common-hal/espidf/__init__.c b/ports/espressif/common-hal/espidf/__init__.c index 4d1a24c9ea04..377faab166b0 100644 --- a/ports/espressif/common-hal/espidf/__init__.c +++ b/ports/espressif/common-hal/espidf/__init__.c @@ -122,7 +122,7 @@ intptr_t common_hal_espidf_get_psram_end(void) { } void raise_esp_error(esp_err_t err) { - const mp_rom_error_text_t *msg = NULL; + mp_rom_error_text_t msg = NULL; const mp_obj_type_t *exception_type = &mp_type_espidf_IDFError; switch (err) { case ESP_FAIL: diff --git a/ports/espressif/common-hal/wifi/Monitor.c b/ports/espressif/common-hal/wifi/Monitor.c index ff3700af57a0..f4d3a9f135b7 100644 --- a/ports/espressif/common-hal/wifi/Monitor.c +++ b/ports/espressif/common-hal/wifi/Monitor.c @@ -78,7 +78,7 @@ static void wifi_monitor_cb(void *recv_buf, wifi_promiscuous_pkt_type_t type) { } void common_hal_wifi_monitor_construct(wifi_monitor_obj_t *self, uint8_t channel, size_t queue) { - const mp_rom_error_text_t *monitor_mode_init_error = translate("monitor init failed"); + mp_rom_error_text_t monitor_mode_init_error = translate("monitor init failed"); self->queue = xQueueCreate(queue, sizeof(monitor_packet_t)); if (!self->queue) { diff --git a/py/compile.c b/py/compile.c index e233d846e3c9..4752d508c8b7 100644 --- a/py/compile.c +++ b/py/compile.c @@ -255,7 +255,7 @@ STATIC void compile_error_set_line(compiler_t *comp, mp_parse_node_t pn) { } } -STATIC void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, const mp_rom_error_text_t *msg) { +STATIC void compile_syntax_error(compiler_t *comp, mp_parse_node_t pn, mp_rom_error_text_t msg) { // only register the error if there has been no other error if (comp->compile_error == MP_OBJ_NULL) { comp->compile_error = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg); diff --git a/py/emitinlinethumb.c b/py/emitinlinethumb.c index ea19b31686e9..29487f10483f 100644 --- a/py/emitinlinethumb.c +++ b/py/emitinlinethumb.c @@ -74,8 +74,7 @@ static inline bool emit_inline_thumb_allow_float(emit_inline_asm_t *emit) { #endif -// CIRCUITPY-CHANGE -STATIC void emit_inline_thumb_error_msg(emit_inline_asm_t *emit, const mp_rom_error_text_t *msg) { +STATIC void emit_inline_thumb_error_msg(emit_inline_asm_t *emit, mp_rom_error_text_t msg) { *emit->error_slot = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg); } diff --git a/py/emitinlinextensa.c b/py/emitinlinextensa.c index 72f59e515e90..5dac2ae3907f 100644 --- a/py/emitinlinextensa.c +++ b/py/emitinlinextensa.c @@ -43,8 +43,7 @@ struct _emit_inline_asm_t { qstr *label_lookup; }; -// CIRCUITPY-CHANGE -STATIC void emit_inline_xtensa_error_msg(emit_inline_asm_t *emit, const mp_rom_error_text_t *msg) { +STATIC void emit_inline_xtensa_error_msg(emit_inline_asm_t *emit, mp_rom_error_text_t msg) { *emit->error_slot = mp_obj_new_exception_msg(&mp_type_SyntaxError, msg); } diff --git a/py/maketranslationdata.py b/py/maketranslationdata.py index 3d6ef03d310c..8676aab1a56d 100644 --- a/py/maketranslationdata.py +++ b/py/maketranslationdata.py @@ -595,7 +595,7 @@ def output_translation_data(encoding_table, i18ns, out): decompressed = decompressed.replace(c, C_ESCAPES[c]) formatted = ["{:d}".format(x) for x in compressed] out.write( - "const mp_rom_error_text_t translation{} = {{ .data = {}, .tail = {{ {} }} }}; // {}\n".format( + "const struct compressed_string translation{} = {{ .data = {}, .tail = {{ {} }} }}; // {}\n".format( i, formatted[0], ", ".join(formatted[1:]), original, decompressed ) ) diff --git a/py/moderrno.c b/py/moderrno.c index 07fa31e005c0..e8057ff00287 100644 --- a/py/moderrno.c +++ b/py/moderrno.c @@ -127,7 +127,7 @@ const char *mp_common_errno_to_str(mp_obj_t errno_val, char *buf, size_t len) { return NULL; } - const mp_rom_error_text_t *desc = NULL; + mp_rom_error_text_t desc = NULL; switch (MP_OBJ_SMALL_INT_VALUE(errno_val)) { case EPERM: desc = MP_ERROR_TEXT("Operation not permitted"); diff --git a/py/mpprint.c b/py/mpprint.c index cb55f150cb9d..36b036d83ff7 100644 --- a/py/mpprint.c +++ b/py/mpprint.c @@ -496,7 +496,7 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) { break; } case 'S': { - mp_rom_error_text_t *arg = va_arg(args, mp_rom_error_text_t *); + mp_rom_error_text_t arg = va_arg(args, mp_rom_error_text_t ); size_t len_with_nul = decompress_length(arg); size_t len = len_with_nul - 1; char str[len_with_nul]; @@ -593,7 +593,7 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) { return chrs; } -int mp_cprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, ...) { +int mp_cprintf(const mp_print_t *print, mp_rom_error_text_t compressed_fmt, ...) { va_list ap; va_start(ap, compressed_fmt); int ret = mp_vcprintf(print, compressed_fmt, ap); @@ -601,7 +601,7 @@ int mp_cprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fm return ret; } -int mp_vcprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, va_list args) { +int mp_vcprintf(const mp_print_t *print, mp_rom_error_text_t compressed_fmt, va_list args) { char fmt[decompress_length(compressed_fmt)]; // TODO: Optimise this to format-while-decompressing (and not require the temp stack space). decompress(compressed_fmt, fmt); diff --git a/py/mpprint.h b/py/mpprint.h index f5e61e172741..2d7e80b6f52a 100644 --- a/py/mpprint.h +++ b/py/mpprint.h @@ -27,7 +27,6 @@ #define MICROPY_INCLUDED_PY_MPPRINT_H #include "py/mpconfig.h" -#include "py/misc.h" #define PF_FLAG_LEFT_ADJUST (0x001) #define PF_FLAG_SHOW_SIGN (0x002) diff --git a/py/obj.c b/py/obj.c index fa5f97a2e40e..0d477613b3e5 100644 --- a/py/obj.c +++ b/py/obj.c @@ -147,7 +147,7 @@ void mp_obj_print(mp_obj_t o_in, mp_print_kind_t kind) { static void mp_obj_print_inner_exception(const mp_print_t *print, mp_obj_t self_in, mp_int_t limit) { #if MICROPY_CPYTHON_EXCEPTION_CHAIN mp_obj_exception_t *self = mp_obj_exception_get_native(self_in); - const mp_rom_error_text_t *msg = MP_ERROR_TEXT("During handling of the above exception, another exception occurred:"); + mp_rom_error_text_t msg = MP_ERROR_TEXT("During handling of the above exception, another exception occurred:"); mp_obj_exception_t *inner = NULL; if (self->cause) { msg = MP_ERROR_TEXT("The above exception was the direct cause of the following exception:"); @@ -177,11 +177,11 @@ void mp_obj_print_exception_with_limit(const mp_print_t *print, mp_obj_t exc, mp if (n > 0) { assert(n % 3 == 0); #if MICROPY_ENABLE_SOURCE_LINE - const mp_rom_error_text_t *frame = MP_ERROR_TEXT(" File \"%q\", line %d"); + mp_rom_error_text_t frame = MP_ERROR_TEXT(" File \"%q\", line %d"); #else - const mp_rom_error_text_t *frame = MP_ERROR_TEXT(" File \"%q\""); + mp_rom_error_text_t frame = MP_ERROR_TEXT(" File \"%q\""); #endif - const mp_rom_error_text_t *block_fmt = MP_ERROR_TEXT(", in %q\n"); + mp_rom_error_text_t block_fmt = MP_ERROR_TEXT(", in %q\n"); // Set traceback formatting // Default: Print full traceback diff --git a/py/obj.h b/py/obj.h index 1b1e8e5a8391..12d9259d1089 100644 --- a/py/obj.h +++ b/py/obj.h @@ -1034,12 +1034,12 @@ mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, #define mp_obj_new_exception_msg_varg(exc_type, ...) mp_obj_new_exception(exc_type) #else // CIRCUITPY-CHANGE -mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg); -mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...); // counts args by number of % symbols in fmt, excluding %%; can only handle void* sizes (ie no float/double!) +mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg); +mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...); // counts args by number of % symbols in fmt, excluding %%; can only handle void* sizes (ie no float/double!) #endif #ifdef va_start // CIRCUITPY-CHANGE -mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, va_list arg); // same fmt restrictions as above +mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list arg); // same fmt restrictions as above #endif mp_obj_t mp_obj_new_gen_wrap(mp_obj_t fun); mp_obj_t mp_obj_new_closure(mp_obj_t fun, size_t n_closed, const mp_obj_t *closed); diff --git a/py/objexcept.c b/py/objexcept.c index c13e8d526c56..e9d5dc814f83 100644 --- a/py/objexcept.c +++ b/py/objexcept.c @@ -479,7 +479,7 @@ mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, } #if MICROPY_ERROR_REPORTING != MICROPY_ERROR_REPORTING_NONE -mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg) { +mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg) { // CIRCUITPY-CHANGE: is different here and for many lines below. return mp_obj_new_exception_msg_varg(exc_type, msg); } @@ -517,7 +517,7 @@ STATIC void exc_add_strn(void *data, const char *str, size_t len) { pr->len += len; } -mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...) { +mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...) { va_list args; va_start(args, fmt); mp_obj_t exc = mp_obj_new_exception_msg_vlist(exc_type, fmt, args); @@ -525,7 +525,7 @@ mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, const mp_r return exc; } -mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, va_list ap) { +mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list ap) { assert(fmt != NULL); // Check that the given type is an exception type diff --git a/py/qstr.c b/py/qstr.c index 420774e353d8..c17a0016c64d 100644 --- a/py/qstr.c +++ b/py/qstr.c @@ -370,7 +370,7 @@ STATIC const byte *find_uncompressed_string(uint8_t n) { // Given a compressed string in src, decompresses it into dst. // dst must be large enough (use MP_MAX_UNCOMPRESSED_TEXT_LEN+1). -void mp_decompress_rom_string(byte *dst, const mp_rom_error_text_t src_chr) { +void mp_decompress_rom_string(byte *dst, mp_rom_error_text_t src_chr) { // Skip past the 0xff marker. const byte *src = (byte *)src_chr + 1; // Need to add spaces around compressed words, except for the first (i.e. transition from 1<->2). diff --git a/py/qstr.h b/py/qstr.h index 3d4ec1fcd499..c031fb919dab 100644 --- a/py/qstr.h +++ b/py/qstr.h @@ -97,7 +97,7 @@ void qstr_pool_info(size_t *n_pool, size_t *n_qstr, size_t *n_str_data_bytes, si void qstr_dump_data(void); #if MICROPY_ROM_TEXT_COMPRESSION -void mp_decompress_rom_string(byte *dst, const mp_rom_error_text_t src); +void mp_decompress_rom_string(byte *dst, mp_rom_error_text_t src); #define MP_IS_COMPRESSED_ROM_STRING(s) (*(byte *)(s) == 0xff) #endif diff --git a/py/runtime.c b/py/runtime.c index 4a842e1864b6..36ab52f46194 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -1744,7 +1744,7 @@ NORETURN MP_COLD void mp_raise_NotImplementedError_no_msg(void) { #else -NORETURN MP_COLD void mp_raise_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg) { if (msg == NULL) { nlr_raise(mp_obj_new_exception(exc_type)); } else { @@ -1752,12 +1752,12 @@ NORETURN MP_COLD void mp_raise_msg(const mp_obj_type_t *exc_type, const mp_rom_e } } -NORETURN MP_COLD void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, va_list argptr) { +NORETURN MP_COLD void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list argptr) { mp_obj_t exception = mp_obj_new_exception_msg_vlist(exc_type, fmt, argptr); nlr_raise(exception); } -NORETURN MP_COLD void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(exc_type, fmt, argptr); @@ -1772,59 +1772,59 @@ NORETURN MP_COLD void mp_raise_msg_str(const mp_obj_type_t *exc_type, const char } } -NORETURN MP_COLD void mp_raise_AttributeError(const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_AttributeError(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_AttributeError, msg); } -NORETURN MP_COLD void mp_raise_RuntimeError(const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_RuntimeError(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_RuntimeError, msg); } -NORETURN MP_COLD void mp_raise_RuntimeError_varg(const mp_rom_error_text_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_RuntimeError_varg(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_RuntimeError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_ImportError(const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_ImportError(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_ImportError, msg); } -NORETURN MP_COLD void mp_raise_IndexError(const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_IndexError(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_IndexError, msg); } -NORETURN MP_COLD void mp_raise_IndexError_varg(const mp_rom_error_text_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_IndexError_varg(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_IndexError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_ValueError(const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_ValueError(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_ValueError, msg); } -NORETURN MP_COLD void mp_raise_ValueError_varg(const mp_rom_error_text_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_ValueError_varg(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_ValueError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_TypeError(const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_TypeError(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_TypeError, msg); } -NORETURN MP_COLD void mp_raise_TypeError_varg(const mp_rom_error_text_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_TypeError_varg(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_TypeError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_OSError_msg(const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_OSError_msg(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_OSError, msg); } @@ -1836,14 +1836,14 @@ NORETURN MP_COLD void mp_raise_OSError_errno_str(int errno_, mp_obj_t str) { nlr_raise(mp_obj_new_exception_args(&mp_type_OSError, 2, args)); } -NORETURN MP_COLD void mp_raise_OSError_msg_varg(const mp_rom_error_text_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_OSError_msg_varg(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_OSError, fmt, argptr); va_end(argptr); } -NORETURN MP_COLD void mp_raise_ConnectionError(const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_ConnectionError(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_ConnectionError, msg); } @@ -1851,11 +1851,11 @@ NORETURN MP_COLD void mp_raise_BrokenPipeError(void) { mp_raise_type_arg(&mp_type_BrokenPipeError, MP_OBJ_NEW_SMALL_INT(MP_EPIPE)); } -NORETURN MP_COLD void mp_raise_NotImplementedError(const mp_rom_error_text_t *msg) { +NORETURN MP_COLD void mp_raise_NotImplementedError(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_NotImplementedError, msg); } -NORETURN MP_COLD void mp_raise_NotImplementedError_varg(const mp_rom_error_text_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_NotImplementedError_varg(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_NotImplementedError, fmt, argptr); @@ -1863,7 +1863,7 @@ NORETURN MP_COLD void mp_raise_NotImplementedError_varg(const mp_rom_error_text_ } -NORETURN MP_COLD void mp_raise_OverflowError_varg(const mp_rom_error_text_t *fmt, ...) { +NORETURN MP_COLD void mp_raise_OverflowError_varg(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_raise_msg_vlist(&mp_type_OverflowError, fmt, argptr); diff --git a/py/runtime.h b/py/runtime.h index b6a3e48fb61a..c197b3d2cdd3 100644 --- a/py/runtime.h +++ b/py/runtime.h @@ -242,44 +242,44 @@ NORETURN void mp_raise_NotImplementedError_no_msg(void); #define mp_raise_NotImplementedError(msg) mp_raise_NotImplementedError_no_msg() #else #define mp_raise_type(exc_type) mp_raise_msg(exc_type, NULL) -NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg); -NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...); -NORETURN void mp_raise_ValueError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_TypeError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_NotImplementedError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg); +NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...); +NORETURN void mp_raise_ValueError(mp_rom_error_text_t msg); +NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg); +NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg); #endif NORETURN void mp_raise_type_arg(const mp_obj_type_t *exc_type, mp_obj_t arg); -NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *msg); -NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt +NORETURN void mp_raise_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg); +NORETURN void mp_raise_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt , ...); -NORETURN void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, va_list argptr); +NORETURN void mp_raise_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list argptr); // Only use this string version in native mpy files. Otherwise, use the compressed string version. NORETURN void mp_raise_msg_str(const mp_obj_type_t *exc_type, const char *msg); -NORETURN void mp_raise_AttributeError(const mp_rom_error_text_t *msg); +NORETURN void mp_raise_AttributeError(mp_rom_error_text_t msg); NORETURN void mp_raise_BrokenPipeError(void); -NORETURN void mp_raise_ConnectionError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_ImportError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_IndexError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_IndexError_varg(const mp_rom_error_text_t *msg, ...); -NORETURN void mp_raise_NotImplementedError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_NotImplementedError_varg(const mp_rom_error_text_t *fmt, ...); +NORETURN void mp_raise_ConnectionError(mp_rom_error_text_t msg); +NORETURN void mp_raise_ImportError(mp_rom_error_text_t msg); +NORETURN void mp_raise_IndexError(mp_rom_error_text_t msg); +NORETURN void mp_raise_IndexError_varg(mp_rom_error_text_t msg, ...); +NORETURN void mp_raise_NotImplementedError(mp_rom_error_text_t msg); +NORETURN void mp_raise_NotImplementedError_varg(mp_rom_error_text_t fmt, ...); NORETURN void mp_raise_OSError_errno_str(int errno_, mp_obj_t str); NORETURN void mp_raise_OSError(int errno_); -NORETURN void mp_raise_OSError_msg(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_OSError_msg_varg(const mp_rom_error_text_t *fmt, ...); +NORETURN void mp_raise_OSError_msg(mp_rom_error_text_t msg); +NORETURN void mp_raise_OSError_msg_varg(mp_rom_error_text_t fmt, ...); NORETURN void mp_raise_OSError_with_filename(int errno_, const char *filename); -NORETURN void mp_raise_OverflowError_varg(const mp_rom_error_text_t *fmt, ...); +NORETURN void mp_raise_OverflowError_varg(mp_rom_error_text_t fmt, ...); NORETURN void mp_raise_recursion_depth(void); -NORETURN void mp_raise_RuntimeError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_RuntimeError_varg(const mp_rom_error_text_t *fmt, ...); +NORETURN void mp_raise_RuntimeError(mp_rom_error_text_t msg); +NORETURN void mp_raise_RuntimeError_varg(mp_rom_error_text_t fmt, ...); NORETURN void mp_raise_StopIteration(mp_obj_t arg); -NORETURN void mp_raise_TypeError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_TypeError_varg(const mp_rom_error_text_t *fmt, ...); +NORETURN void mp_raise_TypeError(mp_rom_error_text_t msg); +NORETURN void mp_raise_TypeError_varg(mp_rom_error_text_t fmt, ...); NORETURN void mp_raise_TypeError_int_conversion(mp_const_obj_t arg); -NORETURN void mp_raise_ValueError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_ValueError_varg(const mp_rom_error_text_t *fmt, ...); +NORETURN void mp_raise_ValueError(mp_rom_error_text_t msg); +NORETURN void mp_raise_ValueError_varg(mp_rom_error_text_t fmt, ...); NORETURN void mp_raise_ZeroDivisionError(void); #if MICROPY_BUILTIN_METHOD_CHECK_SELF_ARG diff --git a/shared-bindings/_bleio/__init__.c b/shared-bindings/_bleio/__init__.c index 949fcae86759..f754f569a32d 100644 --- a/shared-bindings/_bleio/__init__.c +++ b/shared-bindings/_bleio/__init__.c @@ -66,7 +66,7 @@ //| ... //| MP_DEFINE_BLEIO_EXCEPTION(BluetoothError, Exception) -NORETURN void mp_raise_bleio_BluetoothError(const mp_rom_error_text_t *fmt, ...) { +NORETURN void mp_raise_bleio_BluetoothError(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_obj_t exception = mp_obj_new_exception_msg_vlist(&mp_type_bleio_BluetoothError, fmt, argptr); @@ -81,7 +81,7 @@ NORETURN void mp_raise_bleio_BluetoothError(const mp_rom_error_text_t *fmt, ...) //| ... //| MP_DEFINE_BLEIO_EXCEPTION(RoleError, bleio_BluetoothError) -NORETURN void mp_raise_bleio_RoleError(const mp_rom_error_text_t *msg) { +NORETURN void mp_raise_bleio_RoleError(mp_rom_error_text_t msg) { mp_raise_msg(&mp_type_bleio_RoleError, msg); } @@ -91,7 +91,7 @@ NORETURN void mp_raise_bleio_RoleError(const mp_rom_error_text_t *msg) { //| ... //| MP_DEFINE_BLEIO_EXCEPTION(SecurityError, bleio_BluetoothError) -NORETURN void mp_raise_bleio_SecurityError(const mp_rom_error_text_t *fmt, ...) { +NORETURN void mp_raise_bleio_SecurityError(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_obj_t exception = mp_obj_new_exception_msg_vlist(&mp_type_bleio_SecurityError, fmt, argptr); diff --git a/shared-bindings/_bleio/__init__.h b/shared-bindings/_bleio/__init__.h index b980421a52d7..e7d923fbe9f4 100644 --- a/shared-bindings/_bleio/__init__.h +++ b/shared-bindings/_bleio/__init__.h @@ -62,9 +62,9 @@ void bleio_reset(void); extern mp_obj_t bleio_set_adapter(mp_obj_t adapter_obj); -NORETURN void mp_raise_bleio_BluetoothError(const mp_rom_error_text_t *msg, ...); -NORETURN void mp_raise_bleio_RoleError(const mp_rom_error_text_t *msg); -NORETURN void mp_raise_bleio_SecurityError(const mp_rom_error_text_t *msg, ...); +NORETURN void mp_raise_bleio_BluetoothError(mp_rom_error_text_t msg, ...); +NORETURN void mp_raise_bleio_RoleError(mp_rom_error_text_t msg); +NORETURN void mp_raise_bleio_SecurityError(mp_rom_error_text_t msg, ...); bleio_adapter_obj_t *common_hal_bleio_allocate_adapter_or_raise(void); void common_hal_bleio_check_connected(uint16_t conn_handle); diff --git a/shared-bindings/memorymonitor/__init__.c b/shared-bindings/memorymonitor/__init__.c index 72dfd53a0156..677254c00db5 100644 --- a/shared-bindings/memorymonitor/__init__.c +++ b/shared-bindings/memorymonitor/__init__.c @@ -43,7 +43,7 @@ //| MP_DEFINE_MEMORYMONITOR_EXCEPTION(AllocationError, Exception) -NORETURN void mp_raise_memorymonitor_AllocationError(const mp_rom_error_text_t *fmt, ...) { +NORETURN void mp_raise_memorymonitor_AllocationError(mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_obj_t exception = mp_obj_new_exception_msg_vlist(&mp_type_memorymonitor_AllocationError, fmt, argptr); diff --git a/shared-bindings/memorymonitor/__init__.h b/shared-bindings/memorymonitor/__init__.h index 4d79c8f54235..cffb3b77f006 100644 --- a/shared-bindings/memorymonitor/__init__.h +++ b/shared-bindings/memorymonitor/__init__.h @@ -44,6 +44,6 @@ void memorymonitor_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_pr extern const mp_obj_type_t mp_type_memorymonitor_AllocationError; -NORETURN void mp_raise_memorymonitor_AllocationError(const mp_rom_error_text_t *msg, ...); +NORETURN void mp_raise_memorymonitor_AllocationError(mp_rom_error_text_t msg, ...); #endif // MICROPY_INCLUDED_SHARED_BINDINGS_MEMORYMONITOR___INIT___H diff --git a/shared-bindings/usb/core/__init__.c b/shared-bindings/usb/core/__init__.c index 236b33acfc00..47c833ee0e15 100644 --- a/shared-bindings/usb/core/__init__.c +++ b/shared-bindings/usb/core/__init__.c @@ -48,7 +48,7 @@ //| ... //| MP_DEFINE_USB_CORE_EXCEPTION(USBError, OSError) -NORETURN void mp_raise_usb_core_USBError(const mp_rom_error_text_t *fmt, ...) { +NORETURN void mp_raise_usb_core_USBError(mp_rom_error_text_t fmt, ...) { mp_obj_t exception; if (fmt == NULL) { exception = mp_obj_new_exception(&mp_type_usb_core_USBError); diff --git a/shared-bindings/usb/core/__init__.h b/shared-bindings/usb/core/__init__.h index 85b929871a5a..40f3030a6d60 100644 --- a/shared-bindings/usb/core/__init__.h +++ b/shared-bindings/usb/core/__init__.h @@ -45,7 +45,7 @@ void usb_core_exception_print(const mp_print_t *print, mp_obj_t o_in, mp_print_k extern const mp_obj_type_t mp_type_usb_core_USBError; extern const mp_obj_type_t mp_type_usb_core_USBTimeoutError; -NORETURN void mp_raise_usb_core_USBError(const mp_rom_error_text_t *fmt, ...); +NORETURN void mp_raise_usb_core_USBError(mp_rom_error_text_t fmt, ...); NORETURN void mp_raise_usb_core_USBTimeoutError(void); // Find is all Python object oriented so we don't need a separate common-hal API diff --git a/shared-module/os/getenv.c b/shared-module/os/getenv.c index 74e01e07bf7c..4644453da917 100644 --- a/shared-module/os/getenv.c +++ b/shared-module/os/getenv.c @@ -314,7 +314,7 @@ STATIC os_getenv_err_t os_getenv_buf_terminated(const char *key, char *value, si return result; } -STATIC void print_dont_raise(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...) { +STATIC void print_dont_raise(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...) { va_list argptr; va_start(argptr, fmt); mp_vcprintf(&mp_plat_print, fmt, argptr); @@ -322,7 +322,7 @@ STATIC void print_dont_raise(const mp_obj_type_t *exc_type, const mp_rom_error_t va_end(argptr); } -STATIC void handle_getenv_error(os_getenv_err_t error, void (*handle)(const mp_obj_type_t *exc_type, const mp_rom_error_text_t *fmt, ...)) { +STATIC void handle_getenv_error(os_getenv_err_t error, void (*handle)(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...)) { if (error == GETENV_OK) { return; } diff --git a/shared-module/sdcardio/SDCard.c b/shared-module/sdcardio/SDCard.c index f9c31d0f6696..f4fa8b77f27b 100644 --- a/shared-module/sdcardio/SDCard.c +++ b/shared-module/sdcardio/SDCard.c @@ -199,7 +199,7 @@ STATIC int block_cmd(sdcardio_sdcard_obj_t *self, int cmd_, int block, void *res return cmd(self, cmd_, block * self->cdv, response_buf, response_len, true, true); } -STATIC const mp_rom_error_text_t *init_card_v1(sdcardio_sdcard_obj_t *self) { +STATIC mp_rom_error_text_t init_card_v1(sdcardio_sdcard_obj_t *self) { for (int i = 0; i < CMD_TIMEOUT; i++) { if (cmd(self, 41, 0, NULL, 0, true, true) == 0) { return NULL; @@ -208,7 +208,7 @@ STATIC const mp_rom_error_text_t *init_card_v1(sdcardio_sdcard_obj_t *self) { return translate("timeout waiting for v1 card"); } -STATIC const mp_rom_error_text_t *init_card_v2(sdcardio_sdcard_obj_t *self) { +STATIC mp_rom_error_text_t init_card_v2(sdcardio_sdcard_obj_t *self) { for (int i = 0; i < CMD_TIMEOUT; i++) { uint8_t ocr[4]; common_hal_time_delay_ms(50); @@ -225,7 +225,7 @@ STATIC const mp_rom_error_text_t *init_card_v2(sdcardio_sdcard_obj_t *self) { return translate("timeout waiting for v2 card"); } -STATIC const mp_rom_error_text_t *init_card(sdcardio_sdcard_obj_t *self) { +STATIC mp_rom_error_text_t init_card(sdcardio_sdcard_obj_t *self) { clock_card(self, 10); common_hal_digitalio_digitalinout_set_value(&self->cs, false); @@ -256,12 +256,12 @@ STATIC const mp_rom_error_text_t *init_card(sdcardio_sdcard_obj_t *self) { uint8_t rb7[4]; int response = cmd(self, 8, 0x1AA, rb7, sizeof(rb7), false, true); if (response == R1_IDLE_STATE) { - const mp_rom_error_text_t *result = init_card_v2(self); + mp_rom_error_text_t result = init_card_v2(self); if (result != NULL) { return result; } } else if (response == (R1_IDLE_STATE | R1_ILLEGAL_COMMAND)) { - const mp_rom_error_text_t *result = init_card_v1(self); + mp_rom_error_text_t result = init_card_v1(self); if (result != NULL) { return result; } @@ -314,7 +314,7 @@ void common_hal_sdcardio_sdcard_construct(sdcardio_sdcard_obj_t *self, busio_spi self->baudrate = 250000; lock_bus_or_throw(self); - const mp_rom_error_text_t *result = init_card(self); + mp_rom_error_text_t result = init_card(self); extraclock_and_unlock_bus(self); if (result != NULL) { diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c index c7ead7ac5373..ee79d88233ac 100644 --- a/supervisor/shared/safe_mode.c +++ b/supervisor/shared/safe_mode.c @@ -148,7 +148,7 @@ void print_safe_mode_message(safe_mode_t reason) { serial_write_compressed(translate("\nYou are in safe mode because:\n")); - const mp_rom_error_text_t *message = NULL; + mp_rom_error_text_t message = NULL; // First check for safe mode reasons that do not necessarily reflect bugs. diff --git a/supervisor/shared/translate/compressed_string.h b/supervisor/shared/translate/compressed_string.h index 1174121068b1..917f763d7d7e 100644 --- a/supervisor/shared/translate/compressed_string.h +++ b/supervisor/shared/translate/compressed_string.h @@ -94,12 +94,12 @@ typedef struct compressed_string { uint8_t data; const uint8_t tail[]; -} *mp_rom_error_text_t; +} const *mp_rom_error_text_t; // Return the compressed, translated version of a source string // Usually, due to LTO, this is optimized into a load of a constant // pointer. -// const mp_rom_error_text_t *translate(const char *c); -void serial_write_compressed(const mp_rom_error_text_t *compressed); -char *decompress(const mp_rom_error_text_t *compressed, char *decompressed); -uint16_t decompress_length(const mp_rom_error_text_t *compressed); +// mp_rom_error_text_t translate(const char *c); +void serial_write_compressed(mp_rom_error_text_t compressed); +char *decompress(mp_rom_error_text_t compressed, char *decompressed); +uint16_t decompress_length(mp_rom_error_text_t compressed); diff --git a/supervisor/shared/translate/translate.c b/supervisor/shared/translate/translate.c index 244497dfe0c2..e0b5fb897ac9 100644 --- a/supervisor/shared/translate/translate.c +++ b/supervisor/shared/translate/translate.c @@ -39,7 +39,7 @@ #include "py/mpprint.h" #include "supervisor/serial.h" -void serial_write_compressed(const mp_rom_error_text_t *compressed) { +void serial_write_compressed(mp_rom_error_text_t compressed) { mp_printf(MP_PYTHON_PRINTER, "%S", compressed); } @@ -90,7 +90,7 @@ STATIC int put_utf8(char *buf, int u) { } } -uint16_t decompress_length(const mp_rom_error_text_t *compressed) { +uint16_t decompress_length(mp_rom_error_text_t compressed) { #ifndef NO_QSTR #if (compress_max_length_bits <= 8) return 1 + (compressed->data >> (8 - compress_max_length_bits)); @@ -123,7 +123,7 @@ static int get_nbits(bitstream_state_t *st, int n) { return r; } -char *decompress(const mp_rom_error_text_t *compressed, char *decompressed) { +char *decompress(mp_rom_error_text_t compressed, char *decompressed) { bitstream_state_t b = { .ptr = &(compressed->data) + (compress_max_length_bits >> 3), .bit = 1 << (7 - ((compress_max_length_bits) & 0x7)), diff --git a/supervisor/shared/translate/translate.h b/supervisor/shared/translate/translate.h index be8467077606..76bc4626259f 100644 --- a/supervisor/shared/translate/translate.h +++ b/supervisor/shared/translate/translate.h @@ -30,9 +30,10 @@ #include #include -#include "supervisor/shared/translate/compressed_string.h" // Map MicroPython's error messages to our translations. +#if !defined(MICROPY_ENABLE_DYNRUNTIME) || !MICROPY_ENABLE_DYNRUNTIME +#include "supervisor/shared/translate/compressed_string.h" #define MP_COMPRESSED_ROM_TEXT(x) translate(x) // translate() is a giant function with many strcmp calls. The assumption is @@ -47,5 +48,10 @@ #else // In link time optimized (LTO) builds, we can compile this once into a .o and // at link time the calls will be optimized. -const mp_rom_error_text_t *translate(const char *c); +mp_rom_error_text_t translate(const char *c); +#endif + +#else +typedef const char *mp_rom_error_text_t; +#define MP_COMPRESSED_ROM_TEXT(x) x #endif diff --git a/supervisor/shared/translate/translate_impl.h b/supervisor/shared/translate/translate_impl.h index e1a295a0db78..a57f90ff413d 100644 --- a/supervisor/shared/translate/translate_impl.h +++ b/supervisor/shared/translate/translate_impl.h @@ -34,7 +34,7 @@ #ifndef NO_QSTR #define QDEF(id, hash, len, str) -#define TRANSLATION(english_id, number) extern mp_rom_error_text_t translation##number; +#define TRANSLATION(english_id, number) extern struct compressed_string translation##number; #include "genhdr/qstrdefs.generated.h" #undef TRANSLATION #undef QDEF @@ -50,10 +50,10 @@ __attribute__((always_inline)) #endif // Prevent instrumenting this because that disables the inlining we rely of for code size // optimization. -__attribute__((no_instrument_function)) const mp_rom_error_text_t *translate(const char *original) { +__attribute__((no_instrument_function)) mp_rom_error_text_t translate(const char *original) { #ifndef NO_QSTR #define QDEF(id, hash, len, str) - #define TRANSLATION(english_id, number) if (strcmp(original, english_id) == 0) { return &translation##number; } else + #define TRANSLATION(english_id, number) if (strcmp(original, english_id) == 0) { return (mp_rom_error_text_t)&translation##number; } else #include "genhdr/qstrdefs.generated.h" #undef TRANSLATION #undef QDEF From a069dc92e06f515d72c92e494e92e39f9a45cb26 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 26 Oct 2023 19:39:26 +0200 Subject: [PATCH 05/11] restore cprintf/vcprintf prototypes --- py/mpprint.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/py/mpprint.h b/py/mpprint.h index 2d7e80b6f52a..ccf794ab5b06 100644 --- a/py/mpprint.h +++ b/py/mpprint.h @@ -79,9 +79,11 @@ int mp_printf(const mp_print_t *print, const char *fmt, ...); int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args); #endif -int mp_cprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, ...); +// CIRCUITPY-CHANGE +struct compressed_string; +int mp_cprintf(const mp_print_t *print, const struct compressed_string *compressed_fmt, ...); #ifdef va_start -int mp_vcprintf(const mp_print_t *print, const mp_rom_error_text_t *compressed_fmt, va_list args); +int mp_vcprintf(const mp_print_t *print, const struct compressed_string *compressed_fmt, va_list args); #endif #endif // MICROPY_INCLUDED_PY_MPPRINT_H From c695f8b20fd67439091c9103b3cf79659afe7c4d Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Thu, 26 Oct 2023 19:39:43 +0200 Subject: [PATCH 06/11] remove some unneeded diffs --- py/obj.c | 16 +++++----------- py/obj.h | 16 +++++++++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/py/obj.c b/py/obj.c index 0d477613b3e5..f981d27cda2b 100644 --- a/py/obj.c +++ b/py/obj.c @@ -685,18 +685,12 @@ mp_obj_t mp_obj_generic_subscript_getiter(mp_obj_t obj, mp_obj_iter_buf_t *iter_ bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) { const mp_obj_type_t *type = mp_obj_get_type(obj); - if (!MP_OBJ_TYPE_HAS_SLOT(type, buffer)) { - return false; + if (MP_OBJ_TYPE_HAS_SLOT(type, buffer) + && MP_OBJ_TYPE_GET_SLOT(type, buffer)(obj, bufinfo, flags & MP_BUFFER_RW) == 0) { + return true; } - int ret = MP_OBJ_TYPE_GET_SLOT(type, buffer)(obj, bufinfo, flags); - if (ret != 0) { - return false; - } - return true; -} - -void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) { - if (!mp_get_buffer(obj, bufinfo, flags)) { + if (flags & MP_BUFFER_RAISE_IF_UNSUPPORTED) { mp_raise_TypeError(MP_ERROR_TEXT("object with buffer protocol required")); } + return false; } diff --git a/py/obj.h b/py/obj.h index 12d9259d1089..a73e8da6886b 100644 --- a/py/obj.h +++ b/py/obj.h @@ -614,17 +614,25 @@ typedef struct _mp_getiter_iternext_custom_t { } mp_getiter_iternext_custom_t; // Buffer protocol + typedef struct _mp_buffer_info_t { void *buf; // can be NULL if len == 0 size_t len; // in bytes int typecode; // as per binary.h } mp_buffer_info_t; + #define MP_BUFFER_READ (1) #define MP_BUFFER_WRITE (2) #define MP_BUFFER_RW (MP_BUFFER_READ | MP_BUFFER_WRITE) +#define MP_BUFFER_RAISE_IF_UNSUPPORTED (4) + typedef mp_int_t (*mp_buffer_fun_t)(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags); + bool mp_get_buffer(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags); -void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags); + +static inline void mp_get_buffer_raise(mp_obj_t obj, mp_buffer_info_t *bufinfo, mp_uint_t flags) { + mp_get_buffer(obj, bufinfo, flags | MP_BUFFER_RAISE_IF_UNSUPPORTED); +} // This struct will be updated to become a variable sized struct. In order to // use this as a member, or allocate dynamically, use the mp_obj_empty_type_t @@ -1033,13 +1041,11 @@ mp_obj_t mp_obj_new_exception_args(const mp_obj_type_t *exc_type, size_t n_args, #define mp_obj_new_exception_msg(exc_type, msg) mp_obj_new_exception(exc_type) #define mp_obj_new_exception_msg_varg(exc_type, ...) mp_obj_new_exception(exc_type) #else -// CIRCUITPY-CHANGE mp_obj_t mp_obj_new_exception_msg(const mp_obj_type_t *exc_type, mp_rom_error_text_t msg); -mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...); // counts args by number of % symbols in fmt, excluding %%; can only handle void* sizes (ie no float/double!) +mp_obj_t mp_obj_new_exception_msg_varg(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, ...); // counts args by number of % symbols in fmt, excluding %%; can only handle void* sizes (ie no float/double!) #endif #ifdef va_start -// CIRCUITPY-CHANGE -mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list arg); // same fmt restrictions as above +mp_obj_t mp_obj_new_exception_msg_vlist(const mp_obj_type_t *exc_type, mp_rom_error_text_t fmt, va_list arg); // same fmt restrictions as above #endif mp_obj_t mp_obj_new_gen_wrap(mp_obj_t fun); mp_obj_t mp_obj_new_closure(mp_obj_t fun, size_t n_closed, const mp_obj_t *closed); From 3f1b9af025b9027a4117fd097c7af6f2222c4b1f Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Thu, 26 Oct 2023 15:30:42 -0400 Subject: [PATCH 07/11] py/mpprint.c: fix formatting --- py/mpprint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py/mpprint.c b/py/mpprint.c index 36b036d83ff7..467371bec247 100644 --- a/py/mpprint.c +++ b/py/mpprint.c @@ -496,7 +496,7 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args) { break; } case 'S': { - mp_rom_error_text_t arg = va_arg(args, mp_rom_error_text_t ); + mp_rom_error_text_t arg = va_arg(args, mp_rom_error_text_t); size_t len_with_nul = decompress_length(arg); size_t len = len_with_nul - 1; char str[len_with_nul]; From 88fe81cf64a4a70461d48f420bef1f5352a46f75 Mon Sep 17 00:00:00 2001 From: Wellington Terumi Uemura Date: Thu, 26 Oct 2023 19:12:09 +0000 Subject: [PATCH 08/11] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (1003 of 1003 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/pt_BR/ --- locale/pt_BR.po | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/locale/pt_BR.po b/locale/pt_BR.po index d3231cf4f152..a678881c14ae 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-04 12:55-0600\n" -"PO-Revision-Date: 2023-10-23 21:20+0000\n" -"Last-Translator: Dan Halbert \n" +"PO-Revision-Date: 2023-10-27 08:51+0000\n" +"Last-Translator: Wellington Terumi Uemura \n" "Language-Team: \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 5.1.1-dev\n" +"X-Generator: Weblate 5.2-dev\n" #: main.c msgid "" @@ -411,7 +411,7 @@ msgstr "'aguardar' fora da função" #: py/compile.c msgid "'break'/'continue' outside loop" -msgstr "" +msgstr "'break'/'continue' fora do loop" #: py/compile.c msgid "'data' requires at least 2 arguments" @@ -453,7 +453,7 @@ msgstr ", em %q\n" #: shared-bindings/displayio/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" -msgstr "" +msgstr ".show(x) foi removido. Use .root_group = x" #: py/objcomplex.c msgid "0.0 to a complex power" @@ -2550,7 +2550,7 @@ msgstr "estouro asm" #: py/compile.c msgid "async for/with outside async function" -msgstr "" +msgstr "assíncrono para/com a função assíncrona externa" #: extmod/ulab/code/numpy/numerical.c msgid "attempt to get (arg)min/(arg)max of empty sequence" @@ -3166,7 +3166,7 @@ msgstr "a fonte deve ter 2048 bytes de comprimento" #: extmod/moddeflate.c msgid "format" -msgstr "" +msgstr "formato" #: py/objstr.c msgid "format requires a dict" @@ -3411,7 +3411,7 @@ msgstr "o intervalo deve estar entre %s-%s" #: py/compile.c msgid "invalid arch" -msgstr "" +msgstr "arco inválido" #: shared-bindings/bitmaptools/__init__.c #, c-format @@ -3606,7 +3606,7 @@ msgstr "memoryview: o comprimento não é um múltiplo do tamanho dos itens" #: extmod/modtime.c msgid "mktime needs a tuple of length 8 or 9" -msgstr "" +msgstr "O mktime precisa de uma tupla com comprimento 8 ou 9" #: extmod/ulab/code/numpy/linalg/linalg.c msgid "mode must be complete, or reduced" @@ -4402,7 +4402,7 @@ msgstr "valor fora do alcance do alvo" #: extmod/moddeflate.c msgid "wbits" -msgstr "" +msgstr "wbits" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "width must be greater than zero" From a1c6105616c26a5d12a8377e4bc6e4056420060f Mon Sep 17 00:00:00 2001 From: Andi Chandler Date: Fri, 27 Oct 2023 00:20:42 +0000 Subject: [PATCH 09/11] Translated using Weblate (English (United Kingdom)) Currently translated at 100.0% (1003 of 1003 strings) Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/en_GB/ --- locale/en_GB.po | 60 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/locale/en_GB.po b/locale/en_GB.po index 373618c3ea3d..be8d589c3623 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2023-10-05 03:10+0000\n" +"PO-Revision-Date: 2023-10-27 08:51+0000\n" "Last-Translator: Andi Chandler \n" "Language-Team: none\n" "Language: en_GB\n" @@ -15,7 +15,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 5.1-dev\n" +"X-Generator: Weblate 5.2-dev\n" #: main.c msgid "" @@ -295,7 +295,7 @@ msgstr "%q[%u] waits on input outside of count" #: py/runtime.c #, c-format msgid "%s" -msgstr "" +msgstr "%s" #: ports/espressif/common-hal/espidf/__init__.c #, c-format @@ -409,7 +409,7 @@ msgstr "'await' outside function" #: py/compile.c msgid "'break'/'continue' outside loop" -msgstr "" +msgstr "'break'/'continue' outside loop" #: py/compile.c msgid "'data' requires at least 2 arguments" @@ -451,7 +451,7 @@ msgstr ", in %q\n" #: shared-bindings/displayio/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" -msgstr "" +msgstr ".show(x) removed. Use .root_group = x" #: py/objcomplex.c msgid "0.0 to a complex power" @@ -647,7 +647,7 @@ msgstr "Below minimum frame rate" #: ports/raspberrypi/common-hal/audiobusio/I2SOut.c msgid "Bit clock and word select must be sequential GPIO pins" -msgstr "" +msgstr "Bit clock and word select must be sequential GPIO pins" #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c msgid "Bit clock and word select must share a clock unit" @@ -2431,7 +2431,7 @@ msgstr "__init__() should return None" #: py/objtype.c #, c-format msgid "__init__() should return None, not '%s'" -msgstr "" +msgstr "__init__() should return None, not '%s'" #: py/objobject.c msgid "__new__ arg must be a user-type" @@ -2513,7 +2513,7 @@ msgstr "asm overflow" #: py/compile.c msgid "async for/with outside async function" -msgstr "" +msgstr "async for/with outside async function" #: extmod/ulab/code/numpy/numerical.c msgid "attempt to get (arg)min/(arg)max of empty sequence" @@ -2525,7 +2525,7 @@ msgstr "attempt to get argmin/argmax of an empty sequence" #: py/objstr.c msgid "attributes not supported" -msgstr "" +msgstr "attributes not supported" #: extmod/ulab/code/ulab_tools.c msgid "axis is out of bounds" @@ -2597,7 +2597,7 @@ msgstr "Buffer slices must be of equal length" #: py/modstruct.c shared-module/struct/__init__.c msgid "buffer too small" -msgstr "Buffer too small" +msgstr "buffer too small" #: shared-bindings/socketpool/Socket.c shared-bindings/ssl/SSLSocket.c msgid "buffer too small for requested bytes" @@ -2669,7 +2669,7 @@ msgstr "can't convert %s to float" #: py/runtime.c #, c-format msgid "can't convert %s to int" -msgstr "" +msgstr "can't convert %s to int" #: py/objstr.c msgid "can't convert '%q' object to %q implicitly" @@ -2677,7 +2677,7 @@ msgstr "Can't convert '%q' object to %q implicitly" #: py/objint.c msgid "can't convert NaN to int" -msgstr "" +msgstr "can't convert NaN to int" #: extmod/ulab/code/numpy/vector.c msgid "can't convert complex to float" @@ -2685,7 +2685,7 @@ msgstr "can't convert complex to float" #: py/objint.c msgid "can't convert inf to int" -msgstr "" +msgstr "can't convert inf to int" #: py/obj.c msgid "can't convert to complex" @@ -2721,7 +2721,7 @@ msgstr "can't implicitly convert '%q' to 'bool'" #: py/runtime.c msgid "can't import name %q" -msgstr "" +msgstr "can't import name %q" #: py/emitnative.c msgid "can't load from '%q'" @@ -2777,11 +2777,11 @@ msgstr "" #: py/objcomplex.c msgid "can't truncate-divide a complex number" -msgstr "" +msgstr "can't truncate-divide a complex number" #: extmod/moductypes.c msgid "can't unambiguously get sizeof scalar" -msgstr "" +msgstr "can't unambiguously get sizeof scalar" #: extmod/modasyncio.c msgid "can't wait" @@ -2869,7 +2869,7 @@ msgstr "comparison of int and uint" #: py/objcomplex.c msgid "complex divide by zero" -msgstr "" +msgstr "complex divide by zero" #: py/objfloat.c py/parsenum.c msgid "complex values not supported" @@ -3123,7 +3123,7 @@ msgstr "font must be 2048 bytes long" #: extmod/moddeflate.c msgid "format" -msgstr "" +msgstr "format" #: py/objstr.c msgid "format requires a dict" @@ -3367,7 +3367,7 @@ msgstr "interval must be in range %s-%s" #: py/compile.c msgid "invalid arch" -msgstr "" +msgstr "invalid arch" #: shared-bindings/bitmaptools/__init__.c #, c-format @@ -3451,7 +3451,7 @@ msgstr "join expects a list of str/bytes objects consistent with self object" #: py/argcheck.c msgid "keyword argument(s) not implemented - use normal args instead" -msgstr "" +msgstr "keyword argument(s) not implemented - use normal args instead" #: py/emitinlinethumb.c py/emitinlinextensa.c msgid "label '%q' not defined" @@ -3549,7 +3549,7 @@ msgstr "memory allocation failed, heap is locked" #: py/objarray.c msgid "memoryview offset too large" -msgstr "" +msgstr "memoryview offset too large" #: py/objarray.c msgid "memoryview: length is not a multiple of itemsize" @@ -3557,7 +3557,7 @@ msgstr "memoryview: length is not a multiple of itemsize" #: extmod/modtime.c msgid "mktime needs a tuple of length 8 or 9" -msgstr "" +msgstr "mktime needs a tuple of length 8 or 9" #: extmod/ulab/code/numpy/linalg/linalg.c msgid "mode must be complete, or reduced" @@ -3605,7 +3605,7 @@ msgstr "name not defined" #: py/persistentcode.c msgid "native code in .mpy unsupported" -msgstr "" +msgstr "native code in .mpy unsupported" #: py/asmthumb.c msgid "native method too big" @@ -4085,7 +4085,7 @@ msgstr "source_bitmap must have value_count of 8" #: extmod/modre.c msgid "splitting with sub-captures" -msgstr "" +msgstr "splitting with sub-captures" #: py/objstr.c msgid "start/end indices" @@ -4101,16 +4101,16 @@ msgstr "stream operation not supported" #: py/objarray.c py/objstr.c msgid "string argument without an encoding" -msgstr "" +msgstr "string argument without an encoding" #: py/objstrunicode.c msgid "string index out of range" -msgstr "" +msgstr "string index out of range" #: py/objstrunicode.c #, c-format msgid "string indices must be integers, not %s" -msgstr "" +msgstr "string indices must be integers, not %s" #: extmod/moductypes.c msgid "struct: can't index" @@ -4142,7 +4142,7 @@ msgstr "syntax error in uctypes descriptor" #: extmod/modtime.c msgid "ticks interval overflow" -msgstr "" +msgstr "ticks interval overflow" #: ports/nrf/common-hal/watchdog/WatchDogTimer.c msgid "timeout duration exceeded the maximum supported value" @@ -4319,7 +4319,7 @@ msgstr "unsupported format character '%c' (0x%x) at index %d" #: py/runtime.c msgid "unsupported type for %q: '%s'" -msgstr "" +msgstr "unsupported type for %q: '%s'" #: py/runtime.c msgid "unsupported type for operator" @@ -4348,7 +4348,7 @@ msgstr "value out of range of target" #: extmod/moddeflate.c msgid "wbits" -msgstr "" +msgstr "wbits" #: shared-bindings/is31fl3741/FrameBuffer.c msgid "width must be greater than zero" From 817a38dca86a674d9935b08165156a2eb0ecf239 Mon Sep 17 00:00:00 2001 From: Hosted Weblate Date: Fri, 27 Oct 2023 08:51:27 +0000 Subject: [PATCH 10/11] Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: CircuitPython/main Translate-URL: https://hosted.weblate.org/projects/circuitpython/main/ --- locale/ID.po | 73 ++++++++++++++++++++++++---------------- locale/cs.po | 73 ++++++++++++++++++++++++---------------- locale/de_DE.po | 73 ++++++++++++++++++++++++---------------- locale/el.po | 73 ++++++++++++++++++++++++---------------- locale/en_GB.po | 73 ++++++++++++++++++++++++---------------- locale/es.po | 73 ++++++++++++++++++++++++---------------- locale/fil.po | 73 ++++++++++++++++++++++++---------------- locale/fr.po | 73 ++++++++++++++++++++++++---------------- locale/hi.po | 73 ++++++++++++++++++++++++---------------- locale/it_IT.po | 73 ++++++++++++++++++++++++---------------- locale/ja.po | 73 ++++++++++++++++++++++++---------------- locale/ko.po | 73 ++++++++++++++++++++++++---------------- locale/nl.po | 73 ++++++++++++++++++++++++---------------- locale/pl.po | 73 ++++++++++++++++++++++++---------------- locale/pt_BR.po | 73 ++++++++++++++++++++++++---------------- locale/ru.po | 73 ++++++++++++++++++++++++---------------- locale/sv.po | 73 ++++++++++++++++++++++++---------------- locale/tr.po | 73 ++++++++++++++++++++++++---------------- locale/zh_Latn_pinyin.po | 73 ++++++++++++++++++++++++---------------- 19 files changed, 836 insertions(+), 551 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index 265c66bbc3ee..8cbf607f3a6a 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -178,19 +178,23 @@ msgstr "" msgid "%q length must be >= %d" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q harus %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "" @@ -215,6 +219,10 @@ msgstr "" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "" @@ -250,6 +258,10 @@ msgstr "" msgid "%q out of range" msgstr "%q di luar jangkauan" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "" @@ -437,8 +449,8 @@ msgstr "*x harus menjadi target assignment" msgid ", in %q\n" msgstr ", dalam %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -630,7 +642,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Di bawah frame rate minimum" @@ -663,7 +675,7 @@ msgstr "" msgid "Both pins must support hardware interrupts" msgstr "Kedua pin harus mendukung hardware interrut" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Brightness tidak bisa disesuaikan" @@ -700,7 +712,8 @@ msgstr "" msgid "Buffer too short by %d bytes" msgstr "Buffer terlalu pendek untuk %d byte" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -710,10 +723,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Pin bus %d sudah digunakan" @@ -903,8 +916,8 @@ msgstr "Terjadi kesalahan saat menginisialisasi perangkat DAC" msgid "DAC already in use" msgstr "DAC sudah digunakan" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin harus byte disejajarkan" @@ -934,13 +947,13 @@ msgstr "Kapasitas tujuan lebih kecil dari destination_length." msgid "Device in use" msgstr "Perangkat sedang digunakan" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Tampilan harus memiliki ruang warna 16 bit." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Rotasi tampilan harus dalam kelipatan 90 derajat" @@ -1114,7 +1127,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Grup sudah digunakan" @@ -1212,7 +1225,7 @@ msgstr "" msgid "Internal define error" msgstr "Kesalahan definisi internal" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "" @@ -1235,7 +1248,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "" @@ -1438,9 +1451,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Tidak pin %q" @@ -1572,7 +1586,7 @@ msgstr "Tidak terhubung" msgid "Not playing" msgstr "Tidak berfungsi" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1874,7 +1888,7 @@ msgstr "" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Segarkan terlalu cepat" @@ -1977,7 +1991,7 @@ msgstr "" msgid "Source and destination buffers must be the same length" msgstr "Buffer sumber dan tujuan harus memiliki panjang yang sama" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2037,7 +2051,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2172,7 +2186,8 @@ msgstr "" msgid "Unable to create lock" msgstr "" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "Tidak dapat menemukan Tampilan I2C di %x" @@ -2284,7 +2299,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Tipe bus tampilan tidak didukung" diff --git a/locale/cs.po b/locale/cs.po index 72ea00c2cd67..506b69dbfa3a 100644 --- a/locale/cs.po +++ b/locale/cs.po @@ -186,19 +186,23 @@ msgstr "Délka %q musí být <= %d" msgid "%q length must be >= %d" msgstr "Délka %q musí být >= %d" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q musí být %d" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q musí být %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q musí být 1, pokud %q je True" @@ -223,6 +227,10 @@ msgstr "%q musí být bytearray nebo pole typu 'H' nebo 'B'" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "%q musí být bytearray nebo pole typu 'h', 'H', 'b', nebo 'B'" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q musí být pole typu 'H V" @@ -258,6 +266,10 @@ msgstr "%q je mimo hranice" msgid "%q out of range" msgstr "%q je mimo rozsah" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "%q krok nemůže být nula" @@ -445,8 +457,8 @@ msgstr "∗x musí být cíl přiřazení" msgid ", in %q\n" msgstr ", v% q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -638,7 +650,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Baudrate není podporován periférií" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Pod minimální obnovovací frekvencí" @@ -671,7 +683,7 @@ msgstr "RX a TX jsou vyžadovány pro kontrolu toku" msgid "Both pins must support hardware interrupts" msgstr "Oba piny musí podporovat hardwarové přerušení" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Jas není nastavitelný" @@ -708,7 +720,8 @@ msgstr "Buffer musí být násobkem 512 bajtů" msgid "Buffer too short by %d bytes" msgstr "Buffer je příliš krátký o %d bajtů" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -718,10 +731,10 @@ msgstr "Buffer příliš malý" msgid "Buffers must be same size" msgstr "Buffery musí mít stejnou velikost" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Sběrnicový pin %d je již používán" @@ -911,8 +924,8 @@ msgstr "Chyba inicializace zařízení DAC" msgid "DAC already in use" msgstr "DAC se již používá" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Datový pin 0 musí být zarovnán na bajty" @@ -943,13 +956,13 @@ msgstr "Cílová kapacita je menší než destination_length." msgid "Device in use" msgstr "Zařízení je používáno" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Displej musí mít 16bitový barevný prostor." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Otočení displeje musí být po 90 stupních" @@ -1125,7 +1138,7 @@ msgid "Generic Failure" msgstr "Základní chyba" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Skupina již byla použita" @@ -1224,7 +1237,7 @@ msgstr "Interní audio buffer je příliš malý" msgid "Internal define error" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "Interní chyba" @@ -1247,7 +1260,7 @@ msgstr "Chyba přerušení." #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "Špatný %s" @@ -1450,9 +1463,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Žádný %q pin" @@ -1584,7 +1598,7 @@ msgstr "Nepřipojený" msgid "Not playing" msgstr "Nehraje" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "Počet data_pins musí být 8 nebo 16, nikoli %d" @@ -1879,7 +1893,7 @@ msgstr "Přijatá odpověď nebyla validní" msgid "Reconnecting" msgstr "Opětovné připojování" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Pokus o obnovení příliš brzo" @@ -1980,7 +1994,7 @@ msgstr "SocketPool je možné použít pouze s wifi.radio" msgid "Source and destination buffers must be the same length" msgstr "Zdrojové a cílové buffery musí být stejné délky" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "Specifikuj přesně jeden z data0 nebo data_pins" @@ -2040,7 +2054,7 @@ msgstr "Fatální chyby firmware třetí strany." msgid "This microcontroller does not support continuous capture." msgstr "Tento mikrokontrolér nepodporuje kontinuální snímání." -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2176,7 +2190,8 @@ msgstr "Nelze alokovat heap." msgid "Unable to create lock" msgstr "Není možné vytvořit zámek" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "I2C display nenalezen na %x" @@ -2286,7 +2301,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "Nepodporovaný barevný prostor" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Nepodporovaná sběrnice dispalye" diff --git a/locale/de_DE.po b/locale/de_DE.po index 32bf0d8adec1..e4bf3000c65c 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -184,19 +184,23 @@ msgstr "%q länge muss kleiner oder gleich %d sein" msgid "%q length must be >= %d" msgstr "%q länge muss größer oder gleich %d sein" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q muss %d entsprechen" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q muss %d-%d sein" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q muss 1 sein, wenn %q wahr ist" @@ -222,6 +226,10 @@ msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" "%q muss ein Byte-Array oder ein array vom Typ 'h', 'H', 'b', oder 'B' sein" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q muss ein Array vom Typ 'H' sein" @@ -257,6 +265,10 @@ msgstr "%q außerhalb der Grenzen" msgid "%q out of range" msgstr "%q außerhalb des Bereichs" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "Schritt %q kann nicht Null sein" @@ -445,8 +457,8 @@ msgstr "*x muss Zuordnungsziel sein" msgid ", in %q\n" msgstr ", in %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -638,7 +650,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Baudrate wird von der Peripherie nicht unterstützt" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Unterhalb der minimalen Frame Rate" @@ -671,7 +683,7 @@ msgstr "Sowohl RX als auch TX sind zu Flusssteuerung erforderlich" msgid "Both pins must support hardware interrupts" msgstr "Beide Pins müssen Hardware-Interrupts unterstützen" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Die Helligkeit ist nicht einstellbar" @@ -708,7 +720,8 @@ msgstr "Der Puffer muss ein vielfaches von 512 bytes sein" msgid "Buffer too short by %d bytes" msgstr "Puffer um %d Bytes zu kurz" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -718,10 +731,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "Buffers müssen gleiche Größe haben" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus-Pin %d wird schon benutzt" @@ -912,8 +925,8 @@ msgstr "DAC-Gerät-Initialisierungsfehler" msgid "DAC already in use" msgstr "DAC wird schon benutzt" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin muss am Byte ausgerichtet sein" @@ -943,13 +956,13 @@ msgstr "Die Zielkapazität ist kleiner als destination_length." msgid "Device in use" msgstr "Gerät in Benutzung" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Display muss einen 16 Bit Farbraum haben." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Die Rotation der Anzeige muss in 90-Grad-Schritten erfolgen" @@ -1130,7 +1143,7 @@ msgid "Generic Failure" msgstr "Generischer Fehler" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Gruppe schon benutzt" @@ -1233,7 +1246,7 @@ msgstr "Interner Audio-Buffer zu klein" msgid "Internal define error" msgstr "Interner Definitionsfehler" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "Interner Fehler" @@ -1256,7 +1269,7 @@ msgstr "Interrupt Fehler." #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "Ungültiger %q" @@ -1460,9 +1473,10 @@ msgstr "Kein Speicher mehr für Nible vorhanden" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Kein %q-Pin" @@ -1594,7 +1608,7 @@ msgstr "Nicht verbunden" msgid "Not playing" msgstr "Spielt nicht ab" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "Anzahl von data_pins muss 8 oder 16 sein, nicht %d" @@ -1896,7 +1910,7 @@ msgstr "Erhaltene Antwort ist ungültig" msgid "Reconnecting" msgstr "Wiederherstellung der Verbindungen" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Zu früh neu geladen" @@ -1997,7 +2011,7 @@ msgstr "SocketPool kann nur mit wifi.radio verwendet werden" msgid "Source and destination buffers must be the same length" msgstr "Quell- und Zielpuffer müssen gleich lang sein" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "Gib genau einen von data0 oder data_pins an" @@ -2061,7 +2075,7 @@ msgstr "Fataler Fehler bei Drittanbieter-Firmware." msgid "This microcontroller does not support continuous capture." msgstr "Dieser Mikrocontroller unterstützt keine kontinuierliche Erfassung." -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2199,7 +2213,8 @@ msgstr "Keine Allokation auf dem Heap möglich." msgid "Unable to create lock" msgstr "Lock kann nicht erzeugt werden" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "Konnte kein I2C Display finden an %x" @@ -2313,7 +2328,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "Nicht unterstützter Farbraum" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Nicht unterstützter display bus type" diff --git a/locale/el.po b/locale/el.po index 2da3ba82b1ff..d68d70b691e6 100644 --- a/locale/el.po +++ b/locale/el.po @@ -187,19 +187,23 @@ msgstr "%q μήκος πρέπει να είναι <= %d" msgid "%q length must be >= %d" msgstr "%q μήκος πρέπει να είναι >= %d" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q πρέπει να είναι %d" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q πρέπει να είναι %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q πρέπει να είναι 1 όταν %q είναι True" @@ -224,6 +228,10 @@ msgstr "%q πρέπει να είναι bytearray ή array τύπου 'H' ή 'B' msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "%q πρέπει να είναι bytearray ή array τύπου 'h', 'H', 'b', ή 'B'" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q πρέπει να είναι πίνακας τύπου 'H'" @@ -259,6 +267,10 @@ msgstr "%q εκτός ορίων" msgid "%q out of range" msgstr "%q εκτός εμβέλειας" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "" @@ -446,8 +458,8 @@ msgstr "*x πρέπει να είναι στόχος ανάθεσης" msgid ", in %q\n" msgstr ", στο %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -639,7 +651,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Baudrate δεν υποστηρίζεται από την περιφεριακή συσκευή" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Χαμηλότερο από το ελάχιστο frame rate" @@ -672,7 +684,7 @@ msgstr "Και RX και TX απαιτούνται για έλεγχο flow" msgid "Both pins must support hardware interrupts" msgstr "Και τα δύο pin πρέπει να υποστηρίζουν interrupts υλικού" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "H φωτεινότητα δεν μπορεί να προσαρμοστεί" @@ -709,7 +721,8 @@ msgstr "Buffer πρέπει να είναι πολλαπλάσιο των 512 by msgid "Buffer too short by %d bytes" msgstr "Buffer πολύ μικρό κατα %d bytes" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -719,10 +732,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "Τα Buffers πρέπει να είναι του ιδίου μεγέθους" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d είναι ήδη σε χρήση" @@ -917,8 +930,8 @@ msgstr "Σφάλμα εκκίνησης συσκευής DAC" msgid "DAC already in use" msgstr "DAC είναι ήδη σε χρήση" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Το Data 0 pin πρέπει να είναι byte aligned" @@ -948,13 +961,13 @@ msgstr "" msgid "Device in use" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "" @@ -1128,7 +1141,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "" @@ -1226,7 +1239,7 @@ msgstr "" msgid "Internal define error" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "" @@ -1249,7 +1262,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "" @@ -1452,9 +1465,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "" @@ -1586,7 +1600,7 @@ msgstr "" msgid "Not playing" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1878,7 +1892,7 @@ msgstr "" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "" @@ -1979,7 +1993,7 @@ msgstr "" msgid "Source and destination buffers must be the same length" msgstr "" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2039,7 +2053,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2174,7 +2188,8 @@ msgstr "" msgid "Unable to create lock" msgstr "" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "" @@ -2284,7 +2299,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "" diff --git a/locale/en_GB.po b/locale/en_GB.po index be8d589c3623..f377bf58748c 100644 --- a/locale/en_GB.po +++ b/locale/en_GB.po @@ -188,19 +188,23 @@ msgstr "%q length must be <= %d" msgid "%q length must be >= %d" msgstr "%q length must be >= %d" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q must be %d" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q must be %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q must be 1 when %q is True" @@ -225,6 +229,10 @@ msgstr "%q must be a bytearray or array of type 'H' or 'B'" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q must be array of type 'H'" @@ -260,6 +268,10 @@ msgstr "%q out of bounds" msgid "%q out of range" msgstr "%q out of range" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "%q step cannot be zero" @@ -447,8 +459,8 @@ msgstr "*x must be assignment target" msgid ", in %q\n" msgstr ", in %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr ".show(x) removed. Use .root_group = x" @@ -640,7 +652,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Baudrate not supported by peripheral" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Below minimum frame rate" @@ -673,7 +685,7 @@ msgstr "Both RX and TX required for flow control" msgid "Both pins must support hardware interrupts" msgstr "Both pins must support hardware interrupts" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Brightness not adjustable" @@ -710,7 +722,8 @@ msgstr "Buffer must be a multiple of 512 bytes" msgid "Buffer too short by %d bytes" msgstr "Buffer too short by %d bytes" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -720,10 +733,10 @@ msgstr "Buffer too small" msgid "Buffers must be same size" msgstr "Buffers must be same size" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d is already in use" @@ -910,8 +923,8 @@ msgstr "DAC device init error" msgid "DAC already in use" msgstr "DAC already in use" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin must be byte aligned" @@ -941,13 +954,13 @@ msgstr "Destination capacity is smaller than destination_length." msgid "Device in use" msgstr "Device in use" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Display must have a 16 bit colourspace." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Display rotation must be in 90 degree increments" @@ -1122,7 +1135,7 @@ msgid "Generic Failure" msgstr "Generic Failure" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Group already used" @@ -1221,7 +1234,7 @@ msgstr "Internal audio buffer too small" msgid "Internal define error" msgstr "Internal define error" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "Internal error" @@ -1244,7 +1257,7 @@ msgstr "Interrupt error." #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "Invalid %q" @@ -1447,9 +1460,10 @@ msgstr "Nimble out of memory" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "No %q pin" @@ -1581,7 +1595,7 @@ msgstr "Not connected" msgid "Not playing" msgstr "Not playing" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "Number of data_pins must be 8 or 16, not %d" @@ -1879,7 +1893,7 @@ msgstr "Received response was invalid" msgid "Reconnecting" msgstr "Reconnecting" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Refresh too soon" @@ -1980,7 +1994,7 @@ msgstr "SocketPool can only be used with wifi.radio" msgid "Source and destination buffers must be the same length" msgstr "Source and destination buffers must be the same length" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "Specify exactly one of data0 or data_pins" @@ -2040,7 +2054,7 @@ msgstr "Third-party firmware fatal error." msgid "This microcontroller does not support continuous capture." msgstr "This microcontroller does not support continuous capture." -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2177,7 +2191,8 @@ msgstr "Unable to allocate the heap." msgid "Unable to create lock" msgstr "Unable to create lock" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "Unable to find I2C display at %x" @@ -2289,7 +2304,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "Unsupported colourspace" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Unsupported display bus type" diff --git a/locale/es.po b/locale/es.po index 59e3455082f2..fbec79555c6a 100644 --- a/locale/es.po +++ b/locale/es.po @@ -190,19 +190,23 @@ msgstr "%q longitud debe ser <= %d" msgid "%q length must be >= %d" msgstr "%q longitud debe ser >= %d" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q debe ser %d" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q debe ser %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q debe ser 1 cuando %q es True" @@ -227,6 +231,10 @@ msgstr "%q debe ser un bytearray o array de tipo 'H' o 'B'" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "%q debe ser un bytearray o array de tipo 'h', 'H', 'b', o 'B'" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q debe ser un arreglo de tipo 'H'" @@ -262,6 +270,10 @@ msgstr "%q fuera de limites" msgid "%q out of range" msgstr "%q fuera de rango" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "%q paso no puede ser cero" @@ -449,8 +461,8 @@ msgstr "*x debe ser objetivo de la tarea" msgid ", in %q\n" msgstr ", en %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -644,7 +656,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Baudrate no soportado por el periférico" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Por debajo de la tasa mínima de refrescamiento" @@ -677,7 +689,7 @@ msgstr "Ambos RX y TX requeridos para control de flujo" msgid "Both pins must support hardware interrupts" msgstr "Ambos pines deben soportar interrupciones por hardware" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "El brillo no se puede ajustar" @@ -715,7 +727,8 @@ msgstr "El buffer deber ser un múltiplo de 512 bytes" msgid "Buffer too short by %d bytes" msgstr "Buffer muy corto por %d bytes" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -725,10 +738,10 @@ msgstr "Buffer demasiado pequeño" msgid "Buffers must be same size" msgstr "Los buffers deben ser del mismo tamaño" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d ya está siendo utilizado" @@ -921,8 +934,8 @@ msgstr "Error de inicio del dispositivo DAC" msgid "DAC already in use" msgstr "DAC ya está siendo utilizado" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "El pin Data 0 debe estar alineado a bytes" @@ -953,13 +966,13 @@ msgstr "Capacidad de destino es mas pequeña que destination_length." msgid "Device in use" msgstr "Dispositivo en uso" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "La pantalla debe tener un espacio de color de 16 bits." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Rotación de display debe ser en incrementos de 90 grados" @@ -1139,7 +1152,7 @@ msgid "Generic Failure" msgstr "Fallo Genérico" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Grupo ya está siendo utilizado" @@ -1245,7 +1258,7 @@ msgstr "El búfer de audio interno es muy pequeño" msgid "Internal define error" msgstr "Error interno de definición" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "Error interno" @@ -1268,7 +1281,7 @@ msgstr "Error de interrupción." #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "%q inválido" @@ -1471,9 +1484,10 @@ msgstr "Nimble sin memoria" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Sin pin %q" @@ -1605,7 +1619,7 @@ msgstr "No conectado" msgid "Not playing" msgstr "No reproduciendo" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "El numero de pines de datos debe ser 8 o 16, no %d" @@ -1910,7 +1924,7 @@ msgstr "La respuesta recibida es invalida" msgid "Reconnecting" msgstr "Reconectando" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Refresco demasiado pronto" @@ -2012,7 +2026,7 @@ msgstr "SocketPool solo se puede usar con wifi.radio" msgid "Source and destination buffers must be the same length" msgstr "Los buffers de fuente y destino deben ser del mismo tamaño" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "Especifique exactamente uno de data0 or data_pins" @@ -2073,7 +2087,7 @@ msgstr "Error gráve del firmware de un tercero." msgid "This microcontroller does not support continuous capture." msgstr "Este microcontrolador no soporta captura continua." -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2213,7 +2227,8 @@ msgstr "Imposible de asignar el heap." msgid "Unable to create lock" msgstr "No se puede crear bloqueo" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "No se puede encontrar la pantalla I2C en %x" @@ -2325,7 +2340,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "Espacio de color no sportado" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Sin capacidad de bus tipo display" diff --git a/locale/fil.po b/locale/fil.po index de6d61acd1e9..83d4efe73928 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -176,19 +176,23 @@ msgstr "" msgid "%q length must be >= %d" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "" @@ -213,6 +217,10 @@ msgstr "" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "" @@ -248,6 +256,10 @@ msgstr "" msgid "%q out of range" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "" @@ -436,8 +448,8 @@ msgstr "*x ay dapat na assignment target" msgid ", in %q\n" msgstr ", sa %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -630,7 +642,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "" @@ -663,7 +675,7 @@ msgstr "" msgid "Both pins must support hardware interrupts" msgstr "Ang parehong mga pin ay dapat na sumusuporta sa hardware interrupts" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "" @@ -700,7 +712,8 @@ msgstr "" msgid "Buffer too short by %d bytes" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -710,10 +723,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, fuzzy, c-format msgid "Bus pin %d is already in use" msgstr "Ginagamit na ang DAC" @@ -900,8 +913,8 @@ msgstr "" msgid "DAC already in use" msgstr "Ginagamit na ang DAC" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c #, fuzzy msgid "Data 0 pin must be byte aligned" msgstr "graphic ay dapat 2048 bytes ang haba" @@ -934,13 +947,13 @@ msgstr "" msgid "Device in use" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "" @@ -1114,7 +1127,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "" @@ -1212,7 +1225,7 @@ msgstr "" msgid "Internal define error" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "" @@ -1235,7 +1248,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "" @@ -1438,9 +1451,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Walang %q pin" @@ -1573,7 +1587,7 @@ msgstr "Hindi maka connect sa AP" msgid "Not playing" msgstr "Hindi playing" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1866,7 +1880,7 @@ msgstr "" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "" @@ -1967,7 +1981,7 @@ msgstr "" msgid "Source and destination buffers must be the same length" msgstr "" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2027,7 +2041,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2162,7 +2176,8 @@ msgstr "" msgid "Unable to create lock" msgstr "" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "" @@ -2273,7 +2288,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c #, fuzzy msgid "Unsupported display bus type" msgstr "Hindi supportadong tipo ng bitmap" diff --git a/locale/fr.po b/locale/fr.po index 4901067ed3b3..26a0a53366de 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -187,19 +187,23 @@ msgstr "La longeur de %q doit être <= %d" msgid "%q length must be >= %d" msgstr "La longeur de %q doit être >= %d" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q doit être %d" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q doit être %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q doit être 1 quand %q est True" @@ -224,6 +228,10 @@ msgstr "%q doit être un bytearray ou matrice de type 'H' ou 'B'" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "%q doit être a bytearray ou array de type 'h', 'H', 'b', ou 'B'" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q doit être array de type 'H'" @@ -259,6 +267,10 @@ msgstr "%q est hors limites" msgid "%q out of range" msgstr "%q est hors de porté" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "le pas ne peut être zéro dans %q" @@ -448,8 +460,8 @@ msgstr "*x doit être la cible de l'assignement" msgid ", in %q\n" msgstr ", dans %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -641,7 +653,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Baudrate non supporté par le périphérique" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Au-dessous de la fréquence d'images minimale" @@ -674,7 +686,7 @@ msgstr "RX et TX requis pour le contrôle de flux" msgid "Both pins must support hardware interrupts" msgstr "Les deux broches doivent supporter les interruptions matérielles" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Luminosité non-ajustable" @@ -711,7 +723,8 @@ msgstr "La mémoire tampon doit être un multiple de 512" msgid "Buffer too short by %d bytes" msgstr "Tampon trop court de %d octets" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -721,10 +734,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "Les tampons doivent avoir la même taille" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "La broche %d du bus est déjà utilisée" @@ -923,8 +936,8 @@ msgstr "Erreur d'initialisation du périphérique DAC" msgid "DAC already in use" msgstr "DAC déjà utilisé" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "La broche 'Data 0' doit être aligné sur l'octet" @@ -955,13 +968,13 @@ msgstr "La capacité de destination est plus petite que 'destination_length'." msgid "Device in use" msgstr "Appareil utilisé" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "L'affichage doit avoir un espace colorimétrique de 16 bits." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "La rotation d'affichage doit se faire par incréments de 90 degrés" @@ -1143,7 +1156,7 @@ msgid "Generic Failure" msgstr "Échec génerique" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Groupe déjà utilisé" @@ -1247,7 +1260,7 @@ msgstr "Le tampon interne pour l'audio est trop petit" msgid "Internal define error" msgstr "Erreur de définition interne" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "Erreur interne" @@ -1271,7 +1284,7 @@ msgstr "Erreur d'interruption." #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "%q invalide" @@ -1476,9 +1489,10 @@ msgstr "Nimble n'a plus de mémoire" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Pas de broche %q" @@ -1610,7 +1624,7 @@ msgstr "Non connecté" msgid "Not playing" msgstr "Ne joue pas" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "Le nombre de data_pins doit être 8 ou 16, et non %d" @@ -1915,7 +1929,7 @@ msgstr "Réponse reçue invalide" msgid "Reconnecting" msgstr "Reconnexion" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Rafraîchissement trop tôt" @@ -2016,7 +2030,7 @@ msgstr "SocketPool ne s'utilise qu'avec wifi.radio" msgid "Source and destination buffers must be the same length" msgstr "Les tampons source et de destination doivent être de la même longueur" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "Spécifiez une unique broche parmi data0 ou data_pins" @@ -2077,7 +2091,7 @@ msgstr "Erreur fatale de logiciel système tierce partie." msgid "This microcontroller does not support continuous capture." msgstr "Ce microcontrôleur ne support pas la capture continue." -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2218,7 +2232,8 @@ msgstr "Impossible d'allouer le tas." msgid "Unable to create lock" msgstr "Impossible de créer un verrou ('lock')" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "Impossible de trouver l'affichage I2C à %x" @@ -2331,7 +2346,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "Espace de couleur non supporté" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Type de bus d'affichage non supporté" diff --git a/locale/hi.po b/locale/hi.po index 0bb3aa4150cb..1cabf4cb3ee7 100644 --- a/locale/hi.po +++ b/locale/hi.po @@ -175,19 +175,23 @@ msgstr "" msgid "%q length must be >= %d" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "" @@ -212,6 +216,10 @@ msgstr "" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "" @@ -247,6 +255,10 @@ msgstr "" msgid "%q out of range" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "" @@ -434,8 +446,8 @@ msgstr "" msgid ", in %q\n" msgstr "" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -625,7 +637,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "" @@ -658,7 +670,7 @@ msgstr "" msgid "Both pins must support hardware interrupts" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "" @@ -695,7 +707,8 @@ msgstr "" msgid "Buffer too short by %d bytes" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -705,10 +718,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "" @@ -893,8 +906,8 @@ msgstr "" msgid "DAC already in use" msgstr "" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "" @@ -924,13 +937,13 @@ msgstr "" msgid "Device in use" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "" @@ -1104,7 +1117,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "" @@ -1202,7 +1215,7 @@ msgstr "" msgid "Internal define error" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "" @@ -1225,7 +1238,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "" @@ -1428,9 +1441,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "" @@ -1562,7 +1576,7 @@ msgstr "" msgid "Not playing" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1852,7 +1866,7 @@ msgstr "" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "" @@ -1953,7 +1967,7 @@ msgstr "" msgid "Source and destination buffers must be the same length" msgstr "" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2013,7 +2027,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2148,7 +2162,8 @@ msgstr "" msgid "Unable to create lock" msgstr "" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "" @@ -2258,7 +2273,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "" diff --git a/locale/it_IT.po b/locale/it_IT.po index 53eedf3e4c09..a1027260da19 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -179,19 +179,23 @@ msgstr "" msgid "%q length must be >= %d" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "" @@ -216,6 +220,10 @@ msgstr "" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "" @@ -251,6 +259,10 @@ msgstr "" msgid "%q out of range" msgstr "%q oltre il limite" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "" @@ -438,8 +450,8 @@ msgstr "*x deve essere il bersaglio del assegnamento" msgid ", in %q\n" msgstr ", in %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -632,7 +644,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Al di sotto del frame rate minimo" @@ -666,7 +678,7 @@ msgstr "Sia RX che TX richiedono il controllo del flow" msgid "Both pins must support hardware interrupts" msgstr "Entrambi i pin devono supportare gli interrupt hardware" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Luminosità non è regolabile" @@ -703,7 +715,8 @@ msgstr "Il buffer deve essere un multiplo di 512 bytes" msgid "Buffer too short by %d bytes" msgstr "Buffer troppo piccolo di %d bytes" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -713,10 +726,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d è già in uso" @@ -902,8 +915,8 @@ msgstr "" msgid "DAC already in use" msgstr "DAC già in uso" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c #, fuzzy msgid "Data 0 pin must be byte aligned" msgstr "graphic deve essere lunga 2048 byte" @@ -935,13 +948,13 @@ msgstr "La capacità di destinazione è più piccola di destination_length." msgid "Device in use" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "" @@ -1115,7 +1128,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "" @@ -1213,7 +1226,7 @@ msgstr "" msgid "Internal define error" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "" @@ -1236,7 +1249,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "" @@ -1440,9 +1453,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Nessun pin %q" @@ -1575,7 +1589,7 @@ msgstr "Impossible connettersi all'AP" msgid "Not playing" msgstr "In pausa" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1872,7 +1886,7 @@ msgstr "" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "" @@ -1973,7 +1987,7 @@ msgstr "" msgid "Source and destination buffers must be the same length" msgstr "" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2033,7 +2047,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2168,7 +2182,8 @@ msgstr "" msgid "Unable to create lock" msgstr "" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "" @@ -2279,7 +2294,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c #, fuzzy msgid "Unsupported display bus type" msgstr "tipo di bitmap non supportato" diff --git a/locale/ja.po b/locale/ja.po index da17adcffad9..d33036119745 100644 --- a/locale/ja.po +++ b/locale/ja.po @@ -182,19 +182,23 @@ msgstr "" msgid "%q length must be >= %d" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "" @@ -219,6 +223,10 @@ msgstr "" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "" @@ -254,6 +262,10 @@ msgstr "" msgid "%q out of range" msgstr "%q が範囲外" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "" @@ -441,8 +453,8 @@ msgstr "*xは代入先でなければなりません" msgid ", in %q\n" msgstr "" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -634,7 +646,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "最低のフレームレート未満" @@ -667,7 +679,7 @@ msgstr "フロー制御のためRXとTXの両方が必要" msgid "Both pins must support hardware interrupts" msgstr "両方のピンにハードウェア割り込み対応が必要" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Brightnessは調整可能ではありません" @@ -704,7 +716,8 @@ msgstr "バッファは512の倍数でなければなりません" msgid "Buffer too short by %d bytes" msgstr "バッファが %d バイト足りません" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -714,10 +727,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Busピン%dはすでに使用中" @@ -904,8 +917,8 @@ msgstr "DACデバイス初期化エラー" msgid "DAC already in use" msgstr "DACはすでに使用中" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 ピンは、バイト整列されていなければなりません" @@ -935,13 +948,13 @@ msgstr "宛先バッファがdestination_lengthより小さい" msgid "Device in use" msgstr "デバイス使用中" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "ディスプレイは16ビット色空間を持たなければなりません" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "ディスプレイの回転は90度の倍数でなければなりません" @@ -1115,7 +1128,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "グループはすでに使われています" @@ -1213,7 +1226,7 @@ msgstr "" msgid "Internal define error" msgstr "内部定義エラー" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "" @@ -1236,7 +1249,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "不正な %q" @@ -1439,9 +1452,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "%qピンがありません" @@ -1573,7 +1587,7 @@ msgstr "接続されていません" msgid "Not playing" msgstr "再生していません" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1866,7 +1880,7 @@ msgstr "" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "リフレッシュが早すぎます" @@ -1967,7 +1981,7 @@ msgstr "" msgid "Source and destination buffers must be the same length" msgstr "バッファ (元/先) は同じ長さでなければなりません" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2027,7 +2041,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2163,7 +2177,8 @@ msgstr "" msgid "Unable to create lock" msgstr "" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "I2Cディスプレイを %x に見つけられません" @@ -2273,7 +2288,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "" diff --git a/locale/ko.po b/locale/ko.po index 3687ae049e81..e5be395e5862 100644 --- a/locale/ko.po +++ b/locale/ko.po @@ -176,19 +176,23 @@ msgstr "" msgid "%q length must be >= %d" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "" @@ -213,6 +217,10 @@ msgstr "" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "" @@ -248,6 +256,10 @@ msgstr "" msgid "%q out of range" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "" @@ -435,8 +447,8 @@ msgstr "" msgid ", in %q\n" msgstr ", 에서 %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -628,7 +640,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "" @@ -661,7 +673,7 @@ msgstr "" msgid "Both pins must support hardware interrupts" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "밝기를 조절할 수 없습니다" @@ -698,7 +710,8 @@ msgstr "" msgid "Buffer too short by %d bytes" msgstr "" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -708,10 +721,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "" @@ -896,8 +909,8 @@ msgstr "" msgid "DAC already in use" msgstr "DAC가 현재 사용 중입니다" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "" @@ -927,13 +940,13 @@ msgstr "" msgid "Device in use" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "" @@ -1107,7 +1120,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "" @@ -1205,7 +1218,7 @@ msgstr "" msgid "Internal define error" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "" @@ -1228,7 +1241,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "" @@ -1431,9 +1444,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "" @@ -1565,7 +1579,7 @@ msgstr "" msgid "Not playing" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1855,7 +1869,7 @@ msgstr "" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "" @@ -1956,7 +1970,7 @@ msgstr "" msgid "Source and destination buffers must be the same length" msgstr "" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2016,7 +2030,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2152,7 +2166,8 @@ msgstr "" msgid "Unable to create lock" msgstr "" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "" @@ -2262,7 +2277,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "" diff --git a/locale/nl.po b/locale/nl.po index 682ebc134325..5d046728ce69 100644 --- a/locale/nl.po +++ b/locale/nl.po @@ -175,19 +175,23 @@ msgstr "" msgid "%q length must be >= %d" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "" @@ -212,6 +216,10 @@ msgstr "" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "" @@ -247,6 +255,10 @@ msgstr "" msgid "%q out of range" msgstr "%q buiten bereik" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "" @@ -434,8 +446,8 @@ msgstr "*x moet een assignment target zijn" msgid ", in %q\n" msgstr ", in %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -627,7 +639,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Baudrate wordt niet ondersteund door randapparatuur" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Onder de minimum frame rate" @@ -660,7 +672,7 @@ msgstr "RX en TX zijn beide vereist voor stroomregeling" msgid "Both pins must support hardware interrupts" msgstr "Beide pinnen moeten hardware interrupts ondersteunen" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Helderheid is niet aanpasbaar" @@ -697,7 +709,8 @@ msgstr "Buffer moet een veelvoud van 512 bytes zijn" msgid "Buffer too short by %d bytes" msgstr "Buffer is %d bytes te klein" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -707,10 +720,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Bus pin %d al in gebruik" @@ -898,8 +911,8 @@ msgstr "DAC Apparaat Init Fout" msgid "DAC already in use" msgstr "DAC al in gebruik" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pin moet byte uitgelijnd zijn" @@ -929,13 +942,13 @@ msgstr "Bestemming grootte is kleiner dan destination_length." msgid "Device in use" msgstr "Apparaat al in gebruik" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Beeldscherm moet een 16bit kleurruimte hebben." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Beeldscherm rotatie moet in stappen van 90 graden" @@ -1110,7 +1123,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Groep al gebruikt" @@ -1208,7 +1221,7 @@ msgstr "" msgid "Internal define error" msgstr "Interne define fout" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "" @@ -1231,7 +1244,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "Ongeldige %q" @@ -1434,9 +1447,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Geen %q pin" @@ -1568,7 +1582,7 @@ msgstr "Niet verbonden" msgid "Not playing" msgstr "Wordt niet afgespeeld" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1871,7 +1885,7 @@ msgstr "" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Verversing te snel" @@ -1972,7 +1986,7 @@ msgstr "SocketPool kan alleen met wifi.radio gebruikt worden" msgid "Source and destination buffers must be the same length" msgstr "Bron en bestemming buffers moeten dezelfde lengte hebben" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2032,7 +2046,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2167,7 +2181,8 @@ msgstr "" msgid "Unable to create lock" msgstr "Kan vergrendeling niet maken" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "Geen I2C beeldscherm gevonden bij %x" @@ -2279,7 +2294,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Niet-ondersteund beeldscherm bus type" diff --git a/locale/pl.po b/locale/pl.po index 7118b17e546c..1be82f75eeb4 100644 --- a/locale/pl.po +++ b/locale/pl.po @@ -177,19 +177,23 @@ msgstr "" msgid "%q length must be >= %d" msgstr "" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "" @@ -214,6 +218,10 @@ msgstr "" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "" @@ -249,6 +257,10 @@ msgstr "" msgid "%q out of range" msgstr "%q poza zakresem" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "" @@ -436,8 +448,8 @@ msgstr "*x musi być obiektem przypisania" msgid ", in %q\n" msgstr ", w %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -629,7 +641,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Poniżej minimalnej liczby klatek na sekundę" @@ -662,7 +674,7 @@ msgstr "Do kontroli przepływu wymagane są zarówno RX, jak i TX" msgid "Both pins must support hardware interrupts" msgstr "Obie nóżki muszą wspierać przerwania sprzętowe" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Jasność nie jest regulowana" @@ -699,7 +711,8 @@ msgstr "Bufor musi być wielokrotnością 512 bajtów" msgid "Buffer too short by %d bytes" msgstr "Bufor za krótki o %d bajtów" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -709,10 +722,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Nóżka magistrali %d jest w użyciu" @@ -899,8 +912,8 @@ msgstr "Błąd inicjowania urządzenia DAC" msgid "DAC already in use" msgstr "DAC w użyciu" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Nóżka data 0 musi być wyrównana do bajtu" @@ -930,13 +943,13 @@ msgstr "Pojemność celu mniejsza od destination_length." msgid "Device in use" msgstr "Urządzenie w użyciu" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Wyświetlacz musi mieć 16-bitową przestrzeń kolorów." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Wyświetlacz można obracać co 90 stopni" @@ -1110,7 +1123,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Grupa już używana" @@ -1208,7 +1221,7 @@ msgstr "" msgid "Internal define error" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "" @@ -1231,7 +1244,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "Nieprawidłowe %q" @@ -1434,9 +1447,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Brak nóżki %q" @@ -1568,7 +1582,7 @@ msgstr "Nie podłączono" msgid "Not playing" msgstr "Nic nie jest odtwarzane" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1858,7 +1872,7 @@ msgstr "Otrzymana odpowiedź była nieprawidłowa" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Zbyt wczesne odświeżenie" @@ -1959,7 +1973,7 @@ msgstr "" msgid "Source and destination buffers must be the same length" msgstr "Bufory źródłowy i docelowy muszą mieć taką samą długość" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2019,7 +2033,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2154,7 +2168,8 @@ msgstr "" msgid "Unable to create lock" msgstr "" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "" @@ -2264,7 +2279,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Zły typ magistrali wyświetlaczy" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index a678881c14ae..ab15ba6eebff 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -188,19 +188,23 @@ msgstr "o comprimento de %q deve ser <= %d" msgid "%q length must be >= %d" msgstr "o comprimento de %q deve ser >= %d" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q deve ser %d" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "o %q deve ser %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q deve ser 1 quando %q for verdadeiro" @@ -225,6 +229,10 @@ msgstr "%q deve ser um bytearray ou uma matriz do tipo 'H' ou 'B'" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "%q deve ser um bytearray ou uma matriz do tipo 'h', 'H', 'b', ou 'B'" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q deve ser uma matriz do tipo 'H'" @@ -260,6 +268,10 @@ msgstr "%q fora dos limites" msgid "%q out of range" msgstr "%q fora do alcance" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "A etapa %q não pode ser zero" @@ -449,8 +461,8 @@ msgstr "*x deve ser o destino da atribuição" msgid ", in %q\n" msgstr ", em %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr ".show(x) foi removido. Use .root_group = x" @@ -642,7 +654,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "O Baudrate não é suportado pelo periférico" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Abaixo da taxa mínima de quadros" @@ -677,7 +689,7 @@ msgstr "Ambos os RX e TX são necessários para o controle do fluxo" msgid "Both pins must support hardware interrupts" msgstr "Ambos os pinos devem suportar interrupções de hardware" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Brilho não ajustável" @@ -714,7 +726,8 @@ msgstr "O buffer deve ser um múltiplo de 512 bytes" msgid "Buffer too short by %d bytes" msgstr "O buffer é muito curto em %d bytes" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -724,10 +737,10 @@ msgstr "Buffer pequeno demais" msgid "Buffers must be same size" msgstr "Os buffers devem ter o mesmo tamanho" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "O pino bus %d já está em uso" @@ -919,8 +932,8 @@ msgstr "Erro de Inicialização do Dispositivo DAC" msgid "DAC already in use" msgstr "DAC em uso" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "O pino de dados 0 deve ser alinhado por bytes" @@ -950,13 +963,13 @@ msgstr "A capacidade do destino é menor que destination_length." msgid "Device in use" msgstr "Dispositivo em uso" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "O monitor deve ter um espaço de cores com 16 bits." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "A rotação da tela deve estar em incrementos de 90 graus" @@ -1134,7 +1147,7 @@ msgid "Generic Failure" msgstr "Falha Genérica" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "O grupo já está em uso" @@ -1240,7 +1253,7 @@ msgstr "O buffer interno de áudio é muito pequeno" msgid "Internal define error" msgstr "Erro interno de definição" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "Erro interno" @@ -1263,7 +1276,7 @@ msgstr "Erro de interrupção." #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "%q Inválido" @@ -1466,9 +1479,10 @@ msgstr "Ágil fora da memória" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Sem pin %q" @@ -1602,7 +1616,7 @@ msgstr "Não Conectado" msgid "Not playing" msgstr "Não está jogando" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "A quantidade dos data_pins deve ser 8 ou 16, não %d" @@ -1908,7 +1922,7 @@ msgstr "A resposta recebida foi inválida" msgid "Reconnecting" msgstr "Reconectando" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "A recarga foi cedo demais" @@ -2009,7 +2023,7 @@ msgstr "O SocketPool só pode ser usado com rádio wifi.radio" msgid "Source and destination buffers must be the same length" msgstr "Os buffers da origem e do destino devem ter o mesmo comprimento" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "Especifique exatamente um do data0 ou do data_pins" @@ -2070,7 +2084,7 @@ msgstr "Erro fatal no firmware de terceiros." msgid "This microcontroller does not support continuous capture." msgstr "Este microcontrolador não tem suporte para captura contínua." -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2212,7 +2226,8 @@ msgstr "Não é possível alocar a área de alocação dinâmica de variáveis." msgid "Unable to create lock" msgstr "Não é possível criar um lock" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "Não foi possível encontrar a tela I2C no %x" @@ -2324,7 +2339,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "Espaço de cor não compatível" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Não há suporte para o tipo do display bus" diff --git a/locale/ru.po b/locale/ru.po index c6865b609941..ccfaa914648a 100644 --- a/locale/ru.po +++ b/locale/ru.po @@ -190,19 +190,23 @@ msgstr "Длинна %q должна быть <= %d" msgid "%q length must be >= %d" msgstr "Длинна %q должна быть >= %d" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q должно быть %d" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q должно быть %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q должен быть равен 1, если %q имеет значение True" @@ -227,6 +231,10 @@ msgstr "%q должен быть массивом байтов или масси msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "%q должен быть массивом байтов или массивом типа «h», «H», «b» или «B»" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q должен быть массивом типа 'H \"" @@ -262,6 +270,10 @@ msgstr "%q за пределом" msgid "%q out of range" msgstr "%q вне диапазона" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "Шаг %q не может быть нулём" @@ -449,8 +461,8 @@ msgstr "*x должно быть целью назначения" msgid ", in %q\n" msgstr ", в %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -642,7 +654,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Скорость передачи данных не поддерживается периферийным устройством" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Ниже минимальной частоты кадров" @@ -678,7 +690,7 @@ msgstr "Для управления потоком требуется как RX msgid "Both pins must support hardware interrupts" msgstr "Оба пина должны поддерживать аппаратные прерывания" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Яркость не регулируется" @@ -715,7 +727,8 @@ msgstr "Буфер должен быть кратен 512" msgid "Buffer too short by %d bytes" msgstr "Буфер слишком короткий на %d байт" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -725,10 +738,10 @@ msgstr "Слишком маленький буфер" msgid "Buffers must be same size" msgstr "Буферы должны быть одинакового размера" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Вывод шины %d уже используется" @@ -921,8 +934,8 @@ msgstr "Ошибка инициализации устройства DAC" msgid "DAC already in use" msgstr "DAC уже используется" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Пин data 0 должен быть байтово выровнен" @@ -954,13 +967,13 @@ msgstr "Емкость места назначения меньше длины msgid "Device in use" msgstr "Устройство используется" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Дисплей должен иметь 16 битное цветовое пространство." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Поворот дисплея должен осуществляться с шагом 90 градусов" @@ -1143,7 +1156,7 @@ msgid "Generic Failure" msgstr "Общий сбой" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Группа уже используется" @@ -1247,7 +1260,7 @@ msgstr "Внутренний звуковой буфер слишком мал" msgid "Internal define error" msgstr "Внутренняя ошибка определения" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "Внутренняя ошибка" @@ -1270,7 +1283,7 @@ msgstr "Прерванная ошибка." #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "Недопустимый %q" @@ -1475,9 +1488,10 @@ msgstr "Изображение памяти" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Нет пина %q" @@ -1609,7 +1623,7 @@ msgstr "Не подключено" msgid "Not playing" msgstr "Не воспроизводится (Not playing)" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "Количество data_pins должно быть 8 или 16, а не %d" @@ -1913,7 +1927,7 @@ msgstr "Полученный ответ недействителен" msgid "Reconnecting" msgstr "Повторное соединение" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Слишком раннее обновление" @@ -2014,7 +2028,7 @@ msgstr "SocketPool можно использовать только с wifi.radi msgid "Source and destination buffers must be the same length" msgstr "Исходный и конечный буферы должны иметь одинаковую длину" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "Укажите точно один из data0 или data_pins" @@ -2077,7 +2091,7 @@ msgstr "Неустранимая ошибка прошивки сторонне msgid "This microcontroller does not support continuous capture." msgstr "Этот микроконтроллер не поддерживает непрерывный захват." -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2214,7 +2228,8 @@ msgstr "Невозможно выделить кучу." msgid "Unable to create lock" msgstr "Не удается создать блокировку" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "Не удается найти дисплей I2C в %x" @@ -2327,7 +2342,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "Неподдерживаемое цветовое пространство" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Неподдерживаемый тип шины дисплея" diff --git a/locale/sv.po b/locale/sv.po index be8d66b51c6e..c691f7fb93d9 100644 --- a/locale/sv.po +++ b/locale/sv.po @@ -187,19 +187,23 @@ msgstr "längden på %q måste vara <= %d" msgid "%q length must be >= %d" msgstr "längden på %q måste vara >= %d" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q måste vara %d" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q måste vara %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q måste vara 1 när %q är sann" @@ -226,6 +230,10 @@ msgstr "" "%q måste vara en bytearray eller en array av typen \"h\", \"H\", \"b\" eller " "\"B\"" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q måste vara en array av typen 'H'" @@ -261,6 +269,10 @@ msgstr "%q är utanför gränserna" msgid "%q out of range" msgstr "%q utanför intervallet" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "%q steg kan inte vara noll" @@ -448,8 +460,8 @@ msgstr "*x måste vara mål för tilldelning" msgid ", in %q\n" msgstr ", i %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -641,7 +653,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Baudrate stöds inte av kringutrustning" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Under minsta bildfrekvens" @@ -674,7 +686,7 @@ msgstr "Både RX och TX krävs för handskakning" msgid "Both pins must support hardware interrupts" msgstr "Båda pinnarna måste stödja maskinvaruavbrott" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Ljusstyrka kan inte justeras" @@ -711,7 +723,8 @@ msgstr "Bufferten måste vara en multipel av 512 byte" msgid "Buffer too short by %d bytes" msgstr "Buffert är %d bytes för kort" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -721,10 +734,10 @@ msgstr "Buffert för liten" msgid "Buffers must be same size" msgstr "Buffertarna måste ha samma storlek" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Busspinne %d används redan" @@ -913,8 +926,8 @@ msgstr "Initieringsfel för DAC-enhet" msgid "DAC already in use" msgstr "DAC används redan" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Datapinne 0 måste vara bytejusterad" @@ -944,13 +957,13 @@ msgstr "Målkapaciteten är mindre än destination_length." msgid "Device in use" msgstr "Enheten används redan" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Displayen måste ha en 16-bitars färgrymd." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Displayens rotation måste vara i steg om 90 grader" @@ -1127,7 +1140,7 @@ msgid "Generic Failure" msgstr "Allmänt fel" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Grupp används redan" @@ -1227,7 +1240,7 @@ msgstr "Intern ljudbuffert för liten" msgid "Internal define error" msgstr "Internt define-fel" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "Internt fel" @@ -1250,7 +1263,7 @@ msgstr "Interrupt-fel." #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "Ogiltig %q" @@ -1454,9 +1467,10 @@ msgstr "Nimble har inget minne kvar" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Ingen %q-pinne" @@ -1588,7 +1602,7 @@ msgstr "Inte ansluten" msgid "Not playing" msgstr "Ingen uppspelning" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "Antal data_pins måste vara 8 eller 16, inte %d" @@ -1890,7 +1904,7 @@ msgstr "Mottaget svar var ogiltigt" msgid "Reconnecting" msgstr "Återansluter" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Uppdaterad för tidigt" @@ -1991,7 +2005,7 @@ msgstr "SocketPool kan endast användas med wifi.radio" msgid "Source and destination buffers must be the same length" msgstr "Käll- och målbuffertar måste ha samma längd" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "Ange en av data0 eller data_pins" @@ -2051,7 +2065,7 @@ msgstr "Fel från firmware från tredje part." msgid "This microcontroller does not support continuous capture." msgstr "Den här mikrokontrollern stöder inte kontinuerlig insamling." -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2188,7 +2202,8 @@ msgstr "Kan inte allokera heap." msgid "Unable to create lock" msgstr "Kan inte skapa lås" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "Det gick inte att hitta I2C-display på %x" @@ -2300,7 +2315,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "Färgrymd stöds inte" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Busstyp för display stöds inte" diff --git a/locale/tr.po b/locale/tr.po index f3bf5af57aad..8e1462e7af7b 100644 --- a/locale/tr.po +++ b/locale/tr.po @@ -183,19 +183,23 @@ msgstr "%q boyutu <= %d olmalıdır" msgid "%q length must be >= %d" msgstr "%q boyutu >= %d olmalıdır" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q, %d olmalıdır" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q, %d-%d olmalıdır" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "%q 1 olmalı, %q True olduğu zaman" @@ -220,6 +224,10 @@ msgstr "%q 'H' ya da 'B' tipi bir bytearray ya da array olmalıdır" msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "%q 'h', 'H', 'b' ya da 'B' tipi bir bytearray ya da array olmalı" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "" @@ -255,6 +263,10 @@ msgstr "%q sınırların dışında" msgid "%q out of range" msgstr "%q aralık dışında" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "%q sıfır olamaz" @@ -442,8 +454,8 @@ msgstr "*x atama hedefi olmalıdır" msgid ", in %q\n" msgstr ", içinde %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -635,7 +647,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "Baudhızı, çevre birimi tarafından desteklenmiyor" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "Minimum kare hızından altında" @@ -668,7 +680,7 @@ msgstr "Hem RX hem de TX akış kontrolü için gerekli" msgid "Both pins must support hardware interrupts" msgstr "Her iki pin de donanım kesintilerini desteklemelidir" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "Parlaklık ayarlanabilir değil" @@ -705,7 +717,8 @@ msgstr "Buffer 512 bitin katı olmalı" msgid "Buffer too short by %d bytes" msgstr "Buffer bitten %d daha az" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -715,10 +728,10 @@ msgstr "" msgid "Buffers must be same size" msgstr "Arabellek boyutları aynı olmalı" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Veriyolu pini %d kullanımda" @@ -904,8 +917,8 @@ msgstr "" msgid "DAC already in use" msgstr "DAC zaten kullanımda" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "Data 0 pini bite hizalı olmalı" @@ -935,13 +948,13 @@ msgstr "Hedef kapasitesi, hedef_uzunluğundan daha küçük." msgid "Device in use" msgstr "Cihaz kullanımda" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Ekran 16 bitlik bir renk uzayına sahip olmalıdır." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Ekran dönüşü 90 derecelik artışlarla olmalıdır" @@ -1119,7 +1132,7 @@ msgid "Generic Failure" msgstr "" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Grup zaten kullanılıyor" @@ -1217,7 +1230,7 @@ msgstr "Dahili ses arabelleği çok küçük" msgid "Internal define error" msgstr "Dahili tanımlama hatası" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "Dahili hata" @@ -1240,7 +1253,7 @@ msgstr "" #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "Geçersiz %q" @@ -1444,9 +1457,10 @@ msgstr "" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "%q pini yok" @@ -1578,7 +1592,7 @@ msgstr "" msgid "Not playing" msgstr "" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "" @@ -1871,7 +1885,7 @@ msgstr "" msgid "Reconnecting" msgstr "" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "" @@ -1972,7 +1986,7 @@ msgstr "" msgid "Source and destination buffers must be the same length" msgstr "" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "" @@ -2032,7 +2046,7 @@ msgstr "" msgid "This microcontroller does not support continuous capture." msgstr "" -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2167,7 +2181,8 @@ msgstr "" msgid "Unable to create lock" msgstr "" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "" @@ -2277,7 +2292,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "" diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po index 5d16d3173276..52c7fefa4e14 100644 --- a/locale/zh_Latn_pinyin.po +++ b/locale/zh_Latn_pinyin.po @@ -189,19 +189,23 @@ msgstr "%q chángdù bìxū <= %d" msgid "%q length must be >= %d" msgstr "%q chángdù bìxū >= %d" +#: py/objmodule.c py/runtime.c +msgid "%q moved from %q to %q" +msgstr "" + #: py/argcheck.c msgid "%q must be %d" msgstr "%q bìxū %d" -#: py/argcheck.c shared-bindings/displayio/Bitmap.c -#: shared-bindings/displayio/Display.c +#: py/argcheck.c shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/displayio/Bitmap.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/is31fl3741/FrameBuffer.c #: shared-bindings/rgbmatrix/RGBMatrix.c msgid "%q must be %d-%d" msgstr "%q bì xū wéi %d-%d" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c msgid "%q must be 1 when %q is True" msgstr "sāng %q wèi True shí, %q bìxū wèi 1" @@ -227,6 +231,10 @@ msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'" msgstr "" "%q bì xū shì zì jié shù zǔ huò lèi xíng wéi 'h', 'H', 'b', huò 'B' de shù zǔ" +#: shared-bindings/warnings/__init__.c +msgid "%q must be a subclass of %q" +msgstr "" + #: ports/espressif/common-hal/analogbufio/BufferedIn.c msgid "%q must be array of type 'H'" msgstr "%q bì xū shì lèi xíng wéi 'H' de shù zǔ" @@ -262,6 +270,10 @@ msgstr "%q chāo chū jiè xiàn" msgid "%q out of range" msgstr "%q chāochū fànwéi" +#: py/objmodule.c py/runtime.c +msgid "%q renamed %q" +msgstr "" + #: py/objrange.c py/objslice.c shared-bindings/random/__init__.c msgid "%q step cannot be zero" msgstr "%q bù cháng bù néng wéi líng" @@ -449,8 +461,8 @@ msgstr "*x bìxū shì bèi fùzhí de duìxiàng" msgid ", in %q\n" msgstr ", zài %q\n" -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid ".show(x) removed. Use .root_group = x" msgstr "" @@ -642,7 +654,7 @@ msgstr "" msgid "Baudrate not supported by peripheral" msgstr "bōtèlǜ bú bèi wàishè zhīchí" -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Below minimum frame rate" msgstr "dīyú zuìdī zhēnlǜ" @@ -675,7 +687,7 @@ msgstr "RX hé TX dōu xū yào liúliàng kòngzhì" msgid "Both pins must support hardware interrupts" msgstr "liǎnggè yǐnjiǎo dōu bìxū zhīchí yìngjiàn zhōngduàn" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Brightness not adjustable" msgstr "liàngdù wúfǎ tiáozhěng" @@ -712,7 +724,8 @@ msgstr "Huǎnchōngqū bìxū shì 512 zìjié de bèishù" msgid "Buffer too short by %d bytes" msgstr "Huǎnchōngqū tàiduǎn , mùqián zhǐyǒu %d zìjié" -#: ports/cxd56/common-hal/camera/Camera.c shared-bindings/displayio/Display.c +#: ports/cxd56/common-hal/camera/Camera.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c #: shared-bindings/struct/__init__.c shared-module/struct/__init__.c msgid "Buffer too small" @@ -722,10 +735,10 @@ msgstr "huǎnchōngqū tàixiǎo" msgid "Buffers must be same size" msgstr "huǎnchōng qū bìxū dàxiǎo xiāngtóng" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c -#: ports/raspberrypi/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/raspberrypi/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Bus pin %d is already in use" msgstr "Zǒngxiàn yǐnjiǎo %d yǐjīng zài shǐyòng zhōng" @@ -913,8 +926,8 @@ msgstr "DAC shèbèi chūshǐhuà cuòwù" msgid "DAC already in use" msgstr "DAC zhèngzài bèi shǐyòng" -#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c -#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c +#: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c +#: ports/nrf/common-hal/paralleldisplaybus/ParallelBus.c msgid "Data 0 pin must be byte aligned" msgstr "shù jù 0 yǐn jiǎo bì xū shì zì jié duì qí de" @@ -945,13 +958,13 @@ msgstr "Mùbiāo róngliàng xiǎoyú mùdì de_chángdù." msgid "Device in use" msgstr "Zhèngzài shǐyòng de shèbèi" -#: shared-bindings/displayio/Display.c +#: shared-bindings/busdisplay/BusDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display must have a 16 bit colorspace." msgstr "Xiǎnshì bìxū jùyǒu 16 wèi yánsè kōngjiān." -#: shared-bindings/displayio/Display.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/busdisplay/BusDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c #: shared-bindings/framebufferio/FramebufferDisplay.c msgid "Display rotation must be in 90 degree increments" msgstr "Xiǎnshì xuánzhuǎn bìxū 90 dù jiā xīn" @@ -1130,7 +1143,7 @@ msgid "Generic Failure" msgstr "tōng yòng gù zhàng" #: shared-bindings/framebufferio/FramebufferDisplay.c -#: shared-module/displayio/Display.c +#: shared-module/busdisplay/BusDisplay.c #: shared-module/framebufferio/FramebufferDisplay.c msgid "Group already used" msgstr "Jítuán yǐjīng shǐyòngguò" @@ -1233,7 +1246,7 @@ msgstr "nèi bù yīn pín huǎn chōng qì tài xiǎo" msgid "Internal define error" msgstr "Nèibù dìngyì cuòwù" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #: shared-module/os/getenv.c msgid "Internal error" msgstr "nèi bù cuò wù" @@ -1256,7 +1269,7 @@ msgstr "zhōng duàn cuò wù." #: ports/raspberrypi/bindings/picodvi/Framebuffer.c #: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c #: shared-bindings/digitalio/DigitalInOut.c -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Invalid %q" msgstr "wú xiào %q" @@ -1459,9 +1472,10 @@ msgstr "líng huó de bǎi tuō jì yì" #: ports/mimxrt10xx/common-hal/busio/SPI.c #: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c #: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/SPI.c -#: ports/stm/common-hal/busio/UART.c shared-bindings/displayio/FourWire.c -#: shared-bindings/displayio/I2CDisplay.c -#: shared-bindings/paralleldisplay/ParallelBus.c shared-module/bitbangio/SPI.c +#: ports/stm/common-hal/busio/UART.c shared-bindings/fourwire/FourWire.c +#: shared-bindings/i2cdisplaybus/I2CDisplayBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c +#: shared-module/bitbangio/SPI.c msgid "No %q pin" msgstr "Wèi zhǎodào %q yǐn jiǎo" @@ -1593,7 +1607,7 @@ msgstr "Wèi liánjiē" msgid "Not playing" msgstr "Wèi bòfàng" -#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c +#: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c #, c-format msgid "Number of data_pins must be 8 or 16, not %d" msgstr "data_pins shù bì xū wéi 8 huò 16, ér bù shì %d" @@ -1893,7 +1907,7 @@ msgstr "shōu dào de xiǎng yìng wú xiào" msgid "Reconnecting" msgstr "chóngxīn liánjiē" -#: shared-bindings/displayio/EPaperDisplay.c +#: shared-bindings/epaperdisplay/EPaperDisplay.c msgid "Refresh too soon" msgstr "Shuāxīn tài kuàile" @@ -1994,7 +2008,7 @@ msgstr "SocketPool zhǐ néng yǔ wifi.Radio yīqǐ shǐyòng" msgid "Source and destination buffers must be the same length" msgstr "Yuán huǎnchōng qū hé mùbiāo huǎnchōng qū de chángdù bìxū xiāngtóng" -#: shared-bindings/paralleldisplay/ParallelBus.c +#: shared-bindings/paralleldisplaybus/ParallelBus.c msgid "Specify exactly one of data0 or data_pins" msgstr "zhǐ dìng data0 huò data_pins zhōng de yí gè" @@ -2054,7 +2068,7 @@ msgstr "dì sān fāng gù jiàn zhì mìng cuò wù." msgid "This microcontroller does not support continuous capture." msgstr "cǐ wēi kòng zhì qì bù zhī chí lián xù bǔ huò." -#: shared-module/paralleldisplay/ParallelBus.c +#: shared-module/paralleldisplaybus/ParallelBus.c msgid "" "This microcontroller only supports data0=, not data_pins=, because it " "requires contiguous pins." @@ -2191,7 +2205,8 @@ msgstr "wú fǎ fēn pèi duī." msgid "Unable to create lock" msgstr "Wúfǎ chuàngjiàn suǒ" -#: shared-module/displayio/I2CDisplay.c shared-module/is31fl3741/IS31FL3741.c +#: shared-module/i2cdisplaybus/I2CDisplayBus.c +#: shared-module/is31fl3741/IS31FL3741.c #, c-format msgid "Unable to find I2C Display at %x" msgstr "Wúfǎ zài%x zhǎodào I2C xiǎnshìqì" @@ -2303,7 +2318,7 @@ msgstr "" msgid "Unsupported colorspace" msgstr "bú zhī chí de sè cǎi kōng jiān" -#: shared-module/displayio/display_core.c +#: shared-module/displayio/bus_core.c msgid "Unsupported display bus type" msgstr "Bù zhīchí de gōnggòng qìchē lèixíng" From 523d95e192d1745470d888e1d3f971cbf4e2fa81 Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Fri, 27 Oct 2023 09:31:20 -0700 Subject: [PATCH 11/11] Switch warnings to mp_rom_error_text_t --- shared-module/warnings/__init__.c | 2 +- shared-module/warnings/__init__.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shared-module/warnings/__init__.c b/shared-module/warnings/__init__.c index e12958600fb2..9ee52619a56a 100644 --- a/shared-module/warnings/__init__.c +++ b/shared-module/warnings/__init__.c @@ -48,7 +48,7 @@ void common_hal_warnings_warn(const char *message, const mp_obj_type_t *category mp_printf(MICROPY_ERROR_PRINTER, "%q: %s\n", category->name, message); } -void warnings_warn(const mp_obj_type_t *category, const compressed_string_t *message, ...) { +void warnings_warn(const mp_obj_type_t *category, mp_rom_error_text_t message, ...) { warnings_action_t action = MP_STATE_THREAD(warnings_action); if (action == WARNINGS_IGNORE) { return; diff --git a/shared-module/warnings/__init__.h b/shared-module/warnings/__init__.h index 2b9e54407933..5d67438ef20c 100644 --- a/shared-module/warnings/__init__.h +++ b/shared-module/warnings/__init__.h @@ -26,4 +26,4 @@ #pragma once -void warnings_warn(const mp_obj_type_t *category, const compressed_string_t *message, ...); +void warnings_warn(const mp_obj_type_t *category, mp_rom_error_text_t message, ...);