Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
// Place your settings in this file to overwrite default and user settings.
{
"files.exclude": {
"out": false // set this to true to hide the "out" folder with the compiled JS files
},
"search.exclude": {
"out": true // set this to false to include "out" folder in search results
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off"
}
"files.exclude": {
"out": false // set this to true to hide the "out" folder with the compiled JS files
},
"search.exclude": {
"out": true // set this to false to include "out" folder in search results
},
// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
"typescript.tsc.autoDetect": "off",
"i18n-ally.localesPaths": ["src/locales"]
}
31 changes: 31 additions & 0 deletions l10n/bundle.l10n.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"extension.compareSettingsError": "In order to compare folders, the command should have been called with 2 folderLeft and folderRight settings",
"extension.comparingFolders": "Please wait, comparing folder {0}-->{1}",
"extension.compareEnvironmentError": "In order to compare folders, the command should been called with 2 folders: e.g. COMPARE_FOLDERS=DIFF code path/to/folder1 path/to/folder2. Actual folders: {0}",
"comparer.installDiffMerge": "In order to use \"Diff & Merge\" extension you should install / enable it",
"comparer.errorComparing": "Oops, something went wrong while comparing",
"ui.report": "Report",
"ui.moreInfo": "More Info",
"provider.rightClickError": "Unfortunately, this command can run only by right clicking on 2 folders, no shortcuts here 😕",
"provider.alreadyExcluded": "Pattern \"{0}\" is already in excludeFilter",
"provider.excluded": "\"{0}\" excluded from comparison",
"provider.excludeUpdateError": "Failed to update excludeFilter: {0}",
"provider.compareFoldersProgress": "Compare folders...",
"provider.chooseWorkspacePlaceholder": "Choose a workspace to compare with",
"provider.openDiffError": "Failed to open diff: {0}",
"provider.viewParsedDiffError": "Failed to view parsed diff: {0}",
"provider.noDifferences": "[Compare Folders] There are no differences in any file at the same path.",
"provider.sourceRefreshed": "Source Refreshed",
"provider.deleteConfirm": "Are you sure you want to delete this file?",
"provider.takeMyConfirm": "Are you sure you want to take my file?",
"provider.takeComparedConfirm": "Are you sure you want to take the compared file?",
"provider.copyError": "Failed to copy file",
"provider.selectFolderSingle": "Click to select a folder",
"provider.selectFolderPlural": "Click to select folders",
"provider.synchronized": "The compared folders are synchronized",
"provider.fileHasNoRelativePath": "File has no relative path",
"includeExclude.errorParsing": "Error while parsing include/exclude files",
"history.empty": "History is empty",
"history.placeholder": "Pick from history",
"ui.yes": "Yes, go for it"
}
31 changes: 31 additions & 0 deletions l10n/bundle.l10n.ko.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"extension.compareSettingsError": "폴더를 비교하려면 folderLeft 및 folderRight 설정으로 명령을 호출해야 합니다.",
"extension.comparingFolders": "폴더를 비교하는 동안 기다려 주세요: {0}-->{1}",
"extension.compareEnvironmentError": "폴더를 비교하려면 2개의 폴더로 명령을 호출해야 합니다. 예: COMPARE_FOLDERS=DIFF code path/to/folder1 path/to/folder2. 현재 폴더 수: {0}",
"comparer.installDiffMerge": "\"Diff & Merge\" 확장을 사용하려면 해당 확장을 설치하거나 활성화해야 합니다.",
"comparer.errorComparing": "비교하는 중에 문제가 발생했습니다.",
"ui.report": "보고하기",
"ui.moreInfo": "추가 정보",
"provider.rightClickError": "아쉽게도 이 명령은 2개의 폴더를 우클릭해야 실행할 수 있습니다. 단축키는 지원되지 않습니다. 😕",
"provider.alreadyExcluded": "패턴 \"{0}\"은(는) 이미 excludeFilter에 있습니다.",
"provider.excluded": "\"{0}\"이(가) 비교에서 제외되었습니다.",
"provider.excludeUpdateError": "excludeFilter 업데이트 실패: {0}",
"provider.compareFoldersProgress": "폴더 비교 중...",
"provider.chooseWorkspacePlaceholder": "비교할 작업 영역을 선택하세요",
"provider.openDiffError": "Diff 열기 실패: {0}",
"provider.viewParsedDiffError": "해석된 Diff 보기 실패: {0}",
"provider.noDifferences": "[폴더 비교] 동일한 경로의 파일 간에 차이점이 없습니다.",
"provider.sourceRefreshed": "소스가 새로 고쳐졌습니다.",
"provider.deleteConfirm": "이 파일을 정말로 삭제하시겠습니까?",
"provider.takeMyConfirm": "내 파일을 가져오시겠습니까?",
"provider.takeComparedConfirm": "상대 파일을 가져오시겠습니까?",
"provider.copyError": "파일 복사 실패",
"provider.selectFolderSingle": "폴더를 선택하려면 클릭하세요",
"provider.selectFolderPlural": "폴더를 선택하려면 클릭하세요",
"provider.synchronized": "비교된 폴더들이 동기화되었습니다.",
"provider.fileHasNoRelativePath": "파일에 상대 경로가 없습니다.",
"includeExclude.errorParsing": "포함/제외 파일 분석 중 오류 발생",
"history.empty": "이력이 비어 있습니다.",
"history.placeholder": "이력에서 선택",
"ui.yes": "네, 진행하세요"
}
Loading
Loading