Skip to content

added translations #2600

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.

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

Merged
merged 2 commits into from
Feb 13, 2020
Merged

added translations #2600

merged 2 commits into from
Feb 13, 2020

Conversation

hexthat
Copy link

@hexthat hexthat commented Feb 7, 2020

just added missing translations

Copy link
Member

@tannewt tannewt left a comment

Choose a reason for hiding this comment

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

Thank you! Unfortunately it looks like it needs to be merged with the latest changes before we can merge this PR.

@hexthat
Copy link
Author

hexthat commented Feb 9, 2020

think it has latest at line 682

@dhalbert
Copy link
Collaborator

dhalbert commented Feb 10, 2020

Try git fetch from upstream (adafruit/circuitpython), then git merge, then do a make translate and push again.

@hexthat
Copy link
Author

hexthat commented Feb 10, 2020

Try git fetch from upstream (adafruit/circuitpython), then git merge, then do a make translate and push again.

I only use the a firefox web browser for github. I don't see those options.

@hexthat
Copy link
Author

hexthat commented Feb 10, 2020

I tried "Compare" between "Adafruit/circuitpython" and "hexthat/circuitpython" only 1 file changed.

@dhalbert
Copy link
Collaborator

dhalbert commented Feb 10, 2020

It's hard to do ion the GitHub website, because the translation files get all scrambled. Would it be hard for you to start a new PR and make your change on that?

@tannewt
Copy link
Member

tannewt commented Feb 10, 2020

@hexthat I'll do the merge and push your branch. Thanks!

just added missing translations
@tannewt
Copy link
Member

tannewt commented Feb 12, 2020

Ok, I think it should be ok now.

@hexthat any time you start adding more translations please start with https://github.com/adafruit/circuitpython/blob/master/locale/zh_Latn_pinyin.po, click the pencil edit icon and then commit to a new branch. I think these changes were confused because the commit was done on an old version of master rather than the latest.

Thanks!

Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

Thank you both!

@dhalbert dhalbert merged commit bfadcdb into adafruit:master Feb 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants