Resolving conflicts

This commit is contained in:
stevostean 2018-02-20 21:29:54 +01:00
commit ba6e2c2e51

View File

@ -282,7 +282,7 @@ msgstr ""
#: ../Doc/library/lzma.rst:154
msgid ":const:`FORMAT_RAW`: A raw data stream, not using any container format."
msgstr ""
":const:`FORMAT_RAW`: Un flux de donnée brut, n'utilisant aucun format de "
":const:`FORMAT_RAW`: Un flux de données brut, n'utilisant aucun format de "
"conteneur."
#: ../Doc/library/lzma.rst:151