diff options
| author | Jeff Epler <jepler@gmail.com> | 2020-09-13 14:21:21 -0500 |
|---|---|---|
| committer | Jeff Epler <jepler@gmail.com> | 2020-09-13 14:21:21 -0500 |
| commit | af24c8ae060318fb391900d4715dd5d8e5674613 (patch) | |
| tree | 5436481cc6e2512adcc0415136013138e8d8cb40 /locale/circuitpython.pot | |
| parent | 90f7340bfc35d19fcf5e11c078c7f45399ed07e7 (diff) | |
| parent | 73ad78ed1b701dfad46984be2e53ed0bc75228b6 (diff) | |
Merge remote-tracking branch 'origin/main' into implicit-fallthrough-diagnostic
Conflict in locale/circuitpython.pot resolved with 'make translate'
Diffstat (limited to 'locale/circuitpython.pot')
| -rw-r--r-- | locale/circuitpython.pot | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 78d1223a6..038cdacfc 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-09-12 15:10-0500\n" +"POT-Creation-Date: 2020-09-13 14:21-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,12 +30,6 @@ msgid "" "https://github.com/adafruit/circuitpython/issues\n" msgstr "" -#: supervisor/shared/safe_mode.c -msgid "" -"\n" -"To exit, please reset the board without " -msgstr "" - #: py/obj.c msgid " File \"%q\"" msgstr "" @@ -1605,6 +1599,10 @@ msgid "" "Timer was reserved for internal use - declare PWM pins earlier in the program" msgstr "" +#: supervisor/shared/safe_mode.c +msgid "To exit, please reset the board without " +msgstr "" + #: ports/atmel-samd/common-hal/audiobusio/I2SOut.c msgid "Too many channels in sample." msgstr "" |