Skip to content

Commit 00a0972

Browse files
JulienPalardJulienPalard
authored
make merge (#1300)
1 parent 7eee744 commit 00a0972

Some content is hidden

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

98 files changed

+9388
-8485
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# from which we generated our po files. We use it here so when we
2222
# test build, we're building with the .rst files that generated our
2323
# .po files.
24-
CPYTHON_CURRENT_COMMIT := 83d3202b92fb4c2fc6df5b035d57f3a1cf715f20
24+
CPYTHON_CURRENT_COMMIT := dc3239177ff26cb6a12e437a1f507be730fe8ba7
2525

2626
CPYTHON_PATH := ../cpython/
2727

@@ -44,7 +44,7 @@ JOBS := auto
4444
.PHONY: all
4545
all: setup
4646
mkdir -p $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/
47-
cp -uv --parents *.po */*.po $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2
47+
cp -uv --parents *.po */*.po $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2
4848
$(MAKE) -C $(WORKTREE)/Doc/ VENVDIR=$(WORKTREE)/Doc/venv/ PYTHON=$(PYTHON) \
4949
SPHINXOPTS='-qW -j$(JOBS) \
5050
-D locale_dirs=../locales \

‎c-api/arg.po‎

Lines changed: 56 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
8+
"POT-Creation-Date: 2020-05-23 11:38+0200\n"
99
"PO-Revision-Date: 2018-10-04 12:14+0200\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -254,13 +254,13 @@ msgstr ""
254254
"membre ``buf``, dont la structure est :c:type:`Py_buffer` est fixée à *NULL*."
255255

256256
#: ../Doc/c-api/arg.rst:110
257+
#, fuzzy
257258
msgid ""
258259
"``z#`` (:class:`str`, read-only :term:`bytes-like object` or ``None``) "
259-
"[const char \\*, int]"
260+
"[const char \\*, int or :c:type:`Py_ssize_t`]"
260261
msgstr ""
261-
"``z#`` (:class:`str`, :term:`objet compatible avec une chaîne d'octets "
262-
"<bytes-like object>` en lecture seule ou ``None``) [constante char \\*, "
263-
"entier]"
262+
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
263+
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"
264264

265265
#: ../Doc/c-api/arg.rst:109
266266
#, fuzzy
@@ -308,10 +308,13 @@ msgid ""
308308
msgstr ""
309309

310310
#: ../Doc/c-api/arg.rst:129
311-
msgid "``y#`` (read-only :term:`bytes-like object`) [const char \\*, int]"
311+
#, fuzzy
312+
msgid ""
313+
"``y#`` (read-only :term:`bytes-like object`) [const char \\*, int or :c:type:"
314+
"`Py_ssize_t`]"
312315
msgstr ""
313-
"``y#`` (lecture seule :term:`objet compatible avec une chaîne d'octets "
314-
"<bytes-like object>`) [constante char \\*, entier]"
316+
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
317+
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"
315318

316319
#: ../Doc/c-api/arg.rst:128
317320
msgid ""
@@ -378,7 +381,9 @@ msgid ""
378381
msgstr ""
379382

380383
#: ../Doc/c-api/arg.rst:165
381-
msgid "``u#`` (:class:`str`) [const Py_UNICODE \\*, int]"
384+
#, fuzzy
385+
msgid ""
386+
"``u#`` (:class:`str`) [const Py_UNICODE \\*, int or :c:type:`Py_ssize_t`]"
382387
msgstr "``u#`` (:class:`str`) [``const Py_UNICODE *``, ``int``]"
383388

384389
#: ../Doc/c-api/arg.rst:159
@@ -402,7 +407,10 @@ msgstr ""
402407
"pointeur :c:type:`Py_UNICODE` vaut *NULL*."
403408

404409
#: ../Doc/c-api/arg.rst:181
405-
msgid "``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \\*, int]"
410+
#, fuzzy
411+
msgid ""
412+
"``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \\*, int or :c:type:"
413+
"`Py_ssize_t`]"
406414
msgstr "``Z#`` (:class:`str` ou ``None``) [``const Py_UNICODE *``, ``int``]"
407415

408416
#: ../Doc/c-api/arg.rst:176
@@ -481,10 +489,13 @@ msgid ""
481489
msgstr ""
482490

483491
#: ../Doc/c-api/arg.rst:245
492+
#, fuzzy
484493
msgid ""
485-
"``es#`` (:class:`str`) [const char \\*encoding, char \\*\\*buffer, int "
486-
"\\*buffer_length]"
494+
"``es#`` (:class:`str`) [const char \\*encoding, char \\*\\*buffer, int or :c:"
495+
"type:`Py_ssize_t` \\*buffer_length]"
487496
msgstr ""
497+
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
498+
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"
488499

489500
#: ../Doc/c-api/arg.rst:217
490501
msgid ""
@@ -537,10 +548,13 @@ msgstr ""
537548
"sans l'octet NUL de fin."
538549

539550
#: ../Doc/c-api/arg.rst:250
551+
#, fuzzy
540552
msgid ""
541553
"``et#`` (:class:`str`, :class:`bytes` or :class:`bytearray`) [const char "
542-
"\\*encoding, char \\*\\*buffer, int \\*buffer_length]"
554+
"\\*encoding, char \\*\\*buffer, int or :c:type:`Py_ssize_t` \\*buffer_length]"
543555
msgstr ""
556+
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
557+
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"
544558

545559
#: ../Doc/c-api/arg.rst:248
546560
msgid ""
@@ -1065,7 +1079,10 @@ msgid ""
10651079
msgstr ""
10661080

10671081
#: ../Doc/c-api/arg.rst:555
1068-
msgid "``s#`` (:class:`str` or ``None``) [const char \\*, int]"
1082+
#, fuzzy
1083+
msgid ""
1084+
"``s#`` (:class:`str` or ``None``) [const char \\*, int or :c:type:"
1085+
"`Py_ssize_t`]"
10691086
msgstr "``s#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
10701087

10711088
#: ../Doc/c-api/arg.rst:553
@@ -1086,7 +1103,8 @@ msgid ""
10861103
msgstr ""
10871104

10881105
#: ../Doc/c-api/arg.rst:563
1089-
msgid "``y#`` (:class:`bytes`) [const char \\*, int]"
1106+
#, fuzzy
1107+
msgid "``y#`` (:class:`bytes`) [const char \\*, int or :c:type:`Py_ssize_t`]"
10901108
msgstr "``y#`` (:class:`bytes`) [``const char *, int``]"
10911109

10921110
#: ../Doc/c-api/arg.rst:562
@@ -1100,7 +1118,10 @@ msgid "Same as ``s``."
11001118
msgstr ""
11011119

11021120
#: ../Doc/c-api/arg.rst:569
1103-
msgid "``z#`` (:class:`str` or ``None``) [const char \\*, int]"
1121+
#, fuzzy
1122+
msgid ""
1123+
"``z#`` (:class:`str` or ``None``) [const char \\*, int or :c:type:"
1124+
"`Py_ssize_t`]"
11041125
msgstr "``z#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
11051126

11061127
#: ../Doc/c-api/arg.rst:569 ../Doc/c-api/arg.rst:585
@@ -1119,7 +1140,8 @@ msgid ""
11191140
msgstr ""
11201141

11211142
#: ../Doc/c-api/arg.rst:579
1122-
msgid "``u#`` (:class:`str`) [const wchar_t \\*, int]"
1143+
#, fuzzy
1144+
msgid "``u#`` (:class:`str`) [const wchar_t \\*, int or :c:type:`Py_ssize_t`]"
11231145
msgstr "``u#`` (:class:`str`) [``const wchar_t *``, ``int``]"
11241146

11251147
#: ../Doc/c-api/arg.rst:577
@@ -1134,7 +1156,10 @@ msgid "``U`` (:class:`str` or ``None``) [const char \\*]"
11341156
msgstr "``U`` (:class:`str` ou ``None``) [``const char *``]"
11351157

11361158
#: ../Doc/c-api/arg.rst:585
1137-
msgid "``U#`` (:class:`str` or ``None``) [const char \\*, int]"
1159+
#, fuzzy
1160+
msgid ""
1161+
"``U#`` (:class:`str` or ``None``) [const char \\*, int or :c:type:"
1162+
"`Py_ssize_t`]"
11381163
msgstr "``U#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
11391164

11401165
#: ../Doc/c-api/arg.rst:588
@@ -1296,6 +1321,19 @@ msgid ""
12961321
"rather than a variable number of arguments."
12971322
msgstr ""
12981323

1324+
#~ msgid ""
1325+
#~ "``z#`` (:class:`str`, read-only :term:`bytes-like object` or ``None``) "
1326+
#~ "[const char \\*, int]"
1327+
#~ msgstr ""
1328+
#~ "``z#`` (:class:`str`, :term:`objet compatible avec une chaîne d'octets "
1329+
#~ "<bytes-like object>` en lecture seule ou ``None``) [constante char \\*, "
1330+
#~ "entier]"
1331+
1332+
#~ msgid "``y#`` (read-only :term:`bytes-like object`) [const char \\*, int]"
1333+
#~ msgstr ""
1334+
#~ "``y#`` (lecture seule :term:`objet compatible avec une chaîne d'octets "
1335+
#~ "<bytes-like object>`) [constante char \\*, entier]"
1336+
12991337
#~ msgid "``s`` (:class:`str` or ``None``) [char \\*]"
13001338
#~ msgstr "``s`` (:class:`str` ou ``None``) [char \\*]"
13011339

‎c-api/exceptions.po‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
8+
"POT-Creation-Date: 2020-05-23 11:38+0200\n"
99
"PO-Revision-Date: 2018-10-04 12:24+0200\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -379,7 +379,7 @@ msgstr ""
379379
#: ../Doc/c-api/exceptions.rst:360
380380
msgid ""
381381
"Function similar to :c:func:`PyErr_WarnFormat`, but *category* is :exc:"
382-
"`ResourceWarning` and pass *source* to :func:`warnings.WarningMessage`."
382+
"`ResourceWarning` and it passes *source* to :func:`warnings.WarningMessage`."
383383
msgstr ""
384384

385385
#: ../Doc/c-api/exceptions.rst:367
@@ -805,16 +805,16 @@ msgid ""
805805
msgstr ""
806806

807807
#: ../Doc/c-api/exceptions.rst:823 ../Doc/c-api/exceptions.rst:956
808-
#: ../Doc/c-api/exceptions.rst:1004
808+
#: ../Doc/c-api/exceptions.rst:1001
809809
msgid "C Name"
810810
msgstr "Nom C"
811811

812-
#: ../Doc/c-api/exceptions.rst:823 ../Doc/c-api/exceptions.rst:1004
812+
#: ../Doc/c-api/exceptions.rst:823 ../Doc/c-api/exceptions.rst:1001
813813
msgid "Python Name"
814814
msgstr "Nom Python"
815815

816816
#: ../Doc/c-api/exceptions.rst:823 ../Doc/c-api/exceptions.rst:956
817-
#: ../Doc/c-api/exceptions.rst:1004
817+
#: ../Doc/c-api/exceptions.rst:1001
818818
msgid "Notes"
819819
msgstr "Notes"
820820

@@ -828,7 +828,7 @@ msgstr ":exc:`BaseException`"
828828

829829
#: ../Doc/c-api/exceptions.rst:825 ../Doc/c-api/exceptions.rst:827
830830
#: ../Doc/c-api/exceptions.rst:829 ../Doc/c-api/exceptions.rst:875
831-
#: ../Doc/c-api/exceptions.rst:887 ../Doc/c-api/exceptions.rst:1006
831+
#: ../Doc/c-api/exceptions.rst:887 ../Doc/c-api/exceptions.rst:1003
832832
msgid "\\(1)"
833833
msgstr "\\(1)"
834834

@@ -1297,7 +1297,7 @@ msgstr "\\(3)"
12971297
msgid "These aliases used to be separate exception types."
12981298
msgstr ""
12991299

1300-
#: ../Doc/c-api/exceptions.rst:968 ../Doc/c-api/exceptions.rst:1032
1300+
#: ../Doc/c-api/exceptions.rst:968 ../Doc/c-api/exceptions.rst:1029
13011301
msgid "Notes:"
13021302
msgstr "Notes :"
13031303

@@ -1306,119 +1306,118 @@ msgid "This is a base class for other standard exceptions."
13061306
msgstr "C'est la classe de base pour les autres exceptions standards."
13071307

13081308
#: ../Doc/c-api/exceptions.rst:974
1309-
msgid "This is the same as :exc:`weakref.ReferenceError`."
1310-
msgstr "Identique à :exc:`weakref.ReferenceError`."
1311-
1312-
#: ../Doc/c-api/exceptions.rst:977
13131309
msgid ""
13141310
"Only defined on Windows; protect code that uses this by testing that the "
13151311
"preprocessor macro ``MS_WINDOWS`` is defined."
13161312
msgstr ""
13171313

1318-
#: ../Doc/c-api/exceptions.rst:983
1314+
#: ../Doc/c-api/exceptions.rst:980
13191315
msgid "Standard Warning Categories"
13201316
msgstr ""
13211317

1322-
#: ../Doc/c-api/exceptions.rst:985
1318+
#: ../Doc/c-api/exceptions.rst:982
13231319
msgid ""
13241320
"All standard Python warning categories are available as global variables "
13251321
"whose names are ``PyExc_`` followed by the Python exception name. These have "
13261322
"the type :c:type:`PyObject\\*`; they are all class objects. For "
13271323
"completeness, here are all the variables:"
13281324
msgstr ""
13291325

1330-
#: ../Doc/c-api/exceptions.rst:1006
1326+
#: ../Doc/c-api/exceptions.rst:1003
13311327
msgid ":c:data:`PyExc_Warning`"
13321328
msgstr ":c:data:`PyExc_Warning`"
13331329

1334-
#: ../Doc/c-api/exceptions.rst:1006
1330+
#: ../Doc/c-api/exceptions.rst:1003
13351331
msgid ":exc:`Warning`"
13361332
msgstr ":exc:`Warning`"
13371333

1338-
#: ../Doc/c-api/exceptions.rst:1008
1334+
#: ../Doc/c-api/exceptions.rst:1005
13391335
msgid ":c:data:`PyExc_BytesWarning`"
13401336
msgstr ":c:data:`PyExc_BytesWarning`"
13411337

1342-
#: ../Doc/c-api/exceptions.rst:1008
1338+
#: ../Doc/c-api/exceptions.rst:1005
13431339
msgid ":exc:`BytesWarning`"
13441340
msgstr ":exc:`BytesWarning`"
13451341

1346-
#: ../Doc/c-api/exceptions.rst:1010
1342+
#: ../Doc/c-api/exceptions.rst:1007
13471343
msgid ":c:data:`PyExc_DeprecationWarning`"
13481344
msgstr ":c:data:`PyExc_DeprecationWarning`"
13491345

1350-
#: ../Doc/c-api/exceptions.rst:1010
1346+
#: ../Doc/c-api/exceptions.rst:1007
13511347
msgid ":exc:`DeprecationWarning`"
13521348
msgstr ":exc:`DeprecationWarning`"
13531349

1354-
#: ../Doc/c-api/exceptions.rst:1012
1350+
#: ../Doc/c-api/exceptions.rst:1009
13551351
msgid ":c:data:`PyExc_FutureWarning`"
13561352
msgstr ":c:data:`PyExc_FutureWarning`"
13571353

1358-
#: ../Doc/c-api/exceptions.rst:1012
1354+
#: ../Doc/c-api/exceptions.rst:1009
13591355
msgid ":exc:`FutureWarning`"
13601356
msgstr ":exc:`FutureWarning`"
13611357

1362-
#: ../Doc/c-api/exceptions.rst:1014
1358+
#: ../Doc/c-api/exceptions.rst:1011
13631359
msgid ":c:data:`PyExc_ImportWarning`"
13641360
msgstr ":c:data:`PyExc_ImportWarning`"
13651361

1366-
#: ../Doc/c-api/exceptions.rst:1014
1362+
#: ../Doc/c-api/exceptions.rst:1011
13671363
msgid ":exc:`ImportWarning`"
13681364
msgstr ":exc:`ImportWarning`"
13691365

1370-
#: ../Doc/c-api/exceptions.rst:1016
1366+
#: ../Doc/c-api/exceptions.rst:1013
13711367
msgid ":c:data:`PyExc_PendingDeprecationWarning`"
13721368
msgstr ":c:data:`PyExc_PendingDeprecationWarning`"
13731369

1374-
#: ../Doc/c-api/exceptions.rst:1016
1370+
#: ../Doc/c-api/exceptions.rst:1013
13751371
msgid ":exc:`PendingDeprecationWarning`"
13761372
msgstr ":exc:`PendingDeprecationWarning`"
13771373

1378-
#: ../Doc/c-api/exceptions.rst:1018
1374+
#: ../Doc/c-api/exceptions.rst:1015
13791375
msgid ":c:data:`PyExc_ResourceWarning`"
13801376
msgstr ":c:data:`PyExc_ResourceWarning`"
13811377

1382-
#: ../Doc/c-api/exceptions.rst:1018
1378+
#: ../Doc/c-api/exceptions.rst:1015
13831379
msgid ":exc:`ResourceWarning`"
13841380
msgstr ":exc:`ResourceWarning`"
13851381

1386-
#: ../Doc/c-api/exceptions.rst:1020
1382+
#: ../Doc/c-api/exceptions.rst:1017
13871383
msgid ":c:data:`PyExc_RuntimeWarning`"
13881384
msgstr ":c:data:`PyExc_RuntimeWarning`"
13891385

1390-
#: ../Doc/c-api/exceptions.rst:1020
1386+
#: ../Doc/c-api/exceptions.rst:1017
13911387
msgid ":exc:`RuntimeWarning`"
13921388
msgstr ":exc:`RuntimeWarning`"
13931389

1394-
#: ../Doc/c-api/exceptions.rst:1022
1390+
#: ../Doc/c-api/exceptions.rst:1019
13951391
msgid ":c:data:`PyExc_SyntaxWarning`"
13961392
msgstr ":c:data:`PyExc_SyntaxWarning`"
13971393

1398-
#: ../Doc/c-api/exceptions.rst:1022
1394+
#: ../Doc/c-api/exceptions.rst:1019
13991395
msgid ":exc:`SyntaxWarning`"
14001396
msgstr ":exc:`SyntaxWarning`"
14011397

1402-
#: ../Doc/c-api/exceptions.rst:1024
1398+
#: ../Doc/c-api/exceptions.rst:1021
14031399
msgid ":c:data:`PyExc_UnicodeWarning`"
14041400
msgstr ":c:data:`PyExc_UnicodeWarning`"
14051401

1406-
#: ../Doc/c-api/exceptions.rst:1024
1402+
#: ../Doc/c-api/exceptions.rst:1021
14071403
msgid ":exc:`UnicodeWarning`"
14081404
msgstr ":exc:`UnicodeWarning`"
14091405

1410-
#: ../Doc/c-api/exceptions.rst:1026
1406+
#: ../Doc/c-api/exceptions.rst:1023
14111407
msgid ":c:data:`PyExc_UserWarning`"
14121408
msgstr ":c:data:`PyExc_UserWarning`"
14131409

1414-
#: ../Doc/c-api/exceptions.rst:1026
1410+
#: ../Doc/c-api/exceptions.rst:1023
14151411
msgid ":exc:`UserWarning`"
14161412
msgstr ":exc:`UserWarning`"
14171413

1418-
#: ../Doc/c-api/exceptions.rst:1029
1414+
#: ../Doc/c-api/exceptions.rst:1026
14191415
msgid ":c:data:`PyExc_ResourceWarning`."
14201416
msgstr ":c:data:`PyExc_ResourceWarning`."
14211417

1422-
#: ../Doc/c-api/exceptions.rst:1035
1418+
#: ../Doc/c-api/exceptions.rst:1032
14231419
msgid "This is a base class for other standard warning categories."
14241420
msgstr "C'est la classe de base pour les autres catégories de *warning*."
1421+
1422+
#~ msgid "This is the same as :exc:`weakref.ReferenceError`."
1423+
#~ msgstr "Identique à :exc:`weakref.ReferenceError`."

0 commit comments

Comments
 (0)