Make merge

Makefile

@@ -21,7 +21,7 @@
 # from which we generated our po files.  We use it here so when we
 # test build, we're building with the .rst files that generated our
 # .po files.
-CPYTHON_CURRENT_COMMIT := 8fc828ec4e867c111cef137a2daeea6c3d5db2c7
+CPYTHON_CURRENT_COMMIT := b30934e9afb0af3f8e2e5f0992445be775b3c630
 
 CPYTHON_PATH := ../cpython/
 

c-api/dict.po

@@ -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: 2020-10-15 22:05+0200\n"
 "PO-Revision-Date: 2018-07-03 11:36+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: FRENCH <[email protected]>\n"
@@ -92,50 +92,51 @@ msgstr ""
 #: c-api/dict.rst:83
 msgid ""
 "Remove the entry in dictionary *p* with key *key*. *key* must be hashable; "
-"if it isn't, :exc:`TypeError` is raised.  Return ``0`` on success or ``-1`` "
-"on failure."
+"if it isn't, :exc:`TypeError` is raised. If *key* is not in the dictionary, :"
+"exc:`KeyError` is raised. Return ``0`` on success or ``-1`` on failure."
 msgstr ""
 
-#: c-api/dict.rst:90
+#: c-api/dict.rst:91
 msgid ""
 "Remove the entry in dictionary *p* which has a key specified by the string "
-"*key*.  Return ``0`` on success or ``-1`` on failure."
+"*key*. If *key* is not in the dictionary, :exc:`KeyError` is raised. Return "
+"``0`` on success or ``-1`` on failure."
 msgstr ""
 
-#: c-api/dict.rst:96
+#: c-api/dict.rst:98
 msgid ""
 "Return the object from dictionary *p* which has a key *key*.  Return "
 "``NULL`` if the key *key* is not present, but *without* setting an exception."
 msgstr ""
 
-#: c-api/dict.rst:99
+#: c-api/dict.rst:101
 msgid ""
 "Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
 "`__eq__` methods will get suppressed. To get error reporting use :c:func:"
 "`PyDict_GetItemWithError()` instead."
 msgstr ""
 
-#: c-api/dict.rst:106
+#: c-api/dict.rst:108
 msgid ""
 "Variant of :c:func:`PyDict_GetItem` that does not suppress exceptions. "
 "Return ``NULL`` **with** an exception set if an exception occurred.  Return "
 "``NULL`` **without** an exception set if the key wasn't present."
 msgstr ""
 
-#: c-api/dict.rst:114
+#: c-api/dict.rst:116
 msgid ""
 "This is the same as :c:func:`PyDict_GetItem`, but *key* is specified as a :c:"
 "type:`const char*`, rather than a :c:type:`PyObject*`."
 msgstr ""
 
-#: c-api/dict.rst:117
+#: c-api/dict.rst:119
 msgid ""
 "Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
 "`__eq__` methods and creating a temporary string object will get suppressed. "
 "To get error reporting use :c:func:`PyDict_GetItemWithError()` instead."
 msgstr ""
 
-#: c-api/dict.rst:125
+#: c-api/dict.rst:127
 msgid ""
 "This is the same as the Python-level :meth:`dict.setdefault`.  If present, "
 "it returns the value corresponding to *key* from the dictionary *p*.  If the "
@@ -145,29 +146,29 @@ msgid ""
 "the insertion."
 msgstr ""
 
-#: c-api/dict.rst:135
+#: c-api/dict.rst:137
 msgid ""
 "Return a :c:type:`PyListObject` containing all the items from the dictionary."
 msgstr ""
 
-#: c-api/dict.rst:140
+#: c-api/dict.rst:142
 msgid ""
 "Return a :c:type:`PyListObject` containing all the keys from the dictionary."
 msgstr ""
 
-#: c-api/dict.rst:145
+#: c-api/dict.rst:147
 msgid ""
 "Return a :c:type:`PyListObject` containing all the values from the "
 "dictionary *p*."
 msgstr ""
 
-#: c-api/dict.rst:153
+#: c-api/dict.rst:155
 msgid ""
 "Return the number of items in the dictionary.  This is equivalent to "
 "``len(p)`` on a dictionary."
 msgstr ""
 
-#: c-api/dict.rst:159
+#: c-api/dict.rst:161
 msgid ""
 "Iterate over all key-value pairs in the dictionary *p*.  The :c:type:"
 "`Py_ssize_t` referred to by *ppos* must be initialized to ``0`` prior to the "
@@ -181,18 +182,18 @@ msgid ""
 "structure is sparse, the offsets are not consecutive."
 msgstr ""
 
-#: c-api/dict.rst:170
+#: c-api/dict.rst:172
 msgid "For example::"
 msgstr "Par exemple ::"
 
-#: c-api/dict.rst:180
+#: c-api/dict.rst:182
 msgid ""
 "The dictionary *p* should not be mutated during iteration.  It is safe to "
 "modify the values of the keys as you iterate over the dictionary, but only "
 "so long as the set of keys does not change.  For example::"
 msgstr ""
 
-#: c-api/dict.rst:205
+#: c-api/dict.rst:207
 msgid ""
 "Iterate over mapping object *b* adding key-value pairs to dictionary *a*. "
 "*b* may be a dictionary, or any object supporting :c:func:`PyMapping_Keys` "
@@ -202,7 +203,7 @@ msgid ""
 "or ``-1`` if an exception was raised."
 msgstr ""
 
-#: c-api/dict.rst:215
+#: c-api/dict.rst:217
 msgid ""
 "This is the same as ``PyDict_Merge(a, b, 1)`` in C, and is similar to ``a."
 "update(b)`` in Python except that :c:func:`PyDict_Update` doesn't fall back "
@@ -211,7 +212,7 @@ msgid ""
 "exception was raised."
 msgstr ""
 
-#: c-api/dict.rst:224
+#: c-api/dict.rst:226
 msgid ""
 "Update or merge into dictionary *a*, from the key-value pairs in *seq2*. "
 "*seq2* must be an iterable object producing iterable objects of length 2, "

faq/programming.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-01 16:00+0200\n"
+"POT-Creation-Date: 2020-10-15 22:05+0200\n"
 "PO-Revision-Date: 2020-05-30 17:14+0900\n"
 "Last-Translator: Samuel Giffard <[email protected]>\n"
 "Language-Team: FRENCH <[email protected]>\n"
@@ -1832,8 +1832,9 @@ msgid ""
 msgstr ""
 
 #: faq/programming.rst:1179
-msgid "If space is not an issue, the list comprehension may be fastest."
-msgstr ""
+#, fuzzy
+msgid "The list comprehension may be fastest."
+msgstr "Utilisez une liste en compréhension ::"
 
 #: faq/programming.rst:1183
 msgid "How do you make an array in Python?"

library/mailbox.po

@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-01 16:00+0200\n"
+"POT-Creation-Date: 2020-10-15 22:05+0200\n"
 "PO-Revision-Date: 2020-09-24 20:59+0100\n"
+"Last-Translator: James Adjinwa <[email protected]>\n"
 "Language-Team: FRENCH <[email protected]>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: James Adjinwa <[email protected]>\n"
 "X-Generator: Poedit 2.3\n"
 
 #: library/mailbox.rst:2

library/math.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-01 16:00+0200\n"
+"POT-Creation-Date: 2020-10-15 22:05+0200\n"
 "PO-Revision-Date: 2019-10-09 21:42+0200\n"
 "Last-Translator: Antoine Wecxsteen\n"
 "Language-Team: FRENCH <[email protected]>\n"
@@ -221,7 +221,7 @@ msgstr ""
 msgid ""
 "Return the greatest common divisor of the specified integer arguments. If "
 "any of the arguments is nonzero, then the returned value is the largest "
-"positive integer that is a divisor af all arguments.  If all arguments are "
+"positive integer that is a divisor of all arguments.  If all arguments are "
 "zero, then the returned value is ``0``.  ``gcd()`` without arguments returns "
 "``0``."
 msgstr ""