From bb10a8aaa19ed662f7dda6500397432ed7b2e0c0 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Mon, 25 Mar 2019 01:27:54 +0100 Subject: Fix error messages in bleio --- locale/circuitpython.pot | 96 ++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 49 deletions(-) (limited to 'locale/circuitpython.pot') diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index cb2183a0d..55784b5f8 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 "" -- cgit v1.2.3 From 0698e61553dff1dd79014129aef2abe4ff02559d Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Mon, 25 Mar 2019 14:08:39 +0100 Subject: 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(-) (limited to 'locale/circuitpython.pot') diff --git a/locale/ID.po b/locale/ID.po index 706460dec..694b2964f 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 55784b5f8..735459a47 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 37b4ff51c..21fe860eb 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 fa13eb1b3..2f29498b9 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 41216e235..0bcef8066 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 11853cbcd..efae8c368 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 c7cba3c4b..42a1c9e26 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 6bde8ee34..1710a5ae9 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 f40c861a2..758307ff3 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 918b172dd..5d00b4e03 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 -- cgit v1.2.3 From 81fe8060d76d54a20701e6944dd29cdfab9fed4f Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Wed, 20 Mar 2019 19:29:20 +0100 Subject: 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(-) (limited to 'locale/circuitpython.pot') diff --git a/locale/ID.po b/locale/ID.po index 694b2964f..1df86a7d2 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 735459a47..645b2e4ad 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 21fe860eb..87e965914 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 2f29498b9..da189c661 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 0bcef8066..f9bb0f0ff 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 efae8c368..9f71ac160 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 42a1c9e26..230a09597 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 1710a5ae9..f9c007825 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 758307ff3..693f8a03c 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 5d00b4e03..587ed00ba 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 3612b8d63..91c17f2d1 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); } -- cgit v1.2.3