Skip to content

Commit a4bbf35

Browse files
committed
Merge branch 'master' into new-pixelbuf-api
2 parents a9624ff + 83ecb1b commit a4bbf35

File tree

61 files changed

+563
-321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+563
-321
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ jobs:
140140
- "robohatmm1_m4"
141141
- "sam32"
142142
- "serpente"
143+
- "shirtty"
143144
- "snekboard"
144145
- "sparkfun_lumidrive"
145146
- "sparkfun_nrf52840_mini"

locale/ID.po

Lines changed: 8 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-11-23 13:58-0500\n"
11+
"POT-Creation-Date: 2019-11-27 14:54-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 <[email protected]>\n"
@@ -2448,12 +2448,8 @@ msgstr ""
24482448
msgid "time.struct_time() takes a 9-sequence"
24492449
msgstr ""
24502450

2451-
#: shared-bindings/time/__init__.c
2452-
msgid "time.struct_time() takes exactly 1 argument"
2453-
msgstr ""
2454-
24552451
#: shared-bindings/busio/UART.c
2456-
msgid "timeout >100 (units are now seconds, not msecs)"
2452+
msgid "timeout must be 0.0-100.0 seconds"
24572453
msgstr ""
24582454

24592455
#: shared-bindings/_bleio/CharacteristicBuffer.c
@@ -2724,19 +2720,19 @@ msgstr ""
27242720
#~ msgid "Failed to notify or indicate attribute value, err %0x04x"
27252721
#~ msgstr "Gagal untuk melaporkan nilai atribut, status: 0x%08lX"
27262722

2727-
#, fuzzy, c-format
2723+
#, fuzzy
27282724
#~ msgid "Failed to read CCCD value, err 0x%04x"
27292725
#~ msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX"
27302726

27312727
#, fuzzy
27322728
#~ msgid "Failed to read attribute value, err %0x04x"
27332729
#~ msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX"
27342730

2735-
#, fuzzy, c-format
2731+
#, fuzzy
27362732
#~ msgid "Failed to read gatts value, err 0x%04x"
27372733
#~ msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
27382734

2739-
#, fuzzy, c-format
2735+
#, fuzzy
27402736
#~ msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
27412737
#~ msgstr "Gagal untuk menambahkan Vendor Spesific UUID, status: 0x%08lX"
27422738

@@ -2756,7 +2752,7 @@ msgstr ""
27562752
#~ msgid "Failed to start scanning"
27572753
#~ msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"
27582754

2759-
#, fuzzy, c-format
2755+
#, fuzzy
27602756
#~ msgid "Failed to start scanning, err 0x%04x"
27612757
#~ msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"
27622758

@@ -2768,11 +2764,11 @@ msgstr ""
27682764
#~ msgid "Failed to stop advertising, err 0x%04x"
27692765
#~ msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
27702766

2771-
#, fuzzy, c-format
2767+
#, fuzzy
27722768
#~ msgid "Failed to write attribute value, err 0x%04x"
27732769
#~ msgstr "Gagal untuk menulis nilai atribut, status: 0x%08lX"
27742770

2775-
#, fuzzy, c-format
2771+
#, fuzzy
27762772
#~ msgid "Failed to write gatts value, err 0x%04x"
27772773
#~ msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
27782774

locale/circuitpython.pot

Lines changed: 2 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-11-23 13:58-0500\n"
11+
"POT-Creation-Date: 2019-11-27 14:54-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 <[email protected]>\n"
@@ -2417,12 +2417,8 @@ msgstr ""
24172417
msgid "time.struct_time() takes a 9-sequence"
24182418
msgstr ""
24192419

2420-
#: shared-bindings/time/__init__.c
2421-
msgid "time.struct_time() takes exactly 1 argument"
2422-
msgstr ""
2423-
24242420
#: shared-bindings/busio/UART.c
2425-
msgid "timeout >100 (units are now seconds, not msecs)"
2421+
msgid "timeout must be 0.0-100.0 seconds"
24262422
msgstr ""
24272423

24282424
#: shared-bindings/_bleio/CharacteristicBuffer.c

locale/de_DE.po

Lines changed: 2 additions & 17 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-11-23 13:58-0500\n"
10+
"POT-Creation-Date: 2019-11-27 14:54-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"
@@ -2478,12 +2478,8 @@ msgstr "threshold muss im Intervall 0-65536 liegen"
24782478
msgid "time.struct_time() takes a 9-sequence"
24792479
msgstr ""
24802480

2481-
#: shared-bindings/time/__init__.c
2482-
msgid "time.struct_time() takes exactly 1 argument"
2483-
msgstr ""
2484-
24852481
#: shared-bindings/busio/UART.c
2486-
msgid "timeout >100 (units are now seconds, not msecs)"
2482+
msgid "timeout must be 0.0-100.0 seconds"
24872483
msgstr ""
24882484

24892485
#: shared-bindings/_bleio/CharacteristicBuffer.c
@@ -2714,7 +2710,6 @@ msgstr ""
27142710
#~ msgid "Characteristic already in use by another Service."
27152711
#~ msgstr "Characteristic wird bereits von einem anderen Dienst verwendet."
27162712

2717-
#, c-format
27182713
#~ msgid "Could not decode ble_uuid, err 0x%04x"
27192714
#~ msgstr "Konnte ble_uuid nicht decodieren. Status: 0x%04x"
27202715

@@ -2743,7 +2738,6 @@ msgstr ""
27432738
#~ msgid "Failed to add characteristic, err 0x%04x"
27442739
#~ msgstr "Hinzufügen des Characteristic ist gescheitert. Status: 0x%04x"
27452740

2746-
#, c-format
27472741
#~ msgid "Failed to add descriptor, err 0x%04x"
27482742
#~ msgstr "Deskriptor konnte nicht hinzugefügt werden. Status: 0x%04x"
27492743

@@ -2783,22 +2777,18 @@ msgstr ""
27832777
#~ msgid "Failed to pair"
27842778
#~ msgstr "Koppeln fehlgeschlagen"
27852779

2786-
#, c-format
27872780
#~ msgid "Failed to read CCCD value, err 0x%04x"
27882781
#~ msgstr "Kann CCCD value nicht lesen. Status: 0x%04x"
27892782

27902783
#~ msgid "Failed to read attribute value, err %0x04x"
27912784
#~ msgstr "Kann den Attributwert nicht lesen. Status: 0x%04x"
27922785

2793-
#, c-format
27942786
#~ msgid "Failed to read attribute value, err 0x%04x"
27952787
#~ msgstr "Kann Attributwert nicht lesen, Status: 0x%04x"
27962788

2797-
#, c-format
27982789
#~ msgid "Failed to read gatts value, err 0x%04x"
27992790
#~ msgstr "gatts value konnte nicht gelesen werden. Status: 0x%04x"
28002791

2801-
#, c-format
28022792
#~ msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
28032793
#~ msgstr "Kann keine herstellerspezifische UUID hinzufügen. Status: 0x%04x"
28042794

@@ -2814,7 +2804,6 @@ msgstr ""
28142804
#~ msgid "Failed to start advertising, err 0x%04x"
28152805
#~ msgstr "Kann advertisement nicht starten. Status: 0x%04x"
28162806

2817-
#, c-format
28182807
#~ msgid "Failed to start connecting, error 0x%04x"
28192808
#~ msgstr "Verbindung konnte nicht hergestellt werden. Status: 0x%04x"
28202809

@@ -2824,7 +2813,6 @@ msgstr ""
28242813
#~ msgid "Failed to start scanning"
28252814
#~ msgstr "Der Scanvorgang kann nicht gestartet werden"
28262815

2827-
#, c-format
28282816
#~ msgid "Failed to start scanning, err 0x%04x"
28292817
#~ msgstr "Der Scanvorgang kann nicht gestartet werden. Status: 0x%04x"
28302818

@@ -2834,15 +2822,12 @@ msgstr ""
28342822
#~ msgid "Failed to stop advertising, err 0x%04x"
28352823
#~ msgstr "Kann advertisement nicht stoppen. Status: 0x%04x"
28362824

2837-
#, c-format
28382825
#~ msgid "Failed to write CCCD, err 0x%04x"
28392826
#~ msgstr "Konnte CCCD nicht schreiben, Status: 0x%04x"
28402827

2841-
#, c-format
28422828
#~ msgid "Failed to write attribute value, err 0x%04x"
28432829
#~ msgstr "Kann den Attributwert nicht schreiben. Status: 0x%04x"
28442830

2845-
#, c-format
28462831
#~ msgid "Failed to write gatts value, err 0x%04x"
28472832
#~ msgstr "gatts value konnte nicht geschrieben werden. Status: 0x%04x"
28482833

locale/en_US.po

Lines changed: 2 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-11-23 13:58-0500\n"
10+
"POT-Creation-Date: 2019-11-27 14:54-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -2417,12 +2417,8 @@ msgstr ""
24172417
msgid "time.struct_time() takes a 9-sequence"
24182418
msgstr ""
24192419

2420-
#: shared-bindings/time/__init__.c
2421-
msgid "time.struct_time() takes exactly 1 argument"
2422-
msgstr ""
2423-
24242420
#: shared-bindings/busio/UART.c
2425-
msgid "timeout >100 (units are now seconds, not msecs)"
2421+
msgid "timeout must be 0.0-100.0 seconds"
24262422
msgstr ""
24272423

24282424
#: shared-bindings/_bleio/CharacteristicBuffer.c

locale/en_x_pirate.po

Lines changed: 2 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-11-23 13:58-0500\n"
10+
"POT-Creation-Date: 2019-11-27 14:54-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -2421,12 +2421,8 @@ msgstr ""
24212421
msgid "time.struct_time() takes a 9-sequence"
24222422
msgstr ""
24232423

2424-
#: shared-bindings/time/__init__.c
2425-
msgid "time.struct_time() takes exactly 1 argument"
2426-
msgstr ""
2427-
24282424
#: shared-bindings/busio/UART.c
2429-
msgid "timeout >100 (units are now seconds, not msecs)"
2425+
msgid "timeout must be 0.0-100.0 seconds"
24302426
msgstr ""
24312427

24322428
#: shared-bindings/_bleio/CharacteristicBuffer.c

locale/es.po

Lines changed: 10 additions & 16 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-11-23 13:58-0500\n"
10+
"POT-Creation-Date: 2019-11-27 14:54-0500\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -2479,13 +2479,9 @@ msgstr "limite debe ser en el rango 0-65536"
24792479
msgid "time.struct_time() takes a 9-sequence"
24802480
msgstr "time.struct_time() toma un sequencio 9"
24812481

2482-
#: shared-bindings/time/__init__.c
2483-
msgid "time.struct_time() takes exactly 1 argument"
2484-
msgstr "time.struct_time() acepta exactamente 1 argumento"
2485-
24862482
#: shared-bindings/busio/UART.c
2487-
msgid "timeout >100 (units are now seconds, not msecs)"
2488-
msgstr "timepo muerto >100 (unidades en segundos)"
2483+
msgid "timeout must be 0.0-100.0 seconds"
2484+
msgstr ""
24892485

24902486
#: shared-bindings/_bleio/CharacteristicBuffer.c
24912487
msgid "timeout must be >= 0.0"
@@ -2710,7 +2706,6 @@ msgstr "paso cero"
27102706
#~ msgid "Characteristic already in use by another Service."
27112707
#~ msgstr "Características ya esta en uso por otro Serivice"
27122708

2713-
#, c-format
27142709
#~ msgid "Could not decode ble_uuid, err 0x%04x"
27152710
#~ msgstr "No se puede descodificar ble_uuid, err 0x%04x"
27162711

@@ -2777,27 +2772,23 @@ msgstr "paso cero"
27772772
#~ msgid "Failed to notify or indicate attribute value, err %0x04x"
27782773
#~ msgstr "No se puede notificar el valor del anuncio. status: 0x%02x"
27792774

2780-
#, c-format
27812775
#~ msgid "Failed to notify or indicate attribute value, err 0x%04x"
27822776
#~ msgstr "Error al notificar o indicar el valor del atributo, err 0x%04x"
27832777

2784-
#, c-format
27852778
#~ msgid "Failed to read CCCD value, err 0x%04x"
27862779
#~ msgstr "No se puede leer el valor del atributo. err 0x%02x"
27872780

27882781
#, fuzzy
27892782
#~ msgid "Failed to read attribute value, err %0x04x"
27902783
#~ msgstr "No se puede leer el valor del atributo. status 0x%02x"
27912784

2792-
#, fuzzy, c-format
2785+
#, fuzzy
27932786
#~ msgid "Failed to read attribute value, err 0x%04x"
27942787
#~ msgstr "Error al leer valor del atributo, err 0x%04"
27952788

2796-
#, c-format
27972789
#~ msgid "Failed to read gatts value, err 0x%04x"
27982790
#~ msgstr "No se puede escribir el valor del atributo. status: 0x%02x"
27992791

2800-
#, c-format
28012792
#~ msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
28022793
#~ msgstr "Fallo al registrar el Vendor-Specific UUID, err 0x%04x"
28032794

@@ -2816,7 +2807,6 @@ msgstr "paso cero"
28162807
#~ msgid "Failed to start scanning"
28172808
#~ msgstr "No se puede iniciar el escaneo. status: 0x%02x"
28182809

2819-
#, c-format
28202810
#~ msgid "Failed to start scanning, err 0x%04x"
28212811
#~ msgstr "No se puede iniciar el escaneo. err 0x%04x"
28222812

@@ -2827,11 +2817,9 @@ msgstr "paso cero"
28272817
#~ msgid "Failed to stop advertising, err 0x%04x"
28282818
#~ msgstr "No se puede detener el anuncio. err: 0x%04x"
28292819

2830-
#, c-format
28312820
#~ msgid "Failed to write attribute value, err 0x%04x"
28322821
#~ msgstr "No se puede escribir el valor del atributo. err: 0x%04x"
28332822

2834-
#, c-format
28352823
#~ msgid "Failed to write gatts value, err 0x%04x"
28362824
#~ msgstr "No se puede escribir el valor del atributo. err: 0x%04x"
28372825

@@ -3043,6 +3031,12 @@ msgstr "paso cero"
30433031
#~ msgid "tile index out of bounds"
30443032
#~ msgstr "el indice del tile fuera de limite"
30453033

3034+
#~ msgid "time.struct_time() takes exactly 1 argument"
3035+
#~ msgstr "time.struct_time() acepta exactamente 1 argumento"
3036+
3037+
#~ msgid "timeout >100 (units are now seconds, not msecs)"
3038+
#~ msgstr "timepo muerto >100 (unidades en segundos)"
3039+
30463040
#~ msgid "too many arguments"
30473041
#~ msgstr "muchos argumentos"
30483042

0 commit comments

Comments
 (0)