mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-19 03:21:36 -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
944 B
JSON
15 lines
944 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": "此文件中没有其他合并冲突了"
|
|
} |