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

Zh cn/yodfz #3107

Merged
merged 31 commits into from
Mar 19, 2013
Merged

Zh cn/yodfz #3107

merged 31 commits into from
Mar 19, 2013

Conversation

yodfz
Copy link
Contributor

@yodfz yodfz commented Mar 12, 2013

add zh-cn language!

yodfz added 4 commits March 12, 2013 23:31
Translates roughly 1/3
add zh-cn language 2
add zh-cn language 3
and vs 2012 sln file.
@ghost ghost assigned RaymondLim Mar 12, 2013
@RaymondLim
Copy link
Contributor

@yodfz : Thanks for translating Brackets strings. I'll be reviewing your translation tomorrow.

I noticed that you have extra files in this pull request. Can you remove Brackets.sln and Brackets.suo that you accidentally committed for this pull request?

You also need to update nls/strings.js with a new entry for zh-cn.

@yodfz
Copy link
Contributor Author

yodfz commented Mar 13, 2013

@RaymondLim ok.

yodfz added 5 commits March 13, 2013 08:54
edit string.js
add 214 alf
add space to nls/string.js
sorry ,i revert commit old code.
// Find, Replace, Find in Files
"SEARCH_REGEXP_INFO" : "使用正则表达式进行搜索,范例:/re/",
"WITH" : "Con",
"BUTTON_YES" : "Sí",
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do you have Spanish here (line 99 and 100)? :) Are you using strings.js file from a language other than root folder?

@RaymondLim
Copy link
Contributor

@yodfz :

You still have several strings untranslated yet. Some strings are only partially translated. Can you translate them all? I did review some quickly and put some comments, but I'm not done with linguistic review yet. Will continue tomorrow after you have all translation in.

"ERROR_CREATING_FILE" : "试图创建该文件时出现错误,文件: <span class='dialog-filename'>{0}</span>. {1}",

// Application error strings
"ERROR_IN_BROWSER_TITLE" : "囧! {APP_NAME} 尝试在浏览器中运行失败.",
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs a better translation. The English string is telling the users that Brackets is not yet ready to run in the browser window.

Edit translate
"COLOR_EDITOR_HEX_BUTTON_TIP" : "Hex格式",
"COLOR_EDITOR_HSLA_BUTTON_TIP" : "HSLa格式",
"COLOR_EDITOR_USED_COLOR_TIP_SINGULAR" : "{0} (耗时: {1} )",
"COLOR_EDITOR_USED_COLOR_TIP_PLURAL" : "{0} (耗时: {1} )"
Copy link
Contributor

Choose a reason for hiding this comment

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

times has incorrect translation. Time here means .

yodfz added 2 commits March 13, 2013 11:41
// Find, Replace, Find in Files
"SEARCH_REGEXP_INFO" : "使用正则表达式进行搜索,范例:/re/",
"WITH" : "与",
"BUTTON_YES" : "包含",
Copy link
Contributor

Choose a reason for hiding this comment

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

Should be

"CMD_UNDO" : "撤销",
"CMD_REDO" : "重做",
"CMD_CUT" : "剪切",
"CMD_COPY" : "复制",
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be 拷贝 and 复制 should be used for Duplicate.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@RaymondLim CUT is 剪切,COPY is 复制,trust me!!

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm not saying the translation is wrong. I'm just trying to resolve the conflict between the translations of "Copy" and "Duplicate" since I don't like the current long translation for "Duplicate".

And I just checked with Mac OS and Dreamweaver translation. Both are using 拷贝 for Copy and Dreamweaver also uses 复制 for Duplicate.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@RaymondLim
Duplicate is Ctrl+C and Ctrl+V 创建副本 or 克隆副本
Copy is Ctrl+C 复制
Check Visual Studio or Photoshop CS6

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@RaymondLim

副本
duplicate, duplication, counterpart, transcript

"FIND_IN_FILES_MATCH" : "匹配一个",
"FIND_IN_FILES_MATCHES" : "匹配多个",
"FIND_IN_FILES_MORE_THAN" : "以上 ",
"FIND_IN_FILES_MAX" : " (共计 {0} 个匹配)",
Copy link
Contributor

Choose a reason for hiding this comment

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

Replace 共计 with 前. We're not showing the total number of matches; we only show the first 100 matches.

Besides, you need to review the actual message string in the product and make some adjustment to some of the strings in this block. FIND_IN_FILES_TITLE on line 112 controls the format of the message string that is formed by combining strings from line 115 to 1120. To view the actual message string do the following steps.

  1. Switch to Chinese by select Debug > Switch Language.
  2. Select zh-cn and Reload.
  3. Select Brackets src folder as your current project.
  4. Ctrl+Shift+F to do a global search and type "error" in Find text field.
  5. When search results show up in the bottom panel, read the first line.

I think we may have to adjust the format in FIND_IN_FILES_TITLE and we may have to drop 多个 from FIND_IN_FILES_MATCHES.

@RaymondLim
Copy link
Contributor

@yodfz

Thank you very much for your prompt responses to comments. I'm done with linguistic review.

It seems that you still haven't signed up our contributor license agreement.

Let me know when you're done for signing up and also done with your translation.

"FIND_IN_FILES_FILE" : "文件",
"FIND_IN_FILES_FILES" : "多个文件",
"FIND_IN_FILES_MATCH" : "匹配一个",
"FIND_IN_FILES_MATCHES" : "匹配多个",
Copy link
Contributor

Choose a reason for hiding this comment

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

This translation goes into {1} in FIND_IN_FILES_TITLE. So you can change it to 个匹配 here and you can also make the singular form (FIND_IN_FILES_MATCH above this line) the same since there is no difference in Chinese for singular and plural form.

"FIND_IN_FILES_FILES" : "多个文件",
"FIND_IN_FILES_MATCH" : "一个匹配",
"FIND_IN_FILES_MATCHES" : "个匹配",
"FIND_IN_FILES_MORE_THAN" : "以上 ",
Copy link
Contributor

Choose a reason for hiding this comment

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

This translation goes into {5} in FIND_IN_FILES_TITLE. So I think we can intentionally make this an empty string by removing 以上 since without it the formatted string forms a better translation.

"LIVE_DEV_NEED_BASEURL_MESSAGE" : "实时预览需要一个服务端,您需要为这个项目指定一个基本URL地址.(如htt://127.0.0.1/)",
"LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "试图启动HTTP服务器时出现错误,请再试一次.",
"LIVE_DEVELOPMENT_INFO_TITLE" : "欢迎使用实时预览!",
"LIVE_DEVELOPMENT_INFO_MESSAGE" : "{APP_NAME}将通过实时预览连接至你的浏览器. 你的HTML文件将在浏览器中预览, 修改你的代码将会即时更新你浏览器中的预览.<br /><br />目前版本的 {APP_NAME}, 实时预览只能运行于 <strong>Google Chrome</strong>浏览器和更新实时编辑时的 <strong>CSS 文件</strong>. 当你保存了Javascript文件与CSS文件,实时预览将在浏览器中重新加载他们.<br /><br />(此消息仅会出现一次.)",
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry! Need one more fix. 当你保存了Javascript文件与CSS文件, should be 当你保存了HTML文件与Javascript文件,

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@RaymondLim Remove CSS文件?If i save css file,don't ref css file?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@RaymondLim ref is refresh...sorry

Copy link
Contributor

Choose a reason for hiding this comment

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

No need to save CSS updates, they show up in live preview as you type in CSS document in Brackets. This is why we have to emphasize on saving HTML and JavaScript docs.

"ABOUT_TEXT_LINE1" : "冲刺 {VERSION_MINOR} {BUILD_TYPE} {VERSION}",
"ABOUT_TEXT_LINE3" : "关于第三方软件的条款,条例,声明 <a class=\"clickable-link\" data-href=\"http://www.adobe.com/go/thirdparty/\">http://www.adobe.com/go/thirdparty/ </a> 以此作为参考.",
"ABOUT_TEXT_LINE4" : "文档与源码在 <a class=\"clickable-link\" data-href=\"https://github.com/adobe/brackets/\">https://github.com/adobe/brackets/</a>",
"ABOUT_TEXT_LINE5" : "\u2764 基于JavaScript由以下用户参与贡献设计:",
Copy link
Contributor

Choose a reason for hiding this comment

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

Sorry! Still not quite right for me since "\u2764'' is a "love" symbol and we're trying to say that we uses love and Javascript to creates Brackets. So I think it should be 基于\u2764和JavaScript由以下用户参与贡献设计:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@RaymondLim OK!Love!!!!

@@ -0,0 +1,310 @@
/*
* Copyright (c) 2012 Adobe Systems Incorporated. All rights reserved.
Copy link
Contributor

Choose a reason for hiding this comment

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

Copyright year should be 2013 for this file since we're now in 2013. I think this is the last one to change. Once you change it, then I can land it to the master.

@RaymondLim
Copy link
Contributor

@yodfz Thanks for your translation and fixing all the issues. Merging now.

RaymondLim added a commit that referenced this pull request Mar 19, 2013
@RaymondLim RaymondLim merged commit 1d101e4 into adobe:master Mar 19, 2013
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.

3 participants