Clean up duplicates and have make translate produce a stable ordering.

This commit is contained in:
Scott Shawcroft 2018-08-30 16:12:20 -07:00
parent 2a2699bef6
commit 64a333eeaf
No known key found for this signature in database
GPG Key ID: FD0EDC4B6C53CA59
5 changed files with 786 additions and 147 deletions

View File

@ -194,10 +194,10 @@ pseudoxml:
all-source: all-source:
locale/circuitpython.pot: all-source locale/circuitpython.pot: all-source
find . -iname "*.c" | xargs xgettext -L C --keyword=translate -o circuitpython.pot -p locale find . -iname "*.c" | xargs xgettext -L C --keyword=translate -F -o circuitpython.pot -p locale
translate: locale/circuitpython.pot translate: locale/circuitpython.pot
for po in $(shell ls locale/*.po); do msgmerge -U $$po locale/circuitpython.pot; done for po in $(shell ls locale/*.po); do msgmerge -U -F $$po locale/circuitpython.pot; done
check-translate: locale/circuitpython.pot $(wildcard locale/*.po) check-translate: locale/circuitpython.pot $(wildcard locale/*.po)
$(PYTHON) tools/check_translations.py $^ $(PYTHON) tools/check_translations.py $^

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-20 09:37-0700\n" "POT-Creation-Date: 2018-08-30 16:06-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -610,11 +610,11 @@ msgid "frequency can only be either 80Mhz or 160MHz"
msgstr "" msgstr ""
#: ports/esp8266/modnetwork.c:61 #: ports/esp8266/modnetwork.c:61
msgid "STA required" msgid "AP required"
msgstr "" msgstr ""
#: ports/esp8266/modnetwork.c:61 #: ports/esp8266/modnetwork.c:61
msgid "AP required" msgid "STA required"
msgstr "" msgstr ""
#: ports/esp8266/modnetwork.c:87 #: ports/esp8266/modnetwork.c:87

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-20 09:37-0700\n" "POT-Creation-Date: 2018-08-30 16:04-0700\n"
"PO-Revision-Date: 2018-07-27 11:55-0700\n" "PO-Revision-Date: 2018-07-27 11:55-0700\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
@ -610,11 +610,11 @@ msgid "frequency can only be either 80Mhz or 160MHz"
msgstr "" msgstr ""
#: ports/esp8266/modnetwork.c:61 #: ports/esp8266/modnetwork.c:61
msgid "STA required" msgid "AP required"
msgstr "" msgstr ""
#: ports/esp8266/modnetwork.c:61 #: ports/esp8266/modnetwork.c:61
msgid "AP required" msgid "STA required"
msgstr "" msgstr ""
#: ports/esp8266/modnetwork.c:87 #: ports/esp8266/modnetwork.c:87

File diff suppressed because it is too large Load Diff

View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 0.1\n" "Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-20 09:37-0700\n" "POT-Creation-Date: 2018-08-30 16:04-0700\n"
"PO-Revision-Date: 2018-08-14 11:01+0200\n" "PO-Revision-Date: 2018-08-14 11:01+0200\n"
"Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n" "Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n"
"Language-Team: fr\n" "Language-Team: fr\n"
@ -620,14 +620,14 @@ msgstr "l'emplacement en mémoire flash doit être inférieure à 1Mo"
msgid "frequency can only be either 80Mhz or 160MHz" msgid "frequency can only be either 80Mhz or 160MHz"
msgstr "la fréquence doit être soit 80MHz soit 160MHz" msgstr "la fréquence doit être soit 80MHz soit 160MHz"
#: ports/esp8266/modnetwork.c:61
msgid "STA required"
msgstr "'STA' requis"
#: ports/esp8266/modnetwork.c:61 #: ports/esp8266/modnetwork.c:61
msgid "AP required" msgid "AP required"
msgstr "'AP' requis" msgstr "'AP' requis"
#: ports/esp8266/modnetwork.c:61
msgid "STA required"
msgstr "'STA' requis"
#: ports/esp8266/modnetwork.c:87 #: ports/esp8266/modnetwork.c:87
msgid "Cannot update i/f status" msgid "Cannot update i/f status"
msgstr "le status i/f ne peut être mis à jour" msgstr "le status i/f ne peut être mis à jour"