diff options
Diffstat (limited to 'i18n/fra/extensions/merge-conflict/package.i18n.json')
| -rw-r--r-- | i18n/fra/extensions/merge-conflict/package.i18n.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/i18n/fra/extensions/merge-conflict/package.i18n.json b/i18n/fra/extensions/merge-conflict/package.i18n.json index 3bfb714e400..c2da2db9fb3 100644 --- a/i18n/fra/extensions/merge-conflict/package.i18n.json +++ b/i18n/fra/extensions/merge-conflict/package.i18n.json @@ -7,7 +7,7 @@ "Do not edit this file. It is machine generated." ], "displayName": "Conflit de fusion", - "description": "Coloration et commandes pour des conflits de fusion en ligne.", + "description": "Mise en surbrillance et commandes pour les conflits de fusion inline.", "command.category": "Conflit de fusion", "command.accept.all-current": "Accepter les modifications actuelles", "command.accept.all-incoming": "Accepter toutes les modifications entrantes", |