ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-04-03 02:20:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

SQL Operations Studio Public Preview 1 (0.23) release source code

Browse Source
This commit is contained in:
Karl Burtram
2017-11-09 14:30:27 -08:00
parent b88ecb8d93
commit 3cdac41339
8829 changed files with 759707 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
i18n/chs/extensions/merge-conflict/out/commandHandler.i18n.json Normal file
View File

@@ -0,0 +1,13 @@
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the Source EULA License. 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": "此文件中没有其他合并冲突了"
}