Skip to content

Translations: Add guide on merging back in translations - #1700

Merged
willingc merged 2 commits into
python:mainfrom
StanFromIreland:translation/merge-mania
Apr 16, 2026
Merged

Translations: Add guide on merging back in translations#1700
willingc merged 2 commits into
python:mainfrom
StanFromIreland:translation/merge-mania

Conversation

@StanFromIreland

@StanFromIreland StanFromIreland commented Nov 24, 2025

Copy link
Copy Markdown
Member

For #1697


📚 Documentation preview 📚: https://cpython-devguide--1700.org.readthedocs.build/

Then, merge translations from a specific commit (replace :samp:`{COMMIT_HASH}`
with the commit hash from before the files were moved):

.. TODO: Provide Windows instructions.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would greatly appreciate if someone could do this bit, since I don't have a clue:-)

This comment was marked as spam.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@StanFromIreland I'm not sure either. I like the overall changes of this PR. Nice work. Let's land as is and address at a later time. Thanks.

@StanFromIreland StanFromIreland linked an issue Nov 24, 2025 that may be closed by this pull request
2 tasks

@m-aciek m-aciek left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me 👍

I think there are also offline translation memory tools that potentially people could use, so I would consider rephrasing the first paragraph for more general note that this is a workaround for lack of translation memory system.

Then, merge translations from a specific commit (replace :samp:`{COMMIT_HASH}`
with the commit hash from before the files were moved):

.. TODO: Provide Windows instructions.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@StanFromIreland I'm not sure either. I like the overall changes of this PR. Nice work. Let's land as is and address at a later time. Thanks.

@willingc
willingc merged commit ce80d85 into python:main Apr 16, 2026
5 checks passed
@StanFromIreland
StanFromIreland deleted the translation/merge-mania branch April 16, 2026 16:11
@StanFromIreland

Copy link
Copy Markdown
Member Author

Thanks Carol and Maciej :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

4 participants