File tree 2 files changed +14
-14
lines changed
2 files changed +14
-14
lines changed Original file line number Diff line number Diff line change 65
65
66
66
67
67
.PHONY : merge
68
- merge : $( VENV ) /bin/sphinx-build
68
+ merge : upgrade_venv
69
69
ifneq "$(shell cd $(CPYTHON_CLONE ) 2>/dev/null && git describe --contains --all HEAD) " "$(BRANCH ) "
70
70
$(error "You're merging from a different branch")
71
71
endif
Original file line number Diff line number Diff line change 7
7
msgstr ""
8
8
"Project-Id-Version : Python 3.6\n "
9
9
"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 "
11
11
"PO-Revision-Date : 2018-02-15 00:58+0100\n "
12
12
"Last-Translator : \n "
13
13
"Language-Team : \n "
@@ -17,6 +17,18 @@ msgstr ""
17
17
"Content-Transfer-Encoding : 8bit\n "
18
18
"X-Generator : Poedit 1.8.11\n "
19
19
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
+
20
32
#: ../Doc/tools/templates/dummy.html:6
21
33
msgid "CPython implementation detail:"
22
34
msgstr "Particularité de l'implémentation CPython :"
@@ -189,18 +201,6 @@ msgstr "Histoire et licence de Python"
189
201
msgid "Copyright"
190
202
msgstr "Copyright"
191
203
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
-
204
204
#: ../Doc/tools/templates/indexsidebar.html:1
205
205
msgid "Download"
206
206
msgstr "Téléchargement"
You can’t perform that action at this time.
0 commit comments