From 2459eabd66169d18f3f223c942cc73152ce6de68 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Wed, 20 Mar 2019 12:21:36 -0400 Subject: [PATCH 01/19] flush flash filesystem once a second --- ports/atmel-samd/background.c | 2 ++ ports/nrf/background.c | 2 ++ ports/nrf/tick.c | 14 +++++++++----- py/circuitpy_mpconfig.h | 1 + supervisor/filesystem.h | 4 ++++ supervisor/shared/autoreload.c | 5 +++-- supervisor/shared/filesystem.c | 24 ++++++++++++++++++++++++ 7 files changed, 45 insertions(+), 7 deletions(-) diff --git a/ports/atmel-samd/background.c b/ports/atmel-samd/background.c index 519d0eeec7..a8c4e38918 100644 --- a/ports/atmel-samd/background.c +++ b/ports/atmel-samd/background.c @@ -27,6 +27,7 @@ #include "audio_dma.h" #include "tick.h" +#include "supervisor/filesystem.h" #include "supervisor/usb.h" #include "py/runtime.h" @@ -53,6 +54,7 @@ void run_background_tasks(void) { #if CIRCUITPY_NETWORK network_module_background(); #endif + filesystem_background(); usb_background(); assert_heap_ok(); diff --git a/ports/nrf/background.c b/ports/nrf/background.c index 69c76fd066..ea6e846b31 100644 --- a/ports/nrf/background.c +++ b/ports/nrf/background.c @@ -25,6 +25,7 @@ */ #include "py/runtime.h" +#include "supervisor/filesystem.h" #include "supervisor/usb.h" #include "supervisor/shared/stack.h" @@ -33,6 +34,7 @@ #endif void run_background_tasks(void) { + filesystem_background(); usb_background(); #ifdef CIRCUITPY_DISPLAYIO diff --git a/ports/nrf/tick.c b/ports/nrf/tick.c index cdd329f71d..6d8fd13e0a 100644 --- a/ports/nrf/tick.c +++ b/ports/nrf/tick.c @@ -27,6 +27,7 @@ #include "tick.h" #include "supervisor/shared/autoreload.h" +#include "supervisor/filesystem.h" #include "shared-module/gamepad/__init__.h" #include "shared-bindings/microcontroller/Processor.h" #include "nrf.h" @@ -39,14 +40,17 @@ void SysTick_Handler(void) { // (every millisecond). ticks_ms += 1; - #ifdef CIRCUITPY_AUTORELOAD_DELAY_MS - autoreload_tick(); - #endif - #ifdef CIRCUITPY_GAMEPAD_TICKS +#if CIRCUITPY_FILESYSTEM_FLUSH_INTERVAL_MS > 0 + filesystem_tick(); +#endif +#ifdef CIRCUITPY_AUTORELOAD_DELAY_MS + autoreload_tick(); +#endif +#ifdef CIRCUITPY_GAMEPAD_TICKS if (!(ticks_ms & CIRCUITPY_GAMEPAD_TICKS)) { gamepad_tick(); } - #endif +#endif } void tick_init() { diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h index 00f3c7b3f4..df5bfbd8cd 100644 --- a/py/circuitpy_mpconfig.h +++ b/py/circuitpy_mpconfig.h @@ -592,6 +592,7 @@ void run_background_tasks(void); #define MICROPY_VM_HOOK_RETURN run_background_tasks(); #define CIRCUITPY_AUTORELOAD_DELAY_MS 500 +#define CIRCUITPY_FILESYSTEM_FLUSH_INTERVAL_MS 1000 #define CIRCUITPY_BOOT_OUTPUT_FILE "/boot_out.txt" #endif // __INCLUDED_MPCONFIG_CIRCUITPY_H diff --git a/supervisor/filesystem.h b/supervisor/filesystem.h index 76f235f47d..c7c951a5e6 100644 --- a/supervisor/filesystem.h +++ b/supervisor/filesystem.h @@ -31,6 +31,10 @@ #include "extmod/vfs_fat.h" +extern volatile bool filesystem_flush_requested; + +void filesystem_background(void); +void filesystem_tick(void); void filesystem_init(bool create_allowed, bool force_create); void filesystem_flush(void); bool filesystem_present(void); diff --git a/supervisor/shared/autoreload.c b/supervisor/shared/autoreload.c index 2a7fd1e9d8..14b21902cd 100644 --- a/supervisor/shared/autoreload.c +++ b/supervisor/shared/autoreload.c @@ -29,9 +29,10 @@ #include "py/mphal.h" #include "py/reload.h" -volatile uint32_t autoreload_delay_ms = 0; -bool autoreload_enabled = false; +static volatile uint32_t autoreload_delay_ms = 0; +static bool autoreload_enabled = false; static bool autoreload_suspended = false; + volatile bool reload_requested = false; inline void autoreload_tick() { diff --git a/supervisor/shared/filesystem.c b/supervisor/shared/filesystem.c index 0ef978ef21..dc061fa418 100644 --- a/supervisor/shared/filesystem.c +++ b/supervisor/shared/filesystem.c @@ -37,6 +37,30 @@ static mp_vfs_mount_t _mp_vfs; static fs_user_mount_t _internal_vfs; +static volatile uint32_t filesystem_flush_interval_ms = CIRCUITPY_FILESYSTEM_FLUSH_INTERVAL_MS; +volatile bool filesystem_flush_requested = false; + +void filesystem_background(void) { + if (filesystem_flush_requested) { + filesystem_flush(); + filesystem_flush_requested = false; + } +} + +inline void filesystem_tick(void) { + if (filesystem_flush_interval_ms == 0) { + // 0 means not turned on. + return; + } + if (filesystem_flush_interval_ms == 1) { + filesystem_flush_requested = true; + filesystem_flush_interval_ms = CIRCUITPY_FILESYSTEM_FLUSH_INTERVAL_MS; + } else { + filesystem_flush_interval_ms--; + } +} + + static void make_empty_file(FATFS *fatfs, const char *path) { FIL fp; f_open(fatfs, &fp, path, FA_WRITE | FA_CREATE_ALWAYS); From e23bad3a3af2c334573d6233508cf2fd3b111b66 Mon Sep 17 00:00:00 2001 From: Joshua Coats Date: Sat, 23 Mar 2019 10:49:43 -0700 Subject: [PATCH 02/19] shared-bindings/socket: add socket_recv_into --- shared-bindings/socket/__init__.c | 53 ++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/shared-bindings/socket/__init__.c b/shared-bindings/socket/__init__.c index 29d47de568..c59724efcf 100644 --- a/shared-bindings/socket/__init__.c +++ b/shared-bindings/socket/__init__.c @@ -240,6 +240,52 @@ STATIC mp_obj_t socket_send(mp_obj_t self_in, mp_obj_t buf_in) { } STATIC MP_DEFINE_CONST_FUN_OBJ_2(socket_send_obj, socket_send); + +// helper function for socket_recv and socket_recv_into to handle common operations of both +STATIC mp_int_t _socket_recv_into(mod_network_socket_obj_t *sock, byte *buf, mp_int_t len) { + int _errno; + mp_int_t ret = sock->nic_type->recv(sock, buf, len, &_errno); + if (ret == -1) { + mp_raise_OSError(_errno); + } + return len; +} + + +//| .. method:: recv_into(buffer[, bufsize]) +//| +//| Reads some bytes from the connected remote address, writing +//| into the provided buffer. If bufsize <= len(buffer) is given, +//| a maximum of bufsize bytes will be read into the buffer. If no +//| valid value is given for bufsize, the default is the length of +//| the given buffer. +//| +//| Suits sockets of type SOCK_STREAM +//| Returns an int of number of bytes read. +//| +//| :param bytearray buffer: buffer to receive into +//| :param int bufsize: optionally, a maximum number of bytes to read. + +STATIC mp_obj_t socket_recv_into(size_t n_args, const mp_obj_t *args) { + mod_network_socket_obj_t *self = MP_OBJ_TO_PTR(args[0]); + if (self->nic == MP_OBJ_NULL) { + // not connected + mp_raise_OSError(MP_ENOTCONN); + } + mp_buffer_info_t bufinfo; + mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE); + mp_int_t len; + if (n_args == 3) { + len = mp_obj_get_int(args[2]); + } + if (n_args == 2 || (size_t) len > bufinfo.len) { + len = bufinfo.len; + } + mp_int_t ret = _socket_recv_into(self, (byte*)bufinfo.buf, len); + return mp_obj_new_int_from_uint(ret); +} +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(socket_recv_into_obj, 2, 3, socket_recv_into); + //| .. method:: recv(bufsize) //| //| Reads some bytes from the connected remote address. @@ -257,11 +303,7 @@ STATIC mp_obj_t socket_recv(mp_obj_t self_in, mp_obj_t len_in) { mp_int_t len = mp_obj_get_int(len_in); vstr_t vstr; vstr_init_len(&vstr, len); - int _errno; - mp_int_t ret = self->nic_type->recv(self, (byte*)vstr.buf, len, &_errno); - if (ret == -1) { - mp_raise_OSError(_errno); - } + mp_int_t ret = _socket_recv_into(self, (byte*)vstr.buf, len); if (ret == 0) { return mp_const_empty_bytes; } @@ -436,6 +478,7 @@ STATIC const mp_rom_map_elem_t socket_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_recv), MP_ROM_PTR(&socket_recv_obj) }, { MP_ROM_QSTR(MP_QSTR_sendto), MP_ROM_PTR(&socket_sendto_obj) }, { MP_ROM_QSTR(MP_QSTR_recvfrom), MP_ROM_PTR(&socket_recvfrom_obj) }, + { MP_ROM_QSTR(MP_QSTR_recv_into), MP_ROM_PTR(&socket_recv_into_obj) }, { MP_ROM_QSTR(MP_QSTR_setsockopt), MP_ROM_PTR(&socket_setsockopt_obj) }, { MP_ROM_QSTR(MP_QSTR_settimeout), MP_ROM_PTR(&socket_settimeout_obj) }, { MP_ROM_QSTR(MP_QSTR_setblocking), MP_ROM_PTR(&socket_setblocking_obj) }, From cc6fb4595ede6e27ae03edc8af782496e87698bb Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Mon, 25 Mar 2019 01:41:52 +0100 Subject: [PATCH 03/19] Reuse existing error message in busio.i2c Remove a period from the error message, so that the same message as in SPI and other places in I2C can be re-used. --- shared-bindings/busio/I2C.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/busio/I2C.c b/shared-bindings/busio/I2C.c index e792d25757..e17a72b481 100644 --- a/shared-bindings/busio/I2C.c +++ b/shared-bindings/busio/I2C.c @@ -114,7 +114,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(busio_i2c___exit___obj, 4, 4, busio_i static void check_lock(busio_i2c_obj_t *self) { asm(""); if (!common_hal_busio_i2c_has_lock(self)) { - mp_raise_RuntimeError(translate("Function requires lock.")); + mp_raise_RuntimeError(translate("Function requires lock")); } } From bb10a8aaa19ed662f7dda6500397432ed7b2e0c0 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Mon, 25 Mar 2019 01:27:54 +0100 Subject: [PATCH 04/19] Fix error messages in bleio --- locale/ID.po | 112 +++++++++++--------- locale/circuitpython.pot | 96 ++++++++--------- locale/de_DE.po | 106 +++++++++--------- locale/en_US.po | 96 ++++++++--------- locale/en_x_pirate.po | 96 ++++++++--------- locale/es.po | 112 +++++++++++--------- locale/fil.po | 112 +++++++++++--------- locale/fr.po | 112 +++++++++++--------- locale/it_IT.po | 112 +++++++++++--------- locale/pt_BR.po | 112 +++++++++++--------- ports/nrf/common-hal/bleio/Characteristic.c | 4 +- 11 files changed, 552 insertions(+), 518 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index 3052cb90b4..706460decc 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,8 +52,8 @@ msgstr "" msgid "%q indices must be integers, not %s" msgstr "" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c #, fuzzy msgid "%q must be >= 1" msgstr "buffers harus mempunyai panjang yang sama" @@ -62,7 +62,7 @@ msgstr "buffers harus mempunyai panjang yang sama" msgid "%q should be an int" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan" @@ -70,12 +70,12 @@ msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan" msgid "'%q' argument required" msgstr "'%q' argumen dibutuhkan" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "'%s' mengharapkan sebuah register" @@ -95,7 +95,7 @@ msgstr "'%s' mengharapkan sebuah FPU register" msgid "'%s' expects an address of the form [a, b]" msgstr "'%s' mengharapkan sebuah alamat dengan bentuk [a, b]" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "'%s' mengharapkan integer" @@ -249,7 +249,7 @@ msgstr "Semua perangkat I2C sedang digunakan" msgid "All event channels in use" msgstr "Semua channel event sedang digunakan" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "Semua channel event yang disinkronisasi sedang digunakan" @@ -257,9 +257,9 @@ msgstr "Semua channel event yang disinkronisasi sedang digunakan" msgid "All timers for this pin are in use" msgstr "Semua timer untuk pin ini sedang digunakan" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -563,9 +563,8 @@ msgstr "Errod pada ffi_prep_cif" msgid "Error in regex" msgstr "Error pada regex" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "" @@ -573,8 +572,8 @@ msgstr "" msgid "Expected a Characteristic" msgstr "" -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c msgid "Expected a UUID" msgstr "" @@ -613,8 +612,8 @@ msgid "Failed to allocate RX buffer" msgstr "Gagal untuk mengalokasikan buffer RX" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "Gagal untuk megalokasikan buffer RX dari %d byte" @@ -660,9 +659,9 @@ msgid "Failed to get softdevice state" msgstr "Gagal untuk mendapatkan status softdevice, error: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" -msgstr "Gagal untuk melaporkan nilai atribut, status: 0x%08lX" +#, c-format +msgid "Failed to notify or indicate attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -670,9 +669,9 @@ msgid "Failed to read CCCD value, err 0x%04x" msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to read attribute value, err %0x04x" -msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX" +#, c-format +msgid "Failed to read attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -762,7 +761,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "" @@ -779,7 +778,7 @@ msgstr "GPIO16 tidak mendukung pull up" msgid "Group full" msgstr "" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "operasi I/O pada file tertutup" @@ -873,11 +872,10 @@ msgstr "Pin untuk channel kiri tidak valid" msgid "Invalid pin for right channel" msgstr "Pin untuk channel kanan tidak valid" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "Pin-pin tidak valid" @@ -1206,8 +1204,8 @@ msgstr "Serializer sedang digunakan" msgid "Slice and value different lengths." msgstr "" -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "" @@ -1467,7 +1465,7 @@ msgstr "sebuah objek menyerupai byte (bytes-like) dibutuhkan" msgid "abort() called" msgstr "abort() dipanggil" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "alamat %08x tidak selaras dengan %d bytes" @@ -1496,7 +1494,7 @@ msgstr "argumen num/types tidak cocok" msgid "argument should be a '%q' not a '%q'" msgstr "" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "" @@ -1566,8 +1564,8 @@ msgstr "" msgid "buffer too long" msgstr "buffer terlalu panjang" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "" @@ -1825,7 +1823,7 @@ msgstr "" msgid "complex division by zero" msgstr "" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "" @@ -1866,8 +1864,8 @@ msgstr "" msgid "dict update sequence has wrong length" msgstr "" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "" @@ -1879,7 +1877,7 @@ msgstr "hanya antar pos atau kw args yang diperbolehkan" msgid "empty" msgstr "" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "heap kosong" @@ -1952,7 +1950,7 @@ msgstr "argumen posisi ekstra telah diberikan" msgid "ffi_prep_closure_loc" msgstr "ffi_prep_closure_loc" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "" @@ -2001,7 +1999,7 @@ msgstr "fungsi tidak dapat mengambil argumen keyword" msgid "function expected at most %d arguments, got %d" msgstr "fungsi diharapkan setidaknya %d argumen, hanya mendapatkan %d" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "fungsi mendapatkan nilai ganda untuk argumen '%q'" @@ -2023,7 +2021,7 @@ msgstr "fungsi kehilangan argumen keyword '%q' yang dibutuhkan" msgid "function missing required positional argument #%d" msgstr "fungsi kehilangan argumen posisi #%d yang dibutuhkan" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "fungsi mengambil posisi argumen %d tapi %d yang diberikan" @@ -2073,8 +2071,8 @@ msgid "incorrect padding" msgstr "lapisan (padding) tidak benar" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "index keluar dari jangkauan" @@ -2195,7 +2193,7 @@ msgstr "argumen keyword belum diimplementasi - gunakan args normal" msgid "keywords must be strings" msgstr "keyword harus berupa string" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "" @@ -2235,7 +2233,7 @@ msgstr "" msgid "map buffer too small" msgstr "" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "" @@ -2311,11 +2309,11 @@ msgstr "" msgid "need more than %d values to unpack" msgstr "" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "" @@ -2335,7 +2333,7 @@ msgstr "tidak ada ikatan/bind pada temuan nonlocal" msgid "no module named '%q'" msgstr "tidak ada modul yang bernama '%q'" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "" @@ -2422,13 +2420,13 @@ msgstr "" msgid "odd-length string" msgstr "panjang data string memiliki keganjilan (odd-length)" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c #, fuzzy msgid "offset out of bounds" msgstr "modul tidak ditemukan" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "" @@ -2445,7 +2443,7 @@ msgstr "" msgid "overflow converting long int to machine word" msgstr "" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "" @@ -2482,8 +2480,8 @@ msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "Muncul dari PulseIn yang kosong" @@ -2590,7 +2588,7 @@ msgstr "" msgid "slice step cannot be zero" msgstr "" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "" @@ -2753,7 +2751,7 @@ msgstr "" msgid "unexpected keyword argument" msgstr "argumen keyword tidak diharapkan" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "keyword argumen '%q' tidak diharapkan" @@ -2871,3 +2869,11 @@ msgstr "" #: py/objrange.c msgid "zero step" msgstr "" + +#, fuzzy +#~ msgid "Failed to notify or indicate attribute value, err %0x04x" +#~ msgstr "Gagal untuk melaporkan nilai atribut, status: 0x%08lX" + +#, fuzzy +#~ msgid "Failed to read attribute value, err %0x04x" +#~ msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX" diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index cb2183a0d1..55784b5f82 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,8 +52,8 @@ msgstr "" msgid "%q indices must be integers, not %s" msgstr "" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c msgid "%q must be >= 1" msgstr "" @@ -61,7 +61,7 @@ msgstr "" msgid "%q should be an int" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "" @@ -69,12 +69,12 @@ msgstr "" msgid "'%q' argument required" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "" @@ -94,7 +94,7 @@ msgstr "" msgid "'%s' expects an address of the form [a, b]" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "" @@ -247,7 +247,7 @@ msgstr "" msgid "All event channels in use" msgstr "" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "" @@ -255,9 +255,9 @@ msgstr "" msgid "All timers for this pin are in use" msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -551,9 +551,8 @@ msgstr "" msgid "Error in regex" msgstr "" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "" @@ -561,8 +560,8 @@ msgstr "" msgid "Expected a Characteristic" msgstr "" -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c msgid "Expected a UUID" msgstr "" @@ -599,8 +598,8 @@ msgid "Failed to allocate RX buffer" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "" @@ -640,7 +639,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" +msgid "Failed to notify or indicate attribute value, err x0%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -650,7 +649,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err %0x04x" +msgid "Failed to read attribute value, err x0%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -737,7 +736,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "" @@ -754,7 +753,7 @@ msgstr "" msgid "Group full" msgstr "" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "" @@ -848,11 +847,10 @@ msgstr "" msgid "Invalid pin for right channel" msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "" @@ -1176,8 +1174,8 @@ msgstr "" msgid "Slice and value different lengths." msgstr "" -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "" @@ -1422,7 +1420,7 @@ msgstr "" msgid "abort() called" msgstr "" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "" @@ -1451,7 +1449,7 @@ msgstr "" msgid "argument should be a '%q' not a '%q'" msgstr "" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "" @@ -1520,8 +1518,8 @@ msgstr "" msgid "buffer too long" msgstr "" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "" @@ -1779,7 +1777,7 @@ msgstr "" msgid "complex division by zero" msgstr "" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "" @@ -1820,8 +1818,8 @@ msgstr "" msgid "dict update sequence has wrong length" msgstr "" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "" @@ -1833,7 +1831,7 @@ msgstr "" msgid "empty" msgstr "" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "" @@ -1906,7 +1904,7 @@ msgstr "" msgid "ffi_prep_closure_loc" msgstr "" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "" @@ -1955,7 +1953,7 @@ msgstr "" msgid "function expected at most %d arguments, got %d" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "" @@ -1977,7 +1975,7 @@ msgstr "" msgid "function missing required positional argument #%d" msgstr "" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "" @@ -2027,8 +2025,8 @@ msgid "incorrect padding" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "" @@ -2149,7 +2147,7 @@ msgstr "" msgid "keywords must be strings" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "" @@ -2189,7 +2187,7 @@ msgstr "" msgid "map buffer too small" msgstr "" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "" @@ -2264,11 +2262,11 @@ msgstr "" msgid "need more than %d values to unpack" msgstr "" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "" @@ -2288,7 +2286,7 @@ msgstr "" msgid "no module named '%q'" msgstr "" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "" @@ -2375,12 +2373,12 @@ msgstr "" msgid "odd-length string" msgstr "" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c msgid "offset out of bounds" msgstr "" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "" @@ -2397,7 +2395,7 @@ msgstr "" msgid "overflow converting long int to machine word" msgstr "" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "" @@ -2434,8 +2432,8 @@ msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -2542,7 +2540,7 @@ msgstr "" msgid "slice step cannot be zero" msgstr "" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "" @@ -2704,7 +2702,7 @@ msgstr "" msgid "unexpected keyword argument" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 4d1278da12..37b4ff51c7 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: Pascal Deneaux\n" "Language-Team: Sebastian Plamauer, Pascal Deneaux\n" @@ -54,8 +54,8 @@ msgstr "Der Index %q befindet sich außerhalb der Reihung" msgid "%q indices must be integers, not %s" msgstr "%q Indizes müssen ganze Zahlen sein, nicht %s" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c msgid "%q must be >= 1" msgstr "%q muss >= 1 sein" @@ -63,7 +63,7 @@ msgstr "%q muss >= 1 sein" msgid "%q should be an int" msgstr "%q sollte ein int sein" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "%q() nimmt %d Argumente ohne Keyword an, aber es wurden %d angegeben" @@ -71,12 +71,12 @@ msgstr "%q() nimmt %d Argumente ohne Keyword an, aber es wurden %d angegeben" msgid "'%q' argument required" msgstr "'%q' Argument erforderlich" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "'%s' erwartet ein Label" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "'%s' erwartet ein Register" @@ -96,7 +96,7 @@ msgstr "'%s' erwartet ein FPU-Register" msgid "'%s' expects an address of the form [a, b]" msgstr "'%s' erwartet eine Adresse in der Form [a, b]" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "'%s' erwartet ein Integer" @@ -249,7 +249,7 @@ msgstr "Alle UART-Peripheriegeräte sind in Benutzung" msgid "All event channels in use" msgstr "Alle event Kanäle werden benutzt" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "Alle sync event Kanäle werden benutzt" @@ -257,9 +257,9 @@ msgstr "Alle sync event Kanäle werden benutzt" msgid "All timers for this pin are in use" msgstr "Alle timer für diesen Pin werden bereits benutzt" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -556,9 +556,8 @@ msgstr "Fehler in ffi_prep_cif" msgid "Error in regex" msgstr "Fehler in regex" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "Erwartet ein(e) %q" @@ -566,8 +565,8 @@ msgstr "Erwartet ein(e) %q" msgid "Expected a Characteristic" msgstr "Characteristic wird erwartet" -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c msgid "Expected a UUID" msgstr "Eine UUID wird erwartet" @@ -604,8 +603,8 @@ msgid "Failed to allocate RX buffer" msgstr "Konnte keinen RX Buffer allozieren" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "Konnte keine RX Buffer mit %d allozieren" @@ -645,8 +644,8 @@ msgstr "Fehler beim Abrufen des Softdevice-Status" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" -msgstr "Kann den Attributwert nicht mitteilen. Status: 0x%04x" +msgid "Failed to notify or indicate attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format @@ -655,8 +654,8 @@ msgstr "Kann CCCD value nicht lesen. Status: 0x%04x" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err %0x04x" -msgstr "Kann den Attributwert nicht lesen. Status: 0x%04x" +msgid "Failed to read attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format @@ -742,7 +741,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde" @@ -759,7 +758,7 @@ msgstr "GPIO16 unterstützt pull up nicht" msgid "Group full" msgstr "Gruppe voll" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Lese/Schreibe-operation an geschlossener Datei" @@ -855,11 +854,10 @@ msgstr "Ungültiger Pin für linken Kanal" msgid "Invalid pin for right channel" msgstr "Ungültiger Pin für rechten Kanal" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "Ungültige Pins" @@ -1197,8 +1195,8 @@ msgstr "Serializer wird benutzt" msgid "Slice and value different lengths." msgstr "Slice und Wert (value) haben unterschiedliche Längen." -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "Slices werden nicht unterstützt" @@ -1467,7 +1465,7 @@ msgstr "ein Byte-ähnliches Objekt ist erforderlich" msgid "abort() called" msgstr "abort() wurde aufgerufen" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "Addresse %08x ist nicht an %d bytes ausgerichtet" @@ -1496,7 +1494,7 @@ msgstr "Anzahl/Type der Argumente passen nicht" msgid "argument should be a '%q' not a '%q'" msgstr "Argument sollte '%q' sein, nicht '%q'" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "Array/Bytes auf der rechten Seite erforderlich" @@ -1565,8 +1563,8 @@ msgstr "Puffersegmente müssen gleich lang sein" msgid "buffer too long" msgstr "Buffer zu lang" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "Der Puffer ist zu klein" @@ -1824,7 +1822,7 @@ msgstr "" msgid "complex division by zero" msgstr "" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "" @@ -1865,8 +1863,8 @@ msgstr "" msgid "dict update sequence has wrong length" msgstr "" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "Division durch Null" @@ -1878,7 +1876,7 @@ msgstr "" msgid "empty" msgstr "leer" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "leerer heap" @@ -1951,7 +1949,7 @@ msgstr "Es wurden zusätzliche Argumente ohne Keyword angegeben" msgid "ffi_prep_closure_loc" msgstr "ffi_prep_closure_loc" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "Die Datei muss eine im Byte-Modus geöffnete Datei sein" @@ -2000,7 +1998,7 @@ msgstr "Funktion akzeptiert keine Keyword-Argumente" msgid "function expected at most %d arguments, got %d" msgstr "Funktion erwartet maximal %d Argumente, aber hat %d erhalten" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "Funktion hat mehrere Werte für Argument '%q'" @@ -2022,7 +2020,7 @@ msgstr "Funktion vermisst benötigtes Keyword-Argumente '%q'" msgid "function missing required positional argument #%d" msgstr "Funktion vermisst benötigtes Argumente ohne Keyword #%d" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "" @@ -2073,8 +2071,8 @@ msgid "incorrect padding" msgstr "padding ist inkorrekt" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "index außerhalb der Reichweite" @@ -2199,7 +2197,7 @@ msgstr "" msgid "keywords must be strings" msgstr "Schlüsselwörter müssen Zeichenfolgen sein" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "Label '%q' nicht definiert" @@ -2241,7 +2239,7 @@ msgstr "long int wird in diesem Build nicht unterstützt" msgid "map buffer too small" msgstr "map buffer zu klein" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "" @@ -2317,11 +2315,11 @@ msgstr "" msgid "need more than %d values to unpack" msgstr "" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "" @@ -2341,7 +2339,7 @@ msgstr "" msgid "no module named '%q'" msgstr "Kein Modul mit dem Namen '%q'" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "" @@ -2428,12 +2426,12 @@ msgstr "Objekt mit Pufferprotokoll (buffer protocol) erforderlich" msgid "odd-length string" msgstr "String mit ungerader Länge" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c msgid "offset out of bounds" msgstr "offset außerhalb der Grenzen" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "" @@ -2452,7 +2450,7 @@ msgstr "" msgid "overflow converting long int to machine word" msgstr "" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "" @@ -2489,8 +2487,8 @@ msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgstr "pixel_shader muss displayio.Palette oder displayio.ColorConverter sein" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop von einem leeren PulseIn" @@ -2599,7 +2597,7 @@ msgstr "" msgid "slice step cannot be zero" msgstr "" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "small int Überlauf" @@ -2764,7 +2762,7 @@ msgstr "" msgid "unexpected keyword argument" msgstr "unerwartetes Keyword-Argument" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "unerwartetes Keyword-Argument '%q'" @@ -2885,5 +2883,11 @@ msgstr "y Wert außerhalb der Grenzen" msgid "zero step" msgstr "" +#~ msgid "Failed to notify or indicate attribute value, err %0x04x" +#~ msgstr "Kann den Attributwert nicht mitteilen. Status: 0x%04x" + +#~ msgid "Failed to read attribute value, err %0x04x" +#~ msgstr "Kann den Attributwert nicht lesen. Status: 0x%04x" + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Nur unkomprimiertes Windows-Format (BMP) unterstützt %d" diff --git a/locale/en_US.po b/locale/en_US.po index 3cb21287bc..fa13eb1b3f 100644 --- a/locale/en_US.po +++ b/locale/en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: \n" "Language-Team: \n" @@ -52,8 +52,8 @@ msgstr "" msgid "%q indices must be integers, not %s" msgstr "" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c msgid "%q must be >= 1" msgstr "" @@ -61,7 +61,7 @@ msgstr "" msgid "%q should be an int" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "" @@ -69,12 +69,12 @@ msgstr "" msgid "'%q' argument required" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "" @@ -94,7 +94,7 @@ msgstr "" msgid "'%s' expects an address of the form [a, b]" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "" @@ -247,7 +247,7 @@ msgstr "" msgid "All event channels in use" msgstr "" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "" @@ -255,9 +255,9 @@ msgstr "" msgid "All timers for this pin are in use" msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -551,9 +551,8 @@ msgstr "" msgid "Error in regex" msgstr "" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "" @@ -561,8 +560,8 @@ msgstr "" msgid "Expected a Characteristic" msgstr "" -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c msgid "Expected a UUID" msgstr "" @@ -599,8 +598,8 @@ msgid "Failed to allocate RX buffer" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "" @@ -640,7 +639,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" +msgid "Failed to notify or indicate attribute value, err x0%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -650,7 +649,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err %0x04x" +msgid "Failed to read attribute value, err x0%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -737,7 +736,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "" @@ -754,7 +753,7 @@ msgstr "" msgid "Group full" msgstr "" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "" @@ -848,11 +847,10 @@ msgstr "" msgid "Invalid pin for right channel" msgstr "" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "" @@ -1176,8 +1174,8 @@ msgstr "" msgid "Slice and value different lengths." msgstr "" -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "" @@ -1422,7 +1420,7 @@ msgstr "" msgid "abort() called" msgstr "" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "" @@ -1451,7 +1449,7 @@ msgstr "" msgid "argument should be a '%q' not a '%q'" msgstr "" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "" @@ -1520,8 +1518,8 @@ msgstr "" msgid "buffer too long" msgstr "" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "" @@ -1779,7 +1777,7 @@ msgstr "" msgid "complex division by zero" msgstr "" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "" @@ -1820,8 +1818,8 @@ msgstr "" msgid "dict update sequence has wrong length" msgstr "" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "" @@ -1833,7 +1831,7 @@ msgstr "" msgid "empty" msgstr "" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "" @@ -1906,7 +1904,7 @@ msgstr "" msgid "ffi_prep_closure_loc" msgstr "" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "" @@ -1955,7 +1953,7 @@ msgstr "" msgid "function expected at most %d arguments, got %d" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "" @@ -1977,7 +1975,7 @@ msgstr "" msgid "function missing required positional argument #%d" msgstr "" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "" @@ -2027,8 +2025,8 @@ msgid "incorrect padding" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "" @@ -2149,7 +2147,7 @@ msgstr "" msgid "keywords must be strings" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "" @@ -2189,7 +2187,7 @@ msgstr "" msgid "map buffer too small" msgstr "" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "" @@ -2264,11 +2262,11 @@ msgstr "" msgid "need more than %d values to unpack" msgstr "" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "" @@ -2288,7 +2286,7 @@ msgstr "" msgid "no module named '%q'" msgstr "" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "" @@ -2375,12 +2373,12 @@ msgstr "" msgid "odd-length string" msgstr "" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c msgid "offset out of bounds" msgstr "" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "" @@ -2397,7 +2395,7 @@ msgstr "" msgid "overflow converting long int to machine word" msgstr "" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "" @@ -2434,8 +2432,8 @@ msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -2542,7 +2540,7 @@ msgstr "" msgid "slice step cannot be zero" msgstr "" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "" @@ -2704,7 +2702,7 @@ msgstr "" msgid "unexpected keyword argument" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "" diff --git a/locale/en_x_pirate.po b/locale/en_x_pirate.po index 97683883dc..41216e2353 100644 --- a/locale/en_x_pirate.po +++ b/locale/en_x_pirate.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: \n" "Language-Team: @sommersoft, @MrCertainly\n" @@ -54,8 +54,8 @@ msgstr "" msgid "%q indices must be integers, not %s" msgstr "" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c msgid "%q must be >= 1" msgstr "" @@ -63,7 +63,7 @@ msgstr "" msgid "%q should be an int" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "" @@ -71,12 +71,12 @@ msgstr "" msgid "'%q' argument required" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "" @@ -96,7 +96,7 @@ msgstr "" msgid "'%s' expects an address of the form [a, b]" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "" @@ -249,7 +249,7 @@ msgstr "" msgid "All event channels in use" msgstr "" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "" @@ -257,9 +257,9 @@ msgstr "" msgid "All timers for this pin are in use" msgstr "" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -555,9 +555,8 @@ msgstr "" msgid "Error in regex" msgstr "" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "" @@ -565,8 +564,8 @@ msgstr "" msgid "Expected a Characteristic" msgstr "" -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c msgid "Expected a UUID" msgstr "" @@ -603,8 +602,8 @@ msgid "Failed to allocate RX buffer" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "" @@ -644,7 +643,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" +msgid "Failed to notify or indicate attribute value, err x0%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -654,7 +653,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err %0x04x" +msgid "Failed to read attribute value, err x0%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -741,7 +740,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "" @@ -758,7 +757,7 @@ msgstr "" msgid "Group full" msgstr "" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "" @@ -852,11 +851,10 @@ msgstr "Belay that! Invalid pin for port-side channel" msgid "Invalid pin for right channel" msgstr "Belay that! Invalid pin for starboard-side channel" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "" @@ -1180,8 +1178,8 @@ msgstr "" msgid "Slice and value different lengths." msgstr "" -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "" @@ -1426,7 +1424,7 @@ msgstr "" msgid "abort() called" msgstr "" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "" @@ -1455,7 +1453,7 @@ msgstr "" msgid "argument should be a '%q' not a '%q'" msgstr "" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "" @@ -1524,8 +1522,8 @@ msgstr "" msgid "buffer too long" msgstr "" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "" @@ -1783,7 +1781,7 @@ msgstr "" msgid "complex division by zero" msgstr "" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "" @@ -1824,8 +1822,8 @@ msgstr "" msgid "dict update sequence has wrong length" msgstr "" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "" @@ -1837,7 +1835,7 @@ msgstr "" msgid "empty" msgstr "" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "" @@ -1910,7 +1908,7 @@ msgstr "" msgid "ffi_prep_closure_loc" msgstr "" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "" @@ -1959,7 +1957,7 @@ msgstr "" msgid "function expected at most %d arguments, got %d" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "" @@ -1981,7 +1979,7 @@ msgstr "" msgid "function missing required positional argument #%d" msgstr "" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "" @@ -2031,8 +2029,8 @@ msgid "incorrect padding" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "" @@ -2153,7 +2151,7 @@ msgstr "" msgid "keywords must be strings" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "" @@ -2193,7 +2191,7 @@ msgstr "" msgid "map buffer too small" msgstr "" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "" @@ -2268,11 +2266,11 @@ msgstr "" msgid "need more than %d values to unpack" msgstr "" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "" @@ -2292,7 +2290,7 @@ msgstr "" msgid "no module named '%q'" msgstr "" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "" @@ -2379,12 +2377,12 @@ msgstr "" msgid "odd-length string" msgstr "" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c msgid "offset out of bounds" msgstr "" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "" @@ -2401,7 +2399,7 @@ msgstr "" msgid "overflow converting long int to machine word" msgstr "" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "" @@ -2438,8 +2436,8 @@ msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -2546,7 +2544,7 @@ msgstr "" msgid "slice step cannot be zero" msgstr "" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "" @@ -2708,7 +2706,7 @@ msgstr "" msgid "unexpected keyword argument" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "" diff --git a/locale/es.po b/locale/es.po index 8ee9eda359..11853cbcdc 100644 --- a/locale/es.po +++ b/locale/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: 2018-08-24 22:56-0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -53,8 +53,8 @@ msgstr "%w indice fuera de rango" msgid "%q indices must be integers, not %s" msgstr "%q indices deben ser enteros, no %s" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c #, fuzzy msgid "%q must be >= 1" msgstr "los buffers deben de tener la misma longitud" @@ -64,7 +64,7 @@ msgstr "los buffers deben de tener la misma longitud" msgid "%q should be an int" msgstr "y deberia ser un int" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "%q() toma %d argumentos posicionales pero %d fueron dados" @@ -72,12 +72,12 @@ msgstr "%q() toma %d argumentos posicionales pero %d fueron dados" msgid "'%q' argument required" msgstr "argumento '%q' requerido" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "'%s' espera una etiqueta" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "'%s' espera un registro" @@ -97,7 +97,7 @@ msgstr "'%s' espera un registro de FPU" msgid "'%s' expects an address of the form [a, b]" msgstr "'%s' espera una dirección de forma [a, b]" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "'%s' espera un entero" @@ -252,7 +252,7 @@ msgstr "Todos los timers están siendo usados" msgid "All event channels in use" msgstr "Todos los canales de eventos en uso" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "" "Todos los canales de eventos de sincronización(sync event channels) están " @@ -262,9 +262,9 @@ msgstr "" msgid "All timers for this pin are in use" msgstr "Todos los timers para este pin están siendo utilizados" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -566,9 +566,8 @@ msgstr "Error en ffi_prep_cif" msgid "Error in regex" msgstr "Error en regex" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "Se espera un %q" @@ -577,8 +576,8 @@ msgstr "Se espera un %q" msgid "Expected a Characteristic" msgstr "No se puede agregar la Característica." -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c #, fuzzy msgid "Expected a UUID" msgstr "Se espera un %q" @@ -618,8 +617,8 @@ msgid "Failed to allocate RX buffer" msgstr "Ha fallado la asignación del buffer RX" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "Falló la asignación del buffer RX de %d bytes" @@ -665,9 +664,9 @@ msgid "Failed to get softdevice state" msgstr "No se puede obtener el estado del softdevice, error: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" -msgstr "No se puede notificar el valor del anuncio. status: 0x%02x" +#, c-format +msgid "Failed to notify or indicate attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -675,9 +674,9 @@ msgid "Failed to read CCCD value, err 0x%04x" msgstr "No se puede leer el valor del atributo. status 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to read attribute value, err %0x04x" -msgstr "No se puede leer el valor del atributo. status 0x%02x" +#, c-format +msgid "Failed to read attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -767,7 +766,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "La función requiere lock" @@ -784,7 +783,7 @@ msgstr "GPIO16 no soporta pull up." msgid "Group full" msgstr "Group lleno" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Operación I/O en archivo cerrado" @@ -880,11 +879,10 @@ msgstr "Pin inválido para canal izquierdo" msgid "Invalid pin for right channel" msgstr "Pin inválido para canal derecho" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "pines inválidos" @@ -1221,8 +1219,8 @@ msgstr "Serializer está siendo utilizado" msgid "Slice and value different lengths." msgstr "" -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "" @@ -1484,7 +1482,7 @@ msgstr "se requiere un objeto bytes-like" msgid "abort() called" msgstr "se llamó abort()" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "la dirección %08x no esta alineada a %d bytes" @@ -1513,7 +1511,7 @@ msgstr "argumento número/tipos no coinciden" msgid "argument should be a '%q' not a '%q'" msgstr "argumento deberia ser un '%q' no un '%q'" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "array/bytes requeridos en el lado derecho" @@ -1583,8 +1581,8 @@ msgstr "" msgid "buffer too long" msgstr "buffer demasiado largo" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "buffer demasiado pequeño" @@ -1847,7 +1845,7 @@ msgstr "color deberia ser un int" msgid "complex division by zero" msgstr "división compleja por cero" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "valores complejos no soportados" @@ -1890,8 +1888,8 @@ msgstr "destination_length debe ser un int >= 0" msgid "dict update sequence has wrong length" msgstr "la secuencia de actualizacion del dict tiene una longitud incorrecta" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "división por cero" @@ -1903,7 +1901,7 @@ msgstr "ya sea pos o kw args son permitidos" msgid "empty" msgstr "vacío" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "heap vacío" @@ -1977,7 +1975,7 @@ msgstr "argumento posicional adicional dado" msgid "ffi_prep_closure_loc" msgstr "ffi_prep_closure_loc" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "el archivo deberia ser una archivo abierto en modo byte" @@ -2026,7 +2024,7 @@ msgstr "la función no tiene argumentos por palabra clave" msgid "function expected at most %d arguments, got %d" msgstr "la función esperaba minimo %d argumentos, tiene %d" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "la función tiene múltiples valores para el argumento '%q'" @@ -2048,7 +2046,7 @@ msgstr "la función requiere del argumento por palabra clave '%q'" msgid "function missing required positional argument #%d" msgstr "la función requiere del argumento posicional #%d" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "la función toma %d argumentos posicionales pero le fueron dados %d" @@ -2098,8 +2096,8 @@ msgid "incorrect padding" msgstr "relleno (padding) incorrecto" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "index fuera de rango" @@ -2223,7 +2221,7 @@ msgstr "" msgid "keywords must be strings" msgstr "palabras clave deben ser strings" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "etiqueta '%q' no definida" @@ -2263,7 +2261,7 @@ msgstr "long int no soportado en esta compilación" msgid "map buffer too small" msgstr "map buffer muy pequeño" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "error de dominio matemático" @@ -2339,11 +2337,11 @@ msgstr "" msgid "need more than %d values to unpack" msgstr "necesita más de %d valores para descomprimir" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "potencia negativa sin float support" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "cuenta negativa de turnos" @@ -2363,7 +2361,7 @@ msgstr "no se ha encontrado ningún enlace para nonlocal" msgid "no module named '%q'" msgstr "ningún módulo se llama '%q'" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "no hay tal atributo" @@ -2453,13 +2451,13 @@ msgstr "objeto con protocolo de buffer requerido" msgid "odd-length string" msgstr "string de longitud impar" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c #, fuzzy msgid "offset out of bounds" msgstr "address fuera de límites" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "solo se admiten segmentos con step=1 (alias None)" @@ -2476,7 +2474,7 @@ msgstr "ord() espera un carácter, pero encontró un string de longitud %d" msgid "overflow converting long int to machine word" msgstr "desbordamiento convirtiendo long int a palabra de máquina" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "palette debe ser 32 bytes de largo" @@ -2514,8 +2512,8 @@ msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgstr "pixel_shader debe ser displayio.Palette o displayio.ColorConverter" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop de un PulseIn vacío" @@ -2625,7 +2623,7 @@ msgstr "la longitud de sleep no puede ser negativa" msgid "slice step cannot be zero" msgstr "slice step no puede ser cero" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "pequeño int desbordamiento" @@ -2789,7 +2787,7 @@ msgstr "sangría inesperada" msgid "unexpected keyword argument" msgstr "argumento por palabra clave inesperado" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "argumento por palabra clave inesperado '%q'" @@ -2910,6 +2908,14 @@ msgstr "address fuera de límites" msgid "zero step" msgstr "paso cero" +#, fuzzy +#~ msgid "Failed to notify or indicate attribute value, err %0x04x" +#~ msgstr "No se puede notificar el valor del anuncio. status: 0x%02x" + +#, fuzzy +#~ msgid "Failed to read attribute value, err %0x04x" +#~ msgstr "No se puede leer el valor del atributo. status 0x%02x" + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Solo formato Windows, BMP sin comprimir soportado %d" diff --git a/locale/fil.po b/locale/fil.po index 2f7ba57bb9..c7cba3c4bd 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: 2018-12-20 22:15-0800\n" "Last-Translator: Timothy \n" "Language-Team: fil\n" @@ -52,8 +52,8 @@ msgstr "%q indeks wala sa sakop" msgid "%q indices must be integers, not %s" msgstr "%q indeks ay dapat integers, hindi %s" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c #, fuzzy msgid "%q must be >= 1" msgstr "aarehas na haba dapat ang buffer slices" @@ -63,7 +63,7 @@ msgstr "aarehas na haba dapat ang buffer slices" msgid "%q should be an int" msgstr "y ay dapat int" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "" "Ang %q() ay kumukuha ng %d positional arguments pero %d lang ang binigay" @@ -72,12 +72,12 @@ msgstr "" msgid "'%q' argument required" msgstr "'%q' argument kailangan" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "'%s' umaasa ng label" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "Inaasahan ng '%s' ang isang rehistro" @@ -97,7 +97,7 @@ msgstr "Inaasahan ng '%s' ang isang FPU register" msgid "'%s' expects an address of the form [a, b]" msgstr "Inaasahan ng '%s' ang isang address sa [a, b]" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "Inaasahan ng '%s' ang isang integer" @@ -251,7 +251,7 @@ msgstr "Lahat ng I2C peripherals ginagamit" msgid "All event channels in use" msgstr "Lahat ng event channels ginagamit" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "Lahat ng sync event channels ay ginagamit" @@ -259,9 +259,9 @@ msgstr "Lahat ng sync event channels ay ginagamit" msgid "All timers for this pin are in use" msgstr "Lahat ng timers para sa pin na ito ay ginagamit" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -564,9 +564,8 @@ msgstr "Pagkakamali sa ffi_prep_cif" msgid "Error in regex" msgstr "May pagkakamali sa REGEX" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "Umasa ng %q" @@ -575,8 +574,8 @@ msgstr "Umasa ng %q" msgid "Expected a Characteristic" msgstr "Hindi mabasa and Characteristic." -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c #, fuzzy msgid "Expected a UUID" msgstr "Umasa ng %q" @@ -616,8 +615,8 @@ msgid "Failed to allocate RX buffer" msgstr "Nabigong ilaan ang RX buffer" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "Nabigong ilaan ang RX buffer ng %d bytes" @@ -663,9 +662,9 @@ msgid "Failed to get softdevice state" msgstr "Nabigo sa pagkuha ng softdevice state, error: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" -msgstr "Hindi mabalitaan ang attribute value, status: 0x%08lX" +#, c-format +msgid "Failed to notify or indicate attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -673,9 +672,9 @@ msgid "Failed to read CCCD value, err 0x%04x" msgstr "Hindi mabasa ang value ng attribute, status: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to read attribute value, err %0x04x" -msgstr "Hindi mabasa ang value ng attribute, status: 0x%08lX" +#, c-format +msgid "Failed to read attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -765,7 +764,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "Function nangangailangan ng lock" @@ -782,7 +781,7 @@ msgstr "Walang pull down support ang GPI016." msgid "Group full" msgstr "Puno ang group" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "I/O operasyon sa saradong file" @@ -878,11 +877,10 @@ msgstr "Mali ang pin para sa kaliwang channel" msgid "Invalid pin for right channel" msgstr "Mali ang pin para sa kanang channel" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "Mali ang pins" @@ -1220,8 +1218,8 @@ msgstr "Serializer ginagamit" msgid "Slice and value different lengths." msgstr "Slice at value iba't ibang haba." -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "Hindi suportado ang Slices" @@ -1487,7 +1485,7 @@ msgstr "a bytes-like object ay kailangan" msgid "abort() called" msgstr "abort() tinawag" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "address %08x ay hindi pantay sa %d bytes" @@ -1516,7 +1514,7 @@ msgstr "hindi tugma ang argument num/types" msgid "argument should be a '%q' not a '%q'" msgstr "argument ay dapat na '%q' hindi '%q'" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "array/bytes kinakailangan sa kanang bahagi" @@ -1586,8 +1584,8 @@ msgstr "aarehas na haba dapat ang buffer slices" msgid "buffer too long" msgstr "masyadong mahaba ng buffer" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "masyadong maliit ang buffer" @@ -1851,7 +1849,7 @@ msgstr "color ay dapat na int" msgid "complex division by zero" msgstr "kumplikadong dibisyon sa pamamagitan ng zero" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "kumplikadong values hindi sinusuportahan" @@ -1896,8 +1894,8 @@ msgstr "ang destination_length ay dapat na isang int >= 0" msgid "dict update sequence has wrong length" msgstr "may mali sa haba ng dict update sequence" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "dibisyon ng zero" @@ -1909,7 +1907,7 @@ msgstr "pos o kw args ang pinahihintulutan" msgid "empty" msgstr "walang laman" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "walang laman ang heap" @@ -1983,7 +1981,7 @@ msgstr "dagdag na positional argument na ibinigay" msgid "ffi_prep_closure_loc" msgstr "ffi_prep_closure_loc" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "file ay dapat buksan sa byte mode" @@ -2032,7 +2030,7 @@ msgstr "ang function ay hindi kumukuha ng mga argumento ng keyword" msgid "function expected at most %d arguments, got %d" msgstr "function na inaasahang %d ang argumento, ngunit %d ang nakuha" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "ang function ay nakakuha ng maraming values para sa argument '%q'" @@ -2054,7 +2052,7 @@ msgstr "function nangangailangan ng keyword argument '%q'" msgid "function missing required positional argument #%d" msgstr "function nangangailangan ng positional argument #%d" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "" @@ -2105,8 +2103,8 @@ msgid "incorrect padding" msgstr "mali ang padding" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "index wala sa sakop" @@ -2231,7 +2229,7 @@ msgstr "" msgid "keywords must be strings" msgstr "ang keywords dapat strings" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "label '%d' kailangan na i-define" @@ -2271,7 +2269,7 @@ msgstr "long int hindi sinusuportahan sa build na ito" msgid "map buffer too small" msgstr "masyadong maliit ang buffer map" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "may pagkakamali sa math domain" @@ -2348,11 +2346,11 @@ msgstr "native yield" msgid "need more than %d values to unpack" msgstr "kailangan ng higit sa %d na halaga upang i-unpack" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "negatibong power na walang float support" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "negative shift count" @@ -2372,7 +2370,7 @@ msgstr "no binding para sa nonlocal, nahanap" msgid "no module named '%q'" msgstr "walang module na '%q'" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "walang ganoon na attribute" @@ -2459,13 +2457,13 @@ msgstr "object na may buffer protocol kinakailangan" msgid "odd-length string" msgstr "odd-length string" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c #, fuzzy msgid "offset out of bounds" msgstr "wala sa sakop ang address" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "ang mga slices lamang na may hakbang = 1 (aka None) ang sinusuportahan" @@ -2482,7 +2480,7 @@ msgstr "ord() umaasa ng character pero string ng %d haba ang nakita" msgid "overflow converting long int to machine word" msgstr "overflow nagcoconvert ng long int sa machine word" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "ang palette ay dapat 32 bytes ang haba" @@ -2520,8 +2518,8 @@ msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgstr "pixel_shader ay dapat displayio.Palette o displayio.ColorConverter" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop mula sa walang laman na PulseIn" @@ -2631,7 +2629,7 @@ msgstr "sleep length ay dapat hindi negatibo" msgid "slice step cannot be zero" msgstr "slice step ay hindi puedeng 0" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "small int overflow" @@ -2795,7 +2793,7 @@ msgstr "hindi inaasahang indent" msgid "unexpected keyword argument" msgstr "hindi inaasahang argumento ng keyword" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "hindi inaasahang argumento ng keyword na '%q'" @@ -2916,6 +2914,14 @@ msgstr "wala sa sakop ang address" msgid "zero step" msgstr "zero step" +#, fuzzy +#~ msgid "Failed to notify or indicate attribute value, err %0x04x" +#~ msgstr "Hindi mabalitaan ang attribute value, status: 0x%08lX" + +#, fuzzy +#~ msgid "Failed to read attribute value, err %0x04x" +#~ msgstr "Hindi mabasa ang value ng attribute, status: 0x%08lX" + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Tanging Windows format, uncompressed BMP lamang ang supportado %d" diff --git a/locale/fr.po b/locale/fr.po index fd8f78027b..6bde8ee34b 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: 2018-12-23 20:05+0100\n" "Last-Translator: Pierrick Couturier \n" "Language-Team: fr\n" @@ -51,8 +51,8 @@ msgstr "index %q hors gamme" msgid "%q indices must be integers, not %s" msgstr "les indices %q doivent être des entiers, pas %s" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c #, fuzzy msgid "%q must be >= 1" msgstr "les slices de tampon doivent être de longueurs égales" @@ -62,7 +62,7 @@ msgstr "les slices de tampon doivent être de longueurs égales" msgid "%q should be an int" msgstr "y doit être un entier (int)" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "%q() prend %d arguments mais %d ont été donnés" @@ -70,12 +70,12 @@ msgstr "%q() prend %d arguments mais %d ont été donnés" msgid "'%q' argument required" msgstr "'%q' argument requis" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "'%s' attend un label" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "'%s' attend un registre" @@ -95,7 +95,7 @@ msgstr "'%s' attend un registre FPU" msgid "'%s' expects an address of the form [a, b]" msgstr "'%s' attend une adresse de la forme [a, b]" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "'%s' attend un entier" @@ -251,7 +251,7 @@ msgstr "Tous les périphériques I2C sont utilisés" msgid "All event channels in use" msgstr "Tous les canaux d'événements sont utilisés" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "Tous les canaux d'événements de synchro sont utilisés" @@ -259,9 +259,9 @@ msgstr "Tous les canaux d'événements de synchro sont utilisés" msgid "All timers for this pin are in use" msgstr "Tous les timers pour cette broche sont utilisés" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -563,9 +563,8 @@ msgstr "Erreur dans ffi_prep_cif" msgid "Error in regex" msgstr "Erreur dans l'expression régulière" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "Attendu : %q" @@ -574,8 +573,8 @@ msgstr "Attendu : %q" msgid "Expected a Characteristic" msgstr "Impossible d'ajouter la Characteristic." -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c #, fuzzy msgid "Expected a UUID" msgstr "Attendu : %q" @@ -615,8 +614,8 @@ msgid "Failed to allocate RX buffer" msgstr "Echec de l'allocation du tampon RX" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "Echec de l'allocation de %d octets du tampon RX" @@ -662,9 +661,9 @@ msgid "Failed to get softdevice state" msgstr "Echec de l'obtention de l'état du périph., erreur: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" -msgstr "Impossible de notifier la valeur de l'attribut. status: 0x%08lX" +#, c-format +msgid "Failed to notify or indicate attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -672,9 +671,9 @@ msgid "Failed to read CCCD value, err 0x%04x" msgstr "Impossible de lire la valeur de l'attribut. status: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to read attribute value, err %0x04x" -msgstr "Impossible de lire la valeur de l'attribut. status: 0x%08lX" +#, c-format +msgid "Failed to read attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -764,7 +763,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "La fonction nécessite un verrou" @@ -781,7 +780,7 @@ msgstr "le GPIO16 ne supporte pas le tirage (pull-up)" msgid "Group full" msgstr "Groupe plein" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "opération d'E/S sur un fichier fermé" @@ -880,11 +879,10 @@ msgstr "Broche invalide pour le canal gauche" msgid "Invalid pin for right channel" msgstr "Broche invalide pour le canal droit" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "Broches invalides" @@ -1228,8 +1226,8 @@ msgstr "Sérialiseur en cours d'utilisation" msgid "Slice and value different lengths." msgstr "Slice et valeur de tailles différentes" -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "Slices non supportées" @@ -1497,7 +1495,7 @@ msgstr "un objet 'bytes-like' est requis" msgid "abort() called" msgstr "abort() appelé" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "l'adresse %08x n'est pas alignée sur %d octets" @@ -1526,7 +1524,7 @@ msgstr "argument num/types ne correspond pas" msgid "argument should be a '%q' not a '%q'" msgstr "l'argument devrait être un(e) '%q', pas '%q'" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "tableau/octets requis à droite" @@ -1598,8 +1596,8 @@ msgstr "les slices de tampon doivent être de longueurs égales" msgid "buffer too long" msgstr "tampon trop long" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "tampon trop petit" @@ -1870,7 +1868,7 @@ msgstr "la couleur doit être un entier (int)" msgid "complex division by zero" msgstr "division complexe par zéro" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "valeurs complexes non supportées" @@ -1913,8 +1911,8 @@ msgstr "destination_length doit être un entier >= 0" msgid "dict update sequence has wrong length" msgstr "la séquence de mise à jour de dict a une mauvaise longueur" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "division par zéro" @@ -1926,7 +1924,7 @@ msgstr "soit 'pos', soit 'kw' est permis en argument" msgid "empty" msgstr "vide" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "'heap' vide" @@ -2000,7 +1998,7 @@ msgstr "argument positionnel donné en plus" msgid "ffi_prep_closure_loc" msgstr "" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "le fichier doit être un fichier ouvert en mode 'byte'" @@ -2049,7 +2047,7 @@ msgstr "la fonction ne prend pas d'arguments nommés" msgid "function expected at most %d arguments, got %d" msgstr "la fonction attendait au plus %d arguments, reçu %d" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "la fonction a reçu plusieurs valeurs pour l'argument '%q'" @@ -2071,7 +2069,7 @@ msgstr "il manque l'argument nommé obligatoire '%q'" msgid "function missing required positional argument #%d" msgstr "il manque l'argument obligatoire #%d" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "la fonction prend %d argument(s) mais %d ont été donné(s)" @@ -2121,8 +2119,8 @@ msgid "incorrect padding" msgstr "espacement incorrect" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "index hors gamme" @@ -2245,7 +2243,7 @@ msgstr "" msgid "keywords must be strings" msgstr "les noms doivent être des chaînes de caractère" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "label '%q' non supporté" @@ -2285,7 +2283,7 @@ msgstr "entiers longs non supportés dans cette build" msgid "map buffer too small" msgstr "tampon trop petit" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "erreur de domaine math" @@ -2362,11 +2360,11 @@ msgstr "" msgid "need more than %d values to unpack" msgstr "nécessite plus de %d valeur à dégrouper" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "puissance négative sans support des nombres flottants" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "compte de décalage négatif" @@ -2387,7 +2385,7 @@ msgstr "pas de lien trouvé pour nonlocal" msgid "no module named '%q'" msgstr "pas de module '%q'" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "pas de tel attribut" @@ -2476,13 +2474,13 @@ msgstr "un objet avec un protocol de tampon est nécessaire" msgid "odd-length string" msgstr "chaîne de longueur impaire" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c #, fuzzy msgid "offset out of bounds" msgstr "adresse hors limites" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "seuls les slices avec 'step=1' (cad None) sont supportées" @@ -2499,7 +2497,7 @@ msgstr "ord() attend un caractère mais une chaîne de longueur %d a été trouv msgid "overflow converting long int to machine word" msgstr "dépassement de capacité en convertissant un entier long en mot machine" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "la palette doit être longue de 32 octets" @@ -2540,8 +2538,8 @@ msgstr "" "pixel_shader doit être un objet displayio.Palette ou displayio.ColorConverter" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "'pop' d'une entrée PulseIn vide" @@ -2651,7 +2649,7 @@ msgstr "la longueur de sleep ne doit pas être négative" msgid "slice step cannot be zero" msgstr "le pas 'step' de slice ne peut être zéro" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "dépassement de capacité d'un entier court" @@ -2816,7 +2814,7 @@ msgstr "indentation inattendue" msgid "unexpected keyword argument" msgstr "argument nommé imprévu" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "argument nommé '%q' imprévu" @@ -2939,6 +2937,14 @@ msgstr "adresse hors limites" msgid "zero step" msgstr "'step' nul" +#, fuzzy +#~ msgid "Failed to notify or indicate attribute value, err %0x04x" +#~ msgstr "Impossible de notifier la valeur de l'attribut. status: 0x%08lX" + +#, fuzzy +#~ msgid "Failed to read attribute value, err %0x04x" +#~ msgstr "Impossible de lire la valeur de l'attribut. status: 0x%08lX" + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Seul les BMP non-compressé au format Windows sont supportés %d" diff --git a/locale/it_IT.po b/locale/it_IT.po index 5d69dd2de6..f40c861a25 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: 2018-10-02 16:27+0200\n" "Last-Translator: Enrico Paganin \n" "Language-Team: \n" @@ -52,8 +52,8 @@ msgstr "indice %q fuori intervallo" msgid "%q indices must be integers, not %s" msgstr "gli indici %q devono essere interi, non %s" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c #, fuzzy msgid "%q must be >= 1" msgstr "slice del buffer devono essere della stessa lunghezza" @@ -63,7 +63,7 @@ msgstr "slice del buffer devono essere della stessa lunghezza" msgid "%q should be an int" msgstr "y dovrebbe essere un int" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "%q() prende %d argomenti posizionali ma ne sono stati forniti %d" @@ -71,12 +71,12 @@ msgstr "%q() prende %d argomenti posizionali ma ne sono stati forniti %d" msgid "'%q' argument required" msgstr "'%q' argomento richiesto" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "'%s' aspetta una etichetta" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "'%s' aspetta un registro" @@ -96,7 +96,7 @@ msgstr "'%s' aspetta un registro" msgid "'%s' expects an address of the form [a, b]" msgstr "'%s' aspetta un registro" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "'%s' aspetta un intero" @@ -250,7 +250,7 @@ msgstr "Tutte le periferiche I2C sono in uso" msgid "All event channels in use" msgstr "Tutti i canali eventi utilizati" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "Tutti i canali di eventi sincronizzati in uso" @@ -258,9 +258,9 @@ msgstr "Tutti i canali di eventi sincronizzati in uso" msgid "All timers for this pin are in use" msgstr "Tutti i timer per questo pin sono in uso" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -564,9 +564,8 @@ msgstr "Errore in ffi_prep_cif" msgid "Error in regex" msgstr "Errore nella regex" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "Atteso un %q" @@ -575,8 +574,8 @@ msgstr "Atteso un %q" msgid "Expected a Characteristic" msgstr "Non è possibile aggiungere Characteristic." -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c #, fuzzy msgid "Expected a UUID" msgstr "Atteso un %q" @@ -616,8 +615,8 @@ msgid "Failed to allocate RX buffer" msgstr "Impossibile allocare buffer RX" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "Fallita allocazione del buffer RX di %d byte" @@ -662,9 +661,9 @@ msgid "Failed to get softdevice state" msgstr "Impossibile fermare advertisement. status: 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" -msgstr "Impossibile notificare valore dell'attributo. status: 0x%02x" +#, c-format +msgid "Failed to notify or indicate attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -672,9 +671,9 @@ msgid "Failed to read CCCD value, err 0x%04x" msgstr "Impossibile leggere valore dell'attributo. status: 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to read attribute value, err %0x04x" -msgstr "Impossibile leggere valore dell'attributo. status: 0x%02x" +#, c-format +msgid "Failed to read attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -764,7 +763,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "" @@ -781,7 +780,7 @@ msgstr "GPIO16 non supporta pull-up" msgid "Group full" msgstr "Gruppo pieno" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "operazione I/O su file chiuso" @@ -879,11 +878,10 @@ msgstr "Pin non valido per il canale sinistro" msgid "Invalid pin for right channel" msgstr "Pin non valido per il canale destro" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "Pin non validi" @@ -1225,8 +1223,8 @@ msgstr "Serializer in uso" msgid "Slice and value different lengths." msgstr "" -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "Slice non supportate" @@ -1479,7 +1477,7 @@ msgstr "un oggetto byte-like è richiesto" msgid "abort() called" msgstr "abort() chiamato" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "l'indirizzo %08x non è allineato a %d bytes" @@ -1508,7 +1506,7 @@ msgstr "discrepanza di numero/tipo di argomenti" msgid "argument should be a '%q' not a '%q'" msgstr "l'argomento dovrebbe essere un '%q' e non un '%q'" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "" @@ -1580,8 +1578,8 @@ msgstr "slice del buffer devono essere della stessa lunghezza" msgid "buffer too long" msgstr "buffer troppo lungo" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "buffer troppo piccolo" @@ -1842,7 +1840,7 @@ msgstr "il colore deve essere un int" msgid "complex division by zero" msgstr "complex divisione per zero" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "valori complessi non supportai" @@ -1886,8 +1884,8 @@ msgstr "destination_length deve essere un int >= 0" msgid "dict update sequence has wrong length" msgstr "sequanza di aggiornamento del dizionario ha la lunghezza errata" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "divisione per zero" @@ -1899,7 +1897,7 @@ msgstr "sono permesse solo gli argomenti pos o kw" msgid "empty" msgstr "vuoto" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "heap vuoto" @@ -1973,7 +1971,7 @@ msgstr "argomenti posizonali extra dati" msgid "ffi_prep_closure_loc" msgstr "ffi_prep_closure_loc" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "" @@ -2022,7 +2020,7 @@ msgstr "la funzione non prende argomenti nominati" msgid "function expected at most %d arguments, got %d" msgstr "la funzione prevede al massimo %d argmoneti, ma ne ha ricevuti %d" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "la funzione ha ricevuto valori multipli per l'argomento '%q'" @@ -2044,7 +2042,7 @@ msgstr "argomento nominato '%q' mancante alla funzione" msgid "function missing required positional argument #%d" msgstr "mancante il #%d argomento posizonale obbligatorio della funzione" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "" @@ -2095,8 +2093,8 @@ msgid "incorrect padding" msgstr "padding incorretto" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "indice fuori intervallo" @@ -2222,7 +2220,7 @@ msgstr "" msgid "keywords must be strings" msgstr "argomenti nominati devono essere stringhe" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "etichetta '%q' non definita" @@ -2262,7 +2260,7 @@ msgstr "long int non supportata in questa build" msgid "map buffer too small" msgstr "map buffer troppo piccolo" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "errore di dominio matematico" @@ -2339,11 +2337,11 @@ msgstr "yield nativo" msgid "need more than %d values to unpack" msgstr "necessari più di %d valori da scompattare" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "potenza negativa senza supporto per float" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "" @@ -2364,7 +2362,7 @@ msgstr "nessun binding per nonlocal trovato" msgid "no module named '%q'" msgstr "nessun modulo chiamato '%q'" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "attributo inesistente" @@ -2453,13 +2451,13 @@ msgstr "" msgid "odd-length string" msgstr "stringa di lunghezza dispari" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c #, fuzzy msgid "offset out of bounds" msgstr "indirizzo fuori limite" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "solo slice con step=1 (aka None) sono supportate" @@ -2477,7 +2475,7 @@ msgstr "" msgid "overflow converting long int to machine word" msgstr "overflow convertendo long int in parola" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "la palette deve essere lunga 32 byte" @@ -2516,8 +2514,8 @@ msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgstr "pixel_shader deve essere displayio.Palette o displayio.ColorConverter" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "pop sun un PulseIn vuoto" @@ -2627,7 +2625,7 @@ msgstr "la lunghezza di sleed deve essere non negativa" msgid "slice step cannot be zero" msgstr "la step della slice non può essere zero" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "small int overflow" @@ -2791,7 +2789,7 @@ msgstr "indentazione inaspettata" msgid "unexpected keyword argument" msgstr "argomento nominato inaspettato" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "argomento nominato '%q' inaspettato" @@ -2912,6 +2910,14 @@ msgstr "indirizzo fuori limite" msgid "zero step" msgstr "zero step" +#, fuzzy +#~ msgid "Failed to notify or indicate attribute value, err %0x04x" +#~ msgstr "Impossibile notificare valore dell'attributo. status: 0x%02x" + +#, fuzzy +#~ msgid "Failed to read attribute value, err %0x04x" +#~ msgstr "Impossibile leggere valore dell'attributo. status: 0x%02x" + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Formato solo di Windows, BMP non compresso supportato %d" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 42acd28d97..918b172dd8 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-19 18:37-0700\n" +"POT-Creation-Date: 2019-03-25 09:19+0100\n" "PO-Revision-Date: 2018-10-02 21:14-0000\n" "Last-Translator: \n" "Language-Team: \n" @@ -52,8 +52,8 @@ msgstr "" msgid "%q indices must be integers, not %s" msgstr "" -#: shared-bindings/bleio/CharacteristicBuffer.c #: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c +#: shared-bindings/bleio/CharacteristicBuffer.c #, fuzzy msgid "%q must be >= 1" msgstr "buffers devem ser o mesmo tamanho" @@ -63,7 +63,7 @@ msgstr "buffers devem ser o mesmo tamanho" msgid "%q should be an int" msgstr "y deve ser um int" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "%q() takes %d positional arguments but %d were given" msgstr "" @@ -71,12 +71,12 @@ msgstr "" msgid "'%q' argument required" msgstr "'%q' argumento(s) requerido(s)" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a label" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects a register" msgstr "" @@ -96,7 +96,7 @@ msgstr "" msgid "'%s' expects an address of the form [a, b]" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c #, c-format msgid "'%s' expects an integer" msgstr "" @@ -250,7 +250,7 @@ msgstr "Todos os periféricos I2C estão em uso" msgid "All event channels in use" msgstr "Todos os canais de eventos em uso" -#: ports/atmel-samd/audio_dma.c ports/atmel-samd/common-hal/audiobusio/PDMIn.c +#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c ports/atmel-samd/audio_dma.c msgid "All sync event channels in use" msgstr "" @@ -258,9 +258,9 @@ msgstr "" msgid "All timers for this pin are in use" msgstr "Todos os temporizadores para este pino estão em uso" -#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c #: ports/atmel-samd/common-hal/pulseio/PulseOut.c +#: ports/atmel-samd/common-hal/audioio/AudioOut.c #: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c #: shared-module/_pew/PewPew.c msgid "All timers in use" @@ -559,9 +559,8 @@ msgstr "Erro no ffi_prep_cif" msgid "Error in regex" msgstr "Erro no regex" -#: shared-bindings/microcontroller/Pin.c -#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c -#: shared-bindings/terminalio/Terminal.c +#: shared-bindings/pulseio/PulseOut.c shared-bindings/neopixel_write/__init__.c +#: shared-bindings/terminalio/Terminal.c shared-bindings/microcontroller/Pin.c msgid "Expected a %q" msgstr "Esperado um" @@ -570,8 +569,8 @@ msgstr "Esperado um" msgid "Expected a Characteristic" msgstr "Não é possível adicionar Característica." -#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c -#: shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Descriptor.c shared-bindings/bleio/Service.c +#: shared-bindings/bleio/Characteristic.c #, fuzzy msgid "Expected a UUID" msgstr "Esperado um" @@ -611,8 +610,8 @@ msgid "Failed to allocate RX buffer" msgstr "Falha ao alocar buffer RX" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c #, c-format msgid "Failed to allocate RX buffer of %d bytes" msgstr "Falha ao alocar buffer RX de %d bytes" @@ -655,9 +654,9 @@ msgid "Failed to get softdevice state" msgstr "Não pode parar propaganda. status: 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to notify or indicate attribute value, err %0x04x" -msgstr "Não é possível gravar o valor do atributo. status: 0x%02x" +#, c-format +msgid "Failed to notify or indicate attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -665,9 +664,9 @@ msgid "Failed to read CCCD value, err 0x%04x" msgstr "Não é possível ler o valor do atributo. status: 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c -#, fuzzy, c-format -msgid "Failed to read attribute value, err %0x04x" -msgstr "Não é possível ler o valor do atributo. status: 0x%02x" +#, c-format +msgid "Failed to read attribute value, err x0%04x" +msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, fuzzy, c-format @@ -757,7 +756,7 @@ msgstr "" msgid "Frequency captured is above capability. Capture Paused." msgstr "" -#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c +#: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c #: shared-bindings/busio/SPI.c msgid "Function requires lock" msgstr "" @@ -774,7 +773,7 @@ msgstr "GPIO16 não suporta pull up." msgid "Group full" msgstr "Grupo cheio" -#: extmod/vfs_posix_file.c ports/unix/file.c py/objstringio.c +#: ports/unix/file.c extmod/vfs_posix_file.c py/objstringio.c msgid "I/O operation on closed file" msgstr "Operação I/O no arquivo fechado" @@ -870,11 +869,10 @@ msgstr "Pino inválido para canal esquerdo" msgid "Invalid pin for right channel" msgstr "Pino inválido para canal direito" -#: ports/atmel-samd/common-hal/busio/I2C.c -#: ports/atmel-samd/common-hal/busio/SPI.c -#: ports/atmel-samd/common-hal/busio/UART.c #: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c -#: ports/nrf/common-hal/busio/I2C.c +#: ports/atmel-samd/common-hal/busio/UART.c +#: ports/atmel-samd/common-hal/busio/SPI.c +#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c msgid "Invalid pins" msgstr "Pinos inválidos" @@ -1204,8 +1202,8 @@ msgstr "Serializer em uso" msgid "Slice and value different lengths." msgstr "" -#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c -#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c +#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c +#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c msgid "Slices not supported" msgstr "" @@ -1451,7 +1449,7 @@ msgstr "" msgid "abort() called" msgstr "abort() chamado" -#: extmod/machine_mem.c ports/unix/modmachine.c +#: ports/unix/modmachine.c extmod/machine_mem.c #, c-format msgid "address %08x is not aligned to %d bytes" msgstr "endereço %08x não está alinhado com %d bytes" @@ -1480,7 +1478,7 @@ msgstr "" msgid "argument should be a '%q' not a '%q'" msgstr "" -#: py/objarray.c shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c msgid "array/bytes required on right side" msgstr "" @@ -1552,8 +1550,8 @@ msgstr "" msgid "buffer too long" msgstr "buffer muito longo" -#: py/modstruct.c shared-bindings/struct/__init__.c -#: shared-module/struct/__init__.c +#: shared-bindings/struct/__init__.c shared-module/struct/__init__.c +#: py/modstruct.c msgid "buffer too small" msgstr "" @@ -1811,7 +1809,7 @@ msgstr "cor deve ser um int" msgid "complex division by zero" msgstr "" -#: py/objfloat.c py/parsenum.c +#: py/parsenum.c py/objfloat.c msgid "complex values not supported" msgstr "" @@ -1852,8 +1850,8 @@ msgstr "destination_length deve ser um int >= 0" msgid "dict update sequence has wrong length" msgstr "" -#: py/modmath.c py/objfloat.c py/objint_longlong.c py/objint_mpz.c py/runtime.c -#: shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/runtime.c py/modmath.c py/objint_mpz.c +#: py/objint_longlong.c py/objfloat.c msgid "division by zero" msgstr "divisão por zero" @@ -1865,7 +1863,7 @@ msgstr "pos ou kw args são permitidos" msgid "empty" msgstr "vazio" -#: extmod/moduheapq.c extmod/modutimeq.c +#: extmod/modutimeq.c extmod/moduheapq.c msgid "empty heap" msgstr "heap vazia" @@ -1939,7 +1937,7 @@ msgstr "argumentos extra posicionais passados" msgid "ffi_prep_closure_loc" msgstr "ffi_prep_closure_loc" -#: shared-bindings/audioio/WaveFile.c shared-bindings/displayio/OnDiskBitmap.c +#: shared-bindings/displayio/OnDiskBitmap.c shared-bindings/audioio/WaveFile.c msgid "file must be a file opened in byte mode" msgstr "" @@ -1988,7 +1986,7 @@ msgstr "função não aceita argumentos de palavras-chave" msgid "function expected at most %d arguments, got %d" msgstr "função esperada na maioria dos %d argumentos, obteve %d" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "function got multiple values for argument '%q'" msgstr "" @@ -2010,7 +2008,7 @@ msgstr "" msgid "function missing required positional argument #%d" msgstr "" -#: py/argcheck.c py/bc.c py/objnamedtuple.c +#: py/argcheck.c py/objnamedtuple.c py/bc.c #, c-format msgid "function takes %d positional arguments but %d were given" msgstr "função leva %d argumentos posicionais, mas apenas %d foram passadas" @@ -2060,8 +2058,8 @@ msgid "incorrect padding" msgstr "preenchimento incorreto" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c -#: ports/nrf/common-hal/pulseio/PulseIn.c py/obj.c +#: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c py/obj.c msgid "index out of range" msgstr "Índice fora do intervalo" @@ -2182,7 +2180,7 @@ msgstr "" msgid "keywords must be strings" msgstr "" -#: py/emitinlinethumb.c py/emitinlinextensa.c +#: py/emitinlinextensa.c py/emitinlinethumb.c msgid "label '%q' not defined" msgstr "" @@ -2222,7 +2220,7 @@ msgstr "" msgid "map buffer too small" msgstr "" -#: py/modmath.c shared-bindings/math/__init__.c +#: shared-bindings/math/__init__.c py/modmath.c msgid "math domain error" msgstr "" @@ -2298,11 +2296,11 @@ msgstr "" msgid "need more than %d values to unpack" msgstr "precisa de mais de %d valores para desempacotar" -#: py/objint_longlong.c py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c py/objint_longlong.c msgid "negative power with no float support" msgstr "" -#: py/objint_mpz.c py/runtime.c +#: py/runtime.c py/objint_mpz.c msgid "negative shift count" msgstr "" @@ -2322,7 +2320,7 @@ msgstr "" msgid "no module named '%q'" msgstr "" -#: py/runtime.c shared-bindings/_pixelbuf/__init__.c +#: shared-bindings/_pixelbuf/__init__.c py/runtime.c msgid "no such attribute" msgstr "" @@ -2409,12 +2407,12 @@ msgstr "" msgid "odd-length string" msgstr "" -#: py/objstr.c py/objstrunicode.c +#: py/objstrunicode.c py/objstr.c msgid "offset out of bounds" msgstr "" -#: py/objarray.c py/objstr.c py/objstrunicode.c py/objtuple.c -#: shared-bindings/nvm/ByteArray.c +#: shared-bindings/nvm/ByteArray.c py/objarray.c py/objtuple.c +#: py/objstrunicode.c py/objstr.c msgid "only slices with step=1 (aka None) are supported" msgstr "" @@ -2431,7 +2429,7 @@ msgstr "" msgid "overflow converting long int to machine word" msgstr "" -#: shared-bindings/_stage/Layer.c shared-bindings/_stage/Text.c +#: shared-bindings/_stage/Text.c shared-bindings/_stage/Layer.c msgid "palette must be 32 bytes long" msgstr "" @@ -2468,8 +2466,8 @@ msgid "pixel_shader must be displayio.Palette or displayio.ColorConverter" msgstr "" #: ports/atmel-samd/common-hal/pulseio/PulseIn.c -#: ports/esp8266/common-hal/pulseio/PulseIn.c #: ports/nrf/common-hal/pulseio/PulseIn.c +#: ports/esp8266/common-hal/pulseio/PulseIn.c msgid "pop from an empty PulseIn" msgstr "" @@ -2577,7 +2575,7 @@ msgstr "" msgid "slice step cannot be zero" msgstr "" -#: py/objint.c py/sequence.c +#: py/sequence.c py/objint.c msgid "small int overflow" msgstr "" @@ -2741,7 +2739,7 @@ msgstr "" msgid "unexpected keyword argument" msgstr "" -#: py/bc.c py/objnamedtuple.c +#: py/objnamedtuple.c py/bc.c msgid "unexpected keyword argument '%q'" msgstr "" @@ -2860,6 +2858,14 @@ msgstr "" msgid "zero step" msgstr "passo zero" +#, fuzzy +#~ msgid "Failed to notify or indicate attribute value, err %0x04x" +#~ msgstr "Não é possível gravar o valor do atributo. status: 0x%02x" + +#, fuzzy +#~ msgid "Failed to read attribute value, err %0x04x" +#~ msgstr "Não é possível ler o valor do atributo. status: 0x%02x" + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Apenas formato Windows, BMP descomprimido suportado" diff --git a/ports/nrf/common-hal/bleio/Characteristic.c b/ports/nrf/common-hal/bleio/Characteristic.c index 1db564549c..c22072f3d8 100644 --- a/ports/nrf/common-hal/bleio/Characteristic.c +++ b/ports/nrf/common-hal/bleio/Characteristic.c @@ -129,7 +129,7 @@ STATIC void gatts_notify_indicate(bleio_characteristic_obj_t *characteristic, mp const uint32_t err_code = sd_ble_gatts_hvx(conn_handle, &hvx_params); if (err_code != NRF_SUCCESS) { m_tx_in_progress--; - mp_raise_OSError_msg_varg(translate("Failed to notify or indicate attribute value, err %0x04x"), err_code); + mp_raise_OSError_msg_varg(translate("Failed to notify or indicate attribute value, err x0%04x"), err_code); } } @@ -141,7 +141,7 @@ STATIC void gattc_read(bleio_characteristic_obj_t *characteristic) { const uint32_t err_code = sd_ble_gattc_read(conn_handle, characteristic->handle, 0); if (err_code != NRF_SUCCESS) { - mp_raise_OSError_msg_varg(translate("Failed to read attribute value, err %0x04x"), err_code); + mp_raise_OSError_msg_varg(translate("Failed to read attribute value, err x0%04x"), err_code); } // From 4886451000abe7a699ddf2206308f4cb3719974c Mon Sep 17 00:00:00 2001 From: "ITACA Innovation S.R.L" <40298126+ITACAInnovation@users.noreply.github.com> Date: Mon, 25 Mar 2019 13:06:31 +0100 Subject: [PATCH 05/19] Add files via upload This is a pull request to add support for uChip into the Circuitpython environment. We tested the uploaded code and it seems to work with Circuitpython. If there are any suggestions or changes needed, please let us know! What is uChip in brief? A complete USB dev board the size of a narrow 16-DIP package, featuring Atmel SAMD21 Cortex M0+ and onboard switching converters. (OTG compliant and power delivery up to 1A@5V or 3V3). For more details refer to the ongoing campaign on kickstarter. www.kickstarter.com/projects/1186620431/uchip-arduino-zero-compatible-in-a-narrow-dip-16-p --- ports/atmel-samd/boards/uChip/board.c | 39 +++++++++++++ ports/atmel-samd/boards/uChip/mpconfigboard.h | 55 +++++++++++++++++++ .../atmel-samd/boards/uChip/mpconfigboard.mk | 12 ++++ ports/atmel-samd/boards/uChip/pins.c | 38 +++++++++++++ 4 files changed, 144 insertions(+) create mode 100644 ports/atmel-samd/boards/uChip/board.c create mode 100644 ports/atmel-samd/boards/uChip/mpconfigboard.h create mode 100644 ports/atmel-samd/boards/uChip/mpconfigboard.mk create mode 100644 ports/atmel-samd/boards/uChip/pins.c diff --git a/ports/atmel-samd/boards/uChip/board.c b/ports/atmel-samd/boards/uChip/board.c new file mode 100644 index 0000000000..0f60736a24 --- /dev/null +++ b/ports/atmel-samd/boards/uChip/board.c @@ -0,0 +1,39 @@ +/* + * This file is part of the MicroPython project, http://micropython.org/ + * + * The MIT License (MIT) + * + * Copyright (c) 2017 Scott Shawcroft for Adafruit Industries + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "boards/board.h" +#include "mpconfigboard.h" +#include "hal/include/hal_gpio.h" + +void board_init(void) { +} + +bool board_requests_safe_mode(void) { + return false; +} + +void reset_board(void) { +} diff --git a/ports/atmel-samd/boards/uChip/mpconfigboard.h b/ports/atmel-samd/boards/uChip/mpconfigboard.h new file mode 100644 index 0000000000..ce4b5d0709 --- /dev/null +++ b/ports/atmel-samd/boards/uChip/mpconfigboard.h @@ -0,0 +1,55 @@ +#define MICROPY_HW_BOARD_NAME "uChip" +#define MICROPY_HW_MCU_NAME "samd21e18" + +#define MICROPY_HW_LED_STATUS (&pin_PA07) + +#define MICROPY_PORT_A (PORT_PA00 | PORT_PA01 | PORT_PA14 | PORT_PA15 | PORT_PA28 | PORT_PA27 | PORT_PA24 | PORT_PA25) +#define MICROPY_PORT_B (0) +#define MICROPY_PORT_C (0) + +#define CIRCUITPY_INTERNAL_NVM_SIZE 0 + +#define BOARD_FLASH_SIZE (0x00040000 - 0x2000 - 0x010000) + + +// USB is always used internally so skip the pin objects for it. +#define IGNORE_PIN_PA24 1 +#define IGNORE_PIN_PA25 1 + +#define IGNORE_PIN_PA27 1 +#define IGNORE_PIN_PA28 1 +#define IGNORE_PIN_PA30 1 +#define IGNORE_PIN_PA31 1 + +#define IGNORE_PIN_PB01 1 +#define IGNORE_PIN_PB02 1 +#define IGNORE_PIN_PB03 1 +#define IGNORE_PIN_PB04 1 +#define IGNORE_PIN_PB05 1 +#define IGNORE_PIN_PB06 1 +#define IGNORE_PIN_PB07 1 +#define IGNORE_PIN_PB08 1 +#define IGNORE_PIN_PB09 1 +#define IGNORE_PIN_PB10 1 +#define IGNORE_PIN_PB11 1 +#define IGNORE_PIN_PB12 1 +#define IGNORE_PIN_PB13 1 +#define IGNORE_PIN_PB14 1 +#define IGNORE_PIN_PB15 1 +#define IGNORE_PIN_PB16 1 +#define IGNORE_PIN_PB17 1 +#define IGNORE_PIN_PB22 1 +#define IGNORE_PIN_PB23 1 +#define IGNORE_PIN_PB30 1 +#define IGNORE_PIN_PB31 1 +#define IGNORE_PIN_PB00 1 + +#define DEFAULT_I2C_BUS_SCL (&pin_PA23) +#define DEFAULT_I2C_BUS_SDA (&pin_PA22) + +#define DEFAULT_SPI_BUS_SCK (&pin_PA16) +#define DEFAULT_SPI_BUS_MOSI (&pin_PA17) +#define DEFAULT_SPI_BUS_MISO (&pin_PA19) + +#define DEFAULT_UART_BUS_RX (&pin_PA11) +#define DEFAULT_UART_BUS_TX (&pin_PA10) diff --git a/ports/atmel-samd/boards/uChip/mpconfigboard.mk b/ports/atmel-samd/boards/uChip/mpconfigboard.mk new file mode 100644 index 0000000000..bd05152a2d --- /dev/null +++ b/ports/atmel-samd/boards/uChip/mpconfigboard.mk @@ -0,0 +1,12 @@ +LD_FILE = boards/samd21x18-bootloader.ld +USB_VID = 0x04D8 +USB_PID = 0xED7D +USB_PRODUCT = "uChip CircuitPython" +USB_MANUFACTURER = "Itaca Innovation" + +INTERNAL_FLASH_FILESYSTEM = 1 +LONGINT_IMPL = NONE +CIRCUITPY_SMALL_BUILD = 1 + +CHIP_VARIANT = SAMD21E18A +CHIP_FAMILY = samd21 diff --git a/ports/atmel-samd/boards/uChip/pins.c b/ports/atmel-samd/boards/uChip/pins.c new file mode 100644 index 0000000000..7476c60adc --- /dev/null +++ b/ports/atmel-samd/boards/uChip/pins.c @@ -0,0 +1,38 @@ +#include "shared-bindings/board/__init__.h" + +#include "supervisor/shared/board_busses.h" + +STATIC const mp_rom_map_elem_t board_global_dict_table[] = { + { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PA08) }, + { MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_PA10) }, + { MP_ROM_QSTR(MP_QSTR_A4), MP_ROM_PTR(&pin_PA09) }, + { MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_PA11) }, + { MP_ROM_QSTR(MP_QSTR_A6), MP_ROM_PTR(&pin_PA05) }, + { MP_ROM_QSTR(MP_QSTR_A7), MP_ROM_PTR(&pin_PA02) }, + { MP_ROM_QSTR(MP_QSTR_A8), MP_ROM_PTR(&pin_PA04) }, + { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PA08) }, + { MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PA10) }, + { MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PA09) }, + { MP_ROM_QSTR(MP_QSTR_D5), MP_ROM_PTR(&pin_PA11) }, + { MP_ROM_QSTR(MP_QSTR_D6), MP_ROM_PTR(&pin_PA17) }, + { MP_ROM_QSTR(MP_QSTR_D7), MP_ROM_PTR(&pin_PA18) }, + { MP_ROM_QSTR(MP_QSTR_D9), MP_ROM_PTR(&pin_PA19) }, + { MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_PA22) }, + { MP_ROM_QSTR(MP_QSTR_D11), MP_ROM_PTR(&pin_PA23) }, + { MP_ROM_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA05) }, + { MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PA02) }, + { MP_ROM_QSTR(MP_QSTR_D15), MP_ROM_PTR(&pin_PA04) }, + { MP_ROM_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PA11) }, + { MP_ROM_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PA10) }, + { MP_ROM_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA22) }, + { MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA23) }, + { MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_PA16) }, + { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA17) }, + { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA19) }, + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, + { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, +}; +MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table); From a88990aa68ceb3cf9d2fd0ab941310cf586cf7f5 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 25 Mar 2019 08:14:45 -0400 Subject: [PATCH 06/19] Update frozen libraries to latest tagged versions --- frozen/Adafruit_CircuitPython_BusDevice | 2 +- frozen/Adafruit_CircuitPython_HID | 2 +- frozen/Adafruit_CircuitPython_Motor | 2 +- frozen/Adafruit_CircuitPython_NeoPixel | 2 +- frozen/Adafruit_CircuitPython_seesaw | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frozen/Adafruit_CircuitPython_BusDevice b/frozen/Adafruit_CircuitPython_BusDevice index 3e6bf71c75..6b34029659 160000 --- a/frozen/Adafruit_CircuitPython_BusDevice +++ b/frozen/Adafruit_CircuitPython_BusDevice @@ -1 +1 @@ -Subproject commit 3e6bf71c75c9ed4ada51ab69f8bd196dad18c0c1 +Subproject commit 6b3402965999d068316882d63fae3ab26006477c diff --git a/frozen/Adafruit_CircuitPython_HID b/frozen/Adafruit_CircuitPython_HID index dbfabac857..836bb9843f 160000 --- a/frozen/Adafruit_CircuitPython_HID +++ b/frozen/Adafruit_CircuitPython_HID @@ -1 +1 @@ -Subproject commit dbfabac857123443506a3a1de9b5917d58248820 +Subproject commit 836bb9843fd793683061c15150944f8897d806e9 diff --git a/frozen/Adafruit_CircuitPython_Motor b/frozen/Adafruit_CircuitPython_Motor index a889448028..98563ab658 160000 --- a/frozen/Adafruit_CircuitPython_Motor +++ b/frozen/Adafruit_CircuitPython_Motor @@ -1 +1 @@ -Subproject commit a8894480283e3b81f39a3db5716b443963abc56f +Subproject commit 98563ab65800aac6464f671c0d005df56ecaa6c6 diff --git a/frozen/Adafruit_CircuitPython_NeoPixel b/frozen/Adafruit_CircuitPython_NeoPixel index 6e35cd2b40..c0ed34813a 160000 --- a/frozen/Adafruit_CircuitPython_NeoPixel +++ b/frozen/Adafruit_CircuitPython_NeoPixel @@ -1 +1 @@ -Subproject commit 6e35cd2b40575a20e2904b096508325cef4a71d3 +Subproject commit c0ed34813a608b64ed044826553918ddbad12f0c diff --git a/frozen/Adafruit_CircuitPython_seesaw b/frozen/Adafruit_CircuitPython_seesaw index 2df8a671a5..1d12cfc0b7 160000 --- a/frozen/Adafruit_CircuitPython_seesaw +++ b/frozen/Adafruit_CircuitPython_seesaw @@ -1 +1 @@ -Subproject commit 2df8a671a5a3d055b75df278fb354b558718b56d +Subproject commit 1d12cfc0b729b4ae0a2f3f4e7c1933a0fbd3b166 From f440e41819ef87d433c8226aa27b764de51544cc Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Mon, 25 Mar 2019 14:04:50 +0100 Subject: [PATCH 07/19] Really fix the error messages in bleio, this time --- ports/nrf/common-hal/bleio/Characteristic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/nrf/common-hal/bleio/Characteristic.c b/ports/nrf/common-hal/bleio/Characteristic.c index c22072f3d8..c9088c2ab7 100644 --- a/ports/nrf/common-hal/bleio/Characteristic.c +++ b/ports/nrf/common-hal/bleio/Characteristic.c @@ -129,7 +129,7 @@ STATIC void gatts_notify_indicate(bleio_characteristic_obj_t *characteristic, mp const uint32_t err_code = sd_ble_gatts_hvx(conn_handle, &hvx_params); if (err_code != NRF_SUCCESS) { m_tx_in_progress--; - mp_raise_OSError_msg_varg(translate("Failed to notify or indicate attribute value, err x0%04x"), err_code); + mp_raise_OSError_msg_varg(translate("Failed to notify or indicate attribute value, err 0x%04x"), err_code); } } @@ -141,7 +141,7 @@ STATIC void gattc_read(bleio_characteristic_obj_t *characteristic) { const uint32_t err_code = sd_ble_gattc_read(conn_handle, characteristic->handle, 0); if (err_code != NRF_SUCCESS) { - mp_raise_OSError_msg_varg(translate("Failed to read attribute value, err x0%04x"), err_code); + mp_raise_OSError_msg_varg(translate("Failed to read attribute value, err 0x%04x"), err_code); } // From 0698e61553dff1dd79014129aef2abe4ff02559d Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Mon, 25 Mar 2019 14:08:39 +0100 Subject: [PATCH 08/19] And of course forgot make translate --- locale/ID.po | 6 +++--- locale/circuitpython.pot | 6 +++--- locale/de_DE.po | 6 +++--- locale/en_US.po | 6 +++--- locale/en_x_pirate.po | 6 +++--- locale/es.po | 6 +++--- locale/fil.po | 6 +++--- locale/fr.po | 6 +++--- locale/it_IT.po | 6 +++--- locale/pt_BR.po | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index 706460decc..694b2964fd 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -660,7 +660,7 @@ msgstr "Gagal untuk mendapatkan status softdevice, error: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -670,7 +670,7 @@ msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 55784b5f82..735459a47e 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -639,7 +639,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -649,7 +649,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c diff --git a/locale/de_DE.po b/locale/de_DE.po index 37b4ff51c7..21fe860eb4 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: Pascal Deneaux\n" "Language-Team: Sebastian Plamauer, Pascal Deneaux\n" @@ -644,7 +644,7 @@ msgstr "Fehler beim Abrufen des Softdevice-Status" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -654,7 +654,7 @@ msgstr "Kann CCCD value nicht lesen. Status: 0x%04x" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c diff --git a/locale/en_US.po b/locale/en_US.po index fa13eb1b3f..2f29498b95 100644 --- a/locale/en_US.po +++ b/locale/en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: \n" "Language-Team: \n" @@ -639,7 +639,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -649,7 +649,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c diff --git a/locale/en_x_pirate.po b/locale/en_x_pirate.po index 41216e2353..0bcef80668 100644 --- a/locale/en_x_pirate.po +++ b/locale/en_x_pirate.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: \n" "Language-Team: @sommersoft, @MrCertainly\n" @@ -643,7 +643,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -653,7 +653,7 @@ msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c diff --git a/locale/es.po b/locale/es.po index 11853cbcdc..efae8c368c 100644 --- a/locale/es.po +++ b/locale/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: 2018-08-24 22:56-0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -665,7 +665,7 @@ msgstr "No se puede obtener el estado del softdevice, error: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -675,7 +675,7 @@ msgstr "No se puede leer el valor del atributo. status 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c diff --git a/locale/fil.po b/locale/fil.po index c7cba3c4bd..42a1c9e262 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: 2018-12-20 22:15-0800\n" "Last-Translator: Timothy \n" "Language-Team: fil\n" @@ -663,7 +663,7 @@ msgstr "Nabigo sa pagkuha ng softdevice state, error: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -673,7 +673,7 @@ msgstr "Hindi mabasa ang value ng attribute, status: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c diff --git a/locale/fr.po b/locale/fr.po index 6bde8ee34b..1710a5ae97 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: 2018-12-23 20:05+0100\n" "Last-Translator: Pierrick Couturier \n" "Language-Team: fr\n" @@ -662,7 +662,7 @@ msgstr "Echec de l'obtention de l'état du périph., erreur: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -672,7 +672,7 @@ msgstr "Impossible de lire la valeur de l'attribut. status: 0x%08lX" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c diff --git a/locale/it_IT.po b/locale/it_IT.po index f40c861a25..758307ff33 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: 2018-10-02 16:27+0200\n" "Last-Translator: Enrico Paganin \n" "Language-Team: \n" @@ -662,7 +662,7 @@ msgstr "Impossibile fermare advertisement. status: 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -672,7 +672,7 @@ msgstr "Impossibile leggere valore dell'attributo. status: 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 918b172dd8..5d00b4e03e 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 09:19+0100\n" +"POT-Creation-Date: 2019-03-25 14:08+0100\n" "PO-Revision-Date: 2018-10-02 21:14-0000\n" "Last-Translator: \n" "Language-Team: \n" @@ -655,7 +655,7 @@ msgstr "Não pode parar propaganda. status: 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to notify or indicate attribute value, err x0%04x" +msgid "Failed to notify or indicate attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c @@ -665,7 +665,7 @@ msgstr "Não é possível ler o valor do atributo. status: 0x%02x" #: ports/nrf/common-hal/bleio/Characteristic.c #, c-format -msgid "Failed to read attribute value, err x0%04x" +msgid "Failed to read attribute value, err 0x%04x" msgstr "" #: ports/nrf/common-hal/bleio/Characteristic.c From a9f18cc4bd26562a1e3df66d7c12ffba4e103aa0 Mon Sep 17 00:00:00 2001 From: "ITACA Innovation S.R.L" <40298126+ITACAInnovation@users.noreply.github.com> Date: Mon, 25 Mar 2019 15:41:45 +0100 Subject: [PATCH 09/19] Update .travis.yml Commit change with updated board list --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c8a2ea745..443fc2c675 100755 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ git: env: - TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm:nrf - TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo pybadge" TRAVIS_SDK=arm - - TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32" TRAVIS_SDK=arm + - TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uChip" TRAVIS_SDK=arm - TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10" TRAVIS_SDK=arm - TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev" TRAVIS_SDK=arm From af04307c832d67501977fe8d1b37fda445491f45 Mon Sep 17 00:00:00 2001 From: "ITACA Innovation S.R.L" <40298126+ITACAInnovation@users.noreply.github.com> Date: Mon, 25 Mar 2019 15:57:35 +0100 Subject: [PATCH 10/19] Rename ports/atmel-samd/boards/uChip/board.c to ports/atmel-samd/boards/uchip/board.c --- ports/atmel-samd/boards/{uChip => uchip}/board.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ports/atmel-samd/boards/{uChip => uchip}/board.c (100%) diff --git a/ports/atmel-samd/boards/uChip/board.c b/ports/atmel-samd/boards/uchip/board.c similarity index 100% rename from ports/atmel-samd/boards/uChip/board.c rename to ports/atmel-samd/boards/uchip/board.c From 12865ce7d0308d76242653c514873f7350c92257 Mon Sep 17 00:00:00 2001 From: "ITACA Innovation S.R.L" <40298126+ITACAInnovation@users.noreply.github.com> Date: Mon, 25 Mar 2019 15:57:59 +0100 Subject: [PATCH 11/19] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 443fc2c675..31f9a24471 100755 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ git: env: - TRAVIS_TESTS="unix docs translations website" TRAVIS_BOARDS="circuitplayground_express mini_sam_m4 grandcentral_m4_express pca10056 pca10059 feather_nrf52840_express makerdiary_nrf52840_mdk makerdiary_nrf52840_mdk_usb_dongle particle_boron particle_argon particle_xenon sparkfun_nrf52840_mini" TRAVIS_SDK=arm:nrf - TRAVIS_BOARDS="metro_m0_express metro_m4_express pirkey_m0 trellis_m4_express trinket_m0 sparkfun_lumidrive sparkfun_redboard_turbo pybadge" TRAVIS_SDK=arm - - TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uChip" TRAVIS_SDK=arm + - TRAVIS_BOARDS="feather_radiofruit_zigbee gemma_m0 hallowing_m0_express itsybitsy_m0_express itsybitsy_m4_express meowmeow sam32 uchip" TRAVIS_SDK=arm - TRAVIS_BOARDS="feather_m0_express_crickit feather_m0_rfm69 feather_m0_rfm9x feather_m4_express arduino_zero arduino_mkr1300 arduino_mkrzero pewpew10" TRAVIS_SDK=arm - TRAVIS_BOARDS="circuitplayground_express_crickit feather_m0_adalogger feather_m0_basic feather_m0_express catwan_usbstick pyportal sparkfun_samd21_mini sparkfun_samd21_dev" TRAVIS_SDK=arm From dfc5602fa00d555a574ac9c2842149c91b891733 Mon Sep 17 00:00:00 2001 From: "ITACA Innovation S.R.L" <40298126+ITACAInnovation@users.noreply.github.com> Date: Mon, 25 Mar 2019 15:58:37 +0100 Subject: [PATCH 12/19] Rename ports/atmel-samd/boards/uChip/mpconfigboard.h to ports/atmel-samd/boards/uchip/mpconfigboard.h --- ports/atmel-samd/boards/{uChip => uchip}/mpconfigboard.h | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ports/atmel-samd/boards/{uChip => uchip}/mpconfigboard.h (100%) diff --git a/ports/atmel-samd/boards/uChip/mpconfigboard.h b/ports/atmel-samd/boards/uchip/mpconfigboard.h similarity index 100% rename from ports/atmel-samd/boards/uChip/mpconfigboard.h rename to ports/atmel-samd/boards/uchip/mpconfigboard.h From 5ed11ddfc3bf85e30dec0f9acc67b10239b0f2f7 Mon Sep 17 00:00:00 2001 From: "ITACA Innovation S.R.L" <40298126+ITACAInnovation@users.noreply.github.com> Date: Mon, 25 Mar 2019 15:59:00 +0100 Subject: [PATCH 13/19] Rename ports/atmel-samd/boards/uChip/mpconfigboard.mk to ports/atmel-samd/boards/uchip/mpconfigboard.mk --- ports/atmel-samd/boards/{uChip => uchip}/mpconfigboard.mk | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ports/atmel-samd/boards/{uChip => uchip}/mpconfigboard.mk (100%) diff --git a/ports/atmel-samd/boards/uChip/mpconfigboard.mk b/ports/atmel-samd/boards/uchip/mpconfigboard.mk similarity index 100% rename from ports/atmel-samd/boards/uChip/mpconfigboard.mk rename to ports/atmel-samd/boards/uchip/mpconfigboard.mk From 994f292b3b62057635ec08589bb9c6bac47af1c3 Mon Sep 17 00:00:00 2001 From: "ITACA Innovation S.R.L" <40298126+ITACAInnovation@users.noreply.github.com> Date: Mon, 25 Mar 2019 15:59:22 +0100 Subject: [PATCH 14/19] Rename ports/atmel-samd/boards/uChip/pins.c to ports/atmel-samd/boards/uchip/pins.c --- ports/atmel-samd/boards/{uChip => uchip}/pins.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ports/atmel-samd/boards/{uChip => uchip}/pins.c (100%) diff --git a/ports/atmel-samd/boards/uChip/pins.c b/ports/atmel-samd/boards/uchip/pins.c similarity index 100% rename from ports/atmel-samd/boards/uChip/pins.c rename to ports/atmel-samd/boards/uchip/pins.c From 74c5705a9acd4214e78b9d0537b837c45e2c5c3b Mon Sep 17 00:00:00 2001 From: "ITACA Innovation S.R.L" <40298126+ITACAInnovation@users.noreply.github.com> Date: Mon, 25 Mar 2019 17:19:40 +0100 Subject: [PATCH 15/19] Update mpconfigboard.mk --- ports/atmel-samd/boards/uchip/mpconfigboard.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/atmel-samd/boards/uchip/mpconfigboard.mk b/ports/atmel-samd/boards/uchip/mpconfigboard.mk index bd05152a2d..53b8c27713 100644 --- a/ports/atmel-samd/boards/uchip/mpconfigboard.mk +++ b/ports/atmel-samd/boards/uchip/mpconfigboard.mk @@ -10,3 +10,5 @@ CIRCUITPY_SMALL_BUILD = 1 CHIP_VARIANT = SAMD21E18A CHIP_FAMILY = samd21 + +CIRCUITPY_FREQUENCYIO = 0 From 81fe8060d76d54a20701e6944dd29cdfab9fed4f Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Wed, 20 Mar 2019 19:29:20 +0100 Subject: [PATCH 16/19] Properly calculate BPP for displayio.Bitmap Fix #1669 --- locale/ID.po | 12 ++++++------ locale/circuitpython.pot | 12 ++++++------ locale/de_DE.po | 16 ++++++++++------ locale/en_US.po | 12 ++++++------ locale/en_x_pirate.po | 12 ++++++------ locale/es.po | 15 +++++++++------ locale/fil.po | 15 +++++++++------ locale/fr.po | 15 +++++++++------ locale/it_IT.po | 12 ++++++------ locale/pt_BR.po | 12 ++++++------ shared-bindings/displayio/Bitmap.c | 16 ++++++++++++---- 11 files changed, 85 insertions(+), 64 deletions(-) diff --git a/locale/ID.po b/locale/ID.po index 694b2964fd..1df86a7d25 100644 --- a/locale/ID.po +++ b/locale/ID.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -762,14 +762,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "" - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "GPIO16 tidak mendukung pull up" @@ -2838,6 +2834,10 @@ msgstr "" msgid "unsupported types for %q: '%s', '%s'" msgstr "" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "wifi_set_ip_info() gagal" diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 735459a47e..645b2e4add 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -737,14 +737,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "" - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "" @@ -2789,6 +2785,10 @@ msgstr "" msgid "unsupported types for %q: '%s', '%s'" msgstr "" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "" diff --git a/locale/de_DE.po b/locale/de_DE.po index 21fe860eb4..87e9659141 100644 --- a/locale/de_DE.po +++ b/locale/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: Pascal Deneaux\n" "Language-Team: Sebastian Plamauer, Pascal Deneaux\n" @@ -742,14 +742,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde" - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "GPIO16 unterstützt pull up nicht" @@ -2851,6 +2847,10 @@ msgstr "nicht unterstützter Typ für Operator" msgid "unsupported types for %q: '%s', '%s'" msgstr "nicht unterstützte Typen für %q: '%s', '%s'" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "wifi_set_ip_info() fehlgeschlagen" @@ -2889,5 +2889,9 @@ msgstr "" #~ msgid "Failed to read attribute value, err %0x04x" #~ msgstr "Kann den Attributwert nicht lesen. Status: 0x%04x" +#~ msgid "Function requires lock." +#~ msgstr "" +#~ "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde" + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Nur unkomprimiertes Windows-Format (BMP) unterstützt %d" diff --git a/locale/en_US.po b/locale/en_US.po index 2f29498b95..da189c6616 100644 --- a/locale/en_US.po +++ b/locale/en_US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: \n" "Language-Team: \n" @@ -737,14 +737,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "" - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "" @@ -2789,6 +2785,10 @@ msgstr "" msgid "unsupported types for %q: '%s', '%s'" msgstr "" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "" diff --git a/locale/en_x_pirate.po b/locale/en_x_pirate.po index 0bcef80668..f9bb0f0ffe 100644 --- a/locale/en_x_pirate.po +++ b/locale/en_x_pirate.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n" "Last-Translator: \n" "Language-Team: @sommersoft, @MrCertainly\n" @@ -741,14 +741,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "" - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "" @@ -2793,6 +2789,10 @@ msgstr "" msgid "unsupported types for %q: '%s', '%s'" msgstr "" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "" diff --git a/locale/es.po b/locale/es.po index efae8c368c..9f71ac1600 100644 --- a/locale/es.po +++ b/locale/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: 2018-08-24 22:56-0500\n" "Last-Translator: \n" "Language-Team: \n" @@ -767,14 +767,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "La función requiere lock" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "La función requiere lock" - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "GPIO16 no soporta pull up." @@ -2874,6 +2870,10 @@ msgstr "tipo de operador no soportado" msgid "unsupported types for %q: '%s', '%s'" msgstr "tipos no soportados para %q: '%s', '%s'" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "wifi_set_ip_info() ha fallado" @@ -2916,6 +2916,9 @@ msgstr "paso cero" #~ msgid "Failed to read attribute value, err %0x04x" #~ msgstr "No se puede leer el valor del atributo. status 0x%02x" +#~ msgid "Function requires lock." +#~ msgstr "La función requiere lock" + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Solo formato Windows, BMP sin comprimir soportado %d" diff --git a/locale/fil.po b/locale/fil.po index 42a1c9e262..230a095971 100644 --- a/locale/fil.po +++ b/locale/fil.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: 2018-12-20 22:15-0800\n" "Last-Translator: Timothy \n" "Language-Team: fil\n" @@ -765,14 +765,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "Function nangangailangan ng lock" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "Kailangan ng lock ang function." - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "Walang pull down support ang GPI016." @@ -2880,6 +2876,10 @@ msgstr "hindi sinusuportahang type para sa operator" msgid "unsupported types for %q: '%s', '%s'" msgstr "hindi sinusuportahang type para sa %q: '%s', '%s'" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "nabigo ang wifi_set_ip_info()" @@ -2922,6 +2922,9 @@ msgstr "zero step" #~ msgid "Failed to read attribute value, err %0x04x" #~ msgstr "Hindi mabasa ang value ng attribute, status: 0x%08lX" +#~ msgid "Function requires lock." +#~ msgstr "Kailangan ng lock ang function." + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Tanging Windows format, uncompressed BMP lamang ang supportado %d" diff --git a/locale/fr.po b/locale/fr.po index 1710a5ae97..f9c0078250 100644 --- a/locale/fr.po +++ b/locale/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: 2018-12-23 20:05+0100\n" "Last-Translator: Pierrick Couturier \n" "Language-Team: fr\n" @@ -764,14 +764,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "La fonction nécessite un verrou" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "La fonction nécessite un verrou." - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "le GPIO16 ne supporte pas le tirage (pull-up)" @@ -2902,6 +2898,10 @@ msgstr "type non supporté pour l'opérateur" msgid "unsupported types for %q: '%s', '%s'" msgstr "type non supporté pour %q: '%s', '%s'" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "wifi_set_ip_info() a échoué" @@ -2945,6 +2945,9 @@ msgstr "'step' nul" #~ msgid "Failed to read attribute value, err %0x04x" #~ msgstr "Impossible de lire la valeur de l'attribut. status: 0x%08lX" +#~ msgid "Function requires lock." +#~ msgstr "La fonction nécessite un verrou." + #~ msgid "Only Windows format, uncompressed BMP supported %d" #~ msgstr "Seul les BMP non-compressé au format Windows sont supportés %d" diff --git a/locale/it_IT.po b/locale/it_IT.po index 758307ff33..693f8a03c2 100644 --- a/locale/it_IT.po +++ b/locale/it_IT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: 2018-10-02 16:27+0200\n" "Last-Translator: Enrico Paganin \n" "Language-Team: \n" @@ -764,14 +764,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "" - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "GPIO16 non supporta pull-up" @@ -2876,6 +2872,10 @@ msgstr "tipo non supportato per l'operando" msgid "unsupported types for %q: '%s', '%s'" msgstr "tipi non supportati per %q: '%s', '%s'" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "wifi_set_ip_info() faillito" diff --git a/locale/pt_BR.po b/locale/pt_BR.po index 5d00b4e03e..587ed00bac 100644 --- a/locale/pt_BR.po +++ b/locale/pt_BR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-25 14:08+0100\n" +"POT-Creation-Date: 2019-03-25 19:40+0100\n" "PO-Revision-Date: 2018-10-02 21:14-0000\n" "Last-Translator: \n" "Language-Team: \n" @@ -757,14 +757,10 @@ msgid "Frequency captured is above capability. Capture Paused." msgstr "" #: shared-bindings/bitbangio/SPI.c shared-bindings/bitbangio/I2C.c -#: shared-bindings/busio/SPI.c +#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c msgid "Function requires lock" msgstr "" -#: shared-bindings/busio/I2C.c -msgid "Function requires lock." -msgstr "" - #: ports/esp8266/common-hal/digitalio/DigitalInOut.c msgid "GPIO16 does not support pull up." msgstr "GPIO16 não suporta pull up." @@ -2826,6 +2822,10 @@ msgstr "" msgid "unsupported types for %q: '%s', '%s'" msgstr "" +#: shared-bindings/displayio/Bitmap.c +msgid "value_count must be > 0" +msgstr "" + #: ports/esp8266/modnetwork.c msgid "wifi_set_ip_info() failed" msgstr "wifi_set_ip_info() falhou" diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c index 3612b8d63f..91c17f2d13 100644 --- a/shared-bindings/displayio/Bitmap.c +++ b/shared-bindings/displayio/Bitmap.c @@ -58,14 +58,22 @@ STATIC mp_obj_t displayio_bitmap_make_new(const mp_obj_type_t *type, size_t n_ar uint32_t width = mp_obj_get_int(pos_args[0]); uint32_t height = mp_obj_get_int(pos_args[1]); uint32_t value_count = mp_obj_get_int(pos_args[2]); - uint32_t power_of_two = 1; - while (value_count > (1U << power_of_two)) { - power_of_two <<= 1; + uint32_t bits = 1; + + if (value_count == 0) { + mp_raise_ValueError(translate("value_count must be > 0")); + } + while ((value_count - 1) >> bits) { + if (bits < 8) { + bits <<= 1; + } else { + bits += 8; + } } displayio_bitmap_t *self = m_new_obj(displayio_bitmap_t); self->base.type = &displayio_bitmap_type; - common_hal_displayio_bitmap_construct(self, width, height, power_of_two); + common_hal_displayio_bitmap_construct(self, width, height, bits); return MP_OBJ_FROM_PTR(self); } From d553df95b0e597d4c275f33061b71d2d3168ece9 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Mon, 25 Mar 2019 21:09:15 +0100 Subject: [PATCH 17/19] Reuse "Not connected" message in bleio --- shared-bindings/bleio/CharacteristicBuffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-bindings/bleio/CharacteristicBuffer.c b/shared-bindings/bleio/CharacteristicBuffer.c index 66d164954e..c368de3614 100644 --- a/shared-bindings/bleio/CharacteristicBuffer.c +++ b/shared-bindings/bleio/CharacteristicBuffer.c @@ -144,7 +144,7 @@ STATIC mp_uint_t bleio_characteristic_buffer_ioctl(mp_obj_t self_in, mp_uint_t r raise_error_if_deinited(common_hal_bleio_characteristic_buffer_deinited(self)); raise_error_if_not_connected(self); if (!common_hal_bleio_characteristic_buffer_connected(self)) { - mp_raise_ValueError(translate("Not connected.")); + mp_raise_ValueError(translate("Not connected")); } mp_uint_t ret; if (request == MP_IOCTL_POLL) { From a9e2592425f170c9a0237dcd74aa24082e3ace95 Mon Sep 17 00:00:00 2001 From: brentru Date: Mon, 25 Mar 2019 18:10:15 -0400 Subject: [PATCH 18/19] add weight sensor property to the design guide --- docs/design_guide.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/design_guide.rst b/docs/design_guide.rst index e7b3832bcb..2efbdc34c0 100644 --- a/docs/design_guide.rst +++ b/docs/design_guide.rst @@ -500,6 +500,8 @@ properties. +-----------------------+-----------------------+-------------------------------------------------------------------------+ | ``value`` | int | 16-bit Analog value, unit-less | +-----------------------+-----------------------+-------------------------------------------------------------------------+ +| ``weight`` | float | grams (g) | ++-----------------------+-----------------------+-------------------------------------------------------------------------+ Adding native modules -------------------------------------------------------------------------------- From 2229f17911bae7f6db386aad96ac3fa077a46862 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 25 Mar 2019 20:42:08 -0400 Subject: [PATCH 19/19] reset flush timer on call to filesystem_flush() --- supervisor/shared/filesystem.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/supervisor/shared/filesystem.c b/supervisor/shared/filesystem.c index dc061fa418..68c6f47499 100644 --- a/supervisor/shared/filesystem.c +++ b/supervisor/shared/filesystem.c @@ -115,6 +115,8 @@ void filesystem_init(bool create_allowed, bool force_create) { } void filesystem_flush(void) { + // Reset interval before next flush. + filesystem_flush_interval_ms = CIRCUITPY_FILESYSTEM_FLUSH_INTERVAL_MS; supervisor_flash_flush(); }