mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Initial VS Code 1.19 source merge (#571)
* Initial 1.19 xcopy * Fix yarn build * Fix numerous build breaks * Next batch of build break fixes * More build break fixes * Runtime breaks * Additional post merge fixes * Fix windows setup file * Fix test failures. * Update license header blocks to refer to source eula
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
|
||||
11
i18n/esn/extensions/git/out/autofetch.i18n.json
Normal file
11
i18n/esn/extensions/git/out/autofetch.i18n.json
Normal file
@@ -0,0 +1,11 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
"yes": "Sí",
|
||||
"no": "No",
|
||||
"not now": "Ahora No",
|
||||
"suggest auto fetch": "¿Desea habilitar la búsqueda automática de repositorios de Git?"
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
@@ -9,9 +9,12 @@
|
||||
"create branch": "$(plus) crear nueva rama",
|
||||
"repourl": "URL del repositorio",
|
||||
"parent": "Directorio principal",
|
||||
"cancel": "$(sync~spin) Clonando repositorio... Haga clic para cancelar",
|
||||
"cancel tooltip": "Cancelar clonación",
|
||||
"cloning": "Clonando el repositorio GIT...",
|
||||
"openrepo": "Abrir repositorio",
|
||||
"proposeopen": "¿Desea abrir el repositorio clonado?",
|
||||
"init": "Seleccione una carpeta de área de trabajo en la que inicializar el repositorio de git",
|
||||
"init repo": "Inicializar el repositorio",
|
||||
"create repo": "Inicializar el repositorio",
|
||||
"are you sure": "Esto creará un repositorio Git en '{0}'. ¿Está seguro de que desea continuar?",
|
||||
@@ -49,12 +52,15 @@
|
||||
"select branch to delete": "Seleccione una rama para borrar",
|
||||
"confirm force delete branch": "La rama '{0}' no está completamente fusionada. ¿Borrarla de todas formas?",
|
||||
"delete branch": "Borrar rama...",
|
||||
"invalid branch name": "Nombre de rama no válido",
|
||||
"branch already exists": "Ya existe una rama como '{0}'",
|
||||
"select a branch to merge from": "Seleccione una rama desde la que fusionar",
|
||||
"merge conflicts": "Hay conflictos de fusión. Resuelvalos antes de confirmar.",
|
||||
"tag name": "Nombre de la etiqueta",
|
||||
"provide tag name": "Por favor proporcione un nombre de etiqueta",
|
||||
"tag message": "Mensaje",
|
||||
"provide tag message": "Por favor, especifique un mensaje para anotar la etiqueta",
|
||||
"no remotes to fetch": "El repositorio no tiene remotos configurados de los que extraer.",
|
||||
"no remotes to pull": "El repositorio no tiene remotos configurados de los que extraer.",
|
||||
"pick remote pull repo": "Seleccione un origen remoto desde el que extraer la rama",
|
||||
"no remotes to push": "El repositorio no tiene remotos configurados en los que insertar.",
|
||||
@@ -71,7 +77,7 @@
|
||||
"no stashes": "No hay cambios guardados provisionalmente para restaurar.",
|
||||
"pick stash to pop": "Elija un cambio guardado provisionalmente para aplicarlo y quitarlo",
|
||||
"clean repo": "Limpie el árbol de trabajo del repositorio antes de la desprotección.",
|
||||
"cant push": " No puede ejecutar la solicitud de inserción remotamente. Solicite un Pull para integrar los cambios.",
|
||||
"cant push": "No se pueden enviar referencias al remoto. Intenta ejecutar 'Pull' primero para integrar tus cambios.",
|
||||
"git error details": "GIT: {0}",
|
||||
"git error": "Error de GIT",
|
||||
"open git log": "Abrir registro de GIT"
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
"looking": "Buscando git en: {0}",
|
||||
"using git": "Usando GIT {0} desde {1}",
|
||||
"updateGit": "Actualizar GIT",
|
||||
"downloadgit": "Descargar Git",
|
||||
"neverShowAgain": "No volver a mostrar",
|
||||
"notfound": "Git no encontrado. Instálalo o configúralo usando la configuración 'git.path'.",
|
||||
"updateGit": "Actualizar GIT",
|
||||
"git20": "Parece que tiene instalado GIT {0}. El código funciona mejor con GIT >= 2"
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
@@ -21,6 +21,7 @@
|
||||
"deleted by us": "Borrado por nosotros",
|
||||
"both added": "Ambos añadidos",
|
||||
"both modified": "Ambos modificados",
|
||||
"commitMessage": "Message (press {0} to commit)",
|
||||
"commit": "Confirmar",
|
||||
"merge changes": "Fusionar cambios mediante combinación",
|
||||
"staged changes": "Cambios almacenados provisionalmente",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user