Skip to content

Commit 72ad2e9

Browse files
rhooperrhooper
committed
Merge branch 'master' into new-pixelbuf-api
2 parents 0326c98 + 6c3d555 commit 72ad2e9

252 files changed

Lines changed: 2815 additions & 2956 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ jobs:
151151
- "sparkfun_samd21_dev"
152152
- "sparkfun_samd21_mini"
153153
- "spresense"
154+
- "stm32f411ce_blackpill"
154155
- "stm32f411ve_discovery"
155156
- "stm32f412zg_discovery"
156157
- "stringcar_m0_express"

‎locale/ID.po‎

Lines changed: 69 additions & 51 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-12-10 13:55-0600\n"
11+
"POT-Creation-Date: 2019-12-12 15:33-0800\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"
@@ -23,6 +23,19 @@ msgid ""
2323
"Code done running. Waiting for reload.\n"
2424
msgstr ""
2525

26+
#: supervisor/shared/safe_mode.c
27+
msgid ""
28+
"\n"
29+
"Please file an issue with the contents of your CIRCUITPY drive at \n"
30+
"https://github.com/adafruit/circuitpython/issues\n"
31+
msgstr ""
32+
33+
#: supervisor/shared/safe_mode.c
34+
msgid ""
35+
"\n"
36+
"To exit, please reset the board without "
37+
msgstr ""
38+
2639
#: py/obj.c
2740
msgid " File \"%q\""
2841
msgstr ""
@@ -294,7 +307,7 @@ msgid "Array values should be single bytes."
294307
msgstr ""
295308

296309
#: supervisor/shared/safe_mode.c
297-
msgid "Attempted heap allocation when MicroPython VM not running.\n"
310+
msgid "Attempted heap allocation when MicroPython VM not running."
298311
msgstr ""
299312

300313
#: main.c
@@ -401,6 +414,10 @@ msgstr "Tidak bisa mendapatkan pull pada saat mode output"
401414
msgid "Cannot get temperature"
402415
msgstr "Tidak bisa mendapatkan temperatur. status: 0x%02x"
403416

417+
#: shared-bindings/_bleio/Adapter.c
418+
msgid "Cannot have scan responses for extended, connectable advertisements."
419+
msgstr ""
420+
404421
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
405422
msgid "Cannot output both channels on the same pin"
406423
msgstr ""
@@ -449,6 +466,16 @@ msgstr ""
449466
msgid "CharacteristicBuffer writing not provided"
450467
msgstr ""
451468

469+
#: supervisor/shared/safe_mode.c
470+
msgid "CircuitPython core code crashed hard. Whoops!\n"
471+
msgstr ""
472+
473+
#: supervisor/shared/safe_mode.c
474+
msgid ""
475+
"CircuitPython is in safe mode because you pressed the reset button during "
476+
"boot. Press again to exit safe mode.\n"
477+
msgstr ""
478+
452479
#: shared-module/bitbangio/SPI.c
453480
msgid "Clock pin init failed."
454481
msgstr ""
@@ -510,7 +537,7 @@ msgid "Couldn't allocate second buffer"
510537
msgstr ""
511538

512539
#: supervisor/shared/safe_mode.c
513-
msgid "Crash into the HardFault_Handler.\n"
540+
msgid "Crash into the HardFault_Handler."
514541
msgstr ""
515542

516543
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
@@ -627,28 +654,18 @@ msgstr ""
627654
msgid "Failed to release mutex, err 0x%04x"
628655
msgstr "Gagal untuk melepaskan mutex, status: 0x%08lX"
629656

630-
#: py/moduerrno.c
631-
msgid "File exists"
632-
msgstr ""
633-
634-
#: ports/nrf/peripherals/nrf/nvm.c
635-
msgid "Flash erase failed"
657+
#: supervisor/shared/safe_mode.c
658+
msgid "Failed to write internal flash."
636659
msgstr ""
637660

638-
#: ports/nrf/peripherals/nrf/nvm.c
639-
#, c-format
640-
msgid "Flash erase failed to start, err 0x%04x"
661+
#: py/moduerrno.c
662+
msgid "File exists"
641663
msgstr ""
642664

643-
#: ports/nrf/peripherals/nrf/nvm.c
665+
#: ports/nrf/common-hal/nvm/ByteArray.c
644666
msgid "Flash write failed"
645667
msgstr ""
646668

647-
#: ports/nrf/peripherals/nrf/nvm.c
648-
#, c-format
649-
msgid "Flash write failed to start, err 0x%04x"
650-
msgstr ""
651-
652669
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
653670
msgid "Frequency captured is above capability. Capture Paused."
654671
msgstr ""
@@ -825,13 +842,6 @@ msgstr ""
825842
msgid "Length must be non-negative"
826843
msgstr ""
827844

828-
#: supervisor/shared/safe_mode.c
829-
msgid ""
830-
"Looks like our core CircuitPython code crashed hard. Whoops!\n"
831-
"Please file an issue at https://github.com/adafruit/circuitpython/issues\n"
832-
" with the contents of your CIRCUITPY drive and this message:\n"
833-
msgstr ""
834-
835845
#: shared-module/bitbangio/SPI.c
836846
msgid "MISO pin init failed."
837847
msgstr ""
@@ -846,11 +856,11 @@ msgid "Maximum x value when mirrored is %d"
846856
msgstr ""
847857

848858
#: supervisor/shared/safe_mode.c
849-
msgid "MicroPython NLR jump failed. Likely memory corruption.\n"
859+
msgid "MicroPython NLR jump failed. Likely memory corruption."
850860
msgstr ""
851861

852862
#: supervisor/shared/safe_mode.c
853-
msgid "MicroPython fatal error.\n"
863+
msgid "MicroPython fatal error."
854864
msgstr ""
855865

856866
#: shared-bindings/audiobusio/PDMIn.c
@@ -923,6 +933,10 @@ msgstr ""
923933
msgid "No such file/directory"
924934
msgstr ""
925935

936+
#: supervisor/shared/safe_mode.c
937+
msgid "Nordic Soft Device failure assertion."
938+
msgstr ""
939+
926940
#: ports/nrf/common-hal/_bleio/__init__.c
927941
#: shared-bindings/_bleio/CharacteristicBuffer.c
928942
#, fuzzy
@@ -1102,10 +1116,7 @@ msgstr ""
11021116
#: supervisor/shared/safe_mode.c
11031117
msgid ""
11041118
"The CircuitPython heap was corrupted because the stack was too small.\n"
1105-
"Please increase stack size limits and press reset (after ejecting "
1106-
"CIRCUITPY).\n"
1107-
"If you didn't change the stack, then file an issue here with the contents of "
1108-
"your CIRCUITPY drive:\n"
1119+
"Please increase the stack size if you know how, or if not:"
11091120
msgstr ""
11101121

11111122
#: supervisor/shared/safe_mode.c
@@ -1115,21 +1126,11 @@ msgid ""
11151126
msgstr ""
11161127

11171128
#: supervisor/shared/safe_mode.c
1118-
#, fuzzy
11191129
msgid ""
1120-
"The microcontroller's power dipped. Please make sure your power supply "
1121-
"provides\n"
1130+
"The microcontroller's power dipped. Make sure your power supply provides\n"
11221131
"enough power for the whole circuit and press reset (after ejecting "
11231132
"CIRCUITPY).\n"
11241133
msgstr ""
1125-
"Tegangan dari mikrokontroler turun atau mati. Pastikan sumber tegangan "
1126-
"memberikan daya\n"
1127-
1128-
#: supervisor/shared/safe_mode.c
1129-
msgid ""
1130-
"The reset button was pressed while booting CircuitPython. Press again to "
1131-
"exit safe mode.\n"
1132-
msgstr ""
11331134

11341135
#: shared-module/audiomixer/MixerVoice.c
11351136
msgid "The sample's bits_per_sample does not match the mixer's"
@@ -1163,10 +1164,6 @@ msgstr ""
11631164
msgid "Tile width must exactly divide bitmap width"
11641165
msgstr ""
11651166

1166-
#: supervisor/shared/safe_mode.c
1167-
msgid "To exit, please reset the board without "
1168-
msgstr "Untuk keluar, silahkan reset board tanpa "
1169-
11701167
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
11711168
msgid "Too many channels in sample."
11721169
msgstr "Terlalu banyak channel dalam sampel"
@@ -1245,6 +1242,10 @@ msgstr ""
12451242
msgid "Unknown gatt error: 0x%04x"
12461243
msgstr ""
12471244

1245+
#: supervisor/shared/safe_mode.c
1246+
msgid "Unknown reason."
1247+
msgstr ""
1248+
12481249
#: ports/nrf/common-hal/_bleio/__init__.c
12491250
#, c-format
12501251
msgid "Unknown security error: 0x%04x"
@@ -1322,12 +1323,8 @@ msgstr ""
13221323
"Untuk menampilkan modul built-in silahkan ketik `help(\"modules\")`.\n"
13231324

13241325
#: supervisor/shared/safe_mode.c
1325-
#, fuzzy
1326-
msgid ""
1327-
"You are running in safe mode which means something unanticipated happened.\n"
1326+
msgid "You are in safe mode: something unanticipated happened.\n"
13281327
msgstr ""
1329-
"Anda sedang menjalankan mode aman (safe mode) yang berarti sesuatu yang "
1330-
"sangat buruk telah terjadi.\n"
13311328

13321329
#: supervisor/shared/safe_mode.c
13331330
msgid "You requested starting safe mode by "
@@ -2843,6 +2840,19 @@ msgstr ""
28432840
#~ msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
28442841
#~ msgstr "Dukungan soft device, id: 0x%08lX, pc: 0x%08l"
28452842

2843+
#, fuzzy
2844+
#~ msgid ""
2845+
#~ "The microcontroller's power dipped. Please make sure your power supply "
2846+
#~ "provides\n"
2847+
#~ "enough power for the whole circuit and press reset (after ejecting "
2848+
#~ "CIRCUITPY).\n"
2849+
#~ msgstr ""
2850+
#~ "Tegangan dari mikrokontroler turun atau mati. Pastikan sumber tegangan "
2851+
#~ "memberikan daya\n"
2852+
2853+
#~ msgid "To exit, please reset the board without "
2854+
#~ msgstr "Untuk keluar, silahkan reset board tanpa "
2855+
28462856
#~ msgid "UART(%d) does not exist"
28472857
#~ msgstr "UART(%d) tidak ada"
28482858

@@ -2860,6 +2870,14 @@ msgstr ""
28602870
#~ "Gunakan esptool untuk menghapus flash dan upload ulang Python sebagai "
28612871
#~ "gantinya"
28622872

2873+
#, fuzzy
2874+
#~ msgid ""
2875+
#~ "You are running in safe mode which means something unanticipated "
2876+
#~ "happened.\n"
2877+
#~ msgstr ""
2878+
#~ "Anda sedang menjalankan mode aman (safe mode) yang berarti sesuatu yang "
2879+
#~ "sangat buruk telah terjadi.\n"
2880+
28632881
#~ msgid "[addrinfo error %d]"
28642882
#~ msgstr "[addrinfo error %d]"
28652883

0 commit comments

Comments
 (0)