Skip to content

Commit 36c751e

Browse files
JulienPalardJulienPalard
committed
make merge for 3.10.
1 parent e56f9d7 commit 36c751e

File tree

9 files changed

+47081
-373
lines changed

9 files changed

+47081
-373
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
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 := eec8e61992fb654d4cf58de4d727c18622b8303e
24+
CPYTHON_CURRENT_COMMIT := cf739332bd039cd2303b58663a804f784883820d
2525

2626
CPYTHON_PATH := ../cpython/
2727

‎c-api/complex.po

Lines changed: 3 additions & 2 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: 2021-01-27 19:26+0100\n"
8+
"POT-Creation-Date: 2021-06-22 09:58+0200\n"
99
"PO-Revision-Date: 2019-01-14 20:31+0100\n"
1010
"Last-Translator: ANTOINE FOURES <afoures@student.42.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -74,8 +74,9 @@ msgstr ""
7474
"`Py_complex` en C."
7575

7676
#: c-api/complex.rst:51
77+
#, fuzzy
7778
msgid ""
78-
"Return the negation of the complex number *complex*, using the C :c:type:"
79+
"Return the negation of the complex number *num*, using the C :c:type:"
7980
"`Py_complex` representation."
8081
msgstr ""
8182
"Renvoie l'opposé du nombre complexe *complex*, sous la forme d'un :c:type:"

‎c-api/object.po

Lines changed: 3 additions & 2 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: 2020-10-01 16:00+0200\n"
8+
"POT-Creation-Date: 2021-06-22 09:58+0200\n"
99
"PO-Revision-Date: 2019-08-16 22:56+0200\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -445,7 +445,8 @@ msgid ""
445445
"Return an estimated length for the object *o*. First try to return its "
446446
"actual length, then an estimate using :meth:`~object.__length_hint__`, and "
447447
"finally return the default value. On error return ``-1``. This is the "
448-
"equivalent to the Python expression ``operator.length_hint(o, default)``."
448+
"equivalent to the Python expression ``operator.length_hint(o, "
449+
"defaultvalue)``."
449450
msgstr ""
450451

451452
#: c-api/object.rst:326

‎faq/design.po

Lines changed: 24 additions & 12 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: 2021-03-19 16:59+0100\n"
8+
"POT-Creation-Date: 2021-06-22 09:58+0200\n"
99
"PO-Revision-Date: 2020-11-07 16:24+0100\n"
1010
"Last-Translator: Mindiell <mindiell@mindiell.net>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -1369,24 +1369,36 @@ msgstr ""
13691369
"et la deuxième version n'a besoin d'exécuter la résolution qu'une seule fois."
13701370

13711371
#: faq/design.rst:713
1372+
msgid "Why don't generators support the with statement?"
1373+
msgstr ""
1374+
1375+
#: faq/design.rst:715
1376+
msgid ""
1377+
"For technical reasons, a generator used directly as a context manager would "
1378+
"not work correctly. When, as is most common, a generator is used as an "
1379+
"iterator run to completion, no closing is needed. When it is, wrap it as "
1380+
"\"contextlib.closing(generator)\" in the 'with' statment."
1381+
msgstr ""
1382+
1383+
#: faq/design.rst:722
13721384
msgid "Why are colons required for the if/while/def/class statements?"
13731385
msgstr ""
13741386
"Pourquoi les deux-points sont-ils nécessaires pour les déclarations ``if/"
13751387
"while/def/class`` ?"
13761388

1377-
#: faq/design.rst:715
1389+
#: faq/design.rst:724
13781390
msgid ""
13791391
"The colon is required primarily to enhance readability (one of the results "
13801392
"of the experimental ABC language). Consider this::"
13811393
msgstr ""
13821394
"Le deux-points est principalement nécessaires pour améliorer la lisibilité "
13831395
"(l'un des résultats du langage expérimental ABC). Considérez ceci ::"
13841396

1385-
#: faq/design.rst:721
1397+
#: faq/design.rst:730
13861398
msgid "versus ::"
13871399
msgstr "versus ::"
13881400

1389-
#: faq/design.rst:726
1401+
#: faq/design.rst:735
13901402
msgid ""
13911403
"Notice how the second one is slightly easier to read. Notice further how a "
13921404
"colon sets off the example in this FAQ answer; it's a standard usage in "
@@ -1396,7 +1408,7 @@ msgstr ""
13961408
"aussi comment un deux-points introduit l'exemple dans cette réponse à la "
13971409
"FAQ ; c'est un usage standard en anglais."
13981410

1399-
#: faq/design.rst:729
1411+
#: faq/design.rst:738
14001412
msgid ""
14011413
"Another minor reason is that the colon makes it easier for editors with "
14021414
"syntax highlighting; they can look for colons to decide when indentation "
@@ -1408,25 +1420,25 @@ msgstr ""
14081420
"pour décider quand l'indentation doit être augmentée au lieu d'avoir à faire "
14091421
"une analyse plus élaborée du texte du programme."
14101422

1411-
#: faq/design.rst:735
1423+
#: faq/design.rst:744
14121424
msgid "Why does Python allow commas at the end of lists and tuples?"
14131425
msgstr ""
14141426
"Pourquoi Python permet-il les virgules à la fin des listes et des *n*-"
14151427
"uplets ?"
14161428

1417-
#: faq/design.rst:737
1429+
#: faq/design.rst:746
14181430
msgid ""
14191431
"Python lets you add a trailing comma at the end of lists, tuples, and "
14201432
"dictionaries::"
14211433
msgstr ""
14221434
"Python vous permet d'ajouter une virgule à la fin des listes, des *n*-uplets "
14231435
"et des dictionnaires ::"
14241436

1425-
#: faq/design.rst:748
1437+
#: faq/design.rst:757
14261438
msgid "There are several reasons to allow this."
14271439
msgstr "Il y a plusieurs raisons d'accepter cela."
14281440

1429-
#: faq/design.rst:750
1441+
#: faq/design.rst:759
14301442
msgid ""
14311443
"When you have a literal value for a list, tuple, or dictionary spread across "
14321444
"multiple lines, it's easier to add more elements because you don't have to "
@@ -1439,15 +1451,15 @@ msgstr ""
14391451
"virgule à la ligne précédente. Les lignes peuvent aussi être réorganisées "
14401452
"sans créer une erreur de syntaxe."
14411453

1442-
#: faq/design.rst:755
1454+
#: faq/design.rst:764
14431455
msgid ""
14441456
"Accidentally omitting the comma can lead to errors that are hard to "
14451457
"diagnose. For example::"
14461458
msgstr ""
14471459
"L'omission accidentelle de la virgule peut entraîner des erreurs difficiles "
14481460
"à diagnostiquer, par exemple ::"
14491461

1450-
#: faq/design.rst:765
1462+
#: faq/design.rst:774
14511463
msgid ""
14521464
"This list looks like it has four elements, but it actually contains three: "
14531465
"\"fee\", \"fiefoo\" and \"fum\". Always adding the comma avoids this source "
@@ -1457,7 +1469,7 @@ msgstr ""
14571469
"trois : \"*fee*\", \"*fiefoo*\" et \"*fum*\". Toujours ajouter la virgule "
14581470
"permet d'éviter cette source d'erreur."
14591471

1460-
#: faq/design.rst:768
1472+
#: faq/design.rst:777
14611473
msgid ""
14621474
"Allowing the trailing comma may also make programmatic code generation "
14631475
"easier."

0 commit comments

Comments
 (0)