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:
Karl Burtram
2018-01-28 23:37:17 -08:00
committed by GitHub
parent 9a1ac20710
commit 251ae01c3e
8009 changed files with 93378 additions and 35634 deletions

View File

@@ -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.
{

View 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": "Oui",
"no": "Non",
"not now": "Pas maintenant",
"suggest auto fetch": "Voulez-vous activer la rappatriement automatique des dépôts Git ?"
}

View File

@@ -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) Créer nouvelle branche",
"repourl": "URL du dépôt",
"parent": "Répertoire parent",
"cancel": "$(sync~spin) Clonage du dépôt... Cliquer pour annuler",
"cancel tooltip": "Annuler le clonage",
"cloning": "Clonage du dépôt git...",
"openrepo": "Ouvrir le dépôt",
"proposeopen": "Voulez-vous ouvrir le dépôt cloné ?",
"init": "Choisir le dossier despace de travail dans lequel initialiser le dépôt git",
"init repo": "Initialiser le dépôt",
"create repo": "Initialiser le dépôt",
"are you sure": "Ceci va créer un dépôt Git dans '{0}'. Êtes-vous sûr de vouloir continuer ?",
@@ -49,12 +52,15 @@
"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",
"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",
"provide tag name": "Spécifiez un nom de balise",
"tag message": "Message",
"provide tag message": "Spécifiez un message pour annoter la balise",
"no remotes to fetch": "Ce dépôt n'a aucun dépôt distant configuré pour rappatrier.",
"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.",
@@ -71,7 +77,7 @@
"no stashes": "Aucune remise (stash) à restaurer.",
"pick stash to pop": "Choisir une remise (stash) à appliquer et supprimer",
"clean repo": "Nettoyez l'arborescence de travail de votre dépôt avant l'extraction.",
"cant push": "Push impossible des références vers la branche distante. Exécutez d'abord 'Extraire' pour intégrer vos modifications.",
"cant push": "impossible de pousser les références vers la branche distante. Exécutez d'abord 'Récupérer' pour intégrer vos modifications.",
"git error details": "Git : {0}",
"git error": "Erreur Git",
"open git log": "Ouvrir le journal Git"

View File

@@ -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": "Recherche de git dans : {0}",
"using git": "Utilisation de git {0} à partir de {1}",
"updateGit": "Mettre à jour Git",
"downloadgit": "Télécharger Git",
"neverShowAgain": "Ne plus afficher",
"notfound": "Git non trouvé. Installez-le et configurez-le en utilisant le paramètre 'git.path'.",
"updateGit": "Mettre à jour Git",
"git20": "Git {0} semble installé. Le code fonctionne mieux avec git >= 2"
}

View File

@@ -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.
{

View File

@@ -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": "Supprimé par nos soins",
"both added": "Tous deux ajoutés",
"both modified": "Tous deux modifiés",
"commitMessage": "Message (press {0} to commit)",
"commit": "Commit",
"merge changes": "Fusionner les modifications",
"staged changes": "Modifications en zone de transit",

View File

@@ -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.
{

View File

@@ -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.
{