Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 31c80b4

Browse files
committed
New release of Sphinx gives sphinx.po ordered alphabetically.
1 parent 8212e72 commit 31c80b4

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ todo:
6565

6666

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

sphinx.po

+13-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: Python 3.6\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2018-04-29 00:24+0200\n"
10+
"POT-Creation-Date: 2018-05-06 00:40+0200\n"
1111
"PO-Revision-Date: 2018-02-15 00:58+0100\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -17,6 +17,18 @@ msgstr ""
1717
"Content-Transfer-Encoding: 8bit\n"
1818
"X-Generator: Poedit 1.8.11\n"
1919

20+
#: ../Doc/tools/templates/customsourcelink.html:3
21+
msgid "This Page"
22+
msgstr "Cette page"
23+
24+
#: ../Doc/tools/templates/customsourcelink.html:5
25+
msgid "Report a Bug"
26+
msgstr "Signalement de bug"
27+
28+
#: ../Doc/tools/templates/customsourcelink.html:8
29+
msgid "Show Source"
30+
msgstr "Voir la source"
31+
2032
#: ../Doc/tools/templates/dummy.html:6
2133
msgid "CPython implementation detail:"
2234
msgstr "Particularité de l'implémentation CPython :"
@@ -189,18 +201,6 @@ msgstr "Histoire et licence de Python"
189201
msgid "Copyright"
190202
msgstr "Copyright"
191203

192-
#: ../Doc/tools/templates/customsourcelink.html:3
193-
msgid "This Page"
194-
msgstr "Cette page"
195-
196-
#: ../Doc/tools/templates/customsourcelink.html:5
197-
msgid "Report a Bug"
198-
msgstr "Signalement de bug"
199-
200-
#: ../Doc/tools/templates/customsourcelink.html:8
201-
msgid "Show Source"
202-
msgstr "Voir la source"
203-
204204
#: ../Doc/tools/templates/indexsidebar.html:1
205205
msgid "Download"
206206
msgstr "Téléchargement"

0 commit comments

Comments
 (0)