Merged in translations

i18n/chs/extensions/css/package.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.
+{}

i18n/chs/extensions/html/package.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.
+{}

i18n/chs/extensions/json/package.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.
+{}

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

@@ -20,6 +20,7 @@
 	"mWindow": "窗口",
 	"miAbout": "关于(&&A)",
 	"miAccessibilityOptions": "辅助功能选项(&&O)",
+	"miAdditionalViewlets": "其他 &&Viewlet",
 	"miAutoSave": "自动保存",
 	"miBack": "返回(&&B)",
 	"miCheckForUpdates": "检查更新...",
@@ -64,6 +65,7 @@
 	"miOpenFile": "打开文件(&&O)...",
 	"miOpenFolder": "打开文件夹(&&F)...",
 	"miOpenKeymap": "键盘快捷方式(&&K)",
+	"miOpenKeymapExtensions": "&&键映射",
 	"miOpenRecent": "打开最近的文件(&&R)",
 	"miOpenSettings": "用户设置(&&U)",
 	"miOpenSnippets": "用户代码片段(&&S)",
@@ -97,7 +99,6 @@
 	"miToggleDebugConsole": "调试控制台(&&B)",
 	"miToggleDevTools": "切换开发人员工具(&&T)",
 	"miToggleEditorLayout": "切换编辑器组布局(&&L)",
-	"miToggleFocusMode": "切换焦点模式",
 	"miToggleFullScreen": "切换全屏(&&F)",
 	"miToggleIntegratedTerminal": "集成终端(&&I)",
 	"miToggleMenuBar": "切换菜单栏(&&B)",
@@ -107,6 +108,7 @@
 	"miToggleRenderWhitespace": "切换呈现空格(&&R)",
 	"miToggleSidebar": "切换侧边栏(&&T)",
 	"miToggleWordWrap": "切换自动换行(&&W)",
+	"miToggleZenMode": "切换 Zen 模式",
 	"miTwitter": "在 Twitter 上加入我们(&&J)",
 	"miUndo": "撤消(&&U)",
 	"miUserVoice": "搜索功能请求(&&S)",

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

@@ -33,7 +33,7 @@
 	"quickSuggestionsDelay": "控制延迟多少毫秒后将显示快速建议",
 	"renderControlCharacters": "控制编辑器是否应呈现控制字符",
 	"renderIndentGuides": "控制编辑器是否应呈现缩进参考线",
-	"renderLineHighlight": "控制编辑器是否应呈现当前行突出显示",
+	"renderLineHighlight": "控制编辑器应如何呈现当前行突出显示，可能为“无”、“装订线”、“线”和“全部”。",
 	"renderWhitespace": "控制编辑器中呈现空白字符的方式，可能为“无”、“边界”和“全部”。“边界”选项不会在单词之间呈现单空格。",
 	"roundedSelection": "控制选取范围是否有圆角",
 	"rulers": "显示垂直标尺的列",

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

@@ -7,6 +7,7 @@
 	"lines.copyDown": "向下复制行",
 	"lines.copyUp": "向上复制行",
 	"lines.delete": "删除行",
+	"lines.deleteAllLeft": "删除左侧所有内容",
 	"lines.indent": "行缩进",
 	"lines.insertAfter": "在下面插入行",
 	"lines.insertBefore": "在上面插入行",

i18n/chs/src/vs/platform/extensionManagement/common/extensionManagement.i18n.json

@@ -4,5 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"extensions": "扩展"
+	"extensions": "扩展",
+	"preferences": "首选项"
 }

i18n/chs/src/vs/platform/keybinding/common/abstractKeybindingService.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.
+{
+	"first.chord": "已按下({0})。正在等待同时按下第二个键...",
+	"missing.chord": "组合键({0}, {1})不是命令。",
+	"unboundCommands": "以下是其他可用命令:"
+}

i18n/chs/src/vs/workbench/browser/actions/toggleZenMode.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.
+{
+	"toggleZenMode": "切换 Zen 模式",
+	"view": "查看"
+}

i18n/chs/src/vs/workbench/browser/parts/activitybar/activitybarActions.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.
+{
+	"titleKeybinding": "{0} ({1})"
+}

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

@@ -33,10 +33,11 @@
 	"navigateEditorHistoryByInput": "从历史记录里打开上一个编辑器",
 	"navigateNext": "前进",
 	"navigatePrevious": "后退",
+	"nextEditorInGroup": "打开组中的下一个编辑器",
 	"openNextEditor": "打开下一个编辑器",
 	"openNextRecentlyUsedEditorInGroup": "打开组中下一个最近使用的编辑器",
 	"openPreviousEditor": "打开上一个编辑器",
-	"openPreviousEditorInGroup": "打开组中上一个最近使用的编辑器",
+	"openPreviousEditorInGroup": "打开组中上一个编辑器",
 	"openPreviousRecentlyUsedEditorInGroup": "打开组中上一个最近使用的编辑器",
 	"openToSide": "打开到侧边",
 	"reopenClosedEditor": "重新打开已关闭的编辑器",

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

@@ -13,6 +13,7 @@
 	"diffLeftRightLabel": "{0} ⟷ {1}",
 	"files": "文件",
 	"folders": "文件夹",
+	"keybindingsReference": "键盘快捷方式引用",
 	"newWindow": "新建窗口",
 	"noFolderOpened": "此实例中没有要关闭的已打开文件夹。",
 	"openRecent": "打开最近的文件",

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

@@ -4,6 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"telemetry.enableCrashReporting": "启用要发送给 Microsoft 的故障报表。\n\t// 此选项需重启才可生效。",
+	"telemetry.enableCrashReporting": "启用要发送给 Microsoft 的故障报表。\n此选项需重启才可生效。",
 	"telemetryConfigurationTitle": "遥测"
 }

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

@@ -10,6 +10,7 @@
 	"enablePreview": "控制打开的编辑器是否显示为预览。预览编辑器可以重新使用，直到将其保留(例如，双击或编辑)。",
 	"enablePreviewFromQuickOpen": "控制 Quick Open 中打开的编辑器是否显示为预览。预览编辑器可以重新使用，直到将其保留(例如，通过双击或编辑)。",
 	"file": "文件",
+	"fullScreenZenMode": "控制 zen 模式是否应将工作台自动转换到全屏模式。",
 	"help": "帮助",
 	"openDefaultSettings": "控制打开设置时是否打开显示所有默认设置的编辑器。",
 	"openFilesInNewWindow": "启用后，将在新窗口中打开文件，而不是重复使用现有实例。",

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

@@ -8,17 +8,18 @@
 	"NewLaunchConfig": "请设置应用程序的启动配置文件。",
 	"breakpointAdded": "已添加断点，行 {0}, 文件 {1}",
 	"breakpointRemoved": "已删除断点，行 {0}，文件 {1}",
+	"compoundMustHaveConfigurationNames": "复合必须设置 \"configurationNames\" 特性以开始多个配置。",
 	"debugAdapterCrash": "调试适配器进程已意外终止",
 	"debugAnyway": "仍进行调试",
 	"debugSourceNotAvailable": "源 {0} 不可用。",
 	"debugTypeMissing": "所选的启动配置缺少属性 \"type\"。",
 	"debugTypeNotSupported": "配置的类型“{0}”不受支持。",
-	"debuggingContinued": "已继续调试。",
 	"debuggingPaused": "已暂停调试，原因 {0}，{1} {2}",
 	"debuggingStarted": "已开始调试。",
 	"debuggingStopped": "已停止调试。",
 	"differentTaskRunning": "任务 {0} 在运行。无法运行预启动任务 {1}。",
 	"preLaunchTaskError": "preLaunchTask“{0}”期间检测到一个生成错误。",
 	"preLaunchTaskErrors": "preLaunchTask“{0}”期间检测到多个生成错误。",
-	"preLaunchTaskExitCode": "preLaunchTask“{0}”已终止，退出代码为 {1}。"
+	"preLaunchTaskExitCode": "preLaunchTask“{0}”已终止，退出代码为 {1}。",
+	"snapshotObj": "仅显示了此对象的基元值。"
 }

i18n/chs/src/vs/workbench/parts/debug/node/debugConfigurationManager.i18n.json

@@ -5,20 +5,21 @@
 // Do not edit this file. It is machine generated.
 {
 	"DebugConfig.failed": "无法在 \".vscode\" 文件夹({0})内创建 \"launch.json\" 文件。",
+	"app.launch.json.compound.name": "复合的名称。在启动配置下拉菜单中显示。",
+	"app.launch.json.compounds": "复合列表。每个复合引用将一起启动的多个配置。",
+	"app.launch.json.compounds.configurations": "将作为此复合的一部分启动的配置的名称。",
 	"app.launch.json.configurations": "配置列表。使用 IntelliSense 添加新配置或编辑现有配置。",
 	"app.launch.json.debugServer": "已弃用: 请在配置中移动 debugServer。",
 	"app.launch.json.title": "启动",
 	"app.launch.json.version": "此文件格式的版本。",
 	"debugNoType": "不可省略调试适配器“类型”，其类型必须是“字符串”。",
-	"duplicateDebuggerType": "调试类型“{0}”已注册，且具有属性“{1}”，正在忽略属性“{1}”。",
 	"selectDebug": "选择环境",
 	"vscode.extension.contributes.breakpoints": "贡献断电。",
 	"vscode.extension.contributes.breakpoints.language": "对此语言允许断点。",
 	"vscode.extension.contributes.debuggers": "用于调试适配器。",
 	"vscode.extension.contributes.debuggers.args": "要传递给适配器的可选参数。",
 	"vscode.extension.contributes.debuggers.configurationAttributes": "用于验证 \"launch.json\" 的 JSON 架构配置。",
-	"vscode.extension.contributes.debuggers.enableBreakpointsFor": "允许这些语言的断点。",
-	"vscode.extension.contributes.debuggers.enableBreakpointsFor.languageIds": "语言列表。",
+	"vscode.extension.contributes.debuggers.configurationSnippets": "用于在 \"launch.json\" 中添加新配置的代码段。",
 	"vscode.extension.contributes.debuggers.initialConfigurations": "用于生成初始 \"launch.json\" 的配置。",
 	"vscode.extension.contributes.debuggers.label": "显示此调试适配器的名称。",
 	"vscode.extension.contributes.debuggers.linux": "Linux 特定的设置。",

i18n/chs/src/vs/workbench/parts/emmet/browser/actions/showEmmetCommands.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.
+{}

i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorer.contribution.i18n.json

@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 // Do not edit this file. It is machine generated.
 {
-	"treeExplorer.invalidId": "树资源管理器扩展 {0} 的 ID 无效，无法激活。",
+	"showViewlet": "显示 {0}",
+	"view": "查看",
 	"vscode.extension.contributes.explorer": "将自定义树资源管理器 viewlet 添加到边栏",
 	"vscode.extension.contributes.explorer.icon": "活动栏上指向 viewlet 图标的路径",
 	"vscode.extension.contributes.explorer.treeExplorerNodeProviderId": "用于标识通过 vscode.workspace.registerTreeExplorerNodeProvider 注册的提供程序的唯一 ID",

i18n/chs/src/vs/workbench/parts/explorers/browser/treeExplorerService.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.
+{
+	"treeExplorer.noMatchingProviderId": "没有注册 ID 为 {providerId}的 TreeExplorerNodeProvider。"
+}

i18n/chs/src/vs/workbench/parts/extensions/browser/extensionsActions.i18n.json

@@ -42,6 +42,8 @@
 	"showOutdatedExtensions": "显示过时扩展",
 	"showPopularExtensions": "显示常用的扩展",
 	"showRecommendedExtensions": "显示推荐的扩展",
+	"showRecommendedKeymapExtensions": "显示推荐键映射",
+	"showRecommendedKeymapExtensionsShort": "键映射",
 	"showWorkspaceRecommendedExtensions": "显示工作区建议的扩展名",
 	"toggleExtensionsViewlet": "显示扩展",
 	"uninstallAction": "卸载",

i18n/chs/src/vs/workbench/parts/extensions/node/extensionsWorkbenchService.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.
+{
+	"disableOtherKeymapsConfirmation": "禁用其他键映射以避免键绑定之间的冲突?",
+	"no": "否",
+	"yes": "是"
+}

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

@@ -21,6 +21,7 @@
 	"files.exclude.when": "对匹配文件的同级文件的其他检查。使用 $(basename) 作为匹配文件名的变量。",
 	"filesConfigurationTitle": "文件",
 	"formatOnSave": "保存时设置文件的格式。格式化程序必须可用，不能自动保存文件，并且不能关闭编辑器。",
+	"hotExit": "控制是否在重启后还原未保存文件。如果启用它，退出编辑器时将不会提示保存。",
 	"insertFinalNewline": "启用后，保存文件时在文件末尾插入一个最终新行。",
 	"openEditorsVisible": "在“打开的编辑器”窗格中显示的编辑器数量。将其设置为 0 可隐藏窗格。",
 	"showExplorerViewlet": "显示资源管理器",

i18n/chs/src/vs/workbench/parts/indentation/common/indentation.i18n.json

@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"configuredTabSize": "已配置制表符大小",
+	"detectIndentation": "检查内容中的缩进",
+	"indentUsingSpaces": "使用空格缩进",
+	"indentUsingTabs": "使用 \"Tab\" 缩进",
+	"indentationToSpaces": "将缩进转换为空格",
+	"indentationToTabs": "将缩进转换为制表符",
+	"selectTabWidth": "选择当前文件的制表符大小",
+	"toggleRenderControlCharacters": "切换控制字符",
+	"toggleRenderWhitespace": "切换显示空格"
+}

i18n/chs/src/vs/workbench/parts/preferences/browser/preferences.contribution.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.
+{
+	"defaultSettingsEditor": "默认设置编辑器",
+	"preferences": "首选项"
+}

i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesActions.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.
+{
+	"openGlobalKeybindings": "打开键盘快捷方式",
+	"openGlobalSettings": "打开用户设置",
+	"openWorkspaceSettings": "打开工作区设置"
+}

i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesEditor.i18n.json

@@ -0,0 +1,19 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"copyDefaultSetting": "Ctrl + 单击以复制到设置",
+	"copyDefaultSettingMac": "Cmd + 单击以复制到设置",
+	"copyHelpMessage": "Ctrl + 单击值以复制到设置",
+	"copyHelpMessageMac": "Cmd + 单击值以复制到设置",
+	"defaultKeybindings": "默认键盘快捷方式",
+	"defaultName": "默认设置",
+	"selectAndCopyDefaultSettingsHover": "Ctrl + 单击以选择值并复制到设置",
+	"selectAndCopyDefaultSettingsHoverMac": "Cmd + 单击以选择值并复制到设置",
+	"selectAndCopyHelpMessage": "Ctrl + 单击值以选择值并复制到设置",
+	"selectAndCopyHelpMessageMac": "Cmd + 单击值以选择值并复制到设置",
+	"selectAndCopyHover": "Ctrl + 单击以选择值",
+	"selectAndCopyHoverMac": "Cmd + 单击以选择值"
+}

i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesService.i18n.json

@@ -0,0 +1,16 @@
+/*---------------------------------------------------------------------------------------------
+ *  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.
+{
+	"close": "关闭",
+	"emptyKeybindingsHeader": "将键绑定放入此文件中以覆盖默认值",
+	"emptySettingsHeader": "将设置放入此文件中以覆盖默认设置",
+	"emptySettingsHeader1": "将设置放入此文件中以覆盖默认值和用户设置。",
+	"fail.createSettings": "无法创建“{0}”({1})。",
+	"neverShowAgain": "不再显示",
+	"openFolderFirst": "首先打开文件夹以创建工作区设置",
+	"openWorkspaceSettings": "打开工作区设置",
+	"workspaceHasSettings": "当前打开的文件夹包含可能会覆盖用户设置的工作区设置"
+}

i18n/chs/src/vs/workbench/parts/preferences/browser/preferencesWidgets.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.
+{}

i18n/chs/src/vs/workbench/parts/preferences/common/preferencesModels.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.
+{
+	"defaultKeybindingsHeader": "通过将键绑定放入键绑定文件中来覆盖键绑定。",
+	"defaultSettingsHeader": "通过将设置放入设置文件中来覆盖设置。",
+	"defaultSettingsHeader2": "请参阅 http://go.microsoft.com/fwlink/?LinkId=808995 以了解最常用的设置。"
+}