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

Add missing i18n strings for zh-cn #509

Closed
wants to merge 2 commits into from
Closed

Add missing i18n strings for zh-cn #509

wants to merge 2 commits into from

Conversation

PanZiwei
Copy link
Contributor

@PanZiwei PanZiwei commented Jan 8, 2021

Prerequisites

Put an x into the box(es) that apply:

  • This pull request fixes a bug.
  • This pull request adds a feature.
  • This pull request introduces breaking change.

Description

Added missing i18n strings for zh-cn, and update contributor.

Issues Resolved

#417

Checklist

Put an x into the box(es) that apply:

General

  • Describe what changes are being made
  • Explain why and how the changes were necessary and implemented respectively
  • Reference issue with #<ISSUE_NO> if applicable

Resources

  • If you have changed any SCSS code, run make release to regenerate all CSS files

Contributors

  • Add yourself to CONTRIBUTORS.md if you aren't on it already

@alfunx
Copy link
Contributor

alfunx commented Jan 9, 2021

I think this is a subset of #500.

@luizdepra
Copy link
Owner

Yup, @alfunx. It is almost the same thing.

@PanZiwei, could you tell us what is the difference here and which option is the right one? So, could you fix the conflicts for us?

[head_back]
<<<<<<< master
other = "返回 <a href=\"{{ . }}\">主页</a>."
=======
other = "返回 <a href=\"{{ . }}\">首页</a>."
>>>>>>> master

@PanZiwei
Copy link
Contributor Author

@luizdepra
Hi, sorry I didn't notice that it is already fixed by some else. I think either translation is OK.

@luizdepra
Copy link
Owner

Ok, @PanZiwei. So, I'm going to close this PR.
Thank you for the help. :)

@luizdepra luizdepra closed this Jan 22, 2021
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