Skip to content

Forward port from 3.6. #1635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
May 19, 2021
Merged

Forward port from 3.6. #1635

merged 1 commit into from
May 19, 2021

Conversation

JulienPalard
Copy link
Member

Je ne sais pas comment c'est passé au travers des mailles du filet, probablement une PR mergée sur 3.6 après le fork de 3.7, il faut qu'on soit plus attentifs à ça.

J'ai fait ça à coup de :

git checkout 3.6
msgmerge --from-files *.po */*.po
git checkout 3.9
msgmerge --no-overwrite --to-files *.po */*.po
powrap -m

@python python deleted a comment from PyDocTeur May 17, 2021
@christopheNan christopheNan mentioned this pull request May 17, 2021
Closed
@christopheNan
Copy link
Contributor

Je propose de ne garder que locale.po, lzma.po, argparse.po et les fichiers de whatsnew.
pospell n'aime pas locale.po ?

@JulienPalard
Copy link
Member Author

Je propose de ne garder que locale.po, lzma.po, argparse.po

Et je fais une autre PR pour les broutilles ? Pourquoi pas.

@JulienPalard JulienPalard force-pushed the forward-porting-from-3-6 branch from ce9ac12 to 550baa9 Compare May 17, 2021 19:31
christopheNan
christopheNan suggested changes May 17, 2021
View reviewed changes
@JulienPalard JulienPalard force-pushed the forward-porting-from-3-6 branch from ff90490 to 87fba34 Compare May 19, 2021 06:27
@JulienPalard JulienPalard force-pushed the forward-porting-from-3-6 branch from 87fba34 to b98ddef Compare May 19, 2021 06:46
@PyDocTeur
Copy link

C'est bien parti ! Ça manque d'un label automerge ?

Disclaimer

Je suis un robot fait par l'équipe de l'AFPy et de Traduction
sur leur temps libre. Je risque de dire des bétises. Ne me blâmez pas, blamez les développeurs.

Code source

I'm a bot made by the Translation and AFPy teams on their free
time. I might say or do dumb things sometimes. Don't blame me, blame the developer !

Source code

(state: approved)
PyDocTeur v1.12.0

@christopheNan christopheNan merged commit 90bb685 into python:3.9 May 19, 2021
@christopheNan
Copy link
Contributor

Merci Julien et très bien vu pour cette traduction qui s'était perdue dans les limbes des changements de versions 💯

@JulienPalard JulienPalard deleted the forward-porting-from-3-6 branch June 7, 2021 13:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christopheNan christopheNan christopheNan approved these changes

Assignees
No one assigned
Labels
meta
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JulienPalard @christopheNan @PyDocTeur