Merge branch 'main' into hid_devices-gc

Author: dhalbert

.github/workflows/build.yml

@@ -190,6 +190,7 @@ jobs:
         - "arduino_mkrzero"
         - "arduino_nano_33_ble"
         - "arduino_nano_33_iot"
+        - "arduino_nano_rp2040_connect"
         - "arduino_zero"
         - "bast_pro_mini_m0"
         - "bastble"

data/nvm.toml

@@ -45,11 +45,11 @@ This error occurs when importing a module that is stored as a ``mpy`` binary fil
 (rather than a ``py`` text file) that was generated by a different version of
 CircuitPython than the one it's being loaded into. Most versions are compatible
 but, rarely they aren't. In particular, the ``mpy`` binary format changed between
-CircuitPython versions 1.x and 2.x, and will change again between 2.x and 3.x.
+CircuitPython versions 1.x and 2.x, 2.x and 3.x, and will change again between 6.x and 7.x.
 
-So, for instance, if you just upgraded to CircuitPython 2.x from 1.x you'll need to download a
+So, for instance, if you just upgraded to CircuitPython 7.x from 6.x you'll need to download a
 newer version of the library that triggered the error on ``import``. They are
 all available in the
 `Adafruit bundle <https://github.com/adafruit/Adafruit_CircuitPython_Bundle/releases/latest>`_
 and the `Community bundle <https://github.com/adafruit/CircuitPython_Community_Bundle/releases/latest>`_.
-Make sure to download a version with 2.0.0 or higher in the filename.
+Make sure to download a version with 7.0.0 or higher in the filename.

docs/troubleshooting.rst

@@ -1719,7 +1719,7 @@ msgid "Only one color can be transparent at a time"
 msgstr ""
 
 #: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int supported for ip"
+msgid "Only raw int or string supported for ip"
 msgstr ""
 
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

locale/ID.po

@@ -1672,6 +1672,10 @@ msgstr ""
 msgid "Only edge detection is available on this hardware"
 msgstr ""
 
+#: shared-bindings/ipaddress/__init__.c
+msgid "Only int or string supported for ip"
+msgstr ""
+
 #: shared-module/displayio/OnDiskBitmap.c
 #, c-format
 msgid ""
@@ -1693,10 +1697,6 @@ msgstr ""
 msgid "Only one color can be transparent at a time"
 msgstr ""
 
-#: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int supported for ip"
-msgstr ""
-
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
 msgstr ""

locale/circuitpython.pot

@@ -1697,7 +1697,7 @@ msgid "Only one color can be transparent at a time"
 msgstr ""
 
 #: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int supported for ip"
+msgid "Only raw int or string supported for ip"
 msgstr ""
 
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

locale/cs.po

@@ -1721,7 +1721,7 @@ msgid "Only one color can be transparent at a time"
 msgstr ""
 
 #: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int supported for ip"
+msgid "Only raw int or string supported for ip"
 msgstr ""
 
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

locale/de_DE.po

@@ -1694,7 +1694,7 @@ msgid "Only one color can be transparent at a time"
 msgstr ""
 
 #: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int supported for ip"
+msgid "Only raw int or string supported for ip"
 msgstr ""
 
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c

locale/el.po

@@ -1713,8 +1713,8 @@ msgid "Only one color can be transparent at a time"
 msgstr "Only one colour can be transparent at a time"
 
 #: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int supported for ip"
-msgstr "Only raw int supported for ip"
+msgid "Only raw int or string supported for ip"
+msgstr ""
 
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
@@ -4393,6 +4393,9 @@ msgstr "zi must be of float type"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi must be of shape (n_section, 2)"
 
+#~ msgid "Only raw int supported for ip"
+#~ msgstr "Only raw int supported for ip"
+
 #~ msgid ""
 #~ "CircuitPython is in safe mode because you pressed the reset button during "
 #~ "boot. Press again to exit safe mode.\n"

locale/en_GB.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2021-05-15 15:52+0000\n"
+"PO-Revision-Date: 2021-05-22 17:58+0000\n"
 "Last-Translator: Alvaro Figueroa <[email protected]>\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -1246,7 +1246,7 @@ msgstr "AuthMode invalido"
 
 #: ports/nrf/common-hal/_bleio/__init__.c
 msgid "Invalid BLE parameter"
-msgstr ""
+msgstr "Parámetro BLE invalido"
 
 #: shared-module/displayio/OnDiskBitmap.c
 msgid "Invalid BMP file"
@@ -1737,8 +1737,8 @@ msgid "Only one color can be transparent at a time"
 msgstr "Solo un color puede ser transparente a la vez"
 
 #: shared-bindings/ipaddress/__init__.c
-msgid "Only raw int supported for ip"
-msgstr "Solo se aceptan enteros crudos para ip"
+msgid "Only raw int or string supported for ip"
+msgstr "Para ip solo puede con un entero o una cadena"
 
 #: ports/esp32s2/bindings/espidf/__init__.c ports/esp32s2/esp_error.c
 msgid "Operation or feature not supported"
@@ -4448,6 +4448,9 @@ msgstr "zi debe ser de tipo flotante"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi debe ser una forma (n_section,2)"
 
+#~ msgid "Only raw int supported for ip"
+#~ msgstr "Solo se aceptan enteros crudos para ip"
+
 #~ msgid ""
 #~ "CircuitPython is in safe mode because you pressed the reset button during "
 #~ "boot. Press again to exit safe mode.\n"