@codingame/monaco-vscode-view-common-service-override 26.1.1 → 26.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "26.1.1",
+  "version": "26.1.2",
   "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": "26.1.1",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "26.1.1"
+    "@codingame/monaco-vscode-api": "26.1.2",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "26.1.2"
   },
   "main": "index.js",
   "module": "index.js",

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(6739, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(6928, "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(6740, "The viewType of the currently active custom editor."))
+    description: ( localize(6929, "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(
-                6742,
+                6931,
                 "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(
-                6743,
+                6932,
                 "Human readable name of the custom editor. This is displayed to users when selecting which editor to use."
             ))
         },
         [Fields.selector]: {
             type: "array",
-            description: ( localize(6744, "Set of globs that the custom editor is enabled for.")),
+            description: ( localize(6933, "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(6745, "Glob that the custom editor is enabled for."))
+                        description: ( localize(6934, "Glob that the custom editor is enabled for."))
                     }
                 }
             }
@@ -56,15 +56,15 @@ const customEditorsContributionSchema = {
         [Fields.priority]: {
             type: "string",
             markdownDeprecationMessage: ( localize(
-                6746,
+                6935,
                 "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(
-                6747,
+                6936,
                 "The editor is automatically used when the user opens a resource, provided that no other default custom editors are registered for that resource."
             )), ( localize(
-                6748,
+                6937,
                 "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(6749, "Contributed custom editors.")),
+        description: ( localize(6938, "Contributed custom editors.")),
         type: "array",
         defaultSnippets: [{
             body: [{
@@ -116,7 +116,7 @@ class CustomEditorsDataRenderer extends Disposable {
                 dispose: () => {}
             };
         }
-        const headers = [( localize(6750, "View Type")), ( localize(6751, "Priority")), ( localize(6752, "Filename Pattern"))];
+        const headers = [( localize(6939, "View Type")), ( localize(6940, "Priority")), ( localize(6941, "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(6753, "Custom Editors")),
+    label: ( localize(6942, "Custom Editors")),
     access: {
         canToggle: false
     },

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

@@ -205,8 +205,8 @@ let LanguageStatus = class LanguageStatus {
                 isOneBusy = isOneBusy || (!isPinned && status.busy);
             }
             const props = {
-                name: ( localize(8815, "Editor Language Status")),
-                ariaLabel: ( localize(8816, "Editor Language Status: {0}", ariaLabels.join(", next: "))),
+                name: ( localize(9004, "Editor Language Status")),
+                ariaLabel: ( localize(9005, "Editor Language Status: {0}", ariaLabels.join(", next: "))),
                 tooltip: this._combinedEntryTooltip,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? "$(loading~spin)" : text
@@ -324,7 +324,7 @@ let LanguageStatus = class LanguageStatus {
         const actionBar = ( new ActionBar(right, {
             hoverDelegate: nativeHoverDelegate
         }));
-        const actionLabel = isPinned ? ( localize(8817, "Remove from Status Bar")) : ( localize(8818, "Add to Status Bar"));
+        const actionLabel = isPinned ? ( localize(9006, "Remove from Status Bar")) : ( localize(9007, "Add to Status Bar"));
         actionBar.setAriaLabel(actionLabel);
         store.add(actionBar);
         let action;
@@ -392,11 +392,11 @@ let LanguageStatus = class LanguageStatus {
         const textValue = typeof status.label === "string" ? status.label : status.label.value;
         if (status.detail) {
             return {
-                label: ( localize(8819, "{0}, {1}", textValue, status.detail))
+                label: ( localize(9008, "{0}, {1}", textValue, status.detail))
             };
         } else {
             return {
-                label: ( localize(8820, "{0}", textValue))
+                label: ( localize(9009, "{0}", textValue))
             };
         }
     }
@@ -409,7 +409,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === "string" ? item.label : item.label.shortValue;
         return {
-            name: ( localize(8821, "{0} (Language Status)", item.name)),
+            name: ( localize(9010, "{0} (Language Status)", item.name)),
             text: computeText(textValue, item.busy),
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -427,7 +427,7 @@ class ResetAction extends Action2 {
     constructor() {
         super({
             id: "editor.inlayHints.Reset",
-            title: ( localize2(8822, "Reset Language Status Interaction Counter")),
+            title: ( localize2(9011, "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(8823, "Configure"));
+const configureSettingsLabel = ( localize(9012, "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(8824, "Color Decorator Status"));
-        this.label = ( localize(8825, "Color decorators"));
-        this.source = ( localize(8826, "Color Decorators"));
+        this.name = ( localize(9013, "Color Decorator Status"));
+        this.label = ( localize(9014, "Color decorators"));
+        this.source = ( localize(9015, "Color Decorators"));
         this.settingsId = "editor.colorDecoratorsLimit";
     }
     getLimitReporter(editor) {
@@ -50,9 +50,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = "foldingLimitInfo";
-        this.name = ( localize(8827, "Folding Status"));
-        this.label = ( localize(8828, "Folding ranges"));
-        this.source = ( localize(8829, "Folding"));
+        this.name = ( localize(9016, "Folding Status"));
+        this.label = ( localize(9017, "Folding ranges"));
+        this.source = ( localize(9018, "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(8830, "only {0} shown for performance reasons", info.limited)),
+                detail: ( localize(9019, "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(9389, "Open Merge Editor"))
+            title: ( localize2(9578, "Open Merge Editor"))
         });
     }
     run(accessor, ...args) {
@@ -152,7 +152,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: "merge.mixedLayout",
-            title: ( localize2(9390, "Mixed Layout")),
+            title: ( localize2(9579, "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(9391, "Column Layout")),
+            title: ( localize2(9580, "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(9392, "Show Non-Conflicting Changes")),
+            title: ( localize2(9581, "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(9393, "Show Base")),
+            title: ( localize2(9582, "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(9394, "Show Base Top")),
+            title: ( localize2(9583, "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(9395, "Show Base Center")),
+            title: ( localize2(9584, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -289,13 +289,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(9396, "Merge Editor"));
+const mergeEditorCategory = ( localize2(9585, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: "merge.openResult",
             icon: Codicon.goToFile,
-            title: ( localize2(9397, "Open File")),
+            title: ( localize2(9586, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -318,7 +318,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: "merge.goToNextUnhandledConflict",
             category: mergeEditorCategory,
-            title: ( localize2(9398, "Go to Next Unhandled Conflict")),
+            title: ( localize2(9587, "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(9399, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(9588, "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(9400, "Toggle Current Conflict from Left")),
+            title: ( localize2(9589, "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(9401, "Toggle Current Conflict from Right")),
+            title: ( localize2(9590, "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(9402, "Compare Input 1 With Base")),
-            shortTitle: ( localize(9403, "Compare With Base")),
+            title: ( localize2(9591, "Compare Input 1 With Base")),
+            shortTitle: ( localize(9592, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -411,8 +411,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.compareInput2WithBase",
             category: mergeEditorCategory,
-            title: ( localize2(9404, "Compare Input 2 With Base")),
-            shortTitle: ( localize(9403, "Compare With Base")),
+            title: ( localize2(9593, "Compare Input 2 With Base")),
+            shortTitle: ( localize(9592, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -457,7 +457,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: "merge.openBaseEditor",
             category: mergeEditorCategory,
-            title: ( localize2(9405, "Open Base File")),
+            title: ( localize2(9594, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -472,7 +472,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: "merge.acceptAllInput1",
             category: mergeEditorCategory,
-            title: ( localize2(9406, "Accept All Incoming Changes from Left")),
+            title: ( localize2(9595, "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(9407, "Accept All Current Changes from Right")),
+            title: ( localize2(9596, "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(9408, "Reset Result")),
-            shortTitle: ( localize(9409, "Reset")),
+            title: ( localize2(9597, "Reset Result")),
+            shortTitle: ( localize(9598, "Reset")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -530,7 +530,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: "mergeEditor.resetCloseWithConflictsChoice",
             category: mergeEditorCategory,
-            title: ( localize2(9410, "Reset Choice for 'Close with Conflicts'")),
+            title: ( localize2(9599, "Reset Choice for 'Close with Conflicts'")),
             f1: true
         });
     }
@@ -543,7 +543,7 @@ class AcceptAllCombination extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptAllCombination",
             category: mergeEditorCategory,
-            title: ( localize2(9411, "Accept All Combination")),
+            title: ( localize2(9600, "Accept All Combination")),
             f1: true
         });
     }
@@ -572,7 +572,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptMerge",
             category: mergeEditorCategory,
-            title: ( localize2(9412, "Complete Merge")),
+            title: ( localize2(9601, "Complete Merge")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [{
@@ -597,12 +597,12 @@ class AcceptMerge extends MergeEditorAction2 {
                 confirmed
             } = await dialogService.confirm({
                 message: ( localize(
-                    9413,
+                    9602,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(9414, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(9415, "&&Complete with Conflicts"))
+                detail: ( localize(9603, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(9604, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {
@@ -622,7 +622,7 @@ class ToggleBetweenInputs extends MergeEditorAction2 {
         super({
             id: "mergeEditor.toggleBetweenInputs",
             category: mergeEditorCategory,
-            title: ( localize2(9416, "Toggle Between Merge Editor Inputs")),
+            title: ( localize2(9605, "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(9417, "Merge Editor (Dev)"));
+const MERGE_EDITOR_CATEGORY = ( localize2(9606, "Merge Editor (Dev)"));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: "merge.dev.copyContentsJson",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9418, "Copy Merge Editor State as JSON")),
+            title: ( localize2(9607, "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(9419, "Merge Editor")),
-                message: ( localize(9420, "No active merge editor"))
+                name: ( localize(9608, "Merge Editor")),
+                message: ( localize(9609, "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(9419, "Merge Editor")),
-            message: ( localize(9421, "Successfully copied merge editor state"))
+            name: ( localize(9608, "Merge Editor")),
+            message: ( localize(9610, "Successfully copied merge editor state"))
         });
     }
 }
@@ -64,7 +64,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: "merge.dev.saveContentsToFolder",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9422, "Save Merge Editor State to Folder")),
+            title: ( localize2(9611, "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(9419, "Merge Editor")),
-                message: ( localize(9420, "No active merge editor"))
+                name: ( localize(9608, "Merge Editor")),
+                message: ( localize(9609, "No active merge editor"))
             });
             return;
         }
@@ -93,7 +93,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9423, "Select folder to save to"))
+            title: ( localize(9612, "Select folder to save to"))
         });
         if (!result) {
             return;
@@ -115,8 +115,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write("initialResult", model.getInitialResultValue())
         ]);
         notificationService.info({
-            name: ( localize(9419, "Merge Editor")),
-            message: ( localize(9424, "Successfully saved merge editor state to folder"))
+            name: ( localize(9608, "Merge Editor")),
+            message: ( localize(9613, "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(9425, "Load Merge Editor State from Folder")),
+            title: ( localize2(9614, "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(9423, "Select folder to save to"))
+                title: ( localize(9612, "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(9426, "Merge Editor"))), [( new SyncDescriptor(MergeEditorInput))]);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(9615, "Merge Editor"))), [( new SyncDescriptor(MergeEditorInput))]);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     properties: {
@@ -24,7 +24,7 @@ import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibility
             type: "string",
             enum: ["legacy", "advanced"],
             default: "advanced",
-            markdownEnumDescriptions: [( localize(9427, "Uses the legacy diffing algorithm.")), ( localize(9428, "Uses the advanced diffing algorithm."))]
+            markdownEnumDescriptions: [( localize(9616, "Uses the legacy diffing algorithm.")), ( localize(9617, "Uses the advanced diffing algorithm."))]
         },
         "mergeEditor.showDeletionMarkers": {
             type: "boolean",

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

@@ -18,18 +18,18 @@ class MergeEditorAccessibilityHelpProvider {
         if (!codeEditor) {
             return;
         }
-        const content = [( localize(9429, "You are in a merge editor.")), ( localize(
-            9430,
+        const content = [( localize(9618, "You are in a merge editor.")), ( localize(
+            9619,
             "Navigate between merge conflicts using the commands Go to Next Unhandled Conflict{0} and Go to Previous Unhandled Conflict{1}.",
             "<keybinding:merge.goToNextUnhandledConflict>",
             "<keybinding:merge.goToPreviousUnhandledConflict>"
         )), ( localize(
-            9431,
+            9620,
             "Run the command Merge Editor: Accept All Incoming Changes from the Left{0} and Merge Editor: Accept All Current Changes from the Right{1}",
             "<keybinding:merge.acceptAllInput1>",
             "<keybinding:merge.acceptAllInput2>"
-        )), ( localize(9432, "Complete the Merge{0}.", "<keybinding:mergeEditor.acceptMerge>")), ( localize(
-            9433,
+        )), ( localize(9621, "Complete the Merge{0}.", "<keybinding:mergeEditor.acceptMerge>")), ( localize(
+            9622,
             "Toggle between merge editor inputs, incoming and current changes {0}.",
             "<keybinding:mergeEditor.toggleBetweenInputs>"
         ))];

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js

@@ -12,51 +12,51 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 
-registerColor("mergeEditor.change.background", "#9bb95533", ( localize(9469, "The background color for changes.")));
+registerColor("mergeEditor.change.background", "#9bb95533", ( localize(9658, "The background color for changes.")));
 registerColor("mergeEditor.change.word.background", {
     dark: "#9ccc2c33",
     light: "#9ccc2c66",
     hcDark: "#9ccc2c33",
     hcLight: "#9ccc2c66"
-}, ( localize(9470, "The background color for word changes.")));
+}, ( localize(9659, "The background color for word changes.")));
 registerColor("mergeEditor.changeBase.background", {
     dark: "#4B1818FF",
     light: "#FFCCCCFF",
     hcDark: "#4B1818FF",
     hcLight: "#FFCCCCFF"
-}, ( localize(9471, "The background color for changes in base.")));
+}, ( localize(9660, "The background color for changes in base.")));
 registerColor("mergeEditor.changeBase.word.background", {
     dark: "#6F1313FF",
     light: "#FFA3A3FF",
     hcDark: "#6F1313FF",
     hcLight: "#FFA3A3FF"
-}, ( localize(9472, "The background color for word changes in base.")));
+}, ( localize(9661, "The background color for word changes in base.")));
 registerColor("mergeEditor.conflict.unhandledUnfocused.border", {
     dark: "#ffa6007a",
     light: "#ffa600FF",
     hcDark: "#ffa6007a",
     hcLight: "#ffa6007a"
-}, ( localize(9473, "The border color of unhandled unfocused conflicts.")));
-registerColor("mergeEditor.conflict.unhandledFocused.border", "#ffa600", ( localize(9474, "The border color of unhandled focused conflicts.")));
+}, ( localize(9662, "The border color of unhandled unfocused conflicts.")));
+registerColor("mergeEditor.conflict.unhandledFocused.border", "#ffa600", ( localize(9663, "The border color of unhandled focused conflicts.")));
 registerColor(
     "mergeEditor.conflict.handledUnfocused.border",
     "#86868649",
-    ( localize(9475, "The border color of handled unfocused conflicts."))
+    ( localize(9664, "The border color of handled unfocused conflicts."))
 );
-registerColor("mergeEditor.conflict.handledFocused.border", "#c1c1c1cc", ( localize(9476, "The border color of handled focused conflicts.")));
+registerColor("mergeEditor.conflict.handledFocused.border", "#c1c1c1cc", ( localize(9665, "The border color of handled focused conflicts.")));
 const handledConflictMinimapOverViewRulerColor = registerColor(
     "mergeEditor.conflict.handled.minimapOverViewRuler",
     "#adaca8ee",
-    ( localize(9477, "The foreground color for changes in input 1."))
+    ( localize(9666, "The foreground color for changes in input 1."))
 );
 const unhandledConflictMinimapOverViewRulerColor = registerColor(
     "mergeEditor.conflict.unhandled.minimapOverViewRuler",
     "#fcba03FF",
-    ( localize(9478, "The foreground color for changes in input 1."))
+    ( localize(9667, "The foreground color for changes in input 1."))
 );
-registerColor("mergeEditor.conflictingLines.background", "#ffea0047", ( localize(9479, "The background of the \"Conflicting Lines\" text.")));
+registerColor("mergeEditor.conflictingLines.background", "#ffea0047", ( localize(9668, "The background of the \"Conflicting Lines\" text.")));
 const contentTransparency = 0.4;
-registerColor("mergeEditor.conflict.input1.background", ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(9480, "The background color of decorations in input 1.")));
-registerColor("mergeEditor.conflict.input2.background", ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(9481, "The background color of decorations in input 2.")));
+registerColor("mergeEditor.conflict.input1.background", ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(9669, "The background color of decorations in input 1.")));
+registerColor("mergeEditor.conflict.input2.background", ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(9670, "The background color of decorations in input 2.")));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };