Merge adafruit/main latest

1 files changed, 35 insertions, 17 deletions

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index d697f15c8..c8a24ef67 100644
--- a/locale/circuitpython.pot
+++ b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-14 14:20-0500\n"
+"POT-Creation-Date: 2020-08-21 14:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -82,6 +82,7 @@ msgstr ""
 msgid "%q list must be a list"
 msgstr ""
 
+#: shared-bindings/memorymonitor/AllocationAlarm 2.c
 #: shared-bindings/memorymonitor/AllocationAlarm.c
 msgid "%q must be >= 0"
 msgstr ""
@@ -89,6 +90,7 @@ msgstr ""
 #: shared-bindings/_bleio/CharacteristicBuffer.c
 #: shared-bindings/_bleio/PacketBuffer.c shared-bindings/displayio/Group.c
 #: shared-bindings/displayio/Shape.c
+#: shared-bindings/memorymonitor/AllocationAlarm 2.c
 #: shared-bindings/memorymonitor/AllocationAlarm.c
 #: shared-bindings/vectorio/Circle.c shared-bindings/vectorio/Rectangle.c
 msgid "%q must be >= 1"
@@ -330,7 +332,9 @@ msgstr ""
 msgid "Already advertising."
 msgstr ""
 
+#: shared-module/memorymonitor/AllocationAlarm 2.c
 #: shared-module/memorymonitor/AllocationAlarm.c
+#: shared-module/memorymonitor/AllocationSize 2.c
 #: shared-module/memorymonitor/AllocationSize.c
 msgid "Already running"
 msgstr ""
@@ -370,6 +374,7 @@ msgstr ""
 msgid "At most %d %q may be specified (not %d)"
 msgstr ""
 
+#: shared-module/memorymonitor/AllocationAlarm 2.c
 #: shared-module/memorymonitor/AllocationAlarm.c
 #, c-format
 msgid "Attempt to allocate %d blocks"
@@ -451,7 +456,8 @@ msgid "Buffer length %d too big. It must be less than %d"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/sdioio/SDCard.c
-#: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard.c
+#: ports/cxd56/common-hal/sdioio/SDCard.c shared-module/sdcardio/SDCard 2.c
+#: shared-module/sdcardio/SDCard.c
 msgid "Buffer length must be a multiple of 512"
 msgstr ""
 
@@ -503,6 +509,7 @@ msgid "Cannot blit: source palette too large."
 msgstr ""
 
 #: shared-bindings/displayio/Bitmap.c
+#: shared-bindings/memorymonitor/AllocationSize 2.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c
 msgid "Cannot delete values"
@@ -756,7 +763,7 @@ msgstr ""
 
 #: shared-bindings/aesio/aes.c shared-bindings/busio/SPI.c
 #: shared-bindings/microcontroller/Pin.c
-#: shared-bindings/neopixel_write/__init__.c shared-bindings/pulseio/PulseOut.c
+#: shared-bindings/neopixel_write/__init__.c
 #: shared-bindings/terminalio/Terminal.c
 msgid "Expected a %q"
 msgstr ""
@@ -924,7 +931,7 @@ msgstr ""
 msgid "Internal error #%d"
 msgstr ""
 
-#: shared-bindings/sdioio/SDCard.c
+#: shared-bindings/sdioio/SDCard 2.c shared-bindings/sdioio/SDCard.c
 msgid "Invalid %q"
 msgstr ""
 
@@ -1340,6 +1347,15 @@ msgstr ""
 msgid "Polygon needs at least 3 points"
 msgstr ""
 
+#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
+#: ports/cxd56/common-hal/pulseio/PulseOut.c
+#: ports/nrf/common-hal/pulseio/PulseOut.c
+#: ports/stm/common-hal/pulseio/PulseOut.c
+msgid ""
+"Port does not accept pins or frequency.                                     "
+"Construct and pass a PWMOut Carrier instead"
+msgstr ""
+
 #: shared-bindings/_bleio/Adapter.c
 msgid "Prefix buffer must be on the heap"
 msgstr ""
@@ -1382,6 +1398,7 @@ msgstr ""
 msgid "Random number generation error"
 msgstr ""
 
+#: shared-bindings/memorymonitor/AllocationSize 2.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c
 msgid "Read-only"
@@ -1415,7 +1432,7 @@ msgstr ""
 msgid "Running in safe mode! "
 msgstr ""
 
-#: shared-module/sdcardio/SDCard.c
+#: shared-module/sdcardio/SDCard 2.c shared-module/sdcardio/SDCard.c
 msgid "SD card CSD format not supported"
 msgstr ""
 
@@ -1474,6 +1491,7 @@ msgstr ""
 
 #: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c
 #: shared-bindings/displayio/TileGrid.c
+#: shared-bindings/memorymonitor/AllocationSize 2.c
 #: shared-bindings/memorymonitor/AllocationSize.c
 #: shared-bindings/pulseio/PulseIn.c
 msgid "Slices not supported"
@@ -1499,7 +1517,7 @@ msgstr ""
 msgid "Supply at least one UART pin"
 msgstr ""
 
-#: shared-bindings/gnss/GNSS.c
+#: shared-bindings/gnss/GNSS 2.c shared-bindings/gnss/GNSS.c
 msgid "System entry must be gnss.SatelliteSystem"
 msgstr ""
 
@@ -1803,10 +1821,12 @@ msgstr ""
 msgid "address %08x is not aligned to %d bytes"
 msgstr ""
 
+#: shared-bindings/i2cperipheral/I2CPeripheral 2.c
 #: shared-bindings/i2cperipheral/I2CPeripheral.c
 msgid "address out of bounds"
 msgstr ""
 
+#: shared-bindings/i2cperipheral/I2CPeripheral 2.c
 #: shared-bindings/i2cperipheral/I2CPeripheral.c
 msgid "addresses is empty"
 msgstr ""
@@ -1969,7 +1989,9 @@ msgstr ""
 msgid "can't assign to expression"
 msgstr ""
 
-#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral.c
+#: py/obj.c py/objint.c shared-bindings/i2cperipheral/I2CPeripheral 2.c
+#: shared-bindings/i2cperipheral/I2CPeripheral.c
+#: shared-module/_pixelbuf/PixelBuf.c
 msgid "can't convert %q to %q"
 msgstr ""
 
@@ -2029,7 +2051,7 @@ msgstr ""
 msgid "can't send non-None value to a just-started generator"
 msgstr ""
 
-#: shared-module/sdcardio/SDCard.c
+#: shared-module/sdcardio/SDCard 2.c shared-module/sdcardio/SDCard.c
 msgid "can't set 512 block size"
 msgstr ""
 
@@ -2159,7 +2181,7 @@ msgstr ""
 msgid "could not invert Vandermonde matrix"
 msgstr ""
 
-#: shared-module/sdcardio/SDCard.c
+#: shared-module/sdcardio/SDCard 2.c shared-module/sdcardio/SDCard.c
 msgid "couldn't determine SD card version"
 msgstr ""
 
@@ -2717,7 +2739,7 @@ msgstr ""
 msgid "negative shift count"
 msgstr ""
 
-#: shared-module/sdcardio/SDCard.c
+#: shared-module/sdcardio/SDCard 2.c shared-module/sdcardio/SDCard.c
 msgid "no SD card"
 msgstr ""
 
@@ -2742,7 +2764,7 @@ msgstr ""
 msgid "no reset pin available"
 msgstr ""
 
-#: shared-module/sdcardio/SDCard.c
+#: shared-module/sdcardio/SDCard 2.c shared-module/sdcardio/SDCard.c
 msgid "no response from SD card"
 msgstr ""
 
@@ -3130,11 +3152,11 @@ msgstr ""
 msgid "timeout must be >= 0.0"
 msgstr ""
 
-#: shared-module/sdcardio/SDCard.c
+#: shared-module/sdcardio/SDCard 2.c shared-module/sdcardio/SDCard.c
 msgid "timeout waiting for v1 card"
 msgstr ""
 
-#: shared-module/sdcardio/SDCard.c
+#: shared-module/sdcardio/SDCard 2.c shared-module/sdcardio/SDCard.c
 msgid "timeout waiting for v2 card"
 msgstr ""
 
@@ -3167,10 +3189,6 @@ msgstr ""
 msgid "tuple/list has wrong length"
 msgstr ""
 
-#: shared-bindings/_pixelbuf/PixelBuf.c
-msgid "tuple/list required on RHS"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
 #: shared-bindings/busio/UART.c
 msgid "tx and rx cannot both be None"