@codingame/monaco-vscode-view-common-service-override 8.0.1 → 8.0.2

package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js

@@ -24,22 +24,22 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
     static { this.AUTO_LOCK_EXTRA_EDITORS = [
         {
             id: 'workbench.input.interactive',
-            label: ( localize(9723, 'Interactive Window')),
+            label: ( localize(9730, 'Interactive Window')),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-markdown.preview',
-            label: ( localize(9724, "Markdown Preview")),
+            label: ( localize(9731, "Markdown Preview")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-simpleBrowser.view',
-            label: ( localize(9725, "Simple Browser")),
+            label: ( localize(9732, "Simple Browser")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-browserPreview',
-            label: ( localize(9726, "Live Preview")),
+            label: ( localize(9733, "Live Preview")),
             priority: RegisteredEditorPriority.builtin
         }
     ]; }
@@ -84,7 +84,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 'workbench.editor.autoLockGroups': {
                     type: 'object',
                     description: ( localize(
-                        9727,
+                        9734,
                         "If an editor matching one of the listed types is opened as the first in an editor group and more than one group is open, the group is automatically locked. Locked groups will only be used for opening editors when explicitly chosen by a user gesture (for example drag and drop), but not by default. Consequently, the active editor in a locked group is less likely to be replaced accidentally with a different editor."
                     )),
                     properties: autoLockGroupConfiguration,
@@ -102,7 +102,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     default: '',
                     enum: [...binaryEditorCandidates, ''],
                     description: ( localize(
-                        9728,
+                        9735,
                         "The default editor for files detected as binary. If undefined, the user will be presented with a picker."
                     )),
                 }
@@ -115,7 +115,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 'workbench.editorAssociations': {
                     type: 'object',
                     markdownDescription: ( localize(
-                        9729,
+                        9736,
                         "Configure [glob patterns](https://aka.ms/vscode-glob-patterns) to editors (for example `\"*.hex\": \"hexEditor.hexedit\"`). These have precedence over the default behavior."
                     )),
                     patternProperties: {
@@ -137,7 +137,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                     minimum: 1,
                     scope: ConfigurationScope.RESOURCE,
                     markdownDescription: ( localize(
-                        9730,
+                        9737,
                         "Controls the minimum size of a file in MB before asking for confirmation when opening in the editor. Note that this setting may not apply to all editor types and environments."
                     )),
                 }

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

@@ -23,12 +23,12 @@ import { registerIcon } from 'vscode/vscode/vs/platform/theme/common/iconRegistr
 import { isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 
 var CallHierarchyController_1;
-const _ctxHasCallHierarchyProvider = ( (new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4239, 'Whether a call hierarchy provider is available')))));
-const _ctxCallHierarchyVisible = ( (new RawContextKey('callHierarchyVisible', false, ( localize(4240, 'Whether call hierarchy peek is currently showing')))));
+const _ctxHasCallHierarchyProvider = ( (new RawContextKey('editorHasCallHierarchyProvider', false, ( localize(4151, 'Whether a call hierarchy provider is available')))));
+const _ctxCallHierarchyVisible = ( (new RawContextKey('callHierarchyVisible', false, ( localize(4152, 'Whether call hierarchy peek is currently showing')))));
 const _ctxCallHierarchyDirection = ( (new RawContextKey(
     'callHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(4241, 'Whether call hierarchy shows incoming or outgoing calls')) }
+    { type: 'string', description: ( localize(4153, 'Whether call hierarchy shows incoming or outgoing calls')) }
 )));
 function sanitizedDirection(candidate) {
     return candidate === CallHierarchyDirection.CallsFrom || candidate === CallHierarchyDirection.CallsTo
@@ -116,14 +116,14 @@ let CallHierarchyController = class CallHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(4242, "No results")));
+                this._widget.showMessage(( localize(4154, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endCallHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4243, "Failed to show call hierarchy")));
+            this._widget.showMessage(( localize(4155, "Failed to show call hierarchy")));
         });
     }
     showOutgoingCalls() {
@@ -151,7 +151,7 @@ registerAction2(class PeekCallHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showCallHierarchy',
-            title: ( localize2(4244, 'Peek Call Hierarchy')),
+            title: ( localize2(4156, 'Peek Call Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -179,8 +179,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showIncomingCalls',
-            title: ( localize2(4245, 'Show Incoming Calls')),
-            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4246, 'Icon for incoming calls in the call hierarchy view.'))),
+            title: ( localize2(4157, 'Show Incoming Calls')),
+            icon: registerIcon('callhierarchy-incoming', Codicon.callIncoming, ( localize(4158, 'Icon for incoming calls in the call hierarchy view.'))),
             precondition: ( (ContextKeyExpr.and(
                 _ctxCallHierarchyVisible,
                  (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsFrom))
@@ -204,8 +204,8 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showOutgoingCalls',
-            title: ( localize2(4247, 'Show Outgoing Calls')),
-            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4248, 'Icon for outgoing calls in the call hierarchy view.'))),
+            title: ( localize2(4159, 'Show Outgoing Calls')),
+            icon: registerIcon('callhierarchy-outgoing', Codicon.callOutgoing, ( localize(4160, 'Icon for outgoing calls in the call hierarchy view.'))),
             precondition: ( (ContextKeyExpr.and(
                 _ctxCallHierarchyVisible,
                  (_ctxCallHierarchyDirection.isEqualTo(CallHierarchyDirection.CallsTo))
@@ -229,7 +229,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusCallHierarchy',
-            title: ( localize2(4249, 'Refocus Call Hierarchy')),
+            title: ( localize2(4161, 'Refocus Call Hierarchy')),
             precondition: _ctxCallHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -245,7 +245,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeCallHierarchy',
-            title: ( localize(4250, 'Close')),
+            title: ( localize(4162, 'Close')),
             icon: Codicon.close,
             precondition: _ctxCallHierarchyVisible,
             keybinding: {

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

@@ -267,13 +267,13 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === CallHierarchyDirection.CallsFrom
-            ? ( localize(9520, "Calls from '{0}'", element.model.root.name))
-            : ( localize(9521, "Callers of '{0}'", element.model.root.name));
+            ? ( localize(9527, "Calls from '{0}'", element.model.root.name))
+            : ( localize(9528, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(9522, "Loading...")));
+        this.setTitle(( localize(9529, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -292,8 +292,8 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === CallHierarchyDirection.CallsFrom
-                ? ( localize(9523, "No calls from '{0}'", model.root.name))
-                : ( localize(9524, "No callers of '{0}'", model.root.name)));
+                ? ( localize(9530, "No calls from '{0}'", model.root.name))
+                : ( localize(9531, "No callers of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

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

@@ -31,7 +31,7 @@ class ContributedCustomEditors extends Disposable {
                 this.add(( (new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localize(9508, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(9515, "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

@@ -5,7 +5,7 @@ import { globMatchesResource, RegisteredEditorPriority, priorityToRank } from 'v
 
 const CONTEXT_ACTIVE_CUSTOM_EDITOR_ID = ( (new RawContextKey('activeCustomEditorId', '', {
     type: 'string',
-    description: ( localize(9507, "The viewType of the currently active custom editor.")),
+    description: ( localize(9514, "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/languageStatus/browser/languageStatus.contribution.js

@@ -179,8 +179,8 @@ let LanguageStatus = class LanguageStatus {
                 isOneBusy = isOneBusy || (!isPinned && status.busy);
             }
             const props = {
-                name: ( localize(4443, "Editor Language Status")),
-                ariaLabel: ( localize(4444, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
+                name: ( localize(4355, "Editor Language Status")),
+                ariaLabel: ( localize(4356, "Editor Language Status: {0}", ariaLabels.join(', next: '))),
                 tooltip: element,
                 command: ShowTooltipCommand,
                 text: isOneBusy ? `${text}\u00A0\u00A0$(sync~spin)` : text,
@@ -280,7 +280,7 @@ let LanguageStatus = class LanguageStatus {
         store.add(actionBar);
         let action;
         if (!isPinned) {
-            action = ( (new Action('pin', ( localize(4445, "Add to Status Bar")), ThemeIcon.asClassName(Codicon.pin), true, () => {
+            action = ( (new Action('pin', ( localize(4357, "Add to Status Bar")), ThemeIcon.asClassName(Codicon.pin), true, () => {
                 this._dedicated.add(status.id);
                 this._statusBarService.updateEntryVisibility(status.id, true);
                 this._update();
@@ -288,7 +288,7 @@ let LanguageStatus = class LanguageStatus {
             })));
         }
         else {
-            action = ( (new Action('unpin', ( localize(4446, "Remove from Status Bar")), ThemeIcon.asClassName(Codicon.pinned), true, () => {
+            action = ( (new Action('unpin', ( localize(4358, "Remove from Status Bar")), ThemeIcon.asClassName(Codicon.pinned), true, () => {
                 this._dedicated.delete(status.id);
                 this._statusBarService.updateEntryVisibility(status.id, false);
                 this._update();
@@ -330,10 +330,10 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof status.label === 'string' ? status.label : status.label.value;
         if (status.detail) {
-            return { label: ( localize(4447, '{0}, {1}', textValue, status.detail)) };
+            return { label: ( localize(4359, '{0}, {1}', textValue, status.detail)) };
         }
         else {
-            return { label: ( localize(4448, '{0}', textValue)) };
+            return { label: ( localize(4360, '{0}', textValue)) };
         }
     }
     static _asStatusbarEntry(item) {
@@ -346,7 +346,7 @@ let LanguageStatus = class LanguageStatus {
         }
         const textValue = typeof item.label === 'string' ? item.label : item.label.shortValue;
         return {
-            name: ( localize(4449, '{0} (Language Status)', item.name)),
+            name: ( localize(4361, '{0} (Language Status)', item.name)),
             text: item.busy ? `${textValue}\u00A0\u00A0$(sync~spin)` : textValue,
             ariaLabel: LanguageStatus_1._accessibilityInformation(item).label,
             role: item.accessibilityInfo?.role,
@@ -369,7 +369,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'editor.inlayHints.Reset',
-            title: ( localize2(4450, "Reset Language Status Interaction Counter")),
+            title: ( localize2(4362, "Reset Language Status Interaction Counter")),
             category: Categories.View,
             f1: true
         });

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

@@ -12,7 +12,7 @@ import { FoldingController } from 'vscode/vscode/vs/editor/contrib/folding/brows
 import { ColorDetector } from 'vscode/vscode/vs/editor/contrib/colorPicker/browser/colorDetector';
 
 const openSettingsCommand = 'workbench.action.openSettings';
-const configureSettingsLabel = ( localize(4457, "Configure"));
+const configureSettingsLabel = ( localize(4369, "Configure"));
 let LimitIndicatorContribution = class LimitIndicatorContribution extends Disposable {
     constructor(editorService, languageStatusService) {
         super();
@@ -42,9 +42,9 @@ LimitIndicatorContribution = ( (__decorate([
 class ColorDecorationAccessor {
     constructor() {
         this.id = 'decoratorsLimitInfo';
-        this.name = ( localize(4458, 'Color Decorator Status'));
-        this.label = ( localize(4459, 'Color Decorators'));
-        this.source = ( localize(4460, 'Color Decorators'));
+        this.name = ( localize(4370, 'Color Decorator Status'));
+        this.label = ( localize(4371, 'Color Decorators'));
+        this.source = ( localize(4372, 'Color Decorators'));
         this.settingsId = 'editor.colorDecoratorsLimit';
     }
     getLimitReporter(editor) {
@@ -54,9 +54,9 @@ class ColorDecorationAccessor {
 class FoldingRangeAccessor {
     constructor() {
         this.id = 'foldingLimitInfo';
-        this.name = ( localize(4461, 'Folding Status'));
-        this.label = ( localize(4462, 'Folding Ranges'));
-        this.source = ( localize(4463, 'Folding'));
+        this.name = ( localize(4373, 'Folding Status'));
+        this.label = ( localize(4374, 'Folding Ranges'));
+        this.source = ( localize(4375, 'Folding'));
         this.settingsId = 'editor.foldingMaximumRegions';
     }
     getLimitReporter(editor) {
@@ -98,7 +98,7 @@ class LanguageStatusEntry {
                 name: this.accessor.name,
                 severity: Severity$1.Warning,
                 label: this.accessor.label,
-                detail: ( localize(4464, 'only {0} shown for performance reasons', info.limited)),
+                detail: ( localize(4376, 'only {0} shown for performance reasons', info.limited)),
                 command: { id: openSettingsCommand, arguments: [this.accessor.settingsId], title: configureSettingsLabel },
                 accessibilityInfo: undefined,
                 source: this.accessor.source,

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

@@ -55,7 +55,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2(9736, 'Open Merge Editor')),
+            title: ( localize2(9743, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -134,7 +134,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2(9737, "Mixed Layout")),
+            title: ( localize2(9744, "Mixed Layout")),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('mixed'))),
             menu: [
                 {
@@ -158,7 +158,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2(9738, 'Column Layout')),
+            title: ( localize2(9745, 'Column Layout')),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('columns'))),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -180,7 +180,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2(9739, "Show Non-Conflicting Changes")),
+            title: ( localize2(9746, "Show Non-Conflicting Changes")),
             toggled: ( (ctxMergeEditorShowNonConflictingChanges.isEqualTo(true))),
             menu: [
                 {
@@ -204,7 +204,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2(9740, "Show Base")),
+            title: ( localize2(9747, "Show Base")),
             toggled: ( (ctxMergeEditorShowBase.isEqualTo(true))),
             menu: [
                 {
@@ -230,7 +230,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2(9741, "Show Base Top")),
+            title: ( localize2(9748, "Show Base Top")),
             toggled: ( (ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop))),
             menu: [
                 {
@@ -253,7 +253,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2(9742, "Show Base Center")),
+            title: ( localize2(9749, "Show Base Center")),
             toggled: ( (ContextKeyExpr.and(
                 ctxMergeEditorShowBase,
                  (ctxMergeEditorShowBaseAtTop.negate())
@@ -275,13 +275,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(9743, "Merge Editor"));
+const mergeEditorCategory = ( localize2(9750, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2(9744, "Open File")),
+            title: ( localize2(9751, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -302,7 +302,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9745, "Go to Next Unhandled Conflict")),
+            title: ( localize2(9752, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -326,7 +326,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9746, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(9753, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -350,7 +350,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9747, "Toggle Current Conflict from Left")),
+            title: ( localize2(9754, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -364,7 +364,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9748, "Toggle Current Conflict from Right")),
+            title: ( localize2(9755, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -378,8 +378,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9749, "Compare Input 1 With Base")),
-            shortTitle: ( localize(9750, 'Compare With Base')),
+            title: ( localize2(9756, "Compare Input 1 With Base")),
+            shortTitle: ( localize(9757, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -396,8 +396,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9751, "Compare Input 2 With Base")),
-            shortTitle: ( localize(9750, 'Compare With Base')),
+            title: ( localize2(9758, "Compare Input 2 With Base")),
+            shortTitle: ( localize(9757, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -433,7 +433,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2(9752, "Open Base File")),
+            title: ( localize2(9759, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -448,7 +448,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9753, "Accept All Changes from Left")),
+            title: ( localize2(9760, "Accept All Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -464,7 +464,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9754, "Accept All Changes from Right")),
+            title: ( localize2(9761, "Accept All Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -480,8 +480,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9755, "Reset Result")),
-            shortTitle: ( localize(9756, 'Reset')),
+            title: ( localize2(9762, "Reset Result")),
+            shortTitle: ( localize(9763, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -497,7 +497,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2(9757, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(9764, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
@@ -510,7 +510,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9758, "Complete Merge")),
+            title: ( localize2(9765, "Complete Merge")),
             f1: false,
             precondition: ctxIsMergeEditor
         });
@@ -521,12 +521,12 @@ class AcceptMerge extends MergeEditorAction2 {
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
                 message: ( localize(
-                    9759,
+                    9766,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(9760, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(9761, "&&Complete with Conflicts"))
+                detail: ( localize(9767, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(9768, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {

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

@@ -13,13 +13,13 @@ import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxIsMergeEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const MERGE_EDITOR_CATEGORY = ( localize2(9762, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(9769, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9763, "Copy Merge Editor State as JSON")),
+            title: ( localize2(9770, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -31,8 +31,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9764, 'Merge Editor')),
-                message: ( localize(9765, "No active merge editor"))
+                name: ( localize(9771, 'Merge Editor')),
+                message: ( localize(9772, "No active merge editor"))
             });
             return;
         }
@@ -51,8 +51,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(9764, 'Merge Editor')),
-            message: ( localize(9766, "Successfully copied merge editor state")),
+            name: ( localize(9771, 'Merge Editor')),
+            message: ( localize(9773, "Successfully copied merge editor state")),
         });
     }
 }
@@ -61,7 +61,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9767, "Save Merge Editor State to Folder")),
+            title: ( localize2(9774, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -75,8 +75,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9764, 'Merge Editor')),
-                message: ( localize(9765, "No active merge editor"))
+                name: ( localize(9771, 'Merge Editor')),
+                message: ( localize(9772, "No active merge editor"))
             });
             return;
         }
@@ -88,7 +88,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9768, 'Select folder to save to'))
+            title: ( localize(9775, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -106,8 +106,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(9764, 'Merge Editor')),
-            message: ( localize(9769, "Successfully saved merge editor state to folder")),
+            name: ( localize(9771, 'Merge Editor')),
+            message: ( localize(9776, "Successfully saved merge editor state to folder")),
         });
     }
 }
@@ -116,7 +116,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9770, "Load Merge Editor State from Folder")),
+            title: ( localize2(9777, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -135,7 +135,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(9768, 'Select folder to save to'))
+                title: ( localize(9775, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -13,7 +13,7 @@ import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverCon
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4451, "Merge Editor"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4363, "Merge Editor"))), [
     ( (new SyncDescriptor(MergeEditorInput)))
 ]);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -24,8 +24,8 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(4452, "Uses the legacy diffing algorithm.")),
-                ( localize(4453, "Uses the advanced diffing algorithm.")),
+                ( localize(4364, "Uses the legacy diffing algorithm.")),
+                ( localize(4365, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {

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

@@ -126,7 +126,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(9771, "Text Merge Editor"));
+        return ( localize(9778, "Text Merge Editor"));
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;