@codingame/monaco-vscode-api 8.0.0 → 8.0.1

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatController.js

@@ -235,14 +235,14 @@ let InlineChatController = class InlineChatController {
             delete options.position;
         }
         const widgetPosition = this._showWidget(true, initPosition);
-        let errorMessage = ( localize(7045, "Failed to start editor chat"));
+        let errorMessage = ( localize(7081, "Failed to start editor chat"));
         if (!session) {
             const createSessionCts = ( (new CancellationTokenSource()));
             const msgListener = Event.once(this._messages.event)(m => {
                 this._log('state=_createSession) message received', m);
                 if (m === Message.ACCEPT_INPUT) {
                     options.autoSend = true;
-                    this._ui.value.zone.widget.updateInfo(( localize(7046, "Getting ready...")));
+                    this._ui.value.zone.widget.updateInfo(( localize(7082, "Getting ready...")));
                 }
                 else {
                     createSessionCts.cancel();
@@ -510,7 +510,7 @@ let InlineChatController = class InlineChatController {
         const { response } = this._session.lastExchange;
         let newPosition;
         if (response instanceof EmptyResponse) {
-            const status = ( localize(7047, "No results, please refine your input and try again"));
+            const status = ( localize(7083, "No results, please refine your input and try again"));
             this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
             return State.WAIT_FOR_INPUT;
         }
@@ -551,7 +551,7 @@ let InlineChatController = class InlineChatController {
             await this._strategy.apply();
         }
         catch (err) {
-            this._dialogService.error(( localize(7048, "Failed to apply changes.", toErrorMessage(err))));
+            this._dialogService.error(( localize(7084, "Failed to apply changes.", toErrorMessage(err))));
             this._log('FAILED to apply changes');
             this._log(err);
         }
@@ -571,7 +571,7 @@ let InlineChatController = class InlineChatController {
                 undoCancelEdits = this._strategy.cancel();
             }
             catch (err) {
-                this._dialogService.error(( localize(7049, "Failed to discard changes.", toErrorMessage(err))));
+                this._dialogService.error(( localize(7085, "Failed to discard changes.", toErrorMessage(err))));
                 this._log('FAILED to discard changes');
                 this._log(err);
             }
@@ -690,7 +690,7 @@ let InlineChatController = class InlineChatController {
         return this._forcedPlaceholder ?? this._session?.agent.description ?? '';
     }
     showSaveHint() {
-        const status = ( localize(7050, "Accept or discard changes to continue saving"));
+        const status = ( localize(7086, "Accept or discard changes to continue saving"));
         this._ui.value.zone.widget.updateStatus(status, { classes: ['warn'] });
     }
     acceptInput() {

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatStrategies.js

@@ -421,21 +421,21 @@ let LiveStrategy = class LiveStrategy extends EditModeStrategy {
         const needsReview = this._configService.getValue(InlineChatConfigKeys.AcceptedOrDiscardBeforeSave);
         let message;
         if (total === 0) {
-            message = ( localize(10581, "Nothing changed."));
+            message = ( localize(10593, "Nothing changed."));
         }
         else if (remaining === 1) {
             message = needsReview
-                ? ( localize(10582, "$(info) Accept or Discard change"))
-                : ( localize(10583, "1 change"));
+                ? ( localize(10594, "$(info) Accept or Discard change"))
+                : ( localize(10595, "1 change"));
         }
         else {
             message = needsReview
-                ? ( localize(10584, "$(info) Accept or Discard {0} changes", remaining))
-                : ( localize(10585, "{0} changes", total));
+                ? ( localize(10596, "$(info) Accept or Discard {0} changes", remaining))
+                : ( localize(10597, "{0} changes", total));
         }
         let title;
         if (needsReview) {
-            title = ( localize(10586, "Review (accept or discard) all changes before continuing"));
+            title = ( localize(10598, "Review (accept or discard) all changes before continuing"));
         }
         this._zone.widget.updateStatus(message, { title });
     }

package/vscode/src/vs/workbench/contrib/inlineChat/browser/inlineChatZoneWidget.js

@@ -166,7 +166,7 @@ let InlineChatZoneWidget = class InlineChatZoneWidget extends ZoneWidget {
         this.widget.reset();
         this.widget.chatWidget.setVisible(false);
         super.hide();
-        status(( localize(10587, 'Closed inline chat widget')));
+        status(( localize(10599, 'Closed inline chat widget')));
         scrollState.restore(this.editor);
     }
 };

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

@@ -33,7 +33,7 @@ var EditMode;
     properties: {
         [InlineChatConfigKeys.Mode]: {
             description: ( localize(
-                7005,
+                7041,
                 "Configure if changes crafted with inline chat are applied directly to the document or are previewed first."
             )),
             default: EditMode.Live,
@@ -41,11 +41,11 @@ var EditMode;
             enum: [EditMode.Live, EditMode.Preview],
             markdownEnumDescriptions: [
                 ( localize(
-                    7006,
+                    7042,
                     "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(
-                    7007,
+                    7043,
                     "Changes are previewed only and need to be accepted via the apply button. Ending a session will discard the changes."
                 )),
             ],
@@ -53,20 +53,20 @@ var EditMode;
         },
         [InlineChatConfigKeys.FinishOnType]: {
             description: ( localize(
-                7008,
+                7044,
                 "Whether to finish an inline chat session when typing outside of changed regions."
             )),
             default: false,
             type: 'boolean'
         },
         [InlineChatConfigKeys.AcceptedOrDiscardBeforeSave]: {
-            description: ( localize(7009, "Whether pending inline chat sessions prevent saving.")),
+            description: ( localize(7045, "Whether pending inline chat sessions prevent saving.")),
             default: true,
             type: 'boolean'
         },
         [InlineChatConfigKeys.HoldToSpeech]: {
             description: ( localize(
-                7010,
+                7046,
                 "Whether holding the inline chat keybinding will automatically enable speech recognition."
             )),
             default: true,
@@ -74,7 +74,7 @@ var EditMode;
         },
         [InlineChatConfigKeys.AccessibleDiffView]: {
             description: ( localize(
-                7011,
+                7047,
                 "Whether the inline chat also renders an accessible diff viewer for its changes."
             )),
             default: 'auto',
@@ -82,15 +82,15 @@ var EditMode;
             enum: ['auto', 'on', 'off'],
             markdownEnumDescriptions: [
                 ( localize(
-                    7012,
+                    7048,
                     "The accessible diff viewer is based screen reader mode being enabled."
                 )),
-                ( localize(7013, "The accessible diff viewer is always enabled.")),
-                ( localize(7014, "The accessible diff viewer is never enabled.")),
+                ( localize(7049, "The accessible diff viewer is always enabled.")),
+                ( localize(7050, "The accessible diff viewer is never enabled.")),
             ],
         },
         [InlineChatConfigKeys.ExpTextButtons]: {
-            description: ( localize(7015, "Whether to use textual buttons.")),
+            description: ( localize(7051, "Whether to use textual buttons.")),
             default: false,
             type: 'boolean',
             tags: ['experimental']
@@ -104,32 +104,32 @@ var InlineChatResponseType;
     InlineChatResponseType["Messages"] = "messages";
     InlineChatResponseType["MessagesAndEdits"] = "messagesAndEdits";
 })(InlineChatResponseType || (InlineChatResponseType = {}))));
-const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7016, "Whether a provider for interactive editors exists")))));
-const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7017, "Whether the interactive editor input is visible")))));
-const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7018, "Whether the interactive editor input is focused")))));
-const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7019, "Whether the interactive widget's response is focused")))));
-const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7020, "Whether the interactive editor input is empty")))));
+const CTX_INLINE_CHAT_HAS_AGENT = ( (new RawContextKey('inlineChatHasProvider', false, ( localize(7052, "Whether a provider for interactive editors exists")))));
+const CTX_INLINE_CHAT_VISIBLE = ( (new RawContextKey('inlineChatVisible', false, ( localize(7053, "Whether the interactive editor input is visible")))));
+const CTX_INLINE_CHAT_FOCUSED = ( (new RawContextKey('inlineChatFocused', false, ( localize(7054, "Whether the interactive editor input is focused")))));
+const CTX_INLINE_CHAT_RESPONSE_FOCUSED = ( (new RawContextKey('inlineChatResponseFocused', false, ( localize(7055, "Whether the interactive widget's response is focused")))));
+const CTX_INLINE_CHAT_EMPTY = ( (new RawContextKey('inlineChatEmpty', false, ( localize(7056, "Whether the interactive editor input is empty")))));
 const CTX_INLINE_CHAT_INNER_CURSOR_FIRST = ( (new RawContextKey('inlineChatInnerCursorFirst', false, ( localize(
-    7021,
+    7057,
     "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(
-    7022,
+    7058,
     "Whether the cursor of the iteractive editor input is on the last line"
 )))));
 const CTX_INLINE_CHAT_OUTER_CURSOR_POSITION = ( (new RawContextKey('inlineChatOuterCursorPosition', '', ( localize(
-    7025,
+    7061,
     "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(7026, "Whether interactive editor has kept a session for quick restore")))));
-const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7027, "Whether the user did changes ontop of the inline chat")))));
-const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7028, "Whether the document has changed concurrently")))));
-const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7029, "Whether the current change supports showing a diff")))));
-const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7030, "Whether the current change showing a diff")))));
+const CTX_INLINE_CHAT_HAS_STASHED_SESSION = ( (new RawContextKey('inlineChatHasStashedSession', false, ( localize(7062, "Whether interactive editor has kept a session for quick restore")))));
+const CTX_INLINE_CHAT_USER_DID_EDIT = ( (new RawContextKey('inlineChatUserDidEdit', undefined, ( localize(7063, "Whether the user did changes ontop of the inline chat")))));
+const CTX_INLINE_CHAT_DOCUMENT_CHANGED = ( (new RawContextKey('inlineChatDocumentChanged', false, ( localize(7064, "Whether the document has changed concurrently")))));
+const CTX_INLINE_CHAT_CHANGE_HAS_DIFF = ( (new RawContextKey('inlineChatChangeHasDiff', false, ( localize(7065, "Whether the current change supports showing a diff")))));
+const CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF = ( (new RawContextKey('inlineChatChangeShowsDiff', false, ( localize(7066, "Whether the current change showing a diff")))));
 const CTX_INLINE_CHAT_EDIT_MODE = ( (new RawContextKey('config.inlineChat.mode', EditMode.Live)));
-const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7031, "Whether an inline chat request is currently in progress")))));
+const CTX_INLINE_CHAT_REQUEST_IN_PROGRESS = ( (new RawContextKey('inlineChatRequestInProgress', false, ( localize(7067, "Whether an inline chat request is currently in progress")))));
 const CTX_INLINE_CHAT_RESPONSE_TYPE = ( (new RawContextKey('inlineChatResponseType', InlineChatResponseType.None, ( localize(
-    7032,
+    7068,
     "What type was the responses have been receieved, nothing yet, just messages, or messaged and local edits"
 )))));
 const CTX_INLINE_CHAT_CONFIG_TXT_BTNS = ( (ContextKeyExpr.equals(`config.${[InlineChatConfigKeys.ExpTextButtons]}`, true)));
@@ -140,17 +140,17 @@ const ACTION_TOGGLE_DIFF = 'inlineChat.toggleDiff';
 const MENU_INLINE_CHAT_EXECUTE = MenuId.for('inlineChat.execute');
 const MENU_INLINE_CHAT_CONTENT_STATUS = MenuId.for('inlineChat.content.status');
 const MENU_INLINE_CHAT_WIDGET_STATUS = MenuId.for('inlineChatWidget.status');
-const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7033, "Foreground color of the interactive editor widget")));
-const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7034, "Background color of the interactive editor widget")));
-registerColor('inlineChat.border', editorWidgetBorder, ( localize(7035, "Border color of the interactive editor widget")));
-registerColor('inlineChat.shadow', widgetShadow, ( localize(7036, "Shadow color of the interactive editor widget")));
-registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7037, "Border color of the interactive editor input")));
-registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7038, "Border color of the interactive editor input when focused")));
-registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7039, "Foreground color of the interactive editor input placeholder")));
-registerColor('inlineChatInput.background', inputBackground, ( localize(7040, "Background color of the interactive editor input")));
-registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7041, "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(7042, '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(7042, 'Overview ruler marker color for inline chat inserted content.')));
-registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7043, "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(7044, 'Overview ruler marker color for inline chat removed content.')));
+const inlineChatForeground = registerColor('inlineChat.foreground', editorWidgetForeground, ( localize(7069, "Foreground color of the interactive editor widget")));
+const inlineChatBackground = registerColor('inlineChat.background', editorWidgetBackground, ( localize(7070, "Background color of the interactive editor widget")));
+registerColor('inlineChat.border', editorWidgetBorder, ( localize(7071, "Border color of the interactive editor widget")));
+registerColor('inlineChat.shadow', widgetShadow, ( localize(7072, "Shadow color of the interactive editor widget")));
+registerColor('inlineChatInput.border', editorWidgetBorder, ( localize(7073, "Border color of the interactive editor input")));
+registerColor('inlineChatInput.focusBorder', focusBorder, ( localize(7074, "Border color of the interactive editor input when focused")));
+registerColor('inlineChatInput.placeholderForeground', inputPlaceholderForeground, ( localize(7075, "Foreground color of the interactive editor input placeholder")));
+registerColor('inlineChatInput.background', inputBackground, ( localize(7076, "Background color of the interactive editor input")));
+registerColor('inlineChatDiff.inserted', ( (transparent(diffInserted, .5))), ( localize(7077, "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(7078, '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(7078, 'Overview ruler marker color for inline chat inserted content.')));
+registerColor('inlineChatDiff.removed', ( (transparent(diffRemoved, .5))), ( localize(7079, "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(7080, 'Overview ruler marker color for inline chat removed content.')));
 export { ACTION_ACCEPT_CHANGES, ACTION_REGENERATE_RESPONSE, ACTION_TOGGLE_DIFF, ACTION_VIEW_IN_CHAT, CTX_INLINE_CHAT_CHANGE_HAS_DIFF, CTX_INLINE_CHAT_CHANGE_SHOWS_DIFF, CTX_INLINE_CHAT_CONFIG_TXT_BTNS, CTX_INLINE_CHAT_DOCUMENT_CHANGED, 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_REQUEST_IN_PROGRESS, CTX_INLINE_CHAT_RESPONSE_FOCUSED, CTX_INLINE_CHAT_RESPONSE_TYPE, CTX_INLINE_CHAT_USER_DID_EDIT, CTX_INLINE_CHAT_VISIBLE, EditMode, INLINE_CHAT_ID, InlineChatConfigKeys, InlineChatResponseType, MENU_INLINE_CHAT_CONTENT_STATUS, MENU_INLINE_CHAT_EXECUTE, MENU_INLINE_CHAT_WIDGET_STATUS, inlineChatBackground, inlineChatForeground, minimapInlineChatDiffInserted, overviewRulerInlineChatDiffInserted };

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

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

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

@@ -108,12 +108,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const isMany = inputModels.length > 1;
             const message = isMany
                 ? ( localize(
-                10610,
+                10622,
                 'Do you want keep the merge result of {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10611,
+                10623,
                 'Do you want keep the merge result of {0}?',
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
@@ -121,12 +121,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const buttons = [
                 {
                     label: hasUnhandledConflicts ?
-                        ( localize(10612, "&&Save With Conflicts")) :
-                        ( localize(10613, "&&Save")),
+                        ( localize(10624, "&&Save With Conflicts")) :
+                        ( localize(10625, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 },
                 {
-                    label: ( localize(10614, "Do&&n't Save")),
+                    label: ( localize(10626, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }
             ];
@@ -136,16 +136,16 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
                 detail: hasUnhandledConflicts
                     ? isMany
                         ? ( localize(
-                    10615,
+                    10627,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 ))
                         : ( localize(
-                    10616,
+                    10628,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
                 ))
                     : isMany
-                        ? ( localize(10617, "The merge results will be lost if you don't save them."))
-                        : ( localize(10618, "The merge result will be lost if you don't save it.")),
+                        ? ( localize(10629, "The merge results will be lost if you don't save them."))
+                        : ( localize(10630, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => ConfirmResult.CANCEL
@@ -170,12 +170,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         }
         (async () => {
             const { confirmed } = await this.dialogService.confirm({
-                message: ( localize(10619, "Do you want to accept the merge result?")),
+                message: ( localize(10631, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    10620,
+                    10632,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(10621, '&&Accept Merge'))
+                primaryButton: ( localize(10633, '&&Accept Merge'))
             });
             if (confirmed) {
                 await this.accept();
@@ -200,7 +200,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._textModelService = _textModelService;
         this.textFileService = textFileService;
     }
-    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10622, "Before Resolving Conflicts In Merge Editor"))); }
+    static { this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource('merge-editor.source', ( localize(10634, "Before Resolving Conflicts In Merge Editor"))); }
     async createInputModel(args) {
         const store = ( (new DisposableStore()));
         let resultTextFileModel = undefined;
@@ -310,12 +310,12 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         if (someDirty) {
             const message = isMany
                 ? ( localize(
-                10623,
+                10635,
                 'Do you want to save the changes you made to {0} files?',
                 inputModels.length
             ))
                 : ( localize(
-                10624,
+                10636,
                 'Do you want to save the changes you made to {0}?',
                 basename(inputModels[0].resultUri)
             ));
@@ -325,25 +325,25 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 detail: someUnhandledConflicts ?
                     isMany
                         ? ( localize(
-                        10625,
+                        10637,
                         "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                         : ( localize(
-                        10626,
+                        10638,
                         "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
                     ))
                     : isMany
-                        ? ( localize(10627, "Your changes will be lost if you don't save them."))
-                        : ( localize(10628, "Your changes will be lost if you don't save them.")),
+                        ? ( localize(10639, "Your changes will be lost if you don't save them."))
+                        : ( localize(10640, "Your changes will be lost if you don't save them.")),
                 buttons: [
                     {
                         label: someUnhandledConflicts
-                            ? ( localize(10629, '&&Save with Conflicts'))
-                            : ( localize(10630, '&&Save')),
+                            ? ( localize(10641, '&&Save with Conflicts'))
+                            : ( localize(10642, '&&Save')),
                         run: () => ConfirmResult.SAVE
                     },
                     {
-                        label: ( localize(10631, "Do&&n't Save")),
+                        label: ( localize(10643, "Do&&n't Save")),
                         run: () => ConfirmResult.DONT_SAVE
                     }
                 ],
@@ -356,21 +356,21 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         else if (someUnhandledConflicts && !this._storageService.getBoolean(StorageCloseWithConflicts, StorageScope.PROFILE, false)) {
             const { confirmed, checkboxChecked } = await this._dialogService.confirm({
                 message: isMany
-                    ? ( localize(10632, 'Do you want to close {0} merge editors?', inputModels.length))
+                    ? ( localize(10644, 'Do you want to close {0} merge editors?', inputModels.length))
                     : ( localize(
-                    10633,
+                    10645,
                     'Do you want to close the merge editor for {0}?',
                     basename(inputModels[0].resultUri)
                 )),
                 detail: someUnhandledConflicts ?
                     isMany
-                        ? ( localize(10634, "The files contain unhandled conflicts."))
-                        : ( localize(10635, "The file contains unhandled conflicts."))
+                        ? ( localize(10646, "The files contain unhandled conflicts."))
+                        : ( localize(10647, "The file contains unhandled conflicts."))
                     : undefined,
                 primaryButton: someUnhandledConflicts
-                    ? ( localize(10636, '&&Close with Conflicts'))
-                    : ( localize(10637, '&&Close')),
-                checkbox: { label: ( localize(10638, "Do not ask me again")) }
+                    ? ( localize(10648, '&&Close with Conflicts'))
+                    : ( localize(10649, '&&Close')),
+                checkbox: { label: ( localize(10650, "Do not ask me again")) }
             });
             if (checkboxChecked) {
                 this._storageService.store(StorageCloseWithConflicts, true, StorageScope.PROFILE, StorageTarget.USER);

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(10812, 'The editor is a merge editor')) })));
+const ctxIsMergeEditor = ( (new RawContextKey('isMergeEditor', false, { type: 'boolean', description: ( localize(10824, 'The editor is a merge editor')) })));
 const ctxIsMergeResultEditor = ( (new RawContextKey(
  'isMergeResultEditor',
  false,
- { type: 'boolean', description: ( localize(10813, 'The editor is a the result editor of a merge editor.')) }
+ { type: 'boolean', description: ( localize(10825, 'The editor is a the result editor of a merge editor.')) }
 )));
 const ctxMergeEditorLayout = ( (new RawContextKey(
  'mergeEditorLayout',
  'mixed',
- { type: 'string', description: ( localize(10814, 'The layout mode of a merge editor')) }
+ { type: 'string', description: ( localize(10826, 'The layout mode of a merge editor')) }
 )));
 const ctxMergeEditorShowBase = ( (new RawContextKey(
  'mergeEditorShowBase',
  false,
- { type: 'boolean', description: ( localize(10815, 'If the merge editor shows the base version')) }
+ { type: 'boolean', description: ( localize(10827, 'If the merge editor shows the base version')) }
 )));
 const ctxMergeEditorShowBaseAtTop = ( (new RawContextKey(
  'mergeEditorShowBaseAtTop',
  false,
- { type: 'boolean', description: ( localize(10816, 'If base should be shown at the top')) }
+ { type: 'boolean', description: ( localize(10828, 'If base should be shown at the top')) }
 )));
 const ctxMergeEditorShowNonConflictingChanges = ( (new RawContextKey(
  'mergeEditorShowNonConflictingChanges',
  false,
- { type: 'boolean', description: ( localize(10817, 'If the merge editor shows non-conflicting changes')) }
+ { type: 'boolean', description: ( localize(10829, 'If the merge editor shows non-conflicting changes')) }
 )));
-const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(10818, 'The uri of the baser of a merge editor')) })));
-const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(10819, 'The uri of the result of a merge editor')) })));
+const ctxMergeBaseUri = ( (new RawContextKey('mergeEditorBaseUri', '', { type: 'string', description: ( localize(10830, 'The uri of the baser of a merge editor')) })));
+const ctxMergeResultUri = ( (new RawContextKey('mergeEditorResultUri', '', { type: 'string', description: ( localize(10831, '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/icons.contribution.js

@@ -1,5 +1,5 @@
 import { Codicon } from '../../../../base/common/codicons.js';
 import { localize } from '../../../../nls.js';
 import { registerIcon } from '../../../../platform/theme/common/iconRegistry.js';
-const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localize(10252, 'Icon of the multi diff editor label.')));
+const MultiDiffEditorIcon = registerIcon('multi-diff-editor-label-icon', Codicon.diffMultiple, ( localize(10264, 'Icon of the multi diff editor label.')));
 export { MultiDiffEditorIcon };

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

@@ -111,9 +111,9 @@ let MultiDiffEditorInput = class MultiDiffEditorInput extends EditorInput {
         };
         this._register(autorun((reader) => {
             const resources = this.resources.read(reader);
-            const label = this.label ?? ( localize(6104, "Multi Diff Editor"));
+            const label = this.label ?? ( localize(6141, "Multi Diff Editor"));
             if (resources) {
-                this._name = label + ( localize(6105, " ({0} files)", resources.length));
+                this._name = label + ( localize(6142, " ({0} files)", resources.length));
             }
             else {
                 this._name = label;

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

@@ -99,7 +99,7 @@ class OpenScmGroupAction extends Action2 {
     constructor() {
         super({
             id: '_workbench.openScmMultiDiffEditor',
-            title: ( localize2(6109, 'View Changes')),
+            title: ( localize2(6146, '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(7940, "Success")),
+                    tooltip: ( localize(7976, "Success")),
                     alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -141,7 +141,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
             return [{
                     text: `$(${errorStateIcon.id})`,
                     color: themeColorFromId(cellStatusIconError),
-                    tooltip: ( localize(7941, "Failed")),
+                    tooltip: ( localize(7977, "Failed")),
                     alignment: CellStatusbarAlignment.Left,
                     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(7942, "Pending")),
+                    tooltip: ( localize(7978, "Pending")),
                     alignment: CellStatusbarAlignment.Left,
                     priority: Number.MAX_SAFE_INTEGER
                 }];
@@ -160,7 +160,7 @@ let ExecutionStateCellStatusBarItem = class ExecutionStateCellStatusBarItem exte
                 ThemeIcon.modify(executingStateIcon, 'spin');
             return [{
                     text: `$(${icon.id})`,
-                    tooltip: ( localize(7943, "Executing")),
+                    tooltip: ( localize(7979, "Executing")),
                     alignment: CellStatusbarAlignment.Left,
                     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(7944, "Use the links above to file an issue using the issue reporter."))}*\n`;
+            renderTimes += `\n*${( localize(7980, "Use the links above to file an issue using the issue reporter."))}*\n`;
             tooltip = {
                 value: ( localize(
-                    7945,
+                    7981,
                     "**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

@@ -274,10 +274,10 @@ let NotebookFindWidget = class NotebookFindWidget extends SimpleFindReplaceWidge
     _getAriaLabel(label, currentMatch, searchString) {
         if (label === NLS_NO_RESULTS) {
             return searchString === ''
-                ? ( localize(10092, "{0} found", label))
-                : ( localize(10093, "{0} found for '{1}'", label, searchString));
+                ? ( localize(10095, "{0} found", label))
+                : ( localize(10096, "{0} found for '{1}'", label, searchString));
         }
-        return ( localize(10094, "{0} found for '{1}'", label, searchString));
+        return ( localize(10097, "{0} found for '{1}'", label, searchString));
     }
     dispose() {
         this._notebookEditor?.removeClassName(FIND_SHOW_TRANSITION);

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

@@ -295,7 +295,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(10588, "Cannot join cells of different kinds"));
+        const message = ( localize(10600, "Cannot join cells of different kinds"));
         return notificationService.warn(message);
     }
     const firstCell = cells[0];
@@ -323,7 +323,7 @@ async function joinSelectedCells(bulkEditService, notificationService, context)
         }))));
     }
     if (edits.length) {
-        await bulkEditService.apply(edits, { quotableLabel: ( localize(10589, "Join Notebook Cells")) });
+        await bulkEditService.apply(edits, { quotableLabel: ( localize(10601, "Join Notebook Cells")) });
     }
 }
 async function joinNotebookCells(editor, range, direction, constraint) {

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

@@ -16,7 +16,7 @@ registerAction2(class ShowAllOutputsAction extends Action2 {
     constructor() {
         super({
             id: 'notebook.cellOuput.showEmptyOutputs',
-            title: ( localize(7885, "Show empty outputs")),
+            title: ( localize(7921, "Show empty outputs")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: ( (ContextKeyExpr.and(NOTEBOOK_CELL_HAS_OUTPUTS, NOTEBOOK_CELL_HAS_HIDDEN_OUTPUTS)))
@@ -41,7 +41,7 @@ registerAction2(class CopyCellOutputAction extends Action2 {
     constructor() {
         super({
             id: COPY_OUTPUT_COMMAND_ID,
-            title: ( localize(7886, "Copy Cell Output")),
+            title: ( localize(7922, "Copy Cell Output")),
             menu: {
                 id: MenuId.NotebookOutputToolbar,
                 when: NOTEBOOK_CELL_HAS_OUTPUTS
@@ -116,7 +116,7 @@ registerAction2(class OpenCellOutputInEditorAction extends Action2 {
     constructor() {
         super({
             id: OPEN_OUTPUT_COMMAND_ID,
-            title: ( localize(7887, "Open Cell Output in Text Editor")),
+            title: ( localize(7923, "Open Cell Output in Text Editor")),
             f1: false,
             category: NOTEBOOK_ACTIONS_CATEGORY,
             icon: copyIcon,