Merged in translations

i18n/chs/extensions/configuration-editing/out/settingsDocumentHelper.i18n.json

@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"activeEditorName": "例如 myFile.txt",
+	"activeFilePath": "例如 /Users/Development/myProject/myFile.txt",
+	"appName": "例如 VS Code",
+	"assocDescriptionFile": "将所有匹配其文件名内的 glob 模式的文件映射到具有给定标识符的语言。",
+	"assocDescriptionPath": "将所有匹配其路径内绝对路径 glob 模式的文件映射到具有给定标识符的语言。",
+	"assocLabelFile": "带扩展名的文件",
+	"assocLabelPath": "带路径的文件",
+	"derivedDescription": "与具有名称相同但扩展名不同的同级文件的文件匹配。",
+	"derivedLabel": "具有同级文件的文件(按名称)",
+	"dirty": "一个更新的指示器，指示活动编辑器是否更新",
+	"falseDescription": "禁用该模式。",
+	"fileDescription": "与具有特定文件扩展名的所有文件匹配。",
+	"fileLabel": "按扩展名的文件",
+	"filesDescription": "与具有任意文件扩展名的所有文件匹配。",
+	"filesLabel": "具有多个扩展名的文件",
+	"folderDescription": "与任意位置具有特定名称的文件夹匹配。",
+	"folderLabel": "按名称的文件夹(任意位置)",
+	"languageSpecificEditorSettings": "特定语言编辑器设置",
+	"languageSpecificEditorSettingsDescription": "替代语言编辑器设置",
+	"rootName": "例如 myProject",
+	"rootPath": "例如 /Users/Development/myProject",
+	"separator": "一个条件分隔符(\"-\")，仅在左右是具有值的变量时才显示",
+	"siblingsDescription": "与具有名称相同但扩展名不同的同级文件的文件匹配。",
+	"topFolderDescription": "与具有特定名称的顶级文件夹匹配。",
+	"topFolderLabel": "按名称的文件夹(顶级)",
+	"topFoldersDescription": "与多个顶级文件夹匹配。",
+	"topFoldersLabel": "使用多个名称的文件夹(顶级)",
+	"trueDescription": "启用该模式。"
+}

i18n/chs/extensions/extension-editing/out/packageDocumentHelper.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.
+{
+	"languageSpecificEditorSettings": "特定语言编辑器设置",
+	"languageSpecificEditorSettingsDescription": "替代语言编辑器设置"
+}

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

@@ -5,14 +5,24 @@
 // Do not edit this file. It is machine generated.
 {
 	"branch name": "分支名称",
+	"clean": "清理更改",
 	"clean repo": "在签出前，请清理存储库工作树。",
+	"commit message": "提交消息",
 	"confirm clean": "是否确定要清理“{0}”中的更改?",
 	"confirm clean all": "是否确定要清理所有更改?",
-	"no, keep them": "否，保留它们",
+	"disabled": "此工作区已禁用或不支持 GIT",
+	"never again": "好，永不再显示",
+	"no changes": "没有要提交的更改。",
+	"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
+	"no remotes to pull": "存储库未配置任何从其中进行拉取的远程存储库。",
+	"no remotes to push": "存储库未配置任何要推送到的远程存储库。",
+	"nobranch": "请签出一个分支以推送到远程。",
+	"ok": "确定",
 	"open git log": "打开 GIT 日志",
 	"pick remote": "选取要将分支“{0}”发布到的远程:",
 	"provide branch name": "请提供分支名称",
+	"provide commit message": "请提供提交消息",
 	"remote branch at": "{0} 处的远程分支",
-	"tag at": "{0} 处的标记",
-	"yes": "是"
+	"sync is unpredictable": "此操作从“{0}”推送和拉取提交。",
+	"tag at": "{0} 处的标记"
 }

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

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"cantshow": "无法显示对象",
 	"changes": "更改",
 	"merge changes": "合并更改",
 	"staged changes": "暂存的更改"

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

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"checkout": "签出...",
 	"publish changes": "发布更改",
 	"sync changes": "同步更改",
 	"syncing changes": "正在同步更改..."

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

@@ -8,10 +8,12 @@
 	"command.checkout": "签出到...",
 	"command.clean": "清理",
 	"command.cleanAll": "全部清理",
+	"command.commit": "提交",
 	"command.commitAll": "全部提交",
 	"command.commitAllSigned": "全部提交(已注销)",
-	"command.commitStaged": "已暂存提交",
-	"command.commitStagedSigned": "已暂存提交(已注销)",
+	"command.commitStaged": "提交已暂存文件",
+	"command.commitStagedSigned": "提交已暂存文件(已注销)",
+	"command.init": "初始化 GIT 存储库",
 	"command.openChange": "打开更改",
 	"command.openFile": "打开文件",
 	"command.publish": "发布",
@@ -23,8 +25,18 @@
 	"command.showOutput": "显示 GIT 输出",
 	"command.stage": "暂存",
 	"command.stageAll": "全部暂存",
+	"command.stageSelectedRanges": "暂存所选范围",
 	"command.sync": "同步",
 	"command.undoCommit": "撤消上次提交",
 	"command.unstage": "取消暂存",
-	"command.unstageAll": "取消全部暂存"
+	"command.unstageAll": "取消全部暂存",
+	"command.unstageSelectedRanges": "取消暂存所选范围",
+	"config.autofetch": "是否启用了自动提取",
+	"config.autorefresh": "是否已启用自动刷新",
+	"config.checkoutType": "控制列出哪些分支类型",
+	"config.confirmSync": "同步 GIT 存储库前请先进行确认",
+	"config.countBadge": "控制 GIT 徽章计数器",
+	"config.enableLongCommitWarning": "是否应警告提交长段消息",
+	"config.enabled": "是否已启用 GIT",
+	"config.path": "可执行 GIT 的路径"
 }

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

@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 预览中启用双击转换到编辑器。",
+	"markdown.preview.doubleClickToSwitchToEditor.desc": "在 Markdown 预览中双击切换到编辑器。",
 	"markdown.preview.fontFamily.desc": "控制 Markdown 预览中使用的字体系列。",
 	"markdown.preview.fontSize.desc": "控制 Markdown 预览中使用的字号(以像素为单位)。",
 	"markdown.preview.lineHeight.desc": "控制 Markdown 预览中使用的行高。此数值与字号相关。",
 	"markdown.preview.markEditorSelection.desc": "在 Markdown 预览中标记当前的编辑器选定内容。",
-	"markdown.preview.scrollEditorWithPreview.desc": "当 Markdown 预览滚动时，更新编辑器的试图。",
+	"markdown.preview.scrollEditorWithPreview.desc": "当 Markdown 预览滚动时，更新编辑器的视图。",
 	"markdown.preview.scrollPreviewWithEditorSelection.desc": "滚动 Markdown 预览以显示编辑器中当前所选的行。",
 	"markdown.preview.title": "打开预览",
 	"markdown.previewFrontMatter.dec": "设置如何在 Markdown 预览中呈现 YAML 扉页。“隐藏”会删除扉页。否则，扉页则被视为 Markdown 内容。",

i18n/chs/extensions/php/out/features/validationProvider.i18n.json

@@ -7,7 +7,7 @@
 	"noExecutable": "无法验证，因为未设置任何 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。",
 	"php.more": "了解详细信息",
 	"php.no": "否",
-	"php.useExecutablePath": "是否允许执行 {0} 以进行 PHP 文件的 lint 操作?",
+	"php.useExecutablePath": "是否允许执行 {0} (定义为工作区设置)以进行 PHP 文件的 lint 操作?",
 	"php.yes": "是",
 	"unknownReason": "使用路径运行 php 失败: {0}。原因未知。",
 	"wrongExecutable": "无法验证，因为 {0} 不是有效的 PHP 可执行文件。请使用设置 \"php.validate.executablePath\" 配置 PHP 可执行文件。"

i18n/chs/extensions/php/package.i18n.json

@@ -6,7 +6,7 @@
 {
 	"configuration.suggest.basic": "如果已启用内置 PHP 语言建议，则进行配置。此支持建议 PHP 全局变量和变量。",
 	"configuration.title": "PHP",
-	"configuration.validate.enable": "启用/禁用内置 PHP 验证。",
+	"configuration.validate.enable": "启用/禁用内置的 PHP 验证。",
 	"configuration.validate.executablePath": "指向 PHP 可执行文件。",
 	"configuration.validate.run": "不管 linter 是在 save 还是在 type 上运行。"
 }

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

@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"acquiringTypingsDetail": "获取 IntelliSense 的键入定义。",
-	"acquiringTypingsLabel": "正在获取键入..."
+	"acquiringTypingsDetail": "获取 IntelliSense 的 typings 定义。",
+	"acquiringTypingsLabel": "正在获取 typings..."
 }

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

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"manyReferenceLabel": "引用",
-	"oneReferenceLabel": "引用",
+	"manyReferenceLabel": "{0} 个引用",
+	"oneReferenceLabel": "1 个引用",
 	"referenceErrorLabel": "无法确定引用"
 }

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

@@ -0,0 +1,15 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"typescript.configureJsconfigQuickPick": "配置 jsconfig.json",
+	"typescript.configureTsconfigQuickPick": "配置 tsconfig.json",
+	"typescript.noJavaScriptProjectConfig": "文件不属于 JavaScript 项目",
+	"typescript.noTypeScriptProjectConfig": "文件不属于 TypeScript 项目",
+	"typescript.projectConfigCouldNotGetInfo": "无法确定 TypeScript 或 JavaScript 项目",
+	"typescript.projectConfigLearnMore": "了解详细信息",
+	"typescript.projectConfigNoWorkspace": "请在 VS Code 中打开一个文件夹，以使用 TypeScript 或 JavaScript 项目",
+	"typescript.projectConfigUnsupportedFile": "无法确定 TypeScript 或 JavaScript 项目。不受支持的文件类型"
+}

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

@@ -7,7 +7,7 @@
 	"configuration.typescript": "TypeScript",
 	"format.insertSpaceAfterCommaDelimiter": "定义逗号分隔符后面的空格处理。",
 	"format.insertSpaceAfterFunctionKeywordForAnonymousFunctions": "定义匿名函数的函数关键字后面的空格处理。",
-	"format.insertSpaceAfterKeywordsInControlFlowStatements": "定义控制流语句中的关键字后面的空格处理。",
+	"format.insertSpaceAfterKeywordsInControlFlowStatements": "定义控制流语句中关键字后面的空格处理。",
 	"format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": "定义 JSX 表达式左括号后面和右括号前面的空格处理。要求 TypeScript >= 2.0.6。",
 	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": "定义非空方括号的左括号后面和右括号前面的空格处理。",
 	"format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": "定义非空圆括号的左括号后面和右括号前面的空格处理。",
@@ -17,13 +17,16 @@
 	"format.placeOpenBraceOnNewLineForControlBlocks": "定义控制块的左括号是否放置在新的一行。",
 	"format.placeOpenBraceOnNewLineForFunctions": "定义函数的左大括号是否放置在新的一行。",
 	"javascript.format.enable": "启用/禁用 JavaScript 格式化程序。",
-	"javascript.reloadProjects.title": "重新加载 JavaScript 项目",
+	"javascript.goToProjectConfig.title": "转到项目配置",
+	"javascript.reloadProjects.title": "重载项目",
 	"javascript.validate.enable": "启用/禁用 JavaScript 验证。",
 	"typescript.check.tscVersion": "检查全局安装的 TypeScript 编译器(例如 tsc )是否不同于使用的 TypeScript 语言服务。",
 	"typescript.disableAutomaticTypeAcquisition": "禁用自动获取类型。需要 TypeScript >= 2.0.6，并且更改后需要重启。",
 	"typescript.format.enable": "启用/禁用默认 TypeScript 格式化程序。",
-	"typescript.referencesCodeLens.enabled": "启用/禁用引用代码长度",
-	"typescript.reloadProjects.title": "重新加载 TypeScript 项目",
+	"typescript.goToProjectConfig.title": "转到项目配置",
+	"typescript.referencesCodeLens.enabled": "启用/禁用引用 CodeLens。",
+	"typescript.reloadProjects.title": "重载项目",
+	"typescript.selectTypeScriptVersion.title": "选择 TypeScript 版本",
 	"typescript.tsdk.desc": "指定包含要使用的 tsserver 和 lib*.d.ts 文件的文件夹路径。",
 	"typescript.tsdk_version.desc": "指定 tsserver 的版本。仅在未使用 npm 安装 tsserver 时需要。",
 	"typescript.tsserver.experimentalAutoBuild": "启用实验性自动生成。要求安装 1.9 dev 或 2.x tsserver 版本并在更改后重启 VS Code。",

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

@@ -27,6 +27,7 @@
 	"insertSpaces.errorMessage": "应为 \"boolean\"。注意，值 \"auto\" 已由 \"editor.detectIndentation\" 设置替换。",
 	"lineHeight": "控制行高。使用 0 通过字号计算行高。",
 	"lineNumbers": "控制行号的显示。可能的值为“开”、“关”和“相对”。“相对”将显示从当前光标位置开始计数的行数。",
+	"minimap.enabled": "控制是否显示 minimap",
 	"mouseWheelScrollSensitivity": "要对鼠标滚轮滚动事件的 \"deltaX\" 和 \"deltaY\" 使用的乘数 ",
 	"mouseWheelZoom": "通过使用鼠标滚轮同时按住 Ctrl 可缩放编辑器的字体",
 	"overviewRulerLanes": "控制可在概述标尺同一位置显示的效果数量",

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

@@ -5,6 +5,7 @@
 // Do not edit this file. It is machine generated.
 {
 	"actions.clipboard.copyLabel": "复制",
+	"actions.clipboard.copyWithSyntaxHighlightingLabel": "复制并突出显示语法",
 	"actions.clipboard.cutLabel": "剪切",
 	"actions.clipboard.pasteLabel": "粘贴"
 }

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

@@ -7,8 +7,11 @@
 	"actions.goToDecl.label": "转到定义",
 	"actions.goToDeclToSide.label": "打开侧边的定义",
 	"actions.goToImplementation.label": "转到实现",
+	"actions.goToTypeDefinition.label": "转到类型定义",
 	"actions.peekImplementation.label": "速览实现",
+	"actions.peekTypeDefinition.label": "快速查看类型定义",
 	"actions.previewDecl.label": "查看定义",
+	"generic.noResults": "找不到定义",
 	"meta.title": " – {0} 定义",
 	"multipleResults": "单击显示 {0} 个定义。"
 }

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

@@ -9,5 +9,6 @@
 	"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}"
+	"invalid.scopeName": "“contributes.{0}.scopeName”中应为字符串。提供的值: {1}",
+	"no-tm-grammar": "没有注册这种语言的 TM 语法。"
 }

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

@@ -4,12 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
+	"config.property.duplicate": "无法注册“{0}”。此属性已注册。",
+	"config.property.languageDefault": "无法注册“{0}”。这符合属性模式 \"\\[.*\\]$\"，可用于描述特定语言编辑器设置。请使用 \"configurationDefaults\"。",
+	"defaultConfigurations.title": "默认配置替代",
 	"invalid.properties": "configuration.properties 必须是对象",
 	"invalid.title": "configuration.title 必须是字符串",
 	"invalid.type": "如果进行设置，\"configuration.type\" 必须设置为对象",
-	"overrideSettings.description": "为一组语言标识符配置要被替代的设置。",
-	"overrideSettings.title": "替代设置",
+	"overrideSettings.defaultDescription": "针对某种语言，配置替代编辑器设置。",
+	"overrideSettings.description": "针对 {0} 语言，配置替代编辑器设置。",
 	"vscode.extension.contributes.configuration": "用于配置字符串。",
 	"vscode.extension.contributes.configuration.properties": "配置属性的描述。",
-	"vscode.extension.contributes.configuration.title": "设置摘要。此标签将在设置文件中用作分隔注释。"
+	"vscode.extension.contributes.configuration.title": "设置摘要。此标签将在设置文件中用作分隔注释。",
+	"vscode.extension.contributes.defaultConfiguration": "按语言提供默认编辑器配置设置。"
 }

i18n/chs/src/vs/workbench/api/node/mainThreadMessageService.i18n.json

@@ -4,5 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"close": "关闭"
+	"cancel": "取消",
+	"close": "关闭",
+	"ok": "确定"
 }

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

@@ -4,5 +4,5 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"editorLabelWithGroup": "{0} 对 {1} 进行分组。"
+	"editorLabelWithGroup": "{0}，所在组为: {1}。"
 }

i18n/chs/src/vs/workbench/browser/parts/titlebar/titlebarPart.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.
+{
+	"devExtensionWindowTitlePrefix": "[扩展开发主机]",
+	"patchedWindowTitle": "[不受支持]"
+}

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

@@ -0,0 +1,6 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{}