@codingame/monaco-vscode-view-common-service-override 32.0.2 → 33.0.9

package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.d.ts

@@ -39,42 +39,67 @@ declare const customEditorsContributionSchema: {
             };
         };
         readonly priority: {
-            readonly type: "string";
             readonly markdownDescription: string;
-            readonly enum: [
-                CustomEditorPriority.default,
-                CustomEditorPriority.option
-            ];
-            readonly markdownEnumDescriptions: [
-                string,
-                string
+            readonly anyOf: [
+                {
+                    readonly type: "string";
+                    readonly enum: [
+                        CustomEditorPriority.default,
+                        CustomEditorPriority.option
+                    ];
+                    readonly markdownEnumDescriptions: [
+                        string,
+                        string
+                    ];
+                },
+                {
+                    readonly type: "object";
+                    readonly required: [
+                        "editor"
+                    ];
+                    readonly additionalProperties: false;
+                    readonly properties: {
+                        readonly editor: {
+                            readonly markdownDescription: string;
+                            readonly type: "string";
+                            readonly enum: [
+                                CustomEditorPriority.default,
+                                CustomEditorPriority.option
+                            ];
+                            readonly markdownEnumDescriptions: [
+                                string,
+                                string
+                            ];
+                        };
+                        readonly diff: {
+                            readonly markdownDescription: string;
+                            readonly type: "string";
+                            readonly enum: [
+                                CustomEditorPriority.default,
+                                CustomEditorPriority.option
+                            ];
+                            readonly markdownEnumDescriptions: [
+                                string,
+                                string
+                            ];
+                        };
+                        readonly merge: {
+                            readonly markdownDescription: string;
+                            readonly type: "string";
+                            readonly enum: [
+                                CustomEditorPriority.default,
+                                CustomEditorPriority.option
+                            ];
+                            readonly markdownEnumDescriptions: [
+                                string,
+                                string
+                            ];
+                        };
+                    };
+                }
             ];
             readonly default: CustomEditorPriority.default;
         };
-        readonly diffEditorPriority: {
-            readonly type: "string";
-            readonly markdownDescription: string;
-            readonly enum: [
-                CustomEditorPriority.default,
-                CustomEditorPriority.option
-            ];
-            readonly markdownEnumDescriptions: [
-                string,
-                string
-            ];
-        };
-        readonly mergeEditorPriority: {
-            readonly type: "string";
-            readonly markdownDescription: string;
-            readonly enum: [
-                CustomEditorPriority.default,
-                CustomEditorPriority.option
-            ];
-            readonly markdownEnumDescriptions: [
-                string,
-                string
-            ];
-        };
     };
 };
 export type ICustomEditorsExtensionPoint = TypeFromJsonSchema<typeof customEditorsContributionSchema>;
@@ -84,8 +109,10 @@ export declare const customEditorsExtensionPoint: import("@codingame/monaco-vsco
     readonly selector: {
         readonly filenamePattern: string | undefined;
     }[];
-    readonly priority: CustomEditorPriority.default | CustomEditorPriority.option | undefined;
-    readonly diffEditorPriority: CustomEditorPriority.default | CustomEditorPriority.option | undefined;
-    readonly mergeEditorPriority: CustomEditorPriority.default | CustomEditorPriority.option | undefined;
+    readonly priority: CustomEditorPriority.default | CustomEditorPriority.option | {
+        readonly editor: CustomEditorPriority.default | CustomEditorPriority.option;
+        readonly diff: CustomEditorPriority.default | CustomEditorPriority.option | undefined;
+        readonly merge: CustomEditorPriority.default | CustomEditorPriority.option | undefined;
+    } | undefined;
 }[]>;
 export {};

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

@@ -13,10 +13,24 @@ const Fields = ( Object.freeze({
     viewType: "viewType",
     displayName: "displayName",
     selector: "selector",
-    priority: "priority",
-    diffEditorPriority: "diffEditorPriority",
-    mergeEditorPriority: "mergeEditorPriority"
+    priority: "priority"
 }));
+const PriorityFields = ( Object.freeze({
+    editor: "editor",
+    diff: "diff",
+    merge: "merge"
+}));
+const customEditorPrioritySchema = {
+    type: "string",
+    enum: [CustomEditorPriority.default, CustomEditorPriority.option],
+    markdownEnumDescriptions: [( localize(
+        8573,
+        "The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource."
+    )), ( localize(
+        8574,
+        "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."
+    ))]
+};
 const customEditorsContributionSchema = {
     type: "object",
     required: [Fields.viewType, Fields.displayName, Fields.selector],
@@ -25,20 +39,20 @@ const customEditorsContributionSchema = {
         [Fields.viewType]: {
             type: "string",
             markdownDescription: ( localize(
-                8488,
+                8575,
                 "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(
-                8489,
+                8576,
                 "Human readable name of the custom editor. This is displayed to users when selecting which editor to use."
             ))
         },
         [Fields.selector]: {
             type: "array",
-            description: ( localize(8490, "Set of globs that the custom editor is enabled for.")),
+            description: ( localize(8577, "Set of globs that the custom editor is enabled for.")),
             items: {
                 type: "object",
                 defaultSnippets: [{
@@ -50,56 +64,45 @@ const customEditorsContributionSchema = {
                 properties: {
                     filenamePattern: {
                         type: "string",
-                        description: ( localize(8491, "Glob that the custom editor is enabled for."))
+                        description: ( localize(8578, "Glob that the custom editor is enabled for."))
                     }
                 }
             }
         },
         [Fields.priority]: {
-            type: "string",
             markdownDescription: ( localize(
-                8492,
-                "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."
+                8579,
+                "Controls if the custom editor is enabled automatically when the user opens a file, diff, or merge editor. This may be overridden by users using the `workbench.editorAssociations` or `workbench.diffEditorAssociations` setting."
             )),
-            enum: [CustomEditorPriority.default, CustomEditorPriority.option],
-            markdownEnumDescriptions: [( localize(
-                8493,
-                "The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource."
-            )), ( localize(
-                8494,
-                "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."
-            ))],
+            anyOf: [customEditorPrioritySchema, {
+                type: "object",
+                required: [PriorityFields.editor],
+                additionalProperties: false,
+                properties: {
+                    [PriorityFields.editor]: {
+                        ...customEditorPrioritySchema,
+                        markdownDescription: ( localize(
+                            8580,
+                            "Controls if the custom editor is enabled automatically when the user opens a file."
+                        ))
+                    },
+                    [PriorityFields.diff]: {
+                        ...customEditorPrioritySchema,
+                        markdownDescription: ( localize(
+                            8581,
+                            "Controls if the custom editor is enabled automatically when the user opens a diff. When not specified, the value of `editor` is used."
+                        ))
+                    },
+                    [PriorityFields.merge]: {
+                        ...customEditorPrioritySchema,
+                        markdownDescription: ( localize(
+                            8582,
+                            "Controls if the custom editor is enabled automatically when the user opens a merge editor. When not specified, the value of `editor` is used."
+                        ))
+                    }
+                }
+            }],
             default: CustomEditorPriority.default
-        },
-        [Fields.diffEditorPriority]: {
-            type: "string",
-            markdownDescription: ( localize(
-                8495,
-                "Controls if the custom editor is enabled automatically when the user opens a diff. When not specified, the value of `priority` is used."
-            )),
-            enum: [CustomEditorPriority.default, CustomEditorPriority.option],
-            markdownEnumDescriptions: [( localize(
-                8496,
-                "The editor is automatically used when the user opens a diff, provided that no other default custom editors are registered for that resource."
-            )), ( localize(
-                8497,
-                "The editor is not automatically used when the user opens a diff, but a user can switch to the editor using the `Reopen With` command."
-            ))]
-        },
-        [Fields.mergeEditorPriority]: {
-            type: "string",
-            markdownDescription: ( localize(
-                8498,
-                "Controls if the custom editor is enabled automatically when the user opens a merge editor. When not specified, the value of `priority` is used."
-            )),
-            enum: [CustomEditorPriority.default, CustomEditorPriority.option],
-            markdownEnumDescriptions: [( localize(
-                8499,
-                "The editor is automatically used when the user opens a merge editor, provided that no other default custom editors are registered for that resource."
-            )), ( localize(
-                8500,
-                "The editor is not automatically used when the user opens a merge editor, but a user can switch to the editor using the `Reopen With` command."
-            ))]
         }
     }
 };
@@ -107,7 +110,7 @@ const customEditorsExtensionPoint = ExtensionsRegistry.registerExtensionPoint({
     extensionPoint: "customEditors",
     deps: [languagesExtPoint],
     jsonSchema: {
-        description: ( localize(8501, "Contributed custom editors.")),
+        description: ( localize(8583, "Contributed custom editors.")),
         type: "array",
         defaultSnippets: [{
             body: [{
@@ -148,11 +151,11 @@ class CustomEditorsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(8502, "View Type")), ( localize(8503, "Priority")), ( localize(8504, "Filename Pattern"))];
+        const headers = [( localize(8584, "View Type")), ( localize(8585, "Priority")), ( localize(8586, "Filename Pattern"))];
         const rows = ( customEditors.map(customEditor => {
             return [
                 customEditor.viewType,
-                customEditor.priority ?? "",
+                renderPriority(customEditor.priority),
                 coalesce(( customEditor.selector.map(x => x.filenamePattern))).join(", ")
             ];
         }));
@@ -165,9 +168,22 @@ class CustomEditorsDataRenderer extends Disposable {
         };
     }
 }
+function renderPriority(priority) {
+    if (!priority) {
+        return "";
+    }
+    if (typeof priority === "string") {
+        return priority;
+    }
+    return coalesce([
+        priority.editor ? `editor: ${priority.editor}` : undefined,
+        priority.diff ? `diff: ${priority.diff}` : undefined,
+        priority.merge ? `merge: ${priority.merge}` : undefined
+    ]).join(", ");
+}
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: "customEditors",
-    label: ( localize(8505, "Custom Editors")),
+    label: ( localize(8587, "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(10597, "Editor Language Status")),
-                ariaLabel: ( localize(10598, "Editor Language Status: {0}", ariaLabels.join(", next: "))),
+                name: ( localize(10724, "Editor Language Status")),
+                ariaLabel: ( localize(10725, "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(10599, "Remove from Status Bar")) : ( localize(10600, "Add to Status Bar"));
+        const actionLabel = isPinned ? ( localize(10726, "Remove from Status Bar")) : ( localize(10727, "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(10601, "{0}, {1}", textValue, status.detail))
+                label: ( localize(10728, "{0}, {1}", textValue, status.detail))
             };
         } else {
             return {
-                label: ( localize(10602, "{0}", textValue))
+                label: ( localize(10729, "{0}", textValue))
             };
         }
     }
@@ -410,7 +410,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === "string" ? item.label : item.label.shortValue;
         return {
-            name: ( localize(10603, "{0} (Language Status)", item.name)),
+            name: ( localize(10730, "{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(10604, "Reset Language Status Interaction Counter")),
+            title: ( localize2(10731, "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(10605, "Configure"));
+const configureSettingsLabel = ( localize(10732, "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(10606, "Color Decorator Status"));
-        this.label = ( localize(10607, "Color decorators"));
-        this.source = ( localize(10608, "Color Decorators"));
+        this.name = ( localize(10733, "Color Decorator Status"));
+        this.label = ( localize(10734, "Color decorators"));
+        this.source = ( localize(10735, "Color Decorators"));
         this.settingsId = "editor.colorDecoratorsLimit";
     }
     getLimitReporter(editor) {
@@ -50,9 +50,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = "foldingLimitInfo";
-        this.name = ( localize(10609, "Folding Status"));
-        this.label = ( localize(10610, "Folding ranges"));
-        this.source = ( localize(10611, "Folding"));
+        this.name = ( localize(10736, "Folding Status"));
+        this.label = ( localize(10737, "Folding ranges"));
+        this.source = ( localize(10738, "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(10612, "only {0} shown for performance reasons", info.limited)),
+                detail: ( localize(10739, "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(11251, "Open Merge Editor"))
+            title: ( localize2(11378, "Open Merge Editor"))
         });
     }
     run(accessor, ...args) {
@@ -152,7 +152,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: "merge.mixedLayout",
-            title: ( localize2(11252, "Mixed Layout")),
+            title: ( localize2(11379, "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(11253, "Column Layout")),
+            title: ( localize2(11380, "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(11254, "Show Non-Conflicting Changes")),
+            title: ( localize2(11381, "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(11255, "Show Base")),
+            title: ( localize2(11382, "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(11256, "Show Base Top")),
+            title: ( localize2(11383, "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(11257, "Show Base Center")),
+            title: ( localize2(11384, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -289,13 +289,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(11258, "Merge Editor"));
+const mergeEditorCategory = ( localize2(11385, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: "merge.openResult",
             icon: Codicon.goToFile,
-            title: ( localize2(11259, "Open File")),
+            title: ( localize2(11386, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -318,7 +318,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: "merge.goToNextUnhandledConflict",
             category: mergeEditorCategory,
-            title: ( localize2(11260, "Go to Next Unhandled Conflict")),
+            title: ( localize2(11387, "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(11261, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(11388, "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(11262, "Toggle Current Conflict from Left")),
+            title: ( localize2(11389, "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(11263, "Toggle Current Conflict from Right")),
+            title: ( localize2(11390, "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(11264, "Compare Input 1 With Base")),
-            shortTitle: ( localize(11265, "Compare With Base")),
+            title: ( localize2(11391, "Compare Input 1 With Base")),
+            shortTitle: ( localize(11392, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -411,8 +411,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.compareInput2WithBase",
             category: mergeEditorCategory,
-            title: ( localize2(11266, "Compare Input 2 With Base")),
-            shortTitle: ( localize(11265, "Compare With Base")),
+            title: ( localize2(11393, "Compare Input 2 With Base")),
+            shortTitle: ( localize(11392, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -457,7 +457,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: "merge.openBaseEditor",
             category: mergeEditorCategory,
-            title: ( localize2(11267, "Open Base File")),
+            title: ( localize2(11394, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -472,7 +472,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: "merge.acceptAllInput1",
             category: mergeEditorCategory,
-            title: ( localize2(11268, "Accept All Incoming Changes from Left")),
+            title: ( localize2(11395, "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(11269, "Accept All Current Changes from Right")),
+            title: ( localize2(11396, "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(11270, "Reset Result")),
-            shortTitle: ( localize(11271, "Reset")),
+            title: ( localize2(11397, "Reset Result")),
+            shortTitle: ( localize(11398, "Reset")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -530,7 +530,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: "mergeEditor.resetCloseWithConflictsChoice",
             category: mergeEditorCategory,
-            title: ( localize2(11272, "Reset Choice for 'Close with Conflicts'")),
+            title: ( localize2(11399, "Reset Choice for 'Close with Conflicts'")),
             f1: true
         });
     }
@@ -543,7 +543,7 @@ class AcceptAllCombination extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptAllCombination",
             category: mergeEditorCategory,
-            title: ( localize2(11273, "Accept All Combination")),
+            title: ( localize2(11400, "Accept All Combination")),
             f1: true
         });
     }
@@ -572,7 +572,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptMerge",
             category: mergeEditorCategory,
-            title: ( localize2(11274, "Complete Merge")),
+            title: ( localize2(11401, "Complete Merge")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [{
@@ -597,12 +597,12 @@ class AcceptMerge extends MergeEditorAction2 {
                 confirmed
             } = await dialogService.confirm({
                 message: ( localize(
-                    11275,
+                    11402,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(11276, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(11277, "&&Complete with Conflicts"))
+                detail: ( localize(11403, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(11404, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {
@@ -622,7 +622,7 @@ class ToggleBetweenInputs extends MergeEditorAction2 {
         super({
             id: "mergeEditor.toggleBetweenInputs",
             category: mergeEditorCategory,
-            title: ( localize2(11278, "Toggle Between Merge Editor Inputs")),
+            title: ( localize2(11405, "Toggle Between Merge Editor Inputs")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [{