C'est encore un `merge.py 3.11` sans intervention manuelle : j'essaye de tenir la 3.11 à jour à l'approche de la PyConFr. Reviewed-on: #25 Co-authored-by: Julien Palard <julien@palard.fr> Co-committed-by: Julien Palard <julien@palard.fr>

Reviewed-on: #29 Co-authored-by: Julien Palard <julien@palard.fr> Co-committed-by: Julien Palard <julien@palard.fr>

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

Co-authored-by: Antoine <43954001+awecx@users.noreply.github.com>

* Correction de typos * Correction de "multiplateformes"

Co-authored-by: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com>

* Make merge * Avoid a newline at each run of merge.py.

* 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.

Automerge of PR #1639 by @JulienPalard #1636 Closes #1636

Automerge of PR #1624 by @Mindiell

Automerge of PR #1555 by @JulienPalard

Automerge of PR #1547 by @Seluj78

Automerge of PR #1517 by @Seluj78

* Simplify Makefile * Enfin bon il sera bien sur PyPI soon™, laissons le. * Garde fou. * Useless, as rm -fr without argument removes nothing. * Don't remove locales/. * Newline at end of file * I don't get what's happening here. * Still don't get it. * I was not sure it was mandatory, now I am. * Ohh my debug was not debugging. * WTF * Ok, it's a Python upgrade... * Update .github/workflows/tests.yml * Update Makefile * Update .github/workflows/tests.yml * Update Makefile * No longer needed.

* Forward porting from 3.8. * Add missing C89.

* translation of 8% of c-api/arg * fix of pospell issues * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Update c-api/arg.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * resolve of conflict * spelling errors + wrapping * suggestions Christophe * retrait tiret entre "lecture" et "seule" * Apply suggestions from code review Co-authored-by: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> Co-authored-by: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> Co-authored-by: Mathieu Dupuy <deronnax@gmail.com>

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)

* Proposition de traduction pour mapping.po * Corrections de fautes de frappe : object=>objet et c:func:=>:c:func: * "supporte" => "prend en charge" dans c-api/ampping.po Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com> * Update c-api/mapping.po Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com> * Update c-api/mapping.po Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com> * correction d'un accord, reformulation pour introduire l'idée de str *temporaire* * Update c-api/mapping.po : liste => tuple Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com> * objet->object en VO * Update c-api/mapping.po : 'tuple'->'n-uplet' ; 'k/v'->'k-v' Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com> * Update c-api/mapping.po Co-Authored-By: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com> * Suppression des commentaires résolus * Suppression des vigules avant les 'et' * Update c-api/mapping.po Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com> * Update c-api/mapping.po correction de la traduction de _slicing_ Co-Authored-By: Antoine <43954001+awecx@users.noreply.github.com> * powrap sur c-api/mapping.po * Correction d'un accord dans c-api/mapping.po et ajout d'une espace Co-authored-by: Antoine <43954001+awecx@users.noreply.github.com> Co-authored-by: Christophe Nanteuil <35002064+christopheNan@users.noreply.github.com>

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