Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula
This commit is contained in:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions

View File

@@ -1,6 +1,6 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA. See License.txt in the project root for license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
// Do not edit this file. It is machine generated.
{
@@ -33,8 +33,10 @@
"command.checkout": "签出到...",
"command.branch": "创建分支...",
"command.deleteBranch": "删除分支...",
"command.renameBranch": "重命名分支...",
"command.merge": "合并分支...",
"command.createTag": "创建标签",
"command.fetch": "抓取",
"command.pull": "拉取",
"command.pullRebase": "拉取(变基)",
"command.pullFrom": "拉取自...",
@@ -42,21 +44,24 @@
"command.pushTo": "推送到...",
"command.pushWithTags": "带标签推送",
"command.sync": "同步",
"command.syncRebase": "同步(变基)",
"command.publish": "发布分支",
"command.showOutput": "显示 GIT 输出",
"command.showOutput": "显示 Git 输出",
"command.ignore": "将文件添加到 .gitignore",
"command.stashIncludeUntracked": "储藏(包含未跟踪)",
"command.stash": "储藏",
"command.stashPop": "弹出储藏...",
"command.stashPopLatest": "弹出最新储藏",
"config.enabled": "是否启用 GIT",
"config.enabled": "是否启用 Git",
"config.path": "Git 可执行文件路径",
"config.autorefresh": "是否启用自动刷新",
"config.autofetch": "是否启用自动取",
"config.autorefresh": "是否启用自动刷新",
"config.autofetch": "是否启用自动取",
"config.enableLongCommitWarning": "是否针对长段提交消息进行警告",
"config.confirmSync": "同步 Git 存储库前进行确认",
"config.confirmSync": "同步 GIT 存储库前请先进行确认",
"config.countBadge": "控制 Git 徽章计数器。“all”计算所有更改。“tracked”只计算跟踪的更改。“off”关闭此功能。",
"config.checkoutType": "控制运行“签出到...”命令时列出的分支的类型。\"all\" 显示所有 refs\"local\" 只显示本地分支,\"tags\" 只显示标记,\"remote\" 只显示远程分支。",
"config.ignoreLegacyWarning": "忽略旧版 Git 警告",
"config.ignoreMissingGitWarning": "忽略“缺失 Git”警告",
"config.ignoreLimitWarning": "忽略“存储库中存在大量更改”的警告",
"config.defaultCloneDirectory": "克隆 Git 存储库的默认位置",
"config.enableSmartCommit": "在没有暂存的更改时提交所有更改。",