Skip to content

Commit 1e88001

Browse files
dhalbertdhalbert
authored
Merge pull request micropython#2040 from tannewt/merge_in_410
Merge 4.1.0 into master
2 parents 59efce3 + 26f64dd commit 1e88001

File tree

20 files changed

+178
-82
lines changed

20 files changed

+178
-82
lines changed

‎locale/ID.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: 2019-07-31 16:30-0500\n"
11+
"POT-Creation-Date: 2019-08-05 17:52-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 <[email protected]>\n"
@@ -1176,7 +1176,11 @@ msgid "Tile height must exactly divide bitmap height"
11761176
msgstr ""
11771177

11781178
#: shared-bindings/displayio/TileGrid.c
1179-
msgid "Tile indices must be 0 - 255"
1179+
msgid "Tile index out of bounds"
1180+
msgstr ""
1181+
1182+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1183+
msgid "Tile value out of bounds"
11801184
msgstr ""
11811185

11821186
#: shared-bindings/displayio/TileGrid.c
@@ -2453,10 +2457,6 @@ msgstr "sintaksis error pada pendeskripsi uctypes"
24532457
msgid "threshold must be in the range 0-65536"
24542458
msgstr ""
24552459

2456-
#: shared-bindings/displayio/TileGrid.c
2457-
msgid "tile index out of bounds"
2458-
msgstr ""
2459-
24602460
#: shared-bindings/time/__init__.c
24612461
msgid "time.struct_time() takes a 9-sequence"
24622462
msgstr ""

‎locale/circuitpython.pot

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: 2019-07-31 16:30-0500\n"
11+
"POT-Creation-Date: 2019-08-05 17:52-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 <[email protected]>\n"
@@ -1153,7 +1153,11 @@ msgid "Tile height must exactly divide bitmap height"
11531153
msgstr ""
11541154

11551155
#: shared-bindings/displayio/TileGrid.c
1156-
msgid "Tile indices must be 0 - 255"
1156+
msgid "Tile index out of bounds"
1157+
msgstr ""
1158+
1159+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1160+
msgid "Tile value out of bounds"
11571161
msgstr ""
11581162

11591163
#: shared-bindings/displayio/TileGrid.c
@@ -2417,10 +2421,6 @@ msgstr ""
24172421
msgid "threshold must be in the range 0-65536"
24182422
msgstr ""
24192423

2420-
#: shared-bindings/displayio/TileGrid.c
2421-
msgid "tile index out of bounds"
2422-
msgstr ""
2423-
24242424
#: shared-bindings/time/__init__.c
24252425
msgid "time.struct_time() takes a 9-sequence"
24262426
msgstr ""

‎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: 2019-07-31 16:30-0500\n"
10+
"POT-Creation-Date: 2019-08-05 17:52-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"
@@ -1182,7 +1182,11 @@ msgid "Tile height must exactly divide bitmap height"
11821182
msgstr ""
11831183

11841184
#: shared-bindings/displayio/TileGrid.c
1185-
msgid "Tile indices must be 0 - 255"
1185+
msgid "Tile index out of bounds"
1186+
msgstr ""
1187+
1188+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1189+
msgid "Tile value out of bounds"
11861190
msgstr ""
11871191

11881192
#: shared-bindings/displayio/TileGrid.c
@@ -2469,10 +2473,6 @@ msgstr "Syntaxfehler in uctypes Deskriptor"
24692473
msgid "threshold must be in the range 0-65536"
24702474
msgstr "threshold muss im Intervall 0-65536 liegen"
24712475

2472-
#: shared-bindings/displayio/TileGrid.c
2473-
msgid "tile index out of bounds"
2474-
msgstr ""
2475-
24762476
#: shared-bindings/time/__init__.c
24772477
msgid "time.struct_time() takes a 9-sequence"
24782478
msgstr ""

‎locale/en_US.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: 2019-07-31 16:30-0500\n"
10+
"POT-Creation-Date: 2019-08-05 17:52-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1153,7 +1153,11 @@ msgid "Tile height must exactly divide bitmap height"
11531153
msgstr ""
11541154

11551155
#: shared-bindings/displayio/TileGrid.c
1156-
msgid "Tile indices must be 0 - 255"
1156+
msgid "Tile index out of bounds"
1157+
msgstr ""
1158+
1159+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1160+
msgid "Tile value out of bounds"
11571161
msgstr ""
11581162

11591163
#: shared-bindings/displayio/TileGrid.c
@@ -2417,10 +2421,6 @@ msgstr ""
24172421
msgid "threshold must be in the range 0-65536"
24182422
msgstr ""
24192423

2420-
#: shared-bindings/displayio/TileGrid.c
2421-
msgid "tile index out of bounds"
2422-
msgstr ""
2423-
24242424
#: shared-bindings/time/__init__.c
24252425
msgid "time.struct_time() takes a 9-sequence"
24262426
msgstr ""

‎locale/en_x_pirate.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: 2019-07-31 16:30-0500\n"
10+
"POT-Creation-Date: 2019-08-05 17:52-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -1157,7 +1157,11 @@ msgid "Tile height must exactly divide bitmap height"
11571157
msgstr ""
11581158

11591159
#: shared-bindings/displayio/TileGrid.c
1160-
msgid "Tile indices must be 0 - 255"
1160+
msgid "Tile index out of bounds"
1161+
msgstr ""
1162+
1163+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1164+
msgid "Tile value out of bounds"
11611165
msgstr ""
11621166

11631167
#: shared-bindings/displayio/TileGrid.c
@@ -2421,10 +2425,6 @@ msgstr ""
24212425
msgid "threshold must be in the range 0-65536"
24222426
msgstr ""
24232427

2424-
#: shared-bindings/displayio/TileGrid.c
2425-
msgid "tile index out of bounds"
2426-
msgstr ""
2427-
24282428
#: shared-bindings/time/__init__.c
24292429
msgid "time.struct_time() takes a 9-sequence"
24302430
msgstr ""

‎locale/es.po

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,8 +1193,12 @@ msgid "Tile height must exactly divide bitmap height"
11931193
msgstr "La altura del Tile debe dividir exacto la altura del bitmap"
11941194

11951195
#: shared-bindings/displayio/TileGrid.c
1196-
msgid "Tile indices must be 0 - 255"
1197-
msgstr "Los índices de Tile deben ser 0 - 255"
1196+
msgid "Tile index out of bounds"
1197+
msgstr ""
1198+
1199+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1200+
msgid "Tile value out of bounds"
1201+
msgstr ""
11981202

11991203
#: shared-bindings/displayio/TileGrid.c
12001204
msgid "Tile width must exactly divide bitmap width"
@@ -2484,10 +2488,6 @@ msgstr "error de sintaxis en el descriptor uctypes"
24842488
msgid "threshold must be in the range 0-65536"
24852489
msgstr "limite debe ser en el rango 0-65536"
24862490

2487-
#: shared-bindings/displayio/TileGrid.c
2488-
msgid "tile index out of bounds"
2489-
msgstr "el indice del tile fuera de limite"
2490-
24912491
#: shared-bindings/time/__init__.c
24922492
msgid "time.struct_time() takes a 9-sequence"
24932493
msgstr "time.struct_time() toma un sequencio 9"
@@ -2844,6 +2844,9 @@ msgstr "paso cero"
28442844
#~ msgid "STA required"
28452845
#~ msgstr "STA requerido"
28462846

2847+
#~ msgid "Tile indices must be 0 - 255"
2848+
#~ msgstr "Los índices de Tile deben ser 0 - 255"
2849+
28472850
#~ msgid "UART(%d) does not exist"
28482851
#~ msgstr "UART(%d) no existe"
28492852

@@ -2945,6 +2948,9 @@ msgstr "paso cero"
29452948
#~ msgid "services includes an object that is not a Service"
29462949
#~ msgstr "services incluye un objeto que no es servicio"
29472950

2951+
#~ msgid "tile index out of bounds"
2952+
#~ msgstr "el indice del tile fuera de limite"
2953+
29482954
#~ msgid "too many arguments"
29492955
#~ msgstr "muchos argumentos"
29502956

‎locale/fil.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,11 @@ msgid "Tile height must exactly divide bitmap height"
11961196
msgstr ""
11971197

11981198
#: shared-bindings/displayio/TileGrid.c
1199-
msgid "Tile indices must be 0 - 255"
1199+
msgid "Tile index out of bounds"
1200+
msgstr ""
1201+
1202+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1203+
msgid "Tile value out of bounds"
12001204
msgstr ""
12011205

12021206
#: shared-bindings/displayio/TileGrid.c
@@ -2494,10 +2498,6 @@ msgstr "may pagkakamali sa sintaks sa uctypes descriptor"
24942498
msgid "threshold must be in the range 0-65536"
24952499
msgstr "ang threshold ay dapat sa range 0-65536"
24962500

2497-
#: shared-bindings/displayio/TileGrid.c
2498-
msgid "tile index out of bounds"
2499-
msgstr ""
2500-
25012501
#: shared-bindings/time/__init__.c
25022502
msgid "time.struct_time() takes a 9-sequence"
25032503
msgstr "time.struct_time() kumukuha ng 9-sequence"

‎locale/fr.po

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,8 +1217,12 @@ msgid "Tile height must exactly divide bitmap height"
12171217
msgstr "La hauteur de la tuile doit diviser exactement la hauteur de l'image"
12181218

12191219
#: shared-bindings/displayio/TileGrid.c
1220-
msgid "Tile indices must be 0 - 255"
1221-
msgstr "Les indices des tuiles doivent être compris entre 0 et 255 "
1220+
msgid "Tile index out of bounds"
1221+
msgstr ""
1222+
1223+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1224+
msgid "Tile value out of bounds"
1225+
msgstr ""
12221226

12231227
#: shared-bindings/displayio/TileGrid.c
12241228
msgid "Tile width must exactly divide bitmap width"
@@ -2536,10 +2540,6 @@ msgstr "erreur de syntaxe dans le descripteur d'uctypes"
25362540
msgid "threshold must be in the range 0-65536"
25372541
msgstr "le seuil doit être dans la gamme 0-65536"
25382542

2539-
#: shared-bindings/displayio/TileGrid.c
2540-
msgid "tile index out of bounds"
2541-
msgstr "indice de tuile hors limites"
2542-
25432543
#: shared-bindings/time/__init__.c
25442544
msgid "time.struct_time() takes a 9-sequence"
25452545
msgstr "time.struct_time() prend une séquence de longueur 9"
@@ -2895,6 +2895,9 @@ msgstr "'step' nul"
28952895
#~ msgid "STA required"
28962896
#~ msgstr "'STA' requis"
28972897

2898+
#~ msgid "Tile indices must be 0 - 255"
2899+
#~ msgstr "Les indices des tuiles doivent être compris entre 0 et 255 "
2900+
28982901
#~ msgid "UART(%d) does not exist"
28992902
#~ msgstr "UART(%d) n'existe pas"
29002903

@@ -2991,6 +2994,9 @@ msgstr "'step' nul"
29912994
#~ msgid "services includes an object that is not a Service"
29922995
#~ msgstr "'services' inclut un object qui n'est pas un 'Service'"
29932996

2997+
#~ msgid "tile index out of bounds"
2998+
#~ msgstr "indice de tuile hors limites"
2999+
29943000
#~ msgid "too many arguments"
29953001
#~ msgstr "trop d'arguments"
29963002

‎locale/it_IT.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,11 @@ msgid "Tile height must exactly divide bitmap height"
11951195
msgstr ""
11961196

11971197
#: shared-bindings/displayio/TileGrid.c
1198-
msgid "Tile indices must be 0 - 255"
1198+
msgid "Tile index out of bounds"
1199+
msgstr ""
1200+
1201+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1202+
msgid "Tile value out of bounds"
11991203
msgstr ""
12001204

12011205
#: shared-bindings/displayio/TileGrid.c
@@ -2492,10 +2496,6 @@ msgstr "errore di sintassi nel descrittore uctypes"
24922496
msgid "threshold must be in the range 0-65536"
24932497
msgstr "la soglia deve essere nell'intervallo 0-65536"
24942498

2495-
#: shared-bindings/displayio/TileGrid.c
2496-
msgid "tile index out of bounds"
2497-
msgstr ""
2498-
24992499
#: shared-bindings/time/__init__.c
25002500
msgid "time.struct_time() takes a 9-sequence"
25012501
msgstr ""

‎locale/pl.po

Lines changed: 13 additions & 7 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-07-31 16:30-0500\n"
10+
"POT-Creation-Date: 2019-08-05 17:52-0700\n"
1111
"PO-Revision-Date: 2019-03-19 18:37-0700\n"
1212
"Last-Translator: Radomir Dopieralski <[email protected]>\n"
1313
"Language-Team: pl\n"
@@ -1173,8 +1173,12 @@ msgid "Tile height must exactly divide bitmap height"
11731173
msgstr "Wysokość bitmapy musi być wielokrotnością wysokości kafelka"
11741174

11751175
#: shared-bindings/displayio/TileGrid.c
1176-
msgid "Tile indices must be 0 - 255"
1177-
msgstr "Indeks kafelka musi być pomiędzy 0 a 255 włącznie"
1176+
msgid "Tile index out of bounds"
1177+
msgstr ""
1178+
1179+
#: shared-bindings/displayio/TileGrid.c shared-module/displayio/TileGrid.c
1180+
msgid "Tile value out of bounds"
1181+
msgstr ""
11781182

11791183
#: shared-bindings/displayio/TileGrid.c
11801184
msgid "Tile width must exactly divide bitmap width"
@@ -2444,10 +2448,6 @@ msgstr "błąd składni w deskryptorze uctypes"
24442448
msgid "threshold must be in the range 0-65536"
24452449
msgstr "threshold musi być w zakresie 0-65536"
24462450

2447-
#: shared-bindings/displayio/TileGrid.c
2448-
msgid "tile index out of bounds"
2449-
msgstr "indeks kafelka poza zakresem"
2450-
24512451
#: shared-bindings/time/__init__.c
24522452
msgid "time.struct_time() takes a 9-sequence"
24532453
msgstr "time.struct_time() wymaga 9-elementowej sekwencji"
@@ -2702,6 +2702,9 @@ msgstr "zerowy krok"
27022702
#~ msgid "Must be a Group subclass."
27032703
#~ msgstr "Musi dziedziczyć z Group."
27042704

2705+
#~ msgid "Tile indices must be 0 - 255"
2706+
#~ msgstr "Indeks kafelka musi być pomiędzy 0 a 255 włącznie"
2707+
27052708
#~ msgid "UUID integer value not in range 0 to 0xffff"
27062709
#~ msgstr "Wartość UUID poza zakresem 0 do 0xffff"
27072710

@@ -2710,3 +2713,6 @@ msgstr "zerowy krok"
27102713

27112714
#~ msgid "services includes an object that is not a Service"
27122715
#~ msgstr "obiekt typu innego niż Service w services"
2716+
2717+
#~ msgid "tile index out of bounds"
2718+
#~ msgstr "indeks kafelka poza zakresem"

0 commit comments

Comments
 (0)