Skip to content

Started translating library/os.po #1531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
May 27, 2022
Prev Previous commit
Next Next commit
remove conflict markers
  • Loading branch information
Mathieu Dupuy committed May 24, 2022
commit 06598813a7848ceb8ece46d6f370c968107d5a79
17 changes: 0 additions & 17 deletions library/os.po
Original file line number Diff line number Diff line change
Expand Up @@ -3151,12 +3151,7 @@ msgstr ""
msgid "The *dir_fd* parameter."
msgstr "Le paramètre *dir_fd*."

<<<<<<< HEAD
#: library/os.rst:2245
#, fuzzy
=======
#: library/os.rst:2244
>>>>>>> e5cae3db (Even more fuzzies)
msgid ""
"Return an iterator of :class:`os.DirEntry` objects corresponding to the "
"entries in the directory given by *path*. The entries are yielded in "
Expand Down Expand Up @@ -4049,12 +4044,8 @@ msgstr ""
msgid "Added :attr:`f_fsid`."
msgstr "Ajout de :attr:`f_fsid`."

<<<<<<< HEAD
#: library/os.rst:2772
#, fuzzy
=======
#: library/os.rst:2771
>>>>>>> e5cae3db (Even more fuzzies)
msgid ""
"A :class:`set` object indicating which functions in the :mod:`os` module "
"accept an open file descriptor for their *dir_fd* parameter. Different "
Expand All @@ -4075,12 +4066,8 @@ msgstr ""
"pas réellement accessible. (Spécifier ``None`` pour *dir_fd* est toujours "
"accepté sur toutes les plateformes.)"

<<<<<<< HEAD
#: library/os.rst:2782
#, fuzzy
=======
#: library/os.rst:2781
>>>>>>> e5cae3db (Even more fuzzies)
msgid ""
"To check whether a particular function accepts an open file descriptor for "
"its *dir_fd* parameter, use the ``in`` operator on ``supports_dir_fd``. As "
Expand All @@ -4101,12 +4088,8 @@ msgstr ""
"Actuellement, le paramètre *dir_fd* ne fonctionne que sur les plate-formes "
"Unix. Il ne fonctionne jamais sur Windows."

<<<<<<< HEAD
#: library/os.rst:2797
#, fuzzy
=======
#: library/os.rst:2796
>>>>>>> e5cae3db (Even more fuzzies)
msgid ""
"A :class:`set` object indicating whether :func:`os.access` permits "
"specifying ``True`` for its *effective_ids* parameter on the local platform. "
Expand Down