Mdk/merge (#1734)

* Make merge

* Move merge to its own script.

* No longer needed.

* Use git ls-files.

Author: JulienPalard

Makefile

@@ -9,7 +9,6 @@
 # - make spell  # To check for spelling
 # - make clean # To remove build artifacts
 # - make fuzzy  # To find fuzzy strings
-# - make merge  # To merge pot from upstream
 #
 # Modes are: autobuild-stable, autobuild-dev, and autobuild-html,
 # documented in gen/src/3.6/Doc/Makefile as we're only delegating the
@@ -21,7 +20,8 @@
 # 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 := d5feb2b1f12a15c1a9bac094a8f6f77d0cfcbdc2
+CPYTHON_CURRENT_COMMIT := 00ddc1fbd7296ffe066077194a895b175cca26de
+
 
 LANGUAGE := fr
 BRANCH := 3.10
@@ -128,30 +128,6 @@ fuzzy: ensure_prerequisites
 .PHONY: verifs
 verifs: wrap spell
 
-.PHONY: merge
-merge: ensure_prerequisites
-	@echo "Merge from $(UPSTREAM)"
-	git -C venv/cpython/ checkout $(BRANCH)
-	git -C venv/cpython/ pull --ff-only
-	(cd venv/cpython/Doc; sphinx-build -Q -b gettext -D gettext_compact=0 . ../pot)
-	find venv/cpython/pot/ -name '*.pot' |\
-	    while read -r POT; \
-	    do \
-	        PO="./$$(echo "$$POT" | sed "s#venv/cpython/pot/##; s#\.pot\$$#.po#")"; \
-	        mkdir -p "$$(dirname "$$PO")"; \
-	        if [ -f "$$PO" ]; \
-	        then \
-	            msgmerge --backup=off --force-po -U "$$PO" "$$POT"; \
-	        else \
-	            msgcat -o "$$PO" "$$POT"; \
-	        fi \
-	    done
-	rm -fr venv/cpython/pot/
-	sed -i 's|^#: .*Doc/|#: |' *.po */*.po
-	powrap -m
-	@printf "\n%s %s\n" "Replace CPYTHON_CURRENT_COMMIT in Makefile by: " $(shell git -C venv/cpython/ rev-parse HEAD)
-	@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'
-
 .PHONY: clean
 clean:
 	@echo "Cleaning *.mo and $(POSPELL_TMP_DIR)"

c-api/call.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-01 16:00+0200\n"
+"POT-Creation-Date: 2021-10-21 15:04+0200\n"
 "PO-Revision-Date: 2020-07-20 15:07+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -250,7 +250,7 @@ msgstr ""
 msgid ""
 "Various functions are available for calling a Python object. Each converts "
 "its arguments to a convention supported by the called object – either "
-"*tp_call* or vectorcall. In order to do as litle conversion as possible, "
+"*tp_call* or vectorcall. In order to do as little conversion as possible, "
 "pick one that best fits the format of data you have available."
 msgstr ""
 

c-api/decimal.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-23 16:16+0200\n"
+"POT-Creation-Date: 2021-10-21 15:04+0200\n"
 "PO-Revision-Date: 2019-09-04 11:42+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -42,7 +42,7 @@ msgid ""
 "The :ref:`Isolated Configuration <init-isolated-conf>` can be used to embed "
 "Python into an application. It isolates Python from the system. For example, "
 "environments variables are ignored, the LC_CTYPE locale is left unchanged "
-"and no signal handler is registred."
+"and no signal handler is registered."
 msgstr ""
 
 #: c-api/init_config.rst:27
@@ -870,7 +870,7 @@ msgstr ""
 
 #: c-api/init_config.rst:699
 msgid ""
-"At Python statup, the encoding name is normalized to the Python codec name. "
+"At Python startup, the encoding name is normalized to the Python codec name. "
 "For example, ``\"ANSI_X3.4-1968\"`` is replaced with ``\"ascii\"``."
 msgstr ""
 

c-api/init_config.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-23 16:16+0200\n"
+"POT-Creation-Date: 2021-10-21 15:04+0200\n"
 "PO-Revision-Date: 2021-10-17 19:02+0200\n"
 "Last-Translator: Jean Abou Samra <jean@abou-samra.fr>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -77,8 +77,9 @@ msgid "Key terms"
 msgstr "Vocabulaire"
 
 #: distributing/index.rst:34
+#, fuzzy
 msgid ""
-"the `Python Packaging Index <https://pypi.org>`__ is a public repository of "
+"the `Python Package Index <https://pypi.org>`__ is a public repository of "
 "open source licensed packages made available for use by other Python users"
 msgstr ""
 "le `Python Packaging Index <https://pypi.org/pypi>`__ est un dépôt public de "
@@ -274,7 +275,8 @@ msgstr ""
 "project_>`_ ;"
 
 #: distributing/index.rst:130
-msgid "`Uploading the project to the Python Packaging Index`_"
+#, fuzzy
+msgid "`Uploading the project to the Python Package Index`_"
 msgstr ""
 "`(en) Téléverser le projet sur le Python Packaging Index <Uploading the "
 "project to the Python Packaging Index_>`_ ;"
@@ -301,7 +303,8 @@ msgid "This isn't an easy topic, but here are a few tips:"
 msgstr "Ce n'est pas un sujet facile, mais voici quelques conseils :"
 
 #: distributing/index.rst:153
-msgid "check the Python Packaging Index to see if the name is already in use"
+#, fuzzy
+msgid "check the Python Package Index to see if the name is already in use"
 msgstr "vérifiez dans le *Python Packaging Index* si le nom est déjà utilisé"
 
 #: distributing/index.rst:154

distributing/index.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-23 16:16+0200\n"
+"POT-Creation-Date: 2021-10-21 15:04+0200\n"
 "PO-Revision-Date: 2021-10-17 18:30+0200\n"
 "Last-Translator: Jean Abou Samra <jean@abou-samra.fr>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -1378,11 +1378,12 @@ msgstr ""
 "Pourquoi l'instruction ``with`` ne prend-elle pas en charge les générateurs ?"
 
 #: faq/design.rst:714
+#, fuzzy
 msgid ""
 "For technical reasons, a generator used directly as a context manager would "
 "not work correctly.  When, as is most common, a generator is used as an "
 "iterator run to completion, no closing is needed.  When it is, wrap it as "
-"\"contextlib.closing(generator)\" in the 'with' statment."
+"\"contextlib.closing(generator)\" in the 'with' statement."
 msgstr ""
 "Pour des raisons d'ordre technique, un générateur utilisé directement comme "
 "gestionnaire de contexte ne pourrait pas fonctionner. Dans le cas le plus "