mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge VS Code 1.21 source code (#1067)
* Initial VS Code 1.21 file copy with patches * A few more merges * Post npm install * Fix batch of build breaks * Fix more build breaks * Fix more build errors * Fix more build breaks * Runtime fixes 1 * Get connection dialog working with some todos * Fix a few packaging issues * Copy several node_modules to package build to fix loader issues * Fix breaks from master * A few more fixes * Make tests pass * First pass of license header updates * Second pass of license header updates * Fix restore dialog issues * Remove add additional themes menu items * fix select box issues where the list doesn't show up * formatting * Fix editor dispose issue * Copy over node modules to correct location on all platforms
This commit is contained in:
Karl Burtram
@@ -1,8 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
||||
"Licensed under the Source EULA. See License.txt in the project root for license information.",
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Do not edit this file. It is machine generated."
|
||||
],
|
||||
"missOrInvalid": "凭据丢失或无效。"
|
||||
}
|
||||
@@ -1,11 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
||||
"Licensed under the Source EULA. 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 存储库?"
|
||||
"not now": "稍后询问",
|
||||
"suggest auto fetch": "您希望 Code [定期运行 \"git fetch\"]({0}) 吗?"
|
||||
}
|
||||
@@ -1,9 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
||||
"Licensed under the Source EULA. See License.txt in the project root for license information.",
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Do not edit this file. It is machine generated."
|
||||
],
|
||||
"tag at": "{0} 处的 Tag",
|
||||
"remote branch at": "{0} 处的远程分支",
|
||||
"create branch": "$(plus) 创建新分支",
|
||||
@@ -41,6 +43,10 @@
|
||||
"confirm discard all 2": "{0}\n\n此操作不可撤销，你当前的工作集将会永远丢失。",
|
||||
"yes discard tracked": "放弃 1 个已跟踪的文件",
|
||||
"yes discard tracked multiple": "放弃 {0} 个已跟踪的文件",
|
||||
"unsaved files single": "以下文件尚未保存：{0}。\n\n您要在提交之前保存吗?",
|
||||
"unsaved files": "当前有 {0} 个文件尚未保存。\n\n您要在提交之前保存吗?",
|
||||
"save and commit": "全部保存并提交",
|
||||
"commit": "仍要提交",
|
||||
"no staged changes": "现在没有暂存的更改以供提交\n\n是否要直接自动暂存所有更改并提交？",
|
||||
"always": "始终",
|
||||
"no changes": "没有要提交的更改。",
|
||||
@@ -61,15 +67,16 @@
|
||||
"tag message": "消息",
|
||||
"provide tag message": "请提供消息以对标签进行注释",
|
||||
"no remotes to fetch": "此存储库未配置可以从中抓取的远程存储库。",
|
||||
"no remotes to pull": "存储库未配置任何从其中进行拉取的远程存储库。",
|
||||
"no remotes to pull": "存储库未配置任何可进行拉取的远程存储库。",
|
||||
"pick remote pull repo": "选择要从其拉取分支的远程位置",
|
||||
"no remotes to push": "存储库未配置任何要推送到的远程存储库。",
|
||||
"push with tags success": "已成功带标签进行推送。",
|
||||
"nobranch": "请签出一个分支以推送到远程。",
|
||||
"confirm publish branch": "分支“{0}”没有上游分支。您要发布此分支吗?",
|
||||
"ok": "确定",
|
||||
"push with tags success": "已成功带标签进行推送。",
|
||||
"pick remote": "选取要将分支“{0}”发布到的远程:",
|
||||
"sync is unpredictable": "此操作将推送提交至“{0}”，并从中拉取提交。",
|
||||
"ok": "确定",
|
||||
"never again": "好，永不再显示",
|
||||
"never again": "确定，且不再显示",
|
||||
"no remotes to publish": "存储库未配置任何要发布到的远程存储库。",
|
||||
"no changes stash": "没有要储藏的更改。",
|
||||
"provide stash message": "提供储藏消息(可选)",
|
||||
|
||||
@@ -1,9 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
||||
"Licensed under the Source EULA. See License.txt in the project root for license information.",
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Do not edit this file. It is machine generated."
|
||||
],
|
||||
"looking": "在 {0} 查找 Git 中",
|
||||
"using git": "使用 {1} 中的 Git {0}",
|
||||
"downloadgit": "下载 Git",
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* 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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
||||
"Licensed under the Source EULA. See License.txt in the project root for license information.",
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Do not edit this file. It is machine generated."
|
||||
],
|
||||
"too many submodules": "“{0}”存储库中的 {1} 个子模块将不会自动打开。您仍可以通过打开其中的文件来单独打开每个子模块。",
|
||||
"no repositories": "没有可用存储库",
|
||||
"pick repo": "选择存储库"
|
||||
}
|
||||
@@ -1,9 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
||||
"Licensed under the Source EULA. See License.txt in the project root for license information.",
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Do not edit this file. It is machine generated."
|
||||
],
|
||||
"open": "打开",
|
||||
"index modified": "已修改索引",
|
||||
"modified": "已修改",
|
||||
@@ -21,12 +23,13 @@
|
||||
"deleted by us": "已被我们删除",
|
||||
"both added": "两者均已添加",
|
||||
"both modified": "二者均已修改",
|
||||
"commitMessage": "消息(按 {0} 提交)",
|
||||
"commitMessage": "消息 (按 {0} 提交)",
|
||||
"commit": "提交",
|
||||
"merge changes": "合并更改",
|
||||
"staged changes": "暂存的更改",
|
||||
"changes": "更改",
|
||||
"ok": "确定",
|
||||
"commitMessageCountdown": "当前行剩余 {0} 个字符",
|
||||
"commitMessageWarning": "当前行比 {1} 超出 {0} 个字符",
|
||||
"neveragain": "不再显示",
|
||||
"huge": "Git 存储库“{0}”中存在大量活动更改，将仅启用部分 Git 功能。"
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
|
||||
@@ -1,9 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
||||
"Licensed under the Source EULA. See License.txt in the project root for license information.",
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Do not edit this file. It is machine generated."
|
||||
],
|
||||
"checkout": "签出...",
|
||||
"sync changes": "同步更改",
|
||||
"publish changes": "发布更改",
|
||||
|
||||
@@ -1,9 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Copyright (c) Microsoft Corporation. All rights reserved.",
|
||||
"Licensed under the Source EULA. See License.txt in the project root for license information.",
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"Do not edit this file. It is machine generated."
|
||||
],
|
||||
"displayName": "Git",
|
||||
"description": "Git 源代码管理集成",
|
||||
"command.clone": "克隆",
|
||||
"command.init": "初始化存储库",
|
||||
"command.close": "关闭存储库",
|
||||
@@ -54,12 +58,13 @@
|
||||
"command.stashPopLatest": "弹出最新储藏",
|
||||
"config.enabled": "是否启用 Git",
|
||||
"config.path": "Git 可执行文件路径",
|
||||
"config.autoRepositoryDetection": "是否自动检测存储库",
|
||||
"config.autorefresh": "是否启用自动刷新",
|
||||
"config.autofetch": "是否启用自动拉取",
|
||||
"config.enableLongCommitWarning": "是否针对长段提交消息进行警告",
|
||||
"config.confirmSync": "同步 GIT 存储库前请先进行确认",
|
||||
"config.countBadge": "控制 Git 徽章计数器。“all”计算所有更改。“tracked”只计算跟踪的更改。“off”关闭此功能。",
|
||||
"config.checkoutType": "控制运行“签出到...”命令时列出的分支的类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标记，\"remote\" 只显示远程分支。",
|
||||
"config.checkoutType": "控制运行“签出到...”功能时列出的分支类型。\"all\" 显示所有 refs，\"local\" 只显示本地分支，\"tags\" 只显示标签，\"remote\" 只显示远程分支。",
|
||||
"config.ignoreLegacyWarning": "忽略旧版 Git 警告",
|
||||
"config.ignoreMissingGitWarning": "忽略“缺失 Git”警告",
|
||||
"config.ignoreLimitWarning": "忽略“存储库中存在大量更改”的警告",
|
||||
@@ -68,9 +73,14 @@
|
||||
"config.enableCommitSigning": "启用使用 GPG 签名的提交",
|
||||
"config.discardAllScope": "控制运行“放弃所有更改”命令时放弃的更改类型。\"all\" 放弃所有更改。\"tracked\" 只放弃跟踪的文件。\"prompt\" 表示在每次运行此操作时显示提示对话框。",
|
||||
"config.decorations.enabled": "控制 Git 是否向资源管理器和“打开的编辑器”视图添加颜色和小标。",
|
||||
"config.promptToSaveFilesBeforeCommit": "控制 Git 是否在提交之前检查未保存的文件。",
|
||||
"config.showInlineOpenFileAction": "控制是否在 Git 更改视图中显示内联“打开文件”操作。",
|
||||
"config.inputValidation": "控制何时显示提交消息输入验证。",
|
||||
"config.detectSubmodules": "控制是否自动检测 Git 子模块。",
|
||||
"colors.modified": "已修改资源的颜色。",
|
||||
"colors.deleted": "已删除资源的颜色。",
|
||||
"colors.untracked": "未跟踪资源的颜色。",
|
||||
"colors.ignored": "已忽略资源的颜色。",
|
||||
"colors.conflict": "存在冲突的资源的颜色。"
|
||||
"colors.conflict": "存在冲突的资源的颜色。",
|
||||
"colors.submodule": "子模块资源的颜色。"
|
||||
}
|
||||
Reference in New Issue
Block a user