@codingame/monaco-vscode-api 10.1.1 → 10.1.3

package/vscode/src/vs/workbench/contrib/inlineChat/common/inlineChat.js

@@ -19,7 +19,7 @@ import '../../../../platform/theme/common/colors/searchColors.js';
     properties: {
         ["inlineChat.mode" ]: {
             description: ( localize(
-                7414,
+                7203,
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
             default: "live" ,
@@ -27,11 +27,11 @@ import '../../../../platform/theme/common/colors/searchColors.js';
             enum: ["live" , "preview" ],
             markdownEnumDescriptions: [
                 ( localize(
-                    7415,
+                    7204,
                     "Changes are applied directly to the document, can be highlighted via inline diffs, and accepted/discarded by hunks. Ending a session will keep the changes."
                 )),
                 ( localize(
-                    7416,
+                    7205,
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
             ],
@@ -39,20 +39,20 @@ import '../../../../platform/theme/common/colors/searchColors.js';
         },
         ["inlineChat.finishOnType" ]: {
             description: ( localize(
-                7417,
+                7206,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
         ["inlineChat.acceptedOrDiscardBeforeSave" ]: {
-            description: ( localize(7418, "Whether pending inline chat sessions prevent saving.")),
+            description: ( localize(7207, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
         ["inlineChat.holdToSpeech" ]: {
             description: ( localize(
-                7419,
+                7208,
                 "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
             default: true,
@@ -60,7 +60,7 @@ import '../../../../platform/theme/common/colors/searchColors.js';
         },
         ["inlineChat.accessibleDiffView" ]: {
             description: ( localize(
-                7420,
+                7209,
                 "Whether the inline chat also renders an accessible diff viewer for its changes."
             )),
             default: 'auto',
@@ -68,16 +68,16 @@ import '../../../../platform/theme/common/colors/searchColors.js';
             enum: ['auto', 'on', 'off'],
             markdownEnumDescriptions: [
                 ( localize(
-                    7421,
+                    7210,
                     "The accessible diff viewer is based on screen reader mode being enabled."
                 )),
-                ( localize(7422, "The accessible diff viewer is always enabled.")),
-                ( localize(7423, "The accessible diff viewer is never enabled.")),
+                ( localize(7211, "The accessible diff viewer is always enabled.")),
+                ( localize(7212, "The accessible diff viewer is never enabled.")),
             ],
         },
         ["inlineChat.experimental.enableZoneToolbar" ]: {
             description: ( localize(
-                7424,
+                7213,
                 "Whether to show a toolbar to accept or reject changes in the inline chat changes view."
             )),
             default: false,
@@ -88,42 +88,42 @@ import '../../../../platform/theme/common/colors/searchColors.js';
 });
 const INLINE_CHAT_ID = 'interactiveEditor';
 const CTX_INLINE_CHAT_POSSIBLE = ( (new RawContextKey('inlineChatPossible', false, ( localize(
-    7425,
+    7214,
     "Whether a provider for inline chat exists and whether an editor for inline chat is open"
 )))));
-const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7426, "Whether a provider for interactive editors exists")))));
-const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7427, "Whether the interactive editor input is visible")))));
-const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7428, "Whether the interactive editor input is focused")))));
+const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7215, "Whether a provider for interactive editors exists")))));
+const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7216, "Whether the interactive editor input is visible")))));
+const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7217, "Whether the interactive editor input is focused")))));
 const CTX_INLINE_CHAT_EDITING = ( (new RawContextKey('inlineChatEditing', true, ( localize(
-    7429,
+    7218,
     "Whether the user is currently editing or generating code in the inline chat"
 )))));
-const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7430, "Whether the interactive widget's response is focused")))));
-const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7431, "Whether the interactive editor input is empty")))));
+const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7219, "Whether the interactive widget's response is focused")))));
+const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7220, "Whether the interactive editor input is empty")))));
 const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localize(
-    7432,
+    7221,
     "Whether the cursor of the iteractive editor input is on the first line"
 )))));
 const CTX_INLINE_CHAT_INNER_CURSOR_LAST = ( (new RawContextKey('inlineChatInnerCursorLast', false, ( localize(
-    7433,
+    7222,
     "Whether the cursor of the iteractive editor input is on the last line"
 )))));
 const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localize(
-    7436,
+    7225,
     "Whether the cursor of the outer editor is above or below the interactive editor input"
 )))));
-const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7437, "Whether interactive editor has kept a session for quick restore")))));
-const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7438, "Whether the user did changes ontop of the inline chat")))));
-const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7439, "Whether the document has changed concurrently")))));
-const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7440, "Whether the current change supports showing a diff")))));
-const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7441, "Whether the current change showing a diff")))));
+const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7226, "Whether interactive editor has kept a session for quick restore")))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7227, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7228, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7229, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7230, "Whether the current change showing a diff")))));
 const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', "live" )));
-const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7442, "Whether an inline chat request is currently in progress")))));
+const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7231, "Whether an inline chat request is currently in progress")))));
 const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey(
     'inlineChatResponseType',
     "none" ,
     ( localize(
-        7443,
+        7232,
         "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"
     ))
 )));
@@ -136,17 +136,17 @@ const ACTION_REPORT_ISSUE = 'inlineChat.reportIssue';
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
 const MENU_INLINE_CHAT_WIDGET_SECONDARY = MenuId.for('inlineChatWidget.secondary');
 const MENU_INLINE_CHAT_ZONE = MenuId.for('inlineChatWidget.changesZone');
-const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7444, "Foreground color of the interactive editor widget")));
-const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7445, "Background color of the interactive editor widget")));
-registerColor('inlineChat.border', editorWidgetBorder, ( localize(7446, "Border color of the interactive editor widget")));
-registerColor('inlineChat.shadow', widgetShadow, ( localize(7447, "Shadow color of the interactive editor widget")));
-registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7448, "Border color of the interactive editor input")));
-registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7449, "Border color of the interactive editor input when focused")));
-registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7450, "Foreground color of the interactive editor input placeholder")));
-registerColor('inlineChatInput.background', inputBackground, ( localize(7451, "Background color of the interactive editor input")));
-registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7452, "Background color of inserted text in the interactive editor input")));
-const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7453, 'Overview ruler marker color for inline chat inserted content.')));
-const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7453, 'Overview ruler marker color for inline chat inserted content.')));
-registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7454, "Background color of removed text in the interactive editor input")));
-registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(diffRemoved, 0.6))), light: ( (transparent(diffRemoved, 0.8))), hcDark: ( (transparent(diffRemoved, 0.6))), hcLight: ( (transparent(diffRemoved, 0.8))) }, ( localize(7455, 'Overview ruler marker color for inline chat removed content.')));
+const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7233, "Foreground color of the interactive editor widget")));
+const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7234, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', editorWidgetBorder, ( localize(7235, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', widgetShadow, ( localize(7236, "Shadow color of the interactive editor widget")));
+registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7237, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7238, "Border color of the interactive editor input when focused")));
+registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7239, "Foreground color of the interactive editor input placeholder")));
+registerColor('inlineChatInput.background', inputBackground, ( localize(7240, "Background color of the interactive editor input")));
+registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7241, "Background color of inserted text in the interactive editor input")));
+const overviewRulerInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7242, 'Overview ruler marker color for inline chat inserted content.')));
+const minimapInlineChatDiffInserted = registerColor('editorOverviewRuler.inlineChatInserted', { dark: ( (transparent(diffInserted, 0.6))), light: ( (transparent(diffInserted, 0.8))), hcDark: ( (transparent(diffInserted, 0.6))), hcLight: ( (transparent(diffInserted, 0.8))) }, ( localize(7242, 'Overview ruler marker color for inline chat inserted content.')));
+registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7243, "Background color of removed text in the interactive editor input")));
+registerColor('editorOverviewRuler.inlineChatRemoved', { dark: ( (transparent(diffRemoved, 0.6))), light: ( (transparent(diffRemoved, 0.8))), hcDark: ( (transparent(diffRemoved, 0.6))), hcLight: ( (transparent(diffRemoved, 0.8))) }, ( localize(7244, 'Overview ruler marker color for inline chat removed content.')));
 export { ACTION_ACCEPT_CHANGES, ACTION_DISCARD_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_REPORT_ISSUE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_DOCUMENT_CHANGED, CTX_INLINE_CHAT_EDITING, CTX_INLINE_CHAT_EDIT_MODE, CTX_INLINE_CHAT_EMPTY, CTX_INLINE_CHAT_FOCUSED, CTX_INLINE_CHAT_HAS_AGENT, CTX_INLINE_CHAT_HAS_STASHED_SESSION, CTX_INLINE_CHAT_INNER_CURSOR_FIRST, CTX_INLINE_CHAT_INNER_CURSOR_LAST, CTX_INLINE_CHAT_OUTER_CURSOR_POSITION, CTX_INLINE_CHAT_POSSIBLE, CTX_INLINE_CHAT_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, INLINE_CHAT_ID, MENU_INLINE_CHAT_WIDGET_SECONDARY, MENU_INLINE_CHAT_WIDGET_STATUS, MENU_INLINE_CHAT_ZONE, inlineChatBackground, inlineChatForeground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };

package/vscode/src/vs/workbench/contrib/list/browser/listResizeColumnAction.js

@@ -9,8 +9,8 @@ class ListResizeColumnAction extends Action2 {
     constructor() {
         super({
             id: 'list.resizeColumn',
-            title: { value: ( localize(4645, "Resize Column")), original: 'Resize Column' },
-            category: { value: ( localize(4646, "List")), original: 'List' },
+            title: { value: ( localize(4556, "Resize Column")), original: 'Resize Column' },
+            category: { value: ( localize(4557, "List")), original: 'List' },
             precondition: WorkbenchListFocusContextKey,
             f1: true
         });

package/vscode/src/vs/workbench/contrib/list/browser/tableColumnResizeQuickPick.js

@@ -15,14 +15,14 @@ let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Dispos
                 items.push({ label, index });
             }
         });
-        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(9953, "Select the column to resize, type to filter.")) });
+        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(9904, "Select the column to resize, type to filter.")) });
         if (!column) {
             return;
         }
         const value = await this._quickInputService.input({
-            placeHolder: ( localize(9954, "i.e. 20, 60, 100...")),
+            placeHolder: ( localize(9905, "i.e. 20, 60, 100...")),
             prompt: ( localize(
-                9955,
+                9906,
                 "Please enter a width in percentage for the '{0}' column.",
                 column.label
             )),
@@ -37,11 +37,11 @@ let TableColumnResizeQuickPick = class TableColumnResizeQuickPick extends Dispos
     async _validateColumnResizeValue(input) {
         const percentage = Number.parseInt(input);
         if (input && !Number.isInteger(percentage)) {
-            return ( localize(9956, "Please enter an integer."));
+            return ( localize(9907, "Please enter an integer."));
         }
         else if (percentage < 0 || percentage > 100) {
             return ( localize(
-                9957,
+                9908,
                 "Please enter a number greater than 0 and less than or equal to 100."
             ));
         }

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

@@ -85,15 +85,15 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localize(11472, "Manual Resolution")),
-                    tooltip: ( localize(11473, "This conflict has been resolved manually.")),
+                    text: ( localize(11475, "Manual Resolution")),
+                    tooltip: ( localize(11476, "This conflict has been resolved manually.")),
                 });
             }
             else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localize(11474, 'No Changes Accepted')),
+                    text: ( localize(11477, 'No Changes Accepted')),
                     tooltip: ( localize(
-                        11475,
+                        11478,
                         'The current resolution of this conflict equals the common ancestor of both the right and left changes.'
                     )),
                 });
@@ -115,20 +115,20 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localize(11476, 'Remove {0}', model.input1.title)), async () => {
+                stateToggles.push(command(( localize(11479, '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(11477, 'Remove {0} from the result document.', model.input1.title))));
+                }, ( localize(11480, 'Remove {0} from the result document.', model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localize(11476, 'Remove {0}', model.input2.title)), async () => {
+                stateToggles.push(command(( localize(11479, '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(11477, 'Remove {0} from the result document.', model.input2.title))));
+                }, ( localize(11480, 'Remove {0} from the result document.', model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both &&
                 state.firstInput === 2) {
@@ -136,13 +136,13 @@ class ActionsSource {
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localize(11478, 'Reset to base')), async () => {
+                result.push(command(( localize(11481, 'Reset to base')), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
                 }, ( localize(
-                    11479,
+                    11482,
                     'Reset this conflict to the common ancestor of both the right and left changes.'
                 ))));
             }
@@ -174,16 +174,16 @@ 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(11480, "Accept {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11483, "Accept {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11481, "Accept {0} in the result document.", inputData.title))));
+                    }, ( localize(11484, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
                         const commandName = modifiedBaseRange.isOrderRelevant
-                            ? ( localize(11482, "Accept Combination ({0} First)", inputData.title))
-                            : ( localize(11483, "Accept Combination"));
+                            ? ( localize(11485, "Accept Combination ({0} First)", inputData.title))
+                            : ( localize(11486, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, ModifiedBaseRangeState.base
@@ -192,36 +192,36 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11484,
+                            11487,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 else {
-                    result.push(command(( localize(11485, "Append {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11488, "Append {0}", inputData.title)), async () => {
                         transaction((tx) => {
                             model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, false), inputNumber, tx);
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11486, "Append {0} to the result document.", inputData.title))));
+                    }, ( localize(11489, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localize(11487, "Accept Combination", inputData.title)), async () => {
+                        result.push(command(( localize(11490, "Accept Combination", inputData.title)), async () => {
                             transaction((tx) => {
                                 model.setState(modifiedBaseRange, state.withInputValue(inputNumber, true, true), inputNumber, tx);
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11484,
+                            11487,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localize(11488, 'Ignore')), async () => {
+                    result.push(command(( localize(11491, 'Ignore')), async () => {
                         transaction((tx) => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localize(11489, "Don't take this side of the conflict."))));
+                    }, ( localize(11492, "Don't take this side of the conflict."))));
                 }
             }
             return result;

package/vscode/src/vs/workbench/contrib/mergeEditor/common/mergeEditor.js

@@ -1,32 +1,32 @@
 import { localize } from '../../../../nls.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
-const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(10945, 'The editor is a merge editor')) })));
+const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(10974, 'The editor is a merge editor')) })));
 const ctxIsMergeResultEditor = ( (new RawContextKey(
  'isMergeResultEditor',
  false,
- { type: 'boolean', description: ( localize(10946, 'The editor is a the result editor of a merge editor.')) }
+ { type: 'boolean', description: ( localize(10975, 'The editor is a the result editor of a merge editor.')) }
 )));
 const ctxMergeEditorLayout = ( (new RawContextKey(
  'mergeEditorLayout',
  'mixed',
- { type: 'string', description: ( localize(10947, 'The layout mode of a merge editor')) }
+ { type: 'string', description: ( localize(10976, 'The layout mode of a merge editor')) }
 )));
 const ctxMergeEditorShowBase = ( (new RawContextKey(
  'mergeEditorShowBase',
  false,
- { type: 'boolean', description: ( localize(10948, 'If the merge editor shows the base version')) }
+ { type: 'boolean', description: ( localize(10977, 'If the merge editor shows the base version')) }
 )));
 const ctxMergeEditorShowBaseAtTop = ( (new RawContextKey(
  'mergeEditorShowBaseAtTop',
  false,
- { type: 'boolean', description: ( localize(10949, 'If base should be shown at the top')) }
+ { type: 'boolean', description: ( localize(10978, 'If base should be shown at the top')) }
 )));
 const ctxMergeEditorShowNonConflictingChanges = ( (new RawContextKey(
  'mergeEditorShowNonConflictingChanges',
  false,
- { type: 'boolean', description: ( localize(10950, 'If the merge editor shows non-conflicting changes')) }
+ { type: 'boolean', description: ( localize(10979, 'If the merge editor shows non-conflicting changes')) }
 )));
-const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(10951, 'The uri of the baser of a merge editor')) })));
-const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(10952, 'The uri of the result of a merge editor')) })));
+const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(10980, 'The uri of the baser of a merge editor')) })));
+const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(10981, 'The uri of the result of a merge editor')) })));
 const StorageCloseWithConflicts = 'mergeEditorCloseWithConflicts';
 export { StorageCloseWithConflicts, ctxIsMergeEditor, ctxIsMergeResultEditor, ctxMergeBaseUri, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeEditorShowNonConflictingChanges, ctxMergeResultUri };

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput.js

@@ -116,9 +116,9 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         };
         this._register(autorun((reader) => {
             const resources = this.resources.read(reader);
-            const label = this.label ?? ( localize(6147, "Multi Diff Editor"));
+            const label = this.label ?? ( localize(6150, "Multi Diff Editor"));
             if (resources) {
-                this._name = label + ( localize(6148, " ({0} files)", resources.length));
+                this._name = label + ( localize(6151, " ({0} files)", resources.length));
             }
             else {
                 this._name = label;

package/vscode/src/vs/workbench/contrib/multiDiffEditor/browser/scmMultiDiffSourceResolver.js

@@ -109,7 +109,7 @@ class OpenScmGroupAction extends Action2 {
     constructor() {
         super({
             id: '_workbench.openScmMultiDiffEditor',
-            title: ( localize2(6149, 'View Changes')),
+            title: ( localize2(6152, 'View Changes')),
             f1: false
         });
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/find/notebookFindWidget.js

@@ -273,10 +273,10 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localize(10252, "{0} found", label))
-                : ( localize(10253, "{0} found for '{1}'", label, searchString));
+                ? ( localize(10243, "{0} found", label))
+                : ( localize(10244, "{0} found for '{1}'", label, searchString));
         }
-        return ( localize(10254, "{0} found for '{1}'", label, searchString));
+        return ( localize(10245, "{0} found for '{1}'", label, searchString));
     }
     dispose() {
         this._notebookEditor?.removeClassName(FIND_SHOW_TRANSITION);

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/cellOperations.js

@@ -301,7 +301,7 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
     const cellKind = cells[0].cellKind;
     const isSameKind = cells.every(cell => cell.cellKind === cellKind);
     if (!isSameKind) {
-        const message = ( localize(10865, "Cannot join cells of different kinds"));
+        const message = ( localize(10860, "Cannot join cells of different kinds"));
         return notificationService.warn(message);
     }
     const firstCell = cells[0];
@@ -329,7 +329,7 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
         }))));
     }
     if (edits.length) {
-        await bulkEditService.apply(edits, { quotableLabel: ( localize(10866, "Join Notebook Cells")) });
+        await bulkEditService.apply(edits, { quotableLabel: ( localize(10861, "Join Notebook Cells")) });
     }
 }
 async function joinNotebookCells(editor, range, direction, constraint) {

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/chat/notebookChatContext.js

@@ -1,11 +1,11 @@
 import { localize } from '../../../../../../nls.js';
 import { MenuId } from '../../../../../../platform/actions/common/actions.js';
 import { RawContextKey } from '../../../../../../platform/contextkey/common/contextkey.js';
-const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = ( (new RawContextKey('notebookCellChatFocused', false, ( localize(10860, "Whether the cell chat editor is focused")))));
-const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( (new RawContextKey('notebookChatHasActiveRequest', false, ( localize(10861, "Whether the cell chat editor has an active request")))));
-const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( (new RawContextKey('notebookChatUserDidEdit', false, ( localize(10862, "Whether the user did changes ontop of the notebook cell chat")))));
+const CTX_NOTEBOOK_CELL_CHAT_FOCUSED = ( (new RawContextKey('notebookCellChatFocused', false, ( localize(10862, "Whether the cell chat editor is focused")))));
+const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( (new RawContextKey('notebookChatHasActiveRequest', false, ( localize(10863, "Whether the cell chat editor has an active request")))));
+const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( (new RawContextKey('notebookChatUserDidEdit', false, ( localize(10864, "Whether the user did changes ontop of the notebook cell chat")))));
 const CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION = ( (new RawContextKey('notebookChatOuterFocusPosition', '', ( localize(
- 10863,
+ 10865,
  "Whether the focus of the notebook editor is above or below the cell chat"
 )))));
 const MENU_CELL_CHAT_INPUT = MenuId.for('cellChatInput');
@@ -13,5 +13,5 @@ const MENU_CELL_CHAT_WIDGET = MenuId.for('cellChatWidget');
 const MENU_CELL_CHAT_WIDGET_STATUS = MenuId.for('cellChatWidget.status');
 MenuId.for('cellChatWidget.feedback');
 MenuId.for('cellChatWidget.toolbar');
-const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( (new RawContextKey('notebookChatAgentRegistered', false, ( localize(10864, "Whether a chat agent for notebook is registered")))));
+const CTX_NOTEBOOK_CHAT_HAS_AGENT = ( (new RawContextKey('notebookChatAgentRegistered', false, ( localize(10866, "Whether a chat agent for notebook is registered")))));
 export { CTX_NOTEBOOK_CELL_CHAT_FOCUSED, CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST, CTX_NOTEBOOK_CHAT_HAS_AGENT, CTX_NOTEBOOK_CHAT_OUTER_FOCUS_POSITION, CTX_NOTEBOOK_CHAT_USER_DID_EDIT, MENU_CELL_CHAT_INPUT, MENU_CELL_CHAT_WIDGET, MENU_CELL_CHAT_WIDGET_STATUS };

package/vscode/src/vs/workbench/contrib/notebook/browser/controller/coreActions.js

@@ -11,7 +11,7 @@ import { INotebookEditorService } from '../services/notebookEditorService.servic
 import { ITelemetryService } from '../../../../../platform/telemetry/common/telemetry.service.js';
 import { isEqual } from '../../../../../base/common/resources.js';
 const SELECT_KERNEL_ID = '_notebook.selectKernel';
-const NOTEBOOK_ACTIONS_CATEGORY = ( localize2(5647, 'Notebook'));
+const NOTEBOOK_ACTIONS_CATEGORY = ( localize2(5591, 'Notebook'));
 const CELL_TITLE_CELL_GROUP_ID = 'inline/cell';
 const CELL_TITLE_OUTPUT_GROUP_ID = 'inline/output';
 const NOTEBOOK_EDITOR_WIDGET_ACTION_WEIGHT = 100 ;
@@ -299,18 +299,18 @@ const cellExecutionArgs = [
 ];
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
     submenu: MenuId.NotebookCellInsert,
-    title: ( localize(5648, "Insert Cell")),
+    title: ( localize(5592, "Insert Cell")),
     group: "2_insert" ,
     when: ( (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)))
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.NotebookCellTitle,
-    title: ( localize(5649, "Notebook Cell")),
+    title: ( localize(5593, "Notebook Cell")),
     group: "2_insert" ,
     when: NOTEBOOK_EDITOR_FOCUSED
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
-    title: ( localize(5650, "Share")),
+    title: ( localize(5594, "Share")),
     submenu: MenuId.EditorContextShare,
     group: "4_share"
 });

package/vscode/src/vs/workbench/contrib/notebook/browser/notebookIcons.js

@@ -1,32 +1,32 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, ( localize(5651, 'Configure icon to select a kernel in notebook editors.')));
-const executeIcon = registerIcon('notebook-execute', Codicon.play, ( localize(5652, 'Icon to execute in notebook editors.')));
-const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, ( localize(5653, 'Icon to execute above cells in notebook editors.')));
-const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, ( localize(5654, 'Icon to execute below cells in notebook editors.')));
-const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, ( localize(5655, 'Icon to stop an execution in notebook editors.')));
-const deleteCellIcon = registerIcon('notebook-delete-cell', Codicon.trash, ( localize(5656, 'Icon to delete a cell in notebook editors.')));
-const executeAllIcon = registerIcon('notebook-execute-all', Codicon.runAll, ( localize(5657, 'Icon to execute all cells in notebook editors.')));
-const editIcon = registerIcon('notebook-edit', Codicon.pencil, ( localize(5658, 'Icon to edit a cell in notebook editors.')));
-const stopEditIcon = registerIcon('notebook-stop-edit', Codicon.check, ( localize(5659, 'Icon to stop editing a cell in notebook editors.')));
-const moveUpIcon = registerIcon('notebook-move-up', Codicon.arrowUp, ( localize(5660, 'Icon to move up a cell in notebook editors.')));
-const moveDownIcon = registerIcon('notebook-move-down', Codicon.arrowDown, ( localize(5661, 'Icon to move down a cell in notebook editors.')));
-const clearIcon = registerIcon('notebook-clear', Codicon.clearAll, ( localize(5662, 'Icon to clear cell outputs in notebook editors.')));
-const splitCellIcon = registerIcon('notebook-split-cell', Codicon.splitVertical, ( localize(5663, 'Icon to split a cell in notebook editors.')));
-const successStateIcon = registerIcon('notebook-state-success', Codicon.check, ( localize(5664, 'Icon to indicate a success state in notebook editors.')));
-const errorStateIcon = registerIcon('notebook-state-error', Codicon.error, ( localize(5665, 'Icon to indicate an error state in notebook editors.')));
-const pendingStateIcon = registerIcon('notebook-state-pending', Codicon.clock, ( localize(5666, 'Icon to indicate a pending state in notebook editors.')));
-const executingStateIcon = registerIcon('notebook-state-executing', Codicon.sync, ( localize(5667, 'Icon to indicate an executing state in notebook editors.')));
-const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronRight, ( localize(5668, 'Icon to annotate a collapsed section in notebook editors.')));
-const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, ( localize(5669, 'Icon to annotate an expanded section in notebook editors.')));
-const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, ( localize(5670, 'Icon to open the notebook in a text editor.')));
-const revertIcon = registerIcon('notebook-revert', Codicon.discard, ( localize(5671, 'Icon to revert in notebook editors.')));
-const toggleWhitespace = registerIcon('notebook-diff-cell-toggle-whitespace', Codicon.whitespace, ( localize(5672, 'Icon for the toggle whitespace action in the diff editor.')));
-const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, ( localize(5673, 'Icon to render output in diff editor.')));
-const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, ( localize(5674, 'Icon for a mime type in notebook editors.')));
-const copyIcon = registerIcon('notebook-copy', Codicon.copy, ( localize(5675, 'Icon to copy content to clipboard')));
-const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, ( localize(5676, 'Icon for the previous change action in the diff editor.')));
-const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, ( localize(5677, 'Icon for the next change action in the diff editor.')));
-const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localize(5678, 'View icon of the variables view.')));
+const selectKernelIcon = registerIcon('notebook-kernel-select', Codicon.serverEnvironment, ( localize(5595, 'Configure icon to select a kernel in notebook editors.')));
+const executeIcon = registerIcon('notebook-execute', Codicon.play, ( localize(5596, 'Icon to execute in notebook editors.')));
+const executeAboveIcon = registerIcon('notebook-execute-above', Codicon.runAbove, ( localize(5597, 'Icon to execute above cells in notebook editors.')));
+const executeBelowIcon = registerIcon('notebook-execute-below', Codicon.runBelow, ( localize(5598, 'Icon to execute below cells in notebook editors.')));
+const stopIcon = registerIcon('notebook-stop', Codicon.primitiveSquare, ( localize(5599, 'Icon to stop an execution in notebook editors.')));
+const deleteCellIcon = registerIcon('notebook-delete-cell', Codicon.trash, ( localize(5600, 'Icon to delete a cell in notebook editors.')));
+const executeAllIcon = registerIcon('notebook-execute-all', Codicon.runAll, ( localize(5601, 'Icon to execute all cells in notebook editors.')));
+const editIcon = registerIcon('notebook-edit', Codicon.pencil, ( localize(5602, 'Icon to edit a cell in notebook editors.')));
+const stopEditIcon = registerIcon('notebook-stop-edit', Codicon.check, ( localize(5603, 'Icon to stop editing a cell in notebook editors.')));
+const moveUpIcon = registerIcon('notebook-move-up', Codicon.arrowUp, ( localize(5604, 'Icon to move up a cell in notebook editors.')));
+const moveDownIcon = registerIcon('notebook-move-down', Codicon.arrowDown, ( localize(5605, 'Icon to move down a cell in notebook editors.')));
+const clearIcon = registerIcon('notebook-clear', Codicon.clearAll, ( localize(5606, 'Icon to clear cell outputs in notebook editors.')));
+const splitCellIcon = registerIcon('notebook-split-cell', Codicon.splitVertical, ( localize(5607, 'Icon to split a cell in notebook editors.')));
+const successStateIcon = registerIcon('notebook-state-success', Codicon.check, ( localize(5608, 'Icon to indicate a success state in notebook editors.')));
+const errorStateIcon = registerIcon('notebook-state-error', Codicon.error, ( localize(5609, 'Icon to indicate an error state in notebook editors.')));
+const pendingStateIcon = registerIcon('notebook-state-pending', Codicon.clock, ( localize(5610, 'Icon to indicate a pending state in notebook editors.')));
+const executingStateIcon = registerIcon('notebook-state-executing', Codicon.sync, ( localize(5611, 'Icon to indicate an executing state in notebook editors.')));
+const collapsedIcon = registerIcon('notebook-collapsed', Codicon.chevronRight, ( localize(5612, 'Icon to annotate a collapsed section in notebook editors.')));
+const expandedIcon = registerIcon('notebook-expanded', Codicon.chevronDown, ( localize(5613, 'Icon to annotate an expanded section in notebook editors.')));
+const openAsTextIcon = registerIcon('notebook-open-as-text', Codicon.fileCode, ( localize(5614, 'Icon to open the notebook in a text editor.')));
+const revertIcon = registerIcon('notebook-revert', Codicon.discard, ( localize(5615, 'Icon to revert in notebook editors.')));
+const toggleWhitespace = registerIcon('notebook-diff-cell-toggle-whitespace', Codicon.whitespace, ( localize(5616, 'Icon for the toggle whitespace action in the diff editor.')));
+const renderOutputIcon = registerIcon('notebook-render-output', Codicon.preview, ( localize(5617, 'Icon to render output in diff editor.')));
+const mimetypeIcon = registerIcon('notebook-mimetype', Codicon.code, ( localize(5618, 'Icon for a mime type in notebook editors.')));
+const copyIcon = registerIcon('notebook-copy', Codicon.copy, ( localize(5619, 'Icon to copy content to clipboard')));
+const previousChangeIcon = registerIcon('notebook-diff-editor-previous-change', Codicon.arrowUp, ( localize(5620, 'Icon for the previous change action in the diff editor.')));
+const nextChangeIcon = registerIcon('notebook-diff-editor-next-change', Codicon.arrowDown, ( localize(5621, 'Icon for the next change action in the diff editor.')));
+const variablesViewIcon = registerIcon('variables-view-icon', Codicon.debugAlt, ( localize(5622, 'View icon of the variables view.')));
 export { clearIcon, collapsedIcon, copyIcon, deleteCellIcon, editIcon, errorStateIcon, executeAboveIcon, executeAllIcon, executeBelowIcon, executeIcon, executingStateIcon, expandedIcon, mimetypeIcon, moveDownIcon, moveUpIcon, nextChangeIcon, openAsTextIcon, pendingStateIcon, previousChangeIcon, renderOutputIcon, revertIcon, selectKernelIcon, splitCellIcon, stopEditIcon, stopIcon, successStateIcon, toggleWhitespace, variablesViewIcon };

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/backLayerWebView.js

@@ -183,9 +183,9 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
             'notebook-cell-output-line-height': `${this.options.outputLineHeight}px`,
             'notebook-cell-output-max-height': `${this.options.outputLineHeight * this.options.outputLineLimit + 2}px`,
             'notebook-cell-output-font-family': this.options.outputFontFamily || this.options.fontFamily,
-            'notebook-cell-markup-empty-content': ( localize(10842, "Empty markdown cell, double-click or press enter to edit.")),
-            'notebook-cell-renderer-not-found-error': ( localize(10843, "No renderer found for '$0'")),
-            'notebook-cell-renderer-fallbacks-exhausted': ( localize(10844, "Could not render content for '$0'")),
+            'notebook-cell-markup-empty-content': ( localize(10843, "Empty markdown cell, double-click or press enter to edit.")),
+            'notebook-cell-renderer-not-found-error': ( localize(10844, "No renderer found for '$0'")),
+            'notebook-cell-renderer-fallbacks-exhausted': ( localize(10845, "Could not render content for '$0'")),
         };
     }
     generateContent(baseUrl) {
@@ -985,7 +985,7 @@ let BackLayerWebView = class BackLayerWebView extends Themable {
         this.localResourceRootsCache = this._getResourceRootsCache();
         const webview = webviewService.createWebviewElement({
             origin: BackLayerWebView_1.getOriginStore(this.storageService).getOrigin(this.notebookViewType, undefined),
-            title: ( localize(10845, "Notebook webview content")),
+            title: ( localize(10846, "Notebook webview content")),
             options: {
                 purpose: "notebookRenderer" ,
                 enableFindWidget: false,

package/vscode/src/vs/workbench/contrib/notebook/browser/view/renderers/cellRenderer.js

@@ -229,7 +229,7 @@ let CodeCellRenderer = class CodeCellRenderer extends AbstractCellRenderer {
         const cellInputCollapsedContainer = append(cellContainer, $('.input-collapse-container'));
         cellInputCollapsedContainer.style.display = 'none';
         const executionOrderLabel = append(focusIndicatorLeft.domNode, $('div.execution-count-label'));
-        executionOrderLabel.title = ( localize(10846, 'Execution Order'));
+        executionOrderLabel.title = ( localize(10842, 'Execution Order'));
         const editorPart = append(cellContainer, $('.cell-editor-part'));
         const editorContainer = append(editorPart, $('.cell-editor-container'));
         const cellCommentPartContainer = append(container, $('.cell-comment-container'));