Skip to content

Commit 04fb82c

Browse files
authored
Merge branch '3.9' into library/sys
2 parents 30a3cab + 74beb14 commit 04fb82c

36 files changed

+9861
-11046
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ venv/
66
.pospell/
77
.potodo/
88
locales/
9+
.venv/

c-api/conversion.po

+7-7
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: 2020-08-24 09:01+0200\n"
8+
"POT-Creation-Date: 2021-02-24 17:33+0100\n"
99
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -28,14 +28,14 @@ msgstr ""
2828
msgid ""
2929
"Output not more than *size* bytes to *str* according to the format string "
3030
"*format* and the extra arguments. See the Unix man page :manpage:"
31-
"`snprintf(2)`."
31+
"`snprintf(3)`."
3232
msgstr ""
3333

3434
#: c-api/conversion.rst:19
3535
msgid ""
3636
"Output not more than *size* bytes to *str* according to the format string "
3737
"*format* and the variable argument list *va*. Unix man page :manpage:"
38-
"`vsnprintf(2)`."
38+
"`vsnprintf(3)`."
3939
msgstr ""
4040

4141
#: c-api/conversion.rst:23
@@ -48,7 +48,7 @@ msgstr ""
4848

4949
#: c-api/conversion.rst:28
5050
msgid ""
51-
"The wrappers ensure that *str*[*size*-1] is always ``'\\0'`` upon return. "
51+
"The wrappers ensure that ``str[size-1]`` is always ``'\\0'`` upon return. "
5252
"They never write more than *size* bytes (including the trailing ``'\\0'``) "
5353
"into str. Both functions require that ``str != NULL``, ``size > 0`` and "
5454
"``format != NULL``."
@@ -70,19 +70,19 @@ msgstr ""
7070
msgid ""
7171
"When ``0 <= rv < size``, the output conversion was successful and *rv* "
7272
"characters were written to *str* (excluding the trailing ``'\\0'`` byte at "
73-
"*str*[*rv*])."
73+
"``str[rv]``)."
7474
msgstr ""
7575

7676
#: c-api/conversion.rst:43
7777
msgid ""
7878
"When ``rv >= size``, the output conversion was truncated and a buffer with "
79-
"``rv + 1`` bytes would have been needed to succeed. *str*[*size*-1] is "
79+
"``rv + 1`` bytes would have been needed to succeed. ``str[size-1]`` is "
8080
"``'\\0'`` in this case."
8181
msgstr ""
8282

8383
#: c-api/conversion.rst:47
8484
msgid ""
85-
"When ``rv < 0``, \"something bad happened.\" *str*[*size*-1] is ``'\\0'`` in "
85+
"When ``rv < 0``, \"something bad happened.\" ``str[size-1]`` is ``'\\0'`` in "
8686
"this case too, but the rest of *str* is undefined. The exact cause of the "
8787
"error depends on the underlying platform."
8888
msgstr ""

0 commit comments

Comments
 (0)