search

nutritionfactsorg / daily-dozen-android

Keep track of the foods that Dr. Greger recommends in his NYT's best-selling book, How Not to Die with this Android app
https://play.google.com/store/apps/details?id=org.nutritionfacts.dailydozen&hl=en
Other
274 stars 95 forks source link

values-zh #78

Closed ikyli closed 6 years ago

ikyli commented 7 years ago

values-zh.zip

alibitek commented 7 years ago

@ikyli Thanks for contributing a Chinese translation! However, this pull request is not correctly done.

You need to create a Git branch starting from the v15 branch (or you can commit directly in your v15 branch) Then you need to overwrite the strings.xml from app/src/main/res/values-zh Commit your changes Push your commit to the server, in the branch you are on (a feature branch or the v15 branch, if you decided to stay with that) Submit a pull request to merge that branch to v15 branch, not to master branch.

It's the task of the maintainer of this repository to merge branch v15 into master, not ours.

If you are not famliar with all the steps above, no problem, we can help you out get your translations in the project.

alibitek commented 7 years ago

The russian and chinese translations from v15 branch are affected by issue #82 and need to be corrected. Fixed in PR #83

alibitek commented 7 years ago

The changes made to the values-zh/strings.xml seem to be invalid, see this comment.

slavick commented 6 years ago

This pull request is outdated at this point. I am closing this now as the Chinese translation has been added to the app.