AFPy/python-docs-fr
AFPy
/
python-docs-fr
5
6
Fork 44
Code Issues 22 Pull Requests 13 Projects Releases Wiki Activity

Résolution des conflits dans library/io.po
ci/woodpecker/pr/woodpecker Pipeline was successful Details

This commit is contained in:
houedji.espoir 2023-11-14 23:26:44 +01:00
parent 59f8e24caf 66309f9360
commit 2cf33127c8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
library/io.po
View File

@ -6,7 +6,11 @@ msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-07-23 14:38+0200\n"
<<<<<<< HEAD
"PO-Revision-Date: 2023-11-14 23:18+0100\n"
=======
"PO-Revision-Date: 2023-11-14 22:46+0100\n"
>>>>>>> 66309f9360bc4f58f5002fc2a779bf0b7576180b
"Last-Translator: Houedji Espoir <therencecossi@gmail.com>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
"Language: fr\n"
@ -77,11 +81,15 @@ msgid ""
"The easiest way to create a text stream is with :meth:`open()`, optionally "
"specifying an encoding::"
msgstr ""
"Le moyen le plus simple de créer un flux de texte est d'utiliser la méthode :"
"meth:`open()` en spécifiant éventuellement un encodage ::"
#: library/io.rst:63
msgid ""
"In-memory text streams are also available as :class:`StringIO` objects::"
msgstr ""
"Les flux de texte en mémoire sont également disponible sous forme d'objets :"
"class:`StringIO` ::"
#: library/io.rst:67
msgid ""
@ -114,6 +122,7 @@ msgstr ""
msgid ""
"In-memory binary streams are also available as :class:`BytesIO` objects::"
msgstr ""
<<<<<<< HEAD
#: library/io.rst:89
msgid ""
@ -1592,4 +1601,4 @@ msgstr ""
#: library/io.rst:1094
msgid "io.IncrementalNewlineDecoder class"
msgstr ""
msgstr ""