Skip to content

Commit 280e20a

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/master' into oserror-with-filename
2 parents e136423 + 65045eb commit 280e20a

File tree

26 files changed

+229
-137
lines changed

26 files changed

+229
-137
lines changed

‎locale/ID.po

Lines changed: 2 additions & 2 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: 2020-01-29 17:27-0800\n"
11+
"POT-Creation-Date: 2020-02-03 23:41-0500\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"
@@ -1845,7 +1845,7 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18451845
msgstr ""
18461846

18471847
#: shared-bindings/displayio/Palette.c
1848-
msgid "color buffer must be a buffer or int"
1848+
msgid "color buffer must be a buffer, tuple, list, or int"
18491849
msgstr ""
18501850

18511851
#: shared-bindings/displayio/Palette.c

‎locale/circuitpython.pot

Lines changed: 2 additions & 2 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: 2020-01-29 17:27-0800\n"
11+
"POT-Creation-Date: 2020-02-03 23:41-0500\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"
@@ -1821,7 +1821,7 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18211821
msgstr ""
18221822

18231823
#: shared-bindings/displayio/Palette.c
1824-
msgid "color buffer must be a buffer or int"
1824+
msgid "color buffer must be a buffer, tuple, list, or int"
18251825
msgstr ""
18261826

18271827
#: shared-bindings/displayio/Palette.c

‎locale/de_DE.po

Lines changed: 6 additions & 6 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-03 23:41-0500\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"
@@ -1849,8 +1849,8 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18491849
msgstr "Farbpuffer muss 3 Bytes (RGB) oder 4 Bytes (RGB + pad byte) sein"
18501850

18511851
#: shared-bindings/displayio/Palette.c
1852-
msgid "color buffer must be a buffer or int"
1853-
msgstr "Farbpuffer muss ein Puffer oder ein int sein"
1852+
msgid "color buffer must be a buffer, tuple, list, or int"
1853+
msgstr ""
18541854

18551855
#: shared-bindings/displayio/Palette.c
18561856
msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
@@ -2853,7 +2853,6 @@ msgstr ""
28532853
#~ msgid "C-level assert"
28542854
#~ msgstr "C-Level Assert"
28552855

2856-
#, c-format
28572856
#~ msgid "Can not use dotstar with %s"
28582857
#~ msgstr "Kann dotstar nicht mit %s verwenden"
28592858

@@ -3167,17 +3166,18 @@ msgstr ""
31673166
#~ "Sie laufen im abgesicherten Modus, was bedeutet, dass etwas Unerwartetes "
31683167
#~ "passiert ist.\n"
31693168

3170-
#, c-format
31713169
#~ msgid "buf is too small. need %d bytes"
31723170
#~ msgstr "buf ist zu klein. brauche %d Bytes"
31733171

31743172
#~ msgid "buffer too long"
31753173
#~ msgstr "Buffer zu lang"
31763174

3177-
#, c-format
31783175
#~ msgid "byteorder is not an instance of ByteOrder (got a %s)"
31793176
#~ msgstr "byteorder ist keine Instanz von ByteOrder (%s erhalten)"
31803177

3178+
#~ msgid "color buffer must be a buffer or int"
3179+
#~ msgstr "Farbpuffer muss ein Puffer oder ein int sein"
3180+
31813181
#~ msgid "expected a DigitalInOut"
31823182
#~ msgstr "erwarte DigitalInOut"
31833183

‎locale/en_US.po

Lines changed: 2 additions & 2 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-03 23:41-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1821,7 +1821,7 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18211821
msgstr ""
18221822

18231823
#: shared-bindings/displayio/Palette.c
1824-
msgid "color buffer must be a buffer or int"
1824+
msgid "color buffer must be a buffer, tuple, list, or int"
18251825
msgstr ""
18261826

18271827
#: shared-bindings/displayio/Palette.c

‎locale/en_x_pirate.po

Lines changed: 2 additions & 2 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-03 23:41-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -1825,7 +1825,7 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18251825
msgstr ""
18261826

18271827
#: shared-bindings/displayio/Palette.c
1828-
msgid "color buffer must be a buffer or int"
1828+
msgid "color buffer must be a buffer, tuple, list, or int"
18291829
msgstr ""
18301830

18311831
#: shared-bindings/displayio/Palette.c

‎locale/es.po

Lines changed: 6 additions & 8 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-03 23:41-0500\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1850,8 +1850,8 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18501850
msgstr "color buffer debe ser 3 bytes (RGB) ó 4 bytes (RGB + pad byte)"
18511851

18521852
#: shared-bindings/displayio/Palette.c
1853-
msgid "color buffer must be a buffer or int"
1854-
msgstr "color buffer deber ser un buffer o un int"
1853+
msgid "color buffer must be a buffer, tuple, list, or int"
1854+
msgstr ""
18551855

18561856
#: shared-bindings/displayio/Palette.c
18571857
msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
@@ -2853,7 +2853,6 @@ msgstr "paso cero"
28532853
#~ "Intento de allocation de heap cuando la VM de MicroPython no estaba "
28542854
#~ "corriendo.\n"
28552855

2856-
#, c-format
28572856
#~ msgid "Can not use dotstar with %s"
28582857
#~ msgstr "No se puede usar dotstar con %s"
28592858

@@ -3194,14 +3193,12 @@ msgstr "paso cero"
31943193
#~ msgid "bad GATT role"
31953194
#~ msgstr "mal GATT role"
31963195

3197-
#, c-format
31983196
#~ msgid "buf is too small. need %d bytes"
31993197
#~ msgstr "buf es demasiado pequeño. necesita %d bytes"
32003198

32013199
#~ msgid "buffer too long"
32023200
#~ msgstr "buffer demasiado largo"
32033201

3204-
#, c-format
32053202
#~ msgid "byteorder is not an instance of ByteOrder (got a %s)"
32063203
#~ msgstr "byteorder no es instancia de ByteOrder (encontarmos un %s)"
32073204

@@ -3223,6 +3220,9 @@ msgstr "paso cero"
32233220
#~ msgid "characteristics includes an object that is not a Characteristic"
32243221
#~ msgstr "characteristics incluye un objeto que no es una Characteristica"
32253222

3223+
#~ msgid "color buffer must be a buffer or int"
3224+
#~ msgstr "color buffer deber ser un buffer o un int"
3225+
32263226
#~ msgid "either pos or kw args are allowed"
32273227
#~ msgstr "ya sea pos o kw args son permitidos"
32283228

@@ -3312,11 +3312,9 @@ msgstr "paso cero"
33123312
#~ msgid "unknown config param"
33133313
#~ msgstr "parámetro config desconocido"
33143314

3315-
#, c-format
33163315
#~ msgid "unknown format code '%c' for object of type 'float'"
33173316
#~ msgstr "codigo format desconocido '%c' para el typo de objeto 'float'"
33183317

3319-
#, c-format
33203318
#~ msgid "unknown format code '%c' for object of type 'str'"
33213319
#~ msgstr "codigo format desconocido '%c' para objeto de tipo 'str'"
33223320

‎locale/fil.po

Lines changed: 6 additions & 5 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-03 23:41-0500\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"
@@ -1861,8 +1861,8 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18611861
msgstr "color buffer ay dapat na 3 bytes (RGB) o 4 bytes (RGB + pad byte)"
18621862

18631863
#: shared-bindings/displayio/Palette.c
1864-
msgid "color buffer must be a buffer or int"
1865-
msgstr "color buffer ay dapat buffer or int"
1864+
msgid "color buffer must be a buffer, tuple, list, or int"
1865+
msgstr ""
18661866

18671867
#: shared-bindings/displayio/Palette.c
18681868
msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
@@ -3176,6 +3176,9 @@ msgstr "zero step"
31763176
#~ msgid "can't set STA config"
31773177
#~ msgstr "hindi makuha ang STA config"
31783178

3179+
#~ msgid "color buffer must be a buffer or int"
3180+
#~ msgstr "color buffer ay dapat buffer or int"
3181+
31793182
#~ msgid "either pos or kw args are allowed"
31803183
#~ msgstr "pos o kw args ang pinahihintulutan"
31813184

@@ -3254,11 +3257,9 @@ msgstr "zero step"
32543257
#~ msgid "unknown config param"
32553258
#~ msgstr "hindi alam na config param"
32563259

3257-
#, c-format
32583260
#~ msgid "unknown format code '%c' for object of type 'float'"
32593261
#~ msgstr "hindi alam ang format code '%c' sa object na ang type ay 'float'"
32603262

3261-
#, c-format
32623263
#~ msgid "unknown format code '%c' for object of type 'str'"
32633264
#~ msgstr ""
32643265
#~ "hindi alam ang format ng code na '%c' para sa object ng type ay 'str'"

‎locale/fr.po

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: 0.1\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2020-01-29 17:27-0800\n"
11+
"POT-Creation-Date: 2020-02-03 23:41-0500\n"
1212
"PO-Revision-Date: 2019-04-14 20:05+0100\n"
1313
"Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n"
1414
"Language-Team: fr\n"
@@ -1884,9 +1884,8 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18841884
msgstr "le tampon de couleur doit faire 3 octets (RVB) ou 4 (RVB + pad byte)"
18851885

18861886
#: shared-bindings/displayio/Palette.c
1887-
#, fuzzy
1888-
msgid "color buffer must be a buffer or int"
1889-
msgstr "le tampon de couleur doit être un tampon ou un entier 'int'"
1887+
msgid "color buffer must be a buffer, tuple, list, or int"
1888+
msgstr ""
18901889

18911890
#: shared-bindings/displayio/Palette.c
18921891
#, fuzzy
@@ -2903,7 +2902,6 @@ msgstr "'step' nul"
29032902
#~ msgstr ""
29042903
#~ "Tentative d'allocation de tas alors que la VM MicroPython ne tourne pas.\n"
29052904

2906-
#, c-format
29072905
#~ msgid "Can not use dotstar with %s"
29082906
#~ msgstr "Impossible d'utiliser 'dotstar' avec %s"
29092907

@@ -3253,14 +3251,12 @@ msgstr "'step' nul"
32533251
#~ msgid "bad GATT role"
32543252
#~ msgstr "mauvais rôle GATT"
32553253

3256-
#, c-format
32573254
#~ msgid "buf is too small. need %d bytes"
32583255
#~ msgstr "'buf' est trop petit. Besoin de %d octets"
32593256

32603257
#~ msgid "buffer too long"
32613258
#~ msgstr "tampon trop long"
32623259

3263-
#, c-format
32643260
#~ msgid "byteorder is not an instance of ByteOrder (got a %s)"
32653261
#~ msgstr "'byteorder' n'est pas une instance de ByteOrder (reçu un %s)"
32663262

@@ -3283,6 +3279,10 @@ msgstr "'step' nul"
32833279
#~ msgstr ""
32843280
#~ "'characteristics' inclut un objet qui n'est pas une 'Characteristic'"
32853281

3282+
#, fuzzy
3283+
#~ msgid "color buffer must be a buffer or int"
3284+
#~ msgstr "le tampon de couleur doit être un tampon ou un entier 'int'"
3285+
32863286
#~ msgid "either pos or kw args are allowed"
32873287
#~ msgstr "soit 'pos', soit 'kw' est permis en argument"
32883288

@@ -3368,11 +3368,9 @@ msgstr "'step' nul"
33683368
#~ msgid "unknown config param"
33693369
#~ msgstr "paramètre de config. inconnu"
33703370

3371-
#, c-format
33723371
#~ msgid "unknown format code '%c' for object of type 'float'"
33733372
#~ msgstr "code de format '%c' inconnu pour un objet de type 'float'"
33743373

3375-
#, c-format
33763374
#~ msgid "unknown format code '%c' for object of type 'str'"
33773375
#~ msgstr "code de format '%c' inconnu pour un objet de type 'str'"
33783376

‎locale/it_IT.po

Lines changed: 6 additions & 6 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: 2020-01-29 17:27-0800\n"
11+
"POT-Creation-Date: 2020-02-03 23:41-0500\n"
1212
"PO-Revision-Date: 2018-10-02 16:27+0200\n"
1313
"Last-Translator: Enrico Paganin <enrico.paganin@mail.com>\n"
1414
"Language-Team: \n"
@@ -1862,8 +1862,8 @@ msgstr ""
18621862
"il buffer del colore deve esseer di 3 byte (RGB) o 4 byte (RGB + pad byte)"
18631863

18641864
#: shared-bindings/displayio/Palette.c
1865-
msgid "color buffer must be a buffer or int"
1866-
msgstr "il buffer del colore deve essere un buffer o un int"
1865+
msgid "color buffer must be a buffer, tuple, list, or int"
1866+
msgstr ""
18671867

18681868
#: shared-bindings/displayio/Palette.c
18691869
msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
@@ -2870,7 +2870,6 @@ msgstr "zero step"
28702870
#~ msgid "C-level assert"
28712871
#~ msgstr "assert a livello C"
28722872

2873-
#, c-format
28742873
#~ msgid "Can not use dotstar with %s"
28752874
#~ msgstr "dotstar non può essere usato con %s"
28762875

@@ -3166,6 +3165,9 @@ msgstr "zero step"
31663165
#~ msgid "can't set STA config"
31673166
#~ msgstr "impossibile impostare le configurazioni della STA"
31683167

3168+
#~ msgid "color buffer must be a buffer or int"
3169+
#~ msgstr "il buffer del colore deve essere un buffer o un int"
3170+
31693171
#~ msgid "either pos or kw args are allowed"
31703172
#~ msgstr "sono permesse solo gli argomenti pos o kw"
31713173

@@ -3241,12 +3243,10 @@ msgstr "zero step"
32413243
#~ msgid "unknown config param"
32423244
#~ msgstr "parametro di configurazione sconosciuto"
32433245

3244-
#, c-format
32453246
#~ msgid "unknown format code '%c' for object of type 'float'"
32463247
#~ msgstr ""
32473248
#~ "codice di formattazione '%c' sconosciuto per oggetto di tipo 'float'"
32483249

3249-
#, c-format
32503250
#~ msgid "unknown format code '%c' for object of type 'str'"
32513251
#~ msgstr "codice di formattazione '%c' sconosciuto per oggetto di tipo 'str'"
32523252

‎locale/ko.po

Lines changed: 2 additions & 2 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: 2020-01-29 17:27-0800\n"
11+
"POT-Creation-Date: 2020-02-03 23:41-0500\n"
1212
"PO-Revision-Date: 2019-05-06 14:22-0700\n"
1313
"Last-Translator: \n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1826,7 +1826,7 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18261826
msgstr ""
18271827

18281828
#: shared-bindings/displayio/Palette.c
1829-
msgid "color buffer must be a buffer or int"
1829+
msgid "color buffer must be a buffer, tuple, list, or int"
18301830
msgstr ""
18311831

18321832
#: shared-bindings/displayio/Palette.c

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy