8000 Merge branch 'master' of https://github.com/adafruit/circuitpython in… · zencuke/circuitpython@a44bfc2 · GitHub
[go: up one dir, main page]
Skip to content

Commit a44bfc2

Browse files
sommersoftsommersoft
committed
Merge branch 'master' of https://github.com/adafruit/circuitpython into new_freq_in
2 parents 4d47ce5 + 17bf2af commit a44bfc2

32 files changed

+946
-195
lines changed

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,6 @@
9292
[submodule "tools/Tecate-bitmap-fonts"]
9393
path = tools/Tecate-bitmap-fonts
9494
url = https://github.com/Tecate/bitmap-fonts.git
95+
[submodule "frozen/pew-pewpew-standalone-10.x"]
96+
path = frozen/pew-pewpew-standalone-10.x
97+
url = https://github.com/pewpew-game/pew-pewpew-standalone-10.x.git

‎frozen/pew-pewpew-standalone-10.x

‎locale/ID.po

Lines changed: 11 additions & 12 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-02-23 10:51-0800\n"
11+
"POT-Creation-Date: 2019-03-01 07:16-0800\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"
@@ -756,28 +756,24 @@ msgstr ""
756756
msgid "Odd parity is not supported"
757757
msgstr "Parity ganjil tidak didukung"
758758

759-
#, c-format
760-
msgid ""
761-
"Only 16bpp RGB 565 supported for bitfield compressed BMPs; R:%x G:%x B:%x"
762-
msgstr ""
763-
764759
msgid "Only 8 or 16 bit mono with "
765760
msgstr "Hanya 8 atau 16 bit mono dengan "
766761

767762
#, c-format
768-
msgid "Only Windows format, uncompressed BMP supported %d"
763+
msgid ""
764+
"Only Windows format, uncompressed BMP supported: given header size is %d"
769765
msgstr ""
770766

771767
msgid "Only bit maps of 8 bit color or less are supported"
772768
msgstr ""
773769

774-
msgid "Only slices with step=1 (aka None) are supported"
775-
msgstr ""
776-
777770
#, c-format
778771
msgid ""
779-
"Only true color (24 bpp or higher), 16bpp 565 and 555, and 8bpp grayscale "
780-
"BMP supported %d"
772+
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
773+
"given"
774+
msgstr ""
775+
776+
msgid "Only slices with step=1 (aka None) are supported"
781777
msgstr ""
782778

783779
msgid "Only tx supported on UART1 (GPIO2)."
@@ -984,6 +980,9 @@ msgstr "Tidak dapat menemukan GCLK yang kosong"
984980
msgid "Unable to init parser"
985981
msgstr ""
986982

983+
msgid "Unable to read color palette data"
984+
msgstr ""
985+
987986
msgid "Unable to remount filesystem"
988987
msgstr "Tidak dapat memasang filesystem kembali"
989988

‎locale/circuitpython.pot

Lines changed: 11 additions & 12 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-02-23 19:57-0800\n"
11+
"POT-Creation-Date: 2019-03-01 07:16-0800\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"
@@ -730,28 +730,24 @@ msgstr ""
730730
msgid "Odd parity is not supported"
731731
msgstr ""
732732

733-
#, c-format
734-
msgid ""
735-
"Only 16bpp RGB 565 supported for bitfield compressed BMPs; R:%x G:%x B:%x"
736-
msgstr ""
737-
738733
msgid "Only 8 or 16 bit mono with "
739734
msgstr ""
740735

741736
#, c-format
742-
msgid "Only Windows format, uncompressed BMP supported %d"
737+
msgid ""
738+
"Only Windows format, uncompressed BMP supported: given header size is %d"
743739
msgstr ""
744740

745741
msgid "Only bit maps of 8 bit color or less are supported"
746742
msgstr ""
747743

748-
msgid "Only slices with step=1 (aka None) are supported"
749-
msgstr ""
750-
751744
#, c-format
752745
msgid ""
753-
"Only true color (24 bpp or higher), 16bpp 565 and 555, and 8bpp grayscale "
754-
"BMP supported %d"
746+
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
747+
"given"
748+
msgstr ""
749+
750+
msgid "Only slices with step=1 (aka None) are supported"
755751
msgstr ""
756752

757753
msgid "Only tx supported on UART1 (GPIO2)."
@@ -951,6 +947,9 @@ msgstr ""
951947
msgid "Unable to init parser"
952948
msgstr ""
953949

950+
msgid "Unable to read color palette data"
951+
msgstr ""
952+
954953
msgid "Unable to remount filesystem"
955954
msgstr ""
956955

‎locale/de_DE.po

Lines changed: 15 additions & 13 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-02-23 19:57-0800\n"
10+
"POT-Creation-Date: 2019-03-01 07:16-0800\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"
@@ -748,29 +748,25 @@ msgstr ""
748748
msgid "Odd parity is not supported"
749749
msgstr "Eine ungerade Parität wird nicht unterstützt"
750750

751-
#, c-format
752-
msgid ""
753-
"Only 16bpp RGB 565 supported for bitfield compressed BMPs; R:%x G:%x B:%x"
754-
msgstr ""
755-
756751
msgid "Only 8 or 16 bit mono with "
757752
msgstr "Nur 8 oder 16 bit mono mit "
758753

759754
#, c-format
760-
msgid "Only Windows format, uncompressed BMP supported %d"
761-
msgstr "Nur unkomprimiertes Windows-Format (BMP) unterstützt %d"
755+
msgid ""
756+
"Only Windows format, uncompressed BMP supported: given header size is %d"
757+
msgstr ""
762758

763759
msgid "Only bit maps of 8 bit color or less are supported"
764760
msgstr ""
765761
"Es werden nur Bitmaps mit einer Farbtiefe von 8 Bit oder weniger unterstützt"
766762

767-
msgid "Only slices with step=1 (aka None) are supported"
768-
msgstr ""
769-
770763
#, c-format
771764
msgid ""
772-
"Only true color (24 bpp or higher), 16bpp 565 and 555, and 8bpp grayscale "
773-
"BMP supported %d"
765+
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
766+
"given"
767+
msgstr ""
768+
769+
msgid "Only slices with step=1 (aka None) are supported"
774770
msgstr ""
775771

776772
msgid "Only tx supported on UART1 (GPIO2)."
@@ -984,6 +980,9 @@ msgstr "Konnte keinen freien GCLK finden"
984980
msgid "Unable to init parser"
985981
msgstr "Parser konnte nicht gestartet werden"
986982

983+
msgid "Unable to read color palette data"
984+
msgstr ""
985+
987986
msgid "Unable to remount filesystem"
988987
msgstr "Dateisystem konnte nicht wieder eingebunden werden."
989988

@@ -2142,3 +2141,6 @@ msgstr "y Wert außerhalb der Grenzen"
21422141

21432142
msgid "zero step"
21442143
msgstr ""
2144+
2145+
#~ msgid "Only Windows format, uncompressed BMP supported %d"
2146+
#~ msgstr "Nur unkomprimiertes Windows-Format (BMP) unterstützt %d"

‎locale/en_US.po

Lines changed: 11 additions & 12 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-02-23 10:51-0800\n"
10+
"POT-Creation-Date: 2019-03-01 07:16-0800\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -730,28 +730,24 @@ msgstr ""
730730
msgid "Odd parity is not supported"
731731
msgstr ""
732732

733-
#, c-format
734-
msgid ""
735-
"Only 16bpp RGB 565 supported for bitfield compressed BMPs; R:%x G:%x B:%x"
736-
msgstr ""
737-
738733
msgid "Only 8 or 16 bit mono with "
739734
msgstr ""
740735

741736
#, c-format
742-
msgid "Only Windows format, uncompressed BMP supported %d"
737+
msgid ""
738+
"Only Windows format, uncompressed BMP supported: given header size is %d"
743739
msgstr ""
744740

745741
msgid "Only bit maps of 8 bit color or less are supported"
746742
msgstr ""
747743

748-
msgid "Only slices with step=1 (aka None) are supported"
749-
msgstr ""
750-
751744
#, c-format
752745
msgid ""
753-
"Only true color (24 bpp or higher), 16bpp 565 and 555, and 8bpp grayscale "
754-
"BMP supported %d"
746+
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
747+
"given"
748+
msgstr ""
749+
750+
msgid "Only slices with step=1 (aka None) are supported"
755751
msgstr ""
756752

757753
msgid "Only tx supported on UART1 (GPIO2)."
@@ -951,6 +947,9 @@ msgstr ""
951947
msgid "Unable to init parser"
952948
msgstr ""
953949

950+
msgid "Unable to read color palette data"
951+
msgstr ""
952+
954953
msgid "Unable to remount filesystem"
955954
msgstr ""
956955

‎locale/es.po

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: \n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-02-23 10:51-0800\n"
11+
"POT-Creation-Date: 2019-03-01 07:16-0800\n"
1212
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1313
"Last-Translator: \n"
1414
"Language-Team: \n"
@@ -770,31 +770,27 @@ msgstr ""
770770
msgid "Odd parity is not supported"
771771
msgstr "Paridad impar no soportada"
772772

773-
#, c-format
774-
msgid ""
775-
"Only 16bpp RGB 565 supported for bitfield compressed BMPs; R:%x G:%x B:%x"
776-
msgstr ""
777-
778773
msgid "Only 8 or 16 bit mono with "
779774
msgstr "Solo mono de 8 o 16 bit con "
780775

781776
#, c-format
782-
msgid "Only Windows format, uncompressed BMP supported %d"
783-
msgstr "Solo formato Windows, BMP sin comprimir soportado %d"
777+
msgid ""
778+
"Only Windows format, uncompressed BMP supported: given header size is %d"
779+
msgstr ""
784780

785781
msgid "Only bit maps of 8 bit color or less are supported"
786782
msgstr "Solo se admiten bit maps de color de 8 bits o menos"
787783

788-
#, fuzzy
789-
msgid "Only slices with step=1 (aka None) are supported"
790-
msgstr "solo se admiten segmentos con step=1 (alias None)"
791-
792784
#, c-format
793785
msgid ""
794-
"Only true color (24 bpp or higher), 16bpp 565 and 555, and 8bpp grayscale "
795-
"BMP supported %d"
786+
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
787+
"given"
796788
msgstr ""
797789

790+
#, fuzzy
791+
msgid "Only slices with step=1 (aka None) are supported"
792+
msgstr "solo se admiten segmentos con step=1 (alias None)"
793+
798794
msgid "Only tx supported on UART1 (GPIO2)."
799795
msgstr "Solo tx soportada en UART1 (GPIO2)"
800796

@@ -1003,6 +999,9 @@ msgstr "No se pudo encontrar un GCLK libre"
1003999
msgid "Unable to init parser"
10041000
msgstr "Incapaz de inicializar el parser"
10051001

1002+
msgid "Unable to read color palette data"
1003+
msgstr ""
1004+
10061005
msgid "Unable to remount filesystem"
10071006
msgstr "Incapaz de montar de nuevo el sistema de archivos"
10081007

@@ -2168,5 +2167,8 @@ msgstr "address fuera de límites"
21682167
msgid "zero step"
21692168
msgstr "paso cero"
21702169

2170+
#~ msgid "Only Windows format, uncompressed BMP supported %d"
2171+
#~ msgstr "Solo formato Windows, BMP sin comprimir soportado %d"
2172+
21712173
#~ msgid "Only true color (24 bpp or higher) BMP supported %x"
21722174
#~ msgstr "Solo color verdadero (24 bpp o superior) BMP admitido %x"

‎locale/fil.po

Lines changed: 16 additions & 14 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-02-23 10:51-0800\n"
10+
"POT-Creation-Date: 2019-03-01 07:16-0800\n"
1111
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1212
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
1313
"Language-Team: fil\n"
@@ -768,31 +768,27 @@ msgstr ""
768768
msgid "Odd parity is not supported"
769769
msgstr "Odd na parity ay hindi supportado"
770770

771-
#, c-format
772-
msgid ""
773-
"Only 16bpp RGB 565 supported for bitfield compressed BMPs; R:%x G:%x B:%x"
774-
msgstr ""
775-
776771
msgid "Only 8 or 16 bit mono with "
777772
msgstr "Tanging 8 o 16 na bit mono na may "
778773

779774
#, c-format
780-
msgid "Only Windows format, uncompressed BMP supported %d"
781-
msgstr "Tanging Windows format, uncompressed BMP lamang ang supportado %d"
775+
msgid ""
776+
"Only Windows format, uncompressed BMP supported: given header size is %d"
777+
msgstr ""
782778

783779
msgid "Only bit maps of 8 bit color or less are supported"
784780
msgstr "Tanging bit maps na may 8 bit color o mas mababa ang supportado"
785781

786-
#, fuzzy
787-
msgid "Only slices with step=1 (aka None) are supported"
788-
msgstr "ang mga slices lamang na may hakbang = 1 (aka None) ang sinusuportahan"
789-
790782
#, c-format
791783
msgid ""
792-
"Only true color (24 bpp or higher), 16bpp 565 and 555, and 8bpp grayscale "
793-
"BMP supported %d"
784+
"Only monochrome, indexed 8bpp, and 16bpp or greater BMPs supported: %d bpp "
785+
"given"
794786
msgstr ""
795787

788+
#, fuzzy
789+
msgid "Only slices with step=1 (aka None) are supported"
790+
msgstr "ang mga slices lamang na may hakbang = 1 (aka None) ang sinusuportahan"
791+
796792
msgid "Only tx supported on UART1 (GPIO2)."
797793
msgstr "Tanging suportado ang TX sa UART1 (GPIO2)."
798794

@@ -1005,6 +1001,9 @@ msgstr "Hindi mahanap ang libreng GCLK"
10051001
msgid "Unable to init parser"
10061002
msgstr "Hindi ma-init ang parser"
10071003

1004+
msgid "Unable to read color palette data"
1005+
msgstr ""
1006+
10081007
msgid "Unable to remount filesystem"
10091008
msgstr "Hindi ma-remount ang filesystem"
10101009

@@ -2174,5 +2173,8 @@ msgstr "wala sa sakop ang address"
21742173
msgid "zero step"
21752174
msgstr "zero step"
21762175

2176+
#~ msgid "Only Windows format, uncompressed BMP supported %d"
2177+
#~ msgstr "Tanging Windows format, uncompressed BMP lamang ang supportado %d"
2178+
21772179
#~ msgid "Only true color (24 bpp or higher) BMP supported %x"
21782180
#~ msgstr "Dapat true color (24 bpp o mas mataas) BMP lamang ang supportado %x"

0 commit comments

Comments
 (0)
0