make merge

Author: JulienPalard

c-api/abstract.po

@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-02 22:11+0200\n"
+"POT-Creation-Date: 2019-01-03 16:57+0100\n"
 "PO-Revision-Date: 2018-10-17 19:31+0200\n"
+"Last-Translator: \n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: \n"
 "X-Generator: Poedit 2.2\n"
 
 #: ../Doc/c-api/abstract.rst:7

copyright.po

@@ -5,8 +5,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-08 09:58+0100\n"
-"PO-Revision-Date: 2018-07-23 22:39+0200\n"
+"POT-Creation-Date: 2019-01-03 16:57+0100\n"
+"PO-Revision-Date: 2019-01-03 16:59+0100\n"
 "Last-Translator: Julien Palard <julien@palard.fr>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
 "Language: fr\n"
@@ -23,9 +23,8 @@ msgid "Python and this documentation is:"
 msgstr "Python et cette documentation sont :"
 
 #: ../Doc/copyright.rst:7
-msgid "Copyright © 2001-2018 Python Software Foundation. All rights reserved."
-msgstr ""
-"Copyright © 2001-2018 *Python Software Foundation*. Tout droits réservés."
+msgid "Copyright © 2001-2019 Python Software Foundation. All rights reserved."
+msgstr "Copyright © 2001-2019 Python Software Foundation. Tout droits réservés."
 
 #: ../Doc/copyright.rst:9
 msgid "Copyright © 2000 BeOpen.com. All rights reserved."

library/asyncio-policy.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-29 16:06+0100\n"
+"POT-Creation-Date: 2019-01-03 16:57+0100\n"
 "PO-Revision-Date: 2018-11-29 18:26+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -115,7 +115,7 @@ msgid "This function is Unix specific."
 msgstr ""
 
 #: ../Doc/library/asyncio-policy.rst:84
-msgid "Get the current child process watcher to *watcher*."
+msgid "Set the current child process watcher to *watcher*."
 msgstr ""
 
 #: ../Doc/library/asyncio-policy.rst:89

library/asyncio-task.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-12 18:59+0200\n"
+"POT-Creation-Date: 2019-01-03 16:57+0100\n"
 "PO-Revision-Date: 2018-10-13 11:37+0200\n"
 "Last-Translator: Julien Palard <julien@palard.fr>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -562,8 +562,8 @@ msgstr ""
 
 #: ../Doc/library/asyncio-task.rst:607
 msgid ""
-"Unlike other asyncio functions this functions requires the *loop* argument "
-"to be passed explicitly."
+"Unlike other asyncio functions this function requires the *loop* argument to "
+"be passed explicitly."
 msgstr ""
 
 #: ../Doc/library/asyncio-task.rst:614

library/binascii.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 15:29+0200\n"
+"POT-Creation-Date: 2019-01-03 16:57+0100\n"
 "PO-Revision-Date: 2017-08-10 00:59+0200\n"
 "Last-Translator: Julien Palard <julien@palard.fr>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -163,53 +163,66 @@ msgid ""
 "returned bytes object is therefore twice as long as the length of *data*."
 msgstr ""
 
-#: ../Doc/library/binascii.rst:159
+#: ../Doc/library/binascii.rst:155
+msgid ""
+"Similar functionality (but returning a text string) is also conveniently "
+"accessible using the :meth:`bytes.hex` method."
+msgstr ""
+
+#: ../Doc/library/binascii.rst:161
 msgid ""
 "Return the binary data represented by the hexadecimal string *hexstr*.  This "
 "function is the inverse of :func:`b2a_hex`. *hexstr* must contain an even "
 "number of hexadecimal digits (which can be upper or lower case), otherwise "
 "an :exc:`Error` exception is raised."
 msgstr ""
 
-#: ../Doc/library/binascii.rst:167
-msgid "Exception raised on errors. These are usually programming errors."
+#: ../Doc/library/binascii.rst:166
+msgid ""
+"Similar functionality (accepting only text string arguments, but more "
+"liberal towards whitespace) is also accessible using the :meth:`bytes."
+"fromhex` class method."
 msgstr ""
 
 #: ../Doc/library/binascii.rst:172
+msgid "Exception raised on errors. These are usually programming errors."
+msgstr ""
+
+#: ../Doc/library/binascii.rst:177
 msgid ""
 "Exception raised on incomplete data. These are usually not programming "
 "errors, but may be handled by reading a little more data and trying again."
 msgstr ""
 
-#: ../Doc/library/binascii.rst:180
+#: ../Doc/library/binascii.rst:185
 msgid "Module :mod:`base64`"
 msgstr "Module :mod:`base64`"
 
-#: ../Doc/library/binascii.rst:179
+#: ../Doc/library/binascii.rst:184
 msgid ""
 "Support for RFC compliant base64-style encoding in base 16, 32, 64, and 85."
 msgstr ""
 
-#: ../Doc/library/binascii.rst:183
+#: ../Doc/library/binascii.rst:188
 msgid "Module :mod:`binhex`"
 msgstr "Module :mod:`binhex`"
 
-#: ../Doc/library/binascii.rst:183
+#: ../Doc/library/binascii.rst:188
 msgid "Support for the binhex format used on the Macintosh."
 msgstr ""
 
-#: ../Doc/library/binascii.rst:186
+#: ../Doc/library/binascii.rst:191
 msgid "Module :mod:`uu`"
 msgstr "Module :mod:`uu`"
 
-#: ../Doc/library/binascii.rst:186
+#: ../Doc/library/binascii.rst:191
 msgid "Support for UU encoding used on Unix."
 msgstr "Gestion de l'encodage UU utilisé sur Unix."
 
-#: ../Doc/library/binascii.rst:188
+#: ../Doc/library/binascii.rst:193
 msgid "Module :mod:`quopri`"
 msgstr "Module :mod:`quopri`"
 
-#: ../Doc/library/binascii.rst:189
+#: ../Doc/library/binascii.rst:194
 msgid "Support for quoted-printable encoding used in MIME email messages."
 msgstr ""