Merge remote-tracking branch 'origin/6.0.x' into merge-6.0.x

There were conflicts in ports/nrf/common-hal/_bleio/Adapter.c and shared-bindings/_bleio/Adapter.c that I resolved by taking the "main" branch side.  "BLE fixes" was applied via cherry pick to both branches, but "Round BLE timing values; fix timeout check" was applied only on the main, which git couldn't resolve on its own.

There was a conflict in circuitpython.pot that I resolved by regenerating the file with `make translate`.

Author: jepler

locale/circuitpython.pot

@@ -2563,10 +2563,6 @@ msgstr ""
 msgid "data must be of equal length"
 msgstr ""
 
-#: extmod/ulab/code/ndarray.c
-msgid "data type not understood"
-msgstr ""
-
 #: py/parsenum.c
 msgid "decimal numbers not supported"
 msgstr ""
@@ -2885,7 +2881,7 @@ msgid "input and output shapes are not compatible"
 msgstr ""
 
 #: extmod/ulab/code/ulab_create.c
-msgid "input argument must be an integer, a tuple, or a list"
+msgid "input argument must be an integer or a 2-tuple"
 msgstr ""
 
 #: extmod/ulab/code/fft/fft.c
@@ -3128,10 +3124,6 @@ msgstr ""
 msgid "maxiter should be > 0"
 msgstr ""
 
-#: extmod/ulab/code/numerical/numerical.c
-msgid "median argument must be an ndarray"
-msgstr ""
-
 #: py/runtime.c
 #, c-format
 msgid "memory allocation failed, allocating %u bytes"
@@ -3365,6 +3357,10 @@ msgstr ""
 msgid "operation is implemented for 1D Boolean arrays only"
 msgstr ""
 
+#: extmod/ulab/code/numerical/numerical.c
+msgid "operation is not implemented for flattened array"
+msgstr ""
+
 #: extmod/ulab/code/numerical/numerical.c
 msgid "operation is not implemented on ndarrays"
 msgstr ""
@@ -3714,10 +3710,6 @@ msgstr ""
 msgid "too many arguments provided with the given format"
 msgstr ""
 
-#: extmod/ulab/code/ulab_create.c
-msgid "too many dimensions"
-msgstr ""
-
 #: extmod/ulab/code/ndarray.c
 msgid "too many indices"
 msgstr ""
@@ -3727,10 +3719,6 @@ msgstr ""
 msgid "too many values to unpack (expected %d)"
 msgstr ""
 
-#: extmod/ulab/code/approx/approx.c
-msgid "trapz is defined for 1D arrays"
-msgstr ""
-
 #: extmod/ulab/code/approx/approx.c
 msgid "trapz is defined for 1D arrays of equal length"
 msgstr ""
@@ -3739,6 +3727,10 @@ msgstr ""
 msgid "trigger level must be 0 or 1"
 msgstr ""
 
+#: extmod/ulab/code/linalg/linalg.c
+msgid "tuple index out of range"
+msgstr ""
+
 #: py/obj.c
 msgid "tuple/list has wrong length"
 msgstr ""

ports/unix/Makefile

@@ -318,3 +318,5 @@ $(BUILD)/libaxtls.a: $(TOP)/lib/axtls/README | $(OBJ_DIRS)
 $(TOP)/lib/axtls/README:
 	@echo "You cloned without --recursive, fetching submodules for you."
 	(cd $(TOP); git submodule update --init --recursive)
+
+$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h