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.
{

View File

@@ -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.
{
"yes": "是",
"no": "否",
"not now": "不是现在",
"suggest auto fetch": "是否启用自动抓取 Git 存储库?"
}

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.
{
@@ -9,9 +9,12 @@
"create branch": "$(plus) 创建新分支",
"repourl": "存储库 URL",
"parent": "父目录",
"cloning": "正在克隆 GIT 存储库...",
"cancel": "$(sync~spin) 正在克隆存储库... 点击取消",
"cancel tooltip": "取消克隆",
"cloning": "正在克隆 Git 存储库...",
"openrepo": "打开存储库",
"proposeopen": "是否要打开已克隆存储库?",
"init": "选择用于初始化 Git 储存库的工作区文件夹",
"init repo": "初始化存储库",
"create repo": "初始化存储库",
"are you sure": "将在“{0}”中创建 Git 存储库。确定要继续吗?",
@@ -49,12 +52,15 @@
"select branch to delete": "选择要删除的分支",
"confirm force delete branch": "“{0}”分支未被完全合并。是否仍要删除?",
"delete branch": "删除分支",
"invalid branch name": "分支名称无效",
"branch already exists": "已存在名为“{0}”的分支",
"select a branch to merge from": "选择要从其合并的分支",
"merge conflicts": "存在合并冲突。请在提交之前解决这些冲突。",
"tag name": "标签名称",
"provide tag name": "请提供标签名称",
"tag message": "消息",
"provide tag message": "请提供消息以对标签进行注释",
"no remotes to fetch": "此存储库未配置可以从中抓取的远程存储库。",
"no remotes to pull": "存储库未配置任何从其中进行拉取的远程存储库。",
"pick remote pull repo": "选择要从其拉取分支的远程位置",
"no remotes to push": "存储库未配置任何要推送到的远程存储库。",
@@ -71,8 +77,8 @@
"no stashes": "没有可以恢复的储藏。",
"pick stash to pop": "选择要弹出的储藏",
"clean repo": "在签出前,请清理存储库工作树。",
"cant push": "无法推送 refs 到远端。请先运行“拉取”功能整合的更改。",
"git error details": "Git:{0}",
"cant push": "无法推送 refs 到远端。您可以试着运行“拉取”功能整合的更改。",
"git error details": "Git: {0}",
"git error": "Git 错误",
"open git log": "打开 GIT 日志"
"open git log": "打开 Git 日志"
}

View File

@@ -1,11 +1,14 @@
/*---------------------------------------------------------------------------------------------
* 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.
{
"using git": "使用 {1} 中的 GIT {0}",
"updateGit": "更新 GIT",
"looking": " {0} 查找 Git 中",
"using git": "使用 {1} 中的 Git {0}",
"downloadgit": "下载 Git",
"neverShowAgain": "不再显示",
"notfound": "未找到 Git。请安装 Git或在 \"git.path\" 设置中配置。",
"updateGit": "更新 Git",
"git20": "你似乎已安装 Git {0}。Code 和 Git 版本 >=2 一起工作最佳"
}

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.
{

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.
{
@@ -21,6 +21,7 @@
"deleted by us": "已被我们删除",
"both added": "两者均已添加",
"both modified": "二者均已修改",
"commitMessage": "消息(按 {0} 提交)",
"commit": "提交",
"merge changes": "合并更改",
"staged changes": "暂存的更改",

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.
{