Skip to content

make merge #1300

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.

Sign up for GitHub

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 3 commits into from
May 24, 2020
Merged

make merge #1300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e34be78
make merge
JulienPalard May 23, 2020
65d11ab
Update library/idle.po
deronnax May 24, 2020
d418d5d
Help pospell.
JulienPalard May 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# from which we generated our po files. We use it here so when we
# test build, we're building with the .rst files that generated our
# .po files.
CPYTHON_CURRENT_COMMIT := 83d3202b92fb4c2fc6df5b035d57f3a1cf715f20
CPYTHON_CURRENT_COMMIT := dc3239177ff26cb6a12e437a1f507be730fe8ba7

CPYTHON_PATH := ../cpython/

Expand All @@ -44,7 +44,7 @@ JOBS := auto
.PHONY: all
all: setup
mkdir -p $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/
cp -uv --parents *.po */*.po $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2
cp -uv --parents *.po */*.po $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2
$(MAKE) -C $(WORKTREE)/Doc/ VENVDIR=$(WORKTREE)/Doc/venv/ PYTHON=$(PYTHON) \
SPHINXOPTS='-qW -j$(JOBS) \
-D locale_dirs=../locales \
Expand Down
74 changes: 56 additions & 18 deletions c-api/arg.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
"POT-Creation-Date: 2020-05-23 11:38+0200\n"
"PO-Revision-Date: 2018-10-04 12:14+0200\n"
"Last-Translator: Julien Palard <julien@palard.fr>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
Expand Down Expand Up @@ -254,13 +254,13 @@ msgstr ""
"membre ``buf``, dont la structure est :c:type:`Py_buffer` est fixée à *NULL*."

#: ../Doc/c-api/arg.rst:110
#, fuzzy
msgid ""
"``z#`` (:class:`str`, read-only :term:`bytes-like object` or ``None``) "
"[const char \\*, int]"
"[const char \\*, int or :c:type:`Py_ssize_t`]"
msgstr ""
"``z#`` (:class:`str`, :term:`objet compatible avec une chaîne d'octets "
"<bytes-like object>` en lecture seule ou ``None``) [constante char \\*, "
"entier]"
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"

#: ../Doc/c-api/arg.rst:109
#, fuzzy
Expand Down Expand Up @@ -308,10 +308,13 @@ msgid ""
msgstr ""

#: ../Doc/c-api/arg.rst:129
msgid "``y#`` (read-only :term:`bytes-like object`) [const char \\*, int]"
#, fuzzy
msgid ""
"``y#`` (read-only :term:`bytes-like object`) [const char \\*, int or :c:type:"
"`Py_ssize_t`]"
msgstr ""
"``y#`` (lecture seule :term:`objet compatible avec une chaîne d'octets "
"<bytes-like object>`) [constante char \\*, entier]"
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"

#: ../Doc/c-api/arg.rst:128
msgid ""
Expand Down Expand Up @@ -378,7 +381,9 @@ msgid ""
msgstr ""

#: ../Doc/c-api/arg.rst:165
msgid "``u#`` (:class:`str`) [const Py_UNICODE \\*, int]"
#, fuzzy
msgid ""
"``u#`` (:class:`str`) [const Py_UNICODE \\*, int or :c:type:`Py_ssize_t`]"
msgstr "``u#`` (:class:`str`) [``const Py_UNICODE *``, ``int``]"

#: ../Doc/c-api/arg.rst:159
Expand All @@ -402,7 +407,10 @@ msgstr ""
"pointeur :c:type:`Py_UNICODE` vaut *NULL*."

#: ../Doc/c-api/arg.rst:181
msgid "``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \\*, int]"
#, fuzzy
msgid ""
"``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \\*, int or :c:type:"
"`Py_ssize_t`]"
msgstr "``Z#`` (:class:`str` ou ``None``) [``const Py_UNICODE *``, ``int``]"

#: ../Doc/c-api/arg.rst:176
Expand Down Expand Up @@ -481,10 +489,13 @@ msgid ""
msgstr ""

#: ../Doc/c-api/arg.rst:245
#, fuzzy
msgid ""
"``es#`` (:class:`str`) [const char \\*encoding, char \\*\\*buffer, int "
"\\*buffer_length]"
"``es#`` (:class:`str`) [const char \\*encoding, char \\*\\*buffer, int or :c:"
"type:`Py_ssize_t` \\*buffer_length]"
msgstr ""
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"

#: ../Doc/c-api/arg.rst:217
msgid ""
Expand Down Expand Up @@ -537,10 +548,13 @@ msgstr ""
"sans l'octet NUL de fin."

#: ../Doc/c-api/arg.rst:250
#, fuzzy
msgid ""
"``et#`` (:class:`str`, :class:`bytes` or :class:`bytearray`) [const char "
"\\*encoding, char \\*\\*buffer, int \\*buffer_length]"
"\\*encoding, char \\*\\*buffer, int or :c:type:`Py_ssize_t` \\*buffer_length]"
msgstr ""
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"

#: ../Doc/c-api/arg.rst:248
msgid ""
Expand Down Expand Up @@ -1065,7 +1079,10 @@ msgid ""
msgstr ""

#: ../Doc/c-api/arg.rst:555
msgid "``s#`` (:class:`str` or ``None``) [const char \\*, int]"
#, fuzzy
msgid ""
"``s#`` (:class:`str` or ``None``) [const char \\*, int or :c:type:"
"`Py_ssize_t`]"
msgstr "``s#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"

#: ../Doc/c-api/arg.rst:553
Expand All @@ -1086,7 +1103,8 @@ msgid ""
msgstr ""

#: ../Doc/c-api/arg.rst:563
msgid "``y#`` (:class:`bytes`) [const char \\*, int]"
#, fuzzy
msgid "``y#`` (:class:`bytes`) [const char \\*, int or :c:type:`Py_ssize_t`]"
msgstr "``y#`` (:class:`bytes`) [``const char *, int``]"

#: ../Doc/c-api/arg.rst:562
Expand All @@ -1100,7 +1118,10 @@ msgid "Same as ``s``."
msgstr ""

#: ../Doc/c-api/arg.rst:569
msgid "``z#`` (:class:`str` or ``None``) [const char \\*, int]"
#, fuzzy
msgid ""
"``z#`` (:class:`str` or ``None``) [const char \\*, int or :c:type:"
"`Py_ssize_t`]"
msgstr "``z#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"

#: ../Doc/c-api/arg.rst:569 ../Doc/c-api/arg.rst:585
Expand All @@ -1119,7 +1140,8 @@ msgid ""
msgstr ""

#: ../Doc/c-api/arg.rst:579
msgid "``u#`` (:class:`str`) [const wchar_t \\*, int]"
#, fuzzy
msgid "``u#`` (:class:`str`) [const wchar_t \\*, int or :c:type:`Py_ssize_t`]"
msgstr "``u#`` (:class:`str`) [``const wchar_t *``, ``int``]"

#: ../Doc/c-api/arg.rst:577
Expand All @@ -1134,7 +1156,10 @@ msgid "``U`` (:class:`str` or ``None``) [const char \\*]"
msgstr "``U`` (:class:`str` ou ``None``) [``const char *``]"

#: ../Doc/c-api/arg.rst:585
msgid "``U#`` (:class:`str` or ``None``) [const char \\*, int]"
#, fuzzy
msgid ""
"``U#`` (:class:`str` or ``None``) [const char \\*, int or :c:type:"
"`Py_ssize_t`]"
msgstr "``U#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"

#: ../Doc/c-api/arg.rst:588
Expand Down Expand Up @@ -1296,6 +1321,19 @@ msgid ""
"rather than a variable number of arguments."
msgstr ""

#~ msgid ""
#~ "``z#`` (:class:`str`, read-only :term:`bytes-like object` or ``None``) "
#~ "[const char \\*, int]"
#~ msgstr ""
#~ "``z#`` (:class:`str`, :term:`objet compatible avec une chaîne d'octets "
#~ "<bytes-like object>` en lecture seule ou ``None``) [constante char \\*, "
#~ "entier]"

#~ msgid "``y#`` (read-only :term:`bytes-like object`) [const char \\*, int]"
#~ msgstr ""
#~ "``y#`` (lecture seule :term:`objet compatible avec une chaîne d'octets "
#~ "<bytes-like object>`) [constante char \\*, entier]"

#~ msgid "``s`` (:class:`str` or ``None``) [char \\*]"
#~ msgstr "``s`` (:class:`str` ou ``None``) [char \\*]"

Expand Down
73 changes: 36 additions & 37 deletions c-api/exceptions.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
"POT-Creation-Date: 2020-05-23 11:38+0200\n"
"PO-Revision-Date: 2018-10-04 12:24+0200\n"
"Last-Translator: Julien Palard <julien@palard.fr>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
Expand Down Expand Up @@ -379,7 +379,7 @@ msgstr ""
#: ../Doc/c-api/exceptions.rst:360
msgid ""
"Function similar to :c:func:`PyErr_WarnFormat`, but *category* is :exc:"
"`ResourceWarning` and pass *source* to :func:`warnings.WarningMessage`."
"`ResourceWarning` and it passes *source* to :func:`warnings.WarningMessage`."
msgstr ""

#: ../Doc/c-api/exceptions.rst:367
Expand Down Expand Up @@ -805,16 +805,16 @@ msgid ""
msgstr ""

#: ../Doc/c-api/exceptions.rst:823 ../Doc/c-api/exceptions.rst:956
#: ../Doc/c-api/exceptions.rst:1004
#: ../Doc/c-api/exceptions.rst:1001
msgid "C Name"
msgstr "Nom C"

#: ../Doc/c-api/exceptions.rst:823 ../Doc/c-api/exceptions.rst:1004
#: ../Doc/c-api/exceptions.rst:823 ../Doc/c-api/exceptions.rst:1001
msgid "Python Name"
msgstr "Nom Python"

#: ../Doc/c-api/exceptions.rst:823 ../Doc/c-api/exceptions.rst:956
#: ../Doc/c-api/exceptions.rst:1004
#: ../Doc/c-api/exceptions.rst:1001
msgid "Notes"
msgstr "Notes"

Expand All @@ -828,7 +828,7 @@ msgstr ":exc:`BaseException`"

#: ../Doc/c-api/exceptions.rst:825 ../Doc/c-api/exceptions.rst:827
#: ../Doc/c-api/exceptions.rst:829 ../Doc/c-api/exceptions.rst:875
#: ../Doc/c-api/exceptions.rst:887 ../Doc/c-api/exceptions.rst:1006
#: ../Doc/c-api/exceptions.rst:887 ../Doc/c-api/exceptions.rst:1003
msgid "\\(1)"
msgstr "\\(1)"

Expand Down Expand Up @@ -1297,7 +1297,7 @@ msgstr "\\(3)"
msgid "These aliases used to be separate exception types."
msgstr ""

#: ../Doc/c-api/exceptions.rst:968 ../Doc/c-api/exceptions.rst:1032
#: ../Doc/c-api/exceptions.rst:968 ../Doc/c-api/exceptions.rst:1029
msgid "Notes:"
msgstr "Notes :"

Expand All @@ -1306,119 +1306,118 @@ msgid "This is a base class for other standard exceptions."
msgstr "C'est la classe de base pour les autres exceptions standards."

#: ../Doc/c-api/exceptions.rst:974
msgid "This is the same as :exc:`weakref.ReferenceError`."
msgstr "Identique à :exc:`weakref.ReferenceError`."

#: ../Doc/c-api/exceptions.rst:977
msgid ""
"Only defined on Windows; protect code that uses this by testing that the "
"preprocessor macro ``MS_WINDOWS`` is defined."
msgstr ""

#: ../Doc/c-api/exceptions.rst:983
#: ../Doc/c-api/exceptions.rst:980
msgid "Standard Warning Categories"
msgstr ""

#: ../Doc/c-api/exceptions.rst:985
#: ../Doc/c-api/exceptions.rst:982
msgid ""
"All standard Python warning categories are available as global variables "
"whose names are ``PyExc_`` followed by the Python exception name. These have "
"the type :c:type:`PyObject\\*`; they are all class objects. For "
"completeness, here are all the variables:"
msgstr ""

#: ../Doc/c-api/exceptions.rst:1006
#: ../Doc/c-api/exceptions.rst:1003
msgid ":c:data:`PyExc_Warning`"
msgstr ":c:data:`PyExc_Warning`"

#: ../Doc/c-api/exceptions.rst:1006
#: ../Doc/c-api/exceptions.rst:1003
msgid ":exc:`Warning`"
msgstr ":exc:`Warning`"

#: ../Doc/c-api/exceptions.rst:1008
#: ../Doc/c-api/exceptions.rst:1005
msgid ":c:data:`PyExc_BytesWarning`"
msgstr ":c:data:`PyExc_BytesWarning`"

#: ../Doc/c-api/exceptions.rst:1008
#: ../Doc/c-api/exceptions.rst:1005
msgid ":exc:`BytesWarning`"
msgstr ":exc:`BytesWarning`"

#: ../Doc/c-api/exceptions.rst:1010
#: ../Doc/c-api/exceptions.rst:1007
msgid ":c:data:`PyExc_DeprecationWarning`"
msgstr ":c:data:`PyExc_DeprecationWarning`"

#: ../Doc/c-api/exceptions.rst:1010
#: ../Doc/c-api/exceptions.rst:1007
msgid ":exc:`DeprecationWarning`"
msgstr ":exc:`DeprecationWarning`"

#: ../Doc/c-api/exceptions.rst:1012
#: ../Doc/c-api/exceptions.rst:1009
msgid ":c:data:`PyExc_FutureWarning`"
msgstr ":c:data:`PyExc_FutureWarning`"

#: ../Doc/c-api/exceptions.rst:1012
#: ../Doc/c-api/exceptions.rst:1009
msgid ":exc:`FutureWarning`"
msgstr ":exc:`FutureWarning`"

#: ../Doc/c-api/exceptions.rst:1014
#: ../Doc/c-api/exceptions.rst:1011
msgid ":c:data:`PyExc_ImportWarning`"
msgstr ":c:data:`PyExc_ImportWarning`"

#: ../Doc/c-api/exceptions.rst:1014
#: ../Doc/c-api/exceptions.rst:1011
msgid ":exc:`ImportWarning`"
msgstr ":exc:`ImportWarning`"

#: ../Doc/c-api/exceptions.rst:1016
#: ../Doc/c-api/exceptions.rst:1013
msgid ":c:data:`PyExc_PendingDeprecationWarning`"
msgstr ":c:data:`PyExc_PendingDeprecationWarning`"

#: ../Doc/c-api/exceptions.rst:1016
#: ../Doc/c-api/exceptions.rst:1013
msgid ":exc:`PendingDeprecationWarning`"
msgstr ":exc:`PendingDeprecationWarning`"

#: ../Doc/c-api/exceptions.rst:1018
#: ../Doc/c-api/exceptions.rst:1015
msgid ":c:data:`PyExc_ResourceWarning`"
msgstr ":c:data:`PyExc_ResourceWarning`"

#: ../Doc/c-api/exceptions.rst:1018
#: ../Doc/c-api/exceptions.rst:1015
msgid ":exc:`ResourceWarning`"
msgstr ":exc:`ResourceWarning`"

#: ../Doc/c-api/exceptions.rst:1020
#: ../Doc/c-api/exceptions.rst:1017
msgid ":c:data:`PyExc_RuntimeWarning`"
msgstr ":c:data:`PyExc_RuntimeWarning`"

#: ../Doc/c-api/exceptions.rst:1020
#: ../Doc/c-api/exceptions.rst:1017
msgid ":exc:`RuntimeWarning`"
msgstr ":exc:`RuntimeWarning`"

#: ../Doc/c-api/exceptions.rst:1022
#: ../Doc/c-api/exceptions.rst:1019
msgid ":c:data:`PyExc_SyntaxWarning`"
msgstr ":c:data:`PyExc_SyntaxWarning`"

#: ../Doc/c-api/exceptions.rst:1022
#: ../Doc/c-api/exceptions.rst:1019
msgid ":exc:`SyntaxWarning`"
msgstr ":exc:`SyntaxWarning`"

#: ../Doc/c-api/exceptions.rst:1024
#: ../Doc/c-api/exceptions.rst:1021
msgid ":c:data:`PyExc_UnicodeWarning`"
msgstr ":c:data:`PyExc_UnicodeWarning`"

#: ../Doc/c-api/exceptions.rst:1024
#: ../Doc/c-api/exceptions.rst:1021
msgid ":exc:`UnicodeWarning`"
msgstr ":exc:`UnicodeWarning`"

#: ../Doc/c-api/exceptions.rst:1026
#: ../Doc/c-api/exceptions.rst:1023
msgid ":c:data:`PyExc_UserWarning`"
msgstr ":c:data:`PyExc_UserWarning`"

#: ../Doc/c-api/exceptions.rst:1026
#: ../Doc/c-api/exceptions.rst:1023
msgid ":exc:`UserWarning`"
msgstr ":exc:`UserWarning`"

#: ../Doc/c-api/exceptions.rst:1029
#: ../Doc/c-api/exceptions.rst:1026
msgid ":c:data:`PyExc_ResourceWarning`."
msgstr ":c:data:`PyExc_ResourceWarning`."

#: ../Doc/c-api/exceptions.rst:1035
#: ../Doc/c-api/exceptions.rst:1032
msgid "This is a base class for other standard warning categories."
msgstr "C'est la classe de base pour les autres catégories de *warning*."

#~ msgid "This is the same as :exc:`weakref.ReferenceError`."
#~ msgstr "Identique à :exc:`weakref.ReferenceError`."
Loading