From 31c80b4bb115bbd88b75bace5247ea790b7e6797 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Sun, 6 May 2018 00:41:49 +0200 Subject: [PATCH] New release of Sphinx gives sphinx.po ordered alphabetically. --- Makefile | 2 +- sphinx.po | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 9786e67f..a3bf76f0 100644 --- a/Makefile +++ b/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 diff --git a/sphinx.po b/sphinx.po index 11c7109d..6665ed44 100644 --- a/sphinx.po +++ b/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"