Skip to content

Commit f3af2a6

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/master' into choose-usb-devices-xac
2 parents 195de97 + 28e17fe commit f3af2a6

Some content is hidden

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

97 files changed

+2536
-1175
lines changed

‎locale/ID.po

Lines changed: 19 additions & 15 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-08-29 18:48-0400\n"
11+
"POT-Creation-Date: 2019-08-29 22:16-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"
@@ -482,11 +482,11 @@ msgstr ""
482482
msgid "Could not initialize UART"
483483
msgstr "Tidak dapat menginisialisasi UART"
484484

485-
#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
485+
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
486486
msgid "Couldn't allocate first buffer"
487487
msgstr ""
488488

489-
#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
489+
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
490490
msgid "Couldn't allocate second buffer"
491491
msgstr ""
492492

@@ -812,7 +812,7 @@ msgstr "Ukuran buffer tidak valid"
812812
msgid "Invalid capture period. Valid range: 1 - 500"
813813
msgstr ""
814814

815-
#: shared-bindings/audiocore/Mixer.c
815+
#: shared-bindings/audiomixer/Mixer.c
816816
msgid "Invalid channel count"
817817
msgstr ""
818818

@@ -874,7 +874,11 @@ msgstr ""
874874
msgid "Invalid security_mode"
875875
msgstr ""
876876

877-
#: shared-bindings/audiocore/Mixer.c
877+
#: shared-bindings/audiomixer/Mixer.c
878+
msgid "Invalid voice"
879+
msgstr ""
880+
881+
#: shared-bindings/audiomixer/Mixer.c
878882
msgid "Invalid voice count"
879883
msgstr ""
880884

@@ -1133,7 +1137,7 @@ msgstr ""
11331137
msgid "SDA or SCL needs a pull up"
11341138
msgstr "SDA atau SCL membutuhkan pull up"
11351139

1136-
#: shared-bindings/audiocore/Mixer.c
1140+
#: shared-bindings/audiomixer/Mixer.c
11371141
msgid "Sample rate must be positive"
11381142
msgstr ""
11391143

@@ -1206,19 +1210,19 @@ msgid ""
12061210
"exit safe mode.\n"
12071211
msgstr ""
12081212

1209-
#: shared-module/audiocore/Mixer.c
1213+
#: shared-module/audiomixer/MixerVoice.c
12101214
msgid "The sample's bits_per_sample does not match the mixer's"
12111215
msgstr ""
12121216

1213-
#: shared-module/audiocore/Mixer.c
1217+
#: shared-module/audiomixer/MixerVoice.c
12141218
msgid "The sample's channel count does not match the mixer's"
12151219
msgstr ""
12161220

1217-
#: shared-module/audiocore/Mixer.c
1221+
#: shared-module/audiomixer/MixerVoice.c
12181222
msgid "The sample's sample rate does not match the mixer's"
12191223
msgstr ""
12201224

1221-
#: shared-module/audiocore/Mixer.c
1225+
#: shared-module/audiomixer/MixerVoice.c
12221226
msgid "The sample's signedness does not match the mixer's"
12231227
msgstr ""
12241228

@@ -1355,10 +1359,6 @@ msgstr ""
13551359
msgid "Viper functions don't currently support more than 4 arguments"
13561360
msgstr ""
13571361

1358-
#: shared-module/audiocore/Mixer.c
1359-
msgid "Voice index too high"
1360-
msgstr ""
1361-
13621362
#: main.c
13631363
msgid "WARNING: Your code filename has two extensions\n"
13641364
msgstr "PERINGATAN: Nama file kode anda mempunyai dua ekstensi\n"
@@ -1478,7 +1478,7 @@ msgstr ""
14781478
msgid "bits must be 8"
14791479
msgstr "bits harus memilki nilai 8"
14801480

1481-
#: shared-bindings/audiocore/Mixer.c
1481+
#: shared-bindings/audiomixer/Mixer.c
14821482
msgid "bits_per_sample must be 8 or 16"
14831483
msgstr ""
14841484

@@ -2074,6 +2074,10 @@ msgstr "label didefinis ulang"
20742074
msgid "length argument not allowed for this type"
20752075
msgstr ""
20762076

2077+
#: shared-bindings/audiomixer/MixerVoice.c
2078+
msgid "level must be between 0 and 1"
2079+
msgstr ""
2080+
20772081
#: py/objarray.c
20782082
msgid "lhs and rhs should be compatible"
20792083
msgstr ""

‎locale/circuitpython.pot

Lines changed: 19 additions & 15 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-08-29 18:48-0400\n"
11+
"POT-Creation-Date: 2019-08-29 22:16-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"
@@ -472,11 +472,11 @@ msgstr ""
472472
msgid "Could not initialize UART"
473473
msgstr ""
474474

475-
#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
475+
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
476476
msgid "Couldn't allocate first buffer"
477477
msgstr ""
478478

479-
#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
479+
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
480480
msgid "Couldn't allocate second buffer"
481481
msgstr ""
482482

@@ -797,7 +797,7 @@ msgstr ""
797797
msgid "Invalid capture period. Valid range: 1 - 500"
798798
msgstr ""
799799

800-
#: shared-bindings/audiocore/Mixer.c
800+
#: shared-bindings/audiomixer/Mixer.c
801801
msgid "Invalid channel count"
802802
msgstr ""
803803

@@ -859,7 +859,11 @@ msgstr ""
859859
msgid "Invalid security_mode"
860860
msgstr ""
861861

862-
#: shared-bindings/audiocore/Mixer.c
862+
#: shared-bindings/audiomixer/Mixer.c
863+
msgid "Invalid voice"
864+
msgstr ""
865+
866+
#: shared-bindings/audiomixer/Mixer.c
863867
msgid "Invalid voice count"
864868
msgstr ""
865869

@@ -1113,7 +1117,7 @@ msgstr ""
11131117
msgid "SDA or SCL needs a pull up"
11141118
msgstr ""
11151119

1116-
#: shared-bindings/audiocore/Mixer.c
1120+
#: shared-bindings/audiomixer/Mixer.c
11171121
msgid "Sample rate must be positive"
11181122
msgstr ""
11191123

@@ -1183,19 +1187,19 @@ msgid ""
11831187
"exit safe mode.\n"
11841188
msgstr ""
11851189

1186-
#: shared-module/audiocore/Mixer.c
1190+
#: shared-module/audiomixer/MixerVoice.c
11871191
msgid "The sample's bits_per_sample does not match the mixer's"
11881192
msgstr ""
11891193

1190-
#: shared-module/audiocore/Mixer.c
1194+
#: shared-module/audiomixer/MixerVoice.c
11911195
msgid "The sample's channel count does not match the mixer's"
11921196
msgstr ""
11931197

1194-
#: shared-module/audiocore/Mixer.c
1198+
#: shared-module/audiomixer/MixerVoice.c
11951199
msgid "The sample's sample rate does not match the mixer's"
11961200
msgstr ""
11971201

1198-
#: shared-module/audiocore/Mixer.c
1202+
#: shared-module/audiomixer/MixerVoice.c
11991203
msgid "The sample's signedness does not match the mixer's"
12001204
msgstr ""
12011205

@@ -1331,10 +1335,6 @@ msgstr ""
13311335
msgid "Viper functions don't currently support more than 4 arguments"
13321336
msgstr ""
13331337

1334-
#: shared-module/audiocore/Mixer.c
1335-
msgid "Voice index too high"
1336-
msgstr ""
1337-
13381338
#: main.c
13391339
msgid "WARNING: Your code filename has two extensions\n"
13401340
msgstr ""
@@ -1445,7 +1445,7 @@ msgstr ""
14451445
msgid "bits must be 8"
14461446
msgstr ""
14471447

1448-
#: shared-bindings/audiocore/Mixer.c
1448+
#: shared-bindings/audiomixer/Mixer.c
14491449
msgid "bits_per_sample must be 8 or 16"
14501450
msgstr ""
14511451

@@ -2040,6 +2040,10 @@ msgstr ""
20402040
msgid "length argument not allowed for this type"
20412041
msgstr ""
20422042

2043+
#: shared-bindings/audiomixer/MixerVoice.c
2044+
msgid "level must be between 0 and 1"
2045+
msgstr ""
2046+
20432047
#: py/objarray.c
20442048
msgid "lhs and rhs should be compatible"
20452049
msgstr ""

‎locale/de_DE.po

Lines changed: 22 additions & 15 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-08-29 18:48-0400\n"
10+
"POT-Creation-Date: 2019-08-29 22:16-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"
@@ -476,11 +476,11 @@ msgstr "Konnte ble_uuid nicht decodieren. Status: 0x%04x"
476476
msgid "Could not initialize UART"
477477
msgstr "Konnte UART nicht initialisieren"
478478

479-
#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
479+
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
480480
msgid "Couldn't allocate first buffer"
481481
msgstr "Konnte first buffer nicht zuteilen"
482482

483-
#: shared-module/audiocore/Mixer.c shared-module/audiocore/WaveFile.c
483+
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
484484
msgid "Couldn't allocate second buffer"
485485
msgstr "Konnte second buffer nicht zuteilen"
486486

@@ -803,7 +803,7 @@ msgstr "Ungültige Puffergröße"
803803
msgid "Invalid capture period. Valid range: 1 - 500"
804804
msgstr ""
805805

806-
#: shared-bindings/audiocore/Mixer.c
806+
#: shared-bindings/audiomixer/Mixer.c
807807
msgid "Invalid channel count"
808808
msgstr "Ungültige Anzahl von Kanälen"
809809

@@ -865,7 +865,11 @@ msgstr "Ungültiger Ausführungsmodus"
865865
msgid "Invalid security_mode"
866866
msgstr ""
867867

868-
#: shared-bindings/audiocore/Mixer.c
868+
#: shared-bindings/audiomixer/Mixer.c
869+
msgid "Invalid voice"
870+
msgstr ""
871+
872+
#: shared-bindings/audiomixer/Mixer.c
869873
msgid "Invalid voice count"
870874
msgstr "Ungültige Anzahl von Stimmen"
871875

@@ -1130,7 +1134,7 @@ msgstr "Sicherheitsmodus aktiv! Gespeicherter Code wird nicht ausgeführt\n"
11301134
msgid "SDA or SCL needs a pull up"
11311135
msgstr "SDA oder SCL brauchen pull up"
11321136

1133-
#: shared-bindings/audiocore/Mixer.c
1137+
#: shared-bindings/audiomixer/Mixer.c
11341138
msgid "Sample rate must be positive"
11351139
msgstr "Abtastrate muss positiv sein"
11361140

@@ -1212,19 +1216,19 @@ msgstr ""
12121216
"Die Reset-Taste wurde beim Booten von CircuitPython gedrückt. Drücke sie "
12131217
"erneut um den abgesicherten Modus zu verlassen. \n"
12141218

1215-
#: shared-module/audiocore/Mixer.c
1219+
#: shared-module/audiomixer/MixerVoice.c
12161220
msgid "The sample's bits_per_sample does not match the mixer's"
12171221
msgstr ""
12181222

1219-
#: shared-module/audiocore/Mixer.c
1223+
#: shared-module/audiomixer/MixerVoice.c
12201224
msgid "The sample's channel count does not match the mixer's"
12211225
msgstr ""
12221226

1223-
#: shared-module/audiocore/Mixer.c
1227+
#: shared-module/audiomixer/MixerVoice.c
12241228
msgid "The sample's sample rate does not match the mixer's"
12251229
msgstr ""
12261230

1227-
#: shared-module/audiocore/Mixer.c
1231+
#: shared-module/audiomixer/MixerVoice.c
12281232
msgid "The sample's signedness does not match the mixer's"
12291233
msgstr ""
12301234

@@ -1362,10 +1366,6 @@ msgstr ""
13621366
msgid "Viper functions don't currently support more than 4 arguments"
13631367
msgstr "Viper-Funktionen unterstützen derzeit nicht mehr als 4 Argumente"
13641368

1365-
#: shared-module/audiocore/Mixer.c
1366-
msgid "Voice index too high"
1367-
msgstr "Voice index zu hoch"
1368-
13691369
#: main.c
13701370
msgid "WARNING: Your code filename has two extensions\n"
13711371
msgstr ""
@@ -1485,7 +1485,7 @@ msgstr "bits muss 7, 8 oder 9 sein"
14851485
msgid "bits must be 8"
14861486
msgstr "bits müssen 8 sein"
14871487

1488-
#: shared-bindings/audiocore/Mixer.c
1488+
#: shared-bindings/audiomixer/Mixer.c
14891489
msgid "bits_per_sample must be 8 or 16"
14901490
msgstr "Es müssen 8 oder 16 bits_per_sample sein"
14911491

@@ -2085,6 +2085,10 @@ msgstr "Label neu definiert"
20852085
msgid "length argument not allowed for this type"
20862086
msgstr "Für diesen Typ ist length nicht zulässig"
20872087

2088+
#: shared-bindings/audiomixer/MixerVoice.c
2089+
msgid "level must be between 0 and 1"
2090+
msgstr ""
2091+
20882092
#: py/objarray.c
20892093
msgid "lhs and rhs should be compatible"
20902094
msgstr "lhs und rhs sollten kompatibel sein"
@@ -2915,6 +2919,9 @@ msgstr ""
29152919
#~ msgstr ""
29162920
#~ "Benutze das esptool um den flash zu löschen und Python erneut hochzuladen"
29172921

2922+
#~ msgid "Voice index too high"
2923+
#~ msgstr "Voice index zu hoch"
2924+
29182925
#~ msgid "buffer too long"
29192926
#~ msgstr "Buffer zu lang"
29202927

0 commit comments

Comments
 (0)