mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-03-20 03:51:40 -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
25 lines
1.2 KiB
JSON
25 lines
1.2 KiB
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."
|
|
],
|
|
"displayName": "충돌 병합",
|
|
"description": "인라인 병합 충돌에 대한 강조 표시 및 명령입니다.",
|
|
"command.category": "충돌 병합",
|
|
"command.accept.all-current": "모든 현재 사항 수락",
|
|
"command.accept.all-incoming": "수신 모두 수락",
|
|
"command.accept.all-both": "둘 다 모두 수락",
|
|
"command.accept.current": "현재 수락",
|
|
"command.accept.incoming": "수신 수락",
|
|
"command.accept.selection": "선택 수락",
|
|
"command.accept.both": "둘 다 수락",
|
|
"command.next": "다음 충돌",
|
|
"command.previous": "이전 충돌",
|
|
"command.compare": "현재 충돌 비교",
|
|
"config.title": "충돌 병합",
|
|
"config.codeLensEnabled": "편집기 내에서 충돌 블록 CodeLense 병합 사용/사용 안 함",
|
|
"config.decoratorsEnabled": "편집기 내에서 충돌 병합 사용/사용 안 함"
|
|
} |