Skip to content

Commit 64a333e

Browse files
tannewttannewt
committed
Clean up duplicates and have make translate produce a stable ordering.
1 parent 2a2699b commit 64a333e

5 files changed

Lines changed: 870 additions & 231 deletions

File tree

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,10 @@ pseudoxml:
194194
all-source:
195195

196196
locale/circuitpython.pot: all-source
197-
find . -iname "*.c" | xargs xgettext -L C --keyword=translate -o circuitpython.pot -p locale
197+
find . -iname "*.c" | xargs xgettext -L C --keyword=translate -F -o circuitpython.pot -p locale
198198

199199
translate: locale/circuitpython.pot
200-
for po in $(shell ls locale/*.po); do msgmerge -U $$po locale/circuitpython.pot; done
200+
for po in $(shell ls locale/*.po); do msgmerge -U -F $$po locale/circuitpython.pot; done
201201

202202
check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
203203
$(PYTHON) tools/check_translations.py $^

‎locale/circuitpython.pot‎

Lines changed: 3 additions & 3 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: 2018-08-20 09:37-0700\n"
11+
"POT-Creation-Date: 2018-08-30 16:06-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 <LL@li.org>\n"
@@ -610,11 +610,11 @@ msgid "frequency can only be either 80Mhz or 160MHz"
610610
msgstr ""
611611

612612
#: ports/esp8266/modnetwork.c:61
613-
msgid "STA required"
613+
msgid "AP required"
614614
msgstr ""
615615

616616
#: ports/esp8266/modnetwork.c:61
617-
msgid "AP required"
617+
msgid "STA required"
618618
msgstr ""
619619

620620
#: ports/esp8266/modnetwork.c:87

‎locale/en_US.po‎

Lines changed: 3 additions & 3 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: 2018-08-20 09:37-0700\n"
10+
"POT-Creation-Date: 2018-08-30 16:04-0700\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -610,11 +610,11 @@ msgid "frequency can only be either 80Mhz or 160MHz"
610610
msgstr ""
611611

612612
#: ports/esp8266/modnetwork.c:61
613-
msgid "STA required"
613+
msgid "AP required"
614614
msgstr ""
615615

616616
#: ports/esp8266/modnetwork.c:61
617-
msgid "AP required"
617+
msgid "STA required"
618618
msgstr ""
619619

620620
#: ports/esp8266/modnetwork.c:87

0 commit comments

Comments
 (0)