Skip to content

Commit b8884cc

Browse files
committed
Merge branch 'master' into nrf52_uart_io
2 parents 08cbb03 + b958659 commit b8884cc

File tree

18 files changed

+2500
-112
lines changed

18 files changed

+2500
-112
lines changed

locale/circuitpython.pot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -768,27 +768,27 @@ msgstr ""
768768

769769
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
770770
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
771-
msgid "Can encode UUID into the advertisment packet."
771+
msgid "Can encode UUID into the advertisement packet."
772772
msgstr ""
773773

774774
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
775-
msgid "Can not fit data into the advertisment packet."
775+
msgid "Can not fit data into the advertisement packet."
776776
msgstr ""
777777

778778
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
779779
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
780780
#, c-format
781-
msgid "Can not apply advertisment data. status: 0x%02x"
781+
msgid "Can not apply advertisement data. status: 0x%02x"
782782
msgstr ""
783783

784784
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
785785
#, c-format
786-
msgid "Can not start advertisment. status: 0x%02x"
786+
msgid "Can not start advertisement. status: 0x%02x"
787787
msgstr ""
788788

789789
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
790790
#, c-format
791-
msgid "Can not stop advertisment. status: 0x%02x"
791+
msgid "Can not stop advertisement. status: 0x%02x"
792792
msgstr ""
793793

794794
#: ports/nrf/drivers/bluetooth/ble_drv.c:650

locale/de_DE.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -781,27 +781,27 @@ msgstr ""
781781

782782
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
783783
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
784-
msgid "Can encode UUID into the advertisment packet."
784+
msgid "Can encode UUID into the advertisement packet."
785785
msgstr ""
786786

787787
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
788-
msgid "Can not fit data into the advertisment packet."
788+
msgid "Can not fit data into the advertisement packet."
789789
msgstr ""
790790

791791
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
792792
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
793793
#, c-format
794-
msgid "Can not apply advertisment data. status: 0x%02x"
794+
msgid "Can not apply advertisement data. status: 0x%02x"
795795
msgstr ""
796796

797797
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
798798
#, c-format
799-
msgid "Can not start advertisment. status: 0x%02x"
799+
msgid "Can not start advertisement. status: 0x%02x"
800800
msgstr ""
801801

802802
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
803803
#, c-format
804-
msgid "Can not stop advertisment. status: 0x%02x"
804+
msgid "Can not stop advertisement. status: 0x%02x"
805805
msgstr ""
806806

807807
#: ports/nrf/drivers/bluetooth/ble_drv.c:650

locale/en_US.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -768,27 +768,27 @@ msgstr ""
768768

769769
#: ports/nrf/drivers/bluetooth/ble_drv.c:470
770770
#: ports/nrf/drivers/bluetooth/ble_drv.c:520
771-
msgid "Can encode UUID into the advertisment packet."
771+
msgid "Can encode UUID into the advertisement packet."
772772
msgstr ""
773773

774774
#: ports/nrf/drivers/bluetooth/ble_drv.c:545
775-
msgid "Can not fit data into the advertisment packet."
775+
msgid "Can not fit data into the advertisement packet."
776776
msgstr ""
777777

778778
#: ports/nrf/drivers/bluetooth/ble_drv.c:558
779779
#: ports/nrf/drivers/bluetooth/ble_drv.c:604
780780
#, c-format
781-
msgid "Can not apply advertisment data. status: 0x%02x"
781+
msgid "Can not apply advertisement data. status: 0x%02x"
782782
msgstr ""
783783

784784
#: ports/nrf/drivers/bluetooth/ble_drv.c:614
785785
#, c-format
786-
msgid "Can not start advertisment. status: 0x%02x"
786+
msgid "Can not start advertisement. status: 0x%02x"
787787
msgstr ""
788788

789789
#: ports/nrf/drivers/bluetooth/ble_drv.c:631
790790
#, c-format
791-
msgid "Can not stop advertisment. status: 0x%02x"
791+
msgid "Can not stop advertisement. status: 0x%02x"
792792
msgstr ""
793793

794794
#: ports/nrf/drivers/bluetooth/ble_drv.c:650

0 commit comments

Comments
 (0)