Skip to content

Commit 20eba35

Browse files
authored
Make merge (#1912)
* Make merge * Try to have the same build locally to reproduce an issue.
1 parent 900b889 commit 20eba35

File tree

213 files changed

+16023
-13622
lines changed

Some content is hidden

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

213 files changed

+16023
-13622
lines changed

.github/workflows/tests.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,18 @@ jobs:
6666
runs-on: ubuntu-latest
6767
timeout-minutes: 30
6868
steps:
69-
- uses: actions/checkout@v2
70-
- uses: actions/cache@v2
69+
- uses: actions/checkout@v3
70+
- uses: actions/cache@v3
7171
with:
7272
path: '~/cpython/'
7373
key: '1'
74-
- uses: actions/setup-python@v2
74+
- uses: actions/cache@v3
7575
with:
76-
python-version: '3.9'
76+
path: ~/.cache/pip
77+
key: '1'
78+
- uses: actions/setup-python@v4
79+
with:
80+
python-version: '3.10'
7781
- name: Clone cpython
7882
run: |
7983
if [ ! -d ~/cpython ]; then
@@ -88,9 +92,7 @@ jobs:
8892
git -C ~/cpython checkout $(grep ^CPYTHON_CURRENT_COMMIT Makefile| cut -d= -f2)
8993
- name: Prepare venv
9094
run: |
91-
# If the venv exists but is broken, drop it (happens on Python upgrades):
92-
# see https://github.com/actions/setup-python/issues/170
93-
[ -d $HOME/cpython/Doc/venv/bin/ -a ! -e $HOME/cpython/Doc/venv/bin/python ] && rm -fr $HOME/cpython/Doc/venv
95+
make -C $HOME/cpython/Doc clean-venv
9496
make -C $HOME/cpython/Doc venv
9597
- name: sphinx-build
9698
run: make -C $HOME/cpython/Doc SPHINXOPTS="-q -j4 -D locale_dirs=$HOME/locales -D language=fr -D gettext_compact=0" autobuild-dev-html

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 := 3c2a1e7f4af3c5c54e04dfe9ac3a68d2351b00fb
23+
CPYTHON_CURRENT_COMMIT := b2db1c208066b67bdf57bf3799de50352fe63416
2424
LANGUAGE := fr
2525
BRANCH := 3.10
2626

about.po

Lines changed: 3 additions & 2 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: 2022-05-21 16:37+0200\n"
8+
"POT-Creation-Date: 2022-10-18 15:46+0200\n"
99
"PO-Revision-Date: 2022-07-08 17:54+0200\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -52,8 +52,9 @@ msgstr ""
5252
"et rédacteur de la plupart de son contenu ;"
5353

5454
#: about.rst:24
55+
#, fuzzy
5556
msgid ""
56-
"the `Docutils <http://docutils.sourceforge.net/>`_ project for creating "
57+
"the `Docutils <https://docutils.sourceforge.io/>`_ project for creating "
5758
"reStructuredText and the Docutils suite;"
5859
msgstr ""
5960
"le projet `Docutils <http://docutils.sourceforge.net/>`_ pour avoir créé "

bugs.po

Lines changed: 52 additions & 38 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: 2022-05-21 16:37+0200\n"
8+
"POT-Creation-Date: 2022-10-18 15:46+0200\n"
99
"PO-Revision-Date: 2022-07-08 17:50+0200\n"
1010
"Last-Translator: Jean Abou Samra <jean@abou-samra.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -130,25 +130,28 @@ msgid "Using the Python issue tracker"
130130
msgstr "Utilisation du gestionnaire de tickets Python"
131131

132132
#: bugs.rst:47
133+
#, fuzzy
133134
msgid ""
134-
"Bug reports for Python itself should be submitted via the Python Bug Tracker "
135-
"(https://bugs.python.org/). The bug tracker offers a web form which allows "
136-
"pertinent information to be entered and submitted to the developers."
135+
"Issue reports for Python itself should be submitted via the GitHub issues "
136+
"tracker (https://github.com/python/cpython/issues). The GitHub issues "
137+
"tracker offers a web form which allows pertinent information to be entered "
138+
"and submitted to the developers."
137139
msgstr ""
138140
"Les rapports de bogues pour Python lui-même devraient être soumis via le "
139141
"l'outil de suivi des bogues (*Bug Tracker Python* — http://bugs.python."
140142
"org/). Le gestionnaire de tickets propose un formulaire Web permettant de "
141143
"saisir des informations pertinentes à soumettre aux développeurs."
142144

143-
#: bugs.rst:51
145+
#: bugs.rst:52
146+
#, fuzzy
144147
msgid ""
145148
"The first step in filing a report is to determine whether the problem has "
146149
"already been reported. The advantage in doing so, aside from saving the "
147-
"developers time, is that you learn what has been done to fix it; it may be "
150+
"developers' time, is that you learn what has been done to fix it; it may be "
148151
"that the problem has already been fixed for the next release, or additional "
149152
"information is needed (in which case you are welcome to provide it if you "
150-
"can!). To do this, search the bug database using the search box on the top "
151-
"of the page."
153+
"can!). To do this, search the tracker using the search box at the top of the "
154+
"page."
152155
msgstr ""
153156
"La première étape pour remplir un rapport est de déterminer si le problème a "
154157
"déjà été rapporté. L'avantage de cette approche, en plus d'économiser du "
@@ -158,13 +161,13 @@ msgstr ""
158161
"contribution est la bienvenue !). Pour ce faire, cherchez dans la base de "
159162
"données de bogues grâce à la boîte de recherche en haut de la page."
160163

161-
#: bugs.rst:58
164+
#: bugs.rst:59
165+
#, fuzzy
162166
msgid ""
163-
"If the problem you're reporting is not already in the bug tracker, go back "
164-
"to the Python Bug Tracker and log in. If you don't already have a tracker "
165-
"account, select the \"Register\" link or, if you use OpenID, one of the "
166-
"OpenID provider logos in the sidebar. It is not possible to submit a bug "
167-
"report anonymously."
167+
"If the problem you're reporting is not already in the list, log in to "
168+
"GitHub. If you don't already have a GitHub account, create a new account "
169+
"using the \"Sign up\" link. It is not possible to submit a bug report "
170+
"anonymously."
168171
msgstr ""
169172
"Si le problème que vous soumettez n'est pas déjà dans l'outil de suivi des "
170173
"bogues, revenez au *Python Bug Tracker* et connectez-vous. Si vous n'avez "
@@ -173,29 +176,27 @@ msgstr ""
173176
"dans la barre latérale. Il n'est pas possible de soumettre un rapport de "
174177
"bogue de manière anonyme."
175178

176-
#: bugs.rst:63
179+
#: bugs.rst:64
180+
#, fuzzy
177181
msgid ""
178-
"Being now logged in, you can submit a bug. Select the \"Create New\" link "
179-
"in the sidebar to open the bug reporting form."
182+
"Being now logged in, you can submit an issue. Click on the \"New issue\" "
183+
"button in the top bar to report a new issue."
180184
msgstr ""
181185
"Une fois identifié, pour pouvez rapporter un bogue. Sélectionnez le lien "
182186
"*Create New* dans la barre latérale pour ouvrir un nouveau formulaire de "
183187
"rapport de bogue."
184188

185-
#: bugs.rst:66
189+
#: bugs.rst:67
190+
msgid "The submission form has two fields, \"Title\" and \"Comment\"."
191+
msgstr ""
192+
193+
#: bugs.rst:69
186194
msgid ""
187-
"The submission form has a number of fields. For the \"Title\" field, enter "
188-
"a *very* short description of the problem; less than ten words is good. In "
189-
"the \"Type\" field, select the type of your problem; also select the "
190-
"\"Component\" and \"Versions\" to which the bug relates."
195+
"For the \"Title\" field, enter a *very* short description of the problem; "
196+
"less than ten words is good."
191197
msgstr ""
192-
"Le formulaire de soumission a un certain nombre de champs. Pour le champ "
193-
"« Titre », saisissez une *très* courte description du problème ; moins de "
194-
"dix mots est approprié. Dans le champ « Type », sélectionnez le type de "
195-
"problème ; sélectionnez aussi « Composant » et « Versions » en rapport avec "
196-
"le bogue."
197198

198-
#: bugs.rst:71
199+
#: bugs.rst:72
199200
msgid ""
200201
"In the \"Comment\" field, describe the problem in detail, including what you "
201202
"expected to happen and what did happen. Be sure to include whether any "
@@ -208,25 +209,26 @@ msgstr ""
208209
"plateforme matérielle et logicielle vous utilisiez (en incluant les "
209210
"informations de versions)."
210211

211-
#: bugs.rst:76
212+
#: bugs.rst:77
213+
#, fuzzy
212214
msgid ""
213-
"Each bug report will be assigned to a developer who will determine what "
214-
"needs to be done to correct the problem. You will receive an update each "
215-
"time action is taken on the bug."
215+
"Each issue report will be reviewed by a developer who will determine what "
216+
"needs to be done to correct the problem. You will receive an update each "
217+
"time an action is taken on the issue."
216218
msgstr ""
217219
"Chaque bogue sera attribué à un développeur qui déterminera ce qui est "
218220
"nécessaire d'entreprendre pour corriger le problème. Vous recevrez une "
219221
"notification à chaque action effectuée sur le bogue."
220222

221-
#: bugs.rst:85
223+
#: bugs.rst:86
222224
msgid ""
223225
"`How to Report Bugs Effectively <https://www.chiark.greenend.org.uk/"
224226
"~sgtatham/bugs.html>`_"
225227
msgstr ""
226228
"`Comment signaler des bogues de manière efficace <https://www.chiark."
227229
"greenend.org.uk/~sgtatham/bugs.html>`_ (en anglais)"
228230

229-
#: bugs.rst:84
231+
#: bugs.rst:85
230232
msgid ""
231233
"Article which goes into some detail about how to create a useful bug report. "
232234
"This describes what kind of information is useful and why it is useful."
@@ -235,27 +237,27 @@ msgstr ""
235237
"bogue utile. Il décrit quel genre d'information est utile et pourquoi elle "
236238
"est utile."
237239

238-
#: bugs.rst:88
240+
#: bugs.rst:89
239241
msgid ""
240242
"`Bug Writing Guidelines <https://bugzilla.mozilla.org/page.cgi?id=bug-"
241243
"writing.html>`_"
242244
msgstr ""
243245
"`Guide pour la rédaction de rapports de bogues <https://bugzilla.mozilla.org/"
244246
"page.cgi?id=bug-writing.html>`_"
245247

246-
#: bugs.rst:88
248+
#: bugs.rst:89
247249
msgid ""
248250
"Information about writing a good bug report. Some of this is specific to "
249251
"the Mozilla project, but describes general good practices."
250252
msgstr ""
251253
"Conseils pour écrire un bon rapport de bogue. Certains sont spécifiques au "
252254
"projet Mozilla mais présentent des bonnes pratiques générales."
253255

254-
#: bugs.rst:94
256+
#: bugs.rst:95
255257
msgid "Getting started contributing to Python yourself"
256258
msgstr "Commencer à contribuer à Python vous-même"
257259

258-
#: bugs.rst:96
260+
#: bugs.rst:97
259261
msgid ""
260262
"Beyond just reporting bugs that you find, you are also welcome to submit "
261263
"patches to fix them. You can find more information on how to get started "
@@ -269,3 +271,15 @@ msgstr ""
269271
"Developer's Guide`_. Si vous avez des questions, le `core-mentorship mailing "
270272
"list`_ est un endroit amical pour obtenir des réponses à toutes les "
271273
"questions à propos du processus de corrections de bugs dans Python."
274+
275+
#~ msgid ""
276+
#~ "The submission form has a number of fields. For the \"Title\" field, "
277+
#~ "enter a *very* short description of the problem; less than ten words is "
278+
#~ "good. In the \"Type\" field, select the type of your problem; also "
279+
#~ "select the \"Component\" and \"Versions\" to which the bug relates."
280+
#~ msgstr ""
281+
#~ "Le formulaire de soumission a un certain nombre de champs. Pour le champ "
282+
#~ "« Titre », saisissez une *très* courte description du problème ; moins de "
283+
#~ "dix mots est approprié. Dans le champ « Type », sélectionnez le type de "
284+
#~ "problème ; sélectionnez aussi « Composant » et « Versions » en rapport "
285+
#~ "avec le bogue."

c-api/allocation.po

Lines changed: 3 additions & 2 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: 2022-10-18 15:46+0200\n"
99
"PO-Revision-Date: 2018-10-20 21:16+0200\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -20,8 +20,9 @@ msgid "Allocating Objects on the Heap"
2020
msgstr "Allouer des objets dans le tas"
2121

2222
#: c-api/allocation.rst:17
23+
#, fuzzy
2324
msgid ""
24-
"Initialize a newly-allocated object *op* with its type and initial "
25+
"Initialize a newly allocated object *op* with its type and initial "
2526
"reference. Returns the initialized object. If *type* indicates that the "
2627
"object participates in the cyclic garbage detector, it is added to the "
2728
"detector's set of observed objects. Other fields of the object are not "

0 commit comments

Comments
 (0)