make merge from cpython:25ce77dd2455abbb6e2c9e055bbc98954642fa7c (#987)

* make merge from cpython:25ce77dd2455abbb6e2c9e055bbc98954642fa7c * Fixed silly fuzzies for CI * More make merge from my PRs
This commit is contained in:
Jules Lasne (jlasne) 2019-11-15 23:57:16 +01:00 committed by GitHub
commit 3de5dcdad9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3.6\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-09-04 11:33+0200\n"
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
"PO-Revision-Date: 2019-03-26 17:29+0100\n"
"Last-Translator: Julien Palard <julien@palard.fr>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@ -1839,7 +1839,7 @@ msgstr ""
msgid ""
"None of these take parameters. For the first three, return -1 to indicate "
"error. For ``DecodeFSDefault``, the return type is ``const char *``; return "
"a NULL pointer to indicate an error."
"a ``NULL`` pointer to indicate an error."
msgstr ""
#: ../Doc/howto/clinic.rst:1076

View file

@ -5,14 +5,14 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3.6\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-12-21 09:48+0100\n"
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
"PO-Revision-Date: 2019-10-30 00:11+0100\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.3\n"
#: ../Doc/howto/functional.rst:3