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:
@@ -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": "提供储藏消息(可选)",
|
||||
|
||||
Reference in New Issue
Block a user