Skip to content

Commit ea58a19

Browse files
JulienPalardJulienPalard
authored
Merge branch '3.10' into programming
2 parents 2670f64 + cce81d7 commit ea58a19

71 files changed

Lines changed: 3513 additions & 50867 deletions

Some content is hidden

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

‎CONTRIBUTING.rst‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,12 +316,17 @@ Vous pouvez utiliser `potodo`_, un outil fait pour trouver des fichiers *po*
316316
à traduire. Une fois installé, utilisez la commande ``make todo`` dans votre clone
317317
local.
318318

319-
Vous pouvez choisir n'importe quel fichier non réservé dans la liste
320-
renvoyée par la commande **à l'exception** des fichiers de :
319+
Vous pouvez choisir n'importe quel fichier non réservé dans la liste renvoyée.
320+
Elle contient tous les fichiers qui ne sont pas encore complètement traduits, à
321+
l'exception des fichiers de :
321322

322323
- *c-api/* car c'est une partie très technique ;
323-
- *whatsnew/* car les anciennes versions de Python sont pour la plupart obsolètes et leurs journaux de modifications ne sont pas les pages les plus consultées ;
324-
- *distutils/* et *install/* car ces pages seront bientôt obsolètes.
324+
- *whatsnew/* car les anciennes versions de Python sont pour la plupart
325+
obsolètes et leurs journaux de modifications ne sont pas les pages les plus
326+
consultées ;
327+
- *distutils/*, *install/*, et quelques autres parties qui seront bientôt
328+
obsolètes. De manière générale, il n'est pas utile de traduire un module que
329+
sa documentation mentionne comme obsolète.
325330

326331
Vous pouvez commencer par des tâches faciles comme réviser les entrées
327332
*fuzzy* pour aider à garder la documentation à jour (trouvez-les à l'aide

‎Makefile‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# - make verifs # To check for correctness: wrapping, spelling
88
# - make wrap # To check for wrapping
99
# - make spell # To check for spelling
10-
# - make merge # To merge pot from upstream
10+
# - make clean # To remove build artifacts
1111
# - make fuzzy # To find fuzzy strings
1212
#
1313
# Modes are: autobuild-stable, autobuild-dev, and autobuild-html,
@@ -20,12 +20,21 @@
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 := d5feb2b1f12a15c1a9bac094a8f6f77d0cfcbdc2
23+
CPYTHON_CURRENT_COMMIT := 00ddc1fbd7296ffe066077194a895b175cca26de
24+
2425

2526
LANGUAGE := fr
2627
BRANCH := 3.10
2728

28-
EXCLUDED := whatsnew/ c-api/
29+
EXCLUDED := \
30+
whatsnew/ \
31+
c-api/ \
32+
distutils/ \
33+
install/ \
34+
library/2to3.po \
35+
library/distutils.po \
36+
library/imp.po \
37+
library/tkinter.tix \
2938

3039
# Internal variables
3140

@@ -119,32 +128,10 @@ fuzzy: ensure_prerequisites
119128
.PHONY: verifs
120129
verifs: wrap spell
121130

122-
.PHONY: merge
123-
merge: ensure_prerequisites
124-
@echo "Merge from $(UPSTREAM)"
125-
git -C venv/cpython/ checkout $(BRANCH)
126-
git -C venv/cpython/ pull --ff-only
127-
(cd venv/cpython/Doc; sphinx-build -Q -b gettext -D gettext_compact=0 . ../pot)
128-
find venv/cpython/pot/ -name '*.pot' |\
129-
while read -r POT; \
130-
do \
131-
PO="./$$(echo "$$POT" | sed "s#venv/cpython/pot/##; s#\.pot\$$#.po#")"; \
132-
mkdir -p "$$(dirname "$$PO")"; \
133-
if [ -f "$$PO" ]; \
134-
then \
135-
msgmerge --backup=off --force-po -U "$$PO" "$$POT"; \
136-
else \
137-
msgcat -o "$$PO" "$$POT"; \
138-
fi \
139-
done
140-
rm -fr venv/cpython/pot/
141-
sed -i 's|^#: .*Doc/|#: |' *.po */*.po
142-
powrap -m
143-
@printf "\n%s %s\n" "Replace CPYTHON_CURRENT_COMMIT in Makefile by: " $(shell git -C venv/cpython/ rev-parse HEAD)
144-
@printf 'To add, you can use:\n git status -s | grep "^ M .*\.po" | cut -d" " -f3 | while read -r file; do if [ $$(git diff "$$file" | wc -l) -gt 13 ]; then git add "$$file"; fi ; done\n'
145-
146131
.PHONY: clean
147132
clean:
148133
@echo "Cleaning *.mo and $(POSPELL_TMP_DIR)"
149134
rm -fr $(POSPELL_TMP_DIR)
150135
find -name '*.mo' -delete
136+
@echo "Cleaning build directory"
137+
$(MAKE) -C venv/cpython/Doc/ clean

‎c-api/call.po‎

Lines changed: 2 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-10-01 16:00+0200\n"
8+
"POT-Creation-Date: 2021-10-21 15:04+0200\n"
99
"PO-Revision-Date: 2020-07-20 15:07+0200\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -250,7 +250,7 @@ msgstr ""
250250
msgid ""
251251
"Various functions are available for calling a Python object. Each converts "
252252
"its arguments to a convention supported by the called object – either "
253-
"*tp_call* or vectorcall. In order to do as litle conversion as possible, "
253+
"*tp_call* or vectorcall. In order to do as little conversion as possible, "
254254
"pick one that best fits the format of data you have available."
255255
msgstr ""
256256

‎c-api/decimal.po‎

Lines changed: 0 additions & 210 deletions
This file was deleted.

‎c-api/init_config.po‎

Lines changed: 3 additions & 3 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: 2021-09-23 16:16+0200\n"
8+
"POT-Creation-Date: 2021-10-21 15:04+0200\n"
99
"PO-Revision-Date: 2019-09-04 11:42+0200\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -42,7 +42,7 @@ msgid ""
4242
"The :ref:`Isolated Configuration <init-isolated-conf>` can be used to embed "
4343
"Python into an application. It isolates Python from the system. For example, "
4444
"environments variables are ignored, the LC_CTYPE locale is left unchanged "
45-
"and no signal handler is registred."
45+
"and no signal handler is registered."
4646
msgstr ""
4747

4848
#: c-api/init_config.rst:27
@@ -870,7 +870,7 @@ msgstr ""
870870

871871
#: c-api/init_config.rst:699
872872
msgid ""
873-
"At Python statup, the encoding name is normalized to the Python codec name. "
873+
"At Python startup, the encoding name is normalized to the Python codec name. "
874874
"For example, ``\"ANSI_X3.4-1968\"`` is replaced with ``\"ascii\"``."
875875
msgstr ""
876876

0 commit comments

Comments
 (0)