New release of Sphinx gives sphinx.po ordered alphabetically.

Author: JulienPalard

Makefile

@@ -65,7 +65,7 @@ todo:
 
 
 .PHONY: merge
-merge: $(VENV)/bin/sphinx-build
+merge: upgrade_venv
 ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
 $(error "You're merging from a different branch")
 endif

sphinx.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-29 00:24+0200\n"
+"POT-Creation-Date: 2018-05-06 00:40+0200\n"
 "PO-Revision-Date: 2018-02-15 00:58+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -17,6 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.11\n"
 
+#: ../Doc/tools/templates/customsourcelink.html:3
+msgid "This Page"
+msgstr "Cette page"
+
+#: ../Doc/tools/templates/customsourcelink.html:5
+msgid "Report a Bug"
+msgstr "Signalement de bug"
+
+#: ../Doc/tools/templates/customsourcelink.html:8
+msgid "Show Source"
+msgstr "Voir la source"
+
 #: ../Doc/tools/templates/dummy.html:6
 msgid "CPython implementation detail:"
 msgstr "Particularité de l'implémentation CPython :"
@@ -189,18 +201,6 @@ msgstr "Histoire et licence de Python"
 msgid "Copyright"
 msgstr "Copyright"
 
-#: ../Doc/tools/templates/customsourcelink.html:3
-msgid "This Page"
-msgstr "Cette page"
-
-#: ../Doc/tools/templates/customsourcelink.html:5
-msgid "Report a Bug"
-msgstr "Signalement de bug"
-
-#: ../Doc/tools/templates/customsourcelink.html:8
-msgid "Show Source"
-msgstr "Voir la source"
-
 #: ../Doc/tools/templates/indexsidebar.html:1
 msgid "Download"
 msgstr "Téléchargement"