Skip to content

Commit b369fa9

Browse files
tannewttannewt
authored
Merge pull request adafruit#1478 from dhalbert/struct-compat
Improve struct compatibility with CPython
2 parents 6b88d0f + 9558b3a commit b369fa9

14 files changed

Lines changed: 477 additions & 338 deletions

File tree

‎locale/ID.po‎

Lines changed: 27 additions & 17 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-01-20 17:33-0800\n"
11+
"POT-Creation-Date: 2019-01-20 22:46-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"
@@ -1363,9 +1363,9 @@ msgstr ""
13631363
msgid "schedule stack full"
13641364
msgstr ""
13651365

1366-
#: py/modstruct.c:145 py/modstruct.c:153 py/modstruct.c:234 py/modstruct.c:244
1367-
#: shared-bindings/struct/__init__.c:103 shared-bindings/struct/__init__.c:145
1368-
#: shared-module/struct/__init__.c:91 shared-module/struct/__init__.c:175
1366+
#: py/modstruct.c:148 py/modstruct.c:156 py/modstruct.c:244 py/modstruct.c:254
1367+
#: shared-bindings/struct/__init__.c:102 shared-bindings/struct/__init__.c:161
1368+
#: shared-module/struct/__init__.c:183
13691369
msgid "buffer too small"
13701370
msgstr ""
13711371

@@ -2649,10 +2649,20 @@ msgstr ""
26492649
msgid "'S' and 'O' are not supported format types"
26502650
msgstr ""
26512651

2652-
#: shared-module/struct/__init__.c:83
2652+
#: shared-module/struct/__init__.c:128
2653+
#, fuzzy, c-format
2654+
msgid "unpack requires a buffer of %d bytes"
2655+
msgstr "Gagal untuk megalokasikan buffer RX dari %d byte"
2656+
2657+
#: shared-module/struct/__init__.c:136
26532658
msgid "too many arguments provided with the given format"
26542659
msgstr ""
26552660

2661+
#: shared-module/struct/__init__.c:179
2662+
#, fuzzy
2663+
msgid "buffer size must match format"
2664+
msgstr "buffers harus mempunyai panjang yang sama"
2665+
26562666
#: shared-module/usb_hid/Device.c:45
26572667
#, c-format
26582668
msgid "Buffer incorrect size. Should be %d bytes."
@@ -2739,24 +2749,24 @@ msgid ""
27392749
"exit safe mode.\n"
27402750
msgstr ""
27412751

2752+
#~ msgid "Invalid UUID string length"
2753+
#~ msgstr "Panjang string UUID tidak valid"
2754+
27422755
#~ msgid ""
2743-
#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
2756+
#~ "enough power for the whole circuit and press reset (after ejecting "
2757+
#~ "CIRCUITPY).\n"
27442758
#~ msgstr ""
2745-
#~ "Silahkan taruh masalah disini dengan isi dari CIRCUITPY drive: anda \n"
2746-
2747-
#~ msgid "Invalid UUID parameter"
2748-
#~ msgstr "Parameter UUID tidak valid"
2759+
#~ "tegangan cukup untuk semua sirkuit dan tekan reset (setelah mencabut "
2760+
#~ "CIRCUITPY).\n"
27492761

27502762
#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
27512763
#~ msgstr ""
27522764
#~ "Sepertinya inti kode CircuitPython kita crash dengan sangat keras. Ups!\n"
27532765

2766+
#~ msgid "Invalid UUID parameter"
2767+
#~ msgstr "Parameter UUID tidak valid"
2768+
27542769
#~ msgid ""
2755-
#~ "enough power for the whole circuit and press reset (after ejecting "
2756-
#~ "CIRCUITPY).\n"
2770+
#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
27572771
#~ msgstr ""
2758-
#~ "tegangan cukup untuk semua sirkuit dan tekan reset (setelah mencabut "
2759-
#~ "CIRCUITPY).\n"
2760-
2761-
#~ msgid "Invalid UUID string length"
2762-
#~ msgstr "Panjang string UUID tidak valid"
2772+
#~ "Silahkan taruh masalah disini dengan isi dari CIRCUITPY drive: anda \n"

‎locale/circuitpython.pot‎

Lines changed: 14 additions & 5 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-01-20 17:33-0800\n"
11+
"POT-Creation-Date: 2019-01-20 22:46-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"
@@ -1330,9 +1330,9 @@ msgstr ""
13301330
msgid "schedule stack full"
13311331
msgstr ""
13321332

1333-
#: py/modstruct.c:145 py/modstruct.c:153 py/modstruct.c:234 py/modstruct.c:244
1334-
#: shared-bindings/struct/__init__.c:103 shared-bindings/struct/__init__.c:145
1335-
#: shared-module/struct/__init__.c:91 shared-module/struct/__init__.c:175
1333+
#: py/modstruct.c:148 py/modstruct.c:156 py/modstruct.c:244 py/modstruct.c:254
1334+
#: shared-bindings/struct/__init__.c:102 shared-bindings/struct/__init__.c:161
1335+
#: shared-module/struct/__init__.c:183
13361336
msgid "buffer too small"
13371337
msgstr ""
13381338

@@ -2612,10 +2612,19 @@ msgstr ""
26122612
msgid "'S' and 'O' are not supported format types"
26132613
msgstr ""
26142614

2615-
#: shared-module/struct/__init__.c:83
2615+
#: shared-module/struct/__init__.c:128
2616+
#, c-format
2617+
msgid "unpack requires a buffer of %d bytes"
2618+
msgstr ""
2619+
2620+
#: shared-module/struct/__init__.c:136
26162621
msgid "too many arguments provided with the given format"
26172622
msgstr ""
26182623

2624+
#: shared-module/struct/__init__.c:179
2625+
msgid "buffer size must match format"
2626+
msgstr ""
2627+
26192628
#: shared-module/usb_hid/Device.c:45
26202629
#, c-format
26212630
msgid "Buffer incorrect size. Should be %d bytes."

‎locale/de_DE.po‎

Lines changed: 46 additions & 36 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-01-20 17:33-0800\n"
10+
"POT-Creation-Date: 2019-01-20 22:46-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Sebastian Plamauer\n"
1313
"Language-Team: \n"
@@ -1359,9 +1359,9 @@ msgstr ""
13591359
msgid "schedule stack full"
13601360
msgstr ""
13611361

1362-
#: py/modstruct.c:145 py/modstruct.c:153 py/modstruct.c:234 py/modstruct.c:244
1363-
#: shared-bindings/struct/__init__.c:103 shared-bindings/struct/__init__.c:145
1364-
#: shared-module/struct/__init__.c:91 shared-module/struct/__init__.c:175
1362+
#: py/modstruct.c:148 py/modstruct.c:156 py/modstruct.c:244 py/modstruct.c:254
1363+
#: shared-bindings/struct/__init__.c:102 shared-bindings/struct/__init__.c:161
1364+
#: shared-module/struct/__init__.c:183
13651365
msgid "buffer too small"
13661366
msgstr ""
13671367

@@ -2651,10 +2651,20 @@ msgstr "Kann '/' nicht remounten when USB aktiv ist"
26512651
msgid "'S' and 'O' are not supported format types"
26522652
msgstr ""
26532653

2654-
#: shared-module/struct/__init__.c:83
2654+
#: shared-module/struct/__init__.c:128
2655+
#, fuzzy, c-format
2656+
msgid "unpack requires a buffer of %d bytes"
2657+
msgstr "Konnte keine RX Buffer mit %d allozieren"
2658+
2659+
#: shared-module/struct/__init__.c:136
26552660
msgid "too many arguments provided with the given format"
26562661
msgstr ""
26572662

2663+
#: shared-module/struct/__init__.c:179
2664+
#, fuzzy
2665+
msgid "buffer size must match format"
2666+
msgstr "Buffer müssen gleich lang sein"
2667+
26582668
#: shared-module/usb_hid/Device.c:45
26592669
#, c-format
26602670
msgid "Buffer incorrect size. Should be %d bytes."
@@ -2739,22 +2749,29 @@ msgid ""
27392749
"exit safe mode.\n"
27402750
msgstr ""
27412751

2742-
#~ msgid "Invalid UUID string length"
2743-
#~ msgstr "Ungültige UUID-Stringlänge"
2752+
#~ msgid "Can not add Characteristic."
2753+
#~ msgstr "Kann das Merkmal nicht hinzufügen."
27442754

2745-
#~ msgid "Can encode UUID into the advertisement packet."
2746-
#~ msgstr "Kann UUID in das advertisement packet kodieren."
2755+
#~ msgid "Can not add Service."
2756+
#~ msgstr "Kann den Dienst nicht hinzufügen."
27472757

2748-
#~ msgid ""
2749-
#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
2750-
#~ msgstr ""
2751-
#~ "Bitte erstelle ein issue hier mit dem Inhalt deines CIRCUITPY-speichers:\n"
2758+
#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
2759+
#~ msgstr "CircuitPython ist abgestürzt. Ups!\n"
27522760

2753-
#~ msgid "Invalid UUID parameter"
2754-
#~ msgstr "Ungültiger UUID-Parameter"
2761+
#~ msgid "Can not apply advertisement data. status: 0x%02x"
2762+
#~ msgstr "Kann advertisement data nicht anwenden. Status: 0x%02x"
27552763

2756-
#~ msgid "Invalid Service type"
2757-
#~ msgstr "Ungültiger Diensttyp"
2764+
#~ msgid "Cannot apply GAP parameters."
2765+
#~ msgstr "Kann GAP Parameter nicht anwenden."
2766+
2767+
#~ msgid "Can not encode UUID, to check length."
2768+
#~ msgstr "Kann UUID nicht kodieren, um die Länge zu überprüfen."
2769+
2770+
#~ msgid "Can not query for the device address."
2771+
#~ msgstr "Kann nicht nach der Geräteadresse suchen."
2772+
2773+
#~ msgid "Can not apply device name in the stack."
2774+
#~ msgstr "Der Gerätename kann nicht im Stack verwendet werden."
27582775

27592776
#~ msgid ""
27602777
#~ "enough power for the whole circuit and press reset (after ejecting "
@@ -2763,26 +2780,19 @@ msgstr ""
27632780
#~ "genug Strom für den ganzen Schaltkreis liefert und drücke reset (nach dem "
27642781
#~ "sicheren Auswerfen von CIRCUITPY.)\n"
27652782

2766-
#~ msgid "Can not apply device name in the stack."
2767-
#~ msgstr "Der Gerätename kann nicht im Stack verwendet werden."
2768-
2769-
#~ msgid "Can not query for the device address."
2770-
#~ msgstr "Kann nicht nach der Geräteadresse suchen."
2771-
2772-
#~ msgid "Can not encode UUID, to check length."
2773-
#~ msgstr "Kann UUID nicht kodieren, um die Länge zu überprüfen."
2774-
2775-
#~ msgid "Cannot apply GAP parameters."
2776-
#~ msgstr "Kann GAP Parameter nicht anwenden."
2783+
#~ msgid "Invalid Service type"
2784+
#~ msgstr "Ungültiger Diensttyp"
27772785

2778-
#~ msgid "Can not apply advertisement data. status: 0x%02x"
2779-
#~ msgstr "Kann advertisement data nicht anwenden. Status: 0x%02x"
2786+
#~ msgid "Invalid UUID parameter"
2787+
#~ msgstr "Ungültiger UUID-Parameter"
27802788

2781-
#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
2782-
#~ msgstr "CircuitPython ist abgestürzt. Ups!\n"
2789+
#~ msgid ""
2790+
#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
2791+
#~ msgstr ""
2792+
#~ "Bitte erstelle ein issue hier mit dem Inhalt deines CIRCUITPY-speichers:\n"
27832793

2784-
#~ msgid "Can not add Service."
2785-
#~ msgstr "Kann den Dienst nicht hinzufügen."
2794+
#~ msgid "Can encode UUID into the advertisement packet."
2795+
#~ msgstr "Kann UUID in das advertisement packet kodieren."
27862796

2787-
#~ msgid "Can not add Characteristic."
2788-
#~ msgstr "Kann das Merkmal nicht hinzufügen."
2797+
#~ msgid "Invalid UUID string length"
2798+
#~ msgstr "Ungültige UUID-Stringlänge"

‎locale/en_US.po‎

Lines changed: 14 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: 2019-01-20 17:33-0800\n"
10+
"POT-Creation-Date: 2019-01-20 22:46-0500\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -1330,9 +1330,9 @@ msgstr ""
13301330
msgid "schedule stack full"
13311331
msgstr ""
13321332

1333-
#: py/modstruct.c:145 py/modstruct.c:153 py/modstruct.c:234 py/modstruct.c:244
1334-
#: shared-bindings/struct/__init__.c:103 shared-bindings/struct/__init__.c:145
1335-
#: shared-module/struct/__init__.c:91 shared-module/struct/__init__.c:175
1333+
#: py/modstruct.c:148 py/modstruct.c:156 py/modstruct.c:244 py/modstruct.c:254
1334+
#: shared-bindings/struct/__init__.c:102 shared-bindings/struct/__init__.c:161
1335+
#: shared-module/struct/__init__.c:183
13361336
msgid "buffer too small"
13371337
msgstr ""
13381338

@@ -2612,10 +2612,19 @@ msgstr ""
26122612
msgid "'S' and 'O' are not supported format types"
26132613
msgstr ""
26142614

2615-
#: shared-module/struct/__init__.c:83
2615+
#: shared-module/struct/__init__.c:128
2616+
#, c-format
2617+
msgid "unpack requires a buffer of %d bytes"
2618+
msgstr ""
2619+
2620+
#: shared-module/struct/__init__.c:136
26162621
msgid "too many arguments provided with the given format"
26172622
msgstr ""
26182623

2624+
#: shared-module/struct/__init__.c:179
2625+
msgid "buffer size must match format"
2626+
msgstr ""
2627+
26192628
#: shared-module/usb_hid/Device.c:45
26202629
#, c-format
26212630
msgid "Buffer incorrect size. Should be %d bytes."

0 commit comments

Comments
 (0)