@codingame/monaco-vscode-view-common-service-override 10.0.1 → 10.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "10.0.1",
+  "version": "10.0.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@10.0.1",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "10.0.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.2",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "10.0.2"
   }
 }

package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js

@@ -189,11 +189,11 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
     fillContextMenuActions(actions, e) {
         const menuBarVisibility = getMenuBarVisibility(this.configurationService);
         if (menuBarVisibility === 'compact' || menuBarVisibility === 'hidden' || menuBarVisibility === 'toggle') {
-            actions.unshift(...[toAction({ id: 'toggleMenuVisibility', label: ( localize(3755, "Menu")), checked: menuBarVisibility === 'compact', run: () => this.configurationService.updateValue('window.menuBarVisibility', menuBarVisibility === 'compact' ? 'toggle' : 'compact') }), ( (new Separator()))]);
+            actions.unshift(...[toAction({ id: 'toggleMenuVisibility', label: ( localize(3758, "Menu")), checked: menuBarVisibility === 'compact', run: () => this.configurationService.updateValue('window.menuBarVisibility', menuBarVisibility === 'compact' ? 'toggle' : 'compact') }), ( (new Separator()))]);
         }
         if (menuBarVisibility === 'compact' && this.menuBarContainer && e?.target) {
             if (isAncestor(e.target, this.menuBarContainer)) {
-                actions.unshift(...[toAction({ id: 'hideCompactMenu', label: ( localize(3756, "Hide Menu")), run: () => this.configurationService.updateValue('window.menuBarVisibility', 'toggle') }), ( (new Separator()))]);
+                actions.unshift(...[toAction({ id: 'hideCompactMenu', label: ( localize(3759, "Hide Menu")), run: () => this.configurationService.updateValue('window.menuBarVisibility', 'toggle') }), ( (new Separator()))]);
             }
         }
         if (this.globalCompositeBar) {
@@ -290,7 +290,7 @@ let ActivityBarCompositeBar = class ActivityBarCompositeBar extends PaneComposit
         const positionActions = [];
         createAndFillInContextMenuActions(activityBarPositionMenu, { primary: [], secondary: positionActions });
         return [
-            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3757, "Activity Bar Position")), positionActions))),
+            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3760, "Activity Bar Position")), positionActions))),
             toAction({ id: ToggleSidebarPositionAction.ID, label: ToggleSidebarPositionAction.getLabel(this.layoutService), run: () => this.instantiationService.invokeFunction(accessor => ( (new ToggleSidebarPositionAction())).run(accessor)) })
         ];
     }
@@ -312,10 +312,10 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.default',
             title: {
-                ...( localize2(3758, 'Move Activity Bar to Side')),
-                mnemonicTitle: ( localize(3759, "&&Default")),
+                ...( localize2(3761, 'Move Activity Bar to Side')),
+                mnemonicTitle: ( localize(3762, "&&Default")),
             },
-            shortTitle: ( localize(3760, "Default")),
+            shortTitle: ( localize(3763, "Default")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
                 `config.${"workbench.activityBar.location" }`,
@@ -343,10 +343,10 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.top',
             title: {
-                ...( localize2(3761, 'Move Activity Bar to Top')),
-                mnemonicTitle: ( localize(3762, "&&Top")),
+                ...( localize2(3764, 'Move Activity Bar to Top')),
+                mnemonicTitle: ( localize(3765, "&&Top")),
             },
-            shortTitle: ( localize(3763, "Top")),
+            shortTitle: ( localize(3766, "Top")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
                 `config.${"workbench.activityBar.location" }`,
@@ -374,10 +374,10 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.bottom',
             title: {
-                ...( localize2(3764, 'Move Activity Bar to Bottom')),
-                mnemonicTitle: ( localize(3765, "&&Bottom")),
+                ...( localize2(3767, 'Move Activity Bar to Bottom')),
+                mnemonicTitle: ( localize(3768, "&&Bottom")),
             },
-            shortTitle: ( localize(3766, "Bottom")),
+            shortTitle: ( localize(3769, "Bottom")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
                 `config.${"workbench.activityBar.location" }`,
@@ -405,10 +405,10 @@ registerAction2(class extends Action2 {
         super({
             id: 'workbench.action.activityBarLocation.hide',
             title: {
-                ...( localize2(3767, 'Hide Activity Bar')),
-                mnemonicTitle: ( localize(3768, "&&Hidden")),
+                ...( localize2(3770, 'Hide Activity Bar')),
+                mnemonicTitle: ( localize(3771, "&&Hidden")),
             },
-            shortTitle: ( localize(3769, "Hidden")),
+            shortTitle: ( localize(3772, "Hidden")),
             category: Categories.View,
             toggled: ( (ContextKeyExpr.equals(
                 `config.${"workbench.activityBar.location" }`,
@@ -433,13 +433,13 @@ registerAction2(class extends Action2 {
 });
 MenuRegistry.appendMenuItem(MenuId.MenubarAppearanceMenu, {
     submenu: MenuId.ActivityBarPositionMenu,
-    title: ( localize(3770, "Activity Bar Position")),
+    title: ( localize(3773, "Activity Bar Position")),
     group: '3_workbench_layout_move',
     order: 2
 });
 MenuRegistry.appendMenuItem(MenuId.ViewContainerTitleContext, {
     submenu: MenuId.ActivityBarPositionMenu,
-    title: ( localize(3770, "Activity Bar Position")),
+    title: ( localize(3773, "Activity Bar Position")),
     when: ( (ContextKeyExpr.equals(
         'viewContainerLocation',
         ViewContainerLocationToString(0 )
@@ -449,7 +449,7 @@ MenuRegistry.appendMenuItem(MenuId.ViewContainerTitleContext, {
 });
 MenuRegistry.appendMenuItem(MenuId.ViewTitleContext, {
     submenu: MenuId.ActivityBarPositionMenu,
-    title: ( localize(3770, "Activity Bar Position")),
+    title: ( localize(3773, "Activity Bar Position")),
     when: ( (ContextKeyExpr.equals(
         'viewLocation',
         ViewContainerLocationToString(0 )
@@ -483,7 +483,7 @@ registerAction2(class PreviousSideBarViewAction extends SwitchSideBarViewAction
     constructor() {
         super({
             id: 'workbench.action.previousSideBarView',
-            title: ( localize2(3771, 'Previous Primary Side Bar View')),
+            title: ( localize2(3774, 'Previous Primary Side Bar View')),
             category: Categories.View,
             f1: true
         }, -1);
@@ -493,7 +493,7 @@ registerAction2(class NextSideBarViewAction extends SwitchSideBarViewAction {
     constructor() {
         super({
             id: 'workbench.action.nextSideBarView',
-            title: ( localize2(3772, 'Next Primary Side Bar View')),
+            title: ( localize2(3775, 'Next Primary Side Bar View')),
             category: Categories.View,
             f1: true
         }, 1);
@@ -503,7 +503,7 @@ registerAction2(class FocusActivityBarAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.focusActivityBar',
-            title: ( localize2(3773, 'Focus Activity Bar')),
+            title: ( localize2(3776, 'Focus Activity Bar')),
             category: Categories.View,
             f1: true
         });

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(9829, 'Interactive Window')),
+            label: ( localize(9837, 'Interactive Window')),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-markdown.preview',
-            label: ( localize(9830, "Markdown Preview")),
+            label: ( localize(9838, "Markdown Preview")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-simpleBrowser.view',
-            label: ( localize(9831, "Simple Browser")),
+            label: ( localize(9839, "Simple Browser")),
             priority: RegisteredEditorPriority.builtin
         },
         {
             id: 'mainThreadWebview-browserPreview',
-            label: ( localize(9832, "Live Preview")),
+            label: ( localize(9840, "Live Preview")),
             priority: RegisteredEditorPriority.builtin
         }
     ]; }
@@ -84,7 +84,7 @@ let DynamicEditorConfigurations = class DynamicEditorConfigurations extends Disp
                 'workbench.editor.autoLockGroups': {
                     type: 'object',
                     description: ( localize(
-                        9833,
+                        9841,
                         "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(
-                        9834,
+                        9842,
                         "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(
-                        9835,
+                        9843,
                         "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: 4 ,
                     markdownDescription: ( localize(
-                        9836,
+                        9844,
                         "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/browser/parts/editor/editorParts.js

@@ -137,7 +137,7 @@ let EditorParts = class EditorParts extends MultiWindowParts {
         }
     }
     getGroupsLabel(index) {
-        return ( localize(3569, "Window {0}", index + 1));
+        return ( localize(3568, "Window {0}", index + 1));
     }
     getPart(groupOrElement) {
         if (this._parts.size > 1) {

package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js

@@ -93,7 +93,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
         const viewContainer = this.viewDescriptorService.getViewContainerById(compositeId);
         const defaultLocation = this.viewDescriptorService.getDefaultViewContainerLocation(viewContainer);
         if (defaultLocation !== this.viewDescriptorService.getViewContainerLocation(viewContainer)) {
-            actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9409, "Reset Location")), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
+            actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9448, "Reset Location")), run: () => this.viewDescriptorService.moveViewContainerToLocation(viewContainer, defaultLocation, undefined, 'resetLocationAction') }));
         }
         else {
             const viewContainerModel = this.viewDescriptorService.getViewContainerModel(viewContainer);
@@ -101,7 +101,7 @@ let PaneCompositeBar = class PaneCompositeBar extends Disposable {
                 const viewToReset = viewContainerModel.allViewDescriptors[0];
                 const defaultContainer = this.viewDescriptorService.getDefaultContainerById(viewToReset.id);
                 if (defaultContainer !== viewContainer) {
-                    actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9409, "Reset Location")), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
+                    actions.push(toAction({ id: 'resetLocationAction', label: ( localize(9448, "Reset Location")), run: () => this.viewDescriptorService.moveViewsToContainer([viewToReset], defaultContainer, undefined, 'resetLocationAction') }));
                 }
             }
         }

package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js

@@ -118,9 +118,9 @@ let PanelPart = class PanelPart extends AbstractPaneCompositePart {
         createAndFillInContextMenuActions(panelAlignMenu, { primary: [], secondary: alignActions });
         actions.push(...[
             ( (new Separator())),
-            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3774, "Panel Position")), positionActions))),
-            ( (new SubmenuAction('workbench.action.panel.align', ( localize(3775, "Align Panel")), alignActions))),
-            toAction({ id: TogglePanelAction.ID, label: ( localize(3776, "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
+            ( (new SubmenuAction('workbench.action.panel.position', ( localize(3755, "Panel Position")), positionActions))),
+            ( (new SubmenuAction('workbench.action.panel.align', ( localize(3756, "Align Panel")), alignActions))),
+            toAction({ id: TogglePanelAction.ID, label: ( localize(3757, "Hide Panel")), run: () => this.commandService.executeCommand(TogglePanelAction.ID) })
         ]);
     }
     layout(width, height, top, left) {

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

@@ -257,13 +257,13 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === "outgoingCalls"
-            ? ( localize(9619, "Calls from '{0}'", element.model.root.name))
-            : ( localize(9620, "Callers of '{0}'", element.model.root.name));
+            ? ( localize(9632, "Calls from '{0}'", element.model.root.name))
+            : ( localize(9633, "Callers of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = "loading" ;
-        this.setTitle(( localize(9621, "Loading...")));
+        this.setTitle(( localize(9634, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -282,8 +282,8 @@ let CallHierarchyTreePeekWidget = class CallHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === "outgoingCalls"
-                ? ( localize(9622, "No calls from '{0}'", model.root.name))
-                : ( localize(9623, "No callers of '{0}'", model.root.name)));
+                ? ( localize(9635, "No calls from '{0}'", model.root.name))
+                : ( localize(9636, "No callers of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = "data" ;

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

@@ -128,14 +128,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize(11353, "Call Hierarchy"));
+        return ( localize(11356, "Call Hierarchy"));
     }
     getAriaLabel(element) {
         if (this.getDirection() === "outgoingCalls" ) {
-            return ( localize(11354, "calls from {0}", element.item.name));
+            return ( localize(11357, "calls from {0}", element.item.name));
         }
         else {
-            return ( localize(11355, "callers of {0}", element.item.name));
+            return ( localize(11358, "callers of {0}", element.item.name));
         }
     }
 }

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

@@ -30,7 +30,7 @@ class ContributedCustomEditors extends Disposable {
                 this.add(( (new CustomEditorInfo({
                     id: webviewEditorContribution.viewType,
                     displayName: webviewEditorContribution.displayName,
-                    providerDisplayName: extension.description.isBuiltin ? ( localize(9607, "Built-in")) : extension.description.displayName || extension.description.identifier.value,
+                    providerDisplayName: extension.description.isBuiltin ? ( localize(9615, "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(9606, "The viewType of the currently active custom editor.")),
+    description: ( localize(9614, "The viewType of the currently active custom editor.")),
 })));
 const CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE = ( (new RawContextKey('focusedCustomEditorIsEditable', false)));
 class CustomEditorInfo {

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

@@ -54,7 +54,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2(9842, 'Open Merge Editor')),
+            title: ( localize2(9850, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -133,7 +133,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2(9843, "Mixed Layout")),
+            title: ( localize2(9851, "Mixed Layout")),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('mixed'))),
             menu: [
                 {
@@ -157,7 +157,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2(9844, 'Column Layout')),
+            title: ( localize2(9852, 'Column Layout')),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('columns'))),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -179,7 +179,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2(9845, "Show Non-Conflicting Changes")),
+            title: ( localize2(9853, "Show Non-Conflicting Changes")),
             toggled: ( (ctxMergeEditorShowNonConflictingChanges.isEqualTo(true))),
             menu: [
                 {
@@ -203,7 +203,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2(9846, "Show Base")),
+            title: ( localize2(9854, "Show Base")),
             toggled: ( (ctxMergeEditorShowBase.isEqualTo(true))),
             menu: [
                 {
@@ -229,7 +229,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2(9847, "Show Base Top")),
+            title: ( localize2(9855, "Show Base Top")),
             toggled: ( (ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop))),
             menu: [
                 {
@@ -252,7 +252,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2(9848, "Show Base Center")),
+            title: ( localize2(9856, "Show Base Center")),
             toggled: ( (ContextKeyExpr.and(
                 ctxMergeEditorShowBase,
                  (ctxMergeEditorShowBaseAtTop.negate())
@@ -274,13 +274,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(9849, "Merge Editor"));
+const mergeEditorCategory = ( localize2(9857, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2(9850, "Open File")),
+            title: ( localize2(9858, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -301,7 +301,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9851, "Go to Next Unhandled Conflict")),
+            title: ( localize2(9859, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -325,7 +325,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9852, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(9860, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -349,7 +349,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9853, "Toggle Current Conflict from Left")),
+            title: ( localize2(9861, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -363,7 +363,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9854, "Toggle Current Conflict from Right")),
+            title: ( localize2(9862, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -377,8 +377,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9855, "Compare Input 1 With Base")),
-            shortTitle: ( localize(9856, 'Compare With Base')),
+            title: ( localize2(9863, "Compare Input 1 With Base")),
+            shortTitle: ( localize(9864, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -395,8 +395,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9857, "Compare Input 2 With Base")),
-            shortTitle: ( localize(9856, 'Compare With Base')),
+            title: ( localize2(9865, "Compare Input 2 With Base")),
+            shortTitle: ( localize(9864, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -432,7 +432,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2(9858, "Open Base File")),
+            title: ( localize2(9866, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -447,7 +447,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9859, "Accept All Changes from Left")),
+            title: ( localize2(9867, "Accept All Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -463,7 +463,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9860, "Accept All Changes from Right")),
+            title: ( localize2(9868, "Accept All Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -479,8 +479,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9861, "Reset Result")),
-            shortTitle: ( localize(9862, 'Reset')),
+            title: ( localize2(9869, "Reset Result")),
+            shortTitle: ( localize(9870, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -496,7 +496,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2(9863, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(9871, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
@@ -509,7 +509,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9864, "Complete Merge")),
+            title: ( localize2(9872, "Complete Merge")),
             f1: false,
             precondition: ctxIsMergeEditor
         });
@@ -520,12 +520,12 @@ class AcceptMerge extends MergeEditorAction2 {
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
                 message: ( localize(
-                    9865,
+                    9873,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(9866, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(9867, "&&Complete with Conflicts"))
+                detail: ( localize(9874, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(9875, "&&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(9868, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(9876, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9869, "Copy Merge Editor State as JSON")),
+            title: ( localize2(9877, "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(9870, 'Merge Editor')),
-                message: ( localize(9871, "No active merge editor"))
+                name: ( localize(9878, 'Merge Editor')),
+                message: ( localize(9879, "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(9870, 'Merge Editor')),
-            message: ( localize(9872, "Successfully copied merge editor state")),
+            name: ( localize(9878, 'Merge Editor')),
+            message: ( localize(9880, "Successfully copied merge editor state")),
         });
     }
 }
@@ -61,7 +61,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9873, "Save Merge Editor State to Folder")),
+            title: ( localize2(9881, "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(9870, 'Merge Editor')),
-                message: ( localize(9871, "No active merge editor"))
+                name: ( localize(9878, 'Merge Editor')),
+                message: ( localize(9879, "No active merge editor"))
             });
             return;
         }
@@ -88,7 +88,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9874, 'Select folder to save to'))
+            title: ( localize(9882, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -106,8 +106,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(9870, 'Merge Editor')),
-            message: ( localize(9875, "Successfully saved merge editor state to folder")),
+            name: ( localize(9878, 'Merge Editor')),
+            message: ( localize(9883, "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(9876, "Load Merge Editor State from Folder")),
+            title: ( localize2(9884, "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(9874, 'Select folder to save to'))
+                title: ( localize(9882, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -11,19 +11,19 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 
-registerColor('mergeEditor.change.background', '#9bb95533', ( localize(11379, 'The background color for changes.')));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11380, 'The background color for word changes.')));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11381, 'The background color for changes in base.')));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11382, 'The background color for word changes in base.')));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11383, 'The border color of unhandled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11384, 'The border color of unhandled focused conflicts.')));
-registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11385, 'The border color of handled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11386, 'The border color of handled focused conflicts.')));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11387, 'The foreground color for changes in input 1.')));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11388, 'The foreground color for changes in input 1.')));
-registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11389, 'The background of the "Conflicting Lines" text.')));
+registerColor('mergeEditor.change.background', '#9bb95533', ( localize(11369, 'The background color for changes.')));
+registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11370, 'The background color for word changes.')));
+registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11371, 'The background color for changes in base.')));
+registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11372, 'The background color for word changes in base.')));
+registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11373, 'The border color of unhandled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11374, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11375, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11376, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11377, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11378, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11379, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11390, 'The background color of decorations in input 1.')));
-registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11391, 'The background color of decorations in input 2.')));
+registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11380, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11381, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -159,8 +159,8 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             }
             this.editor.setModel(this.inputNumber === 1 ? vm.model.input1.textModel : vm.model.input2.textModel);
             const title = this.inputNumber === 1
-                ? vm.model.input1.title || ( localize(11369, 'Input 1'))
-                : vm.model.input2.title || ( localize(11370, 'Input 2'));
+                ? vm.model.input1.title || ( localize(11382, 'Input 1'))
+                : vm.model.input2.title || ( localize(11383, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -242,19 +242,19 @@ class ModifiedBaseRangeGutterItemModel {
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localize(11371, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(11384, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(11371, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(11384, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(11372, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(11385, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
                 : undefined,
             ( (new Separator())),
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.swap', ( localize(11373, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(11386, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11374, 'Mark as Handled')), undefined, true, () => {
+            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11387, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -297,10 +297,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [0 ]: { icon: undefined, checked: false, title: ( localize(11375, "Accept")) },
-                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11376, "Accept (result is dirty)")) },
-                [1 ]: { icon: Codicon.check, checked: true, title: ( localize(11377, "Undo accept")) },
-                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localize(11378, "Undo accept (currently second)")) },
+                [0 ]: { icon: undefined, checked: false, title: ( localize(11388, "Accept")) },
+                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11389, "Accept (result is dirty)")) },
+                [1 ]: { icon: Codicon.check, checked: true, title: ( localize(11390, "Undo accept")) },
+                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localize(11391, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

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

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

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js

@@ -252,13 +252,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === "supertypes"
-            ? ( localize(9624, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(9625, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(9627, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(9628, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = "loading" ;
-        this.setTitle(( localize(9626, "Loading...")));
+        this.setTitle(( localize(9629, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -277,8 +277,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === "supertypes"
-                ? ( localize(9627, "No supertypes of '{0}'", model.root.name))
-                : ( localize(9628, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(9630, "No supertypes of '{0}'", model.root.name))
+                : ( localize(9631, "No subtypes of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = "data" ;

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js

@@ -116,14 +116,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize(11356, "Type Hierarchy"));
+        return ( localize(11353, "Type Hierarchy"));
     }
     getAriaLabel(element) {
         if (this.getDirection() === "supertypes" ) {
-            return ( localize(11357, "supertypes of {0}", element.item.name));
+            return ( localize(11354, "supertypes of {0}", element.item.name));
         }
         else {
-            return ( localize(11358, "subtypes of {0}", element.item.name));
+            return ( localize(11355, "subtypes of {0}", element.item.name));
         }
     }
 }

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -157,7 +157,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(9611, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(9619, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js

@@ -15,7 +15,7 @@ const webviewActiveContextKeyExpr = ( (ContextKeyExpr.and(
 )));
 class ShowWebViewEditorFindWidgetAction extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.showFind'; }
-    static { this.LABEL = ( localize(9837, "Show find")); }
+    static { this.LABEL = ( localize(9845, "Show find")); }
     constructor() {
         super({
             id: ShowWebViewEditorFindWidgetAction.ID,
@@ -36,7 +36,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
 }
 class HideWebViewEditorFindCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.hideFind'; }
-    static { this.LABEL = ( localize(9838, "Stop find")); }
+    static { this.LABEL = ( localize(9846, "Stop find")); }
     constructor() {
         super({
             id: HideWebViewEditorFindCommand.ID,
@@ -57,7 +57,7 @@ class HideWebViewEditorFindCommand extends Action2 {
 }
 class WebViewEditorFindNextCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findNext'; }
-    static { this.LABEL = ( localize(9839, 'Find next')); }
+    static { this.LABEL = ( localize(9847, 'Find next')); }
     constructor() {
         super({
             id: WebViewEditorFindNextCommand.ID,
@@ -78,7 +78,7 @@ class WebViewEditorFindNextCommand extends Action2 {
 }
 class WebViewEditorFindPreviousCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
-    static { this.LABEL = ( localize(9840, 'Find previous')); }
+    static { this.LABEL = ( localize(9848, 'Find previous')); }
     constructor() {
         super({
             id: WebViewEditorFindPreviousCommand.ID,
@@ -99,7 +99,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
 }
 class ReloadWebviewAction extends Action2 {
     static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
-    static { this.LABEL = ( localize2(9841, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(9849, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js

@@ -23,7 +23,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: '_workbench.output.showViewsLog',
-            title: ( localize2(9605, "Show Views Log")),
+            title: ( localize2(9613, "Show Views Log")),
             category: Categories.Developer,
             f1: true
         });