@codingame/monaco-vscode-view-common-service-override 13.0.0 → 13.1.1

package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js

@@ -25,22 +25,22 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
     static { this.AUTO_LOCK_EXTRA_EDITORS = [
         {
             id: 'workbench.input.interactive',
-            label: ( localize(3069, 'Interactive Window')),
+            label: ( localize(3087, 'Interactive Window')),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-markdown.preview',
-            label: ( localize(3070, "Markdown Preview")),
+            label: ( localize(3088, "Markdown Preview")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-simpleBrowser.view',
-            label: ( localize(3071, "Simple Browser")),
+            label: ( localize(3089, "Simple Browser")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-browserPreview',
-            label: ( localize(3072, "Live Preview")),
+            label: ( localize(3090, "Live Preview")),
             priority: RegisteredEditorPriority.builtin
         }
     ]; }
@@ -85,7 +85,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 'workbench.editor.autoLockGroups': {
                     type: 'object',
                     description: ( localize(
-                        3073,
+                        3091,
                         "If an editor matching one of the listed types is opened as the first in an editor group and more than one group is open, the group is automatically locked. Locked groups will only be used for opening editors when explicitly chosen by a user gesture (for example drag and drop), but not by default. Consequently, the active editor in a locked group is less likely to be replaced accidentally with a different editor."
                     )),
                     properties: autoLockGroupConfiguration,
@@ -103,7 +103,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     default: '',
                     enum: [...binaryEditorCandidates, ''],
                     description: ( localize(
-                        3074,
+                        3092,
                         "The default editor for files detected as binary. If undefined, the user will be presented with a picker."
                     )),
                 }
@@ -116,7 +116,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 'workbench.editorAssociations': {
                     type: 'object',
                     markdownDescription: ( localize(
-                        3075,
+                        3093,
                         "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
                     )),
                     patternProperties: {
@@ -138,7 +138,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     minimum: 1,
                     scope: ConfigurationScope.RESOURCE,
                     markdownDescription: ( localize(
-                        3076,
+                        3094,
                         "Controls the minimum size of a file in MB before asking for confirmation when opening in the editor. Note that this setting may not apply to all editor types and environments."
                     )),
                 }

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

@@ -24,12 +24,12 @@ import { registerIcon } from '@codingame/monaco-vscode-api/vscode/vs/platform/th
 import { isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 
 var CallHierarchyController_1;
-const _ctxHasCallHierarchyProvider = ( new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4111, 'Whether a call hierarchy provider is available'))));
-const _ctxCallHierarchyVisible = ( new RawContextKey('callHierarchyVisible', false, ( localize(4112, 'Whether call hierarchy peek is currently showing'))));
+const _ctxHasCallHierarchyProvider = ( new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4129, 'Whether a call hierarchy provider is available'))));
+const _ctxCallHierarchyVisible = ( new RawContextKey('callHierarchyVisible', false, ( localize(4130, 'Whether call hierarchy peek is currently showing'))));
 const _ctxCallHierarchyDirection = ( new RawContextKey(
     'callHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(4113, 'Whether call hierarchy shows incoming or outgoing calls')) }
+    { type: 'string', description: ( localize(4131, 'Whether call hierarchy shows incoming or outgoing calls')) }
 ));
 function sanitizedDirection(candidate) {
     return candidate === CallHierarchyDirection.CallsFrom || candidate === CallHierarchyDirection.CallsTo
@@ -117,14 +117,14 @@ let CallHierarchyController = class CallHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(4114, "No results")));
+                this._widget.showMessage(( localize(4132, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endCallHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4115, "Failed to show call hierarchy")));
+            this._widget.showMessage(( localize(4133, "Failed to show call hierarchy")));
         });
     }
     showOutgoingCalls() {
@@ -152,7 +152,7 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showCallHierarchy',
-            title: ( localize2(4116, 'Peek Call Hierarchy')),
+            title: ( localize2(4134, 'Peek Call Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -176,8 +176,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showIncomingCalls',
-            title: ( localize2(4117, 'Show Incoming Calls')),
-            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4118, 'Icon for incoming calls in the call hierarchy view.'))),
+            title: ( localize2(4135, 'Show Incoming Calls')),
+            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4136, 'Icon for incoming calls in the call hierarchy view.'))),
             precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom)))),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -198,8 +198,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showOutgoingCalls',
-            title: ( localize2(4119, 'Show Outgoing Calls')),
-            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4120, 'Icon for outgoing calls in the call hierarchy view.'))),
+            title: ( localize2(4137, 'Show Outgoing Calls')),
+            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4138, 'Icon for outgoing calls in the call hierarchy view.'))),
             precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo)))),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -220,7 +220,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusCallHierarchy',
-            title: ( localize2(4121, 'Refocus Call Hierarchy')),
+            title: ( localize2(4139, 'Refocus Call Hierarchy')),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -236,7 +236,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeCallHierarchy',
-            title: ( localize(4122, 'Close')),
+            title: ( localize(4140, 'Close')),
             icon: Codicon.close,
             precondition: _ctxCallHierarchyVisible,
             keybinding: {

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js

@@ -267,13 +267,13 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === CallHierarchyDirection.CallsFrom
-            ? ( localize(4123, "Calls from '{0}'", element.model.root.name))
-            : ( localize(4124, "Callers of '{0}'", element.model.root.name));
+            ? ( localize(4141, "Calls from '{0}'", element.model.root.name))
+            : ( localize(4142, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(4125, "Loading...")));
+        this.setTitle(( localize(4143, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -292,8 +292,8 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === CallHierarchyDirection.CallsFrom
-                ? ( localize(4126, "No calls from '{0}'", model.root.name))
-                : ( localize(4127, "No callers of '{0}'", model.root.name)));
+                ? ( localize(4144, "No calls from '{0}'", model.root.name))
+                : ( localize(4145, "No callers of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js

@@ -107,14 +107,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(4128, "Call Hierarchy");
+        return localize(4146, "Call Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
-            return localize(4129, "calls from {0}", element.item.name);
+            return localize(4147, "calls from {0}", element.item.name);
         }
         else {
-            return localize(4130, "callers of {0}", element.item.name);
+            return localize(4148, "callers of {0}", element.item.name);
         }
     }
 }

package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js

@@ -8,7 +8,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { ICustomEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/customEditor/common/customEditor.service';
 import { NotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { WebviewContentPurpose } from '@codingame/monaco-vscode-22790577-4553-50b6-978d-0acc75c394cc-common/vscode/vs/workbench/contrib/webview/browser/webview';
+import { WebviewContentPurpose } from '@codingame/monaco-vscode-972e8507-3a64-566d-8bc0-b78993998562-common/vscode/vs/workbench/contrib/webview/browser/webview';
 import { IWebviewService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webview/browser/webview.service';
 import { WebviewEditorInputSerializer, reviveWebviewExtensionDescription, restoreWebviewOptions, restoreWebviewContentOptions } from '../../webviewPanel/browser/webviewEditorInputSerializer.js';
 import { IWebviewWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbenchService.service';

package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js

@@ -32,7 +32,7 @@ class ContributedCustomEditors extends Disposable {
                 this.add(( new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localize(4921, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(4939, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
                     selector: webviewEditorContribution.selector || [],
                     priority: getPriorityFromContribution(webviewEditorContribution, extension.description),
                 })));

package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js

@@ -6,7 +6,7 @@ import { globMatchesResource, RegisteredEditorPriority, priorityToRank } from '@
 
 const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = ( new RawContextKey('activeCustomEditorId', '', {
     type: 'string',
-    description: ( localize(4922, "The viewType of the currently active custom editor.")),
+    description: ( localize(4940, "The viewType of the currently active custom editor.")),
 }));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( new RawContextKey('focusedCustomEditorIsEditable', false));
 var CustomEditorPriority;

package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js

@@ -16,7 +16,7 @@ const Fields = ( Object.freeze({
     priority: 'priority',
 }));
 const CustomEditorsContribution = {
-    description: ( localize(4924, 'Contributed custom editors.')),
+    description: ( localize(4942, 'Contributed custom editors.')),
     type: 'array',
     defaultSnippets: [{
             body: [{
@@ -38,20 +38,20 @@ const CustomEditorsContribution = {
             [Fields.viewType]: {
                 type: 'string',
                 markdownDescription: ( localize(
-                    4925,
+                    4943,
                     'Identifier for the custom editor. This must be unique across all custom editors, so we recommend including your extension id as part of `viewType`. The `viewType` is used when registering custom editors with `vscode.registerCustomEditorProvider` and in the `onCustomEditor:${id}` [activation event](https://code.visualstudio.com/api/references/activation-events).'
                 )),
             },
             [Fields.displayName]: {
                 type: 'string',
                 description: ( localize(
-                    4926,
+                    4944,
                     'Human readable name of the custom editor. This is displayed to users when selecting which editor to use.'
                 )),
             },
             [Fields.selector]: {
                 type: 'array',
-                description: ( localize(4927, 'Set of globs that the custom editor is enabled for.')),
+                description: ( localize(4945, 'Set of globs that the custom editor is enabled for.')),
                 items: {
                     type: 'object',
                     defaultSnippets: [{
@@ -62,7 +62,7 @@ const CustomEditorsContribution = {
                     properties: {
                         filenamePattern: {
                             type: 'string',
-                            description: ( localize(4928, 'Glob that the custom editor is enabled for.')),
+                            description: ( localize(4946, 'Glob that the custom editor is enabled for.')),
                         },
                     }
                 }
@@ -70,7 +70,7 @@ const CustomEditorsContribution = {
             [Fields.priority]: {
                 type: 'string',
                 markdownDeprecationMessage: ( localize(
-                    4929,
+                    4947,
                     'Controls if the custom editor is enabled automatically when the user opens a file. This may be overridden by users using the `workbench.editorAssociations` setting.'
                 )),
                 enum: [
@@ -79,11 +79,11 @@ const CustomEditorsContribution = {
                 ],
                 markdownEnumDescriptions: [
                     ( localize(
-                    4930,
+                    4948,
                     'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
                 )),
                     ( localize(
-                    4931,
+                    4949,
                     'The editor is not automatically used when the user opens a resource, but a user can switch to the editor using the `Reopen With` command.'
                 )),
                 ],
@@ -119,9 +119,9 @@ class CustomEditorsDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(4932, "View Type")),
-            ( localize(4933, "Priority")),
-            ( localize(4934, "Filename Pattern")),
+            ( localize(4950, "View Type")),
+            ( localize(4951, "Priority")),
+            ( localize(4952, "Filename Pattern")),
         ];
         const rows = ( customEditors
             .map(customEditor => {
@@ -142,7 +142,7 @@ class CustomEditorsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'customEditors',
-    label: ( localize(4935, "Custom Editors")),
+    label: ( localize(4953, "Custom Editors")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.js

@@ -178,8 +178,8 @@ let LanguageStatus = class LanguageStatus {
                 isOneBusy = isOneBusy || (!isPinned && status.busy);
             }
             const props = {
-                name: ( localize(6937, "Editor Language Status")),
-                ariaLabel: ( localize(6938, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
+                name: ( localize(6955, "Editor Language Status")),
+                ariaLabel: ( localize(6956, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
                 tooltip: element,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? '$(loading~spin)' : text,
@@ -276,7 +276,7 @@ let LanguageStatus = class LanguageStatus {
             }, { hoverDelegate: nativeHoverDelegate }, this._hoverService, this._openerService)));
         }
         const actionBar = ( new ActionBar(right, { hoverDelegate: nativeHoverDelegate }));
-        const actionLabel = isPinned ? ( localize(6939, "Remove from Status Bar")) : ( localize(6940, "Add to Status Bar"));
+        const actionLabel = isPinned ? ( localize(6957, "Remove from Status Bar")) : ( localize(6958, "Add to Status Bar"));
         actionBar.setAriaLabel(actionLabel);
         store.add(actionBar);
         let action;
@@ -331,10 +331,10 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof status.label === 'string' ? status.label : status.label.value;
         if (status.detail) {
-            return { label: ( localize(6941, '{0}, {1}', textValue, status.detail)) };
+            return { label: ( localize(6959, '{0}, {1}', textValue, status.detail)) };
         }
         else {
-            return { label: ( localize(6942, '{0}', textValue)) };
+            return { label: ( localize(6960, '{0}', textValue)) };
         }
     }
     static _asStatusbarEntry(item) {
@@ -347,7 +347,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;
         return {
-            name: ( localize(6943, '{0} (Language Status)', item.name)),
+            name: ( localize(6961, '{0} (Language Status)', item.name)),
             text: computeText(textValue, item.busy),
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -369,7 +369,7 @@ class ResetAction extends Action2 {
     constructor() {
         super({
             id: 'editor.inlayHints.Reset',
-            title: ( localize2(6944, "Reset Language Status Interaction Counter")),
+            title: ( localize2(6962, "Reset Language Status Interaction Counter")),
             category: Categories.View,
             f1: true
         });

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

@@ -13,7 +13,7 @@ import { FoldingController } from '@codingame/monaco-vscode-api/vscode/vs/editor
 import { ColorDetector } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
 
 const openSettingsCommand = 'workbench.action.openSettings';
-const configureSettingsLabel = ( localize(6945, "Configure"));
+const configureSettingsLabel = ( localize(6963, "Configure"));
 let LimitIndicatorContribution = class LimitIndicatorContribution extends Disposable {
     constructor(editorService, languageStatusService) {
         super();
@@ -41,9 +41,9 @@ LimitIndicatorContribution = ( __decorate([
 class ColorDecorationAccessor {
     constructor() {
         this.id = 'decoratorsLimitInfo';
-        this.name = ( localize(6946, 'Color Decorator Status'));
-        this.label = ( localize(6947, 'Color Decorators'));
-        this.source = ( localize(6948, 'Color Decorators'));
+        this.name = ( localize(6964, 'Color Decorator Status'));
+        this.label = ( localize(6965, 'Color Decorators'));
+        this.source = ( localize(6966, 'Color Decorators'));
         this.settingsId = 'editor.colorDecoratorsLimit';
     }
     getLimitReporter(editor) {
@@ -53,9 +53,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = 'foldingLimitInfo';
-        this.name = ( localize(6949, 'Folding Status'));
-        this.label = ( localize(6950, 'Folding Ranges'));
-        this.source = ( localize(6951, 'Folding'));
+        this.name = ( localize(6967, 'Folding Status'));
+        this.label = ( localize(6968, 'Folding Ranges'));
+        this.source = ( localize(6969, 'Folding'));
         this.settingsId = 'editor.foldingMaximumRegions';
     }
     getLimitReporter(editor) {
@@ -97,7 +97,7 @@ class LanguageStatusEntry {
                 name: this.accessor.name,
                 severity: Severity.Warning,
                 label: this.accessor.label,
-                detail: ( localize(6952, 'only {0} shown for performance reasons', info.limited)),
+                detail: ( localize(6970, 'only {0} shown for performance reasons', info.limited)),
                 command: { id: openSettingsCommand, arguments: [this.accessor.settingsId], title: configureSettingsLabel },
                 accessibilityInfo: undefined,
                 source: this.accessor.source,

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js

@@ -56,7 +56,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2(7142, 'Open Merge Editor')),
+            title: ( localize2(7160, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -127,7 +127,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2(7143, "Mixed Layout")),
+            title: ( localize2(7161, "Mixed Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo('mixed')),
             menu: [
                 {
@@ -151,7 +151,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2(7144, 'Column Layout')),
+            title: ( localize2(7162, 'Column Layout')),
             toggled: ( ctxMergeEditorLayout.isEqualTo('columns')),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -173,7 +173,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2(7145, "Show Non-Conflicting Changes")),
+            title: ( localize2(7163, "Show Non-Conflicting Changes")),
             toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
             menu: [
                 {
@@ -197,7 +197,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2(7146, "Show Base")),
+            title: ( localize2(7164, "Show Base")),
             toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
             menu: [
                 {
@@ -220,7 +220,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2(7147, "Show Base Top")),
+            title: ( localize2(7165, "Show Base Top")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
             menu: [
                 {
@@ -243,7 +243,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2(7148, "Show Base Center")),
+            title: ( localize2(7166, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [
                 {
@@ -262,13 +262,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(7149, "Merge Editor"));
+const mergeEditorCategory = ( localize2(7167, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2(7150, "Open File")),
+            title: ( localize2(7168, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -289,7 +289,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(7151, "Go to Next Unhandled Conflict")),
+            title: ( localize2(7169, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -313,7 +313,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(7152, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(7170, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -337,7 +337,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2(7153, "Toggle Current Conflict from Left")),
+            title: ( localize2(7171, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -351,7 +351,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2(7154, "Toggle Current Conflict from Right")),
+            title: ( localize2(7172, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -365,8 +365,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(7155, "Compare Input 1 With Base")),
-            shortTitle: ( localize(7156, 'Compare With Base')),
+            title: ( localize2(7173, "Compare Input 1 With Base")),
+            shortTitle: ( localize(7174, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -383,8 +383,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(7157, "Compare Input 2 With Base")),
-            shortTitle: ( localize(7156, 'Compare With Base')),
+            title: ( localize2(7175, "Compare Input 2 With Base")),
+            shortTitle: ( localize(7174, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -420,7 +420,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2(7158, "Open Base File")),
+            title: ( localize2(7176, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -435,7 +435,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2(7159, "Accept All Changes from Left")),
+            title: ( localize2(7177, "Accept All Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -451,7 +451,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2(7160, "Accept All Changes from Right")),
+            title: ( localize2(7178, "Accept All Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -467,8 +467,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2(7161, "Reset Result")),
-            shortTitle: ( localize(7162, 'Reset')),
+            title: ( localize2(7179, "Reset Result")),
+            shortTitle: ( localize(7180, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -484,7 +484,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2(7163, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(7181, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
@@ -497,7 +497,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2(7164, "Complete Merge")),
+            title: ( localize2(7182, "Complete Merge")),
             f1: false,
             precondition: ctxIsMergeEditor
         });
@@ -508,12 +508,12 @@ class AcceptMerge extends MergeEditorAction2 {
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
                 message: ( localize(
-                    7165,
+                    7183,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(7166, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(7167, "&&Complete with Conflicts"))
+                detail: ( localize(7184, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(7185, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {