Merged in translations

i18n/chs/extensions/html/client/out/htmlMain.i18n.json

@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
+{
+	"htmlserver.name": "HTML 语言服务器"
+}

i18n/chs/extensions/typescript/out/typescriptServiceClient.i18n.json

@@ -9,12 +9,17 @@
 	"doNotCheckAgain": "不要再次检查",
 	"localTSFound": "工作区文件夹包含 TypeScript 版本 {0}。是否要使用此版本而不是捆绑的版本 {1}?",
 	"moreInformation": "详细信息",
+	"neverCheckLocalVesion": "从不检查工作区版本",
 	"noServerFound": "路径 {0} 未指向有效的 tsserver 安装。将禁用 TypeScript 语言功能。",
 	"serverCouldNotBeStarted": "无法启动 TypeScript 语言服务器。错误消息为: {0}",
 	"serverDied": "在过去 5 分钟内，TypeScript 语言服务意外中止了 5 次。请考虑启用 bug 报告。",
 	"serverDiedAfterStart": "TypeScript 语言服务在其启动后已中止 5 次。将不会重启该服务。请启用 bug 报告。",
-	"use": "使用 {0}",
-	"useBundled": "使用 {0}",
+	"updateGlobalWorkspaceCheck": "已将用户设置 \"typescript.check.workspaceVersion\" 更新为 false",
+	"updateLocalWorkspaceCheck": "已将工作区设置 \"typescript.check.workspaceVersion\" 更新为 false",
+	"updateTscCheck": "已将用户设置 \"typescript.check.tscVersion\" 更新为 false",
+	"updatedtsdk": "已将工作区设置 \"typescript.tsdk\" 更新为 {0}",
+	"use": "使用工作区({0})",
+	"useBundled": "捆绑使用({0})",
 	"versionMismatch": "检测到全局安装的 tsc 编译器({0})与 VS 代码语言服务({1})版本不匹配。这可能导致不一致的编译错误。",
 	"versionNumber.custom": "自定义"
 }

i18n/chs/extensions/typescript/package.i18n.json

@@ -16,6 +16,8 @@
 	"format.placeOpenBraceOnNewLineForFunctions": "定义左大括号是否针对函数而放置在新的一行",
 	"javascript.reloadProjects.title": "重新加载 JavaScript 项目",
 	"javascript.validate.enable": "启用/禁用 JavaScript 验证",
+	"typescript.check.tscVersion": "检查全局安装的 TypeScript 编译器(例如 tsc )是否不同于使用的 TypeScript 语言服务。",
+	"typescript.check.workspaceVersion": "检查工作区中的 TypeScript 版本是否可用",
 	"typescript.reloadProjects.title": "重新加载 TypeScript 项目",
 	"typescript.tsdk.desc": "指定包含要使用的 tsserver 和 lib*.d.ts 文件的文件夹路径。",
 	"typescript.tsdk_version.desc": "指定 tsserver 的版本。仅在未使用 npm 安装 tsserver 时需要。",

i18n/chs/src/vs/base/browser/ui/resourceviewer/resourceViewer.i18n.json

@@ -4,8 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"imgTitle": "{0} ({1}x{2})",
-	"missingAudioSupport": "抱歉，不支持音频文件播放。",
-	"missingVideoSupport": "抱歉，不支持视频文件播放。",
-	"nativeBinaryError": "文件将不在编辑器中显示，因为它是二进制文件、非常大或使用不支持的文本编码。"
+	"imgMeta": "{0}x{1} {2}",
+	"nativeBinaryError": "文件将不在编辑器中显示，因为它是二进制文件、非常大或使用不支持的文本编码。",
+	"sizeB": "{0} B",
+	"sizeGB": "{0} GB",
+	"sizeKB": "{0} KB",
+	"sizeMB": "{0} MB",
+	"sizeTB": "{0} TB"
 }

i18n/chs/src/vs/base/common/errorMessage.i18n.json

@@ -3,4 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
+{
+	"error.connection.unknown": "出现未知连接错误。您的 Internet 连接已断开，或者您连接的服务器已脱机。",
+	"error.connection.unknown.verbose": "未知连接错误 ({0})",
+	"error.defaultMessage": "出现未知错误。有关详细信息，请参阅日志。",
+	"error.http": "{0} (HTTP {1})",
+	"error.http.verbose": "{0} (HTTP {1}: {2})",
+	"error.moreErrors": "{0} 个(共 {1} 个错误)",
+	"error.permission": "权限被拒绝",
+	"error.permission.verbose": "权限被拒绝(HTTP {0})",
+	"message": "{0}。错误代码: {1}",
+	"nodeExceptionMessage": "发生了系统错误({0})",
+	"stackTrace.format": "{0}: {1}"
+}

i18n/chs/src/vs/base/common/keybinding.i18n.json

@@ -3,4 +3,15 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
+{
+	"altKey": "Alt",
+	"altKey.long": "Alt",
+	"cmdKey": "命令",
+	"cmdKey.long": "命令",
+	"ctrlKey": "Ctrl",
+	"ctrlKey.long": "控件",
+	"shiftKey": "Shift",
+	"shiftKey.long": "Shift",
+	"windowsKey": "Windows",
+	"windowsKey.long": "Windows"
+}

i18n/chs/src/vs/code/electron-main/main.i18n.json

@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"newWindow": "新建窗口"
+	"folderDesc": "{0} {1}",
+	"newWindow": "新建窗口",
+	"newWindowDesc": "打开一个新窗口"
 }

i18n/chs/src/vs/code/electron-main/menus.i18n.json

@@ -19,6 +19,8 @@
 	"mView": "查看(&&V)",
 	"mWindow": "窗口",
 	"miAbout": "关于(&&A)",
+	"miAccessibilityOptions": "辅助功能选项(&&O)",
+	"miAutoSave": "自动保存",
 	"miBack": "返回(&&B)",
 	"miCheckForUpdates": "检查更新...",
 	"miCheckingForUpdates": "正在检查更新...",
@@ -42,7 +44,8 @@
 	"miGotoDefinition": "转到定义(&&D)...",
 	"miGotoFile": "转到文件(&&F)...",
 	"miGotoLine": "转到行(&&L)...",
-	"miGotoSymbol": "转到符号(&&S)...",
+	"miGotoSymbolInFile": "转到文件中的符号(&&S)...",
+	"miGotoSymbolInWorkspace": "转到工作区中的符号(&&W)...",
 	"miInstallingUpdate": "正在安装更新...",
 	"miLicense": "查看许可证(&&V)",
 	"miMarker": "问题(&&P)",

i18n/chs/src/vs/code/electron-main/windows.i18n.json

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"accessibilityOptionsWindowTitle": "辅助功能选项",
 	"appCrashed": "窗口出现故障",
 	"appCrashedDetail": "我们对此引起的不便表示抱歉! 请重启该窗口从上次停止的位置继续。",
 	"appStalled": "窗口不再响应",

i18n/chs/src/vs/editor/common/config/commonEditorConfig.i18n.json

@@ -17,7 +17,6 @@
 	"fontSize": "以像素为单位控制字号。",
 	"fontWeight": "控制字体粗细。",
 	"formatOnType": "控制编辑器是否应在键入后自动设置行的格式",
-	"glyphMargin": "控制字形边距的可见性",
 	"hideCursorInOverviewRuler": "控制光标是否应隐藏在概述标尺中。",
 	"ignoreTrimWhitespace": "控制差异编辑器是否将对前导空格或尾随空格的更改显示为差异",
 	"insertSpaces": "按 \"Tab\" 时插入空格。该设置在 `editor.detectIndentation` 启用时根据文件内容进行重写。",
@@ -33,7 +32,7 @@
 	"renderControlCharacters": "控制编辑器是否应呈现控制字符",
 	"renderIndentGuides": "控制编辑器是否应呈现缩进参考线",
 	"renderLineHighlight": "控制编辑器是否应呈现当前行突出显示",
-	"renderWhitespace": "控制编辑器是否应呈现空白字符",
+	"renderWhitespace": "控制编辑器中呈现空白字符的方式，可能为“无”、“边界”和“全部”。“边界”选项不会在单词之间呈现单空格。",
 	"roundedSelection": "控制选取范围是否有圆角",
 	"rulers": "显示垂直标尺的列",
 	"scrollBeyondLastLine": "控制编辑器是否可以滚动到最后一行之后",

i18n/chs/src/vs/editor/common/modes/snippetsRegistry.i18n.json

@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
+{
+	"snippetSuggest.longLabel": "{0}，{1}"
+}

i18n/chs/src/vs/editor/common/services/modelServiceImpl.i18n.json

@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"indentAutoMigrate": "请更新设置: \"editor.detectIndentation\" 替换 \"editor.tabSize\": \"auto\" 或 \"editor.insertSpaces\": \"auto\"",
-	"sourceAndDiagMessage": "[{0}] {1}"
+	"diagAndSource": "[{0}] {1}",
+	"indentAutoMigrate": "请更新设置: \"editor.detectIndentation\" 替换 \"editor.tabSize\": \"auto\" 或 \"editor.insertSpaces\": \"auto\""
 }

i18n/chs/src/vs/editor/contrib/quickFix/browser/quickFixWidget.i18n.json

@@ -0,0 +1,10 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"QuickFixSelectionWidget.loading": "正在加载...",
+	"QuickFixSelectionWidget.noSuggestions": "无修复建议。",
+	"quickFixAccepted": "{0}，已接受"
+}

i18n/chs/src/vs/platform/environment/node/argv.i18n.json

@@ -3,4 +3,26 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
+{
+	"diff": "打开差异编辑器。需要传递两个文件路径作为参数。",
+	"disableExtensions": "禁用所有已安装的扩展。",
+	"extensionHomePath": "设置扩展的根路径。",
+	"goto": "在行和列处的路径打开文件(向路径添加 :line[:column])。",
+	"gotoValidation": "\"--goto\" 模式中的参数格式应为 \"FILE(:LINE(:COLUMN))\"。",
+	"help": "打印使用情况。",
+	"installExtension": "安装扩展。",
+	"listExtensions": "列出已安装的扩展。",
+	"locale": "要使用的区域设置(例如 en-US 或 zh-TW)。",
+	"newWindow": "强制创建一个新的 Code 实例。",
+	"options": "选项",
+	"optionsUpperCase": "选项",
+	"paths": "路径",
+	"performance": "通过启用 \"Developer: Startup Performance\" 命令开始。",
+	"reuseWindow": "在上一活动窗口中强制打开文件或文件夹。",
+	"uninstallExtension": "卸载扩展。",
+	"usage": "使用情况",
+	"userDataDir": "指定存放用户数据的目录，此目录在作为根运行时十分有用。",
+	"verbose": "打印详细输出(表示 - 等待)。",
+	"version": "打印版本。",
+	"wait": "等窗口关闭后再返回。"
+}

i18n/chs/src/vs/platform/extensionManagement/node/extensionManagementService.i18n.json

@@ -4,7 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"close": "关闭",
+	"doNotInstall": "否",
+	"install": "是",
+	"installDependeciesConfirmation": "安装”{0}“还会安装其依赖项。是否要继续?",
 	"invalidManifest": "扩展无效: package.json 不是 JSON 文件。",
 	"invalidName": "扩展无效: 清单名不匹配。",
 	"invalidPublisher": "扩展无效: 清单发布服务器不匹配。",

i18n/chs/src/vs/platform/integrity/node/integrityServiceImpl.i18n.json

@@ -0,0 +1,11 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+// Do not edit this file. It is machine generated.
+{
+	"integrity.dontShowAgain": "不再显示",
+	"integrity.moreInfo": "详细信息",
+	"integrity.ok": "确定",
+	"integrity.prompt": "{0} 安装似乎损坏。请重新安装。"
+}

i18n/chs/src/vs/workbench/browser/parts/editor/binaryDiffEditor.i18n.json

@@ -5,5 +5,6 @@
 // Do not edit this file. It is machine generated.
 {
 	"binaryDiffEditor": "二进制差异查看器",
-	"cannotDiffTextToBinary": "当前不支持比较二进制文件和非二进制文件"
+	"cannotDiffTextToBinary": "当前不支持比较二进制文件和非二进制文件",
+	"metadataDiff": "{0} ↔ {1}"
 }

i18n/chs/src/vs/workbench/browser/parts/editor/editorActions.i18n.json

@@ -13,6 +13,7 @@
 	"closeEditorsToTheRight": "关闭右侧编辑器",
 	"closeOtherEditorsInGroup": "关闭其他编辑器",
 	"evenEditorGroups": "编辑器组平均宽度",
+	"focusActiveEditorGroup": "聚焦活动编辑器组",
 	"focusFirstEditorGroup": "聚焦于左侧编辑器组",
 	"focusLastEditorInStack": "打开组中上一个编辑器",
 	"focusNextGroup": "聚焦于下一个组",

i18n/chs/src/vs/workbench/browser/parts/editor/editorCommands.i18n.json

@@ -5,7 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"commandDeprecated": "已删除命令 **{0}**。你可以改用 **{1}**",
-	"editorCommand.activeEditorMove.arg.description": "\n\t\t\t\t\t\t参数属性:\n\t\t\t\t\t\t\"to\": 提供向何处移动的字符串值。\n\t\t\t\t\t\t\"by\": 提供要移动的单元的字符串值。按标签或按组。\n\t\t\t\t\t\t\"value\": 提供要移动的位置的数量或绝对位置的数字值。\n\t\t\t\t\t",
+	"editorCommand.activeEditorMove.arg.description": "参数属性:\n\t\t\t\t\t\t* \"to\": 提供向何处移动的字符串值。\n\t\t\t\t\t\t* \"by\": 提供要移动的单元的字符串值。按标签或按组。\n\t\t\t\t\t\t* \"value\": 提供要移动的位置或绝对位置数量的数字值。\n\t\t\t\t\t",
 	"editorCommand.activeEditorMove.arg.name": "活动编辑器移动参数",
 	"editorCommand.activeEditorMove.description": "按标签或按组移动活动编辑器",
 	"openKeybindings": "配置键盘快捷方式"

i18n/chs/src/vs/workbench/browser/parts/editor/editorStatus.i18n.json

@@ -9,28 +9,30 @@
 	"changeEndOfLine": "更改行尾序列",
 	"changeIndentation": "更改缩进",
 	"changeMode": "更改语言模式",
-	"configureAssociations": "配置文件关联...",
 	"configureAssociationsExt": "“{0}”的配置文件关联...",
-	"configuredLanguage": "已配置语言",
+	"currentAssociation": "当前关联",
 	"disableTabMode": "禁用辅助功能模式",
 	"endOfLineCarriageReturnLineFeed": "CRLF",
 	"endOfLineLineFeed": "LF",
+	"fileInfo": "文件信息",
 	"gotoLine": "转到行",
 	"indentConvert": "转换文件",
 	"indentView": "更改视图",
 	"indentation": "缩进",
-	"languagesPicks": "语言",
+	"languageDescription": "({0}) - 已配置的语言",
+	"languageDescriptionConfigured": "({0})",
+	"languagesPicks": "语言(标识符)",
 	"multiSelection": "{0} 选择",
 	"multiSelectionRange": "{0} 选择(已选择 {1} 个字符)",
 	"noEditor": "此时没有处于活动状态的文本编辑器",
 	"noFileEditor": "此时无活动文件",
 	"noWritableCodeEditor": "活动代码编辑器为只读模式。",
-	"persistFileAssociations": "你可以将文件名配置为 **files.associations** 部分中的语言关联。该更改可能需要重启才能在已打开的文件上生效。",
 	"pickAction": "选择操作",
 	"pickEncodingForReopen": "选择文件编码以重新打开文件",
 	"pickEncodingForSave": "选择用于保存的文件编码",
 	"pickEndOfLine": "选择行尾序列",
 	"pickLanguage": "选择语言模式",
+	"pickLanguageToConfigure": "选择语言模式与“{0}”关联",
 	"reopenWithEncoding": "通过编码重新打开",
 	"saveWithEncoding": "通过编码保存",
 	"selectEOL": "选择行尾序列",

i18n/chs/src/vs/workbench/browser/parts/panel/panelPart.i18n.json

@@ -6,6 +6,6 @@
 {
 	"closePanel": "关闭",
 	"focusPanel": "焦点集中到面板",
-	"togglePanel": "切换面板可见性",
+	"togglePanel": "切换面板",
 	"view": "查看"
 }

i18n/chs/src/vs/workbench/browser/parts/quickopen/quickOpenController.i18n.json

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"canNotRunPlaceholder": "在当前上下文中无法使用此快速打开处理程序",
+	"canNotRunPlaceholder": "在当前上下文中无法使用此 Quick Open 处理程序",
 	"emptyPicks": "无条目可供选取",
 	"entryAriaLabel": "{0}，最近打开",
 	"historyMatches": "最近打开",

i18n/chs/src/vs/workbench/browser/parts/quickopen/quickopen.contribution.i18n.json

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"quickNavigateNext": "在速启中导航到下一个",
-	"quickNavigatePrevious": "在速启中导航到上一个",
+	"quickNavigateNext": "在 Quick Open 中导航到下一个",
+	"quickNavigatePrevious": "在 Quick Open 中导航到上一个",
 	"quickOpen": "转到文件..."
 }

i18n/chs/src/vs/workbench/electron-browser/actions.i18n.json

@@ -18,6 +18,9 @@
 	"openRecentPlaceHolder": "选择要打开的路径(在新窗口中按住 Ctrl 键打开)",
 	"openRecentPlaceHolderMac": "选择路径(在新窗口中按住 Cmd 键打开)",
 	"reloadWindow": "重新加载窗口",
+	"reportIssues": "报告问题",
+	"switchWindow": "切换窗口",
+	"switchWindowPlaceHolder": "选择窗口",
 	"toggleDevTools": "切换开发人员工具",
 	"toggleFullScreen": "切换全屏",
 	"toggleMenuBar": "切换菜单栏",

i18n/chs/src/vs/workbench/electron-browser/main.contribution.i18n.json

@@ -4,17 +4,19 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"closeOnFocusLost": "控制速启是否应在失去焦点时自动关闭。",
+	"closeOnFocusLost": "控制 Quick Open 是否应在失去焦点时自动关闭。",
 	"developer": "开发人员",
 	"editorOpenPositioning": "控制打开编辑器的位置。选择“左侧”或“右侧”以在当前活动位置的左侧或右侧打开编辑器。选择“第一个”或“最后一个”以从当前活动位置独立打开编辑器。",
 	"enablePreview": "控制打开的编辑器是否显示为预览。预览编辑器可以重新使用，直到将其保留(例如，双击或编辑)。",
-	"enablePreviewFromQuickOpen": "控制速启中打开的编辑器是否显示为预览。预览编辑器可以重新使用，直到将其保留(例如，双击或编辑)。",
+	"enablePreviewFromQuickOpen": "控制 Quick Open 中打开的编辑器是否显示为预览。预览编辑器可以重新使用，直到将其保留(例如，通过双击或编辑)。",
 	"file": "文件",
+	"help": "帮助",
 	"openDefaultSettings": "控制打开设置时是否打开显示所有默认设置的编辑器。",
 	"openFilesInNewWindow": "启用后，将在新窗口中打开文件，而不是重复使用现有实例。",
 	"reopenFolders": "控制重启后重新打开文件夹的方式。选择“none”表示永不重新打开文件夹，选择“one”表示重新打开最后使用的一个文件夹，或选择“all”表示打开上次会话的所有文件夹。",
 	"restoreFullscreen": "如果窗口已退出全屏模式，控制其是否应还原为全屏模式。",
 	"showEditorTabs": "控制打开的编辑器是否显示在选项卡中。",
+	"showIcons": "控制打开的编辑器是否随图标一起显示。这还需启用图标主题。",
 	"updateChannel": "配置是否从更新通道接收自动更新。更改后需要重启。",
 	"updateConfigurationTitle": "更新",
 	"view": "查看",

i18n/chs/src/vs/workbench/electron-browser/main.i18n.json

@@ -3,4 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
+{
+	"loaderError": "无法加载需要的文件。您的 Internet 连接已断开，或者您连接的服务器已脱机。请刷新浏览器并重试。",
+	"loaderErrorNative": "未能加载所需文件。请重启应用程序重试。详细信息: {0}"
+}

i18n/chs/src/vs/workbench/parts/debug/electron-browser/debug.contribution.i18n.json

@@ -6,8 +6,10 @@
 {
 	"debug": "调试",
 	"debugCategory": "调试",
+	"debugErrorEditor": "调试错误",
 	"debugPanel": "调试控制台",
 	"launchConfigDoesNotExist": "启动配置“{0}”不存在。",
+	"toggleDebugPanel": "调试控制台",
 	"toggleDebugViewlet": "显示调试",
 	"view": "查看"
 }

i18n/chs/src/vs/workbench/parts/debug/electron-browser/terminalSupport.i18n.json

@@ -3,4 +3,6 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
-{}
+{
+	"debuggee": "调试对象"
+}