Merged in translations

i18n/chs/extensions/git/out/commands.i18n.json

@@ -0,0 +1,18 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"branch name": "分支名称",
+	"clean repo": "在签出前，请清理存储库工作树。",
+	"confirm clean": "是否确定要清理“{0}”中的更改?",
+	"confirm clean all": "是否确定要清理所有更改?",
+	"no, keep them": "否，保留它们",
+	"open git log": "打开 GIT 日志",
+	"pick remote": "选取要将分支“{0}”发布到的远程:",
+	"provide branch name": "请提供分支名称",
+	"remote branch at": "{0} 处的远程分支",
+	"tag at": "{0} 处的标记",
+	"yes": "是"
+}

i18n/chs/extensions/git/out/git.i18n.json

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"errorBuffer": "无法从 GIT 中打开文件"
+}

i18n/chs/extensions/git/out/main.i18n.json

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"using git": "使用 {1} 中的 GIT {0}"
+}

i18n/chs/extensions/git/out/model.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.
+{
+	"changes": "更改",
+	"merge changes": "合并更改",
+	"staged changes": "暂存的更改"
+}

i18n/chs/extensions/git/out/statusbar.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.
+{
+	"publish changes": "发布更改",
+	"sync changes": "同步更改",
+	"syncing changes": "正在同步更改..."
+}

i18n/chs/extensions/git/package.i18n.json

@@ -0,0 +1,28 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"command.branch": "创建分支...",
+	"command.checkout": "签出到...",
+	"command.clean": "清理",
+	"command.cleanAll": "全部清理",
+	"command.commitAll": "全部提交",
+	"command.commitAllSigned": "全部提交(已注销)",
+	"command.openChange": "打开更改",
+	"command.openFile": "打开文件",
+	"command.publish": "发布",
+	"command.pull": "拉取",
+	"command.pullRebase": "拉取(变基)",
+	"command.push": "推送",
+	"command.pushTo": "推送到...",
+	"command.refresh": "刷新",
+	"command.showOutput": "显示 GIT 输出",
+	"command.stage": "暂存",
+	"command.stageAll": "全部暂存",
+	"command.sync": "同步",
+	"command.undoCommit": "撤消上次提交",
+	"command.unstage": "取消暂存",
+	"command.unstageAll": "取消全部暂存"
+}

i18n/chs/extensions/html/package.i18n.json

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"html.format.contentUnformatted.desc": "以逗号分隔的标记列表，不应在其中重新设置内容的格式。\"null\" 默认为 \"pre\" 标记。",
 	"html.format.enable.desc": "启用/禁用默认 HTML 格式化程序(需要重启)",
 	"html.format.endWithNewline.desc": "以新行结束。",
 	"html.format.extraLiners.desc": "标记列表，以逗号分隔，其前应有额外新行。\"null\" 默认为“标头、正文、/html”。",
@@ -12,8 +13,15 @@
 	"html.format.maxPreserveNewLines.desc": "要保留在一个区块中的换行符的最大数量。对于无限制使用 \"null\"。",
 	"html.format.preserveNewLines.desc": "是否要保留元素前面的现有换行符。仅适用于元素前，不适用于标记内或文本。",
 	"html.format.unformatted.desc": "以逗号分隔的标记列表不应重设格式。\"null\" 默认为所有列于 https://www.w3.org/TR/html5/dom.html#phrasing-content 的标记。",
+	"html.format.wrapAttributes.auto": "仅在超出行长度时才对属性进行换行。",
+	"html.format.wrapAttributes.desc": "对属性进行换行。",
+	"html.format.wrapAttributes.force": "对除第一个属性外的其他每个属性进行换行。",
+	"html.format.wrapAttributes.forcealign": "对除第一个属性外的其他每个属性进行换行，并保持对齐。",
+	"html.format.wrapAttributes.forcemultiline": "对每个属性进行换行。",
 	"html.format.wrapLineLength.desc": "每行最大字符数(0 = 禁用)。",
 	"html.suggest.angular1.desc": "配置内置 HTML 语言支持是否建议 Angular V1 标记和属性。",
 	"html.suggest.html5.desc": "配置内置 HTML 语言支持是否建议 HTML5 标记、属性和值。",
-	"html.suggest.ionic.desc": "配置内置 HTML 语言支持是否建议 Ionic 标记、属性和值。"
+	"html.suggest.ionic.desc": "配置内置 HTML 语言支持是否建议 Ionic 标记、属性和值。",
+	"html.validate.scripts": "配置内置的 HTML 语言支持是否对嵌入的脚本进行验证。",
+	"html.validate.styles": "配置内置的 HTML 语言支持是否对嵌入的样式进行验证。"
 }

i18n/chs/extensions/markdown/package.i18n.json

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"markdown.preview.experimentalSyncronizationEnabled.desc": "在 Markdown 预览和编辑器之间启用实验性同步",
 	"markdown.preview.fontFamily.desc": "控制 Markdown 预览中使用的字体系列。",
 	"markdown.preview.fontSize.desc": "控制 Markdown 预览中使用的字号(以像素为单位)。",
 	"markdown.preview.lineHeight.desc": "控制 Markdown 预览中使用的行高。此数值与字号相关。",

i18n/chs/extensions/typescript/out/features/completionItemProvider.i18n.json

@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"acquiringTypingsDetail": "获取 IntelliSense 的键入定义。",
+	"acquiringTypingsLabel": "正在获取键入..."
+}

i18n/chs/extensions/typescript/out/features/referencesCodeLensProvider.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.
+{
+	"manyReferenceLabel": "引用",
+	"oneReferenceLabel": "引用",
+	"referenceErrorLabel": "无法确定引用"
+}

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

@@ -13,7 +13,10 @@
 	"serverDied": "在过去 5 分钟内，TypeScript 语言服务意外中止了 5 次。请考虑启用 bug 报告。",
 	"serverDiedAfterStart": "TypeScript 语言服务在其启动后已中止 5 次。将不会重启该服务。请启用 bug 报告。",
 	"updateGlobalWorkspaceCheck": "已将用户设置 \"typescript.check.workspaceVersion\" 更新为 false",
+	"updateGlobalWorkspaceCheckFailed": "无法更新 \"typescript.check.workspaceVersion\" 用户设置。请确认用户设置文件有效",
 	"updateLocalWorkspaceCheck": "已将工作区设置 \"typescript.check.workspaceVersion\" 更新为 false",
+	"updateLocalWorkspaceCheckFailed": "无法更新 \"typescript.check.workspaceVersion\" 工作区设置。请确认工作区设置文件有效",
+	"updateTsdkFailed": "无法更新 \"typescript.tsdk\" 工作区设置。请确认工作区设置文件有效",
 	"updatedtsdk": "已将工作区设置 \"typescript.tsdk\" 更新为 {0}",
 	"use": "使用工作区({0})",
 	"useBundled": "捆绑使用({0})",

i18n/chs/extensions/typescript/out/utils/typingsStatus.i18n.json

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"installingPackages": "提取数据以实现更好的 TypeScript IntelliSense"
+}

i18n/chs/src/vs/base/browser/ui/findinput/findInputCheckboxes.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.
+{
+	"caseDescription": "区分大小写",
+	"regexDescription": "使用正则表达式",
+	"wordsDescription": "全字匹配"
+}

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

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"hiddenMenuBar": "你仍可以通过按 **Alt** 键访问菜单栏。"
+}

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

@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"acceptSuggestionOnEnter": "控制除了 \"Tab\" 以外，是否还应在 \"Enter\" 时接受建议。帮助避免“插入新行”或“接受建议”之间的歧义。",
+	"acceptSuggestionOnCommitCharacter": "控制是否应接受建议的提交字符。例如，在 JavaScript 中，分号(\";\")可以为提交字符，可接受建议并键入该字符。",
+	"acceptSuggestionOnEnter": "控制除了 \"Tab\" 键以外，是否还应接受建议的 \"Enter\" 键。帮助避免“插入新行”或“接受建议”之间出现歧义。",
 	"autoClosingBrackets": "控制编辑器是否应该在左括号后自动插入右括号",
 	"codeLens": "控制编辑器是否显示代码滤镜",
 	"cursorBlinking": "控制光标动画样式，可能的值为 \"blink\"、\"smooth\"、\"phase\"、\"expand\" 和 \"solid\"",
@@ -17,6 +18,7 @@
 	"fontLigatures": "启用字体连字",
 	"fontSize": "以像素为单位控制字号。",
 	"fontWeight": "控制字体粗细。",
+	"formatOnPaste": "控制编辑器是否应自动设置粘贴内容的格式",
 	"formatOnType": "控制编辑器是否应在键入后自动设置行的格式",
 	"glyphMargin": "控制编辑器是否应呈现垂直字形边距。字形边距最常用于调试。",
 	"hideCursorInOverviewRuler": "控制光标是否应隐藏在概述标尺中。",

i18n/chs/src/vs/editor/contrib/bracketMatching/common/bracketMatching.i18n.json

@@ -0,0 +1,8 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"smartSelect.jumpBracket": "转到括号"
+}

i18n/chs/src/vs/editor/contrib/caretOperations/common/caretOperations.i18n.json

@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"caret.moveLeft": "将脱字号向左移",
+	"caret.moveRight": "将脱字号向右移"
+}

i18n/chs/src/vs/editor/contrib/folding/browser/folding.i18n.json

@@ -6,11 +6,7 @@
 {
 	"foldAction.label": "折叠",
 	"foldAllAction.label": "全部折叠",
-	"foldLevel1Action.label": "折叠级别 1",
-	"foldLevel2Action.label": "折叠级别 2",
-	"foldLevel3Action.label": "折叠级别 3",
-	"foldLevel4Action.label": "折叠级别 4",
-	"foldLevel5Action.label": "折叠级别 5",
+	"foldLevelAction.label": "折叠级别 {0}",
 	"foldRecursivelyAction.label": "以递归方式折叠",
 	"unFoldRecursivelyAction.label": "以递归方式展开",
 	"unfoldAction.label": "展开",

i18n/chs/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.i18n.json

@@ -6,6 +6,8 @@
 {
 	"actions.goToDecl.label": "转到定义",
 	"actions.goToDeclToSide.label": "打开侧边的定义",
+	"actions.goToImplementation.label": "转到实现",
+	"actions.peekImplementation.label": "速览实现",
 	"actions.previewDecl.label": "查看定义",
 	"meta.title": " – {0} 定义",
 	"multipleResults": "单击显示 {0} 个定义。"

i18n/chs/src/vs/editor/contrib/inspectTMScopes/electron-browser/inspectTMScopes.i18n.json

@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"inspectTMScopes": "开发者: 插入 TM 作用域",
+	"inspectTMScopesWidget.loading": "正在加载..."
+}

i18n/chs/src/vs/editor/contrib/toggleTabFocusMode/common/toggleTabFocusMode.i18n.json

@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"toggle.tabfocusmode": "切换使用 Tab 键，设置焦点"
+	"toggle.tabMovesFocus": "切换 Tab 键移动焦点"
 }

i18n/chs/src/vs/editor/electron-browser/textMate/TMSyntax.i18n.json

@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"invalid.embeddedLanguages": "\"contributes.{0}.embeddedLanguages\" 中的值无效。必须为从作用域名称到语言的对象映射。提供的值: {1}",
+	"invalid.injectTo": "\"contributes.{0}.injectTo\" 中的值无效。必须为语言范围名称数组。提供的值: {1}",
+	"invalid.language": "“contributes.{0}.language”中存在未知的语言。提供的值: {1}",
+	"invalid.path.0": "“contributes.{0}.path”中应为字符串。提供的值: {1}",
+	"invalid.path.1": "“contributes.{0}.path”({1})应包含在扩展的文件夹({2})内。这可能会使扩展不可移植。",
+	"invalid.scopeName": "“contributes.{0}.scopeName”中应为字符串。提供的值: {1}"
+}

i18n/chs/src/vs/editor/node/textMate/TMGrammars.i18n.json

@@ -0,0 +1,13 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"vscode.extension.contributes.grammars": "贡献 textmate tokenizer。",
+	"vscode.extension.contributes.grammars.embeddedLanguages": "如果此语法包含嵌入式语言，则为作用域名称到语言 ID 的映射。",
+	"vscode.extension.contributes.grammars.injectTo": "此语法注入到的语言范围名称列表。",
+	"vscode.extension.contributes.grammars.language": "此语法为其贡献了内容的语言标识符。",
+	"vscode.extension.contributes.grammars.path": "tmLanguage 文件的路径。该路径是相对于扩展文件夹，通常以 \"./syntaxes/\" 开头。",
+	"vscode.extension.contributes.grammars.scopeName": "tmLanguage 文件所用的 textmate 范围名称。"
+}

i18n/chs/src/vs/platform/configuration/common/configurationRegistry.i18n.json

@@ -7,6 +7,8 @@
 	"invalid.properties": "configuration.properties 必须是对象",
 	"invalid.title": "configuration.title 必须是字符串",
 	"invalid.type": "如果进行设置，\"configuration.type\" 必须设置为对象",
+	"overrideSettings.description": "为一组语言标识符配置要被替代的设置。",
+	"overrideSettings.title": "替代设置",
 	"vscode.extension.contributes.configuration": "用于配置字符串。",
 	"vscode.extension.contributes.configuration.properties": "配置属性的描述。",
 	"vscode.extension.contributes.configuration.title": "设置摘要。此标签将在设置文件中用作分隔注释。"

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

@@ -8,8 +8,8 @@
 	"disableExtensions": "禁用所有已安装的扩展。",
 	"disableGPU": "禁用 GPU 硬件加速。",
 	"extensionHomePath": "设置扩展的根路径。",
-	"goto": "在行和列处的路径打开文件(向路径添加 :line[:column])。",
-	"gotoValidation": "\"--goto\" 模式中的参数格式应为 \"FILE(:LINE(:COLUMN))\"。",
+	"goto": "在路径中的行和字符处打开文件(向路径添加 :line[:character])。",
+	"gotoValidation": "\"--goto\" 模式中的参数格式应为 \"FILE(:LINE(:CHARACTER))\"。",
 	"help": "打印使用情况。",
 	"installExtension": "安装扩展。",
 	"listExtensions": "列出已安装的扩展。",

i18n/chs/src/vs/workbench/browser/actions/fileActions.i18n.json

@@ -0,0 +1,9 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"openFileFolder": "打开...",
+	"openFolder": "打开文件夹..."
+}

i18n/chs/src/vs/workbench/browser/parts/compositePart.i18n.json

@@ -5,5 +5,5 @@
 // Do not edit this file. It is machine generated.
 {
 	"ariaCompositeToolbarLabel": "{0} 操作",
-	"compositeTitleTooltip": "{0} ({1})"
+	"titleTooltip": "{0} ({1})"
 }

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

@@ -10,6 +10,7 @@
 	"changeIndentation": "更改缩进",
 	"changeMode": "更改语言模式",
 	"configureAssociationsExt": "“{0}”的配置文件关联...",
+	"configureModeSettings": "配置“{0}”语言基础设置...",
 	"currentAssociation": "当前关联",
 	"disableTabMode": "禁用辅助功能模式",
 	"endOfLineCarriageReturnLineFeed": "CRLF",