Skip to content

Commit 8811d22

Browse files
mahollimaholli
authored
Merge branch 'adafruit:main' into samd-sleep
2 parents 7cbcc2f + 9d95292 commit 8811d22

32 files changed

+487
-971
lines changed

‎locale/ID.po

Lines changed: 26 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ msgstr ""
110110
msgid "%q length must be >= 1"
111111
msgstr ""
112112

113-
#: shared-bindings/vectorio/Polygon.c
114-
msgid "%q list must be a list"
115-
msgstr "daftar %q harus berupa daftar"
116-
117113
#: py/argcheck.c
118114
msgid "%q must <= %d"
119115
msgstr ""
@@ -151,12 +147,12 @@ msgstr "%q harus berupa tuple dengan panjang 2"
151147
msgid "%q must be between %d and %d"
152148
msgstr ""
153149

154-
#: ports/atmel-samd/common-hal/busio/UART.c
155-
msgid "%q must be power of 2"
150+
#: py/argcheck.c
151+
msgid "%q must be of type %q"
156152
msgstr ""
157153

158-
#: py/argcheck.c
159-
msgid "%q must of type %q"
154+
#: ports/atmel-samd/common-hal/busio/UART.c
155+
msgid "%q must be power of 2"
160156
msgstr ""
161157

162158
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -800,10 +796,6 @@ msgstr "Peregangan clock terlalu panjang"
800796
msgid "Clock unit in use"
801797
msgstr "Clock unit sedang digunakan"
802798

803-
#: shared-bindings/_pew/PewPew.c
804-
msgid "Column entry must be digitalio.DigitalInOut"
805-
msgstr "Entri kolom harus digitalio.DigitalInOut"
806-
807799
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
808800
#: shared-bindings/paralleldisplay/ParallelBus.c
809801
msgid "Command must be an int between 0 and 255"
@@ -980,36 +972,9 @@ msgstr ""
980972
#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
981973
#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
982974
#: shared-bindings/neopixel_write/__init__.c
983-
#: shared-bindings/terminalio/Terminal.c
984975
msgid "Expected a %q"
985976
msgstr "Diharapkan %q"
986977

987-
#: shared-bindings/_bleio/CharacteristicBuffer.c
988-
#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
989-
msgid "Expected a Characteristic"
990-
msgstr "Diharapkan sebuah Karakteristik"
991-
992-
#: shared-bindings/_bleio/Adapter.c
993-
msgid "Expected a DigitalInOut"
994-
msgstr ""
995-
996-
#: shared-bindings/_bleio/Characteristic.c
997-
msgid "Expected a Service"
998-
msgstr "Diharapkan sebuah Layanan"
999-
1000-
#: shared-bindings/_bleio/Adapter.c
1001-
msgid "Expected a UART"
1002-
msgstr ""
1003-
1004-
#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
1005-
#: shared-bindings/_bleio/Service.c
1006-
msgid "Expected a UUID"
1007-
msgstr "Diharapkan sebuah UUID"
1008-
1009-
#: shared-bindings/_bleio/Adapter.c
1010-
msgid "Expected an Address"
1011-
msgstr "Diharapkan sebuah Alamat"
1012-
1013978
#: shared-bindings/alarm/__init__.c
1014979
msgid "Expected an alarm"
1015980
msgstr ""
@@ -2064,10 +2029,6 @@ msgstr ""
20642029
msgid "Right channel unsupported"
20652030
msgstr "Channel Kanan tidak didukung"
20662031

2067-
#: shared-bindings/_pew/PewPew.c
2068-
msgid "Row entry must be digitalio.DigitalInOut"
2069-
msgstr "Entri baris harus digitalio.DigitalInOut"
2070-
20712032
#: main.c
20722033
msgid "Running in safe mode! Not running saved code.\n"
20732034
msgstr ""
@@ -2713,10 +2674,6 @@ msgstr ""
27132674
msgid "buffer too small for requested bytes"
27142675
msgstr ""
27152676

2716-
#: shared-bindings/_pew/PewPew.c
2717-
msgid "buttons must be digitalio.DigitalInOut"
2718-
msgstr ""
2719-
27202677
#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
27212678
msgid "byteorder is not a string"
27222679
msgstr ""
@@ -3503,7 +3460,7 @@ msgstr ""
35033460
msgid "invalid syntax for number"
35043461
msgstr ""
35053462

3506-
#: py/objexcept.c shared-bindings/traceback/__init__.c
3463+
#: py/objexcept.c
35073464
msgid "invalid traceback"
35083465
msgstr ""
35093466

@@ -4543,6 +4500,27 @@ msgstr "zi harus berjenis float"
45434500
msgid "zi must be of shape (n_section, 2)"
45444501
msgstr ""
45454502

4503+
#~ msgid "%q list must be a list"
4504+
#~ msgstr "daftar %q harus berupa daftar"
4505+
4506+
#~ msgid "Column entry must be digitalio.DigitalInOut"
4507+
#~ msgstr "Entri kolom harus digitalio.DigitalInOut"
4508+
4509+
#~ msgid "Expected a Characteristic"
4510+
#~ msgstr "Diharapkan sebuah Karakteristik"
4511+
4512+
#~ msgid "Expected a Service"
4513+
#~ msgstr "Diharapkan sebuah Layanan"
4514+
4515+
#~ msgid "Expected a UUID"
4516+
#~ msgstr "Diharapkan sebuah UUID"
4517+
4518+
#~ msgid "Expected an Address"
4519+
#~ msgstr "Diharapkan sebuah Alamat"
4520+
4521+
#~ msgid "Row entry must be digitalio.DigitalInOut"
4522+
#~ msgstr "Entri baris harus digitalio.DigitalInOut"
4523+
45464524
#~ msgid "ParallelBus not yet supported"
45474525
#~ msgstr "ParallelBus belum didukung"
45484526

‎locale/circuitpython.pot

Lines changed: 5 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ msgstr ""
103103
msgid "%q length must be >= 1"
104104
msgstr ""
105105

106-
#: shared-bindings/vectorio/Polygon.c
107-
msgid "%q list must be a list"
108-
msgstr ""
109-
110106
#: py/argcheck.c
111107
msgid "%q must <= %d"
112108
msgstr ""
@@ -144,12 +140,12 @@ msgstr ""
144140
msgid "%q must be between %d and %d"
145141
msgstr ""
146142

147-
#: ports/atmel-samd/common-hal/busio/UART.c
148-
msgid "%q must be power of 2"
143+
#: py/argcheck.c
144+
msgid "%q must be of type %q"
149145
msgstr ""
150146

151-
#: py/argcheck.c
152-
msgid "%q must of type %q"
147+
#: ports/atmel-samd/common-hal/busio/UART.c
148+
msgid "%q must be power of 2"
153149
msgstr ""
154150

155151
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -783,10 +779,6 @@ msgstr ""
783779
msgid "Clock unit in use"
784780
msgstr ""
785781

786-
#: shared-bindings/_pew/PewPew.c
787-
msgid "Column entry must be digitalio.DigitalInOut"
788-
msgstr ""
789-
790782
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
791783
#: shared-bindings/paralleldisplay/ParallelBus.c
792784
msgid "Command must be an int between 0 and 255"
@@ -962,36 +954,9 @@ msgstr ""
962954
#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
963955
#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
964956
#: shared-bindings/neopixel_write/__init__.c
965-
#: shared-bindings/terminalio/Terminal.c
966957
msgid "Expected a %q"
967958
msgstr ""
968959

969-
#: shared-bindings/_bleio/CharacteristicBuffer.c
970-
#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
971-
msgid "Expected a Characteristic"
972-
msgstr ""
973-
974-
#: shared-bindings/_bleio/Adapter.c
975-
msgid "Expected a DigitalInOut"
976-
msgstr ""
977-
978-
#: shared-bindings/_bleio/Characteristic.c
979-
msgid "Expected a Service"
980-
msgstr ""
981-
982-
#: shared-bindings/_bleio/Adapter.c
983-
msgid "Expected a UART"
984-
msgstr ""
985-
986-
#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
987-
#: shared-bindings/_bleio/Service.c
988-
msgid "Expected a UUID"
989-
msgstr ""
990-
991-
#: shared-bindings/_bleio/Adapter.c
992-
msgid "Expected an Address"
993-
msgstr ""
994-
995960
#: shared-bindings/alarm/__init__.c
996961
msgid "Expected an alarm"
997962
msgstr ""
@@ -2034,10 +1999,6 @@ msgstr ""
20341999
msgid "Right channel unsupported"
20352000
msgstr ""
20362001

2037-
#: shared-bindings/_pew/PewPew.c
2038-
msgid "Row entry must be digitalio.DigitalInOut"
2039-
msgstr ""
2040-
20412002
#: main.c
20422003
msgid "Running in safe mode! Not running saved code.\n"
20432004
msgstr ""
@@ -2675,10 +2636,6 @@ msgstr ""
26752636
msgid "buffer too small for requested bytes"
26762637
msgstr ""
26772638

2678-
#: shared-bindings/_pew/PewPew.c
2679-
msgid "buttons must be digitalio.DigitalInOut"
2680-
msgstr ""
2681-
26822639
#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
26832640
msgid "byteorder is not a string"
26842641
msgstr ""
@@ -3465,7 +3422,7 @@ msgstr ""
34653422
msgid "invalid syntax for number"
34663423
msgstr ""
34673424

3468-
#: py/objexcept.c shared-bindings/traceback/__init__.c
3425+
#: py/objexcept.c
34693426
msgid "invalid traceback"
34703427
msgstr ""
34713428

‎locale/cs.po

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,6 @@ msgstr ""
106106
msgid "%q length must be >= 1"
107107
msgstr ""
108108

109-
#: shared-bindings/vectorio/Polygon.c
110-
msgid "%q list must be a list"
111-
msgstr "Seznam %q musí být seznam"
112-
113109
#: py/argcheck.c
114110
msgid "%q must <= %d"
115111
msgstr ""
@@ -147,12 +143,12 @@ msgstr "%q musí být n-tice délky 2"
147143
msgid "%q must be between %d and %d"
148144
msgstr ""
149145

150-
#: ports/atmel-samd/common-hal/busio/UART.c
151-
msgid "%q must be power of 2"
146+
#: py/argcheck.c
147+
msgid "%q must be of type %q"
152148
msgstr ""
153149

154-
#: py/argcheck.c
155-
msgid "%q must of type %q"
150+
#: ports/atmel-samd/common-hal/busio/UART.c
151+
msgid "%q must be power of 2"
156152
msgstr ""
157153

158154
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
@@ -786,10 +782,6 @@ msgstr ""
786782
msgid "Clock unit in use"
787783
msgstr ""
788784

789-
#: shared-bindings/_pew/PewPew.c
790-
msgid "Column entry must be digitalio.DigitalInOut"
791-
msgstr ""
792-
793785
#: shared-bindings/displayio/FourWire.c shared-bindings/displayio/I2CDisplay.c
794786
#: shared-bindings/paralleldisplay/ParallelBus.c
795787
msgid "Command must be an int between 0 and 255"
@@ -965,36 +957,9 @@ msgstr ""
965957
#: shared-bindings/_bleio/__init__.c shared-bindings/aesio/aes.c
966958
#: shared-bindings/busio/SPI.c shared-bindings/microcontroller/Pin.c
967959
#: shared-bindings/neopixel_write/__init__.c
968-
#: shared-bindings/terminalio/Terminal.c
969960
msgid "Expected a %q"
970961
msgstr ""
971962

972-
#: shared-bindings/_bleio/CharacteristicBuffer.c
973-
#: shared-bindings/_bleio/Descriptor.c shared-bindings/_bleio/PacketBuffer.c
974-
msgid "Expected a Characteristic"
975-
msgstr ""
976-
977-
#: shared-bindings/_bleio/Adapter.c
978-
msgid "Expected a DigitalInOut"
979-
msgstr ""
980-
981-
#: shared-bindings/_bleio/Characteristic.c
982-
msgid "Expected a Service"
983-
msgstr ""
984-
985-
#: shared-bindings/_bleio/Adapter.c
986-
msgid "Expected a UART"
987-
msgstr ""
988-
989-
#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
990-
#: shared-bindings/_bleio/Service.c
991-
msgid "Expected a UUID"
992-
msgstr ""
993-
994-
#: shared-bindings/_bleio/Adapter.c
995-
msgid "Expected an Address"
996-
msgstr ""
997-
998963
#: shared-bindings/alarm/__init__.c
999964
msgid "Expected an alarm"
1000965
msgstr ""
@@ -2035,10 +2000,6 @@ msgstr ""
20352000
msgid "Right channel unsupported"
20362001
msgstr ""
20372002

2038-
#: shared-bindings/_pew/PewPew.c
2039-
msgid "Row entry must be digitalio.DigitalInOut"
2040-
msgstr ""
2041-
20422003
#: main.c
20432004
msgid "Running in safe mode! Not running saved code.\n"
20442005
msgstr ""
@@ -2674,10 +2635,6 @@ msgstr ""
26742635
msgid "buffer too small for requested bytes"
26752636
msgstr ""
26762637

2677-
#: shared-bindings/_pew/PewPew.c
2678-
msgid "buttons must be digitalio.DigitalInOut"
2679-
msgstr ""
2680-
26812638
#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
26822639
msgid "byteorder is not a string"
26832640
msgstr ""
@@ -3464,7 +3421,7 @@ msgstr ""
34643421
msgid "invalid syntax for number"
34653422
msgstr ""
34663423

3467-
#: py/objexcept.c shared-bindings/traceback/__init__.c
3424+
#: py/objexcept.c
34683425
msgid "invalid traceback"
34693426
msgstr ""
34703427

@@ -4503,6 +4460,9 @@ msgstr ""
45034460
msgid "zi must be of shape (n_section, 2)"
45044461
msgstr ""
45054462

4463+
#~ msgid "%q list must be a list"
4464+
#~ msgstr "Seznam %q musí být seznam"
4465+
45064466
#~ msgid "%q indices must be integers, not %q"
45074467
#~ msgstr "Indexy %q musí být celá čísla, ne %q"
45084468

0 commit comments

Comments
 (0)