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

Author: tannewt

Makefile

@@ -194,10 +194,10 @@ pseudoxml:
 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
-	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)
 	$(PYTHON) tools/check_translations.py $^

locale/circuitpython.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\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"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -610,11 +610,11 @@ msgid "frequency can only be either 80Mhz or 160MHz"
 msgstr ""
 
 #: ports/esp8266/modnetwork.c:61
-msgid "STA required"
+msgid "AP required"
 msgstr ""
 
 #: ports/esp8266/modnetwork.c:61
-msgid "AP required"
+msgid "STA required"
 msgstr ""
 
 #: ports/esp8266/modnetwork.c:87

locale/en_US.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \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"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -610,11 +610,11 @@ msgid "frequency can only be either 80Mhz or 160MHz"
 msgstr ""
 
 #: ports/esp8266/modnetwork.c:61
-msgid "STA required"
+msgid "AP required"
 msgstr ""
 
 #: ports/esp8266/modnetwork.c:61
-msgid "AP required"
+msgid "STA required"
 msgstr ""
 
 #: ports/esp8266/modnetwork.c:87