Skip to content
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

update zh-cn translation #8185

Closed
wants to merge 36 commits into from
Closed

update zh-cn translation #8185

wants to merge 36 commits into from

Conversation

ymzcdg
Copy link
Contributor

@ymzcdg ymzcdg commented Feb 16, 2020

Description

update translation.
docs/zh-cn/
-_summary.md
-contributing.md
-custom_quantum_functions.md
-faq.md
-faq_debug.md
-faq_build.md
-faq_general.md
-faq_keymap.md
-getting_started_getting_help.md
-getting_started_github.md
-newbs.md
-newbs_building_firmware.md
-newbs_flashing.md
-newbs_getting_started.md
-newbs_learn_more_resources.md
-newbs_testing_debugging.md
-newbs_git_best_practices.md
-how_keyboards_work.md
-newbs_git_resolving_merge_conflicts.md
-newbs_git_using_your_master_branch.md
-newbs_git_resynchronize_a_branch.md
-understanding_qmk.md

update after this PR is merged:
-newbs_building_firmware_configurator.md
-custom_quantum_functions.md
-getting_started_introduction.md
武汉加油!

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

fix doc/getting_started_introduction.md #8202

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

faq.md    custom_quantum_functions.md     contributing.md    _summary.md
fix commit hash
@ymzcdg
Copy link
Contributor Author

ymzcdg commented Feb 18, 2020

What should I do for the commit 2601183?
I updated the file with my browser, I don't know what's wrong with the file.
Thanks for your help.

@ymzcdg
Copy link
Contributor Author

ymzcdg commented Feb 18, 2020

Why a re-upload can fix the bug?
These two files are the same.

@fauxpark
Copy link
Member

That is probably because on current master faq_general.md is currently in GB2312 encoding instead of UTF-8. Your commit fixes it (👍) but it looks like by pure coincidence Travis failed to install moxygen that one time. It's unrelated and all is well.

@ymzcdg
Copy link
Contributor Author

ymzcdg commented Feb 19, 2020

That is probably because on current master faq_general.md is currently in GB2312 encoding instead of UTF-8. Your commit fixes it (+1) but it looks like by pure coincidence Travis failed to install moxygen that one time. It's unrelated and all is well.

Appreciate you!

Line7, rename 'keyboard'  to 'keyboards'
@ymzcdg ymzcdg changed the title update zh-cn translate update zh-cn translation Feb 21, 2020
docs/zh-cn/
-faq_keymap.md
-getting_started_getting_help.md
-getting_started_github.md
@noroadsleft
Copy link
Member

@ymzcdg Are you ready for this to be merged?

@ymzcdg
Copy link
Contributor Author

ymzcdg commented Feb 24, 2020

@ymzcdg Are you ready for this to be merged?

Commit 2a026be should be merged, then I will upload the translation of doc/getting_started_introduction.md
So, please merge.
thanks!

@noroadsleft
Copy link
Member

If I merge, a2e644d will also be included, but you're free to make additional changes on a new pull request. Translations take a while anyway, so it's kind of expected.

docs/zh-cn/how_keyboards_work.md Outdated Show resolved Hide resolved
ymzcdg and others added 3 commits March 13, 2020 16:23
Co-Authored-By: Drashna Jaelre <drashna@live.com>
fix switch (get_highest_layer(state))
@ymzcdg ymzcdg requested a review from noroadsleft March 13, 2020 08:43
upload docs/zh-cn/newbs_git_resolving_merge_conflicts.md
docs/zh-cn/
-newbs_git_using_your_master_branch.md
-newbs_git_resynchronize_a_branch.md
@ymzcdg
Copy link
Contributor Author

ymzcdg commented Mar 15, 2020

Please merge, the source docs are changed a lot since this PR is opened.
This PR just like I am playing a Single player game with some friends.
Long live QMK, hooray!
Thanks!

@mtei mtei requested a review from a team April 20, 2020 21:19
@mtei
Copy link
Contributor

mtei commented Apr 21, 2020

#8822 seems to be in conflict with your changes.

@stale
Copy link

stale bot commented Jun 5, 2020

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@stale
Copy link

stale bot commented Jul 5, 2020

Thank you for your contribution!
This pull request has been automatically closed because it has not had activity in the last 30 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.

@stale stale bot closed this Jul 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants