@codingame/monaco-vscode-view-common-service-override 14.0.3 → 14.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "14.0.3",
+  "version": "14.0.4",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-common service-override",
   "keywords": [],
@@ -15,44 +15,44 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "14.0.3",
-    "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "14.0.3",
-    "@codingame/monaco-vscode-0f5ced28-abde-558b-8652-db8e7d4d64aa-common": "14.0.3",
-    "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "14.0.3",
-    "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "14.0.3",
-    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "14.0.3",
-    "@codingame/monaco-vscode-44b92f80-48ea-5562-a8d0-18a015f8d845-common": "14.0.3",
-    "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common": "14.0.3",
-    "@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common": "14.0.3",
-    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "14.0.3",
-    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "14.0.3",
-    "@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common": "14.0.3",
-    "@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common": "14.0.3",
-    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "14.0.3",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "14.0.3",
-    "@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common": "14.0.3",
-    "@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common": "14.0.3",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "14.0.3",
-    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "14.0.3",
-    "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "14.0.3",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "14.0.3",
-    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.3",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "14.0.3",
-    "@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common": "14.0.3",
-    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "14.0.3",
-    "@codingame/monaco-vscode-api": "14.0.3",
-    "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "14.0.3",
-    "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common": "14.0.3",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "14.0.3",
-    "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common": "14.0.3",
-    "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common": "14.0.3",
-    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "14.0.3",
-    "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "14.0.3",
-    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "14.0.3",
-    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "14.0.3",
-    "@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common": "14.0.3",
-    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "14.0.3",
-    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "14.0.3"
+    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "14.0.4",
+    "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "14.0.4",
+    "@codingame/monaco-vscode-0f5ced28-abde-558b-8652-db8e7d4d64aa-common": "14.0.4",
+    "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "14.0.4",
+    "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "14.0.4",
+    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "14.0.4",
+    "@codingame/monaco-vscode-44b92f80-48ea-5562-a8d0-18a015f8d845-common": "14.0.4",
+    "@codingame/monaco-vscode-464d4abe-0937-5367-af84-1b9279e14ea3-common": "14.0.4",
+    "@codingame/monaco-vscode-4a28f637-7c3c-5e48-a77c-1b7538b38850-common": "14.0.4",
+    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "14.0.4",
+    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "14.0.4",
+    "@codingame/monaco-vscode-55ed5668-e8ca-5335-a587-790bcf1200c0-common": "14.0.4",
+    "@codingame/monaco-vscode-5945a5e2-a66c-5a82-bd2c-1965724b29eb-common": "14.0.4",
+    "@codingame/monaco-vscode-65619f8f-0eab-5d8b-855a-43b6353fe527-common": "14.0.4",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "14.0.4",
+    "@codingame/monaco-vscode-7443a901-21f6-577a-9674-42893b997ee0-common": "14.0.4",
+    "@codingame/monaco-vscode-771c2e6d-0284-5ac1-be73-7176085eedc5-common": "14.0.4",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "14.0.4",
+    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "14.0.4",
+    "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "14.0.4",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "14.0.4",
+    "@codingame/monaco-vscode-91789cdf-e3cb-5a04-aaeb-6f7df7d3d231-common": "14.0.4",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "14.0.4",
+    "@codingame/monaco-vscode-a17f5129-e16c-5dac-857e-dcd91bfeffa2-common": "14.0.4",
+    "@codingame/monaco-vscode-a7c9ae3c-16d2-5d17-86b2-981be7094566-common": "14.0.4",
+    "@codingame/monaco-vscode-api": "14.0.4",
+    "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "14.0.4",
+    "@codingame/monaco-vscode-bd6ad8b7-9db3-51a8-9895-0046508c029d-common": "14.0.4",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "14.0.4",
+    "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common": "14.0.4",
+    "@codingame/monaco-vscode-ce8c4b18-4e75-55dd-9656-517347af9de7-common": "14.0.4",
+    "@codingame/monaco-vscode-d0fb86d3-2a47-594e-955b-9a24631a7124-common": "14.0.4",
+    "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "14.0.4",
+    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "14.0.4",
+    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "14.0.4",
+    "@codingame/monaco-vscode-eea37658-2307-56a5-8ed0-b2752c7b7a50-common": "14.0.4",
+    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "14.0.4",
+    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "14.0.4"
   },
   "main": "index.js",
   "module": "index.js",

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(5082, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(5083, "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(5083, "The viewType of the currently active custom editor.")),
+    description: ( localize(5084, "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(5085, 'Contributed custom editors.')),
+    description: ( localize(5086, 'Contributed custom editors.')),
     type: 'array',
     defaultSnippets: [{
             body: [{
@@ -38,20 +38,20 @@ const CustomEditorsContribution = {
             [Fields.viewType]: {
                 type: 'string',
                 markdownDescription: ( localize(
-                    5086,
+                    5087,
                     '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(
-                    5087,
+                    5088,
                     'Human readable name of the custom editor. This is displayed to users when selecting which editor to use.'
                 )),
             },
             [Fields.selector]: {
                 type: 'array',
-                description: ( localize(5088, 'Set of globs that the custom editor is enabled for.')),
+                description: ( localize(5089, '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(5089, 'Glob that the custom editor is enabled for.')),
+                            description: ( localize(5090, 'Glob that the custom editor is enabled for.')),
                         },
                     }
                 }
@@ -70,7 +70,7 @@ const CustomEditorsContribution = {
             [Fields.priority]: {
                 type: 'string',
                 markdownDeprecationMessage: ( localize(
-                    5090,
+                    5091,
                     '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(
-                    5091,
+                    5092,
                     'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
                 )),
                     ( localize(
-                    5092,
+                    5093,
                     '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(5093, "View Type")),
-            ( localize(5094, "Priority")),
-            ( localize(5095, "Filename Pattern")),
+            ( localize(5094, "View Type")),
+            ( localize(5095, "Priority")),
+            ( localize(5096, "Filename Pattern")),
         ];
         const rows = ( customEditors
             .map(customEditor => {
@@ -142,7 +142,7 @@ class CustomEditorsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'customEditors',
-    label: ( localize(5096, "Custom Editors")),
+    label: ( localize(5097, "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(7098, "Editor Language Status")),
-                ariaLabel: ( localize(7099, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
+                name: ( localize(7099, "Editor Language Status")),
+                ariaLabel: ( localize(7100, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
                 tooltip: this._combinedEntryTooltip,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? '$(loading~spin)' : text,
@@ -278,7 +278,7 @@ let LanguageStatus = class LanguageStatus {
             }, { hoverDelegate: nativeHoverDelegate }, this._hoverService, this._openerService)));
         }
         const actionBar = ( new ActionBar(right, { hoverDelegate: nativeHoverDelegate }));
-        const actionLabel = isPinned ? ( localize(7100, "Remove from Status Bar")) : ( localize(7101, "Add to Status Bar"));
+        const actionLabel = isPinned ? ( localize(7101, "Remove from Status Bar")) : ( localize(7102, "Add to Status Bar"));
         actionBar.setAriaLabel(actionLabel);
         store.add(actionBar);
         let action;
@@ -333,10 +333,10 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof status.label === 'string' ? status.label : status.label.value;
         if (status.detail) {
-            return { label: ( localize(7102, '{0}, {1}', textValue, status.detail)) };
+            return { label: ( localize(7103, '{0}, {1}', textValue, status.detail)) };
         }
         else {
-            return { label: ( localize(7103, '{0}', textValue)) };
+            return { label: ( localize(7104, '{0}', textValue)) };
         }
     }
     static _asStatusbarEntry(item) {
@@ -349,7 +349,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;
         return {
-            name: ( localize(7104, '{0} (Language Status)', item.name)),
+            name: ( localize(7105, '{0} (Language Status)', item.name)),
             text: computeText(textValue, item.busy),
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -371,7 +371,7 @@ class ResetAction extends Action2 {
     constructor() {
         super({
             id: 'editor.inlayHints.Reset',
-            title: ( localize2(7105, "Reset Language Status Interaction Counter")),
+            title: ( localize2(7106, "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(7106, "Configure"));
+const configureSettingsLabel = ( localize(7107, "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(7107, 'Color Decorator Status'));
-        this.label = ( localize(7108, 'Color Decorators'));
-        this.source = ( localize(7109, 'Color Decorators'));
+        this.name = ( localize(7108, 'Color Decorator Status'));
+        this.label = ( localize(7109, 'Color Decorators'));
+        this.source = ( localize(7110, 'Color Decorators'));
         this.settingsId = 'editor.colorDecoratorsLimit';
     }
     getLimitReporter(editor) {
@@ -53,9 +53,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = 'foldingLimitInfo';
-        this.name = ( localize(7110, 'Folding Status'));
-        this.label = ( localize(7111, 'Folding Ranges'));
-        this.source = ( localize(7112, 'Folding'));
+        this.name = ( localize(7111, 'Folding Status'));
+        this.label = ( localize(7112, 'Folding Ranges'));
+        this.source = ( localize(7113, '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(7113, 'only {0} shown for performance reasons', info.limited)),
+                detail: ( localize(7114, '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(7303, 'Open Merge Editor')),
+            title: ( localize2(7304, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -127,7 +127,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2(7304, "Mixed Layout")),
+            title: ( localize2(7305, "Mixed Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo('mixed')),
             menu: [
                 {
@@ -151,7 +151,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2(7305, 'Column Layout')),
+            title: ( localize2(7306, '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(7306, "Show Non-Conflicting Changes")),
+            title: ( localize2(7307, "Show Non-Conflicting Changes")),
             toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
             menu: [
                 {
@@ -197,7 +197,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2(7307, "Show Base")),
+            title: ( localize2(7308, "Show Base")),
             toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
             menu: [
                 {
@@ -220,7 +220,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2(7308, "Show Base Top")),
+            title: ( localize2(7309, "Show Base Top")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
             menu: [
                 {
@@ -243,7 +243,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2(7309, "Show Base Center")),
+            title: ( localize2(7310, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [
                 {
@@ -262,13 +262,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(7310, "Merge Editor"));
+const mergeEditorCategory = ( localize2(7311, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2(7311, "Open File")),
+            title: ( localize2(7312, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -289,7 +289,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(7312, "Go to Next Unhandled Conflict")),
+            title: ( localize2(7313, "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(7313, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(7314, "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(7314, "Toggle Current Conflict from Left")),
+            title: ( localize2(7315, "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(7315, "Toggle Current Conflict from Right")),
+            title: ( localize2(7316, "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(7316, "Compare Input 1 With Base")),
-            shortTitle: ( localize(7317, 'Compare With Base')),
+            title: ( localize2(7317, "Compare Input 1 With Base")),
+            shortTitle: ( localize(7318, '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(7318, "Compare Input 2 With Base")),
-            shortTitle: ( localize(7317, 'Compare With Base')),
+            title: ( localize2(7319, "Compare Input 2 With Base")),
+            shortTitle: ( localize(7318, '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(7319, "Open Base File")),
+            title: ( localize2(7320, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -435,7 +435,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2(7320, "Accept All Changes from Left")),
+            title: ( localize2(7321, "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(7321, "Accept All Changes from Right")),
+            title: ( localize2(7322, "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(7322, "Reset Result")),
-            shortTitle: ( localize(7323, 'Reset')),
+            title: ( localize2(7323, "Reset Result")),
+            shortTitle: ( localize(7324, '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(7324, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(7325, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
@@ -497,7 +497,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2(7325, "Complete Merge")),
+            title: ( localize2(7326, "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(
-                    7326,
+                    7327,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(7327, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(7328, "&&Complete with Conflicts"))
+                detail: ( localize(7328, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(7329, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {

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

@@ -14,13 +14,13 @@ import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxIsMergeEditor } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const MERGE_EDITOR_CATEGORY = ( localize2(7329, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(7330, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(7330, "Copy Merge Editor State as JSON")),
+            title: ( localize2(7331, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -32,8 +32,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(7331, 'Merge Editor')),
-                message: ( localize(7332, "No active merge editor"))
+                name: ( localize(7332, 'Merge Editor')),
+                message: ( localize(7333, "No active merge editor"))
             });
             return;
         }
@@ -52,8 +52,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(7331, 'Merge Editor')),
-            message: ( localize(7333, "Successfully copied merge editor state")),
+            name: ( localize(7332, 'Merge Editor')),
+            message: ( localize(7334, "Successfully copied merge editor state")),
         });
     }
 }
@@ -62,7 +62,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(7334, "Save Merge Editor State to Folder")),
+            title: ( localize2(7335, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -76,8 +76,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(7331, 'Merge Editor')),
-                message: ( localize(7332, "No active merge editor"))
+                name: ( localize(7332, 'Merge Editor')),
+                message: ( localize(7333, "No active merge editor"))
             });
             return;
         }
@@ -89,7 +89,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(7335, 'Select folder to save to'))
+            title: ( localize(7336, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -107,8 +107,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(7331, 'Merge Editor')),
-            message: ( localize(7336, "Successfully saved merge editor state to folder")),
+            name: ( localize(7332, 'Merge Editor')),
+            message: ( localize(7337, "Successfully saved merge editor state to folder")),
         });
     }
 }
@@ -117,7 +117,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(7337, "Load Merge Editor State from Folder")),
+            title: ( localize2(7338, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -136,7 +136,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(7335, 'Select folder to save to'))
+                title: ( localize(7336, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -14,7 +14,7 @@ import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverCon
 import { LifecyclePhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(7338, "Merge Editor"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(7339, "Merge Editor"))), [
     ( new SyncDescriptor(MergeEditorInput))
 ]);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -25,8 +25,8 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(7339, "Uses the legacy diffing algorithm.")),
-                ( localize(7340, "Uses the advanced diffing algorithm.")),
+                ( localize(7340, "Uses the legacy diffing algorithm.")),
+                ( localize(7341, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {