Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

use Chinese punctuation,add new item for string.js #7306

Closed
wants to merge 6 commits into from
Closed

use Chinese punctuation,add new item for string.js #7306

wants to merge 6 commits into from

Conversation

michaeljayt
Copy link
Contributor

This commit contained Chinese punctuation for zh-cn locale all around, and added untranslated item from root folder. At the same time it has unified words usage of the global scope, and corrected typos like 实施预览 => 实时预览 (for 'Live Preview')

This commit contained Chinese punctuation for zh-cn locale all around, and added untranslated item from root folder. At the same time it unified words usage of the global scope, and corrected typos like 实施预览 => 实时预览 (for 'Live Preview')
@RaymondLim
Copy link
Contributor

@michaeljayt Thanks for catching incorrect translation. I just landed some translation to the same file. Can you merge from master and resolve the conflicts?

@michaeljayt
Copy link
Contributor Author

Thanks but, well, I don't know how to do that..Is that means I need to merge from master repo first, then resolve the conflicts, and send another pull request at last?

@TomMalbran
Copy link
Contributor

@michaeljayt Yes. Checkout to this branch first, then use git fetch upstream, and git merge upstream/master. Resolve any issue, commit the changes, and push it this branch. Try to not create a new branch or PR.

@michaeljayt
Copy link
Contributor Author

@TomMalbran I made it, thanks for your instructions!
@RaymondLim I'm appreciate for your beautiful Chinese on some
strings, they helped me corrected some unnatural sentences.

@michaeljayt
Copy link
Contributor Author

I killed those duplicate strings, and this commit should be okay now...
It seems that it failed again..oops

"NO_MODIFICATION_ALLOWED_ERR" : "无法修改此目录",
"NO_MODIFICATION_ALLOWED_ERR_FILE" : "你没有做出修改的权限。",
"CONTENTS_MODIFIED_ERR" : "该文件已在 {APP_NAME} 外被修改。",
"FILE_EXISTS_ERR" : "文件/目录名已存在。",
Copy link
Contributor

Choose a reason for hiding this comment

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

Good catch!

@RaymondLim
Copy link
Contributor

@michaeljayt Thanks for your compliment on beautiful Chinese on some strings, but I didn't do any translation. They all come from community contributors like you. I noticed that you're touching lots of previous translation besides the punctuation characters. So don't expect me to get the review done soon, it will take me some time to do a thorough review of all the changes.

I noticed that you also remove the comment on the very last line. Please put it back and update the SHA with the version of English strings.js you used for this pull request. For more info you can read Localization Readme.

@michaeljayt
Copy link
Contributor Author

@RaymondLim What's the problem with the The Travis CI build system now?
I clicked the link above to check why this commit failed to build, and found a
task called 'cla-check', bui I have already submitted the contributor license agreement
for the first time I contribute to the translation...

@RaymondLim
Copy link
Contributor

@michaeljayt We're aware of CLA check failure and someone will be looking into it soon.

@jasonnjit
Copy link

@michaeljayt Hey Michael, I don't suppose we should keep Chinese period 。inside double quotes " ". It looks weird with 。

@michaeljayt
Copy link
Contributor Author

@jasonnjit Got it, had you reviewed these sentences on the application interface? If weird, how should we deal with other punctuations like ,(the comma) and !(exclamation mark) ?

@jasonnjit
Copy link

Hi Michael,
I didn't happen to check the error strings, I only selected Chinese once.
Maybe you are right, but I mean if there is only one period in the end of
the sentence, I don't suppose we need to show this period, but if we have
several punctuations in the same sentence, we have to keep them all.

On Wed, Mar 26, 2014 at 7:55 PM, Michael J. notifications@github.comwrote:

@jasonnjit https://github.com/jasonnjit Got it, had you reviewed these
sentences on the application interface? If weird, how should we deal with
other punctuations like ,(the comma) and !(exclamation mark) ?


Reply to this email directly or view it on GitHubhttps://github.com//pull/7306#issuecomment-38755112
.

All bests,
Jiawei

@michaeljayt
Copy link
Contributor Author

@jasonnjit so how should I (or,other contributor like me) deal with this kind of issue? Anyone here to provide an standard for non-English punctuation, or I need to revert those punctuation?

"NOT_FOUND_ERR" : "无法找到该文件。",
"NOT_READABLE_ERR" : "无法读取该文件。",
"NO_MODIFICATION_ALLOWED_ERR" : "无法修改此目录。",
"NO_MODIFICATION_ALLOWED_ERR_FILE" : "你没有做出修改的权限。",
Copy link
Contributor

Choose a reason for hiding this comment

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

I think 你没有权限修改。 is better here instead of having 做出.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree.

@njx
Copy link
Contributor

njx commented May 14, 2014

Marking medium priority since this is a major update.

@RaymondLim
Copy link
Contributor

Closing since we've already had newer pull request landed.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants