Merge remote-tracking branch 'adafruit/main' into restore-1970-epoch

dhalbert · dhalbert · commit 0d9c4cb7463c · 2021-07-02T09:27:16.000-04:00
diff --git a/locale/ID.po b/locale/ID.po
@@ -154,11 +154,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/cs.po b/locale/cs.po
@@ -150,11 +150,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/de_DE.po b/locale/de_DE.po
@@ -155,11 +155,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/el.po b/locale/el.po
@@ -147,11 +147,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/en_GB.po b/locale/en_GB.po
@@ -156,11 +156,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/es.po b/locale/es.po
@@ -158,11 +158,6 @@ msgstr "%q debe estar entre %d y %d"
 msgid "%q must of type %q"
 msgstr "%q debe ser de tipo %q"
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr "%q debe almacenar bytes"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
@@ -4516,6 +4511,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 "%q must store bytes"
+#~ msgstr "%q debe almacenar bytes"
+
 #~ msgid "Buffer too large and unable to allocate"
 #~ msgstr "Buffer demasiado grande e incapaz de asignar"
 
diff --git a/locale/fil.po b/locale/fil.po
@@ -147,11 +147,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/fr.po b/locale/fr.po
@@ -158,11 +158,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/hi.po b/locale/hi.po
@@ -147,11 +147,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/it_IT.po b/locale/it_IT.po
@@ -157,11 +157,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/ja.po b/locale/ja.po
@@ -152,11 +152,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/ko.po b/locale/ko.po
@@ -148,11 +148,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/nl.po b/locale/nl.po
@@ -150,11 +150,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/pl.po b/locale/pl.po
@@ -152,11 +152,6 @@ msgstr ""
 msgid "%q must of type %q"
 msgstr ""
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr ""
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
diff --git a/locale/pt_BR.po b/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: 2021-06-25 18:00+0000\n"
+"PO-Revision-Date: 2021-06-30 17:19+0000\n"
 "Last-Translator: Wellington Terumi Uemura <wellingtonuemura@gmail.com>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -56,7 +56,7 @@ msgstr " é do tipo %q\n"
 
 #: main.c
 msgid " not found.\n"
-msgstr ""
+msgstr " não encontrado.\n"
 
 #: main.c
 msgid " output:\n"
@@ -156,11 +156,6 @@ msgstr "%q deve estar entre %d e %d"
 msgid "%q must of type %q"
 msgstr "o %q deve ser do tipo %q"
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr "o %q deve armazenar bytes"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
@@ -2093,7 +2088,7 @@ msgstr "Houve um erro na reinicialização SPI"
 
 #: ports/esp32s2/common-hal/busio/SPI.c
 msgid "SPI configuration failed"
-msgstr ""
+msgstr "A configuração SPI falhou"
 
 #: ports/raspberrypi/common-hal/busio/SPI.c
 msgid "SPI peripheral in use"
@@ -4526,6 +4521,9 @@ msgstr "zi deve ser de um tipo float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi deve estar na forma (n_section, 2)"
 
+#~ msgid "%q must store bytes"
+#~ msgstr "o %q deve armazenar bytes"
+
 #~ msgid "Buffer too large and unable to allocate"
 #~ msgstr "O buffer é muito grande e incapaz de alocar"
 
diff --git a/locale/sv.po b/locale/sv.po
@@ -155,11 +155,6 @@ msgstr "%q måste vara mellan %d och %d"
 msgid "%q must of type %q"
 msgstr "%q måste av typen %q"
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr "%q måste lagra bytes"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
@@ -4485,6 +4480,9 @@ msgstr "zi måste vara av typ float"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi måste vara i formen (n_section, 2)"
 
+#~ msgid "%q must store bytes"
+#~ msgstr "%q måste lagra bytes"
+
 #~ msgid "Buffer too large and unable to allocate"
 #~ msgstr "Bufferten är för stor och kan inte allokeras"
 
diff --git a/locale/zh_Latn_pinyin.po b/locale/zh_Latn_pinyin.po
@@ -157,11 +157,6 @@ msgstr "%q bì xū zài %d hé %d zhī jiān"
 msgid "%q must of type %q"
 msgstr "%q bì xū lèi xíng %q"
 
-#: shared-bindings/keypad/KeyMatrix.c shared-bindings/keypad/Keys.c
-#: shared-bindings/keypad/ShiftRegisterKeys.c
-msgid "%q must store bytes"
-msgstr "%q bì xū cún chǔ zì jié"
-
 #: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
 #: shared-bindings/canio/Match.c
 msgid "%q out of range"
@@ -4482,6 +4477,9 @@ msgstr "zi bìxū wèi fú diǎn xíng"
 msgid "zi must be of shape (n_section, 2)"
 msgstr "zi bìxū jùyǒu xíngzhuàng (n_section,2)"
 
+#~ msgid "%q must store bytes"
+#~ msgstr "%q bì xū cún chǔ zì jié"
+
 #~ msgid "Buffer too large and unable to allocate"
 #~ msgstr "Huǎn chōng qū tài dà , wú fǎ fēn pèi"
 
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
@@ -64,6 +64,7 @@
 #define MICROPY_ENABLE_FINALISER         (1)
 #define MICROPY_ENABLE_GC                (1)
 #define MICROPY_ENABLE_SOURCE_LINE       (1)
+#define MICROPY_EPOCH_IS_1970            (1)
 #define MICROPY_ERROR_REPORTING          (MICROPY_ERROR_REPORTING_NORMAL)
 #define MICROPY_FLOAT_HIGH_QUALITY_HASH  (0)
 #define MICROPY_FLOAT_IMPL               (MICROPY_FLOAT_IMPL_FLOAT)
