Skip to content

Commit 323cca8

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/master' into wdt-nrf
2 parents 2fd7a43 + bdbb16e commit 323cca8

File tree

38 files changed

+319
-506
lines changed

38 files changed

+319
-506
lines changed

‎Makefile

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,22 +202,37 @@ pseudoxml:
202202
@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
203203

204204
# phony target so we always run
205+
.PHONY: all-source
205206
all-source:
206207

207208
locale/circuitpython.pot: all-source
208209
find $(TRANSLATE_SOURCES) -iname "*.c" -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot -p locale
209210

211+
# Historically, `make translate` updated the .pot file and ran msgmerge.
212+
# However, this was a frequent source of merge conflicts. Weblate can perform
213+
# msgmerge, so make translate merely update the translation template file.
214+
.PHONY: translate
210215
translate: locale/circuitpython.pot
216+
217+
# Note that normally we rely on weblate to perform msgmerge. This reduces the
218+
# chance of a merge conflict between developer changes (that only add and
219+
# remove source strings) and weblate changes (that only add and remove
220+
# translated strings from po files). However, in case this is legitimately
221+
# needed we preserve a rule to do it.
222+
.PHONY: msgmerge
223+
msgmerge:
211224
for po in $(shell ls locale/*.po); do msgmerge -U $$po -s --no-fuzzy-matching --add-location=file locale/circuitpython.pot; done
212225

213226
merge-translate:
214227
git merge HEAD 1>&2 2> /dev/null; test $$? -eq 128
215228
rm locale/*~ || true
216-
git checkout --ours -- locale/*
229+
git checkout --theirs -- locale/*
217230
make translate
218231

219-
check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
220-
$(PYTHON) tools/check_translations.py $^
232+
.PHONY: check-translate
233+
check-translate:
234+
find $(TRANSLATE_SOURCES) -iname "*.c" -print | (LC_ALL=C sort) | xgettext -f- -L C -s --add-location=file --keyword=translate -o circuitpython.pot.tmp -p locale
235+
$(PYTHON) tools/check_translations.py locale/circuitpython.pot.tmp locale/circuitpython.pot; status=$$?; rm -f locale/circuitpython.pot.tmp; exit $$status
221236

222237
stubs:
223238
@mkdir -p circuitpython-stubs

‎locale/ID.po

Lines changed: 1 addition & 29 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: 2020-05-27 10:46-0700\n"
11+
"POT-Creation-Date: 2020-05-27 20:51-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"
@@ -1667,26 +1667,6 @@ msgstr ""
16671667
msgid "WARNING: Your code filename has two extensions\n"
16681668
msgstr "PERINGATAN: Nama file kode anda mempunyai dua ekstensi\n"
16691669

1670-
#: shared-bindings/watchdog/WatchDogTimer.c
1671-
msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET"
1672-
msgstr ""
1673-
1674-
#: shared-bindings/watchdog/WatchDogTimer.c
1675-
msgid "WatchDogTimer is not currently running"
1676-
msgstr ""
1677-
1678-
#: shared-bindings/watchdog/WatchDogTimer.c
1679-
msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
1680-
msgstr ""
1681-
1682-
#: shared-bindings/watchdog/WatchDogTimer.c
1683-
msgid "WatchDogTimer.timeout must be greater than 0"
1684-
msgstr ""
1685-
1686-
#: supervisor/shared/safe_mode.c
1687-
msgid "Watchdog timer expired."
1688-
msgstr ""
1689-
16901670
#: py/builtinhelp.c
16911671
#, c-format
16921672
msgid ""
@@ -3074,10 +3054,6 @@ msgstr ""
30743054
msgid "time.struct_time() takes a 9-sequence"
30753055
msgstr ""
30763056

3077-
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
3078-
msgid "timeout duration exceeded the maximum supported value"
3079-
msgstr ""
3080-
30813057
#: shared-bindings/busio/UART.c
30823058
msgid "timeout must be 0.0-100.0 seconds"
30833059
msgstr ""
@@ -3232,10 +3208,6 @@ msgstr ""
32323208
msgid "value_count must be > 0"
32333209
msgstr ""
32343210

3235-
#: shared-bindings/watchdog/WatchDogTimer.c
3236-
msgid "watchdog timeout must be greater than 0"
3237-
msgstr ""
3238-
32393211
#: shared-bindings/_bleio/Adapter.c
32403212
msgid "window must be <= interval"
32413213
msgstr ""

‎locale/circuitpython.pot

Lines changed: 6 additions & 4 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: 2020-05-29 10:15-0700\n"
11+
"POT-Creation-Date: 2020-06-01 15:17-0700\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"
@@ -874,7 +874,7 @@ msgstr ""
874874
msgid "Invalid DAC pin supplied"
875875
msgstr ""
876876

877-
#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/stm/common-hal/busio/I2C.c
877+
#: ports/stm/common-hal/busio/I2C.c
878878
msgid "Invalid I2C pin selection"
879879
msgstr ""
880880

@@ -964,7 +964,8 @@ msgstr ""
964964
#: ports/atmel-samd/common-hal/busio/UART.c
965965
#: ports/atmel-samd/common-hal/i2cslave/I2CSlave.c
966966
#: ports/cxd56/common-hal/busio/I2C.c ports/cxd56/common-hal/busio/SPI.c
967-
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/SPI.c
967+
#: ports/cxd56/common-hal/busio/UART.c ports/mimxrt10xx/common-hal/busio/I2C.c
968+
#: ports/mimxrt10xx/common-hal/busio/SPI.c
968969
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/I2C.c
969970
msgid "Invalid pins"
970971
msgstr ""
@@ -1356,7 +1357,8 @@ msgstr ""
13561357
msgid "Running in safe mode! Not running saved code.\n"
13571358
msgstr ""
13581359

1359-
#: ports/atmel-samd/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
1360+
#: ports/atmel-samd/common-hal/busio/I2C.c
1361+
#: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nrf/common-hal/busio/I2C.c
13601362
msgid "SDA or SCL needs a pull up"
13611363
msgstr ""
13621364

‎locale/de_DE.po

Lines changed: 7 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2020-05-29 10:15-0700\n"
11-
"PO-Revision-Date: 2020-05-23 16:13+0000\n"
12-
"Last-Translator: Timon <[email protected]>\n"
10+
"POT-Creation-Date: 2020-05-27 20:51-0500\n"
11+
"PO-Revision-Date: 2020-05-29 17:42+0000\n"
12+
"Last-Translator: Thomas Friehoff <[email protected]>\n"
1313
"Language-Team: German <https://later.unpythonic.net/projects/circuitpython/"
1414
"circuitpython-master/de/>\n"
1515
"Language: de_DE\n"
@@ -383,7 +383,7 @@ msgstr "Bit depth muss ein Vielfaches von 8 sein."
383383

384384
#: ports/mimxrt10xx/common-hal/busio/UART.c
385385
msgid "Both RX and TX required for flow control"
386-
msgstr ""
386+
msgstr "Sowohl RX als auch TX sind zu Flusssteuerung erforderlich"
387387

388388
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
389389
msgid "Both pins must support hardware interrupts"
@@ -652,7 +652,7 @@ msgstr "DAC Kanal Intialisierungs Fehler"
652652

653653
#: ports/stm/common-hal/analogio/AnalogOut.c
654654
msgid "DAC Device Init Error"
655-
msgstr "DAC Device Init Error"
655+
msgstr "DAC Device Initialisierungs-Fehler"
656656

657657
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
658658
msgid "DAC already in use"
@@ -1275,7 +1275,7 @@ msgstr "Pin hat keine ADC Funktionalität"
12751275

12761276
#: shared-bindings/digitalio/DigitalInOut.c
12771277
msgid "Pin is input only"
1278-
msgstr ""
1278+
msgstr "Pin kann nur als Eingang verwendet werden"
12791279

12801280
#: ports/atmel-samd/common-hal/countio/Counter.c
12811281
msgid "Pin must support hardware interrupts"
@@ -1709,26 +1709,6 @@ msgid "WARNING: Your code filename has two extensions\n"
17091709
msgstr ""
17101710
"WARNUNG: Der Dateiname deines Programms hat zwei Dateityperweiterungen\n"
17111711

1712-
#: shared-bindings/watchdog/WatchDogTimer.c
1713-
msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET"
1714-
msgstr ""
1715-
1716-
#: shared-bindings/watchdog/WatchDogTimer.c
1717-
msgid "WatchDogTimer is not currently running"
1718-
msgstr ""
1719-
1720-
#: shared-bindings/watchdog/WatchDogTimer.c
1721-
msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
1722-
msgstr ""
1723-
1724-
#: shared-bindings/watchdog/WatchDogTimer.c
1725-
msgid "WatchDogTimer.timeout must be greater than 0"
1726-
msgstr ""
1727-
1728-
#: supervisor/shared/safe_mode.c
1729-
msgid "Watchdog timer expired."
1730-
msgstr ""
1731-
17321712
#: py/builtinhelp.c
17331713
#, c-format
17341714
msgid ""
@@ -2985,7 +2965,7 @@ msgstr "die ersuchte Länge ist %d, aber das Objekt hat eine Länge von %d"
29852965

29862966
#: py/compile.c
29872967
msgid "return annotation must be an identifier"
2988-
msgstr "return annotation muss ein identifier sein"
2968+
msgstr "Rückgabewert-Beschreibung muss ein Identifier sein"
29892969

29902970
#: py/emitnative.c
29912971
msgid "return expected '%q' but got '%q'"
@@ -3143,10 +3123,6 @@ msgstr "threshold muss im Intervall 0-65536 liegen"
31433123
msgid "time.struct_time() takes a 9-sequence"
31443124
msgstr "time.struct_time() nimmt eine 9-Sequenz an"
31453125

3146-
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
3147-
msgid "timeout duration exceeded the maximum supported value"
3148-
msgstr ""
3149-
31503126
#: shared-bindings/busio/UART.c
31513127
msgid "timeout must be 0.0-100.0 seconds"
31523128
msgstr "Das Zeitlimit muss 0,0-100,0 Sekunden betragen"
@@ -3304,10 +3280,6 @@ msgstr "Wert muss in %d Byte(s) passen"
33043280
msgid "value_count must be > 0"
33053281
msgstr "value_count muss größer als 0 sein"
33063282

3307-
#: shared-bindings/watchdog/WatchDogTimer.c
3308-
msgid "watchdog timeout must be greater than 0"
3309-
msgstr ""
3310-
33113283
#: shared-bindings/_bleio/Adapter.c
33123284
msgid "window must be <= interval"
33133285
msgstr "Fenster muss <= Intervall sein"

‎locale/es.po

Lines changed: 1 addition & 29 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: 2020-05-27 10:46-0700\n"
10+
"POT-Creation-Date: 2020-05-27 20:51-0500\n"
1111
"PO-Revision-Date: 2020-05-17 20:56+0000\n"
1212
"Last-Translator: Jeff Epler <[email protected]>\n"
1313
"Language-Team: \n"
@@ -1669,26 +1669,6 @@ msgstr ""
16691669
msgid "WARNING: Your code filename has two extensions\n"
16701670
msgstr "ADVERTENCIA: El nombre de archivo de tu código tiene dos extensiones\n"
16711671

1672-
#: shared-bindings/watchdog/WatchDogTimer.c
1673-
msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET"
1674-
msgstr ""
1675-
1676-
#: shared-bindings/watchdog/WatchDogTimer.c
1677-
msgid "WatchDogTimer is not currently running"
1678-
msgstr ""
1679-
1680-
#: shared-bindings/watchdog/WatchDogTimer.c
1681-
msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
1682-
msgstr ""
1683-
1684-
#: shared-bindings/watchdog/WatchDogTimer.c
1685-
msgid "WatchDogTimer.timeout must be greater than 0"
1686-
msgstr ""
1687-
1688-
#: supervisor/shared/safe_mode.c
1689-
msgid "Watchdog timer expired."
1690-
msgstr ""
1691-
16921672
#: py/builtinhelp.c
16931673
#, c-format
16941674
msgid ""
@@ -3092,10 +3072,6 @@ msgstr "limite debe ser en el rango 0-65536"
30923072
msgid "time.struct_time() takes a 9-sequence"
30933073
msgstr "time.struct_time() toma un sequencio 9"
30943074

3095-
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
3096-
msgid "timeout duration exceeded the maximum supported value"
3097-
msgstr ""
3098-
30993075
#: shared-bindings/busio/UART.c
31003076
msgid "timeout must be 0.0-100.0 seconds"
31013077
msgstr ""
@@ -3249,10 +3225,6 @@ msgstr ""
32493225
msgid "value_count must be > 0"
32503226
msgstr ""
32513227

3252-
#: shared-bindings/watchdog/WatchDogTimer.c
3253-
msgid "watchdog timeout must be greater than 0"
3254-
msgstr ""
3255-
32563228
#: shared-bindings/_bleio/Adapter.c
32573229
msgid "window must be <= interval"
32583230
msgstr ""

‎locale/fil.po

Lines changed: 1 addition & 29 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: 2020-05-27 10:46-0700\n"
10+
"POT-Creation-Date: 2020-05-27 20:51-0500\n"
1111
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1212
"Last-Translator: Timothy <[email protected]>\n"
1313
"Language-Team: fil\n"
@@ -1677,26 +1677,6 @@ msgstr ""
16771677
msgid "WARNING: Your code filename has two extensions\n"
16781678
msgstr "BABALA: Ang pangalan ng file ay may dalawang extension\n"
16791679

1680-
#: shared-bindings/watchdog/WatchDogTimer.c
1681-
msgid "WatchDogTimer cannot be deinitialized once mode is set to RESET"
1682-
msgstr ""
1683-
1684-
#: shared-bindings/watchdog/WatchDogTimer.c
1685-
msgid "WatchDogTimer is not currently running"
1686-
msgstr ""
1687-
1688-
#: shared-bindings/watchdog/WatchDogTimer.c
1689-
msgid "WatchDogTimer.mode cannot be changed once set to WatchDogMode.RESET"
1690-
msgstr ""
1691-
1692-
#: shared-bindings/watchdog/WatchDogTimer.c
1693-
msgid "WatchDogTimer.timeout must be greater than 0"
1694-
msgstr ""
1695-
1696-
#: supervisor/shared/safe_mode.c
1697-
msgid "Watchdog timer expired."
1698-
msgstr ""
1699-
17001680
#: py/builtinhelp.c
17011681
#, c-format
17021682
msgid ""
@@ -3104,10 +3084,6 @@ msgstr "ang threshold ay dapat sa range 0-65536"
31043084
msgid "time.struct_time() takes a 9-sequence"
31053085
msgstr "time.struct_time() kumukuha ng 9-sequence"
31063086

3107-
#: ports/nrf/common-hal/watchdog/WatchDogTimer.c
3108-
msgid "timeout duration exceeded the maximum supported value"
3109-
msgstr ""
3110-
31113087
#: shared-bindings/busio/UART.c
31123088
msgid "timeout must be 0.0-100.0 seconds"
31133089
msgstr ""
@@ -3262,10 +3238,6 @@ msgstr ""
32623238
msgid "value_count must be > 0"
32633239
msgstr ""
32643240

3265-
#: shared-bindings/watchdog/WatchDogTimer.c
3266-
msgid "watchdog timeout must be greater than 0"
3267-
msgstr ""
3268-
32693241
#: shared-bindings/_bleio/Adapter.c
32703242
msgid "window must be <= interval"
32713243
msgstr ""

0 commit comments

Comments
 (0)