mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-19 19:41:37 -04:00
dafb780987
* 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
15 lines
960 B
JSON
15 lines
960 B
JSON
{
|
|
"": [
|
|
"--------------------------------------------------------------------------------------------",
|
|
"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."
|
|
],
|
|
"cursorNotInConflict": "編輯器游標不在衝突合併範圍之內",
|
|
"compareChangesTitle": "{0}: 當前變更⟷來源變更",
|
|
"cursorOnCommonAncestorsRange": "編輯器游標在共同上階區塊內，請移動至「當前項目」或「來源項目」區塊",
|
|
"cursorOnSplitterRange": "編輯器游標在衝突合併工具範圍內,請移動至\"當前項目\"或來源項目\"區塊",
|
|
"noConflicts": "檔案內找不到需要合併衝突項目",
|
|
"noOtherConflictsInThisFile": "此檔案內沒有其他的衝突合併項目"
|
|
} |