Skip to content

Commit aed2499

Browse files
JulienPalardJulienPalard
committed
msgmerge 3.7
1 parent fe4f5fa commit aed2499

File tree

209 files changed

+28811
-17926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+28811
-17926
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ LANGUAGE := fr
1919
VENV := ~/.venvs/python-docs-i18n/
2020
PYTHON := $(shell which python3)
2121
MODE := autobuild-dev-html
22-
BRANCH = $(shell git describe --contains --all HEAD)
22+
BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
2323
JOBS = 1
2424

2525

@@ -67,7 +67,7 @@ todo:
6767
.PHONY: merge
6868
merge: upgrade_venv
6969
ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
70-
$(error "You're merging from a different branch")
70+
$(error "You're merging from a different branch:" "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" vs "$(BRANCH)")
7171
endif
7272
(cd $(CPYTHON_CLONE)/Doc; rm -f build/NEWS)
7373
(cd $(CPYTHON_CLONE); $(VENV)/bin/sphinx-build -Q -b gettext -D gettext_compact=0 Doc pot/)

‎bugs.po‎

Lines changed: 4 additions & 3 deletions
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: 2017-09-21 09:15+0200\n"
10+
"POT-Creation-Date: 2018-06-28 15:29+0200\n"
1111
"PO-Revision-Date: 2018-02-15 00:28+0100\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -171,9 +171,10 @@ msgstr ""
171171
"notification à chaque action effectuée sur le bogue."
172172

173173
#: ../Doc/bugs.rst:73
174+
#, fuzzy
174175
msgid ""
175-
"`How to Report Bugs Effectively <http://www.chiark.greenend.org.uk/~sgtatham/"
176-
"bugs.html>`_"
176+
"`How to Report Bugs Effectively <https://www.chiark.greenend.org.uk/"
177+
"~sgtatham/bugs.html>`_"
177178
msgstr ""
178179
"`Comment rédiger des bugs de manière efficiente <http://www.chiark.greenend."
179180
"org.uk/~sgtatham/bugs.html>`_"

‎c-api/arg.po‎

Lines changed: 43 additions & 22 deletions
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-06-28 15:29+0200\n"
1111
"PO-Revision-Date: 2018-05-08 17:57+0200\n"
1212
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1313
"Language-Team: \n"
@@ -194,7 +194,7 @@ msgid ""
194194
"objects are converted to C strings using ``'utf-8'`` encoding."
195195
msgstr ""
196196

197-
#: ../Doc/c-api/arg.rst:102
197+
#: ../Doc/c-api/arg.rst:102 ../Doc/c-api/arg.rst:566
198198
msgid "``z`` (:class:`str` or ``None``) [const char \\*]"
199199
msgstr "``z`` (:class:`str` ou ``None``) [const char \\*]"
200200

@@ -296,7 +296,8 @@ msgid ""
296296
msgstr ""
297297

298298
#: ../Doc/c-api/arg.rst:156
299-
msgid "``u`` (:class:`str`) [Py_UNICODE \\*]"
299+
#, fuzzy
300+
msgid "``u`` (:class:`str`) [const Py_UNICODE \\*]"
300301
msgstr "``u`` (:class:`str`) [Py_UNICODE \\*]"
301302

302303
#: ../Doc/c-api/arg.rst:142
@@ -318,7 +319,8 @@ msgid ""
318319
msgstr ""
319320

320321
#: ../Doc/c-api/arg.rst:165
321-
msgid "``u#`` (:class:`str`) [Py_UNICODE \\*, int]"
322+
#, fuzzy
323+
msgid "``u#`` (:class:`str`) [const Py_UNICODE \\*, int]"
322324
msgstr "``u#`` (:class:`str`) [Py_UNICODE \\*, int]"
323325

324326
#: ../Doc/c-api/arg.rst:159
@@ -329,7 +331,8 @@ msgid ""
329331
msgstr ""
330332

331333
#: ../Doc/c-api/arg.rst:173
332-
msgid "``Z`` (:class:`str` or ``None``) [Py_UNICODE \\*]"
334+
#, fuzzy
335+
msgid "``Z`` (:class:`str` or ``None``) [const Py_UNICODE \\*]"
333336
msgstr "``Z`` (:class:`str` ou ``None``) [Py_UNICODE \\*]"
334337

335338
#: ../Doc/c-api/arg.rst:168
@@ -341,7 +344,8 @@ msgstr ""
341344
"pointeur :c:type:`Py_UNICODE` vaut *NULL*."
342345

343346
#: ../Doc/c-api/arg.rst:181
344-
msgid "``Z#`` (:class:`str` or ``None``) [Py_UNICODE \\*, int]"
347+
#, fuzzy
348+
msgid "``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \\*, int]"
345349
msgstr "``Z#`` (:class:`str` ou ``None``) [Py_UNICODE \\*, int]"
346350

347351
#: ../Doc/c-api/arg.rst:176
@@ -988,8 +992,9 @@ msgid ""
988992
msgstr ""
989993

990994
#: ../Doc/c-api/arg.rst:550
991-
msgid "``s`` (:class:`str` or ``None``) [char \\*]"
992-
msgstr "``s`` (:class:`str` ou ``None``) [char \\*]"
995+
#, fuzzy
996+
msgid "``s`` (:class:`str` or ``None``) [const char \\*]"
997+
msgstr "``z`` (:class:`str` ou ``None``) [const char \\*]"
993998

994999
#: ../Doc/c-api/arg.rst:549
9951000
msgid ""
@@ -998,7 +1003,8 @@ msgid ""
9981003
msgstr ""
9991004

10001005
#: ../Doc/c-api/arg.rst:555
1001-
msgid "``s#`` (:class:`str` or ``None``) [char \\*, int]"
1006+
#, fuzzy
1007+
msgid "``s#`` (:class:`str` or ``None``) [const char \\*, int]"
10021008
msgstr "``s#`` (:class:`str` ou ``None``) [char \\*, int]"
10031009

10041010
#: ../Doc/c-api/arg.rst:553
@@ -1009,7 +1015,8 @@ msgid ""
10091015
msgstr ""
10101016

10111017
#: ../Doc/c-api/arg.rst:559
1012-
msgid "``y`` (:class:`bytes`) [char \\*]"
1018+
#, fuzzy
1019+
msgid "``y`` (:class:`bytes`) [const char \\*]"
10131020
msgstr "``y`` (:class:`bytes`) [char \\*]"
10141021

10151022
#: ../Doc/c-api/arg.rst:558
@@ -1019,7 +1026,8 @@ msgid ""
10191026
msgstr ""
10201027

10211028
#: ../Doc/c-api/arg.rst:563
1022-
msgid "``y#`` (:class:`bytes`) [char \\*, int]"
1029+
#, fuzzy
1030+
msgid "``y#`` (:class:`bytes`) [const char \\*, int]"
10231031
msgstr "``y#`` (:class:`bytes`) [char \\*, int]"
10241032

10251033
#: ../Doc/c-api/arg.rst:562
@@ -1028,25 +1036,23 @@ msgid ""
10281036
"string pointer is *NULL*, ``None`` is returned."
10291037
msgstr ""
10301038

1031-
#: ../Doc/c-api/arg.rst:566
1032-
msgid "``z`` (:class:`str` or ``None``) [char \\*]"
1033-
msgstr "``z`` (:class:`str` ou ``None``) [char \\*]"
1034-
10351039
#: ../Doc/c-api/arg.rst:566 ../Doc/c-api/arg.rst:582
10361040
msgid "Same as ``s``."
10371041
msgstr ""
10381042

10391043
#: ../Doc/c-api/arg.rst:569
1040-
msgid "``z#`` (:class:`str` or ``None``) [char \\*, int]"
1044+
#, fuzzy
1045+
msgid "``z#`` (:class:`str` or ``None``) [const char \\*, int]"
10411046
msgstr "``z#`` (:class:`str` ou ``None``) [char \\*, int]"
10421047

10431048
#: ../Doc/c-api/arg.rst:569 ../Doc/c-api/arg.rst:585
10441049
msgid "Same as ``s#``."
10451050
msgstr ""
10461051

10471052
#: ../Doc/c-api/arg.rst:574
1048-
msgid "``u`` (:class:`str`) [wchar_t \\*]"
1049-
msgstr "``u`` (:class:`str`) [wchar_t \\*]"
1053+
#, fuzzy
1054+
msgid "``u`` (:class:`str`) [const wchar_t \\*]"
1055+
msgstr "``s`` (:class:`str`) [const char \\*]"
10501056

10511057
#: ../Doc/c-api/arg.rst:572
10521058
msgid ""
@@ -1056,7 +1062,8 @@ msgid ""
10561062
msgstr ""
10571063

10581064
#: ../Doc/c-api/arg.rst:579
1059-
msgid "``u#`` (:class:`str`) [wchar_t \\*, int]"
1065+
#, fuzzy
1066+
msgid "``u#`` (:class:`str`) [const wchar_t \\*, int]"
10601067
msgstr "``u#`` (:class:`str`) [wchar_t \\*, int]"
10611068

10621069
#: ../Doc/c-api/arg.rst:577
@@ -1067,11 +1074,13 @@ msgid ""
10671074
msgstr ""
10681075

10691076
#: ../Doc/c-api/arg.rst:582
1070-
msgid "``U`` (:class:`str` or ``None``) [char \\*]"
1071-
msgstr "``U`` (:class:`str` ou ``None``) [char \\*]"
1077+
#, fuzzy
1078+
msgid "``U`` (:class:`str` or ``None``) [const char \\*]"
1079+
msgstr "``z`` (:class:`str` ou ``None``) [const char \\*]"
10721080

10731081
#: ../Doc/c-api/arg.rst:585
1074-
msgid "``U#`` (:class:`str` or ``None``) [char \\*, int]"
1082+
#, fuzzy
1083+
msgid "``U#`` (:class:`str` or ``None``) [const char \\*, int]"
10751084
msgstr "``U#`` (:class:`str` ou ``None``) [char \\*, int]"
10761085

10771086
#: ../Doc/c-api/arg.rst:588
@@ -1229,3 +1238,15 @@ msgid ""
12291238
"Identical to :c:func:`Py_BuildValue`, except that it accepts a va_list "
12301239
"rather than a variable number of arguments."
12311240
msgstr ""
1241+
1242+
#~ msgid "``s`` (:class:`str` or ``None``) [char \\*]"
1243+
#~ msgstr "``s`` (:class:`str` ou ``None``) [char \\*]"
1244+
1245+
#~ msgid "``z`` (:class:`str` or ``None``) [char \\*]"
1246+
#~ msgstr "``z`` (:class:`str` ou ``None``) [char \\*]"
1247+
1248+
#~ msgid "``u`` (:class:`str`) [wchar_t \\*]"
1249+
#~ msgstr "``u`` (:class:`str`) [wchar_t \\*]"
1250+
1251+
#~ msgid "``U`` (:class:`str` or ``None``) [char \\*]"
1252+
#~ msgstr "``U`` (:class:`str` ou ``None``) [char \\*]"

0 commit comments

Comments
 (0)