Merge branch 'main' into webflow_edit_page

# Conflicts:
#	supervisor/shared/web_workflow/web_workflow.c

Author: FoamyGuy

locale/ID.po

@@ -211,6 +211,10 @@ msgstr "%q() mengambil posisi argumen %d tapi %d yang diberikan"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, dan %q semuanya harus memiliki panjang yang sama"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/circuitpython.pot

@@ -205,6 +205,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/cs.po

@@ -212,6 +212,10 @@ msgstr "%q() vyžaduje %d pozičních argumentů, ale %d jich bylo zadáno"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, a %q musí mít všechny shodnou délku"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/de_DE.po

@@ -214,6 +214,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q und %q müssen alle die gleiche Länge haben"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/el.po

@@ -205,6 +205,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/en_GB.po

@@ -215,6 +215,10 @@ msgstr "%q() takes %d positional arguments but %d were given"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, and %q must all be the same length"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/es.po

@@ -214,6 +214,10 @@ msgstr "%q() toma %d argumentos posicionales pero %d fueron dados"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/fil.po

@@ -208,6 +208,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/fr.po

@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-07-06 05:15+0000\n"
+"PO-Revision-Date: 2022-07-19 23:15+0000\n"
 "Last-Translator: Maxime Leroy <[email protected]>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"X-Generator: Weblate 4.14-dev\n"
 
 #: main.c
 msgid ""
@@ -217,6 +217,10 @@ msgstr "%q() prend %d paramètres positionnels mais %d ont été donnés"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, et %q doivent tous être de la même longueur"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
@@ -2291,7 +2295,7 @@ msgstr "Format non supporté"
 
 #: shared-bindings/hashlib/__init__.c
 msgid "Unsupported hash algorithm"
-msgstr ""
+msgstr "Algorithme de hachage non supporté"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
@@ -2459,7 +2463,7 @@ msgstr "la taille de la matrice et de l'index doivent être égaux"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "array has too many dimensions"
-msgstr ""
+msgstr "la tableau à trop de dimensions"
 
 #: py/objarray.c shared-bindings/alarm/SleepMemory.c
 #: shared-bindings/nvm/ByteArray.c
@@ -2840,7 +2844,7 @@ msgstr "les arguments convolve ne doivent pas être vides"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "corrupted file"
-msgstr ""
+msgstr "fichier corrompu"
 
 #: extmod/ulab/code/numpy/poly.c
 msgid "could not invert Vandermonde matrix"
@@ -2938,7 +2942,7 @@ msgstr "vide"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "empty file"
-msgstr ""
+msgstr "fichier vide"
 
 #: extmod/moduasyncio.c extmod/moduheapq.c extmod/modutimeq.c
 msgid "empty heap"
@@ -3261,7 +3265,7 @@ msgstr "la matrice d'entrée est singulière"
 
 #: extmod/ulab/code/numpy/create.c
 msgid "input must be 1- or 2-d"
-msgstr ""
+msgstr "l'entrée doit être 1D ou 2D"
 
 #: extmod/ulab/code/numpy/carray/carray.c
 msgid "input must be a 1D ndarray"
@@ -3479,7 +3483,7 @@ msgstr "max_length doit être 0-%d lorsque fixed_length est %s"
 
 #: extmod/ulab/code/ndarray.c
 msgid "maximum number of dimensions is "
-msgstr ""
+msgstr "le nombre maximal de dimensions est "
 
 #: py/runtime.c
 msgid "maximum recursion depth exceeded"
@@ -3883,7 +3887,7 @@ msgstr "pow() avec 3 arguments nécessite des entiers"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
-msgstr ""
+msgstr "presser le bouton SW38 au démarrage.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
@@ -4327,11 +4331,11 @@ msgstr "types non supportés pour %q: '%q', '%q'"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols is too high"
-msgstr ""
+msgstr "usecols est trop grand"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "usecols keyword must be specified"
-msgstr ""
+msgstr "le mot-clé \"usecols\" doit être spécifié"
 
 #: py/objint.c
 #, c-format
@@ -4376,7 +4380,7 @@ msgstr "axe incorrecte spécifiée"
 
 #: extmod/ulab/code/numpy/io/io.c
 msgid "wrong dtype"
-msgstr ""
+msgstr "dtype invalide"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong index type"
@@ -4394,7 +4398,7 @@ msgstr "mauvaise taille du tableau de condition"
 
 #: extmod/ulab/code/numpy/transform.c
 msgid "wrong length of index array"
-msgstr ""
+msgstr "mauvaise longueur du tableau d'indices"
 
 #: extmod/ulab/code/numpy/create.c py/objarray.c py/objstr.c
 msgid "wrong number of arguments"

locale/hi.po

@@ -205,6 +205,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/it_IT.po

@@ -213,6 +213,10 @@ msgstr "%q() prende %d argomenti posizionali ma ne sono stati forniti %d"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/ja.po

@@ -210,6 +210,10 @@ msgstr "%q() は %d 個の位置引数を取りますが、%d 個与えられま
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/ko.po

@@ -206,6 +206,10 @@ msgstr ""
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/nl.po

@@ -208,6 +208,10 @@ msgstr "%q() verwacht %d positionele argumenten maar kreeg %d"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/pl.po

@@ -210,6 +210,10 @@ msgstr "%q() bierze %d argumentów pozycyjnych, lecz podano %d"
 msgid "%q, %q, and %q must all be the same length"
 msgstr ""
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/pt_BR.po

@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-07-12 13:10+0000\n"
+"PO-Revision-Date: 2022-07-24 22:22+0000\n"
 "Last-Translator: Wellington Terumi Uemura <[email protected]>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -214,6 +214,10 @@ msgstr "%q() recebe %d argumentos posicionais, porém %d foram informados"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "todos os %q, %q, e %q devem ter mesmo comprimento"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr "%q=%q"
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"
@@ -2273,7 +2277,7 @@ msgstr "Formato não suportado"
 
 #: shared-bindings/hashlib/__init__.c
 msgid "Unsupported hash algorithm"
-msgstr ""
+msgstr "Sem compatibilidade com o algoritmo de hash"
 
 #: ports/espressif/common-hal/dualbank/__init__.c
 msgid "Update Failed"
@@ -3860,7 +3864,7 @@ msgstr "o pow() com 3 argumentos requer números inteiros"
 
 #: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
 msgid "pressing SW38 button at start up.\n"
-msgstr ""
+msgstr "pressionando o botão SW38 na inicialização.\n"
 
 #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
 #: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h

locale/ru.po

@@ -213,6 +213,10 @@ msgstr "%q() принимает %d позиционных аргументов,
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, и %q должны быть одной длинны"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/sv.po

@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2022-07-14 18:05+0000\n"
+"PO-Revision-Date: 2022-07-21 20:15+0000\n"
 "Last-Translator: Jonny Bergdahl <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: sv\n"
@@ -213,6 +213,10 @@ msgstr "% q() tar %d positionsargument men %d gavs"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q och %q måste vara lika långa"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr "%q=%q"
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/tr.po

@@ -217,6 +217,10 @@ msgstr "%q(), %d konumsal argümanını alır ancak %d verildi"
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q ve %q aynı uzunlukta olmalıdır"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

locale/zh_Latn_pinyin.po

@@ -216,6 +216,10 @@ msgstr "%q() yāoqiú shūrù %d gè wèizhì cānshù, dàn mùqián shūrù le
 msgid "%q, %q, and %q must all be the same length"
 msgstr "%q, %q, hé %q bì xū cháng dù xiāng tóng"
 
+#: py/objint.c
+msgid "%q=%q"
+msgstr ""
+
 #: ports/espressif/bindings/espidf/__init__.c ports/espressif/esp_error.c
 #, c-format
 msgid "%s error 0x%x"

ports/atmel-samd/mpconfigport.mk

@@ -61,17 +61,12 @@ endif
 
 MICROPY_PY_ASYNC_AWAIT = 0
 
-# We don't have room for the fonts for terminalio for ja and ko
+# We don't have room for the fonts for terminalio for certain languages,
 # so turn off terminalio, and if it's off and displayio is on,
 # force a clean build.
 # Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
 # ifeq, because it's not set yet.
-ifeq ($(TRANSLATION), ja)
-CIRCUITPY_TERMINALIO = 0
-RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
-endif
-
-ifeq ($(TRANSLATION), ko)
+ifneq (,$(filter $(TRANSLATION),ja ko ru))
 CIRCUITPY_TERMINALIO = 0
 RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
 endif