@codingame/monaco-vscode-scm-service-override 9.0.2 → 9.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-scm-service-override",
-  "version": "9.0.2",
+  "version": "9.0.3",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.2"
+    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3"
   }
 }

package/vscode/src/vs/workbench/contrib/scm/browser/activity.js

@@ -113,7 +113,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
         if (count === 0) {
             return;
         }
-        const badge = ( (new NumberBadge(count, num => ( localize(6430, '{0} pending changes', num)))));
+        const badge = ( (new NumberBadge(count, num => ( localize(6331, '{0} pending changes', num)))));
         store.add(this.activityService.showViewActivity(VIEW_PANE_ID, { badge }));
     }
     _updateStatusBar(repository, commands, store) {
@@ -139,7 +139,7 @@ let SCMActiveRepositoryController = class SCMActiveRepositoryController extends
                 repoAgnosticActionName = '';
             }
             const statusbarEntry = {
-                name: ( localize(6431, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
+                name: ( localize(6332, "Source Control")) + (repoAgnosticActionName ? ` ${repoAgnosticActionName}` : ''),
                 text: command.title,
                 ariaLabel: tooltip,
                 tooltip,
@@ -172,8 +172,8 @@ let SCMActiveResourceContextKeyController = class SCMActiveResourceContextKeyCon
         this.uriIdentityService = uriIdentityService;
         this._repositories = observableFromEvent(this, Event.any(this.scmService.onDidAddRepository, this.scmService.onDidRemoveRepository), () => this.scmService.repositories);
         this._onDidRepositoryChange = ( (new Emitter()));
-        const activeResourceHasChangesContextKey = ( (new RawContextKey('scmActiveResourceHasChanges', false, ( localize(6432, "Whether the active resource has changes")))));
-        const activeResourceRepositoryContextKey = ( (new RawContextKey('scmActiveResourceRepository', undefined, ( localize(6433, "The active resource's repository")))));
+        const activeResourceHasChangesContextKey = ( (new RawContextKey('scmActiveResourceHasChanges', false, ( localize(6333, "Whether the active resource has changes")))));
+        const activeResourceRepositoryContextKey = ( (new RawContextKey('scmActiveResourceRepository', undefined, ( localize(6334, "The active resource's repository")))));
         this._store.add(autorunWithStore((reader, store) => {
             for (const repository of this._repositories.read(reader)) {
                 store.add(Event.runAndSubscribe(repository.provider.onDidChangeResources, () => {

package/vscode/src/vs/workbench/contrib/scm/browser/scm.contribution.js

@@ -45,10 +45,10 @@ ModesRegistry.registerLanguage({
 });
 ( (Registry.as(Extensions.Workbench)))
     .registerWorkbenchContribution(DirtyDiffWorkbenchController, LifecyclePhase.Restored);
-const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(2870, 'View icon of the Source Control view.')));
+const sourceControlViewIcon = registerIcon('source-control-view-icon', Codicon.sourceControl, ( localize(2869, 'View icon of the Source Control view.')));
 const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).registerViewContainer({
     id: VIEWLET_ID,
-    title: ( localize2(2871, 'Source Control')),
+    title: ( localize2(2870, 'Source Control')),
     ctorDescriptor: ( (new SyncDescriptor(SCMViewPaneContainer))),
     storageId: 'workbench.scm.views.state',
     icon: sourceControlViewIcon,
@@ -58,12 +58,12 @@ const viewContainer = ( (Registry.as(Extensions$1.ViewContainersRegistry))).regi
 }, ViewContainerLocation.Sidebar, { doNotRegisterOpenCommand: true });
 const viewsRegistry = ( (Registry.as(Extensions$1.ViewsRegistry)));
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: ( localize(2872, "No source control providers registered.")),
+    content: ( localize(2871, "No source control providers registered.")),
     when: 'default'
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
     content: ( localize(
-        2873,
+        2872,
         "None of the registered source control providers work in Restricted Mode."
     )),
     when: ( (ContextKeyExpr.and(
@@ -73,7 +73,7 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
     )))
 });
 viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
-    content: `[${( localize(2874, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
+    content: `[${( localize(2873, "Manage Workspace Trust"))}](command:${MANAGE_TRUST_COMMAND_ID})`,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scm.providerCount', 0)),
         WorkspaceTrustContext.IsEnabled,
@@ -82,7 +82,7 @@ viewsRegistry.registerViewWelcomeContent(VIEW_PANE_ID, {
 });
 viewsRegistry.registerViews([{
         id: VIEW_PANE_ID,
-        name: ( localize2(2871, 'Source Control')),
+        name: ( localize2(2870, 'Source Control')),
         ctorDescriptor: ( (new SyncDescriptor(SCMViewPane))),
         canToggleVisibility: true,
         canMoveView: true,
@@ -91,7 +91,7 @@ viewsRegistry.registerViews([{
         containerIcon: sourceControlViewIcon,
         openCommandActionDescriptor: {
             id: viewContainer.id,
-            mnemonicTitle: ( localize(2875, "Source &&Control")),
+            mnemonicTitle: ( localize(2874, "Source &&Control")),
             keybindings: {
                 primary: 0,
                 win: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KeyG },
@@ -103,7 +103,7 @@ viewsRegistry.registerViews([{
     }], viewContainer);
 viewsRegistry.registerViews([{
         id: REPOSITORIES_VIEW_PANE_ID,
-        name: ( localize2(2876, "Source Control Repositories")),
+        name: ( localize2(2875, "Source Control Repositories")),
         ctorDescriptor: ( (new SyncDescriptor(SCMRepositoriesViewPane))),
         canToggleVisibility: true,
         hideByDefault: true,
@@ -118,7 +118,7 @@ viewsRegistry.registerViews([{
     }], viewContainer);
 viewsRegistry.registerViews([{
         id: HISTORY_VIEW_PANE_ID,
-        name: ( localize2(2877, "Source Control Graph")),
+        name: ( localize2(2876, "Source Control Graph")),
         ctorDescriptor: ( (new SyncDescriptor(SCMHistoryViewPane))),
         canToggleVisibility: true,
         canMoveView: true,
@@ -138,7 +138,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
 ( (Registry.as(Extensions$2.Configuration))).registerConfiguration({
     id: 'scm',
     order: 5,
-    title: ( localize(2878, "Source Control")),
+    title: ( localize(2877, "Source Control")),
     type: 'object',
     scope: ConfigurationScope.RESOURCE,
     properties: {
@@ -146,21 +146,21 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['all', 'gutter', 'overview', 'minimap', 'none'],
             enumDescriptions: [
-                ( localize(2879, "Show the diff decorations in all available locations.")),
-                ( localize(2880, "Show the diff decorations only in the editor gutter.")),
-                ( localize(2881, "Show the diff decorations only in the overview ruler.")),
-                ( localize(2882, "Show the diff decorations only in the minimap.")),
-                ( localize(2883, "Do not show the diff decorations."))
+                ( localize(2878, "Show the diff decorations in all available locations.")),
+                ( localize(2879, "Show the diff decorations only in the editor gutter.")),
+                ( localize(2880, "Show the diff decorations only in the overview ruler.")),
+                ( localize(2881, "Show the diff decorations only in the minimap.")),
+                ( localize(2882, "Do not show the diff decorations."))
             ],
             default: 'all',
-            description: ( localize(2884, "Controls diff decorations in the editor."))
+            description: ( localize(2883, "Controls diff decorations in the editor."))
         },
         'scm.diffDecorationsGutterWidth': {
             type: 'number',
             enum: [1, 2, 3, 4, 5],
             default: 3,
             description: ( localize(
-                2885,
+                2884,
                 "Controls the width(px) of diff decorations in gutter (added & modified)."
             ))
         },
@@ -168,11 +168,11 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['always', 'hover'],
             enumDescriptions: [
-                ( localize(2886, "Show the diff decorator in the gutter at all times.")),
-                ( localize(2887, "Show the diff decorator in the gutter only on hover."))
+                ( localize(2885, "Show the diff decorator in the gutter at all times.")),
+                ( localize(2886, "Show the diff decorator in the gutter only on hover."))
             ],
             description: ( localize(
-                2888,
+                2887,
                 "Controls the visibility of the Source Control diff decorator in the gutter."
             )),
             default: 'always'
@@ -181,27 +181,27 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['diff', 'none'],
             enumDescriptions: [
-                ( localize(2889, "Show the inline diff Peek view on click.")),
-                ( localize(2890, "Do nothing."))
+                ( localize(2888, "Show the inline diff Peek view on click.")),
+                ( localize(2889, "Do nothing."))
             ],
-            description: ( localize(2891, "Controls the behavior of Source Control diff gutter decorations.")),
+            description: ( localize(2890, "Controls the behavior of Source Control diff gutter decorations.")),
             default: 'diff'
         },
         'scm.diffDecorationsGutterPattern': {
             type: 'object',
             description: ( localize(
-                2892,
+                2891,
                 "Controls whether a pattern is used for the diff decorations in gutter."
             )),
             additionalProperties: false,
             properties: {
                 'added': {
                     type: 'boolean',
-                    description: ( localize(2893, "Use pattern for the diff decorations in gutter for added lines.")),
+                    description: ( localize(2892, "Use pattern for the diff decorations in gutter for added lines.")),
                 },
                 'modified': {
                     type: 'boolean',
-                    description: ( localize(2894, "Use pattern for the diff decorations in gutter for modified lines.")),
+                    description: ( localize(2893, "Use pattern for the diff decorations in gutter for modified lines.")),
                 },
             },
             default: {
@@ -213,12 +213,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['true', 'false', 'inherit'],
             enumDescriptions: [
-                ( localize(2895, "Ignore leading and trailing whitespace.")),
-                ( localize(2896, "Do not ignore leading and trailing whitespace.")),
-                ( localize(2897, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
+                ( localize(2894, "Ignore leading and trailing whitespace.")),
+                ( localize(2895, "Do not ignore leading and trailing whitespace.")),
+                ( localize(2896, "Inherit from `diffEditor.ignoreTrimWhitespace`."))
             ],
             description: ( localize(
-                2898,
+                2897,
                 "Controls whether leading and trailing whitespace is ignored in Source Control diff gutter decorations."
             )),
             default: 'false'
@@ -226,7 +226,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.alwaysShowActions': {
             type: 'boolean',
             description: ( localize(
-                2899,
+                2898,
                 "Controls whether inline actions are always visible in the Source Control view."
             )),
             default: false
@@ -235,12 +235,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['all', 'focused', 'off'],
             enumDescriptions: [
-                ( localize(2900, "Show the sum of all Source Control Provider count badges.")),
-                ( localize(2901, "Show the count badge of the focused Source Control Provider.")),
-                ( localize(2902, "Disable the Source Control count badge."))
+                ( localize(2899, "Show the sum of all Source Control Provider count badges.")),
+                ( localize(2900, "Show the count badge of the focused Source Control Provider.")),
+                ( localize(2901, "Disable the Source Control count badge."))
             ],
             description: ( localize(
-                2903,
+                2902,
                 "Controls the count badge on the Source Control icon on the Activity Bar."
             )),
             default: 'all'
@@ -249,12 +249,12 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['hidden', 'auto', 'visible'],
             enumDescriptions: [
-                ( localize(2904, "Hide Source Control Provider count badges.")),
-                ( localize(2905, "Only show count badge for Source Control Provider when non-zero.")),
-                ( localize(2906, "Show Source Control Provider count badges."))
+                ( localize(2903, "Hide Source Control Provider count badges.")),
+                ( localize(2904, "Only show count badge for Source Control Provider when non-zero.")),
+                ( localize(2905, "Show Source Control Provider count badges."))
             ],
             markdownDescription: ( localize(
-                2907,
+                2906,
                 "Controls the count badges on Source Control Provider headers. These headers appear in the Source Control view when there is more than one provider or when the {0} setting is enabled, and in the Source Control Repositories view.",
                 '\`#scm.alwaysShowRepositories#\`'
             )),
@@ -264,22 +264,22 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             type: 'string',
             enum: ['tree', 'list'],
             enumDescriptions: [
-                ( localize(2908, "Show the repository changes as a tree.")),
-                ( localize(2909, "Show the repository changes as a list."))
+                ( localize(2907, "Show the repository changes as a tree.")),
+                ( localize(2908, "Show the repository changes as a list."))
             ],
-            description: ( localize(2910, "Controls the default Source Control repository view mode.")),
+            description: ( localize(2909, "Controls the default Source Control repository view mode.")),
             default: 'list'
         },
         'scm.defaultViewSortKey': {
             type: 'string',
             enum: ['name', 'path', 'status'],
             enumDescriptions: [
-                ( localize(2911, "Sort the repository changes by file name.")),
-                ( localize(2912, "Sort the repository changes by path.")),
-                ( localize(2913, "Sort the repository changes by Source Control status."))
+                ( localize(2910, "Sort the repository changes by file name.")),
+                ( localize(2911, "Sort the repository changes by path.")),
+                ( localize(2912, "Sort the repository changes by Source Control status."))
             ],
             description: ( localize(
-                2914,
+                2913,
                 "Controls the default Source Control repository changes sort order when viewed as a list."
             )),
             default: 'path'
@@ -287,7 +287,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.autoReveal': {
             type: 'boolean',
             description: ( localize(
-                2915,
+                2914,
                 "Controls whether the Source Control view should automatically reveal and select files when opening them."
             )),
             default: true
@@ -295,20 +295,20 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.inputFontFamily': {
             type: 'string',
             markdownDescription: ( localize(
-                2916,
+                2915,
                 "Controls the font for the input message. Use `default` for the workbench user interface font family, `editor` for the `#editor.fontFamily#`'s value, or a custom font family."
             )),
             default: 'default'
         },
         'scm.inputFontSize': {
             type: 'number',
-            markdownDescription: ( localize(2917, "Controls the font size for the input message in pixels.")),
+            markdownDescription: ( localize(2916, "Controls the font size for the input message in pixels.")),
             default: 13
         },
         'scm.inputMaxLineCount': {
             type: 'number',
             markdownDescription: ( localize(
-                2918,
+                2917,
                 "Controls the maximum number of lines that the input will auto-grow to."
             )),
             minimum: 1,
@@ -318,7 +318,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.inputMinLineCount': {
             type: 'number',
             markdownDescription: ( localize(
-                2919,
+                2918,
                 "Controls the minimum number of lines that the input will auto-grow from."
             )),
             minimum: 1,
@@ -328,7 +328,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.alwaysShowRepositories': {
             type: 'boolean',
             markdownDescription: ( localize(
-                2920,
+                2919,
                 "Controls whether repositories should always be visible in the Source Control view."
             )),
             default: false
@@ -338,20 +338,20 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             enum: ['discovery time', 'name', 'path'],
             enumDescriptions: [
                 ( localize(
-                    2921,
+                    2920,
                     "Repositories in the Source Control Repositories view are sorted by discovery time. Repositories in the Source Control view are sorted in the order that they were selected."
                 )),
                 ( localize(
-                    2922,
+                    2921,
                     "Repositories in the Source Control Repositories and Source Control views are sorted by repository name."
                 )),
                 ( localize(
-                    2923,
+                    2922,
                     "Repositories in the Source Control Repositories and Source Control views are sorted by repository path."
                 ))
             ],
             description: ( localize(
-                2924,
+                2923,
                 "Controls the sort order of the repositories in the source control repositories view."
             )),
             default: 'discovery time'
@@ -359,7 +359,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.repositories.visible': {
             type: 'number',
             description: ( localize(
-                2925,
+                2924,
                 "Controls how many repositories are visible in the Source Control Repositories section. Set to 0, to be able to manually resize the view."
             )),
             default: 10
@@ -367,7 +367,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.showActionButton': {
             type: 'boolean',
             markdownDescription: ( localize(
-                2926,
+                2925,
                 "Controls whether an action button can be shown in the Source Control view."
             )),
             default: true
@@ -375,7 +375,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.showInputActionButton': {
             type: 'boolean',
             markdownDescription: ( localize(
-                2927,
+                2926,
                 "Controls whether an action button can be shown in the Source Control input."
             )),
             default: true
@@ -383,7 +383,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.workingSets.enabled': {
             type: 'boolean',
             description: ( localize(
-                2928,
+                2927,
                 "Controls whether to store editor working sets when switching between source control history item groups."
             )),
             default: false
@@ -393,16 +393,16 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
             enum: ['empty', 'current'],
             enumDescriptions: [
                 ( localize(
-                    2929,
+                    2928,
                     "Use an empty working set when switching to a source control history item group that does not have a working set."
                 )),
                 ( localize(
-                    2930,
+                    2929,
                     "Use the current working set when switching to a source control history item group that does not have a working set."
                 ))
             ],
             description: ( localize(
-                2931,
+                2930,
                 "Controls the default working set to use when switching to a source control history item group that does not have a working set."
             )),
             default: 'current'
@@ -410,7 +410,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
         'scm.compactFolders': {
             type: 'boolean',
             description: ( localize(
-                2932,
+                2931,
                 "Controls whether the Source Control view should render folders in a compact form. In such a form, single child folders will be compressed in a combined tree element."
             )),
             default: true
@@ -419,7 +419,7 @@ registerWorkbenchContribution2(SCMWorkingSetController.ID, SCMWorkingSetControll
 });
 KeybindingsRegistry.registerCommandAndKeybindingRule({
     id: 'scm.acceptInput',
-    metadata: { description: ( localize(2933, "Source Control: Accept Input")), args: [] },
+    metadata: { description: ( localize(2932, "Source Control: Accept Input")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     when: ( (ContextKeyExpr.has('scmRepository'))),
     primary: KeyMod.CtrlCmd | KeyCode.Enter,
@@ -459,7 +459,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
     }
 });
 const viewNextCommitCommand = {
-    description: { description: ( localize(2934, "Source Control: View Next Commit")), args: [] },
+    description: { description: ( localize(2933, "Source Control: View Next Commit")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -471,7 +471,7 @@ const viewNextCommitCommand = {
     }
 };
 const viewPreviousCommitCommand = {
-    description: { description: ( localize(2935, "Source Control: View Previous Commit")), args: [] },
+    description: { description: ( localize(2934, "Source Control: View Previous Commit")), args: [] },
     weight: KeybindingWeight.WorkbenchContrib,
     handler: (accessor) => {
         const contextKeyService = accessor.get(IContextKeyService);
@@ -548,7 +548,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInTerminal',
-        title: ( localize(2936, "Open in External Terminal"))
+        title: ( localize(2935, "Open in External Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),
@@ -562,7 +562,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMSourceControl, {
     group: '100_end',
     command: {
         id: 'scm.openInIntegratedTerminal',
-        title: ( localize(2937, "Open in Integrated Terminal"))
+        title: ( localize(2936, "Open in Integrated Terminal"))
     },
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('scmProviderHasRootUri', true)),

package/vscode/src/vs/workbench/contrib/scm/browser/scmHistory.js

@@ -20,14 +20,14 @@ const SWIMLANE_HEIGHT = 22;
 const SWIMLANE_WIDTH = 11;
 const CIRCLE_RADIUS = 4;
 const SWIMLANE_CURVE_RADIUS = 5;
-const historyItemGroupLocal = registerColor('scmGraph.historyItemGroupLocal', chartsBlue, ( localize(10520, "Local history item group color.")));
-const historyItemGroupRemote = registerColor('scmGraph.historyItemGroupRemote', chartsPurple, ( localize(10521, "Remote history item group color.")));
-const historyItemGroupBase = registerColor('scmGraph.historyItemGroupBase', chartsOrange, ( localize(10522, "Base history item group color.")));
-const historyItemGroupHoverLabelForeground = registerColor('scmGraph.historyItemHoverLabelForeground', buttonForeground, ( localize(10523, "History item hover label foreground color.")));
+const historyItemGroupLocal = registerColor('scmGraph.historyItemGroupLocal', chartsBlue, ( localize(10471, "Local history item group color.")));
+const historyItemGroupRemote = registerColor('scmGraph.historyItemGroupRemote', chartsPurple, ( localize(10472, "Remote history item group color.")));
+const historyItemGroupBase = registerColor('scmGraph.historyItemGroupBase', chartsOrange, ( localize(10473, "Base history item group color.")));
+const historyItemGroupHoverLabelForeground = registerColor('scmGraph.historyItemHoverLabelForeground', buttonForeground, ( localize(10474, "History item hover label foreground color.")));
 const colorRegistry = [
-    registerColor('scmGraph.foreground1', chartsGreen, ( localize(10524, "Source control graph foreground color (1)."))),
-    registerColor('scmGraph.foreground2', chartsRed, ( localize(10525, "Source control graph foreground color (2)."))),
-    registerColor('scmGraph.foreground3', chartsYellow, ( localize(10526, "Source control graph foreground color (3)."))),
+    registerColor('scmGraph.foreground1', chartsGreen, ( localize(10475, "Source control graph foreground color (1)."))),
+    registerColor('scmGraph.foreground2', chartsRed, ( localize(10476, "Source control graph foreground color (2)."))),
+    registerColor('scmGraph.foreground3', chartsYellow, ( localize(10477, "Source control graph foreground color (3)."))),
 ];
 function getLabelColorIdentifier(historyItem, colorMap) {
     for (const label of historyItem.labels ?? []) {

package/vscode/src/vs/workbench/contrib/scm/browser/scmHistoryViewPane.js

@@ -66,13 +66,13 @@ import { WorkbenchToolBar } from 'vscode/vscode/vs/platform/actions/browser/tool
 import { IProgressService } from 'vscode/vscode/vs/platform/progress/common/progress.service';
 
 var RepositoryRenderer_1, HistoryItemRenderer_1, HistoryItemLoadMoreRenderer_1;
-const historyItemAdditionsForeground = registerColor('scmGraph.historyItemHoverAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6467, "History item hover additions foreground color.")));
-const historyItemDeletionsForeground = registerColor('scmGraph.historyItemHoverDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6468, "History item hover deletions foreground color.")));
+const historyItemAdditionsForeground = registerColor('scmGraph.historyItemHoverAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6368, "History item hover additions foreground color.")));
+const historyItemDeletionsForeground = registerColor('scmGraph.historyItemHoverDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6369, "History item hover deletions foreground color.")));
 registerAction2(class extends ViewAction {
     constructor() {
         super({
             id: 'workbench.scm.action.refreshGraph',
-            title: ( localize(6469, "Refresh")),
+            title: ( localize(6370, "Refresh")),
             viewId: HISTORY_VIEW_PANE_ID,
             f1: false,
             icon: Codicon.refresh,
@@ -265,19 +265,19 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         if (historyItem.statistics) {
             markdown.appendMarkdown(`---\n\n`);
             markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
-                ( localize(6470, "{0} file changed", historyItem.statistics.files)) :
-                ( localize(6471, "{0} files changed", historyItem.statistics.files))}</span>`);
+                ( localize(6371, "{0} file changed", historyItem.statistics.files)) :
+                ( localize(6372, "{0} files changed", historyItem.statistics.files))}</span>`);
             if (historyItem.statistics.insertions) {
                 const historyItemAdditionsForegroundColor = colorTheme.getColor(historyItemAdditionsForeground);
                 markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemAdditionsForegroundColor};">${historyItem.statistics.insertions === 1 ?
-                    ( localize(6472, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
-                    ( localize(6473, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
+                    ( localize(6373, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
+                    ( localize(6374, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
             }
             if (historyItem.statistics.deletions) {
                 const historyItemDeletionsForegroundColor = colorTheme.getColor(historyItemDeletionsForeground);
                 markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemDeletionsForegroundColor};">${historyItem.statistics.deletions === 1 ?
-                    ( localize(6474, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
-                    ( localize(6475, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
+                    ( localize(6375, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
+                    ( localize(6376, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
             }
         }
         const labels = this.getLabels(element.repository);
@@ -349,7 +349,7 @@ let HistoryItemLoadMoreRenderer = class HistoryItemLoadMoreRenderer {
             templateData.elementDisposables.add(autorun(reader => {
                 const loadingMore = this._loadingMore(element.element.repository).read(reader);
                 const icon = `$(${loadingMore ? 'loading~spin' : 'fold-down'})`;
-                templateData.historyItemPlaceholderLabel.setLabel(( localize(6476, "{0} Load More...", icon)));
+                templateData.historyItemPlaceholderLabel.setLabel(( localize(6377, "{0} Load More...", icon)));
             }));
         }
         else {
@@ -443,7 +443,7 @@ SCMHistoryViewPaneActionRunner = ( (__decorate([
 ], SCMHistoryViewPaneActionRunner)));
 class SCMHistoryTreeAccessibilityProvider {
     getWidgetAriaLabel() {
-        return ( localize(6477, "Source Control History"));
+        return ( localize(6378, "Source Control History"));
     }
     getAriaLabel(element) {
         if (isSCMRepository(element)) {
@@ -779,7 +779,7 @@ let SCMHistoryViewPane = class SCMHistoryViewPane extends ViewPane {
                     this.refresh(repository);
                     return;
                 }
-                const description = ( localize(6478, "OUTDATED"));
+                const description = ( localize(6379, "OUTDATED"));
                 this._setRepositoryDescription(this._isRepositoryNodeVisible() ? repository : undefined, description);
             }));
             this._repositories.set(repository, repositoryDisposables);

package/vscode/src/vs/workbench/contrib/scm/browser/scmRepositoriesViewPane.js

@@ -59,7 +59,7 @@ let SCMRepositoriesViewPane = class SCMRepositoriesViewPane extends ViewPane {
                     return r.provider.label;
                 },
                 getWidgetAriaLabel() {
-                    return ( localize(6464, "Source Control Repositories"));
+                    return ( localize(6365, "Source Control Repositories"));
                 }
             }
         });

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPane.js

@@ -120,10 +120,10 @@ import { fromNow } from 'vscode/vscode/vs/base/common/date';
 import { observableConfigValue } from 'vscode/vscode/vs/platform/observable/common/platformObservableUtils';
 
 var ActionButtonRenderer_1, InputRenderer_1, ResourceGroupRenderer_1, ResourceRenderer_1, HistoryItemGroupRenderer_1, HistoryItemRenderer_1, HistoryItem2Renderer_1, HistoryItemChangeRenderer_1, SeparatorRenderer_1, SCMInputWidget_1;
-const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6435, "History item additions foreground color.")));
-const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6436, "History item deletions foreground color.")));
-registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(6437, "History item statistics border color.")));
-registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(6438, "History item selected statistics border color.")));
+const historyItemAdditionsForeground = registerColor('scm.historyItemAdditionsForeground', 'gitDecoration.addedResourceForeground', ( localize(6336, "History item additions foreground color.")));
+const historyItemDeletionsForeground = registerColor('scm.historyItemDeletionsForeground', 'gitDecoration.deletedResourceForeground', ( localize(6337, "History item deletions foreground color.")));
+registerColor('scm.historyItemStatisticsBorder', ( (transparent(foreground, 0.2))), ( localize(6338, "History item statistics border color.")));
+registerColor('scm.historyItemSelectedStatisticsBorder', ( (transparent(listActiveSelectionForeground, 0.2))), ( localize(6339, "History item selected statistics border color.")));
 function processResourceFilterData(uri, filterData) {
     if (!filterData) {
         return [undefined, undefined];
@@ -810,12 +810,12 @@ let HistoryItemRenderer = class HistoryItemRenderer {
         if (historyItem.statistics) {
             const statsAriaLabel = [
                 historyItem.statistics.files === 1 ?
-                    ( localize(6439, "{0} file changed", historyItem.statistics.files)) :
-                    ( localize(6440, "{0} files changed", historyItem.statistics.files)),
-                historyItem.statistics.insertions === 1 ? ( localize(6441, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
-                    historyItem.statistics.insertions > 1 ? ( localize(6442, "{0} insertions{1}", historyItem.statistics.insertions, '(+)')) : '',
-                historyItem.statistics.deletions === 1 ? ( localize(6443, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
-                    historyItem.statistics.deletions > 1 ? ( localize(6444, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
+                    ( localize(6340, "{0} file changed", historyItem.statistics.files)) :
+                    ( localize(6341, "{0} files changed", historyItem.statistics.files)),
+                historyItem.statistics.insertions === 1 ? ( localize(6342, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
+                    historyItem.statistics.insertions > 1 ? ( localize(6343, "{0} insertions{1}", historyItem.statistics.insertions, '(+)')) : '',
+                historyItem.statistics.deletions === 1 ? ( localize(6344, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
+                    historyItem.statistics.deletions > 1 ? ( localize(6345, "{0} deletions{1}", historyItem.statistics.deletions, '(-)')) : ''
             ];
             const statsTitle = statsAriaLabel.filter(l => l !== '').join(', ');
             templateData.statsContainer.setAttribute('aria-label', statsTitle);
@@ -903,19 +903,19 @@ let HistoryItem2Renderer = class HistoryItem2Renderer {
         if (historyItem.statistics) {
             markdown.appendMarkdown(`---\n\n`);
             markdown.appendMarkdown(`<span>${historyItem.statistics.files === 1 ?
-                ( localize(6439, "{0} file changed", historyItem.statistics.files)) :
-                ( localize(6440, "{0} files changed", historyItem.statistics.files))}</span>`);
+                ( localize(6340, "{0} file changed", historyItem.statistics.files)) :
+                ( localize(6341, "{0} files changed", historyItem.statistics.files))}</span>`);
             if (historyItem.statistics.insertions) {
                 const historyItemAdditionsForegroundColor = colorTheme.getColor(historyItemAdditionsForeground);
                 markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemAdditionsForegroundColor};">${historyItem.statistics.insertions === 1 ?
-                    ( localize(6441, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
-                    ( localize(6442, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
+                    ( localize(6342, "{0} insertion{1}", historyItem.statistics.insertions, '(+)')) :
+                    ( localize(6343, "{0} insertions{1}", historyItem.statistics.insertions, '(+)'))}</span>`);
             }
             if (historyItem.statistics.deletions) {
                 const historyItemDeletionsForegroundColor = colorTheme.getColor(historyItemDeletionsForeground);
                 markdown.appendMarkdown(`,&nbsp;<span style="color:${historyItemDeletionsForegroundColor};">${historyItem.statistics.deletions === 1 ?
-                    ( localize(6443, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
-                    ( localize(6444, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
+                    ( localize(6344, "{0} deletion{1}", historyItem.statistics.deletions, '(-)')) :
+                    ( localize(6345, "{0} deletions{1}", historyItem.statistics.deletions, '(-)'))}</span>`);
             }
         }
         if (historyItem.labels) {
@@ -1342,7 +1342,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
         this.labelService = labelService;
     }
     getWidgetAriaLabel() {
-        return ( localize(6445, "Source Control Management"));
+        return ( localize(6346, "Source Control Management"));
     }
     getAriaLabel(element) {
         if (ResourceTree.isResourceNode(element)) {
@@ -1352,7 +1352,7 @@ let SCMAccessibilityProvider = class SCMAccessibilityProvider {
             return `${element.provider.name} ${element.provider.label}`;
         }
         else if (isSCMInput(element)) {
-            return ( localize(6446, "Source Control Input"));
+            return ( localize(6347, "Source Control Input"));
         }
         else if (isSCMActionButton(element)) {
             return element.button?.command.title ?? '';
@@ -1431,7 +1431,7 @@ const ContextKeys = {
     }
 };
 MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
-    title: ( localize(6447, "View & Sort")),
+    title: ( localize(6348, "View & Sort")),
     submenu: Menus.ViewSort,
     when: ( (ContextKeyExpr.and(
          (ContextKeyExpr.equals('view', VIEW_PANE_ID)),
@@ -1441,7 +1441,7 @@ MenuRegistry.appendMenuItem(MenuId.SCMTitle, {
     order: 1
 });
 MenuRegistry.appendMenuItem(Menus.ViewSort, {
-    title: ( localize(6448, "Repositories")),
+    title: ( localize(6349, "Repositories")),
     submenu: Menus.Repositories,
     when: ContextKeyExpr.greater(ContextKeys.RepositoryCount.key, 1),
     group: '0_repositories'
@@ -1450,7 +1450,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.scm.action.scm.viewChanges',
-            title: ( localize(6449, "View Changes")),
+            title: ( localize(6350, "View Changes")),
             f1: false,
             menu: [
                 {
@@ -1483,7 +1483,7 @@ registerAction2(class extends Action2 {
         const title = historyItems.length === 1 ?
             `${historyItems[0].id.substring(0, 8)} - ${historyItems[0].message}` :
             ( localize(
-                6450,
+                6351,
                 "All Changes ({0} ↔ {1})",
                 historyItemLast.id.substring(0, 8),
                 historyItem.id.substring(0, 8)
@@ -1585,7 +1585,7 @@ class SetListViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setListViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(6451, "View as List")),
+            title: ( localize(6352, "View as List")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listTree,
@@ -1615,7 +1615,7 @@ class SetTreeViewModeAction extends ViewAction {
     constructor(id = 'workbench.scm.action.setTreeViewMode', menu = {}) {
         super({
             id,
-            title: ( localize(6452, "View as Tree")),
+            title: ( localize(6353, "View as Tree")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.listFlat,
@@ -1672,17 +1672,17 @@ class RepositorySortAction extends ViewAction {
 }
 class RepositorySortByDiscoveryTimeAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(6453, "Sort by Discovery Time")));
+        super(ISCMRepositorySortKey.DiscoveryTime, ( localize(6354, "Sort by Discovery Time")));
     }
 }
 class RepositorySortByNameAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Name, ( localize(6454, "Sort by Name")));
+        super(ISCMRepositorySortKey.Name, ( localize(6355, "Sort by Name")));
     }
 }
 class RepositorySortByPathAction extends RepositorySortAction {
     constructor() {
-        super(ISCMRepositorySortKey.Path, ( localize(6455, "Sort by Path")));
+        super(ISCMRepositorySortKey.Path, ( localize(6356, "Sort by Path")));
     }
 }
 registerAction2(RepositorySortByDiscoveryTimeAction);
@@ -1707,17 +1707,17 @@ class SetSortKeyAction extends ViewAction {
 }
 class SetSortByNameAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Name, ( localize(6456, "Sort Changes by Name")));
+        super(ViewSortKey.Name, ( localize(6357, "Sort Changes by Name")));
     }
 }
 class SetSortByPathAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Path, ( localize(6457, "Sort Changes by Path")));
+        super(ViewSortKey.Path, ( localize(6358, "Sort Changes by Path")));
     }
 }
 class SetSortByStatusAction extends SetSortKeyAction {
     constructor() {
-        super(ViewSortKey.Status, ( localize(6458, "Sort Changes by Status")));
+        super(ViewSortKey.Status, ( localize(6359, "Sort Changes by Status")));
     }
 }
 registerAction2(SetSortByNameAction);
@@ -1727,7 +1727,7 @@ class CollapseAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.collapseAllRepositories`,
-            title: ( localize(6459, "Collapse All Repositories")),
+            title: ( localize(6360, "Collapse All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.collapseAll,
@@ -1750,7 +1750,7 @@ class ExpandAllRepositoriesAction extends ViewAction {
     constructor() {
         super({
             id: `workbench.scm.action.expandAllRepositories`,
-            title: ( localize(6460, "Expand All Repositories")),
+            title: ( localize(6361, "Expand All Repositories")),
             viewId: VIEW_PANE_ID,
             f1: false,
             icon: Codicon.expandAll,
@@ -1829,10 +1829,10 @@ let SCMInputWidgetToolbar = class SCMInputWidgetToolbar extends WorkbenchToolBar
         this._onDidChange = ( (new Emitter()));
         this.onDidChange = this._onDidChange.event;
         this._disposables = this._register(( (new MutableDisposable())));
-        this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6461, "More Actions...")), 'codicon-chevron-down')));
+        this._dropdownAction = ( (new Action('scmInputMoreActions', ( localize(6362, "More Actions...")), 'codicon-chevron-down')));
         this._cancelAction = ( (new MenuItemAction({
             id: SCMInputWidgetCommandId.CancelAction,
-            title: ( localize(6462, "Cancel")),
+            title: ( localize(6363, "Cancel")),
             icon: Codicon.debugStop,
         }, undefined, undefined, undefined, undefined, contextKeyService, commandService)));
     }
@@ -2283,7 +2283,7 @@ let SCMInputWidget = class SCMInputWidget {
                 }
                 const actionsContainer = append(validationContainer, $('.scm-editor-validation-actions'));
                 const actionbar = ( (new ActionBar(actionsContainer)));
-                const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(6463, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
+                const action = ( (new Action('scmInputWidget.validationMessage.close', ( localize(6364, "Close")), ThemeIcon.asClassName(Codicon.close), true, () => {
                     this.contextViewService.hideContextView();
                     this.element.style.borderBottomLeftRadius = '2px';
                     this.element.style.borderBottomRightRadius = '2px';

package/vscode/src/vs/workbench/contrib/scm/browser/scmViewPaneContainer.js

@@ -26,7 +26,7 @@ let SCMViewPaneContainer = class SCMViewPaneContainer extends ViewPaneContainer
         return 400;
     }
     getTitle() {
-        return ( localize(6434, "Source Control"));
+        return ( localize(6335, "Source Control"));
     }
 };
 SCMViewPaneContainer = ( (__decorate([