update fork

.gitignore

@@ -1,2 +1,5 @@
 *.mo
 .tx/**/*.po
+venv/
+.idea/
+.DS_Store

.travis.yml

@@ -0,0 +1,11 @@
+language: python
+python: 3.6
+before_install:
+  - sudo apt-get update
+  - sudo apt-get install -y hunspell hunspell-fr-comprehensive
+install:
+  - pip install pospell
+  - pospell --version
+script:
+  - pospell -p dict -l fr_FR **/*.po
+  - make CPYTHON_CLONE=/tmp/cpython/ COMMIT=902196d867

Makefile

@@ -18,38 +18,34 @@ SPHINX_CONF := $(CPYTHON_CLONE)/Doc/conf.py
 LANGUAGE := fr
 VENV := ~/.venvs/python-docs-i18n/
 PYTHON := $(shell which python3)
-MODE := autobuild-dev-html
-BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
-JOBS = 4
+MODE := html
+BRANCH = 3.7
+COMMIT =
+JOBS = auto
 
 
 .PHONY: all
-all: $(VENV)/bin/sphinx-build $(VENV)/bin/blurb $(SPHINX_CONF)
-	mkdir -p $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/
-	ln -nfs $(shell readlink -f .) $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/LC_MESSAGES
-	. $(VENV)/bin/activate; $(MAKE) -C $(CPYTHON_CLONE)/Doc/ SPHINXOPTS='-j$(JOBS) -D locale_dirs=locales -D language=$(LANGUAGE) -D gettext_compact=0 -D latex_engine=xelatex -D latex_elements.inputenc= -D latex_elements.fontenc=' $(MODE)
+all: $(SPHINX_CONF) $(VENV)/bin/activate
+ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
+	$(warning "Your ../cpython checkout may be on the wrong branch, got $(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD) expected $(BRANCH)")
+endif
+	mkdir -p $(CPYTHON_CLONE)/locales/$(LANGUAGE)/
+	ln -nfs $(shell $(PYTHON) -c 'import os; print(os.path.realpath("."))') $(CPYTHON_CLONE)/locales/$(LANGUAGE)/LC_MESSAGES
+	$(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) SPHINXOPTS='-qW -j$(JOBS) -D locale_dirs=../locales -D language=$(LANGUAGE) -D gettext_compact=0 -D latex_engine=xelatex -D latex_elements.inputenc= -D latex_elements.fontenc=' $(MODE)
 
 
 $(SPHINX_CONF):
-	git clone --depth 1 --no-single-branch https://github.com/python/cpython.git $(CPYTHON_CLONE)
-
-
-$(VENV)/bin/activate:
-	mkdir -p $(VENV)
-	$(PYTHON) -m venv $(VENV)
-
+	git clone --depth 1 --branch $(BRANCH) https://github.com/python/cpython.git $(CPYTHON_CLONE)
+	[ -n "$(COMMIT)" ] && (i=1; while ! $$(git -C $(CPYTHON_CLONE) checkout $(COMMIT)); do i=$$((i * 2)); git -C $(CPYTHON_CLONE) fetch --depth $$i; done) || true
 
-$(VENV)/bin/sphinx-build: $(VENV)/bin/activate
-	. $(VENV)/bin/activate; python3 -m pip install sphinx
 
-
-$(VENV)/bin/blurb: $(VENV)/bin/activate
-	. $(VENV)/bin/activate; python3 -m pip install blurb
+.PHONY: upgrade_venv
+upgrade_venv:
+	$(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) venv
 
 
-.PHONY: upgrade_venv
-upgrade_venv: $(VENV)/bin/activate
-	. $(VENV)/bin/activate; python3 -m pip install --upgrade sphinx blurb
+$(VENV)/bin/activate: $(SPHINX_CONF)
+	$(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) venv
 
 
 .PHONY: progress
@@ -59,10 +55,12 @@ progress:
 	$(shell msgcat *.po */*.po | grep -c '^msgid')
 
 
-.PHONY: todo
-todo:
-	for file in *.po */*.po; do echo $$(msgattrib --untranslated $$file | grep ^msgid | sed 1d | wc -l ) $$file; done | grep -v ^0 | sort -gr
+$(VENV)/bin/potodo: $(VENV)/bin/activate
+	$(VENV)/bin/pip install potodo
 
+.PHONY: todo
+todo: $(VENV)/bin/potodo
+	$(VENV)/bin/potodo --github python/python-docs-fr
 
 .PHONY: merge
 merge: upgrade_venv
@@ -89,5 +87,5 @@ endif
 
 
 .PHONY: fuzzy
-fuzzy:
-	for file in *.po */*.po; do echo $$(msgattrib --only-fuzzy --no-obsolete "$$file" | grep -c '#, fuzzy') $$file; done | grep -v ^0 | sort -gr
+fuzzy: $(VENV)/bin/potodo
+	$(VENV)/bin/potodo --github python/python-docs-fr -f

README.rst

@@ -1,7 +1,10 @@
 French Translation of the Python Documentation
 ==============================================
 
-**Translated: 28%**
+.. image:: https://travis-ci.org/python/python-docs-fr.svg?branch=3.7
+  :target: https://travis-ci.org/python/python-docs-fr
+
+**Translated: 36%**
 
 Documentation Contribution Agreement
 ------------------------------------
@@ -71,6 +74,11 @@ Step by step:
     # Add the upstream (the public repository) using HTTPS (won't ask for password):
     git remote add upstream https://github.com/python/python-docs-fr.git
 
+All the translations must be made on the latest release.
+We never translate on an oldest version, by example, the latest python release
+is python 3.7, we don't want to translate directly on the python 3.5 release.
+If needed translations would be backported on the oldest versions by the
+`documentation team <https://www.python.org/dev/peps/pep-8015/#documentation-team>`.
 
 Now you're ready to start a work session, each time you'll start a new task, start here:
 
@@ -83,7 +91,11 @@ Now you're ready to start a work session, each time you'll start a new task, sta
     git checkout -b glossary upstream/3.7
 
     # You can now work on the file, typically using poedit,
-    # then commit your work with a nice explicit message:
+    poedit directory/file.po
+
+    # When everything is clear (syntax errors from Sphinx, html rendering,
+    # semantics, typography),
+    # you can commit your work with a nice explicit message:
     git commit -a -m "Working on glossary."
 
     # Then push your modifications to your github clone,
@@ -93,7 +105,8 @@ Now you're ready to start a work session, each time you'll start a new task, sta
     # it's nice as it's exactly what we want:
     git push origin HEAD
 
-    # Now you can open the pull request on github, just go to
+    # The previous command will print you a link to open a PR on github.
+    # If you missed it, just go to
     # https://github.com/python/python-docs-fr/ and a nice "Compare & pull request"
     # button should appear after a few seconds telling you can ask for a pull request.
 
@@ -120,7 +133,7 @@ You may also have noted you never ever commit on a version branch
 you'll avoid problems.
 
 Before commiting, you should use `grammalecte
-<https://www.dicollecte.org/>`_ to check for your translations.
+<https://grammalecte.net/>`_ to check for your translations.
 
 
 What to translate
@@ -143,6 +156,31 @@ translate untranslated ones (find them using ``make todo``)..
   title.
 
 
+The case of "::"
+~~~~~~~~~~~~~~~~
+
+From the reStructuredText point of view, ``::`` glued at the end of a
+word means "output ``:`` and introduce a code block", but a ``::``
+after a space means "Just introduce a code block".
+
+So in english rst, we see either ``blah blah::`` or ``blah blah. ::``.
+
+In french, we're putting a no-break space before our columns, like:
+``Et voilà :``.
+
+Using no-break space in rst is natural, you'll simply write ``Et
+voilà ::``, as the ``::`` is not precedded by a normal space it
+will output the column and introduce the code block, you're done.
+
+If you don't know how to type a no-break space there's a trick,
+translate column column by space, column, space, column column. the
+"space column" will render your space and your column as french needs,
+and the trailing "space column column" will output nothing and
+introduce the code block. No it does not magically inserts a no-break
+space, so it's still not really valid french. Yes, better learn how to
+type no-break space.
+
+
 Where to get help
 ~~~~~~~~~~~~~~~~~
 
@@ -176,6 +214,10 @@ For consistency in our translations, here are some propositions and
 reminders for frequent terms you'll have to translate, don't hesitate
 to open an issue if you disagree.
 
+To easily find how a term is already translated in our documentation,
+you may use
+`find_in_po.py <https://gist.github.com/JulienPalard/c430ac23446da2081060ab17bf006ac1>`_.
+
 ========================== ===========================================
 Term                       Proposed Translation
 ========================== ===========================================
@@ -188,11 +230,13 @@ bug                        bogue, *bug*
 built-in                   native
 call stack                 pile d'appels
 debugging                  débogage
+deep copy                  copie récursive (préféré), ou copie profonde.
 double quote               guillemet
 e.g.                       e.g. (pour *exempli gratia*)
 garbage collector          ramasse-miettes
 identifier                 identifiant
 immutable                  immuable
+installer                  installateur
 interpreter                interpréteur
 library                    bibliothèque
 list comprehension         liste en compréhension (liste en intension est
@@ -205,14 +249,16 @@ parameter                  paramètre
 prompt                     invite
 raise                      lever
 regular expression         expression rationnelle, expression régulière
-return                     renvoie, donne (On évite
-                           "retourne" qui pourrait porter à confusion.
+return                     renvoie, donne (on évite
+                           "retourne" qui pourrait porter à confusion).
 simple quote               guillemet simple, apostrophe (apostrophe
                            is to glue, guillemet is to surround)
 socket                     *socket*
 statement                  instruction
+subprocess                 sous-processus
 thread                     fil d'exécution
 underscore                 tiret bas, *underscore*
+expression				         expression
 ========================== ===========================================
 
 
@@ -256,7 +302,9 @@ Maintenance
 
 All those snippets are to run from the root of a ``python-docs-fr``
 clone, and some expect to find an up-to-date CPython clone near to it,
-like::
+like:
+
+.. code-block:: bash
 
   ~/
   ├── python-docs-fr/
@@ -299,18 +347,19 @@ Run a test build locally
 Synchronize translation with Transifex
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-You'll need the ``transifex-client`` and ``poindent``
+You'll need the ``transifex-client`` and ``powrap``
 from Pypi.
 
 You'll need to configure ``tx`` via ``tx init`` if not already done.
 
-You should work on a separate ``transifex`` branch.
-
 .. code-block:: bash
 
-   tx pull
-   poindent --modified
+   pomerge --from-files **/*.po
+   tx pull -f
+   pomerge --to-files **/*.po
+   pomerge --from-files **/*.po
+   git checkout -- .
+   pomerge --to-files **/*.po
+   powrap --modified
    git commit -m "tx pull"
-   git checkout 3.6
-   git merge transifex -Xours
-   tx push -t
+   tx push -t -f

TRANSLATORS

@@ -5,3 +5,7 @@ Valentin Lorentz
 Antoine Rozo
 Mohamed Kiouaz
 Hervé Sousset
+Mickaël Bergem
+Vincent Poulailleau
+Jules Lasne
+Mathieu Dupuy

about.po

@@ -6,8 +6,8 @@ msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-04-02 22:11+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2018-07-23 17:55+0200\n"
+"Last-Translator: Julien Palard <julien@palard.fr>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgid ""
 "reStructuredText and the Docutils suite;"
 msgstr ""
 "le projet `Docutils <http://docutils.sourceforge.net/>`_ pour avoir créé "
-"reStructuredText et la suite d'outils Docutils ;"
+"*reStructuredText* et la suite d'outils *Docutils* ;"
 
 #: ../Doc/about.rst:26
 msgid ""
@@ -77,7 +77,7 @@ msgid ""
 "library, and the Python documentation.  See :source:`Misc/ACKS` in the "
 "Python source distribution for a partial list of contributors."
 msgstr ""
-"De nombreuses personnes ont contribué au language Python, à sa librarie "
+"De nombreuses personnes ont contribué au langage Python, à sa bibliothèque "
 "standard et à sa documentation. Consultez :source:`Misc/ACKS` dans les "
 "sources de la distribution Python pour avoir une liste partielle des "
 "contributeurs."

bugs.po

@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-06-28 15:29+0200\n"
-"PO-Revision-Date: 2018-06-28 15:37+0200\n"
+"PO-Revision-Date: 2018-07-31 19:26+0200\n"
 "Last-Translator: \n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
 "Language: fr\n"
@@ -36,7 +36,7 @@ msgid ""
 "ref:`contribute <contributing-to-python>`."
 msgstr ""
 "Il est parfois plus rapide de réparer les bugs soi-même et d'en proposer les "
-"*patch*, ca simplifie le processus et implique moins de monde. Apprenez à :"
+"*patch*, ça simplifie le processus et implique moins de monde. Apprenez à :"
 "ref:`contribuer <contributing-to-python>`."
 
 #: ../Doc/bugs.rst:16
@@ -55,8 +55,8 @@ msgstr ""
 "décrivant en anglais le bogue et où vous l'avez trouvé. Si le problème ne "
 "touche que la traduction en français, ouvrez un ticket sur https://github."
 "com/python/python-docs-fr/issues, ou venez nous en toucher un mot sur le "
-"canal #python-fr sur freenode (https://webchat.freenode.net/). Si vous avez "
-"une suggestion de correction, merci de l'inclure également."
+"canal #python-fr sur *freenode* (https://webchat.freenode.net/). Si vous "
+"avez une suggestion de correction, merci de l'inclure également."
 
 #: ../Doc/bugs.rst:22
 msgid ""
@@ -85,8 +85,8 @@ msgid ""
 "(https://bugs.python.org/).  The bug tracker offers a Web form which allows "
 "pertinent information to be entered and submitted to the developers."
 msgstr ""
-"Les rapports de bugs pour Python lui-même devraient être soumis via le Bug "
-"Tracker Python (http://bugs.python.org/). Le gestionnaire de ticket propose "
+"Les rapports de bugs pour Python lui-même devraient être soumis via le *Bug "
+"Tracker Python* (http://bugs.python.org/). Le gestionnaire de ticket propose "
 "un formulaire Web permettant de saisir des informations pertinentes à "
 "soumettre aux développeurs."
 
@@ -116,20 +116,20 @@ msgid ""
 "OpenID provider logos in the sidebar.  It is not possible to submit a bug "
 "report anonymously."
 msgstr ""
-"Si le problème que vous soumettez n'est pas déjà dans le bug tracker, "
-"revenez au Python Bug Tracker et connectez-vous. Si vous n'avez pas déjà un "
-"compte pour le tracker, cliquez sur le lien \"S'enregistrer\", ou, si vous "
-"utilisez OpenID, sur l'un des logos des fournisseurs OpenID dans la barre "
-"latérale. Il n'est pas possible de soumettre un rapport de bug de manière "
-"anonyme."
+"Si le problème que vous soumettez n'est pas déjà dans le *bug tracker*, "
+"revenez au *Python Bug Tracker* et connectez-vous. Si vous n'avez pas déjà "
+"un compte pour le *tracker*, cliquez sur le lien \"S'enregistrer\", ou, si "
+"vous utilisez *OpenID*, sur l'un des logos des fournisseurs *OpenID* dans la "
+"barre latérale. Il n'est pas possible de soumettre un rapport de bug de "
+"manière anonyme."
 
 #: ../Doc/bugs.rst:51
 msgid ""
 "Being now logged in, you can submit a bug.  Select the \"Create New\" link "
 "in the sidebar to open the bug reporting form."
 msgstr ""
 "Une fois identifié, pour pouvez rapporter un bogue. Sélectionnez le lien "
-"\"Create New\" dans la barre latérale pour ouvrir un nouveau formulaire de "
+"*Create New* dans la barre latérale pour ouvrir un nouveau formulaire de "
 "rapport de bogue."
 
 #: ../Doc/bugs.rst:54

c-api/abstract.po

@@ -5,14 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-02 22:11+0200\n"
-"PO-Revision-Date: 2018-02-15 00:28+0100\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2019-01-03 16:57+0100\n"
+"PO-Revision-Date: 2018-10-17 19:31+0200\n"
+"Last-Translator: \n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 2.2\n"
 
 #: ../Doc/c-api/abstract.rst:7
 msgid "Abstract Objects Layer"