J'ai juste exécuté `python merge.py 3.11`. Reviewed-on: AFPy/python-docs-fr#21 Co-authored-by: Julien Palard <julien@palard.fr> Co-committed-by: Julien Palard <julien@palard.fr>

Automerge of PR #1821 by @Seluj78

* Make merge * Move merge to its own script. * No longer needed. * Use git ls-files.

* Make merge * FIX: spelling for pospell. * Uniformisation des entêtes po.

import polib import pathlib def check(file): pofile = polib.pofile(file) for entry in pofile: if not entry.msgstr: continue if entry.msgid.endswith(" ::"): entry.msgstr = entry.msgstr.rstrip(": \u202f\u00A0") + " ::" if entry.msgid.endswith("::") and not entry.msgid.endswith(" ::"): entry.msgstr = entry.msgstr.rstrip(": ,. \u202f\u00A0") + "\u00A0::" pofile.save() for file in pathlib.Path(".").glob("*.po"): check(file) for file in pathlib.Path(".").glob("*/*.po"): check(file)

* make merge from cpython:25ce77dd2455abbb6e2c9e055bbc98954642fa7c * Fixed silly fuzzies for CI * More make merge from my PRs

sed -i 's/ : ::"/ ::"/g' **/*.po

* pomerge * Proofreading latest fuzzy strings. * FIX: Orth.

* Disambiguate option/paramètre to avoid using flags in french. * pospell on a few directories. * FIX differences between my Hunspell version and travis one. * Nice try. * Hunspell 1.3.2, please. * FIX feedback from Christophe. * De mieux en mieux.

Checked using and some manual proofreading: def check_entry(po_file, entry): if entry.msgid.endswith(' ::'): return if entry.msgid.endswith('::'): if entry.msgstr.endswith(': ::'): return entry.msgstr = entry.msgstr.rstrip(' :. ') + ' ::'