@codingame/monaco-vscode-api 10.0.0 → 10.0.1

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(
-                7202,
+                7227,
                 "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(
-                    7203,
+                    7228,
                     "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(
-                    7204,
+                    7229,
                     "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(
-                7205,
+                7230,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
         ["inlineChat.acceptedOrDiscardBeforeSave" ]: {
-            description: ( localize(7206, "Whether pending inline chat sessions prevent saving.")),
+            description: ( localize(7231, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
         ["inlineChat.holdToSpeech" ]: {
             description: ( localize(
-                7207,
+                7232,
                 "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(
-                7208,
+                7233,
                 "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(
-                    7209,
+                    7234,
                     "The accessible diff viewer is based on screen reader mode being enabled."
                 )),
-                ( localize(7210, "The accessible diff viewer is always enabled.")),
-                ( localize(7211, "The accessible diff viewer is never enabled.")),
+                ( localize(7235, "The accessible diff viewer is always enabled.")),
+                ( localize(7236, "The accessible diff viewer is never enabled.")),
             ],
         },
         ["inlineChat.experimental.enableZoneToolbar" ]: {
             description: ( localize(
-                7212,
+                7237,
                 "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(
-    7213,
+    7238,
     "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(7214, "Whether a provider for interactive editors exists")))));
-const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7215, "Whether the interactive editor input is visible")))));
-const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7216, "Whether the interactive editor input is focused")))));
+const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7239, "Whether a provider for interactive editors exists")))));
+const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7240, "Whether the interactive editor input is visible")))));
+const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7241, "Whether the interactive editor input is focused")))));
 const CTX_INLINE_CHAT_EDITING = ( (new RawContextKey('inlineChatEditing', true, ( localize(
-    7217,
+    7242,
     "Whether the user is currently editing or generating code in the inline chat"
 )))));
-const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7218, "Whether the interactive widget's response is focused")))));
-const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7219, "Whether the interactive editor input is empty")))));
+const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7243, "Whether the interactive widget's response is focused")))));
+const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7244, "Whether the interactive editor input is empty")))));
 const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localize(
-    7220,
+    7245,
     "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(
-    7221,
+    7246,
     "Whether the cursor of the iteractive editor input is on the last line"
 )))));
 const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localize(
-    7224,
+    7249,
     "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(7225, "Whether interactive editor has kept a session for quick restore")))));
-const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7226, "Whether the user did changes ontop of the inline chat")))));
-const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7227, "Whether the document has changed concurrently")))));
-const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7228, "Whether the current change supports showing a diff")))));
-const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7229, "Whether the current change showing a diff")))));
+const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7250, "Whether interactive editor has kept a session for quick restore")))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7251, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7252, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7253, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7254, "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(7230, "Whether an inline chat request is currently in progress")))));
+const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7255, "Whether an inline chat request is currently in progress")))));
 const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey(
     'inlineChatResponseType',
     "none" ,
     ( localize(
-        7231,
+        7256,
         "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(7232, "Foreground color of the interactive editor widget")));
-const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7233, "Background color of the interactive editor widget")));
-registerColor('inlineChat.border', editorWidgetBorder, ( localize(7234, "Border color of the interactive editor widget")));
-registerColor('inlineChat.shadow', widgetShadow, ( localize(7235, "Shadow color of the interactive editor widget")));
-registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7236, "Border color of the interactive editor input")));
-registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7237, "Border color of the interactive editor input when focused")));
-registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7238, "Foreground color of the interactive editor input placeholder")));
-registerColor('inlineChatInput.background', inputBackground, ( localize(7239, "Background color of the interactive editor input")));
-registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7240, "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(7241, '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(7241, 'Overview ruler marker color for inline chat inserted content.')));
-registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7242, "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(7243, 'Overview ruler marker color for inline chat removed content.')));
+const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7257, "Foreground color of the interactive editor widget")));
+const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7258, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', editorWidgetBorder, ( localize(7259, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', widgetShadow, ( localize(7260, "Shadow color of the interactive editor widget")));
+registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7261, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7262, "Border color of the interactive editor input when focused")));
+registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7263, "Foreground color of the interactive editor input placeholder")));
+registerColor('inlineChatInput.background', inputBackground, ( localize(7264, "Background color of the interactive editor input")));
+registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7265, "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(7266, '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(7266, 'Overview ruler marker color for inline chat inserted content.')));
+registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7267, "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(7268, '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(4573, "Resize Column")), original: 'Resize Column' },
-            category: { value: ( localize(4574, "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(9906, "Select the column to resize, type to filter.")) });
+        const column = await this._quickInputService.pick(items, { placeHolder: ( localize(9897, "Select the column to resize, type to filter.")) });
         if (!column) {
             return;
         }
         const value = await this._quickInputService.input({
-            placeHolder: ( localize(9907, "i.e. 20, 60, 100...")),
+            placeHolder: ( localize(9898, "i.e. 20, 60, 100...")),
             prompt: ( localize(
-                9908,
+                9899,
                 "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(9909, "Please enter an integer."));
+            return ( localize(9900, "Please enter an integer."));
         }
         else if (percentage < 0 || percentage > 100) {
             return ( localize(
-                9910,
+                9901,
                 "Please enter a number greater than 0 and less than or equal to 100."
             ));
         }

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

@@ -75,7 +75,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return ( localize(7720, "Merging: {0}", super.getName()));
+        return ( localize(8131, "Merging: {0}", super.getName()));
     }
     async resolve() {
         if (!this._inputModel) {

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

@@ -106,12 +106,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const isMany = inputModels.length > 1;
             const message = isMany
                 ? ( localize(
-                10770,
+                10813,
                 'Do you want keep the merge result of {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10771,
+                10814,
                 'Do you want keep the merge result of {0}?',
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
@@ -119,12 +119,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localize(10772, "&&Save With Conflicts")) :
-                        ( localize(10773, "&&Save")),
+                        ( localize(10815, "&&Save With Conflicts")) :
+                        ( localize(10816, "&&Save")),
                     run: () => 0
                 },
                 {
-                    label: ( localize(10774, "Do&&n't Save")),
+                    label: ( localize(10817, "Do&&n't Save")),
                     run: () => 1
                 }
             ];
@@ -134,16 +134,16 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 detail: hasUnhandledConflicts
                     ? isMany
                         ? ( localize(
-                    10775,
+                    10818,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 ))
                         : ( localize(
-                    10776,
+                    10819,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
                 ))
                     : isMany
-                        ? ( localize(10777, "The merge results will be lost if you don't save them."))
-                        : ( localize(10778, "The merge result will be lost if you don't save it.")),
+                        ? ( localize(10820, "The merge results will be lost if you don't save them."))
+                        : ( localize(10821, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => 2
@@ -168,12 +168,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localize(10779, "Do you want to accept the merge result?")),
+                message: ( localize(10822, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    10780,
+                    10823,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(10781, '&&Accept Merge'))
+                primaryButton: ( localize(10824, '&&Accept Merge'))
             });
             if (confirmed) {
                 await this.accept();
@@ -198,7 +198,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._textModelService = _textModelService;
         this.textFileService = textFileService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10782, "Before Resolving Conflicts In Merge Editor"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10825, "Before Resolving Conflicts In Merge Editor"))); }
     async createInputModel(args) {
         const store = ( (new DisposableStore()));
         let resultTextFileModel = undefined;
@@ -308,12 +308,12 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         if (someDirty) {
             const message = isMany
                 ? ( localize(
-                10783,
+                10826,
                 'Do you want to save the changes you made to {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10784,
+                10827,
                 'Do you want to save the changes you made to {0}?',
                 basename(inputModels[0].resultUri)
             ));
@@ -323,25 +323,25 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 detail: someUnhandledConflicts ?
                     isMany
                         ? ( localize(
-                        10785,
+                        10828,
                         "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                         : ( localize(
-                        10786,
+                        10829,
                         "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                     : isMany
-                        ? ( localize(10787, "Your changes will be lost if you don't save them."))
-                        : ( localize(10788, "Your changes will be lost if you don't save them.")),
+                        ? ( localize(10830, "Your changes will be lost if you don't save them."))
+                        : ( localize(10831, "Your changes will be lost if you don't save them.")),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localize(10789, '&&Save with Conflicts'))
-                            : ( localize(10790, '&&Save')),
+                            ? ( localize(10832, '&&Save with Conflicts'))
+                            : ( localize(10833, '&&Save')),
                         run: () => 0
                     },
                     {
-                        label: ( localize(10791, "Do&&n't Save")),
+                        label: ( localize(10834, "Do&&n't Save")),
                         run: () => 1
                     }
                 ],
@@ -354,21 +354,21 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, 0 , false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
-                    ? ( localize(10792, 'Do you want to close {0} merge editors?', inputModels.length))
+                    ? ( localize(10835, 'Do you want to close {0} merge editors?', inputModels.length))
                     : ( localize(
-                    10793,
+                    10836,
                     'Do you want to close the merge editor for {0}?',
                     basename(inputModels[0].resultUri)
                 )),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localize(10794, "The files contain unhandled conflicts."))
-                        : ( localize(10795, "The file contains unhandled conflicts."))
+                        ? ( localize(10837, "The files contain unhandled conflicts."))
+                        : ( localize(10838, "The file contains unhandled conflicts."))
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localize(10796, '&&Close with Conflicts'))
-                    : ( localize(10797, '&&Close')),
-                checkbox: { label: ( localize(10798, "Do not ask me again")) }
+                    ? ( localize(10839, '&&Close with Conflicts'))
+                    : ( localize(10840, '&&Close')),
+                checkbox: { label: ( localize(10841, "Do not ask me again")) }
             });
             if (checkboxChecked) {
                 this._storageService.store(StorageCloseWithConflicts, true, 0 , 0 );

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(6175, "Multi Diff Editor"));
+            const label = this.label ?? ( localize(6171, "Multi Diff Editor"));
             if (resources) {
-                this._name = label + ( localize(6176, " ({0} files)", resources.length));
+                this._name = label + ( localize(6172, " ({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(6177, 'View Changes')),
+            title: ( localize2(6176, 'View Changes')),
             f1: false
         });
     }

package/vscode/src/vs/workbench/contrib/notebook/browser/contrib/cellStatusBar/executionStatusBarItemController.js

@@ -132,7 +132,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                     text: `$(${successStateIcon.id})`,
                     color: themeColorFromId(cellStatusIconSuccess),
-                    tooltip: ( localize(8071, "Success")),
+                    tooltip: ( localize(8327, "Success")),
                     alignment: 1 ,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -141,7 +141,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                     text: `$(${errorStateIcon.id})`,
                     color: themeColorFromId(cellStatusIconError),
-                    tooltip: ( localize(8072, "Failed")),
+                    tooltip: ( localize(8328, "Failed")),
                     alignment: 1 ,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -149,7 +149,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
         else if (state === NotebookCellExecutionState.Pending || state === NotebookCellExecutionState.Unconfirmed) {
             return [{
                     text: `$(${pendingStateIcon.id})`,
-                    tooltip: ( localize(8073, "Pending")),
+                    tooltip: ( localize(8329, "Pending")),
                     alignment: 1 ,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -160,7 +160,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
                 ThemeIcon.modify(executingStateIcon, 'spin');
             return [{
                     text: `$(${icon.id})`,
-                    tooltip: ( localize(8074, "Executing")),
+                    tooltip: ( localize(8330, "Executing")),
                     alignment: 1 ,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -264,10 +264,10 @@ let TimerCellStatusBarItem = class TimerCellStatusBarItem extends Disposable {
                 }));
                 renderTimes += `- [${rendererInfo?.displayName ?? key}](command:workbench.action.openIssueReporter?${args}) ${formatCellDuration(renderDuration[key])}\n`;
             }
-            renderTimes += `\n*${( localize(8075, "Use the links above to file an issue using the issue reporter."))}*\n`;
+            renderTimes += `\n*${( localize(8331, "Use the links above to file an issue using the issue reporter."))}*\n`;
             tooltip = {
                 value: ( localize(
-                    8076,
+                    8332,
                     "**Last Execution** {0}\n\n**Execution Time** {1}\n\n**Overhead Time** {2}\n\n**Render Times**\n\n{3}",
                     lastExecution,
                     formatCellDuration(executionDuration),

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(10817, "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(10818, "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/cellOutputActions.js

@@ -17,7 +17,7 @@ registerAction2(class ShowAllOutputsAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.cellOuput.showEmptyOutputs',
-            title: ( localize(8015, "Show empty outputs")),
+            title: ( localize(8271, "Show empty outputs")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS)))
@@ -42,7 +42,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
     constructor() {
         super({
             id: COPY_OUTPUT_COMMAND_ID,
-            title: ( localize(8016, "Copy Cell Output")),
+            title: ( localize(8272, "Copy Cell Output")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: NOTEBOOK_CELL_HAS_OUTPUTS
@@ -117,7 +117,7 @@ registerAction2(class OpenCellOutputInEditorAction extends Action2 {
     constructor() {
         super({
             id: OPEN_OUTPUT_COMMAND_ID,
-            title: ( localize(8017, "Open Cell Output in Text Editor")),
+            title: ( localize(8273, "Open Cell Output in Text Editor")),
             f1: false,
             category: NOTEBOOK_ACTIONS_CATEGORY,
             icon: copyIcon,

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(10828, "Whether the cell chat editor is focused")))));
-const CTX_NOTEBOOK_CHAT_HAS_ACTIVE_REQUEST = ( (new RawContextKey('notebookChatHasActiveRequest', false, ( localize(10829, "Whether the cell chat editor has an active request")))));
-const CTX_NOTEBOOK_CHAT_USER_DID_EDIT = ( (new RawContextKey('notebookChatUserDidEdit', false, ( localize(10830, "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(
- 10831,
+ 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(10832, "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/chat/notebookChatController.js

@@ -337,8 +337,8 @@ let NotebookChatController = class NotebookChatController extends Disposable {
                 }
             }
         }));
-        inlineChatWidget.placeholder = ( localize(10826, "Ask a question"));
-        inlineChatWidget.updateInfo(( localize(10827, "AI-generated code may be incorrect")));
+        inlineChatWidget.placeholder = ( localize(10867, "Ask a question"));
+        inlineChatWidget.updateInfo(( localize(10868, "AI-generated code may be incorrect")));
         widgetContainer.appendChild(inlineChatWidget.domNode);
         this._widgetDisposableStore.add(inlineChatWidget.onDidChangeInput(() => {
             this._warmupRequestCts?.dispose(true);

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(5671, 'Notebook'));
+const NOTEBOOK_ACTIONS_CATEGORY = ( localize2(5615, '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(5672, "Insert Cell")),
+    title: ( localize(5616, "Insert Cell")),
     group: "2_insert" ,
     when: ( (NOTEBOOK_EDITOR_EDITABLE.isEqualTo(true)))
 });
 MenuRegistry.appendMenuItem(MenuId.EditorContext, {
     submenu: MenuId.NotebookCellTitle,
-    title: ( localize(5673, "Notebook Cell")),
+    title: ( localize(5617, "Notebook Cell")),
     group: "2_insert" ,
     when: NOTEBOOK_EDITOR_FOCUSED
 });
 MenuRegistry.appendMenuItem(MenuId.NotebookCellTitle, {
-    title: ( localize(5674, "Share")),
+    title: ( localize(5618, "Share")),
     submenu: MenuId.EditorContextShare,
     group: "4_share"
 });

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

@@ -106,8 +106,8 @@ class FoldingController extends Disposable {
     }
 }
 registerNotebookContribution(FoldingController.id, FoldingController);
-const NOTEBOOK_FOLD_COMMAND_LABEL = ( localize(8018, "Fold Cell"));
-const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localize2(8019, "Unfold Cell"));
+const NOTEBOOK_FOLD_COMMAND_LABEL = ( localize(8274, "Fold Cell"));
+const NOTEBOOK_UNFOLD_COMMAND_LABEL = ( localize2(8275, "Unfold Cell"));
 const FOLDING_COMMAND_ARGS = {
     args: [{
             isOptional: true,
@@ -137,7 +137,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'notebook.fold',
-            title: ( localize2(8018, "Fold Cell")),
+            title: ( localize2(8274, "Fold Cell")),
             category: NOTEBOOK_ACTIONS_CATEGORY,
             keybinding: {
                 when: ( (ContextKeyExpr.and(NOTEBOOK_EDITOR_FOCUSED, ContextKeyExpr.not(InputFocusedContextKey)))),

package/vscode/src/vs/workbench/contrib/notebook/browser/diff/notebookDiffEditor.js

@@ -243,7 +243,7 @@ let NotebookTextDiffEditor = class NotebookTextDiffEditor extends EditorPane {
             accessibilityProvider: {
                 getAriaLabel() { return null; },
                 getWidgetAriaLabel() {
-                    return ( localize(7937, "Notebook Text Diff"));
+                    return ( localize(8193, "Notebook Text Diff"));
                 }
             },
         });