Make merge (#1766)

* Make merge * Avoid a newline at each run of merge.py.
This commit is contained in:
Julien Palard 2021-11-05 23:32:47 +01:00 committed by GitHub
commit 4955f79c65
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\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-10-21 15:04+0200\n"
"POT-Creation-Date: 2021-11-04 18:14+0100\n"
"PO-Revision-Date: 2021-10-21 23:42+0200\n"
"Last-Translator: Jean Abou Samra <jean@abou-samra.fr>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@ -4381,11 +4381,9 @@ msgstr ""
#: reference/datamodel.rst:2544
msgid ""
"If :meth:`__int__` is not defined then the built-in function :func:`int` "
"falls back to :meth:`__trunc__`."
"The built-in function :func:`int` falls back to :meth:`__trunc__` if "
"neither :meth:`__int__` nor :meth:`__index__` is defined."
msgstr ""
"Si :meth:`__int__` n'est pas définie, alors la fonction native :func:`int` "
"se replie sur :meth:`__trunc__`."
#: reference/datamodel.rst:2551
msgid "With Statement Context Managers"
@ -4881,6 +4879,13 @@ msgstr ""
"(telle que :meth:`__add__`) échoue, alors l'opération en tant que telle "
"n'est pas autorisée et donc la méthode symétrique n'est pas appelée."
#~ msgid ""
#~ "If :meth:`__int__` is not defined then the built-in function :func:`int` "
#~ "falls back to :meth:`__trunc__`."
#~ msgstr ""
#~ "Si :meth:`__int__` n'est pas définie, alors la fonction native :func:"
#~ "`int` se replie sur :meth:`__trunc__`."
#~ msgid ""
#~ "Special attributes: :attr:`~definition.__name__` is the class name; :attr:"
#~ "`__module__` is the module name in which the class was defined; :attr:"