Skip to content

Commit 17d5f9c

Browse files
JulienPalardJulienPalard
authored
Make merge (#1695)
* Make merge * FIX: spelling for pospell. * Uniformisation des entêtes po.
1 parent 0086ed1 commit 17d5f9c

File tree

257 files changed

+42841
-31569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

257 files changed

+42841
-31569
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# from which we generated our po files. We use it here so when we
2121
# test build, we're building with the .rst files that generated our
2222
# .po files.
23-
CPYTHON_CURRENT_COMMIT := cf739332bd039cd2303b58663a804f784883820d
23+
CPYTHON_CURRENT_COMMIT := d5feb2b1f12a15c1a9bac094a8f6f77d0cfcbdc2
2424

2525
CPYTHON_PATH := ../cpython/
2626

‎bugs.po‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-08-24 09:01+0200\n"
8+
"POT-Creation-Date: 2021-09-23 16:16+0200\n"
99
"PO-Revision-Date: 2021-05-26 23:13+0200\n"
1010
"Last-Translator: Antoine Wecxsteen\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -114,9 +114,10 @@ msgid "Using the Python issue tracker"
114114
msgstr "Utilisation du gestionnaire de tickets Python"
115115

116116
#: bugs.rst:43
117+
#, fuzzy
117118
msgid ""
118119
"Bug reports for Python itself should be submitted via the Python Bug Tracker "
119-
"(https://bugs.python.org/). The bug tracker offers a Web form which allows "
120+
"(https://bugs.python.org/). The bug tracker offers a web form which allows "
120121
"pertinent information to be entered and submitted to the developers."
121122
msgstr ""
122123
"Les rapports de bogues pour Python lui-même devraient être soumis via le "
@@ -220,9 +221,10 @@ msgstr ""
220221
"est utile."
221222

222223
#: bugs.rst:84
224+
#, fuzzy
223225
msgid ""
224-
"`Bug Report Writing Guidelines <https://developer.mozilla.org/en-US/docs/"
225-
"Mozilla/QA/Bug_writing_guidelines>`_"
226+
"`Bug Writing Guidelines <https://bugzilla.mozilla.org/page.cgi?id=bug-"
227+
"writing.html>`_"
226228
msgstr ""
227229
"`Guide pour la rédaction de rapports de bogues <https://developer.mozilla."
228230
"org/en-US/docs/Mozilla/QA/Bug_writing_guidelines>`_"

‎c-api/apiabiversion.po‎

Lines changed: 133 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2020-08-24 09:01+0200\n"
8+
"POT-Creation-Date: 2021-09-23 16:16+0200\n"
99
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -20,101 +20,181 @@ msgstr "Version des API et ABI"
2020

2121
#: c-api/apiabiversion.rst:9
2222
msgid ""
23-
"``PY_VERSION_HEX`` is the Python version number encoded in a single integer."
23+
"CPython exposes its version number in the following macros. Note that these "
24+
"correspond to the version code is **built** with, not necessarily the "
25+
"version used at **run time**."
26+
msgstr ""
27+
28+
#: c-api/apiabiversion.rst:13
29+
msgid ""
30+
"See :ref:`stable` for a discussion of API and ABI stability across versions."
31+
msgstr ""
32+
33+
#: c-api/apiabiversion.rst:17
34+
#, fuzzy
35+
msgid "The ``3`` in ``3.4.1a2``."
36+
msgstr "``PY_MAJOR_VERSION`` (le ``3`` dans ``3.4.1a2``)"
37+
38+
#: c-api/apiabiversion.rst:21
39+
#, fuzzy
40+
msgid "The ``4`` in ``3.4.1a2``."
41+
msgstr "``PY_MINOR_VERSION`` (le ``4`` dans ``3.4.1a2``)"
42+
43+
#: c-api/apiabiversion.rst:25
44+
#, fuzzy
45+
msgid "The ``1`` in ``3.4.1a2``."
46+
msgstr "``PY_MICRO_VERSION`` (le ``1`` dans ``3.4.1a2``)"
47+
48+
#: c-api/apiabiversion.rst:29
49+
#, fuzzy
50+
msgid ""
51+
"The ``a`` in ``3.4.1a2``. This can be ``0xA`` for alpha, ``0xB`` for beta, "
52+
"``0xC`` for release candidate or ``0xF`` for final."
53+
msgstr ""
54+
"``PY_RELEASE_LEVEL`` (``0xA`` pour alpha, ``0xB`` pour bêta, ``0xC`` pour "
55+
"une version candidate et ``0xF`` pour final), dans ce cas c'est alpha."
56+
57+
#: c-api/apiabiversion.rst:35
58+
#, fuzzy
59+
msgid "The ``2`` in ``3.4.1a2``. Zero for final releases."
60+
msgstr ""
61+
"``PY_RELEASE_SERIAL`` (le ``2`` au ``3.4.1a2``, zéro pour des versions "
62+
"finales)"
63+
64+
#: c-api/apiabiversion.rst:39
65+
#, fuzzy
66+
msgid "The Python version number encoded in a single integer."
2467
msgstr ""
2568
"``PY_VERSION_HEX`` est le numéro de version de Python encodé en un seul "
2669
"entier."
2770

28-
#: c-api/apiabiversion.rst:11
71+
#: c-api/apiabiversion.rst:41
72+
#, fuzzy
2973
msgid ""
30-
"For example if the ``PY_VERSION_HEX`` is set to ``0x030401a2``, the "
31-
"underlying version information can be found by treating it as a 32 bit "
74+
"The underlying version information can be found by treating it as a 32 bit "
3275
"number in the following manner:"
3376
msgstr ""
3477
"Par exemple si le ``PY_VERSION_HEX` est défini à ``0x030401a2``, la "
3578
"version d'information sous-jacente peut être trouvée en la traitant comme un "
3679
"nombre sous 32 bits de la manière suivante:"
3780

38-
#: c-api/apiabiversion.rst:16
81+
#: c-api/apiabiversion.rst:45
3982
msgid "Bytes"
4083
msgstr "Bytes"
4184

42-
#: c-api/apiabiversion.rst:16
85+
#: c-api/apiabiversion.rst:45
4386
msgid "Bits (big endian order)"
4487
msgstr "Bits (ordre gros-boutiste)"
4588

46-
#: c-api/apiabiversion.rst:16
89+
#: c-api/apiabiversion.rst:45
4790
msgid "Meaning"
4891
msgstr "Signification"
4992

50-
#: c-api/apiabiversion.rst:18
51-
msgid "``1``"
52-
msgstr "``1``"
93+
#: c-api/apiabiversion.rst:45
94+
msgid "Value for ``3.4.1a2``"
95+
msgstr ""
96+
97+
#: c-api/apiabiversion.rst:47
98+
msgid "1"
99+
msgstr ""
53100

54-
#: c-api/apiabiversion.rst:18
55-
msgid "``1-8``"
101+
#: c-api/apiabiversion.rst:47
102+
#, fuzzy
103+
msgid "1-8"
56104
msgstr "``1-8``"
57105

58-
#: c-api/apiabiversion.rst:18
59-
msgid "``PY_MAJOR_VERSION`` (the ``3`` in ``3.4.1a2``)"
60-
msgstr "``PY_MAJOR_VERSION`` (le ``3`` dans ``3.4.1a2``)"
106+
#: c-api/apiabiversion.rst:47
107+
msgid "``PY_MAJOR_VERSION``"
108+
msgstr ""
61109

62-
#: c-api/apiabiversion.rst:21
63-
msgid "``2``"
64-
msgstr "``2``"
110+
#: c-api/apiabiversion.rst:47
111+
msgid "``0x03``"
112+
msgstr ""
65113

66-
#: c-api/apiabiversion.rst:21
67-
msgid "``9-16``"
114+
#: c-api/apiabiversion.rst:49
115+
msgid "2"
116+
msgstr ""
117+
118+
#: c-api/apiabiversion.rst:49
119+
#, fuzzy
120+
msgid "9-16"
68121
msgstr "``9-16``"
69122

70-
#: c-api/apiabiversion.rst:21
71-
msgid "``PY_MINOR_VERSION`` (the ``4`` in ``3.4.1a2``)"
72-
msgstr "``PY_MINOR_VERSION`` (le ``4`` dans ``3.4.1a2``)"
123+
#: c-api/apiabiversion.rst:49
124+
msgid "``PY_MINOR_VERSION``"
125+
msgstr ""
126+
127+
#: c-api/apiabiversion.rst:49
128+
msgid "``0x04``"
129+
msgstr ""
73130

74-
#: c-api/apiabiversion.rst:24
75-
msgid "``3``"
76-
msgstr "``3``"
131+
#: c-api/apiabiversion.rst:51
132+
msgid "3"
133+
msgstr ""
77134

78-
#: c-api/apiabiversion.rst:24
79-
msgid "``17-24``"
135+
#: c-api/apiabiversion.rst:51
136+
#, fuzzy
137+
msgid "17-24"
80138
msgstr "``17-24``"
81139

82-
#: c-api/apiabiversion.rst:24
83-
msgid "``PY_MICRO_VERSION`` (the ``1`` in ``3.4.1a2``)"
84-
msgstr "``PY_MICRO_VERSION`` (le ``1`` dans ``3.4.1a2``)"
140+
#: c-api/apiabiversion.rst:51
141+
msgid "``PY_MICRO_VERSION``"
142+
msgstr ""
85143

86-
#: c-api/apiabiversion.rst:27
87-
msgid "``4``"
88-
msgstr "``4``"
144+
#: c-api/apiabiversion.rst:51
145+
msgid "``0x01``"
146+
msgstr ""
89147

90-
#: c-api/apiabiversion.rst:27
91-
msgid "``25-28``"
148+
#: c-api/apiabiversion.rst:53
149+
msgid "4"
150+
msgstr ""
151+
152+
#: c-api/apiabiversion.rst:53
153+
#, fuzzy
154+
msgid "25-28"
92155
msgstr "``25-28``"
93156

94-
#: c-api/apiabiversion.rst:27
95-
msgid ""
96-
"``PY_RELEASE_LEVEL`` (``0xA`` for alpha, ``0xB`` for beta, ``0xC`` for "
97-
"release candidate and ``0xF`` for final), in this case it is alpha."
157+
#: c-api/apiabiversion.rst:53
158+
msgid "``PY_RELEASE_LEVEL``"
159+
msgstr ""
160+
161+
#: c-api/apiabiversion.rst:53
162+
msgid "``0xA``"
98163
msgstr ""
99-
"``PY_RELEASE_LEVEL`` (``0xA`` pour alpha, ``0xB`` pour bêta, ``0xC`` pour "
100-
"une version candidate et ``0xF`` pour final), dans ce cas c'est alpha."
101164

102-
#: c-api/apiabiversion.rst:32
103-
msgid "``29-32``"
165+
#: c-api/apiabiversion.rst:55
166+
#, fuzzy
167+
msgid "29-32"
104168
msgstr "``29-32``"
105169

106-
#: c-api/apiabiversion.rst:32
107-
msgid ""
108-
"``PY_RELEASE_SERIAL`` (the ``2`` in ``3.4.1a2``, zero for final releases)"
170+
#: c-api/apiabiversion.rst:55
171+
msgid "``PY_RELEASE_SERIAL``"
109172
msgstr ""
110-
"``PY_RELEASE_SERIAL`` (le ``2`` au ``3.4.1a2``, zéro pour des versions "
111-
"finales)"
112173

113-
#: c-api/apiabiversion.rst:36
114-
msgid "Thus ``3.4.1a2`` is hexversion ``0x030401a2``."
174+
#: c-api/apiabiversion.rst:55
175+
msgid "``0x2``"
176+
msgstr ""
177+
178+
#: c-api/apiabiversion.rst:58
179+
#, fuzzy
180+
msgid ""
181+
"Thus ``3.4.1a2`` is hexversion ``0x030401a2`` and ``3.10.0`` is hexversion "
182+
"``0x030a00f0``."
115183
msgstr "Ainsi ``3.4.1a2`` est une hexane-version ``0x030401a2``."
116184

117-
#: c-api/apiabiversion.rst:38
185+
#: c-api/apiabiversion.rst:62
118186
msgid "All the given macros are defined in :source:`Include/patchlevel.h`."
119187
msgstr ""
120188
"Toutes les macros données sont définies dans :source:`Include/patchlevel.h`."
189+
190+
#~ msgid "``1``"
191+
#~ msgstr "``1``"
192+
193+
#~ msgid "``2``"
194+
#~ msgstr "``2``"
195+
196+
#~ msgid "``3``"
197+
#~ msgstr "``3``"
198+
199+
#~ msgid "``4``"
200+
#~ msgstr "``4``"

0 commit comments

Comments
 (0)