@codingame/monaco-vscode-view-common-service-override 23.0.3 → 23.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "23.0.3",
+  "version": "23.0.4",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-common service-override",
   "keywords": [],
@@ -15,46 +15,46 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-02fe61a6-05e4-5021-8c27-16e910b9182c-common": "23.0.3",
-    "@codingame/monaco-vscode-05c09f77-cd1d-5960-b387-e7023df3160b-common": "23.0.3",
-    "@codingame/monaco-vscode-09f99a3e-bf90-51d4-ab34-acea412359d2-common": "23.0.3",
-    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "23.0.3",
-    "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "23.0.3",
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "23.0.3",
-    "@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common": "23.0.3",
-    "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "23.0.3",
-    "@codingame/monaco-vscode-2a04f0cd-b806-5886-909e-418183d32279-common": "23.0.3",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "23.0.3",
-    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "23.0.3",
-    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.3",
-    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "23.0.3",
-    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "23.0.3",
-    "@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common": "23.0.3",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "23.0.3",
-    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "23.0.3",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.0.3",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "23.0.3",
-    "@codingame/monaco-vscode-7869cfe8-f42c-5721-9f2b-7d04a6a41f16-common": "23.0.3",
-    "@codingame/monaco-vscode-7aa7b0aa-41af-57b3-860a-86d2f987a6c8-common": "23.0.3",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "23.0.3",
-    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "23.0.3",
-    "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "23.0.3",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "23.0.3",
-    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "23.0.3",
-    "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common": "23.0.3",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "23.0.3",
-    "@codingame/monaco-vscode-a6a3e03d-2b1a-5e17-b904-ed5d40c14550-common": "23.0.3",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "23.0.3",
-    "@codingame/monaco-vscode-api": "23.0.3",
-    "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "23.0.3",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "23.0.3",
-    "@codingame/monaco-vscode-d26a96d3-122c-5a3d-a04d-deb5ff0f19c0-common": "23.0.3",
-    "@codingame/monaco-vscode-d392702e-4ad7-5904-a915-f6063284cf14-common": "23.0.3",
-    "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "23.0.3",
-    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "23.0.3",
-    "@codingame/monaco-vscode-ef156ae1-7926-5925-b78f-228b206ed123-common": "23.0.3",
-    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "23.0.3",
-    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "23.0.3"
+    "@codingame/monaco-vscode-02fe61a6-05e4-5021-8c27-16e910b9182c-common": "23.0.4",
+    "@codingame/monaco-vscode-05c09f77-cd1d-5960-b387-e7023df3160b-common": "23.0.4",
+    "@codingame/monaco-vscode-09f99a3e-bf90-51d4-ab34-acea412359d2-common": "23.0.4",
+    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "23.0.4",
+    "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "23.0.4",
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "23.0.4",
+    "@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common": "23.0.4",
+    "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "23.0.4",
+    "@codingame/monaco-vscode-2a04f0cd-b806-5886-909e-418183d32279-common": "23.0.4",
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "23.0.4",
+    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "23.0.4",
+    "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-common": "23.0.4",
+    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "23.0.4",
+    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "23.0.4",
+    "@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common": "23.0.4",
+    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "23.0.4",
+    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "23.0.4",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.0.4",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "23.0.4",
+    "@codingame/monaco-vscode-7869cfe8-f42c-5721-9f2b-7d04a6a41f16-common": "23.0.4",
+    "@codingame/monaco-vscode-7aa7b0aa-41af-57b3-860a-86d2f987a6c8-common": "23.0.4",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "23.0.4",
+    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "23.0.4",
+    "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "23.0.4",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "23.0.4",
+    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "23.0.4",
+    "@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common": "23.0.4",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "23.0.4",
+    "@codingame/monaco-vscode-a6a3e03d-2b1a-5e17-b904-ed5d40c14550-common": "23.0.4",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "23.0.4",
+    "@codingame/monaco-vscode-api": "23.0.4",
+    "@codingame/monaco-vscode-b1e8558d-1726-5299-bc75-e43ee6d1a124-common": "23.0.4",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "23.0.4",
+    "@codingame/monaco-vscode-d26a96d3-122c-5a3d-a04d-deb5ff0f19c0-common": "23.0.4",
+    "@codingame/monaco-vscode-d392702e-4ad7-5904-a915-f6063284cf14-common": "23.0.4",
+    "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "23.0.4",
+    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "23.0.4",
+    "@codingame/monaco-vscode-ef156ae1-7926-5925-b78f-228b206ed123-common": "23.0.4",
+    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "23.0.4",
+    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "23.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(6259, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(6263, "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(6260, "The viewType of the currently active custom editor.")),
+    description: ( localize(6264, "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

@@ -27,20 +27,20 @@ const customEditorsContributionSchema = {
         [Fields.viewType]: {
             type: 'string',
             markdownDescription: ( localize(
-                6262,
+                6266,
                 '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(
-                6263,
+                6267,
                 'Human readable name of the custom editor. This is displayed to users when selecting which editor to use.'
             )),
         },
         [Fields.selector]: {
             type: 'array',
-            description: ( localize(6264, 'Set of globs that the custom editor is enabled for.')),
+            description: ( localize(6268, 'Set of globs that the custom editor is enabled for.')),
             items: {
                 type: 'object',
                 defaultSnippets: [{
@@ -52,7 +52,7 @@ const customEditorsContributionSchema = {
                 properties: {
                     filenamePattern: {
                         type: 'string',
-                        description: ( localize(6265, 'Glob that the custom editor is enabled for.')),
+                        description: ( localize(6269, 'Glob that the custom editor is enabled for.')),
                     },
                 }
             }
@@ -60,7 +60,7 @@ const customEditorsContributionSchema = {
         [Fields.priority]: {
             type: 'string',
             markdownDeprecationMessage: ( localize(
-                6266,
+                6270,
                 '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: [
@@ -69,11 +69,11 @@ const customEditorsContributionSchema = {
             ],
             markdownEnumDescriptions: [
                 ( localize(
-                6267,
+                6271,
                 'The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource.'
             )),
                 ( localize(
-                6268,
+                6272,
                 '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.'
             )),
             ],
@@ -85,7 +85,7 @@ const customEditorsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: 'customEditors',
     deps: [languagesExtPoint],
     jsonSchema: {
-        description: ( localize(6269, 'Contributed custom editors.')),
+        description: ( localize(6273, 'Contributed custom editors.')),
         type: 'array',
         defaultSnippets: [{
                 body: [{
@@ -121,9 +121,9 @@ class CustomEditorsDataRenderer extends Disposable {
             return { data: { headers: [], rows: [] }, dispose: () => { } };
         }
         const headers = [
-            ( localize(6270, "View Type")),
-            ( localize(6271, "Priority")),
-            ( localize(6272, "Filename Pattern")),
+            ( localize(6274, "View Type")),
+            ( localize(6275, "Priority")),
+            ( localize(6276, "Filename Pattern")),
         ];
         const rows = ( customEditors
             .map(customEditor => {
@@ -144,7 +144,7 @@ class CustomEditorsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: 'customEditors',
-    label: ( localize(6273, "Custom Editors")),
+    label: ( localize(6277, "Custom Editors")),
     access: {
         canToggle: false
     },

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

@@ -180,8 +180,8 @@ let LanguageStatus = class LanguageStatus {
                 isOneBusy = isOneBusy || (!isPinned && status.busy);
             }
             const props = {
-                name: ( localize(8334, "Editor Language Status")),
-                ariaLabel: ( localize(8335, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
+                name: ( localize(8338, "Editor Language Status")),
+                ariaLabel: ( localize(8339, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
                 tooltip: this._combinedEntryTooltip,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? '$(loading~spin)' : text,
@@ -274,7 +274,7 @@ let LanguageStatus = class LanguageStatus {
             }, { hoverDelegate: nativeHoverDelegate }, this._hoverService, this._openerService)));
         }
         const actionBar = ( new ActionBar(right, { hoverDelegate: nativeHoverDelegate }));
-        const actionLabel = isPinned ? ( localize(8336, "Remove from Status Bar")) : ( localize(8337, "Add to Status Bar"));
+        const actionLabel = isPinned ? ( localize(8340, "Remove from Status Bar")) : ( localize(8341, "Add to Status Bar"));
         actionBar.setAriaLabel(actionLabel);
         store.add(actionBar);
         let action;
@@ -334,10 +334,10 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof status.label === 'string' ? status.label : status.label.value;
         if (status.detail) {
-            return { label: ( localize(8338, '{0}, {1}', textValue, status.detail)) };
+            return { label: ( localize(8342, '{0}, {1}', textValue, status.detail)) };
         }
         else {
-            return { label: ( localize(8339, '{0}', textValue)) };
+            return { label: ( localize(8343, '{0}', textValue)) };
         }
     }
     static _asStatusbarEntry(item) {
@@ -350,7 +350,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;
         return {
-            name: ( localize(8340, '{0} (Language Status)', item.name)),
+            name: ( localize(8344, '{0} (Language Status)', item.name)),
             text: computeText(textValue, item.busy),
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -372,7 +372,7 @@ class ResetAction extends Action2 {
     constructor() {
         super({
             id: 'editor.inlayHints.Reset',
-            title: ( localize2(8341, "Reset Language Status Interaction Counter")),
+            title: ( localize2(8345, "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(8342, "Configure"));
+const configureSettingsLabel = ( localize(8346, "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(8343, 'Color Decorator Status'));
-        this.label = ( localize(8344, 'Color decorators'));
-        this.source = ( localize(8345, 'Color Decorators'));
+        this.name = ( localize(8347, 'Color Decorator Status'));
+        this.label = ( localize(8348, 'Color decorators'));
+        this.source = ( localize(8349, 'Color Decorators'));
         this.settingsId = 'editor.colorDecoratorsLimit';
     }
     getLimitReporter(editor) {
@@ -53,9 +53,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = 'foldingLimitInfo';
-        this.name = ( localize(8346, 'Folding Status'));
-        this.label = ( localize(8347, 'Folding ranges'));
-        this.source = ( localize(8348, 'Folding'));
+        this.name = ( localize(8350, 'Folding Status'));
+        this.label = ( localize(8351, 'Folding ranges'));
+        this.source = ( localize(8352, '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(8349, 'only {0} shown for performance reasons', info.limited)),
+                detail: ( localize(8353, '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

@@ -61,7 +61,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2(8888, 'Open Merge Editor')),
+            title: ( localize2(8892, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -132,7 +132,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2(8889, "Mixed Layout")),
+            title: ( localize2(8893, "Mixed Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo('mixed')),
             menu: [
                 {
@@ -156,7 +156,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2(8890, 'Column Layout')),
+            title: ( localize2(8894, 'Column Layout')),
             toggled: ( ctxMergeEditorLayout.isEqualTo('columns')),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -178,7 +178,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2(8891, "Show Non-Conflicting Changes")),
+            title: ( localize2(8895, "Show Non-Conflicting Changes")),
             toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
             menu: [
                 {
@@ -202,7 +202,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2(8892, "Show Base")),
+            title: ( localize2(8896, "Show Base")),
             toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
             menu: [
                 {
@@ -225,7 +225,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2(8893, "Show Base Top")),
+            title: ( localize2(8897, "Show Base Top")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
             menu: [
                 {
@@ -248,7 +248,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2(8894, "Show Base Center")),
+            title: ( localize2(8898, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [
                 {
@@ -267,13 +267,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(8895, "Merge Editor"));
+const mergeEditorCategory = ( localize2(8899, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2(8896, "Open File")),
+            title: ( localize2(8900, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -294,7 +294,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(8897, "Go to Next Unhandled Conflict")),
+            title: ( localize2(8901, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -318,7 +318,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(8898, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(8902, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -342,7 +342,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2(8899, "Toggle Current Conflict from Left")),
+            title: ( localize2(8903, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -356,7 +356,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2(8900, "Toggle Current Conflict from Right")),
+            title: ( localize2(8904, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -370,8 +370,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(8901, "Compare Input 1 With Base")),
-            shortTitle: ( localize(8902, 'Compare With Base')),
+            title: ( localize2(8905, "Compare Input 1 With Base")),
+            shortTitle: ( localize(8906, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -388,8 +388,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(8903, "Compare Input 2 With Base")),
-            shortTitle: ( localize(8902, 'Compare With Base')),
+            title: ( localize2(8907, "Compare Input 2 With Base")),
+            shortTitle: ( localize(8906, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -425,7 +425,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2(8904, "Open Base File")),
+            title: ( localize2(8908, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -440,7 +440,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2(8905, "Accept All Incoming Changes from Left")),
+            title: ( localize2(8909, "Accept All Incoming Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -456,7 +456,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2(8906, "Accept All Current Changes from Right")),
+            title: ( localize2(8910, "Accept All Current Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -472,8 +472,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2(8907, "Reset Result")),
-            shortTitle: ( localize(8908, 'Reset')),
+            title: ( localize2(8911, "Reset Result")),
+            shortTitle: ( localize(8912, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -489,7 +489,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2(8909, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(8913, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
@@ -502,7 +502,7 @@ class AcceptAllCombination extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptAllCombination',
             category: mergeEditorCategory,
-            title: ( localize2(8910, "Accept All Combination")),
+            title: ( localize2(8914, "Accept All Combination")),
             f1: true,
         });
     }
@@ -529,7 +529,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2(8911, "Complete Merge")),
+            title: ( localize2(8915, "Complete Merge")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [
@@ -547,12 +547,12 @@ class AcceptMerge extends MergeEditorAction2 {
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
                 message: ( localize(
-                    8912,
+                    8916,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(8913, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(8914, "&&Complete with Conflicts"))
+                detail: ( localize(8917, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(8918, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {
@@ -572,7 +572,7 @@ class ToggleBetweenInputs extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.toggleBetweenInputs',
             category: mergeEditorCategory,
-            title: ( localize2(8915, "Toggle Between Merge Editor Inputs")),
+            title: ( localize2(8919, "Toggle Between Merge Editor Inputs")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [

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(8916, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(8920, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(8917, "Copy Merge Editor State as JSON")),
+            title: ( localize2(8921, "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(8918, 'Merge Editor')),
-                message: ( localize(8919, "No active merge editor"))
+                name: ( localize(8922, 'Merge Editor')),
+                message: ( localize(8923, "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(8918, 'Merge Editor')),
-            message: ( localize(8920, "Successfully copied merge editor state")),
+            name: ( localize(8922, 'Merge Editor')),
+            message: ( localize(8924, "Successfully copied merge editor state")),
         });
     }
 }
@@ -62,7 +62,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(8921, "Save Merge Editor State to Folder")),
+            title: ( localize2(8925, "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(8918, 'Merge Editor')),
-                message: ( localize(8919, "No active merge editor"))
+                name: ( localize(8922, 'Merge Editor')),
+                message: ( localize(8923, "No active merge editor"))
             });
             return;
         }
@@ -89,7 +89,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(8922, 'Select folder to save to'))
+            title: ( localize(8926, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -107,8 +107,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(8918, 'Merge Editor')),
-            message: ( localize(8923, "Successfully saved merge editor state to folder")),
+            name: ( localize(8922, 'Merge Editor')),
+            message: ( localize(8927, "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(8924, "Load Merge Editor State from Folder")),
+            title: ( localize2(8928, "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(8922, 'Select folder to save to'))
+                title: ( localize(8926, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -16,7 +16,7 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibilityHelp.js';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(8925, "Merge Editor"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(8929, "Merge Editor"))), [
     ( new SyncDescriptor(MergeEditorInput))
 ]);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -27,8 +27,8 @@ import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibility
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(8926, "Uses the legacy diffing algorithm.")),
-                ( localize(8927, "Uses the advanced diffing algorithm.")),
+                ( localize(8930, "Uses the legacy diffing algorithm.")),
+                ( localize(8931, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {