Skip to content

Commit 35cfc61

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#1746 from tannewt/fix_bitmap_wrap
Support multi-byte values with Bitmap
2 parents 5b0c1c8 + 99b4913 commit 35cfc61

File tree

15 files changed

+242
-255
lines changed

15 files changed

+242
-255
lines changed

‎locale/ID.po

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-04-02 13:43+1100\n"
11+
"POT-Creation-Date: 2019-04-04 13:37-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgid "%q indices must be integers, not %s"
5353
msgstr ""
5454

5555
#: shared-bindings/bleio/CharacteristicBuffer.c
56-
#: shared-bindings/displayio/Shape.c shared-bindings/displayio/Group.c
56+
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
5757
#, fuzzy
5858
msgid "%q must be >= 1"
5959
msgstr "buffers harus mempunyai panjang yang sama"
@@ -254,8 +254,8 @@ msgid "All timers for this pin are in use"
254254
msgstr "Semua timer untuk pin ini sedang digunakan"
255255

256256
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
257-
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
258257
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
258+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
259259
#: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c
260260
#: shared-module/_pew/PewPew.c
261261
msgid "All timers in use"
@@ -513,8 +513,8 @@ msgstr ""
513513
msgid "Drive mode not used when direction is input."
514514
msgstr ""
515515

516-
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
517516
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
517+
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
518518
msgid "EXTINT channel already in use"
519519
msgstr "Channel EXTINT sedang digunakan"
520520

@@ -532,8 +532,8 @@ msgstr ""
532532
msgid "Expected a Characteristic"
533533
msgstr ""
534534

535-
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Service.c
536-
#: shared-bindings/bleio/Descriptor.c
535+
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
536+
#: shared-bindings/bleio/Service.c
537537
msgid "Expected a UUID"
538538
msgstr ""
539539

@@ -721,7 +721,7 @@ msgid "Frequency captured is above capability. Capture Paused."
721721
msgstr ""
722722

723723
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
724-
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
724+
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
725725
msgid "Function requires lock"
726726
msgstr ""
727727

@@ -768,6 +768,10 @@ msgstr ""
768768
msgid "Invalid bit clock pin"
769769
msgstr "Bit clock pada pin tidak valid"
770770

771+
#: shared-module/displayio/Bitmap.c
772+
msgid "Invalid bits per value"
773+
msgstr ""
774+
771775
#: ports/nrf/common-hal/busio/UART.c
772776
msgid "Invalid buffer size"
773777
msgstr "Ukuran buffer tidak valid"
@@ -824,8 +828,8 @@ msgid "Invalid pin for right channel"
824828
msgstr "Pin untuk channel kanan tidak valid"
825829

826830
#: ports/atmel-samd/common-hal/busio/I2C.c
827-
#: ports/atmel-samd/common-hal/busio/UART.c
828831
#: ports/atmel-samd/common-hal/busio/SPI.c
832+
#: ports/atmel-samd/common-hal/busio/UART.c
829833
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
830834
#: ports/nrf/common-hal/busio/I2C.c
831835
msgid "Invalid pins"
@@ -940,8 +944,8 @@ msgstr "Tidak ada GCLK yang kosong"
940944
msgid "No hardware random available"
941945
msgstr ""
942946

943-
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
944947
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
948+
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
945949
msgid "No hardware support on pin"
946950
msgstr "Tidak ada dukungan hardware untuk pin"
947951

@@ -981,10 +985,6 @@ msgid ""
981985
"Only Windows format, uncompressed BMP supported: given header size is %d"
982986
msgstr ""
983987

984-
#: shared-module/displayio/Bitmap.c
985-
msgid "Only bit maps of 8 bit color or less are supported"
986-
msgstr ""
987-
988988
#: shared-module/displayio/OnDiskBitmap.c
989989
#, c-format
990990
msgid ""
@@ -1101,8 +1101,8 @@ msgstr "Serializer sedang digunakan"
11011101
msgid "Slice and value different lengths."
11021102
msgstr ""
11031103

1104-
#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c
1105-
#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c
1104+
#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c
1105+
#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c
11061106
msgid "Slices not supported"
11071107
msgstr ""
11081108

@@ -2315,10 +2315,6 @@ msgstr "anotasi return harus sebuah identifier"
23152315
msgid "return expected '%q' but got '%q'"
23162316
msgstr ""
23172317

2318-
#: shared-module/displayio/Bitmap.c
2319-
msgid "row must be packed and word aligned"
2320-
msgstr ""
2321-
23222318
#: py/objstr.c
23232319
msgid "rsplit(None,n)"
23242320
msgstr ""

‎locale/circuitpython.pot

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-04-02 13:43+1100\n"
11+
"POT-Creation-Date: 2019-04-04 13:37-0700\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgid "%q indices must be integers, not %s"
5353
msgstr ""
5454

5555
#: shared-bindings/bleio/CharacteristicBuffer.c
56-
#: shared-bindings/displayio/Shape.c shared-bindings/displayio/Group.c
56+
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
5757
msgid "%q must be >= 1"
5858
msgstr ""
5959

@@ -252,8 +252,8 @@ msgid "All timers for this pin are in use"
252252
msgstr ""
253253

254254
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
255-
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
256255
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
256+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
257257
#: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c
258258
#: shared-module/_pew/PewPew.c
259259
msgid "All timers in use"
@@ -501,8 +501,8 @@ msgstr ""
501501
msgid "Drive mode not used when direction is input."
502502
msgstr ""
503503

504-
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
505504
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
505+
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
506506
msgid "EXTINT channel already in use"
507507
msgstr ""
508508

@@ -520,8 +520,8 @@ msgstr ""
520520
msgid "Expected a Characteristic"
521521
msgstr ""
522522

523-
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Service.c
524-
#: shared-bindings/bleio/Descriptor.c
523+
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
524+
#: shared-bindings/bleio/Service.c
525525
msgid "Expected a UUID"
526526
msgstr ""
527527

@@ -696,7 +696,7 @@ msgid "Frequency captured is above capability. Capture Paused."
696696
msgstr ""
697697

698698
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
699-
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
699+
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
700700
msgid "Function requires lock"
701701
msgstr ""
702702

@@ -743,6 +743,10 @@ msgstr ""
743743
msgid "Invalid bit clock pin"
744744
msgstr ""
745745

746+
#: shared-module/displayio/Bitmap.c
747+
msgid "Invalid bits per value"
748+
msgstr ""
749+
746750
#: ports/nrf/common-hal/busio/UART.c
747751
msgid "Invalid buffer size"
748752
msgstr ""
@@ -799,8 +803,8 @@ msgid "Invalid pin for right channel"
799803
msgstr ""
800804

801805
#: ports/atmel-samd/common-hal/busio/I2C.c
802-
#: ports/atmel-samd/common-hal/busio/UART.c
803806
#: ports/atmel-samd/common-hal/busio/SPI.c
807+
#: ports/atmel-samd/common-hal/busio/UART.c
804808
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
805809
#: ports/nrf/common-hal/busio/I2C.c
806810
msgid "Invalid pins"
@@ -915,8 +919,8 @@ msgstr ""
915919
msgid "No hardware random available"
916920
msgstr ""
917921

918-
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
919922
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
923+
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
920924
msgid "No hardware support on pin"
921925
msgstr ""
922926

@@ -955,10 +959,6 @@ msgid ""
955959
"Only Windows format, uncompressed BMP supported: given header size is %d"
956960
msgstr ""
957961

958-
#: shared-module/displayio/Bitmap.c
959-
msgid "Only bit maps of 8 bit color or less are supported"
960-
msgstr ""
961-
962962
#: shared-module/displayio/OnDiskBitmap.c
963963
#, c-format
964964
msgid ""
@@ -1071,8 +1071,8 @@ msgstr ""
10711071
msgid "Slice and value different lengths."
10721072
msgstr ""
10731073

1074-
#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c
1075-
#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c
1074+
#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c
1075+
#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c
10761076
msgid "Slices not supported"
10771077
msgstr ""
10781078

@@ -2269,10 +2269,6 @@ msgstr ""
22692269
msgid "return expected '%q' but got '%q'"
22702270
msgstr ""
22712271

2272-
#: shared-module/displayio/Bitmap.c
2273-
msgid "row must be packed and word aligned"
2274-
msgstr ""
2275-
22762272
#: py/objstr.c
22772273
msgid "rsplit(None,n)"
22782274
msgstr ""

‎locale/de_DE.po

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-04-02 13:43+1100\n"
10+
"POT-Creation-Date: 2019-04-04 13:37-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -55,7 +55,7 @@ msgid "%q indices must be integers, not %s"
5555
msgstr "%q Indizes müssen ganze Zahlen sein, nicht %s"
5656

5757
#: shared-bindings/bleio/CharacteristicBuffer.c
58-
#: shared-bindings/displayio/Shape.c shared-bindings/displayio/Group.c
58+
#: shared-bindings/displayio/Group.c shared-bindings/displayio/Shape.c
5959
msgid "%q must be >= 1"
6060
msgstr "%q muss >= 1 sein"
6161

@@ -254,8 +254,8 @@ msgid "All timers for this pin are in use"
254254
msgstr "Alle timer für diesen Pin werden bereits benutzt"
255255

256256
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
257-
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
258257
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
258+
#: ports/atmel-samd/common-hal/pulseio/PulseOut.c
259259
#: ports/nrf/common-hal/pulseio/PulseOut.c shared-bindings/pulseio/PWMOut.c
260260
#: shared-module/_pew/PewPew.c
261261
msgid "All timers in use"
@@ -505,8 +505,8 @@ msgstr "Die Rotation der Anzeige muss in 90-Grad-Schritten erfolgen"
505505
msgid "Drive mode not used when direction is input."
506506
msgstr "Drive mode wird nicht verwendet, wenn die Richtung input ist."
507507

508-
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
509508
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
509+
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
510510
msgid "EXTINT channel already in use"
511511
msgstr "EXTINT Kanal ist schon in Benutzung"
512512

@@ -524,8 +524,8 @@ msgstr "Erwartet ein(e) %q"
524524
msgid "Expected a Characteristic"
525525
msgstr "Characteristic wird erwartet"
526526

527-
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Service.c
528-
#: shared-bindings/bleio/Descriptor.c
527+
#: shared-bindings/bleio/Characteristic.c shared-bindings/bleio/Descriptor.c
528+
#: shared-bindings/bleio/Service.c
529529
msgid "Expected a UUID"
530530
msgstr "Eine UUID wird erwartet"
531531

@@ -700,7 +700,7 @@ msgid "Frequency captured is above capability. Capture Paused."
700700
msgstr ""
701701

702702
#: shared-bindings/bitbangio/I2C.c shared-bindings/bitbangio/SPI.c
703-
#: shared-bindings/busio/SPI.c shared-bindings/busio/I2C.c
703+
#: shared-bindings/busio/I2C.c shared-bindings/busio/SPI.c
704704
msgid "Function requires lock"
705705
msgstr "Die Funktion erwartet, dass der 'lock'-Befehl zuvor ausgeführt wurde"
706706

@@ -749,6 +749,10 @@ msgstr "Ungültiges Argument"
749749
msgid "Invalid bit clock pin"
750750
msgstr "Ungültiges bit clock pin"
751751

752+
#: shared-module/displayio/Bitmap.c
753+
msgid "Invalid bits per value"
754+
msgstr ""
755+
752756
#: ports/nrf/common-hal/busio/UART.c
753757
msgid "Invalid buffer size"
754758
msgstr "Ungültige Puffergröße"
@@ -805,8 +809,8 @@ msgid "Invalid pin for right channel"
805809
msgstr "Ungültiger Pin für rechten Kanal"
806810

807811
#: ports/atmel-samd/common-hal/busio/I2C.c
808-
#: ports/atmel-samd/common-hal/busio/UART.c
809812
#: ports/atmel-samd/common-hal/busio/SPI.c
813+
#: ports/atmel-samd/common-hal/busio/UART.c
810814
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
811815
#: ports/nrf/common-hal/busio/I2C.c
812816
msgid "Invalid pins"
@@ -928,8 +932,8 @@ msgstr "Keine freien GCLKs"
928932
msgid "No hardware random available"
929933
msgstr "Kein hardware random verfügbar"
930934

931-
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
932935
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
936+
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
933937
msgid "No hardware support on pin"
934938
msgstr "Keine Hardwareunterstützung an diesem Pin"
935939

@@ -970,11 +974,6 @@ msgid ""
970974
"Only Windows format, uncompressed BMP supported: given header size is %d"
971975
msgstr ""
972976

973-
#: shared-module/displayio/Bitmap.c
974-
msgid "Only bit maps of 8 bit color or less are supported"
975-
msgstr ""
976-
"Es werden nur Bitmaps mit einer Farbtiefe von 8 Bit oder weniger unterstützt"
977-
978977
#: shared-module/displayio/OnDiskBitmap.c
979978
#, c-format
980979
msgid ""
@@ -1089,8 +1088,8 @@ msgstr "Serializer wird benutzt"
10891088
msgid "Slice and value different lengths."
10901089
msgstr "Slice und Wert (value) haben unterschiedliche Längen."
10911090

1092-
#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/TileGrid.c
1093-
#: shared-bindings/displayio/Group.c shared-bindings/pulseio/PulseIn.c
1091+
#: shared-bindings/displayio/Bitmap.c shared-bindings/displayio/Group.c
1092+
#: shared-bindings/displayio/TileGrid.c shared-bindings/pulseio/PulseIn.c
10941093
msgid "Slices not supported"
10951094
msgstr "Slices werden nicht unterstützt"
10961095

@@ -2319,10 +2318,6 @@ msgstr "return annotation muss ein identifier sein"
23192318
msgid "return expected '%q' but got '%q'"
23202319
msgstr ""
23212320

2322-
#: shared-module/displayio/Bitmap.c
2323-
msgid "row must be packed and word aligned"
2324-
msgstr ""
2325-
23262321
#: py/objstr.c
23272322
msgid "rsplit(None,n)"
23282323
msgstr ""
@@ -2716,6 +2711,11 @@ msgstr ""
27162711
#~ msgid "Only Windows format, uncompressed BMP supported %d"
27172712
#~ msgstr "Nur unkomprimiertes Windows-Format (BMP) unterstützt %d"
27182713

2714+
#~ msgid "Only bit maps of 8 bit color or less are supported"
2715+
#~ msgstr ""
2716+
#~ "Es werden nur Bitmaps mit einer Farbtiefe von 8 Bit oder weniger "
2717+
#~ "unterstützt"
2718+
27192719
#~ msgid "Only tx supported on UART1 (GPIO2)."
27202720
#~ msgstr "UART1 (GPIO2) unterstützt nur tx"
27212721

0 commit comments

Comments
 (0)