Zh cn/yodfz #3199
Zh cn/yodfz #3199
Conversation
ghost
assigned
src/nls/zh-cn/strings.js
Outdated
There was a problem hiding this comment.
If my understanding is correct, I think URL and ZIP get flipped in the translation. And translation is missing for the part of "or GitHub repo". We're telling the user either provide the url of the zip file OR the url of the GitHub repo.
|
You still haven't solved the merge conflict in your end. It seems like you need to fix it in your git client. Are you on Windows? Please look for .gitattributes file in your Brackets folder on your machine. Open it in a text editor and see you have the following lines If you don't have it, then fix it in your .gitattributes file. If you have it and you still cannot solve the merge conflict, please let me know. |
|
@RaymondLim Github .gitattributes have |
src/nls/zh-cn/strings.js
Outdated
There was a problem hiding this comment.
You need to look up the latest English strings in this entire block (line305 - 329) and retranslate the updated strings, not just those I pointed out. Otherwise, you may miss some of the string updates.
|
I know you're trying to translate all the new or updated strings, but your file has less lines (341) than English file which has 346 lines. So you have 5 strings missing. Not sure you miss any existing ones that are updated after your previous pulll request. So please diff the current English version with the previous English version that you use for your first version of translation. |
|
@RaymondLim Show active line is show colour to active line?or highlight line? |
|
Show active line is to highlight the line with the current cursor location in a different background color. |
|
@RaymondLim Is highlight line!!! |
src/nls/zh-cn/strings.js
Outdated
There was a problem hiding this comment.
Don't translate folder path "extensions/disabled". Keep it as is and take out 或禁用了扩展
There was a problem hiding this comment.
I don't think 转到 is better than 定位于 since it means "goto" and does not imply locating it in the file tree. Maybe we should have translation of "Show Current Document in File Tree".
There was a problem hiding this comment.
@RaymondLim "转到" equal "定位于" ,and more reasonable in the Chinese language!
|
You may want to check English version strings again. I noticed that you don't have translation for "CANNOT_WRITE_TEMP" string. Not sure that if there are any strings that were updated after you started your translation. After you merge the latest and finish all translation, then I'll try to fix the line ending issue on our end for you. |
|
I still can't resolve the merge conflict in this pull request. So I created a new pull request #3287 and close this one |
2 participants
No description provided.