@codingame/monaco-vscode-view-common-service-override 29.1.1 → 30.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "29.1.1",
+  "version": "30.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-common service-override",
   "keywords": [],
@@ -15,8 +15,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "29.1.1",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "29.1.1"
+    "@codingame/monaco-vscode-api": "30.0.0",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "30.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -24,11 +24,11 @@ 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(4666, "Whether a call hierarchy provider is available"))));
-const _ctxCallHierarchyVisible = ( new RawContextKey("callHierarchyVisible", false, ( localize(4667, "Whether call hierarchy peek is currently showing"))));
+const _ctxHasCallHierarchyProvider = ( new RawContextKey("editorHasCallHierarchyProvider", false, ( localize(4665, "Whether a call hierarchy provider is available"))));
+const _ctxCallHierarchyVisible = ( new RawContextKey("callHierarchyVisible", false, ( localize(4666, "Whether call hierarchy peek is currently showing"))));
 const _ctxCallHierarchyDirection = ( new RawContextKey("callHierarchyDirection", undefined, {
     type: "string",
-    description: ( localize(4668, "Whether call hierarchy shows incoming or outgoing calls"))
+    description: ( localize(4667, "Whether call hierarchy shows incoming or outgoing calls"))
 }));
 function sanitizedDirection(candidate) {
     return candidate === CallHierarchyDirection.CallsFrom || candidate === CallHierarchyDirection.CallsTo ? candidate : CallHierarchyDirection.CallsTo;
@@ -149,14 +149,14 @@ let CallHierarchyController = class CallHierarchyController {
                 this._sessionDisposables.add(model);
                 this._widget.showModel(model);
             } else {
-                this._widget.showMessage(( localize(4669, "No results")));
+                this._widget.showMessage(( localize(4668, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endCallHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4670, "Failed to show call hierarchy")));
+            this._widget.showMessage(( localize(4669, "Failed to show call hierarchy")));
         });
     }
     showOutgoingCalls() {
@@ -183,7 +183,7 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showCallHierarchy",
-            title: ( localize2(4671, "Peek Call Hierarchy")),
+            title: ( localize2(4670, "Peek Call Hierarchy")),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: "navigation",
@@ -207,8 +207,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showIncomingCalls",
-            title: ( localize2(4672, "Show Incoming Calls")),
-            icon: registerIcon("callhierarchy-incoming", Codicon.callIncoming, ( localize(4673, "Icon for incoming calls in the call hierarchy view."))),
+            title: ( localize2(4671, "Show Incoming Calls")),
+            icon: registerIcon("callhierarchy-incoming", Codicon.callIncoming, ( localize(4672, "Icon for incoming calls in the call hierarchy view."))),
             precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom)))),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -229,8 +229,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showOutgoingCalls",
-            title: ( localize2(4674, "Show Outgoing Calls")),
-            icon: registerIcon("callhierarchy-outgoing", Codicon.callOutgoing, ( localize(4675, "Icon for outgoing calls in the call hierarchy view."))),
+            title: ( localize2(4673, "Show Outgoing Calls")),
+            icon: registerIcon("callhierarchy-outgoing", Codicon.callOutgoing, ( localize(4674, "Icon for outgoing calls in the call hierarchy view."))),
             precondition: ( ContextKeyExpr.and(_ctxCallHierarchyVisible, ( _ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo)))),
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -251,7 +251,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.refocusCallHierarchy",
-            title: ( localize2(4676, "Refocus Call Hierarchy")),
+            title: ( localize2(4675, "Refocus Call Hierarchy")),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -267,7 +267,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.closeCallHierarchy",
-            title: ( localize(4677, "Close")),
+            title: ( localize(4676, "Close")),
             icon: Codicon.close,
             precondition: _ctxCallHierarchyVisible,
             keybinding: {

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

@@ -323,12 +323,12 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === CallHierarchyDirection.CallsFrom ? ( localize(4678, "Calls from '{0}'", element.model.root.name)) : ( localize(4679, "Callers of '{0}'", element.model.root.name));
+        const title = this._direction === CallHierarchyDirection.CallsFrom ? ( localize(4677, "Calls from '{0}'", element.model.root.name)) : ( localize(4678, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset["state"] = State.Loading;
-        this.setTitle(( localize(4680, "Loading...")));
+        this.setTitle(( localize(4679, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -346,7 +346,7 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         const root = this._tree.getNode(model).children[0];
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
-            this.showMessage(this._direction === CallHierarchyDirection.CallsFrom ? ( localize(4681, "No calls from '{0}'", model.root.name)) : ( localize(4682, "No callers of '{0}'", model.root.name)));
+            this.showMessage(this._direction === CallHierarchyDirection.CallsFrom ? ( localize(4680, "No calls from '{0}'", model.root.name)) : ( localize(4681, "No callers of '{0}'", model.root.name)));
         } else {
             this._parent.dataset["state"] = State.Data;
             if (!viewState || this._tree.getFocus().length === 0) {

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

@@ -131,13 +131,13 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(4683, "Call Hierarchy");
+        return localize(4682, "Call Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === CallHierarchyDirection.CallsFrom) {
-            return localize(4684, "calls from {0}", element.item.name);
+            return localize(4683, "calls from {0}", element.item.name);
         } else {
-            return localize(4685, "callers of {0}", element.item.name);
+            return localize(4684, "callers of {0}", element.item.name);
         }
     }
 }

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

@@ -36,7 +36,7 @@ class ContributedCustomEditors extends Disposable {
                 this.add(( new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localize(7947, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(8012, "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(7948, "The viewType of the currently active custom editor."))
+    description: ( localize(8013, "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

@@ -23,20 +23,20 @@ const customEditorsContributionSchema = {
         [Fields.viewType]: {
             type: "string",
             markdownDescription: ( localize(
-                7950,
+                8015,
                 "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(
-                7951,
+                8016,
                 "Human readable name of the custom editor. This is displayed to users when selecting which editor to use."
             ))
         },
         [Fields.selector]: {
             type: "array",
-            description: ( localize(7952, "Set of globs that the custom editor is enabled for.")),
+            description: ( localize(8017, "Set of globs that the custom editor is enabled for.")),
             items: {
                 type: "object",
                 defaultSnippets: [{
@@ -48,7 +48,7 @@ const customEditorsContributionSchema = {
                 properties: {
                     filenamePattern: {
                         type: "string",
-                        description: ( localize(7953, "Glob that the custom editor is enabled for."))
+                        description: ( localize(8018, "Glob that the custom editor is enabled for."))
                     }
                 }
             }
@@ -56,15 +56,15 @@ const customEditorsContributionSchema = {
         [Fields.priority]: {
             type: "string",
             markdownDeprecationMessage: ( localize(
-                7954,
+                8019,
                 "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: [CustomEditorPriority.default, CustomEditorPriority.option],
             markdownEnumDescriptions: [( localize(
-                7955,
+                8020,
                 "The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource."
             )), ( localize(
-                7956,
+                8021,
                 "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."
             ))],
             default: CustomEditorPriority.default
@@ -75,7 +75,7 @@ const customEditorsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "customEditors",
     deps: [languagesExtPoint],
     jsonSchema: {
-        description: ( localize(7957, "Contributed custom editors.")),
+        description: ( localize(8022, "Contributed custom editors.")),
         type: "array",
         defaultSnippets: [{
             body: [{
@@ -116,7 +116,7 @@ class CustomEditorsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(7958, "View Type")), ( localize(7959, "Priority")), ( localize(7960, "Filename Pattern"))];
+        const headers = [( localize(8023, "View Type")), ( localize(8024, "Priority")), ( localize(8025, "Filename Pattern"))];
         const rows = ( customEditors.map(customEditor => {
             return [
                 customEditor.viewType,
@@ -135,7 +135,7 @@ class CustomEditorsDataRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "customEditors",
-    label: ( localize(7961, "Custom Editors")),
+    label: ( localize(8026, "Custom Editors")),
     access: {
         canToggle: false
     },

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

@@ -206,8 +206,8 @@ let LanguageStatus = class LanguageStatus {
                 isOneBusy = isOneBusy || (!isPinned && status.busy);
             }
             const props = {
-                name: ( localize(10079, "Editor Language Status")),
-                ariaLabel: ( localize(10080, "Editor Language Status: {0}", ariaLabels.join(", next: "))),
+                name: ( localize(10144, "Editor Language Status")),
+                ariaLabel: ( localize(10145, "Editor Language Status: {0}", ariaLabels.join(", next: "))),
                 tooltip: this._combinedEntryTooltip,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? "$(loading~spin)" : text
@@ -325,7 +325,7 @@ let LanguageStatus = class LanguageStatus {
         const actionBar = ( new ActionBar(right, {
             hoverDelegate: nativeHoverDelegate
         }));
-        const actionLabel = isPinned ? ( localize(10081, "Remove from Status Bar")) : ( localize(10082, "Add to Status Bar"));
+        const actionLabel = isPinned ? ( localize(10146, "Remove from Status Bar")) : ( localize(10147, "Add to Status Bar"));
         actionBar.setAriaLabel(actionLabel);
         store.add(actionBar);
         let action;
@@ -393,11 +393,11 @@ let LanguageStatus = class LanguageStatus {
         const textValue = typeof status.label === "string" ? status.label : status.label.value;
         if (status.detail) {
             return {
-                label: ( localize(10083, "{0}, {1}", textValue, status.detail))
+                label: ( localize(10148, "{0}, {1}", textValue, status.detail))
             };
         } else {
             return {
-                label: ( localize(10084, "{0}", textValue))
+                label: ( localize(10149, "{0}", textValue))
             };
         }
     }
@@ -410,7 +410,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === "string" ? item.label : item.label.shortValue;
         return {
-            name: ( localize(10085, "{0} (Language Status)", item.name)),
+            name: ( localize(10150, "{0} (Language Status)", item.name)),
             text: computeText(textValue, item.busy),
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -428,7 +428,7 @@ class ResetAction extends Action2 {
     constructor() {
         super({
             id: "editor.inlayHints.Reset",
-            title: ( localize2(10086, "Reset Language Status Interaction Counter")),
+            title: ( localize2(10151, "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(10087, "Configure"));
+const configureSettingsLabel = ( localize(10152, "Configure"));
 let LimitIndicatorContribution = class LimitIndicatorContribution extends Disposable {
     constructor(editorService, languageStatusService) {
         super();
@@ -38,9 +38,9 @@ LimitIndicatorContribution = ( __decorate([( __param(0, IEditorService)), ( __pa
 class ColorDecorationAccessor {
     constructor() {
         this.id = "decoratorsLimitInfo";
-        this.name = ( localize(10088, "Color Decorator Status"));
-        this.label = ( localize(10089, "Color decorators"));
-        this.source = ( localize(10090, "Color Decorators"));
+        this.name = ( localize(10153, "Color Decorator Status"));
+        this.label = ( localize(10154, "Color decorators"));
+        this.source = ( localize(10155, "Color Decorators"));
         this.settingsId = "editor.colorDecoratorsLimit";
     }
     getLimitReporter(editor) {
@@ -50,9 +50,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = "foldingLimitInfo";
-        this.name = ( localize(10091, "Folding Status"));
-        this.label = ( localize(10092, "Folding ranges"));
-        this.source = ( localize(10093, "Folding"));
+        this.name = ( localize(10156, "Folding Status"));
+        this.label = ( localize(10157, "Folding ranges"));
+        this.source = ( localize(10158, "Folding"));
         this.settingsId = "editor.foldingMaximumRegions";
     }
     getLimitReporter(editor) {
@@ -94,7 +94,7 @@ class LanguageStatusEntry {
                 name: this.accessor.name,
                 severity: Severity.Warning,
                 label: this.accessor.label,
-                detail: ( localize(10094, "only {0} shown for performance reasons", info.limited)),
+                detail: ( localize(10159, "only {0} shown for performance reasons", info.limited)),
                 command: {
                     id: openSettingsCommand,
                     arguments: [this.accessor.settingsId],

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

@@ -65,7 +65,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: "_open.mergeEditor",
-            title: ( localize2(10727, "Open Merge Editor"))
+            title: ( localize2(10792, "Open Merge Editor"))
         });
     }
     run(accessor, ...args) {
@@ -152,7 +152,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: "merge.mixedLayout",
-            title: ( localize2(10728, "Mixed Layout")),
+            title: ( localize2(10793, "Mixed Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo("mixed")),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -176,7 +176,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: "merge.columnLayout",
-            title: ( localize2(10729, "Column Layout")),
+            title: ( localize2(10794, "Column Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo("columns")),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -200,7 +200,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: "merge.showNonConflictingChanges",
-            title: ( localize2(10730, "Show Non-Conflicting Changes")),
+            title: ( localize2(10795, "Show Non-Conflicting Changes")),
             toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -224,7 +224,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: "merge.showBase",
-            title: ( localize2(10731, "Show Base")),
+            title: ( localize2(10796, "Show Base")),
             toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -247,7 +247,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: "merge.showBaseTop",
-            title: ( localize2(10732, "Show Base Top")),
+            title: ( localize2(10797, "Show Base Top")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -270,7 +270,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: "merge.showBaseCenter",
-            title: ( localize2(10733, "Show Base Center")),
+            title: ( localize2(10798, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -289,13 +289,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(10734, "Merge Editor"));
+const mergeEditorCategory = ( localize2(10799, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: "merge.openResult",
             icon: Codicon.goToFile,
-            title: ( localize2(10735, "Open File")),
+            title: ( localize2(10800, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -318,7 +318,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: "merge.goToNextUnhandledConflict",
             category: mergeEditorCategory,
-            title: ( localize2(10736, "Go to Next Unhandled Conflict")),
+            title: ( localize2(10801, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -340,7 +340,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: "merge.goToPreviousUnhandledConflict",
             category: mergeEditorCategory,
-            title: ( localize2(10737, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(10802, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -362,7 +362,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: "merge.toggleActiveConflictInput1",
             category: mergeEditorCategory,
-            title: ( localize2(10738, "Toggle Current Conflict from Left")),
+            title: ( localize2(10803, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -376,7 +376,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: "merge.toggleActiveConflictInput2",
             category: mergeEditorCategory,
-            title: ( localize2(10739, "Toggle Current Conflict from Right")),
+            title: ( localize2(10804, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -390,8 +390,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.compareInput1WithBase",
             category: mergeEditorCategory,
-            title: ( localize2(10740, "Compare Input 1 With Base")),
-            shortTitle: ( localize(10741, "Compare With Base")),
+            title: ( localize2(10805, "Compare Input 1 With Base")),
+            shortTitle: ( localize(10806, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -411,8 +411,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.compareInput2WithBase",
             category: mergeEditorCategory,
-            title: ( localize2(10742, "Compare Input 2 With Base")),
-            shortTitle: ( localize(10741, "Compare With Base")),
+            title: ( localize2(10807, "Compare Input 2 With Base")),
+            shortTitle: ( localize(10806, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -457,7 +457,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: "merge.openBaseEditor",
             category: mergeEditorCategory,
-            title: ( localize2(10743, "Open Base File")),
+            title: ( localize2(10808, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -472,7 +472,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: "merge.acceptAllInput1",
             category: mergeEditorCategory,
-            title: ( localize2(10744, "Accept All Incoming Changes from Left")),
+            title: ( localize2(10809, "Accept All Incoming Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -491,7 +491,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: "merge.acceptAllInput2",
             category: mergeEditorCategory,
-            title: ( localize2(10745, "Accept All Current Changes from Right")),
+            title: ( localize2(10810, "Accept All Current Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -510,8 +510,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.resetResultToBaseAndAutoMerge",
             category: mergeEditorCategory,
-            title: ( localize2(10746, "Reset Result")),
-            shortTitle: ( localize(10747, "Reset")),
+            title: ( localize2(10811, "Reset Result")),
+            shortTitle: ( localize(10812, "Reset")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -530,7 +530,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: "mergeEditor.resetCloseWithConflictsChoice",
             category: mergeEditorCategory,
-            title: ( localize2(10748, "Reset Choice for 'Close with Conflicts'")),
+            title: ( localize2(10813, "Reset Choice for 'Close with Conflicts'")),
             f1: true
         });
     }
@@ -543,7 +543,7 @@ class AcceptAllCombination extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptAllCombination",
             category: mergeEditorCategory,
-            title: ( localize2(10749, "Accept All Combination")),
+            title: ( localize2(10814, "Accept All Combination")),
             f1: true
         });
     }
@@ -572,7 +572,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptMerge",
             category: mergeEditorCategory,
-            title: ( localize2(10750, "Complete Merge")),
+            title: ( localize2(10815, "Complete Merge")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [{
@@ -597,12 +597,12 @@ class AcceptMerge extends MergeEditorAction2 {
                 confirmed
             } = await dialogService.confirm({
                 message: ( localize(
-                    10751,
+                    10816,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(10752, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(10753, "&&Complete with Conflicts"))
+                detail: ( localize(10817, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(10818, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {
@@ -622,7 +622,7 @@ class ToggleBetweenInputs extends MergeEditorAction2 {
         super({
             id: "mergeEditor.toggleBetweenInputs",
             category: mergeEditorCategory,
-            title: ( localize2(10754, "Toggle Between Merge Editor Inputs")),
+            title: ( localize2(10819, "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-api/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(10755, "Merge Editor (Dev)"));
+const MERGE_EDITOR_CATEGORY = ( localize2(10820, "Merge Editor (Dev)"));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: "merge.dev.copyContentsJson",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(10756, "Copy Merge Editor State as JSON")),
+            title: ( localize2(10821, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor
@@ -34,8 +34,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(10757, "Merge Editor")),
-                message: ( localize(10758, "No active merge editor"))
+                name: ( localize(10822, "Merge Editor")),
+                message: ( localize(10823, "No active merge editor"))
             });
             return;
         }
@@ -54,8 +54,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(10757, "Merge Editor")),
-            message: ( localize(10759, "Successfully copied merge editor state"))
+            name: ( localize(10822, "Merge Editor")),
+            message: ( localize(10824, "Successfully copied merge editor state"))
         });
     }
 }
@@ -64,7 +64,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: "merge.dev.saveContentsToFolder",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(10760, "Save Merge Editor State to Folder")),
+            title: ( localize2(10825, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor
@@ -80,8 +80,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(10757, "Merge Editor")),
-                message: ( localize(10758, "No active merge editor"))
+                name: ( localize(10822, "Merge Editor")),
+                message: ( localize(10823, "No active merge editor"))
             });
             return;
         }
@@ -93,7 +93,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(10761, "Select folder to save to"))
+            title: ( localize(10826, "Select folder to save to"))
         });
         if (!result) {
             return;
@@ -115,8 +115,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write("initialResult", model.getInitialResultValue())
         ]);
         notificationService.info({
-            name: ( localize(10757, "Merge Editor")),
-            message: ( localize(10762, "Successfully saved merge editor state to folder"))
+            name: ( localize(10822, "Merge Editor")),
+            message: ( localize(10827, "Successfully saved merge editor state to folder"))
         });
     }
 }
@@ -125,7 +125,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: "merge.dev.loadContentsFromFolder",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(10763, "Load Merge Editor State from Folder")),
+            title: ( localize2(10828, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -144,7 +144,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(10761, "Select folder to save to"))
+                title: ( localize(10826, "Select folder to save to"))
             });
             if (!result) {
                 return;