From 4a5f51752c8faf80003bd9a162d274cfc38cb7b4 Mon Sep 17 00:00:00 2001 From: yodfz Date: Wed, 20 Mar 2013 11:34:05 +0800 Subject: [PATCH 01/11] update install ex --- src/nls/zh-cn/strings.js | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 75ebd2360f6..d21b68363a2 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -74,6 +74,7 @@ define({ "LIVE_DEVELOPMENT_ERROR_TITLE" : "实时预览错误", "LIVE_DEVELOPMENT_RELAUNCH_TITLE" : "连接至浏览器", "LIVE_DEVELOPMENT_ERROR_MESSAGE" : "为了应用实时预览,Chrome需要重启并启用远程调试功能.

你确定重新启动Chrome浏览器,并且启用远程调试?", + "LIVE_DEV_LOADING_ERROR_MESSAGE" : "无法加载实时开发页面.", "LIVE_DEV_NEED_HTML_MESSAGE" : "需要打开一个HTML文件才能实时预览.", "LIVE_DEV_NEED_BASEURL_MESSAGE" : "实时预览需要一个服务端,您需要为这个项目指定一个基本URL地址.(如htt://127.0.0.1/)", "LIVE_DEV_SERVER_NOT_READY_MESSAGE" : "试图启动HTTP服务器时出现错误,请再试一次.", @@ -175,6 +176,7 @@ define({ "CMD_LIVE_HIGHLIGHT" : "在线高亮代码", "CMD_PROJECT_SETTINGS" : "项目设置\u2026", "CMD_FILE_RENAME" : "重命名", + "CMD_INSTALL_EXTENSION" : "安装扩展", "CMD_QUIT" : "退出", // Used in native File menu on Windows "CMD_EXIT" : "退出", @@ -190,7 +192,7 @@ define({ "CMD_SELECT_LINE" : "选中当前行", "CMD_FIND" : "查找", "CMD_FIND_IN_FILES" : "在文件中查找", - "CMD_FIND_IN_SUBTREE" : "查找中\u2026", + "CMD_FIND_IN_SUBTREE" : "在该文件中查找", "CMD_FIND_NEXT" : "查找下一个", "CMD_FIND_PREVIOUS" : "查找上一个", "CMD_REPLACE" : "替换", @@ -298,6 +300,34 @@ define({ "BASEURL_ERROR_INVALID_CHAR" : "特殊字符 '{0}' 必须 %-encoded.", "BASEURL_ERROR_UNKOWN_ERROR" : "解析地址错误,请确认地址格式", + // Extension Management strings + "INSTALL_EXTENSION_TITLE" : "安装扩展", + "INSTALL_EXTENSION_LABEL" : "扩展地址", + "INSTALL_EXTENSION_HINT" : "URL地址应该是一个ZIP扩展包.", + "INSTALLING_FROM" : "正在安装扩展 {0}...", + "INSTALL_SUCCEEDED" : "安装成功!", + "INSTALL_FAILED" : "安装失败.", + "INSTALL_CANCELLED" : "安装已取消.", + // These must match the error codes in ExtensionsDomain.Errors.* : + "INVALID_ZIP_FILE" : "{0}不是一个有效的ZIP包.", + "INVALID_PACKAGE_JSON" : "扩展包中的JSON文件是无效的. (错误是: {0}).", + "MISSING_PACKAGE_NAME" : "扩展包名字遗失 {0}.", + "BAD_PACKAGE_NAME" : "{0} 是一个无效扩展包名.", + "MISSING_PACKAGE_VERSION" : "扩展包版本遗失 {0}.", + "INVALID_VERSION_NUMBER" : "扩展包版本 ({0}) 是一个无效版本号.", + "API_NOT_COMPATIBLE" : "扩展包将安装到你的扩展目录中,但是这个扩展包不适合你现在的版本.", + "MISSING_MAIN" : "扩展包遗失main.js文件.", + "ALREADY_INSTALLED" : "扩展将安装到你的扩张目录,但是在扩展目录中发现了以前安装了同样的扩展.", + "NO_DISABLED_DIRECTORY" : "由于扩展文件夹不存在或禁用了扩展,所以无法保存扩展至扩展文件夹.", + "DOWNLOAD_ID_IN_USE" : "内部错误:该下载ID已被使用.", + "DOWNLOAD_TARGET_EXISTS" : "临时下载文件已存在: {0}.", + "NO_SERVER_RESPONSE" : "无法连接到服务器.", + "BAD_HTTP_STATUS" : "未在服务器上发现该文件 (HTTP {0}).", + "ERROR_LOADING" : "扩展程序遇到一个错误,将重启扩展.", + "MALFORMED_URL" : "无法识别的URL地址.", + "UNSUPPORTED_PROTOCOL" : "不支持此URL协议.", + "UNKNOWN_ERROR" : "未知内部错误.", + // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "当前颜色", "COLOR_EDITOR_ORIGINAL_COLOR_SWATCH_TIP" : "原来的颜色", From dbcf94a73c31d8d47ab350737a07f402ed548adb Mon Sep 17 00:00:00 2001 From: yodfz Date: Wed, 20 Mar 2013 13:20:44 +0800 Subject: [PATCH 02/11] add install in line 282 --- src/nls/zh-cn/strings.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index d21b68363a2..29703b94f1a 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -279,6 +279,7 @@ define({ "KEEP_CHANGES_IN_EDITOR" : "选择编辑器中修改的内容", "CLOSE_DONT_SAVE" : "放弃保存并关闭", "RELAUNCH_CHROME" : "重新运行Chrome", + "INSTALL" : "安装", "ABOUT" : "关于", "APP_NAME" : "Brackets", "CLOSE" : "关闭", @@ -303,7 +304,7 @@ define({ // Extension Management strings "INSTALL_EXTENSION_TITLE" : "安装扩展", "INSTALL_EXTENSION_LABEL" : "扩展地址", - "INSTALL_EXTENSION_HINT" : "URL地址应该是一个ZIP扩展包.", + "INSTALL_EXTENSION_HINT" : "填写一个基于URL的ZIP扩展包地址.", "INSTALLING_FROM" : "正在安装扩展 {0}...", "INSTALL_SUCCEEDED" : "安装成功!", "INSTALL_FAILED" : "安装失败.", @@ -327,6 +328,7 @@ define({ "MALFORMED_URL" : "无法识别的URL地址.", "UNSUPPORTED_PROTOCOL" : "不支持此URL协议.", "UNKNOWN_ERROR" : "未知内部错误.", + // For NOT_FOUND_ERR, see generic strings above // extensions/default/InlineColorEditor "COLOR_EDITOR_CURRENT_COLOR_SWATCH_TIP" : "当前颜色", From 4b67c743e798f3e8f931d644c323132fe172b05c Mon Sep 17 00:00:00 2001 From: yodfz Date: Wed, 20 Mar 2013 13:21:35 +0800 Subject: [PATCH 03/11] =?UTF-8?q?add=20=EF=BF=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/nls/zh-cn/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 29703b94f1a..10beb5bd1ae 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -303,7 +303,7 @@ define({ // Extension Management strings "INSTALL_EXTENSION_TITLE" : "安装扩展", - "INSTALL_EXTENSION_LABEL" : "扩展地址", + "INSTALL_EXTENSION_LABEL" : "扩展包地址", "INSTALL_EXTENSION_HINT" : "填写一个基于URL的ZIP扩展包地址.", "INSTALLING_FROM" : "正在安装扩展 {0}...", "INSTALL_SUCCEEDED" : "安装成功!", From 9d9408f94a22d7abe16f475b7191fa04130e64d3 Mon Sep 17 00:00:00 2001 From: yodfz Date: Wed, 20 Mar 2013 13:23:00 +0800 Subject: [PATCH 04/11] edit line 313 --- src/nls/zh-cn/strings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 10beb5bd1ae..2f234ec95e8 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -310,9 +310,9 @@ define({ "INSTALL_FAILED" : "安装失败.", "INSTALL_CANCELLED" : "安装已取消.", // These must match the error codes in ExtensionsDomain.Errors.* : - "INVALID_ZIP_FILE" : "{0}不是一个有效的ZIP包.", + "INVALID_ZIP_FILE" : "{0}不是一个有效的ZIP文件.", "INVALID_PACKAGE_JSON" : "扩展包中的JSON文件是无效的. (错误是: {0}).", - "MISSING_PACKAGE_NAME" : "扩展包名字遗失 {0}.", + "MISSING_PACKAGE_NAME" : "扩展包名称遗失 {0}.", "BAD_PACKAGE_NAME" : "{0} 是一个无效扩展包名.", "MISSING_PACKAGE_VERSION" : "扩展包版本遗失 {0}.", "INVALID_VERSION_NUMBER" : "扩展包版本 ({0}) 是一个无效版本号.", From b8278fb7dca33dd055e65ff942a2f6450362980e Mon Sep 17 00:00:00 2001 From: yodfz Date: Wed, 20 Mar 2013 13:25:17 +0800 Subject: [PATCH 05/11] edit line 195 --- src/nls/zh-cn/strings.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 2f234ec95e8..2f835166b26 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -163,7 +163,7 @@ define({ // File menu commands "FILE_MENU" : "文件", - "CMD_FILE_NEW" : "新建", + "CMD_FILE_NEW" : "新建文件", "CMD_FILE_NEW_FOLDER" : "新建目录", "CMD_FILE_OPEN" : "打开\u2026", "CMD_ADD_TO_WORKING_SET" : "添加至工作集合", @@ -192,7 +192,7 @@ define({ "CMD_SELECT_LINE" : "选中当前行", "CMD_FIND" : "查找", "CMD_FIND_IN_FILES" : "在文件中查找", - "CMD_FIND_IN_SUBTREE" : "在该文件中查找", + "CMD_FIND_IN_SUBTREE" : "在该位置查找", "CMD_FIND_NEXT" : "查找下一个", "CMD_FIND_PREVIOUS" : "查找上一个", "CMD_REPLACE" : "替换", From 0709d422e687e1faed5ba70176b347b216c862bd Mon Sep 17 00:00:00 2001 From: yodfz Date: Wed, 20 Mar 2013 15:18:33 +0800 Subject: [PATCH 06/11] edit line 191 --- src/nls/zh-cn/strings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 2f835166b26..5314e0ce8f3 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -188,7 +188,7 @@ define({ "CMD_CUT" : "剪切", "CMD_COPY" : "复制", "CMD_PASTE" : "粘帖", - "CMD_SELECT_ALL" : "选择全部", + "CMD_SELECT_ALL" : "全选", "CMD_SELECT_LINE" : "选中当前行", "CMD_FIND" : "查找", "CMD_FIND_IN_FILES" : "在文件中查找", From 277d60fbc40d4190b16e4da4130a47e50bd5cffe Mon Sep 17 00:00:00 2001 From: yodfz Date: Thu, 21 Mar 2013 08:39:20 +0800 Subject: [PATCH 07/11] new submit! --- src/nls/zh-cn/strings.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 5314e0ce8f3..1508f76fcc7 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -192,7 +192,7 @@ define({ "CMD_SELECT_LINE" : "选中当前行", "CMD_FIND" : "查找", "CMD_FIND_IN_FILES" : "在文件中查找", - "CMD_FIND_IN_SUBTREE" : "在该位置查找", + "CMD_FIND_IN_SUBTREE" : "在该位置查找\u2026", "CMD_FIND_NEXT" : "查找下一个", "CMD_FIND_PREVIOUS" : "查找上一个", "CMD_REPLACE" : "替换", @@ -338,5 +338,4 @@ define({ "COLOR_EDITOR_HSLA_BUTTON_TIP" : "HSLa格式", "COLOR_EDITOR_USED_COLOR_TIP_SINGULAR" : "{0} ({1} 次)", "COLOR_EDITOR_USED_COLOR_TIP_PLURAL" : "{0} ({1} 次)" -}); - +}); \ No newline at end of file From a63c28b67174ed6a5c992a6f1aee124bfc468e85 Mon Sep 17 00:00:00 2001 From: yodfz Date: Fri, 22 Mar 2013 08:42:58 +0800 Subject: [PATCH 08/11] Edit --- src/nls/zh-cn/strings.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 1508f76fcc7..1e28b3f02ff 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -304,17 +304,17 @@ define({ // Extension Management strings "INSTALL_EXTENSION_TITLE" : "安装扩展", "INSTALL_EXTENSION_LABEL" : "扩展包地址", - "INSTALL_EXTENSION_HINT" : "填写一个基于URL的ZIP扩展包地址.", - "INSTALLING_FROM" : "正在安装扩展 {0}...", + "INSTALL_EXTENSION_HINT" : "填写一个基于URL或者Github的ZIP扩展包地址.", + "INSTALLING_FROM" : "正在从 {0} 安装扩展 ...", "INSTALL_SUCCEEDED" : "安装成功!", "INSTALL_FAILED" : "安装失败.", "INSTALL_CANCELLED" : "安装已取消.", // These must match the error codes in ExtensionsDomain.Errors.* : "INVALID_ZIP_FILE" : "{0}不是一个有效的ZIP文件.", "INVALID_PACKAGE_JSON" : "扩展包中的JSON文件是无效的. (错误是: {0}).", - "MISSING_PACKAGE_NAME" : "扩展包名称遗失 {0}.", + "MISSING_PACKAGE_NAME" : "扩展包中的JSON文件内容缺失. {0}.", "BAD_PACKAGE_NAME" : "{0} 是一个无效扩展包名.", - "MISSING_PACKAGE_VERSION" : "扩展包版本遗失 {0}.", + "MISSING_PACKAGE_VERSION" : "扩展包版本缺失 {0}.", "INVALID_VERSION_NUMBER" : "扩展包版本 ({0}) 是一个无效版本号.", "API_NOT_COMPATIBLE" : "扩展包将安装到你的扩展目录中,但是这个扩展包不适合你现在的版本.", "MISSING_MAIN" : "扩展包遗失main.js文件.", @@ -326,7 +326,7 @@ define({ "BAD_HTTP_STATUS" : "未在服务器上发现该文件 (HTTP {0}).", "ERROR_LOADING" : "扩展程序遇到一个错误,将重启扩展.", "MALFORMED_URL" : "无法识别的URL地址.", - "UNSUPPORTED_PROTOCOL" : "不支持此URL协议.", + "UNSUPPORTED_PROTOCOL" : "需要一个Http或Https协议的地址.", "UNKNOWN_ERROR" : "未知内部错误.", // For NOT_FOUND_ERR, see generic strings above From bf20aa113d0ef1cebb5d2f1cfb5b66545460e3c8 Mon Sep 17 00:00:00 2001 From: yodfz Date: Fri, 22 Mar 2013 11:20:16 +0800 Subject: [PATCH 09/11] add new line. --- src/nls/zh-cn/strings.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 1e28b3f02ff..8d624f79b97 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -215,6 +215,9 @@ define({ "CMD_RESTORE_FONT_SIZE" : "恢复编辑器默认字体", "CMD_SCROLL_LINE_UP" : "向上滚动", "CMD_SCROLL_LINE_DOWN" : "向下滚动", + "CMD_TOGGLE_LINE_NUMBERS" : "显示行号", + "CMD_TOGGLE_ACTIVE_LINE" : "高亮当前行", + "CMD_TOGGLE_WORD_WRAP" : "自动换行", "CMD_SORT_WORKINGSET_BY_ADDED" : "根据添加时间排序", "CMD_SORT_WORKINGSET_BY_NAME" : "根据名称排序", "CMD_SORT_WORKINGSET_BY_TYPE" : "根据类型排序", @@ -308,11 +311,13 @@ define({ "INSTALLING_FROM" : "正在从 {0} 安装扩展 ...", "INSTALL_SUCCEEDED" : "安装成功!", "INSTALL_FAILED" : "安装失败.", + "CANCELING_INSTALL" : "正在取消...", + "CANCELING_HUNG" : "取消安装需要很长时间.可能出现了内部错误.", "INSTALL_CANCELLED" : "安装已取消.", // These must match the error codes in ExtensionsDomain.Errors.* : "INVALID_ZIP_FILE" : "{0}不是一个有效的ZIP文件.", "INVALID_PACKAGE_JSON" : "扩展包中的JSON文件是无效的. (错误是: {0}).", - "MISSING_PACKAGE_NAME" : "扩展包中的JSON文件内容缺失. {0}.", + "MISSING_PACKAGE_NAME" : "扩展包中的Package.json文件内容缺失. {0}.", "BAD_PACKAGE_NAME" : "{0} 是一个无效扩展包名.", "MISSING_PACKAGE_VERSION" : "扩展包版本缺失 {0}.", "INVALID_VERSION_NUMBER" : "扩展包版本 ({0}) 是一个无效版本号.", From 764cdc03ee279ecb46d338ccdf3c3b047195a785 Mon Sep 17 00:00:00 2001 From: yodfz Date: Fri, 22 Mar 2013 13:11:30 +0800 Subject: [PATCH 10/11] Edit --- src/nls/zh-cn/strings.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index 8d624f79b97..a3a9e84c25b 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -234,7 +234,7 @@ define({ "CMD_QUICK_EDIT_NEXT_MATCH" : "下一个匹配项", "CMD_NEXT_DOC" : "下一个文件", "CMD_PREV_DOC" : "上一个文件", - "CMD_SHOW_IN_TREE" : "定位于工作目录中", + "CMD_SHOW_IN_TREE" : "转到工作目录", // Debug menu commands "DEBUG_MENU" : "调试", @@ -316,15 +316,15 @@ define({ "INSTALL_CANCELLED" : "安装已取消.", // These must match the error codes in ExtensionsDomain.Errors.* : "INVALID_ZIP_FILE" : "{0}不是一个有效的ZIP文件.", - "INVALID_PACKAGE_JSON" : "扩展包中的JSON文件是无效的. (错误是: {0}).", - "MISSING_PACKAGE_NAME" : "扩展包中的Package.json文件内容缺失. {0}.", + "INVALID_PACKAGE_JSON" : "扩展包中的Package.json不存在. (错误是: {0}).", + "MISSING_PACKAGE_NAME" : "扩展包中的Package.json未指定扩展包名称. {0}.", "BAD_PACKAGE_NAME" : "{0} 是一个无效扩展包名.", - "MISSING_PACKAGE_VERSION" : "扩展包版本缺失 {0}.", + "MISSING_PACKAGE_VERSION" : "扩展包中的Package.json未指定版本号 {0}.", "INVALID_VERSION_NUMBER" : "扩展包版本 ({0}) 是一个无效版本号.", - "API_NOT_COMPATIBLE" : "扩展包将安装到你的扩展目录中,但是这个扩展包不适合你现在的版本.", + "API_NOT_COMPATIBLE" : "这个扩展包不兼容当前的版本,将安装至Disabled扩展文件夹中.", "MISSING_MAIN" : "扩展包遗失main.js文件.", - "ALREADY_INSTALLED" : "扩展将安装到你的扩张目录,但是在扩展目录中发现了以前安装了同样的扩展.", - "NO_DISABLED_DIRECTORY" : "由于扩展文件夹不存在或禁用了扩展,所以无法保存扩展至扩展文件夹.", + "ALREADY_INSTALLED" : "该扩展已经存在,将安装至Disabled扩展文件夹中.", + "NO_DISABLED_DIRECTORY" : "由于扩展文件夹不存在\"extensions/disabled\",所以无法保存扩展至扩展文件夹.", "DOWNLOAD_ID_IN_USE" : "内部错误:该下载ID已被使用.", "DOWNLOAD_TARGET_EXISTS" : "临时下载文件已存在: {0}.", "NO_SERVER_RESPONSE" : "无法连接到服务器.", From 54bd67fc79603b9a640f2aa8db12412e892c5cf0 Mon Sep 17 00:00:00 2001 From: yodfz Date: Tue, 26 Mar 2013 10:03:24 +0800 Subject: [PATCH 11/11] Edit2 --- src/nls/zh-cn/strings.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/nls/zh-cn/strings.js b/src/nls/zh-cn/strings.js index a3a9e84c25b..71b53e04d4b 100644 --- a/src/nls/zh-cn/strings.js +++ b/src/nls/zh-cn/strings.js @@ -328,6 +328,7 @@ define({ "DOWNLOAD_ID_IN_USE" : "内部错误:该下载ID已被使用.", "DOWNLOAD_TARGET_EXISTS" : "临时下载文件已存在: {0}.", "NO_SERVER_RESPONSE" : "无法连接到服务器.", + "CANNOT_WRITE_TEMP" : "无法保存下载文件到临时文件.", "BAD_HTTP_STATUS" : "未在服务器上发现该文件 (HTTP {0}).", "ERROR_LOADING" : "扩展程序遇到一个错误,将重启扩展.", "MALFORMED_URL" : "无法识别的URL地址.",