8000 Mdk/merge (#1734) · python/python-docs-fr@2afee90 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2afee90

Browse files
JulienPalardJulienPalard
authored
Mdk/merge (#1734)
* Make merge * Move merge to its own script. * No longer needed. * Use git ls-files.
1 parent f2d50c8 commit 2afee90

Some content is hidden

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

59 files changed

+3053
-50679
lines changed

‎Makefile

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# - make spell # To check for spelling
1010
# - make clean # To remove build artifacts
1111
# - make fuzzy # To find fuzzy strings
12-
# - make merge # To merge pot from upstream
1312
#
1413
# Modes are: autobuild-stable, autobuild-dev, and autobuild-html,
1514
# documented in gen/src/3.6/Doc/Makefile as we're only delegating the
@@ -21,7 +20,8 @@
2120
# from which we generated our po files. We use it here so when we
2221
# test build, we're building with the .rst files that generated our
2322
# .po files.
24-
CPYTHON_CURRENT_COMMIT := d5feb2b1f12a15c1a9bac094a8f6f77d0cfcbdc2
23+
CPYTHON_CURRENT_COMMIT := 00ddc1fbd7296ffe066077194a895b175cca26de
24+
2525

2626
LANGUAGE := fr
2727
BRANCH := 3.10
@@ -128,30 +128,6 @@ fuzzy: ensure_prerequisites
128128
.PHONY: verifs
129129
verifs: wrap spell
130130

131-
.PHONY: merge
132-
merge: ensure_prerequisites
133-
@echo "Merge from $(UPSTREAM)"
134-
git -C venv/cpython/ checkout $(BRANCH)
135-
git -C venv/cpython/ pull --ff-only
136-
(cd venv/cpython/Doc; sphinx-build -Q -b gettext -D gettext_compact=0 . ../pot)
137-
find venv/cpython/pot/ -name '*.pot' |\
138-
while read -r POT; \
139-
do \
140-
PO="./$$(echo "$$POT" | sed "s#venv/cpython/pot/##; s#\.pot\$$#.po#")"; \
141-
mkdir -p "$$(dirname "$$PO")"; \
142-
if [ -f "$$PO" ]; \
143-
then \
144-
msgmerge --backup=off --force-po -U "$$PO" "$$POT"; \
145-
else \
146-
msgcat -o "$$PO" "$$POT"; \
147-
fi \
148-
done
149-
rm -fr venv/cpython/pot/
150-
sed -i 's|^#: .*Doc/|#: |' *.po */*.po
151-
powrap -m
152-
@printf "\n%s %s\n" "Replace CPYTHON_CURRENT_COMMIT in Makefile by: " $(shell git -C venv/cpython/ rev-parse HEAD)
153-
@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'
154-
155131
.PHONY: clean
156132
clean:
157133
@echo "Cleaning *.mo and $(POSPELL_TMP_DIR)"

‎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

‎distributing/index.po

Lines changed: 7 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: 2021-09-23 16:16+0200\n"
8+
"POT-Creation-Date: 2021-10-21 15:04+0200\n"
99
"PO-Revision-Date: 2021-10-17 19:02+0200\n"
1010
"Last-Translator: Jean Abou Samra <jean@abou-samra.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -77,8 +77,9 @@ msgid "Key terms"
7777
msgstr "Vocabulaire"
7878

7979
#: distributing/index.rst:34
80+
#, fuzzy
8081
msgid ""
81-
"the `Python Packaging Index <https://pypi.org>`__ is a public repository of "
82+
"the `Python Package Index <https://pypi.org>`__ is a public repository of "
8283
"open source licensed packages made available for use by other Python users"
8384
msgstr ""
8485
"le `Python Packaging Index <https://pypi.org/pypi>`__ est un dépôt public de "
@@ -274,7 +275,8 @@ msgstr ""
274275
"project_>`_ ;"
275276

276277
#: distributing/index.rst:130
277-
msgid "`Uploading the project to the Python Packaging Index`_"
278+
#, fuzzy
279+
msgid "`Uploading the project to the Python Package Index`_"
278280
msgstr ""
279281
"`(en) Téléverser le projet sur le Python Packaging Index <Uploading the "
280282
"project to the Python Packaging Index_>`_ ;"
@@ -301,7 +303,8 @@ msgid "This isn't an easy topic, but here are a few tips:"
301303
msgstr "Ce n'est pas un sujet facile, mais voici quelques conseils :"
302304

303305
#: distributing/index.rst:153
304-
msgid "check the Python Packaging Index to see if the name is already in use"
306+
#, fuzzy
307+
msgid "check the Python Package Index to see if the name is already in use"
305308
msgstr "vérifiez dans le *Python Packaging Index* si le nom est déjà utilisé"
306309

307310
#: distributing/index.rst:154

‎faq/design.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: 2021-09-23 16:16+0200\n"
8+
"POT-Creation-Date: 2021-10-21 15:04+0200\n"
99
"PO-Revision-Date: 2021-10-17 18:30+0200\n"
1010
"Last-Translator: Jean Abou Samra <jean@abou-samra.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -1378,11 +1378,12 @@ msgstr ""
13781378
"Pourquoi l'instruction ``with`` ne prend-elle pas en charge les générateurs ?"
13791379

13801380
#: faq/design.rst:714
1381+
#, fuzzy
13811382
msgid ""
13821383
"For technical reasons, a generator used directly as a context manager would "
13831384
"not work correctly. When, as is most common, a generator is used as an "
13841385
"iterator run to completion, no closing is needed. When it is, wrap it as "
1385-
"\"contextlib.closing(generator)\" in the 'with' statment."
1386+
"\"contextlib.closing(generator)\" in the 'with' statement."
13861387
msgstr ""
13871388
"Pour des raisons d'ordre technique, un générateur utilisé directement comme "
13881389
"gestionnaire de contexte ne pourrait pas fonctionner. Dans le cas le plus "

0 commit comments

Comments
 (0)
0