Make merge (#1639)

Automerge of PR #1639 by @JulienPalard #1636 Closes #1636
This commit is contained in:
Julien Palard 2021-05-26 19:39:06 +02:00 committed by GitHub
commit dafa30ed3c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-24 09:01+0200\n"
"POT-Creation-Date: 2021-05-19 22:36+0200\n"
"PO-Revision-Date: 2018-08-03 23:47+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@ -124,8 +124,8 @@ msgstr ""
#: c-api/contextvars.rst:109
msgid ""
"Create a new ``ContextVar`` object. The *name* parameter is used for "
"introspection and debug purposes. The *def* parameter may optionally "
"specify the default value for the context variable. If an error has "
"introspection and debug purposes. The *def* parameter specifies a default "
"value for the context variable, or ``NULL`` for no default. If an error has "
"occurred, this function returns ``NULL``."
msgstr ""
@ -155,16 +155,16 @@ msgid "``NULL``"
msgstr "``NULL``"
#: c-api/contextvars.rst:127
msgid "If the value was found, the function will create a new reference to it."
msgid "Except for ``NULL``, the function returns a new reference."
msgstr ""
#: c-api/contextvars.rst:131
msgid ""
"Set the value of *var* to *value* in the current context. Returns a pointer "
"to a :c:type:`PyObject` object, or ``NULL`` if an error has occurred."
"Set the value of *var* to *value* in the current context. Returns a new "
"token object for this change, or ``NULL`` if an error has occurred."
msgstr ""
#: c-api/contextvars.rst:137
#: c-api/contextvars.rst:136
msgid ""
"Reset the state of the *var* context variable to that it was in before :c:"
"func:`PyContextVar_Set` that returned the *token* was called. This function "