Skip to content

More space savings #7181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Dec 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
10d9287
Don't generate QSTRs for wrong identifiers
jepler Nov 8, 2022
2315b62
Remove unused static qstrs
jepler Nov 8, 2022
284ac21
merge a message
jepler Nov 8, 2022
6ac2022
merge a message
jepler Nov 8, 2022
f652a89
merge two messages
jepler Nov 8, 2022
7df21c9
Combine a message
jepler Nov 8, 2022
ac99909
merge a message
jepler Nov 8, 2022
8658e7a
re-use length validator
jepler Nov 8, 2022
7c9cd56
If uart is disabled, no pins will work; show NotImplementedError instead
jepler Nov 8, 2022
beb053a
more thoroughly disable UART when
jepler Nov 8, 2022
db01dfe
use a standard length validator
jepler Nov 8, 2022
2b01c13
use a standard validator function
jepler Nov 8, 2022
0e19fbb
Use a function to raise ZeroDivisionError, consistent string
jepler Nov 8, 2022
f67bca9
On python3 log(0) raises math domain error, not zerodivisionerror
jepler Nov 8, 2022
5fb191b
Use a standard validator
jepler Nov 8, 2022
d61fde3
re-use an error message
jepler Nov 8, 2022
d39d146
Merge some messages
jepler Nov 8, 2022
a94663b
use a standard error message
jepler Nov 8, 2022
4158ddf
compile out terse mismatch message when not used
jepler Nov 8, 2022
c46e219
Having an input-only pin is rare, save a string on other ports
jepler Nov 8, 2022
4671658
Use ASCII apostrophe in french translation, it saves flash space
jepler Nov 8, 2022
9c11bb2
Check that translations fit in expected character type
jepler Nov 8, 2022
6be0a42
Don't run maketranslationdata twice
jepler Nov 8, 2022
530e5a1
Use standard validation function
jepler Nov 8, 2022
19a3893
update translations again
jepler Nov 8, 2022
0f6091c
update fil translation to fit in uint8_t
jepler Nov 9, 2022
ed33f65
move define to proper place
jepler Nov 9, 2022
9916b39
update nl translation to fit in uint8_t
jepler Nov 9, 2022
d16c951
Compact the characters of certain translations, so they fit in uint8_t
jepler Nov 9, 2022
e5b8382
fr should fit in 8 bits
jepler Nov 9, 2022
fb66a6b
Don't use "offset" as an identifier
jepler Nov 9, 2022
d2e2a61
Reworking how "run list" works saves a dozen bytes
jepler Nov 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 6 additions & 76 deletions locale/circuitpython.pot
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ msgstr ""
msgid "%q is %q"
msgstr ""

#: py/argcheck.c
#: py/argcheck.c shared-bindings/usb_hid/Device.c
msgid "%q length must be %d"
msgstr ""

Expand All @@ -134,10 +134,6 @@ msgstr ""
msgid "%q length must be >= %d"
msgstr ""

#: shared-bindings/busio/I2C.c
msgid "%q length must be >= 1"
msgstr ""

#: py/argcheck.c
msgid "%q must be %d"
msgstr ""
Expand All @@ -163,15 +159,7 @@ msgstr ""
msgid "%q must be a bytearray or array of type 'h', 'H', 'b', or 'B'"
msgstr ""

#: py/argcheck.c
msgid "%q must be a string"
msgstr ""

#: py/argcheck.c
msgid "%q must be an int"
msgstr ""

#: py/argcheck.c py/obj.c
#: py/argcheck.c py/obj.c py/objstrunicode.c
msgid "%q must be of type %q"
msgstr ""

Expand Down Expand Up @@ -201,8 +189,8 @@ msgstr ""
msgid "%q pin invalid"
msgstr ""

#: shared-bindings/usb_hid/Device.c
msgid "%q with a report ID of 0 must be of length 1"
#: py/objrange.c py/objslice.c shared-bindings/random/__init__.c
msgid "%q step cannot be zero"
msgstr ""

#: py/bc.c py/objnamedtuple.c
Expand Down Expand Up @@ -511,10 +499,6 @@ msgstr ""
msgid "Array values should be single bytes."
msgstr ""

#: shared-bindings/microcontroller/Pin.c
msgid "At most %d %q may be specified (not %d)"
msgstr ""

#: shared-module/memorymonitor/AllocationAlarm.c
#, c-format
msgid "Attempt to allocate %d blocks"
Expand Down Expand Up @@ -1260,10 +1244,6 @@ msgstr ""
msgid "Invalid multicast MAC address"
msgstr ""

#: shared-bindings/busio/UART.c
msgid "Invalid pins"
msgstr ""

#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
msgid "Invalid size"
msgstr ""
Expand Down Expand Up @@ -1501,11 +1481,6 @@ msgstr ""
msgid "No long integer support"
msgstr ""

#: shared-module/usb_hid/__init__.c
#, c-format
msgid "No more than %d HID devices allowed"
msgstr ""

#: shared-bindings/wifi/Radio.c
msgid "No network with that ssid"
msgstr ""
Expand Down Expand Up @@ -2545,10 +2520,6 @@ msgstr ""
msgid "buffer too small for requested bytes"
msgstr ""

#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
msgid "byteorder is not a string"
msgstr ""

#: py/objarray.c
msgid "bytes length not a multiple of item size"
msgstr ""
Expand Down Expand Up @@ -2590,14 +2561,10 @@ msgstr ""
msgid "can't cancel self"
msgstr ""

#: py/obj.c py/objint.c shared-module/adafruit_pixelbuf/PixelBuf.c
#: py/obj.c py/objint.c py/runtime.c shared-module/adafruit_pixelbuf/PixelBuf.c
msgid "can't convert %q to %q"
msgstr ""

#: py/runtime.c
msgid "can't convert %q to int"
msgstr ""

#: py/obj.c
#, c-format
msgid "can't convert %s to complex"
Expand Down Expand Up @@ -2781,10 +2748,6 @@ msgstr ""
msgid "comparison of int and uint"
msgstr ""

#: py/objcomplex.c
msgid "complex division by zero"
msgstr ""

#: py/objfloat.c py/parsenum.c
msgid "complex values not supported"
msgstr ""
Expand Down Expand Up @@ -2887,12 +2850,7 @@ msgstr ""
msgid "div/mod not implemented for uint"
msgstr ""

#: py/objfloat.c py/objint_mpz.c
msgid "divide by zero"
msgstr ""

#: py/modmath.c py/objint_longlong.c py/runtime.c
#: shared-bindings/math/__init__.c
#: py/runtime.c
msgid "division by zero"
msgstr ""

Expand Down Expand Up @@ -3264,10 +3222,6 @@ msgstr ""
msgid "inputs are not iterable"
msgstr ""

#: py/parsenum.c
msgid "int() arg 2 must be >= 2 and <= 36"
msgstr ""

#: extmod/ulab/code/numpy/approx.c
msgid "interp is defined for 1D iterables of equal length"
msgstr ""
Expand Down Expand Up @@ -3405,10 +3359,6 @@ msgstr ""
msgid "local variable referenced before assignment"
msgstr ""

#: py/objint.c
msgid "long int not supported in this build"
msgstr ""

#: ports/espressif/common-hal/canio/CAN.c
msgid "loopback + silent mode not supported by peripheral"
msgstr ""
Expand Down Expand Up @@ -3943,10 +3893,6 @@ msgstr ""
msgid "slice step can't be zero"
msgstr ""

#: py/objslice.c
msgid "slice step cannot be zero"
msgstr ""

#: py/nativeglue.c
msgid "slice unsupported"
msgstr ""
Expand Down Expand Up @@ -3995,10 +3941,6 @@ msgstr ""
msgid "start/end indices"
msgstr ""

#: shared-bindings/random/__init__.c
msgid "step must be non-zero"
msgstr ""

#: shared-bindings/random/__init__.c
msgid "stop not reachable from start"
msgstr ""
Expand All @@ -4007,10 +3949,6 @@ msgstr ""
msgid "stream operation not supported"
msgstr ""

#: py/objstrunicode.c
msgid "string indices must be integers, not %q"
msgstr ""

#: py/stream.c
msgid "string not supported; use bytes or bytearray"
msgstr ""
Expand Down Expand Up @@ -4043,10 +3981,6 @@ msgstr ""
msgid "syntax error in uctypes descriptor"
msgstr ""

#: shared-bindings/time/__init__.c
msgid "time.struct_time() takes a 9-sequence"
msgstr ""

#: ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
#: ports/espressif/common-hal/watchdog/WatchDogTimer.c
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
Expand Down Expand Up @@ -4328,10 +4262,6 @@ msgstr ""
msgid "y value out of bounds"
msgstr ""

#: py/objrange.c
msgid "zero step"
msgstr ""

#: extmod/ulab/code/scipy/signal/signal.c
msgid "zi must be an ndarray"
msgstr ""
Expand Down
8 changes: 4 additions & 4 deletions locale/fil.po
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ msgstr "Inaasahan ng '%s' ang hangang r%d"
#: py/emitinlinethumb.c
#, c-format
msgid "'%s' expects {r0, r1, ...}"
msgstr "Inaasahan ng '%s' ay {r0, r1, }"
msgstr "Inaasahan ng '%s' ay {r0, r1, ...}"

#: py/emitinlinextensa.c
#, c-format
Expand Down Expand Up @@ -2789,7 +2789,7 @@ msgstr ""

#: shared-bindings/displayio/Palette.c
msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
msgstr "ang color buffer ay dapat bytearray o array na type ‘b’ or ‘B’"
msgstr "ang color buffer ay dapat bytearray o array na type 'b' or 'B'"

#: shared-bindings/displayio/Palette.c
msgid "color must be between 0x000000 and 0xffffff"
Expand Down Expand Up @@ -3911,7 +3911,7 @@ msgstr "return annotation ay dapat na identifier"

#: py/emitnative.c
msgid "return expected '%q' but got '%q'"
msgstr "return umasa ng '%q' pero ang nakuha ay ‘%q’"
msgstr "return umasa ng '%q' pero ang nakuha ay '%q'"

#: shared-bindings/rgbmatrix/RGBMatrix.c
#, c-format
Expand Down Expand Up @@ -4621,7 +4621,7 @@ msgstr ""
#~ "Mangyaring bisitahin ang learn.adafruit.com/category/circuitpython para "
#~ "sa project guides.\n"
#~ "\n"
#~ "Para makita ang listahan ng modules, `help(modules)`.\n"
#~ "Para makita ang listahan ng modules, `help(\"modules\")`.\n"

#~ msgid "integer required"
#~ msgstr "kailangan ng int"
Expand Down
22 changes: 11 additions & 11 deletions locale/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ msgstr "Les blocs CBC doivent être des multiples de 16 octets"

#: supervisor/shared/safe_mode.c
msgid "CIRCUITPY drive could not be found or created."
msgstr "Lappareil CIRCUITPY ne peut pas être trouvé ou créé."
msgstr "L'appareil CIRCUITPY ne peut pas être trouvé ou créé."

#: ports/espressif/common-hal/espidf/__init__.c ports/espressif/esp_error.c
msgid "CRC or checksum was invalid"
Expand Down Expand Up @@ -842,11 +842,11 @@ msgstr "Fichier .mpy corrompu"

#: ports/espressif/common-hal/neopixel_write/__init__.c
msgid "Could not retrieve clock"
msgstr "Impossible dobtenir lhorloge"
msgstr "Impossible d'obtenir l'horloge"

#: shared-bindings/_bleio/Adapter.c
msgid "Could not set address"
msgstr "Impossible de définir ladresse"
msgstr "Impossible de définir l'adresse"

#: shared-bindings/pwmio/PWMOut.c
msgid "Could not start PWM"
Expand Down Expand Up @@ -1006,7 +1006,7 @@ msgstr "Échec d'allocation du tampon %q"

#: ports/espressif/common-hal/wifi/__init__.c
msgid "Failed to allocate Wifi memory"
msgstr "Impossible dallouer la mémoire pour Wifi"
msgstr "Impossible d'allouer la mémoire pour Wifi"

#: ports/espressif/common-hal/wifi/ScannedNetworks.c
msgid "Failed to allocate wifi scan memory"
Expand Down Expand Up @@ -1833,7 +1833,7 @@ msgstr "Ainsi que tout autres modules présents sur le système de fichiers\n"

#: shared-module/vectorio/Polygon.c
msgid "Polygon needs at least 3 points"
msgstr "Polygon a besoin dau moins 3 points"
msgstr "Polygon a besoin d'au moins 3 points"

#: shared-bindings/_bleio/Adapter.c
msgid "Prefix buffer must be on the heap"
Expand Down Expand Up @@ -2552,7 +2552,7 @@ msgstr "matrice/octets requis à la droite"

#: extmod/ulab/code/numpy/numerical.c
msgid "attempt to get (arg)min/(arg)max of empty sequence"
msgstr "tentative dobtenir (arg)min/(arg)max d'une séquence vide"
msgstr "tentative d'obtenir (arg)min/(arg)max d'une séquence vide"

#: extmod/ulab/code/numpy/numerical.c
msgid "attempt to get argmin/argmax of an empty sequence"
Expand Down Expand Up @@ -2620,7 +2620,7 @@ msgstr "tampon est plus petit que la taille demandée"

#: extmod/ulab/code/numpy/create.c extmod/ulab/code/utils/utils.c
msgid "buffer size must be a multiple of element size"
msgstr "taille du tampon doit être un multiple de la taille de lélément"
msgstr "taille du tampon doit être un multiple de la taille de l'élément"

#: shared-module/struct/__init__.c
msgid "buffer size must match format"
Expand Down Expand Up @@ -3181,7 +3181,7 @@ msgstr "la fonction a reçu plusieurs valeurs pour l'argument '%q'"

#: extmod/ulab/code/scipy/optimize/optimize.c
msgid "function has the same sign at the ends of interval"
msgstr "la fonction a le même signe aux extrémités de lintervalle"
msgstr "la fonction a le même signe aux extrémités de l'intervalle"

#: extmod/ulab/code/ndarray.c
msgid "function is defined for ndarrays only"
Expand Down Expand Up @@ -4186,11 +4186,11 @@ msgstr "le délai (timeout) doit être < 655.35 secondes"

#: shared-module/sdcardio/SDCard.c
msgid "timeout waiting for v1 card"
msgstr "Délai dexpiration dépassé en attendant une carte v1"
msgstr "Délai d'expiration dépassé en attendant une carte v1"

#: shared-module/sdcardio/SDCard.c
msgid "timeout waiting for v2 card"
msgstr "Délai dexpiration dépassé en attendant une carte v2"
msgstr "Délai d'expiration dépassé en attendant une carte v2"

#: ports/stm/common-hal/pwmio/PWMOut.c
msgid "timer re-init"
Expand Down Expand Up @@ -4390,7 +4390,7 @@ msgstr "width doit être plus que zero"
#: ports/espressif/common-hal/wifi/Radio.c
#: ports/raspberrypi/common-hal/wifi/Radio.c
msgid "wifi is not enabled"
msgstr "wifi nest pas activé"
msgstr "wifi n'est pas activé"

#: ports/raspberrypi/common-hal/wifi/Monitor.c
msgid "wifi.Monitor not available"
Expand Down
2 changes: 1 addition & 1 deletion locale/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ msgstr "'%s' verwacht op zijn meest r%d"
#: py/emitinlinethumb.c
#, c-format
msgid "'%s' expects {r0, r1, ...}"
msgstr "'%s' verwacht {r0, r1, }"
msgstr "'%s' verwacht {r0, r1, ...}"

#: py/emitinlinextensa.c
#, c-format
Expand Down
Loading