Merge branch '3.8' into fuzzies-subprocess

Author: deronnax

CONTRIBUTING.rst

@@ -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 := e21aa61e96f8343200e765d119ebe778873a6bf1
+CPYTHON_CURRENT_COMMIT := 83d3202b92fb4c2fc6df5b035d57f3a1cf715f20
 
 CPYTHON_PATH := ../cpython/
 
@@ -80,6 +80,7 @@ setup: venv
 	    fi;                                                                              \
 	    git -C $(CPYTHON_PATH) worktree add $(WORKTREE)/ $(CPYTHON_CURRENT_COMMIT);      \
 	    $(MAKE) -C $(WORKTREE)/Doc/ VENVDIR=$(WORKTREE)/Doc/venv/ PYTHON=$(PYTHON) venv; \
+	    $(WORKTREE)/Doc/venv/bin/python -m pip install Sphinx==2.2;                      \
 	fi
 
 
@@ -99,7 +100,7 @@ serve:
 
 .PHONY: progress
 progress:
-	@python3 -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))'  \
+	@$(PYTHON) -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))'  \
 	$(shell msgcat *.po */*.po | msgattrib --translated | grep -c '^msgid') \
 	$(shell msgcat *.po */*.po | grep -c '^msgid')
 
@@ -157,6 +158,7 @@ merge: setup
 	sed -i 's/^CPYTHON_CURRENT_COMMIT :=.*/CPYTHON_CURRENT_COMMIT := $(shell git -C $(WORKTREES)/$(BRANCH) rev-parse HEAD)/' Makefile
 	rm -fr $(WORKTREES)/$(BRANCH)
 	git -C $(CPYTHON_PATH) worktree prune
+	echo 'To add, you can use git status -s | grep "^ M .*\.po" | cut -d" " -f3 | while read -r file; do if [ $$(git diff "$$file" | wc -l) -gt 13 ]; then git add "$$file"; fi ; done'
 
 .PHONY: clean
 clean:

Makefile

@@ -42,8 +42,8 @@ Comment contribuer
 
 Vous pouvez contribuer :
 
-- en proposant des *pull requests* Github (solution recommandée),
-- ou en envoyant un patch à la liste `traductions <https://lists.afpy.org/mailman/listinfo/traductions>`_.
+- en proposant des *pull requests* Github (solution recommandée) ;
+- en envoyant un patch à la liste `traductions <https://lists.afpy.org/mailman/listinfo/traductions>`_.
 
 Un guide pour contribuer au projet via Github se trouve dans
 `CONTRIBUTING.rst
@@ -70,4 +70,4 @@ l'`AFPy <https://www.afpy.org/>`_. En 2017 ce projet est devenu la
 traduction officielle de la documentation Python en français grâce à
 la `PEP 545 <https://www.python.org/dev/peps/pep-0545/>`_. `Jules Lasne
 <https://github.com/Seluj78>`_ à publié fin 2019 une `vidéo de
-l'histore du repo <https://youtu.be/azXmvpEJMhU>`_.
+l'histoire du dépôt <https://youtu.be/azXmvpEJMhU>`_.

README.rst

@@ -13,3 +13,5 @@ Vivien Lambert
 Andy Kwok
 Aya Keddam
 Antoine Wecxsteen 
+Sascha Salles
+Valériane Venance

TRANSLATORS

@@ -584,18 +584,22 @@ msgid "``L`` (:class:`int`) [long long]"
 msgstr "``L`` (:class:`int`) [``long long``]"
 
 #: ../Doc/c-api/arg.rst:285
+#, fuzzy
 msgid "Convert a Python integer to a C :c:type:`long long`."
-msgstr ""
+msgstr "Convertit un entier Python en un :c:type:`long int`."
 
 #: ../Doc/c-api/arg.rst:289 ../Doc/c-api/arg.rst:615
 msgid "``K`` (:class:`int`) [unsigned long long]"
 msgstr "``K`` (:class:`int`) [``unsigned long long``]"
 
 #: ../Doc/c-api/arg.rst:288
+#, fuzzy
 msgid ""
 "Convert a Python integer to a C :c:type:`unsigned long long` without "
 "overflow checking."
 msgstr ""
+"Convertit un entier Python en un :c:type:`unsigned long` C sans en vérifier "
+"le débordement."
 
 #: ../Doc/c-api/arg.rst:292 ../Doc/c-api/arg.rst:618
 msgid "``n`` (:class:`int`) [Py_ssize_t]"
@@ -1076,8 +1080,9 @@ msgid "``U#`` (:class:`str` or ``None``) [const char \\*, int]"
 msgstr "``U#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
 
 #: ../Doc/c-api/arg.rst:588
+#, fuzzy
 msgid "Convert a plain C :c:type:`int` to a Python integer object."
-msgstr ""
+msgstr "Convertit un :c:type:`long int` en un *int* Python."
 
 #: ../Doc/c-api/arg.rst:591
 msgid "``b`` (:class:`int`) [char]"
@@ -1104,16 +1109,18 @@ msgid "Convert a C :c:type:`unsigned short int` to a Python integer object."
 msgstr ""
 
 #: ../Doc/c-api/arg.rst:606
+#, fuzzy
 msgid "Convert a C :c:type:`unsigned int` to a Python integer object."
-msgstr ""
+msgstr "Convertit un :c:type:`long int` en un *int* Python."
 
 #: ../Doc/c-api/arg.rst:609
 msgid "Convert a C :c:type:`unsigned long` to a Python integer object."
 msgstr ""
 
 #: ../Doc/c-api/arg.rst:612
+#, fuzzy
 msgid "Convert a C :c:type:`long long` to a Python integer object."
-msgstr ""
+msgstr "Convertit un :c:type:`long int` en un *int* Python."
 
 #: ../Doc/c-api/arg.rst:615
 msgid "Convert a C :c:type:`unsigned long long` to a Python integer object."

c-api/arg.po

@@ -25,26 +25,37 @@ msgid ""
 msgstr ""
 
 #: ../Doc/c-api/bytes.rst:16
+#, fuzzy
 msgid "This subtype of :c:type:`PyObject` represents a Python bytes object."
 msgstr ""
+"Ce sous-type de :c:type:`PyObject` représente un objet ``bytearray`` Python."
 
 #: ../Doc/c-api/bytes.rst:21
+#, fuzzy
 msgid ""
 "This instance of :c:type:`PyTypeObject` represents the Python bytes type; it "
 "is the same object as :class:`bytes` in the Python layer."
 msgstr ""
+"Cette instance de :c:type:`PyTypeObject` représente le type Python "
+"*bytearray*, c'est le même que :class:`bytearray` côté Python."
 
 #: ../Doc/c-api/bytes.rst:27
+#, fuzzy
 msgid ""
 "Return true if the object *o* is a bytes object or an instance of a subtype "
 "of the bytes type."
 msgstr ""
+"Renvoie vrai si l'objet *o* est un ``bytearray`` ou une instance d'un sous-"
+"type du type ``bytearray``."
 
 #: ../Doc/c-api/bytes.rst:33
+#, fuzzy
 msgid ""
 "Return true if the object *o* is a bytes object, but not an instance of a "
 "subtype of the bytes type."
 msgstr ""
+"Renvoie vrai si l'objet *o* est un ``bytearray``, mais pas une instance d'un "
+"sous-type du type ``bytearray``."
 
 #: ../Doc/c-api/bytes.rst:39
 msgid ""
@@ -72,15 +83,16 @@ msgstr ""
 
 #: ../Doc/c-api/bytes.rst:68
 msgid "Format Characters"
-msgstr ""
+msgstr "Caractères de format"
 
 #: ../Doc/c-api/bytes.rst:68
 msgid "Type"
 msgstr "Type"
 
 #: ../Doc/c-api/bytes.rst:68
+#, fuzzy
 msgid "Comment"
-msgstr ""
+msgstr "Commentaires"
 
 #: ../Doc/c-api/bytes.rst:70
 msgid ":attr:`%%`"

c-api/bytes.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 18:54+0100\n"
+"POT-Creation-Date: 2020-02-04 10:00+0100\n"
 "PO-Revision-Date: 2018-02-15 00:30+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -67,7 +67,7 @@ msgstr ""
 #: ../Doc/c-api/code.rst:45
 msgid ""
 "Similar to :c:func:`PyCode_New`, but with an extra \"posonlyargcount\" for "
-"positonal-only arguments."
+"positional-only arguments."
 msgstr ""
 
 #: ../Doc/c-api/code.rst:51

c-api/code.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 18:54+0100\n"
+"POT-Creation-Date: 2020-02-04 10:00+0100\n"
 "PO-Revision-Date: 2018-07-03 11:36+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -19,15 +19,21 @@ msgid "Dictionary Objects"
 msgstr "Objets dictionnaires"
 
 #: ../Doc/c-api/dict.rst:13
+#, fuzzy
 msgid ""
 "This subtype of :c:type:`PyObject` represents a Python dictionary object."
 msgstr ""
+"Ce sous-type de :c:type:`PyObject` représente un objet ``bytearray`` Python."
 
 #: ../Doc/c-api/dict.rst:18
+#, fuzzy
 msgid ""
 "This instance of :c:type:`PyTypeObject` represents the Python dictionary "
 "type.  This is the same object as :class:`dict` in the Python layer."
 msgstr ""
+"Cette instance de l'objet :c:type:`PyTypeObject` représente le type nombre à "
+"virgule flottante en Python. C'est le même objet que la classe :class:"
+"`float` de la couche Python."
 
 #: ../Doc/c-api/dict.rst:24
 msgid ""
@@ -69,65 +75,67 @@ msgstr ""
 
 #: ../Doc/c-api/dict.rst:65
 msgid ""
-"Insert *value* into the dictionary *p* with a key of *key*.  *key* must be :"
+"Insert *val* into the dictionary *p* with a key of *key*.  *key* must be :"
 "term:`hashable`; if it isn't, :exc:`TypeError` will be raised. Return ``0`` "
-"on success or ``-1`` on failure."
+"on success or ``-1`` on failure.  This function *does not* steal a reference "
+"to *val*."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:74
+#: ../Doc/c-api/dict.rst:75
 msgid ""
-"Insert *value* into the dictionary *p* using *key* as a key. *key* should be "
+"Insert *val* into the dictionary *p* using *key* as a key. *key* should be "
 "a :c:type:`const char\\*`.  The key object is created using "
-"``PyUnicode_FromString(key)``.  Return ``0`` on success or ``-1`` on failure."
+"``PyUnicode_FromString(key)``.  Return ``0`` on success or ``-1`` on "
+"failure.  This function *does not* steal a reference to *val*."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:82
+#: ../Doc/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."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:89
+#: ../Doc/c-api/dict.rst:90
 msgid ""
 "Remove the entry in dictionary *p* which has a key specified by the string "
 "*key*.  Return ``0`` on success or ``-1`` on failure."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:95
+#: ../Doc/c-api/dict.rst:96
 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 ""
 
-#: ../Doc/c-api/dict.rst:98
+#: ../Doc/c-api/dict.rst:99
 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 ""
 
-#: ../Doc/c-api/dict.rst:105
+#: ../Doc/c-api/dict.rst:106
 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 ""
 
-#: ../Doc/c-api/dict.rst:113
+#: ../Doc/c-api/dict.rst:114
 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 ""
 
-#: ../Doc/c-api/dict.rst:116
+#: ../Doc/c-api/dict.rst:117
 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 ""
 
-#: ../Doc/c-api/dict.rst:124
+#: ../Doc/c-api/dict.rst:125
 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 "
@@ -137,29 +145,29 @@ msgid ""
 "the insertion."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:134
+#: ../Doc/c-api/dict.rst:135
 msgid ""
 "Return a :c:type:`PyListObject` containing all the items from the dictionary."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:139
+#: ../Doc/c-api/dict.rst:140
 msgid ""
 "Return a :c:type:`PyListObject` containing all the keys from the dictionary."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:144
+#: ../Doc/c-api/dict.rst:145
 msgid ""
 "Return a :c:type:`PyListObject` containing all the values from the "
 "dictionary *p*."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:152
+#: ../Doc/c-api/dict.rst:153
 msgid ""
 "Return the number of items in the dictionary.  This is equivalent to "
 "``len(p)`` on a dictionary."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:158
+#: ../Doc/c-api/dict.rst:159
 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 "
@@ -173,18 +181,18 @@ msgid ""
 "structure is sparse, the offsets are not consecutive."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:169
+#: ../Doc/c-api/dict.rst:170
 msgid "For example::"
 msgstr "Par exemple ::"
 
-#: ../Doc/c-api/dict.rst:179
+#: ../Doc/c-api/dict.rst:180
 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 ""
 
-#: ../Doc/c-api/dict.rst:204
+#: ../Doc/c-api/dict.rst:205
 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` "
@@ -194,7 +202,7 @@ msgid ""
 "or ``-1`` if an exception was raised."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:214
+#: ../Doc/c-api/dict.rst:215
 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 "
@@ -203,7 +211,7 @@ msgid ""
 "exception was raised."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:223
+#: ../Doc/c-api/dict.rst:224
 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, "
@@ -212,6 +220,6 @@ msgid ""
 "if an exception was raised. Equivalent Python (except for the return value)::"
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:238
+#: ../Doc/c-api/dict.rst:239
 msgid "Clear the free list. Return the total number of freed items."
 msgstr ""

c-api/dict.po

@@ -1041,8 +1041,9 @@ msgid ":exc:`MemoryError`"
 msgstr ":exc:`MemoryError`"
 
 #: ../Doc/c-api/exceptions.rst:879
+#, fuzzy
 msgid ":c:data:`PyExc_ModuleNotFoundError`"
-msgstr ""
+msgstr ":c:data:`PyExc_ModuleNotFoundError`."
 
 #: ../Doc/c-api/exceptions.rst:879
 msgid ":exc:`ModuleNotFoundError`"