mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Merge VS Code 1.21 source code (#1067)
* 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
This commit is contained in:
Karl Burtram
@@ -1,8 +1,10 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* 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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"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."
|
||||
],
|
||||
"missOrInvalid": "Informations d'identification manquantes ou non valides."
|
||||
}
|
||||
@@ -1,11 +1,13 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* 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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"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."
|
||||
],
|
||||
"yes": "Oui",
|
||||
"no": "Non",
|
||||
"not now": "Pas maintenant",
|
||||
"suggest auto fetch": "Voulez-vous activer la rappatriement automatique des dépôts Git ?"
|
||||
"not now": "Me demander plus tard",
|
||||
"suggest auto fetch": "Voulez-vous que Code exécute [périodiquement 'git fetch']({0}) ?"
|
||||
}
|
||||
@@ -1,9 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"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."
|
||||
],
|
||||
"tag at": "Étiquette à {0}",
|
||||
"remote branch at": "Branche distante à {0}",
|
||||
"create branch": "$(plus) Créer nouvelle branche",
|
||||
@@ -35,12 +37,16 @@
|
||||
"discardAll multiple": "Ignorer 1 fichier",
|
||||
"discardAll": "Ignorer les {0} fichiers",
|
||||
"confirm delete multiple": "Voulez-vous vraiment SUPPRIMER {0} fichiers ?",
|
||||
"delete files": "Supprimer des fichiers",
|
||||
"delete files": "Supprimer les fichiers",
|
||||
"there are untracked files single": "Le fichier non suivi suivant sera SUPPRIMÉ DU DISQUE s'il est ignoré : {0}.",
|
||||
"there are untracked files": "{0} fichiers non suivis seront SUPPRIMÉS DU DISQUE s'ils sont ignorés.",
|
||||
"confirm discard all 2": "{0}\n\nCette opération est IRRÉVERSIBLE, votre plage de travail actuelle sera DÉFINITIVEMENT PERDUE.",
|
||||
"yes discard tracked": "Ignorer 1 fichier suivi",
|
||||
"yes discard tracked multiple": "Ignorer {0} fichiers suivis",
|
||||
"unsaved files single": "Le fichier suivant n'est pas enregistré : {0}.\n\nVoulez-vous l'enregistrer avant d'effectuer le commit ?",
|
||||
"unsaved files": "Il y a {0} fichiers non enregistrés.\n\nVoulez-vous l'enregistrer avant d'effectuer le commit ?",
|
||||
"save and commit": "Tout enregistrer et Effectuer le commit",
|
||||
"commit": "Effectuer le commit quand même",
|
||||
"no staged changes": "Aucune modification en attente à valider.\n\nVoulez-vous automatiquement mettre en attente toutes vos modifications et les valider directement ?",
|
||||
"always": "Toujours",
|
||||
"no changes": "Il n'existe aucun changement à valider.",
|
||||
@@ -52,11 +58,11 @@
|
||||
"select branch to delete": "Sélectionner une branche à supprimer",
|
||||
"confirm force delete branch": "La branche '{0}' n'est pas complètement fusionnée. Supprimer quand même ?",
|
||||
"delete branch": "Supprimer la branche",
|
||||
"invalid branch name": "Nom de la branche non valide",
|
||||
"invalid branch name": "Nom de branche non valide",
|
||||
"branch already exists": "Une branche nommée '0}' existe déjà",
|
||||
"select a branch to merge from": "Sélectionner une branche à fusionner",
|
||||
"merge conflicts": "Il existe des conflits de fusion. Corrigez-les avant la validation.",
|
||||
"tag name": "Nom de la balise",
|
||||
"tag name": "Nom du Tag",
|
||||
"provide tag name": "Spécifiez un nom de balise",
|
||||
"tag message": "Message",
|
||||
"provide tag message": "Spécifiez un message pour annoter la balise",
|
||||
@@ -64,12 +70,13 @@
|
||||
"no remotes to pull": "Votre dépôt n'a aucun dépôt distant configuré pour un Pull.",
|
||||
"pick remote pull repo": "Choisir un dépôt distant duquel extraire la branche",
|
||||
"no remotes to push": "Votre dépôt n'a aucun dépôt distant configuré pour un Push.",
|
||||
"push with tags success": "Envoyé (push) avec des balises.",
|
||||
"nobranch": "Vous devez extraire une branche dont vous souhaitez effectuer le Push vers un emplacement distant.",
|
||||
"confirm publish branch": "La branche '{0}' n'a pas de branche en amont. Voulez-vous publier cette branche ?",
|
||||
"ok": "OK",
|
||||
"push with tags success": "Envoyé (push) avec des balises.",
|
||||
"pick remote": "Choisissez un dépôt distant où publier la branche '{0}' :",
|
||||
"sync is unpredictable": "Cette action effectue un transfert (Push) et un tirage (Pull) des validations à destination et en provenance de '{0}'.",
|
||||
"ok": "OK",
|
||||
"never again": "OK, ne plus afficher",
|
||||
"never again": "OK, Ne plus afficher",
|
||||
"no remotes to publish": "Votre dépôt n'a aucun dépôt distant configuré pour une publication.",
|
||||
"no changes stash": "Aucune modification à remiser (stash).",
|
||||
"provide stash message": "Spécifier éventuellement un message pour la remise (stash)",
|
||||
|
||||
@@ -1,9 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"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."
|
||||
],
|
||||
"looking": "Recherche de git dans : {0}",
|
||||
"using git": "Utilisation de git {0} à partir de {1}",
|
||||
"downloadgit": "Télécharger Git",
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* 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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"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."
|
||||
],
|
||||
"too many submodules": "Le dépôt '{0}' a {1} sous-modules qui ne vont pas être ouverts automatiquement. Vous pouvez ouvrir chacun individuellement en ouvrant un fichier à l'intérieur.",
|
||||
"no repositories": "Aucun dépôt disponible",
|
||||
"pick repo": "Choisir un dépôt"
|
||||
}
|
||||
@@ -1,9 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"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."
|
||||
],
|
||||
"open": "Ouvrir",
|
||||
"index modified": "Index modifié",
|
||||
"modified": "Modifié",
|
||||
@@ -15,10 +17,10 @@
|
||||
"untracked": "Non suivi",
|
||||
"ignored": "Ignoré",
|
||||
"both deleted": "Tous deux supprimés",
|
||||
"added by us": "Ajouté par nos soins",
|
||||
"added by us": "Ajouté par nous",
|
||||
"deleted by them": "Supprimé par eux",
|
||||
"added by them": "Ajouté par eux",
|
||||
"deleted by us": "Supprimé par nos soins",
|
||||
"deleted by us": "Supprimé par nous",
|
||||
"both added": "Tous deux ajoutés",
|
||||
"both modified": "Tous deux modifiés",
|
||||
"commitMessage": "Message (press {0} to commit)",
|
||||
@@ -26,7 +28,8 @@
|
||||
"merge changes": "Fusionner les modifications",
|
||||
"staged changes": "Modifications en zone de transit",
|
||||
"changes": "Modifications",
|
||||
"ok": "OK",
|
||||
"commitMessageCountdown": "{0} caractères restants sur la ligne actuelle",
|
||||
"commitMessageWarning": "{0} caractères sur {1} sur la ligne actuelle",
|
||||
"neveragain": "Ne plus afficher",
|
||||
"huge": "Le dépôt Git dans '{0}' a trop de modifications actives, seul un sous-ensemble de fonctionnalités Git sera activé."
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
/*---------------------------------------------------------------------------------------------
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
// Do not edit this file. It is machine generated.
|
||||
{
|
||||
|
||||
@@ -1,9 +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.
|
||||
{
|
||||
"": [
|
||||
"--------------------------------------------------------------------------------------------",
|
||||
"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."
|
||||
],
|
||||
"checkout": "Extraire...",
|
||||
"sync changes": "Synchroniser les modifications",
|
||||
"publish changes": "Publier les modifications",
|
||||
|
||||
Reference in New Issue
Block a user