Skip to content

Commit 95d9c49

Browse files
committed
Merge remote-tracking branch 'origin/master' into tick-refactor
2 parents bfdfe0e + 83ecb1b commit 95d9c49

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-21 16:50-0800\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"
@@ -2454,12 +2454,8 @@ msgstr ""
24542454
msgid "time.struct_time() takes a 9-sequence"
24552455
msgstr ""
24562456

2457-
#: shared-bindings/time/__init__.c
2458-
msgid "time.struct_time() takes exactly 1 argument"
2459-
msgstr ""
2460-
24612457
#: shared-bindings/busio/UART.c
2462-
msgid "timeout >100 (units are now seconds, not msecs)"
2458+
msgid "timeout must be 0.0-100.0 seconds"
24632459
msgstr ""
24642460

24652461
#: shared-bindings/_bleio/CharacteristicBuffer.c
@@ -2734,19 +2730,19 @@ msgstr ""
27342730
#~ msgid "Failed to notify or indicate attribute value, err %0x04x"
27352731
#~ msgstr "Gagal untuk melaporkan nilai atribut, status: 0x%08lX"
27362732

2737-
#, fuzzy, c-format
2733+
#, fuzzy
27382734
#~ msgid "Failed to read CCCD value, err 0x%04x"
27392735
#~ msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX"
27402736

27412737
#, fuzzy
27422738
#~ msgid "Failed to read attribute value, err %0x04x"
27432739
#~ msgstr "Gagal untuk membaca nilai atribut, status: 0x%08lX"
27442740

2745-
#, fuzzy, c-format
2741+
#, fuzzy
27462742
#~ msgid "Failed to read gatts value, err 0x%04x"
27472743
#~ msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
27482744

2749-
#, fuzzy, c-format
2745+
#, fuzzy
27502746
#~ msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
27512747
#~ msgstr "Gagal untuk menambahkan Vendor Spesific UUID, status: 0x%08lX"
27522748

@@ -2766,7 +2762,7 @@ msgstr ""
27662762
#~ msgid "Failed to start scanning"
27672763
#~ msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"
27682764

2769-
#, fuzzy, c-format
2765+
#, fuzzy
27702766
#~ msgid "Failed to start scanning, err 0x%04x"
27712767
#~ msgstr "Gagal untuk melakukan scanning, status: 0x%08lX"
27722768

@@ -2778,11 +2774,11 @@ msgstr ""
27782774
#~ msgid "Failed to stop advertising, err 0x%04x"
27792775
#~ msgstr "Gagal untuk memberhentikan advertisement, status: 0x%08lX"
27802776

2781-
#, fuzzy, c-format
2777+
#, fuzzy
27822778
#~ msgid "Failed to write attribute value, err 0x%04x"
27832779
#~ msgstr "Gagal untuk menulis nilai atribut, status: 0x%08lX"
27842780

2785-
#, fuzzy, c-format
2781+
#, fuzzy
27862782
#~ msgid "Failed to write gatts value, err 0x%04x"
27872783
#~ msgstr "Gagal untuk menulis nilai gatts, status: 0x%08lX"
27882784

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-21 16:50-0800\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"
@@ -2423,12 +2423,8 @@ msgstr ""
24232423
msgid "time.struct_time() takes a 9-sequence"
24242424
msgstr ""
24252425

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

24342430
#: 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-21 16:50-0800\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"
@@ -2484,12 +2484,8 @@ msgstr "threshold muss im Intervall 0-65536 liegen"
24842484
msgid "time.struct_time() takes a 9-sequence"
24852485
msgstr ""
24862486

2487-
#: shared-bindings/time/__init__.c
2488-
msgid "time.struct_time() takes exactly 1 argument"
2489-
msgstr ""
2490-
24912487
#: shared-bindings/busio/UART.c
2492-
msgid "timeout >100 (units are now seconds, not msecs)"
2488+
msgid "timeout must be 0.0-100.0 seconds"
24932489
msgstr ""
24942490

24952491
#: shared-bindings/_bleio/CharacteristicBuffer.c
@@ -2720,7 +2716,6 @@ msgstr ""
27202716
#~ msgid "Characteristic already in use by another Service."
27212717
#~ msgstr "Characteristic wird bereits von einem anderen Dienst verwendet."
27222718

2723-
#, c-format
27242719
#~ msgid "Could not decode ble_uuid, err 0x%04x"
27252720
#~ msgstr "Konnte ble_uuid nicht decodieren. Status: 0x%04x"
27262721

@@ -2749,7 +2744,6 @@ msgstr ""
27492744
#~ msgid "Failed to add characteristic, err 0x%04x"
27502745
#~ msgstr "Hinzufügen des Characteristic ist gescheitert. Status: 0x%04x"
27512746

2752-
#, c-format
27532747
#~ msgid "Failed to add descriptor, err 0x%04x"
27542748
#~ msgstr "Deskriptor konnte nicht hinzugefügt werden. Status: 0x%04x"
27552749

@@ -2789,22 +2783,18 @@ msgstr ""
27892783
#~ msgid "Failed to pair"
27902784
#~ msgstr "Koppeln fehlgeschlagen"
27912785

2792-
#, c-format
27932786
#~ msgid "Failed to read CCCD value, err 0x%04x"
27942787
#~ msgstr "Kann CCCD value nicht lesen. Status: 0x%04x"
27952788

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

2799-
#, c-format
28002792
#~ msgid "Failed to read attribute value, err 0x%04x"
28012793
#~ msgstr "Kann Attributwert nicht lesen, Status: 0x%04x"
28022794

2803-
#, c-format
28042795
#~ msgid "Failed to read gatts value, err 0x%04x"
28052796
#~ msgstr "gatts value konnte nicht gelesen werden. Status: 0x%04x"
28062797

2807-
#, c-format
28082798
#~ msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
28092799
#~ msgstr "Kann keine herstellerspezifische UUID hinzufügen. Status: 0x%04x"
28102800

@@ -2820,7 +2810,6 @@ msgstr ""
28202810
#~ msgid "Failed to start advertising, err 0x%04x"
28212811
#~ msgstr "Kann advertisement nicht starten. Status: 0x%04x"
28222812

2823-
#, c-format
28242813
#~ msgid "Failed to start connecting, error 0x%04x"
28252814
#~ msgstr "Verbindung konnte nicht hergestellt werden. Status: 0x%04x"
28262815

@@ -2830,7 +2819,6 @@ msgstr ""
28302819
#~ msgid "Failed to start scanning"
28312820
#~ msgstr "Der Scanvorgang kann nicht gestartet werden"
28322821

2833-
#, c-format
28342822
#~ msgid "Failed to start scanning, err 0x%04x"
28352823
#~ msgstr "Der Scanvorgang kann nicht gestartet werden. Status: 0x%04x"
28362824

@@ -2840,15 +2828,12 @@ msgstr ""
28402828
#~ msgid "Failed to stop advertising, err 0x%04x"
28412829
#~ msgstr "Kann advertisement nicht stoppen. Status: 0x%04x"
28422830

2843-
#, c-format
28442831
#~ msgid "Failed to write CCCD, err 0x%04x"
28452832
#~ msgstr "Konnte CCCD nicht schreiben, Status: 0x%04x"
28462833

2847-
#, c-format
28482834
#~ msgid "Failed to write attribute value, err 0x%04x"
28492835
#~ msgstr "Kann den Attributwert nicht schreiben. Status: 0x%04x"
28502836

2851-
#, c-format
28522837
#~ msgid "Failed to write gatts value, err 0x%04x"
28532838
#~ msgstr "gatts value konnte nicht geschrieben werden. Status: 0x%04x"
28542839

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-21 16:50-0800\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"
@@ -2423,12 +2423,8 @@ msgstr ""
24232423
msgid "time.struct_time() takes a 9-sequence"
24242424
msgstr ""
24252425

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

24342430
#: 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-21 16:50-0800\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"
@@ -2427,12 +2427,8 @@ msgstr ""
24272427
msgid "time.struct_time() takes a 9-sequence"
24282428
msgstr ""
24292429

2430-
#: shared-bindings/time/__init__.c
2431-
msgid "time.struct_time() takes exactly 1 argument"
2432-
msgstr ""
2433-
24342430
#: shared-bindings/busio/UART.c
2435-
msgid "timeout >100 (units are now seconds, not msecs)"
2431+
msgid "timeout must be 0.0-100.0 seconds"
24362432
msgstr ""
24372433

24382434
#: 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-21 16:50-0800\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"
@@ -2487,13 +2487,9 @@ msgstr "limite debe ser en el rango 0-65536"
24872487
msgid "time.struct_time() takes a 9-sequence"
24882488
msgstr "time.struct_time() toma un sequencio 9"
24892489

2490-
#: shared-bindings/time/__init__.c
2491-
msgid "time.struct_time() takes exactly 1 argument"
2492-
msgstr "time.struct_time() acepta exactamente 1 argumento"
2493-
24942490
#: shared-bindings/busio/UART.c
2495-
msgid "timeout >100 (units are now seconds, not msecs)"
2496-
msgstr "timepo muerto >100 (unidades en segundos)"
2491+
msgid "timeout must be 0.0-100.0 seconds"
2492+
msgstr ""
24972493

24982494
#: shared-bindings/_bleio/CharacteristicBuffer.c
24992495
msgid "timeout must be >= 0.0"
@@ -2718,7 +2714,6 @@ msgstr "paso cero"
27182714
#~ msgid "Characteristic already in use by another Service."
27192715
#~ msgstr "Características ya esta en uso por otro Serivice"
27202716

2721-
#, c-format
27222717
#~ msgid "Could not decode ble_uuid, err 0x%04x"
27232718
#~ msgstr "No se puede descodificar ble_uuid, err 0x%04x"
27242719

@@ -2785,27 +2780,23 @@ msgstr "paso cero"
27852780
#~ msgid "Failed to notify or indicate attribute value, err %0x04x"
27862781
#~ msgstr "No se puede notificar el valor del anuncio. status: 0x%02x"
27872782

2788-
#, c-format
27892783
#~ msgid "Failed to notify or indicate attribute value, err 0x%04x"
27902784
#~ msgstr "Error al notificar o indicar el valor del atributo, err 0x%04x"
27912785

2792-
#, c-format
27932786
#~ msgid "Failed to read CCCD value, err 0x%04x"
27942787
#~ msgstr "No se puede leer el valor del atributo. err 0x%02x"
27952788

27962789
#, fuzzy
27972790
#~ msgid "Failed to read attribute value, err %0x04x"
27982791
#~ msgstr "No se puede leer el valor del atributo. status 0x%02x"
27992792

2800-
#, fuzzy, c-format
2793+
#, fuzzy
28012794
#~ msgid "Failed to read attribute value, err 0x%04x"
28022795
#~ msgstr "Error al leer valor del atributo, err 0x%04"
28032796

2804-
#, c-format
28052797
#~ msgid "Failed to read gatts value, err 0x%04x"
28062798
#~ msgstr "No se puede escribir el valor del atributo. status: 0x%02x"
28072799

2808-
#, c-format
28092800
#~ msgid "Failed to register Vendor-Specific UUID, err 0x%04x"
28102801
#~ msgstr "Fallo al registrar el Vendor-Specific UUID, err 0x%04x"
28112802

@@ -2824,7 +2815,6 @@ msgstr "paso cero"
28242815
#~ msgid "Failed to start scanning"
28252816
#~ msgstr "No se puede iniciar el escaneo. status: 0x%02x"
28262817

2827-
#, c-format
28282818
#~ msgid "Failed to start scanning, err 0x%04x"
28292819
#~ msgstr "No se puede iniciar el escaneo. err 0x%04x"
28302820

@@ -2835,11 +2825,9 @@ msgstr "paso cero"
28352825
#~ msgid "Failed to stop advertising, err 0x%04x"
28362826
#~ msgstr "No se puede detener el anuncio. err: 0x%04x"
28372827

2838-
#, c-format
28392828
#~ msgid "Failed to write attribute value, err 0x%04x"
28402829
#~ msgstr "No se puede escribir el valor del atributo. err: 0x%04x"
28412830

2842-
#, c-format
28432831
#~ msgid "Failed to write gatts value, err 0x%04x"
28442832
#~ msgstr "No se puede escribir el valor del atributo. err: 0x%04x"
28452833

@@ -3039,6 +3027,12 @@ msgstr "paso cero"
30393027
#~ msgid "tile index out of bounds"
30403028
#~ msgstr "el indice del tile fuera de limite"
30413029

3030+
#~ msgid "time.struct_time() takes exactly 1 argument"
3031+
#~ msgstr "time.struct_time() acepta exactamente 1 argumento"
3032+
3033+
#~ msgid "timeout >100 (units are now seconds, not msecs)"
3034+
#~ msgstr "timepo muerto >100 (unidades en segundos)"
3035+
30423036
#~ msgid "too many arguments"
30433037
#~ msgstr "muchos argumentos"
30443038

0 commit comments

Comments
 (0)