mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -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} 的標記",
|
||||
"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": "沒有任何變更要認可。",
|
||||
@@ -64,12 +70,13 @@
|
||||
"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