@codingame/monaco-vscode-view-common-service-override 26.0.0 → 26.1.0

package/package.json

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

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(9388, "Open Merge Editor"))
+            title: ( localize2(9389, "Open Merge Editor"))
         });
     }
     run(accessor, ...args) {
@@ -152,7 +152,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: "merge.mixedLayout",
-            title: ( localize2(9389, "Mixed Layout")),
+            title: ( localize2(9390, "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(9390, "Column Layout")),
+            title: ( localize2(9391, "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(9391, "Show Non-Conflicting Changes")),
+            title: ( localize2(9392, "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(9392, "Show Base")),
+            title: ( localize2(9393, "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(9393, "Show Base Top")),
+            title: ( localize2(9394, "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(9394, "Show Base Center")),
+            title: ( localize2(9395, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [{
                 id: MenuId.EditorTitle,
@@ -289,13 +289,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(9395, "Merge Editor"));
+const mergeEditorCategory = ( localize2(9396, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: "merge.openResult",
             icon: Codicon.goToFile,
-            title: ( localize2(9396, "Open File")),
+            title: ( localize2(9397, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                 id: MenuId.EditorTitle,
@@ -318,7 +318,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: "merge.goToNextUnhandledConflict",
             category: mergeEditorCategory,
-            title: ( localize2(9397, "Go to Next Unhandled Conflict")),
+            title: ( localize2(9398, "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(9398, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(9399, "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(9399, "Toggle Current Conflict from Left")),
+            title: ( localize2(9400, "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(9400, "Toggle Current Conflict from Right")),
+            title: ( localize2(9401, "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(9401, "Compare Input 1 With Base")),
-            shortTitle: ( localize(9402, "Compare With Base")),
+            title: ( localize2(9402, "Compare Input 1 With Base")),
+            shortTitle: ( localize(9403, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -411,8 +411,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: "mergeEditor.compareInput2WithBase",
             category: mergeEditorCategory,
-            title: ( localize2(9403, "Compare Input 2 With Base")),
-            shortTitle: ( localize(9402, "Compare With Base")),
+            title: ( localize2(9404, "Compare Input 2 With Base")),
+            shortTitle: ( localize(9403, "Compare With Base")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -457,7 +457,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: "merge.openBaseEditor",
             category: mergeEditorCategory,
-            title: ( localize2(9404, "Open Base File")),
+            title: ( localize2(9405, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor
         });
@@ -472,7 +472,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: "merge.acceptAllInput1",
             category: mergeEditorCategory,
-            title: ( localize2(9405, "Accept All Incoming Changes from Left")),
+            title: ( localize2(9406, "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(9406, "Accept All Current Changes from Right")),
+            title: ( localize2(9407, "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(9407, "Reset Result")),
-            shortTitle: ( localize(9408, "Reset")),
+            title: ( localize2(9408, "Reset Result")),
+            shortTitle: ( localize(9409, "Reset")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: {
@@ -530,7 +530,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: "mergeEditor.resetCloseWithConflictsChoice",
             category: mergeEditorCategory,
-            title: ( localize2(9409, "Reset Choice for 'Close with Conflicts'")),
+            title: ( localize2(9410, "Reset Choice for 'Close with Conflicts'")),
             f1: true
         });
     }
@@ -543,7 +543,7 @@ class AcceptAllCombination extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptAllCombination",
             category: mergeEditorCategory,
-            title: ( localize2(9410, "Accept All Combination")),
+            title: ( localize2(9411, "Accept All Combination")),
             f1: true
         });
     }
@@ -572,7 +572,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: "mergeEditor.acceptMerge",
             category: mergeEditorCategory,
-            title: ( localize2(9411, "Complete Merge")),
+            title: ( localize2(9412, "Complete Merge")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [{
@@ -597,12 +597,12 @@ class AcceptMerge extends MergeEditorAction2 {
                 confirmed
             } = await dialogService.confirm({
                 message: ( localize(
-                    9412,
+                    9413,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(9413, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(9414, "&&Complete with Conflicts"))
+                detail: ( localize(9414, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(9415, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {
@@ -622,7 +622,7 @@ class ToggleBetweenInputs extends MergeEditorAction2 {
         super({
             id: "mergeEditor.toggleBetweenInputs",
             category: mergeEditorCategory,
-            title: ( localize2(9415, "Toggle Between Merge Editor Inputs")),
+            title: ( localize2(9416, "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(9416, "Merge Editor (Dev)"));
+const MERGE_EDITOR_CATEGORY = ( localize2(9417, "Merge Editor (Dev)"));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: "merge.dev.copyContentsJson",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9417, "Copy Merge Editor State as JSON")),
+            title: ( localize2(9418, "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(9418, "Merge Editor")),
-                message: ( localize(9419, "No active merge editor"))
+                name: ( localize(9419, "Merge Editor")),
+                message: ( localize(9420, "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(9418, "Merge Editor")),
-            message: ( localize(9420, "Successfully copied merge editor state"))
+            name: ( localize(9419, "Merge Editor")),
+            message: ( localize(9421, "Successfully copied merge editor state"))
         });
     }
 }
@@ -64,7 +64,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: "merge.dev.saveContentsToFolder",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9421, "Save Merge Editor State to Folder")),
+            title: ( localize2(9422, "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(9418, "Merge Editor")),
-                message: ( localize(9419, "No active merge editor"))
+                name: ( localize(9419, "Merge Editor")),
+                message: ( localize(9420, "No active merge editor"))
             });
             return;
         }
@@ -93,7 +93,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9422, "Select folder to save to"))
+            title: ( localize(9423, "Select folder to save to"))
         });
         if (!result) {
             return;
@@ -115,8 +115,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write("initialResult", model.getInitialResultValue())
         ]);
         notificationService.info({
-            name: ( localize(9418, "Merge Editor")),
-            message: ( localize(9423, "Successfully saved merge editor state to folder"))
+            name: ( localize(9419, "Merge Editor")),
+            message: ( localize(9424, "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(9424, "Load Merge Editor State from Folder")),
+            title: ( localize2(9425, "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(9422, "Select folder to save to"))
+                title: ( localize(9423, "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(9425, "Merge Editor"))), [( new SyncDescriptor(MergeEditorInput))]);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(9426, "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(9426, "Uses the legacy diffing algorithm.")), ( localize(9427, "Uses the advanced diffing algorithm."))]
+            markdownEnumDescriptions: [( localize(9427, "Uses the legacy diffing algorithm.")), ( localize(9428, "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(9428, "You are in a merge editor.")), ( localize(
-            9429,
+        const content = [( localize(9429, "You are in a merge editor.")), ( localize(
+            9430,
             "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(
-            9430,
+            9431,
             "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(9431, "Complete the Merge{0}.", "<keybinding:mergeEditor.acceptMerge>")), ( localize(
-            9432,
+        )), ( localize(9432, "Complete the Merge{0}.", "<keybinding:mergeEditor.acceptMerge>")), ( localize(
+            9433,
             "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(9468, "The background color for changes.")));
+registerColor("mergeEditor.change.background", "#9bb95533", ( localize(9469, "The background color for changes.")));
 registerColor("mergeEditor.change.word.background", {
     dark: "#9ccc2c33",
     light: "#9ccc2c66",
     hcDark: "#9ccc2c33",
     hcLight: "#9ccc2c66"
-}, ( localize(9469, "The background color for word changes.")));
+}, ( localize(9470, "The background color for word changes.")));
 registerColor("mergeEditor.changeBase.background", {
     dark: "#4B1818FF",
     light: "#FFCCCCFF",
     hcDark: "#4B1818FF",
     hcLight: "#FFCCCCFF"
-}, ( localize(9470, "The background color for changes in base.")));
+}, ( localize(9471, "The background color for changes in base.")));
 registerColor("mergeEditor.changeBase.word.background", {
     dark: "#6F1313FF",
     light: "#FFA3A3FF",
     hcDark: "#6F1313FF",
     hcLight: "#FFA3A3FF"
-}, ( localize(9471, "The background color for word changes in base.")));
+}, ( localize(9472, "The background color for word changes in base.")));
 registerColor("mergeEditor.conflict.unhandledUnfocused.border", {
     dark: "#ffa6007a",
     light: "#ffa600FF",
     hcDark: "#ffa6007a",
     hcLight: "#ffa6007a"
-}, ( localize(9472, "The border color of unhandled unfocused conflicts.")));
-registerColor("mergeEditor.conflict.unhandledFocused.border", "#ffa600", ( localize(9473, "The border color of unhandled focused conflicts.")));
+}, ( localize(9473, "The border color of unhandled unfocused conflicts.")));
+registerColor("mergeEditor.conflict.unhandledFocused.border", "#ffa600", ( localize(9474, "The border color of unhandled focused conflicts.")));
 registerColor(
     "mergeEditor.conflict.handledUnfocused.border",
     "#86868649",
-    ( localize(9474, "The border color of handled unfocused conflicts."))
+    ( localize(9475, "The border color of handled unfocused conflicts."))
 );
-registerColor("mergeEditor.conflict.handledFocused.border", "#c1c1c1cc", ( localize(9475, "The border color of handled focused conflicts.")));
+registerColor("mergeEditor.conflict.handledFocused.border", "#c1c1c1cc", ( localize(9476, "The border color of handled focused conflicts.")));
 const handledConflictMinimapOverViewRulerColor = registerColor(
     "mergeEditor.conflict.handled.minimapOverViewRuler",
     "#adaca8ee",
-    ( localize(9476, "The foreground color for changes in input 1."))
+    ( localize(9477, "The foreground color for changes in input 1."))
 );
 const unhandledConflictMinimapOverViewRulerColor = registerColor(
     "mergeEditor.conflict.unhandled.minimapOverViewRuler",
     "#fcba03FF",
-    ( localize(9477, "The foreground color for changes in input 1."))
+    ( localize(9478, "The foreground color for changes in input 1."))
 );
-registerColor("mergeEditor.conflictingLines.background", "#ffea0047", ( localize(9478, "The background of the \"Conflicting Lines\" text.")));
+registerColor("mergeEditor.conflictingLines.background", "#ffea0047", ( localize(9479, "The background of the \"Conflicting Lines\" text.")));
 const contentTransparency = 0.4;
-registerColor("mergeEditor.conflict.input1.background", ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(9479, "The background color of decorations in input 1.")));
-registerColor("mergeEditor.conflict.input2.background", ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(9480, "The background color of decorations in input 2.")));
+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.")));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -92,14 +92,14 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localize(9481, "Manual Resolution")),
-                    tooltip: ( localize(9482, "This conflict has been resolved manually."))
+                    text: ( localize(9482, "Manual Resolution")),
+                    tooltip: ( localize(9483, "This conflict has been resolved manually."))
                 });
             } else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localize(9483, "No Changes Accepted")),
+                    text: ( localize(9484, "No Changes Accepted")),
                     tooltip: ( localize(
-                        9484,
+                        9485,
                         "The current resolution of this conflict equals the common ancestor of both the right and left changes."
                     ))
                 });
@@ -120,33 +120,33 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localize(9485, "Remove {0}", model.input1.title)), async () => {
+                stateToggles.push(command(( localize(9486, "Remove {0}", model.input1.title)), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, state.withInputValue(1, false), true, tx);
                         model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
                     });
-                }, ( localize(9486, "Remove {0} from the result document.", model.input1.title))));
+                }, ( localize(9487, "Remove {0} from the result document.", model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localize(9485, "Remove {0}", model.input2.title)), async () => {
+                stateToggles.push(command(( localize(9486, "Remove {0}", model.input2.title)), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
                         model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
                     });
-                }, ( localize(9486, "Remove {0} from the result document.", model.input2.title))));
+                }, ( localize(9487, "Remove {0} from the result document.", model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both && state.firstInput === 2) {
                 stateToggles.reverse();
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localize(9487, "Reset to base")), async () => {
+                result.push(command(( localize(9488, "Reset to base")), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
                 }, ( localize(
-                    9488,
+                    9489,
                     "Reset this conflict to the common ancestor of both the right and left changes."
                 ))));
             }
@@ -178,7 +178,7 @@ class ActionsSource {
             const otherInputNumber = inputNumber === 1 ? 2 : 1;
             if (state.kind !== ModifiedBaseRangeStateKind.unrecognized && !state.isInputIncluded(inputNumber)) {
                 if (!state.isInputIncluded(otherInputNumber) || !this.viewModel.shouldUseAppendInsteadOfAccept.read(reader)) {
-                    result.push(command(( localize(9489, "Accept {0}", inputData.title)), async () => {
+                    result.push(command(( localize(9490, "Accept {0}", inputData.title)), async () => {
                         transaction(tx => {
                             model.setState(
                                 modifiedBaseRange,
@@ -188,9 +188,9 @@ class ActionsSource {
                             );
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(9490, "Accept {0} in the result document.", inputData.title))));
+                    }, ( localize(9491, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        const commandName = modifiedBaseRange.isOrderRelevant ? ( localize(9491, "Accept Combination ({0} First)", inputData.title)) : ( localize(9492, "Accept Combination"));
+                        const commandName = modifiedBaseRange.isOrderRelevant ? ( localize(9492, "Accept Combination ({0} First)", inputData.title)) : ( localize(9493, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction(tx => {
                                 model.setState(
@@ -202,12 +202,12 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            9493,
+                            9494,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 } else {
-                    result.push(command(( localize(9494, "Append {0}", inputData.title)), async () => {
+                    result.push(command(( localize(9495, "Append {0}", inputData.title)), async () => {
                         transaction(tx => {
                             model.setState(
                                 modifiedBaseRange,
@@ -217,9 +217,9 @@ class ActionsSource {
                             );
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(9495, "Append {0} to the result document.", inputData.title))));
+                    }, ( localize(9496, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localize(9496, "Accept Combination", inputData.title)), async () => {
+                        result.push(command(( localize(9497, "Accept Combination", inputData.title)), async () => {
                             transaction(tx => {
                                 model.setState(
                                     modifiedBaseRange,
@@ -230,17 +230,17 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            9493,
+                            9494,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localize(9497, "Ignore")), async () => {
+                    result.push(command(( localize(9498, "Ignore")), async () => {
                         transaction(tx => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localize(9498, "Don't take this side of the conflict."))));
+                    }, ( localize(9499, "Don't take this side of the conflict."))));
                 }
             }
             return result;

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

@@ -122,16 +122,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9499, "Base"))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9500, "Base"))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    9500,
+                    9501,
                     "Comparing with {0}",
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(9501, "Differences are highlighted with a background color."));
+                const tooltip = ( localize(9502, "Differences are highlighted with a background color."));
                 node = h("span", {
                     title: tooltip
                 }, [label]).root;

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

@@ -178,7 +178,7 @@ 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(9502, "Input 1")) : vm.model.input2.title || ( localize(9503, "Input 2"));
+            const title = this.inputNumber === 1 ? vm.model.input1.title || ( localize(9503, "Input 1")) : vm.model.input2.title || ( localize(9504, "Input 2"));
             const description = this.inputNumber === 1 ? vm.model.input1.description : vm.model.input2.description;
             const detail = this.inputNumber === 1 ? vm.model.input1.detail : vm.model.input2.detail;
             reset(this.htmlElements.title, ...renderLabelWithIcons(title));
@@ -255,16 +255,16 @@ class ModifiedBaseRangeGutterItemModel {
         }
         const both = state.includesInput1 && state.includesInput2;
         return [
-            this.baseRange.input1Diffs.length > 0 ? action("mergeEditor.acceptInput1", ( localize(9504, "Accept {0}", this.model.input1.title)), state.toggle(1), state.includesInput1) : undefined,
-            this.baseRange.input2Diffs.length > 0 ? action("mergeEditor.acceptInput2", ( localize(9504, "Accept {0}", this.model.input2.title)), state.toggle(2), state.includesInput2) : undefined,
-            this.baseRange.isConflicting ? setFields(action("mergeEditor.acceptBoth", ( localize(9505, "Accept Both")), state.withInputValue(1, !both).withInputValue(2, !both), both), {
+            this.baseRange.input1Diffs.length > 0 ? action("mergeEditor.acceptInput1", ( localize(9505, "Accept {0}", this.model.input1.title)), state.toggle(1), state.includesInput1) : undefined,
+            this.baseRange.input2Diffs.length > 0 ? action("mergeEditor.acceptInput2", ( localize(9505, "Accept {0}", this.model.input2.title)), state.toggle(2), state.includesInput2) : undefined,
+            this.baseRange.isConflicting ? setFields(action("mergeEditor.acceptBoth", ( localize(9506, "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(9506, "Swap")), state.swap(), false), {
+            this.baseRange.isConflicting ? setFields(action("mergeEditor.swap", ( localize(9507, "Swap")), state.swap(), false), {
                 enabled: !state.kind && (!both || this.baseRange.isOrderRelevant)
             }) : undefined,
-            setFields(( new Action("mergeEditor.markAsHandled", ( localize(9507, "Mark as Handled")), undefined, true, () => {
+            setFields(( new Action("mergeEditor.markAsHandled", ( localize(9508, "Mark as Handled")), undefined, true, () => {
                 transaction(tx => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -311,22 +311,22 @@ class MergeConflictGutterItemView extends Disposable {
                 [InputState.excluded]: {
                     icon: undefined,
                     checked: false,
-                    title: ( localize(9508, "Accept"))
+                    title: ( localize(9509, "Accept"))
                 },
                 [InputState.unrecognized]: {
                     icon: Codicon.circleFilled,
                     checked: false,
-                    title: ( localize(9509, "Accept (result is dirty)"))
+                    title: ( localize(9510, "Accept (result is dirty)"))
                 },
                 [InputState.first]: {
                     icon: Codicon.check,
                     checked: true,
-                    title: ( localize(9510, "Undo accept"))
+                    title: ( localize(9511, "Undo accept"))
                 },
                 [InputState.second]: {
                     icon: Codicon.checkAll,
                     checked: true,
-                    title: ( localize(9511, "Undo accept (currently second)"))
+                    title: ( localize(9512, "Undo accept (currently second)"))
                 }
             };
             const state = iconMap[value];

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

@@ -139,7 +139,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9512, "Result"))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9513, "Result"))));
             reset(
                 this.htmlElements.description,
                 ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, {
@@ -158,7 +158,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             const count = model.unhandledConflictsCount.read(reader);
-            const text = count === 1 ? ( localize(9513, "{0} Conflict Remaining", count)) : ( localize(9514, "{0} Conflicts Remaining ", count));
+            const text = count === 1 ? ( localize(9514, "{0} Conflict Remaining", count)) : ( localize(9515, "{0} Conflicts Remaining ", count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -169,7 +169,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.model.telemetry.reportConflictCounterClicked();
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).read(undefined));
                 },
-                tooltip: count > 0 ? ( localize(9515, "Go to next conflict")) : ( localize(9516, "All conflicts handled, the merge can be completed now."))
+                tooltip: count > 0 ? ( localize(9516, "Go to next conflict")) : ( localize(9517, "All conflicts handled, the merge can be completed now."))
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));

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

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

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

@@ -238,7 +238,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(9518, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(9519, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -26,11 +26,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(10192, "Keyboard Layout"));
+        const name = ( localize(10193, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(10193, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(10194, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -42,7 +42,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(10193, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(10194, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -50,7 +50,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                     command: KEYBOARD_LAYOUT_OPEN_PICKER
                 });
             } else {
-                const text = ( localize(10193, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(10194, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -68,17 +68,17 @@ registerWorkbenchContribution2(
     WorkbenchPhase.BlockStartup
 );
 const DEFAULT_CONTENT = [`// ${( localize(
-    10194,
+    10195,
     "Defines the keyboard layout used in VS Code in the browser environment."
 ))}`, `// ${( localize(
-    10195,
+    10196,
     "Open VS Code and run \"Developer: Inspect Key Mappings (JSON)\" from Command Palette."
 ))}`, ``, `// Once you have the keyboard layout info, please paste it below.`, "\n"].join("\n");
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(10196, "Change Keyboard Layout")),
+            title: ( localize2(10197, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -113,21 +113,21 @@ registerAction2(class extends Action2 {
             const platform = isMacintosh ? "Mac" : isWindows ? "Win" : "Linux";
             picks.unshift({
                 type: "separator",
-                label: ( localize(10197, "Keyboard Layouts ({0})", platform))
+                label: ( localize(10198, "Keyboard Layouts ({0})", platform))
             });
         }
         const configureKeyboardLayout = {
-            label: ( localize(10198, "Configure Keyboard Layout"))
+            label: ( localize(10199, "Configure Keyboard Layout"))
         };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(10199, "Auto Detect")),
+            label: ( localize(10200, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localize(10200, "Select Keyboard Layout")),
+            placeHolder: ( localize(10201, "Select Keyboard Layout")),
             matchOnDescription: true
         });
         if (!pick) {
@@ -153,7 +153,7 @@ registerAction2(class extends Action2 {
                     }
                 });
             }, error => {
-                throw ( new Error(( localize(10201, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(10202, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

@@ -21,7 +21,7 @@ registerWorkbenchContribution2(
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                10752,
+                10753,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -31,7 +31,7 @@ registerWorkbenchContribution2(
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                10753,
+                10754,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         }

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

@@ -122,8 +122,8 @@ let SyncScroll = class SyncScroll extends Disposable {
     toggleStatusbarItem(active) {
         if (active) {
             if (!this.statusBarEntry.value) {
-                const text = ( localize(10970, "Scrolling Locked"));
-                const tooltip = ( localize(10971, "Lock Scrolling Enabled"));
+                const text = ( localize(10971, "Scrolling Locked"));
+                const tooltip = ( localize(10972, "Lock Scrolling Enabled"));
                 this.statusBarEntry.value = this.statusbarService.addEntry({
                     name: text,
                     text,
@@ -148,13 +148,13 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.toggleLockedScrolling",
                     title: {
-                        ...( localize2(10972, "Toggle Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(10973, "Locked Scrolling"))
+                        ...( localize2(10973, "Toggle Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10974, "Locked Scrolling"))
                     },
                     category: Categories.View,
                     f1: true,
                     metadata: {
-                        description: ( localize(10974, "Synchronize Scrolling Editors"))
+                        description: ( localize(10975, "Synchronize Scrolling Editors"))
                     }
                 });
             }
@@ -167,8 +167,8 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.holdLockedScrolling",
                     title: {
-                        ...( localize2(10975, "Hold Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(10976, "Locked Scrolling"))
+                        ...( localize2(10976, "Hold Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10977, "Locked Scrolling"))
                     },
                     category: Categories.View
                 });

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

@@ -22,11 +22,11 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(13198, "Whether a type hierarchy provider is available"))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(13199, "Whether type hierarchy peek is currently showing"))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey("editorHasTypeHierarchyProvider", false, ( localize(13199, "Whether a type hierarchy provider is available"))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey("typeHierarchyVisible", false, ( localize(13200, "Whether type hierarchy peek is currently showing"))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey("typeHierarchyDirection", undefined, {
     type: "string",
-    description: ( localize(13200, "whether type hierarchy shows super types or subtypes"))
+    description: ( localize(13201, "whether type hierarchy shows super types or subtypes"))
 }));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes ? candidate : TypeHierarchyDirection.Subtypes;
@@ -121,14 +121,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._sessionDisposables.add(model);
                 this._widget.showModel(model);
             } else {
-                this._widget.showMessage(( localize(13201, "No results")));
+                this._widget.showMessage(( localize(13202, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(13202, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(13203, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -179,7 +179,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showTypeHierarchy",
-            title: ( localize2(13203, "Peek Type Hierarchy")),
+            title: ( localize2(13204, "Peek Type Hierarchy")),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: "navigation",
@@ -198,7 +198,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSupertypes",
-            title: ( localize2(13204, "Show Supertypes")),
+            title: ( localize2(13205, "Show Supertypes")),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
@@ -220,7 +220,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.showSubtypes",
-            title: ( localize2(13205, "Show Subtypes")),
+            title: ( localize2(13206, "Show Subtypes")),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
@@ -242,7 +242,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.refocusTypeHierarchy",
-            title: ( localize2(13206, "Refocus Type Hierarchy")),
+            title: ( localize2(13207, "Refocus Type Hierarchy")),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -258,7 +258,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: "editor.closeTypeHierarchy",
-            title: ( localize(13207, "Close")),
+            title: ( localize(13208, "Close")),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

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

@@ -326,12 +326,12 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
             this._previewDisposable.add(toDisposable(() => decorationsCollection.clear()));
         }
         this._previewDisposable.add(value);
-        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(13208, "Supertypes of '{0}'", element.model.root.name)) : ( localize(13209, "Subtypes of '{0}'", element.model.root.name));
+        const title = this._direction === TypeHierarchyDirection.Supertypes ? ( localize(13209, "Supertypes of '{0}'", element.model.root.name)) : ( localize(13210, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset["state"] = State.Loading;
-        this.setTitle(( localize(13210, "Loading...")));
+        this.setTitle(( localize(13211, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -349,7 +349,7 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         const root = this._tree.getNode(model).children[0];
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
-            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(13211, "No supertypes of '{0}'", model.root.name)) : ( localize(13212, "No subtypes of '{0}'", model.root.name)));
+            this.showMessage(this._direction === TypeHierarchyDirection.Supertypes ? ( localize(13212, "No supertypes of '{0}'", model.root.name)) : ( localize(13213, "No subtypes of '{0}'", model.root.name)));
         } else {
             this._parent.dataset["state"] = State.Data;
             if (!viewState || this._tree.getFocus().length === 0) {

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

@@ -122,13 +122,13 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(13213, "Type Hierarchy");
+        return localize(13214, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(13214, "supertypes of {0}", element.item.name);
+            return localize(13215, "supertypes of {0}", element.item.name);
         } else {
-            return localize(13215, "subtypes of {0}", element.item.name);
+            return localize(13216, "subtypes of {0}", element.item.name);
         }
     }
 }

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

@@ -202,7 +202,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on("fatal-error", e => {
-            notificationService.error(( localize(13520, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(13521, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({
                 message: e.message
             });

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

@@ -18,7 +18,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
         this.ID = "editor.action.webvieweditor.showFind";
     }
     static {
-        this.LABEL = ( localize(13521, "Show find"));
+        this.LABEL = ( localize(13522, "Show find"));
     }
     constructor() {
         super({
@@ -43,7 +43,7 @@ class HideWebViewEditorFindCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.hideFind";
     }
     static {
-        this.LABEL = ( localize(13522, "Stop find"));
+        this.LABEL = ( localize(13523, "Stop find"));
     }
     constructor() {
         super({
@@ -68,7 +68,7 @@ class WebViewEditorFindNextCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findNext";
     }
     static {
-        this.LABEL = ( localize(13523, "Find next"));
+        this.LABEL = ( localize(13524, "Find next"));
     }
     constructor() {
         super({
@@ -93,7 +93,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
         this.ID = "editor.action.webvieweditor.findPrevious";
     }
     static {
-        this.LABEL = ( localize(13524, "Find previous"));
+        this.LABEL = ( localize(13525, "Find previous"));
     }
     constructor() {
         super({
@@ -118,7 +118,7 @@ class ReloadWebviewAction extends Action2 {
         this.ID = "workbench.action.webview.reloadWebviewAction";
     }
     static {
-        this.LABEL = ( localize2(13525, "Reload Webviews"));
+        this.LABEL = ( localize2(13526, "Reload Webviews"));
     }
     constructor() {
         super({

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

@@ -19,7 +19,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ins
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
 ( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(
-    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(13527, "webview editor"))),
+    EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(13528, "webview editor"))),
     [( new SyncDescriptor(WebviewInput))]
 );
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -560,8 +560,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource]?.find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity.Warning, ( localize(14270, "There are multiple default editors available for the resource.")), [{
-            label: ( localize(14271, "Configure Default")),
+        const handle = this.notificationService.prompt(Severity.Warning, ( localize(14271, "There are multiple default editors available for the resource.")), [{
+            label: ( localize(14272, "Configure Default")),
             run: async () => {
                 const picked = await this.doPickEditor(untypedInput, true);
                 if (!picked) {
@@ -579,7 +579,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }]);
             }
         }, {
-            label: ( localize(14272, "Keep {0}", editorName)),
+            label: ( localize(14273, "Keep {0}", editorName)),
             run: writeCurrentEditorsToStorage
         }]);
         const onCloseListener = handle.onDidClose(() => {
@@ -602,9 +602,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(14273, "Active"));
-        const currentDefaultLabel = ( localize(14274, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(14275, "Active and Default"));
+        const currentlyActiveLabel = ( localize(14274, "Active"));
+        const currentDefaultLabel = ( localize(14275, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(14276, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -631,7 +631,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(14276, "Configure default editor for '{0}'...", `*${extname(resource)}`))
+                label: ( localize(14277, "Configure default editor for '{0}'...", `*${extname(resource)}`))
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -651,7 +651,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({
             useSeparators: true
         }));
-        const placeHolderMessage = showDefaultPicker ? ( localize(14277, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(14278, "Select editor for '{0}'", basename(resource)));
+        const placeHolderMessage = showDefaultPicker ? ( localize(14278, "Select new default editor for '{0}'", `*${extname(resource)}`)) : ( localize(14279, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;

package/vscode/src/vs/workbench/services/history/browser/historyService.js

@@ -101,33 +101,33 @@ let HistoryService = class HistoryService extends Disposable {
             return matcher;
         })));
         this.editorHelper = this.instantiationService.createInstance(EditorHelper);
-        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(14492, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
-        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(14493, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateBackContextKey = ( new RawContextKey("canNavigateBack", false, ( localize(14493, "Whether it is possible to navigate back in editor history")))).bindTo(this.contextKeyService);
+        this.canNavigateForwardContextKey = ( new RawContextKey("canNavigateForward", false, ( localize(14494, "Whether it is possible to navigate forward in editor history")))).bindTo(this.contextKeyService);
         this.canNavigateBackInNavigationsContextKey = ( new RawContextKey("canNavigateBackInNavigationLocations", false, ( localize(
-            14494,
+            14495,
             "Whether it is possible to navigate back in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInNavigationsContextKey = ( new RawContextKey("canNavigateForwardInNavigationLocations", false, ( localize(
-            14495,
+            14496,
             "Whether it is possible to navigate forward in editor navigation locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastNavigationLocationContextKey = ( new RawContextKey("canNavigateToLastNavigationLocation", false, ( localize(
-            14496,
+            14497,
             "Whether it is possible to navigate to the last editor navigation location"
         )))).bindTo(this.contextKeyService);
         this.canNavigateBackInEditsContextKey = ( new RawContextKey("canNavigateBackInEditLocations", false, ( localize(
-            14497,
+            14498,
             "Whether it is possible to navigate back in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateForwardInEditsContextKey = ( new RawContextKey("canNavigateForwardInEditLocations", false, ( localize(
-            14498,
+            14499,
             "Whether it is possible to navigate forward in editor edit locations history"
         )))).bindTo(this.contextKeyService);
         this.canNavigateToLastEditLocationContextKey = ( new RawContextKey("canNavigateToLastEditLocation", false, ( localize(
-            14499,
+            14500,
             "Whether it is possible to navigate to the last editor edit location"
         )))).bindTo(this.contextKeyService);
-        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(14500, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
+        this.canReopenClosedEditorContextKey = ( new RawContextKey("canReopenClosedEditor", false, ( localize(14501, "Whether it is possible to reopen the last closed editor")))).bindTo(this.contextKeyService);
         this.registerListeners();
         if (this.editorService.activeEditorPane) {
             this.onDidActiveEditorChange();

package/vscode/src/vs/workbench/services/progress/browser/progressService.js

@@ -170,20 +170,20 @@ let ProgressService = class ProgressService extends Disposable {
             let title;
             const source = options.source && typeof options.source !== "string" ? options.source.label : options.source;
             if (progressTitle && progressMessage) {
-                text = ( localize(14629, "{0}: {1}", progressTitle, progressMessage));
-                title = source ? ( localize(14630, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
+                text = ( localize(14630, "{0}: {1}", progressTitle, progressMessage));
+                title = source ? ( localize(14631, "[{0}] {1}: {2}", source, progressTitle, progressMessage)) : text;
             } else if (progressTitle) {
                 text = progressTitle;
-                title = source ? ( localize(14631, "[{0}]: {1}", source, progressTitle)) : text;
+                title = source ? ( localize(14632, "[{0}]: {1}", source, progressTitle)) : text;
             } else if (progressMessage) {
                 text = progressMessage;
-                title = source ? ( localize(14631, "[{0}]: {1}", source, progressMessage)) : text;
+                title = source ? ( localize(14632, "[{0}]: {1}", source, progressMessage)) : text;
             } else {
                 this.updateWindowProgress(idx + 1);
                 return;
             }
             const statusEntryProperties = {
-                name: ( localize(14632, "Progress Message")),
+                name: ( localize(14633, "Progress Message")),
                 text,
                 showProgress: options.type || true,
                 ariaLabel: text,
@@ -289,7 +289,7 @@ let ProgressService = class ProgressService extends Disposable {
                     constructor() {
                         super(
                             "progress.cancel",
-                            typeof options.cancellable === "string" ? options.cancellable : ( localize(14633, "Cancel")),
+                            typeof options.cancellable === "string" ? options.cancellable : ( localize(14634, "Cancel")),
                             undefined,
                             true
                         );
@@ -481,7 +481,7 @@ let ProgressService = class ProgressService extends Disposable {
             const buttons = options.buttons || [];
             if (!options.sticky) {
                 buttons.push(
-                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(14633, "Cancel")) : options.cancellable) : ( localize(14634, "Dismiss"))
+                    options.cancellable ? (typeof options.cancellable === "boolean" ? ( localize(14634, "Cancel")) : options.cancellable) : ( localize(14635, "Dismiss"))
                 );
             }
             dialog = ( new Dialog(

package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js

@@ -458,7 +458,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                 mergeViewWithContainerWhenSingleView: true
             }])),
             title: {
-                value: ( localize(15008, "User View Container")),
+                value: ( localize(15009, "User View Container")),
                 original: "User View Container"
             },
             icon: location === ViewContainerLocation.Sidebar ? defaultViewIcon : undefined,
@@ -765,7 +765,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                             title: viewDescriptor.name,
                             metadata: {
                                 description: ( localize2(
-                                    15009,
+                                    15010,
                                     "Toggles the visibility of the {0} view if the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -796,10 +796,10 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
                         super({
                             id: `${viewDescriptor.id}.removeView`,
                             viewPaneContainerId: viewContainerModel.viewContainer.id,
-                            title: ( localize(15010, "Hide '{0}'", viewDescriptor.name.value)),
+                            title: ( localize(15011, "Hide '{0}'", viewDescriptor.name.value)),
                             metadata: {
                                 description: ( localize2(
-                                    15011,
+                                    15012,
                                     "Hides the {0} view if it is visible and the view container it is located in is visible",
                                     viewDescriptor.name.value
                                 ))
@@ -829,7 +829,7 @@ let ViewDescriptorService = class ViewDescriptorService extends Disposable {
             constructor() {
                 super({
                     id: `${viewContainer.id}.resetViewContainerLocation`,
-                    title: ( localize2(15012, "Reset Location")),
+                    title: ( localize2(15013, "Reset Location")),
                     menu: [{
                         id: MenuId.ViewContainerTitleContext,
                         group: "1_viewActions",