@codingame/monaco-vscode-api 37.3.3 → 37.3.5

package/vscode/src/vs/sessions/contrib/changes/browser/checksWidget.js

@@ -67,7 +67,7 @@ class CICheckListRenderer {
         templateData.elementDisposables.clear();
         templateData.actionBar.clear();
         templateData.row.className = `ci-status-widget-check ${getCheckStatusClass(element.check)}`;
-        const title = ( localize(3434, "{0}: {1}", element.check.name, getCheckStateLabel(element.check)));
+        const title = ( localize(3457, "{0}: {1}", element.check.name, getCheckStateLabel(element.check)));
         templateData.label.setResource({
             name: element.check.name,
             resource: ( URI.from({
@@ -80,12 +80,12 @@ class CICheckListRenderer {
         });
         const actions = [];
         if (element.group === CICheckGroup.Failed && parseWorkflowRunId(element.check.detailsUrl) !== undefined) {
-            actions.push(templateData.elementDisposables.add(( new Action("ci.rerunCheck", ( localize(3435, "Rerun Check")), ThemeIcon.asClassName(Codicon.debugRerun), true, async () => {
+            actions.push(templateData.elementDisposables.add(( new Action("ci.rerunCheck", ( localize(3458, "Rerun Check")), ThemeIcon.asClassName(Codicon.debugRerun), true, async () => {
                 await this._getModel()?.rerunFailedCheck(element.check);
             }))));
         }
         if (element.check.detailsUrl) {
-            actions.push(templateData.elementDisposables.add(( new Action("ci.openOnGitHub", ( localize(3436, "Open on GitHub")), ThemeIcon.asClassName(Codicon.linkExternal), true, async () => {
+            actions.push(templateData.elementDisposables.add(( new Action("ci.openOnGitHub", ( localize(3459, "Open on GitHub")), ThemeIcon.asClassName(Codicon.linkExternal), true, async () => {
                 await this._openerService.open(( URI.parse(element.check.detailsUrl)));
             }))));
         }
@@ -154,12 +154,12 @@ let CIStatusWidget = class CIStatusWidget extends Disposable {
         this._headerNode = append(this._domNode, $(".ci-status-widget-header"));
         this._titleNode = append(this._headerNode, $(".ci-status-widget-title"));
         this._titleLabelNode = append(this._titleNode, $(".ci-status-widget-title-label"));
-        this._titleLabelNode.textContent = ( localize(3437, "Checks"));
+        this._titleLabelNode.textContent = ( localize(3460, "Checks"));
         this._countsNode = append(this._titleNode, $(".ci-status-widget-counts"));
         this._chevronNode = append(this._headerNode, $(".group-chevron"));
         this._chevronNode.classList.add(...ThemeIcon.asClassNameArray(Codicon.chevronDown));
         this._headerNode.setAttribute("role", "button");
-        this._headerNode.setAttribute("aria-label", ( localize(3438, "Toggle Checks")));
+        this._headerNode.setAttribute("aria-label", ( localize(3461, "Toggle Checks")));
         this._headerNode.setAttribute("aria-expanded", "true");
         this._headerNode.tabIndex = 0;
         this._register(addDisposableListener(this._headerNode, EventType.CLICK, () => {
@@ -181,8 +181,8 @@ let CIStatusWidget = class CIStatusWidget extends Disposable {
                 multipleSelectionSupport: false,
                 openOnSingleClick: false,
                 accessibilityProvider: {
-                    getWidgetAriaLabel: () => ( localize(3439, "Checks")),
-                    getAriaLabel: item => ( localize(3440, "{0}, {1}", item.check.name, getCheckStateLabel(item.check)))
+                    getWidgetAriaLabel: () => ( localize(3462, "Checks")),
+                    getAriaLabel: item => ( localize(3463, "{0}, {1}", item.check.name, getCheckStateLabel(item.check)))
                 },
                 keyboardNavigationLabelProvider: {
                     getKeyboardNavigationLabel: item => item.check.name

package/vscode/src/vs/sessions/contrib/changes/browser/createPullRequestChatRequest.js

@@ -15,7 +15,7 @@ let CreatePullRequestChatRequest = class CreatePullRequestChatRequest {
             session.isArchived.get() || chat.isArchived.get(),
             chat.interactivity.get()
         ) !== ChatInteractivity.Full) {
-            throw ( new Error(( localize(3441, "Cannot send a pull request creation message to a read-only chat."))));
+            throw ( new Error(( localize(3464, "Cannot send a pull request creation message to a read-only chat."))));
         }
         await this.sessionsManagementService.sendRequest(session, chat, request);
     }
@@ -23,37 +23,37 @@ let CreatePullRequestChatRequest = class CreatePullRequestChatRequest {
 CreatePullRequestChatRequest = ( __decorate([( __param(0, ISessionsManagementService))], CreatePullRequestChatRequest));
 function createPullRequestMessage(options) {
     const mergeMethods = {
-        MERGE: ( localize(3442, "a merge commit")),
-        SQUASH: ( localize(3443, "squash merging")),
-        REBASE: ( localize(3444, "rebase merging"))
+        MERGE: ( localize(3465, "a merge commit")),
+        SQUASH: ( localize(3466, "squash merging")),
+        REBASE: ( localize(3467, "rebase merging"))
     };
     return [options.draft ? ( localize(
-        3445,
+        3468,
         "Create a draft pull request for this session's changes. Keep it in draft."
-    )) : ( localize(3446, "Create a pull request ready for review for this session's changes.")), ...(options.expectedContext ? [( localize(
-        3447,
+    )) : ( localize(3469, "Create a pull request ready for review for this session's changes.")), ...(options.expectedContext ? [( localize(
+        3470,
         "The prepared context is repository {0}, current branch {1}, and base branch {2}. If this context has changed, stop and ask me to review it before committing, pushing, or creating the pull request.",
         options.expectedContext.repository,
         options.expectedContext.branchName,
         options.expectedContext.baseBranchName
     )), ...(options.expectedContext.branchName === options.expectedContext.baseBranchName ? [( localize(
-        3448,
+        3471,
         "Create and switch to a new source branch before committing changes."
     ))] : [])] : []), ( localize(
-        3449,
+        3472,
         "Commit any uncommitted changes and push the source branch as needed."
     )), ( localize(
-        3450,
+        3473,
         "Use the following title and description exactly (provided as JSON):\n{0}",
         JSON.stringify({
             title: options.title,
             description: options.description
         }, undefined, 2)
     )), options.autoMergeMethod ? ( localize(
-        3451,
+        3474,
         "Enable GitHub auto-merge using {0}, so the pull request merges when required checks and approvals pass. Do not bypass these requirements.",
         mergeMethods[options.autoMergeMethod]
-    )) : ( localize(3452, "Do not merge the pull request or enable GitHub auto-merge."))].join("\n\n");
+    )) : ( localize(3475, "Do not merge the pull request or enable GitHub auto-merge."))].join("\n\n");
 }
 
 export { CreatePullRequestChatRequest, createPullRequestMessage };

package/vscode/src/vs/sessions/contrib/changes/browser/createPullRequestWidget.js

@@ -58,7 +58,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         const headingLabel = this._register(( new IconLabel(append(heading, $("h2", {
             id: `${id}-heading`
         })))));
-        const headingText = ( localize(3453, "Create pull request"));
+        const headingText = ( localize(3476, "Create pull request"));
         headingLabel.setLabel(headingText, undefined, {
             title: headingText
         });
@@ -74,7 +74,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.baseBranch = this._register(( new IconLabel(this.branches)));
         append(this.branches, renderIcon(Codicon.arrowLeft)).setAttribute("aria-hidden", "true");
         this.sourceBranch = this._register(( new IconLabel(this.branches)));
-        this.branchesLoading = append(header, $(".create-pr-branches-loading", undefined, ( localize(3454, "Loading branch information..."))));
+        this.branchesLoading = append(header, $(".create-pr-branches-loading", undefined, ( localize(3477, "Loading branch information..."))));
         this.updateRepository(options.branchName, options.baseBranchName);
         const body = $(".create-pr-body");
         this.scrollable = this._register(( new DomScrollableElement(body, {
@@ -86,11 +86,11 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         const titleField = append(body, $(".create-pr-field"));
         const titleLabel = append(titleField, $("label.create-pr-label.create-pr-field-label", {
             for: `${id}-title`
-        }, ( localize(3455, "Title"))));
+        }, ( localize(3478, "Title"))));
         this.titleLoading = append(titleLabel, renderIcon(loadingIcon));
         this.titleLoading.setAttribute("aria-hidden", "true");
         this.titleInput = this._register(( new InputBox(titleField, undefined, {
-            placeholder: ( localize(3456, "Summarize your changes")),
+            placeholder: ( localize(3479, "Summarize your changes")),
             inputBoxStyles: defaultInputBoxStyles
         })));
         this.titleInput.inputElement.id = `${id}-title`;
@@ -99,11 +99,11 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         const descriptionField = append(body, $(".create-pr-field.create-pr-description-field"));
         const descriptionLabel = append(descriptionField, $("label.create-pr-label.create-pr-field-label", {
             for: `${id}-description`
-        }, ( localize(3457, "Description"))));
+        }, ( localize(3480, "Description"))));
         this.descriptionLoading = append(descriptionLabel, renderIcon(loadingIcon));
         this.descriptionLoading.setAttribute("aria-hidden", "true");
         this.descriptionInput = this._register(( new InputBox(descriptionField, undefined, {
-            placeholder: ( localize(3458, "Describe what changed and how it was tested")),
+            placeholder: ( localize(3481, "Describe what changed and how it was tested")),
             flexibleHeight: true,
             flexibleMaxHeight: 180,
             inputBoxStyles: defaultInputBoxStyles
@@ -122,15 +122,15 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             secondary: true,
             small: true
         })));
-        this.retryButton.label = ( localize(3459, "Retry"));
+        this.retryButton.label = ( localize(3482, "Retry"));
         this.retryButton.element.hidden = true;
         this._register(this.retryButton.onDidClick(() => this.prepare()));
         const draftRow = append(body, $(".create-pr-draft"));
-        this.draftCheckbox = this._register(( new Checkbox(( localize(3460, "Create as Draft")), options.initialDraft ?? options.preferences?.draft ?? false, defaultCheckboxStyles)));
+        this.draftCheckbox = this._register(( new Checkbox(( localize(3483, "Create as Draft")), options.initialDraft ?? options.preferences?.draft ?? false, defaultCheckboxStyles)));
         draftRow.appendChild(this.draftCheckbox.domNode);
         const draftText = append(draftRow, $(".create-pr-option-text"));
-        append(draftText, $("span.create-pr-label", undefined, ( localize(3460, "Create as Draft"))));
-        const draftHint = ( localize(3461, "Keep the pull request in draft until it is ready for review."));
+        append(draftText, $("span.create-pr-label", undefined, ( localize(3483, "Create as Draft"))));
+        const draftHint = ( localize(3484, "Keep the pull request in draft until it is ready for review."));
         append(draftText, $("span", {
             id: `${id}-draft-hint`,
             hidden: true
@@ -156,10 +156,10 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             this.updateMergeOptions();
         }));
         const mergeField = append(body, $(".create-pr-field"));
-        append(mergeField, $(".create-pr-label", undefined, ( localize(3462, "After creation"))));
+        append(mergeField, $(".create-pr-label", undefined, ( localize(3485, "After creation"))));
         this.mergeModeRadio = this._register(( new Radio({
             items: [],
-            ariaLabel: ( localize(3462, "After creation"))
+            ariaLabel: ( localize(3485, "After creation"))
         })));
         mergeField.appendChild(this.mergeModeRadio.domNode);
         this.mergeDescription = append(mergeField, $(".create-pr-hint.create-pr-merge-description", {
@@ -179,7 +179,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         }));
         this.agentMergeOptionsSection = append(body, $(".create-pr-field.create-pr-agent-merge", {
             role: "group",
-            "aria-label": ( localize(3463, "Agent Merge configuration for this session"))
+            "aria-label": ( localize(3486, "Agent Merge configuration for this session"))
         }));
         const repairActions = append(this.agentMergeOptionsSection, $(".create-pr-agent-merge-actions"));
         const createRepairCheckbox = (label, description) => {
@@ -215,32 +215,32 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             return checkbox;
         };
         this.agentMergeCheckboxes = {
-            addressReviews: createRepairCheckbox(( localize(3464, "Address Reviews")), ( localize(
-                3465,
+            addressReviews: createRepairCheckbox(( localize(3487, "Address Reviews")), ( localize(
+                3488,
                 "Agent Merge will automatically ask the agent to address feedback when the pull request has unresolved review comments."
             ))),
-            fixCI: createRepairCheckbox(( localize(3466, "Fix CI Failures")), ( localize(
-                3467,
+            fixCI: createRepairCheckbox(( localize(3489, "Fix CI Failures")), ( localize(
+                3490,
                 "Agent Merge will automatically ask the agent to investigate and fix failures when required CI checks fail."
             ))),
-            resolveConflicts: createRepairCheckbox(( localize(3468, "Resolve Conflicts and Behind Branches")), ( localize(
-                3469,
+            resolveConflicts: createRepairCheckbox(( localize(3491, "Resolve Conflicts and Behind Branches")), ( localize(
+                3492,
                 "Agent Merge will automatically ask the agent to update the source branch when it has merge conflicts or falls behind the base branch."
             )))
         };
         append(
             this.agentMergeOptionsSection,
-            $(".create-pr-label", undefined, ( localize(3470, "Merge Pull Request")))
+            $(".create-pr-label", undefined, ( localize(3493, "Merge Pull Request")))
         );
         this.agentMergePolicyRadio = this._register(( new Radio({
-            ariaLabel: ( localize(3470, "Merge Pull Request")),
+            ariaLabel: ( localize(3493, "Merge Pull Request")),
             items: [{
-                text: ( localize(3471, "Off")),
+                text: ( localize(3494, "Off")),
                 isActive: true
             }, {
-                text: ( localize(3472, "If Unchanged"))
+                text: ( localize(3495, "If Unchanged"))
             }, {
-                text: ( localize(3473, "When Ready"))
+                text: ( localize(3496, "When Ready"))
             }]
         })));
         this.agentMergeOptionsSection.appendChild(this.agentMergePolicyRadio.domNode);
@@ -260,11 +260,11 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.mergeMethodSection = append(body, $(".create-pr-field"));
         append(
             this.mergeMethodSection,
-            $(".create-pr-label", undefined, ( localize(3474, "Merge method")))
+            $(".create-pr-label", undefined, ( localize(3497, "Merge method")))
         );
         this.mergeMethodRadio = this._register(( new Radio({
             items: [],
-            ariaLabel: ( localize(3474, "Merge method"))
+            ariaLabel: ( localize(3497, "Merge method"))
         })));
         this.mergeMethodSection.appendChild(this.mergeMethodRadio.domNode);
         this.mergeMethodDescription = append(this.mergeMethodSection, $(".create-pr-hint"));
@@ -281,13 +281,13 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         }));
         this.error.hidden = true;
         const footer = append(this.domNode, $(".create-pr-footer"));
-        append(footer, $(".create-pr-hint", undefined, ( localize(3475, "Uncommitted changes will be committed and your branch pushed."))));
+        append(footer, $(".create-pr-hint", undefined, ( localize(3498, "Uncommitted changes will be committed and your branch pushed."))));
         const buttons = this._register(( new ButtonBar(append(footer, $(".create-pr-buttons")))));
         this.cancelButton = buttons.addButton({
             ...defaultButtonStyles,
             secondary: true
         });
-        this.cancelButton.label = ( localize(3476, "Cancel"));
+        this.cancelButton.label = ( localize(3499, "Cancel"));
         this.createButton = options.sendToChat ? buttons.addButtonWithDropdown({
             ...defaultButtonStyles,
             supportIcons: true,
@@ -309,7 +309,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         const primaryButton = this.createButton instanceof ButtonWithDropdown ? this.createButton.primaryButton : this.createButton;
         primaryButton.element.classList.add("create-pr-submit");
         if (this.createButton instanceof ButtonWithDropdown) {
-            this.createButton.dropdownButton.setAriaLabel(( localize(3477, "Pull Request Actions")));
+            this.createButton.dropdownButton.setAriaLabel(( localize(3500, "Pull Request Actions")));
         }
         this._register(this.cancelButton.onDidClick(() => options.onCancel()));
         this._register(this.createButton.onDidClick(() => this.submit()));
@@ -354,19 +354,19 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.branches.hidden = !hasBranches;
         this.branchesLoading.hidden = hasBranches;
         const createsBranch = hasBranches && branchName === baseBranchName;
-        const branchDescription = createsBranch ? ( localize(3478, "A new branch will be created from {0}", baseBranchName)) : ( localize(
-            3479,
+        const branchDescription = createsBranch ? ( localize(3501, "A new branch will be created from {0}", baseBranchName)) : ( localize(
+            3502,
             "Merge source branch {0} into base branch {1}",
             branchName ?? "",
             baseBranchName ?? ""
         ));
         this.branches.setAttribute("aria-label", branchDescription);
         this.baseBranch.setLabel(baseBranchName ?? "", undefined, {
-            title: ( localize(3480, "Base branch: {0}", baseBranchName ?? "")),
+            title: ( localize(3503, "Base branch: {0}", baseBranchName ?? "")),
             extraClasses: ["create-pr-base-branch"]
         });
-        this.sourceBranch.setLabel(createsBranch ? ( localize(3481, "New branch")) : branchName ?? "", undefined, {
-            title: createsBranch ? branchDescription : ( localize(3482, "Source branch: {0}", branchName ?? "")),
+        this.sourceBranch.setLabel(createsBranch ? ( localize(3504, "New branch")) : branchName ?? "", undefined, {
+            title: createsBranch ? branchDescription : ( localize(3505, "Source branch: {0}", branchName ?? "")),
             extraClasses: ["create-pr-source-branch"]
         });
     }
@@ -380,7 +380,7 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         this.updateSubmitButton();
         this.updateMergeOptions();
         if (this.domNode.isConnected) {
-            status(( localize(3483, "Generating pull request title and description.")));
+            status(( localize(3506, "Generating pull request title and description.")));
         }
         try {
             const details = await this.options.creation.prepare(cancellation.token);
@@ -405,19 +405,19 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             this.updateRepository(details.branchName, details.baseBranchName, details.repository);
             const generationFailed = details.generationError !== undefined;
             this.setGenerationError(generationFailed ? details.generationError ? ( localize(
-                3484,
+                3507,
                 "Could not generate details: {0} Enter your own or retry.",
                 details.generationError
-            )) : ( localize(3485, "Could not generate details. Enter your own or retry.")) : undefined);
+            )) : ( localize(3508, "Could not generate details. Enter your own or retry.")) : undefined);
             if (!generationFailed && this.domNode.isConnected) {
-                status(( localize(3486, "Pull request details are ready.")));
+                status(( localize(3509, "Pull request details are ready.")));
             }
         } catch (error) {
             if (this._store.isDisposed || cancellation.token.isCancellationRequested) {
                 return;
             }
             this.setGenerationError(( localize(
-                3487,
+                3510,
                 "Could not load pull request details: {0} Enter your own or retry.",
                 toErrorMessage(error)
             )));
@@ -453,16 +453,16 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         }
         this.mergeModes = this.details?.agentMergeAvailable ? ["manual", "agent", "auto"] : ["manual", "auto"];
         const labels = {
-            manual: ( localize(3488, "Merge Manually")),
-            agent: ( localize(3489, "Agent Merge")),
-            auto: ( localize(3490, "Auto-Merge"))
+            manual: ( localize(3511, "Merge Manually")),
+            agent: ( localize(3512, "Agent Merge")),
+            auto: ( localize(3513, "Auto-Merge"))
         };
         this.mergeModeRadio.setItems(this.mergeModes.map(mode => ({
             text: labels[mode],
             ariaLabel: labels[mode],
             isActive: this.mergeMode === mode,
             disabled: this.loading || this.submitting || (mode === "auto" && !autoMergeAllowed),
-            tooltip: mode === "auto" && !autoMergeAllowed ? this.draftCheckbox.checked ? ( localize(3491, "Mark the pull request ready before enabling GitHub auto-merge.")) : ( localize(3492, "GitHub auto-merge is not available for this repository or session.")) : labels[mode]
+            tooltip: mode === "auto" && !autoMergeAllowed ? this.draftCheckbox.checked ? ( localize(3514, "Mark the pull request ready before enabling GitHub auto-merge.")) : ( localize(3515, "GitHub auto-merge is not available for this repository or session.")) : labels[mode]
         })));
         const mergeMethods = this.details?.mergeMethods ?? [];
         this.mergeMethod = this.preferredMergeMethod;
@@ -470,9 +470,9 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
             this.mergeMethod = mergeMethods[0];
         }
         const methodLabels = {
-            SQUASH: ( localize(3493, "Squash")),
-            MERGE: ( localize(3494, "Merge Commit")),
-            REBASE: ( localize(3495, "Rebase"))
+            SQUASH: ( localize(3516, "Squash")),
+            MERGE: ( localize(3517, "Merge Commit")),
+            REBASE: ( localize(3518, "Rebase"))
         };
         this.mergeMethodRadio.setItems(mergeMethods.map(method => ({
             text: methodLabels[method],
@@ -494,34 +494,34 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
         }
         this.agentMergePolicyRadio.setEnabled(agentMergeControlsEnabled);
         this.mergeDescription.textContent = this.mergeMode === "agent" ? this.details?.agentMergeOptions ? ( localize(
-            3496,
+            3519,
             "Applied to this session on submission. Your choices are remembered for future pull requests. Additional agent usage may apply."
         )) : ( localize(
-            3497,
+            3520,
             "Uses the session's existing Agent Merge settings. Update the agent host to configure them here."
         )) : this.mergeMode === "auto" ? ( localize(
-            3498,
+            3521,
             "GitHub merges when required checks and approvals pass. It does not fix failing checks or address reviews."
-        )) : ( localize(3499, "You decide when to merge. No automatic fixes or merging."));
-        const policyDescription = this.agentMergePolicy === "never" ? ( localize(3500, "Leave the pull request open for you to merge.")) : this.agentMergePolicy === "ifUnchanged" ? ( localize(
-            3501,
+        )) : ( localize(3522, "You decide when to merge. No automatic fixes or merging."));
+        const policyDescription = this.agentMergePolicy === "never" ? ( localize(3523, "Leave the pull request open for you to merge.")) : this.agentMergePolicy === "ifUnchanged" ? ( localize(
+            3524,
             "Merge only if Agent Merge made no changes. A repair commit switches merging off."
-        )) : ( localize(3502, "Merge when required checks and approvals pass."));
-        this.agentMergePolicyDescription.textContent = this.draftCheckbox.checked && this.agentMergePolicy !== "never" ? ( localize(3503, "{0} Drafts can be marked ready automatically.", policyDescription)) : policyDescription;
+        )) : ( localize(3525, "Merge when required checks and approvals pass."));
+        this.agentMergePolicyDescription.textContent = this.draftCheckbox.checked && this.agentMergePolicy !== "never" ? ( localize(3526, "{0} Drafts can be marked ready automatically.", policyDescription)) : policyDescription;
         this.updateMergeMethodDescription();
         this.relayout();
     }
     updateMergeMethodDescription() {
-        this.mergeMethodDescription.textContent = this.mergeMethod === "SQUASH" ? ( localize(3504, "Combine all changes into one commit on the base branch.")) : this.mergeMethod === "REBASE" ? ( localize(3505, "Replay each commit on the base branch without a merge commit.")) : ( localize(3506, "Preserve all commits and add a merge commit."));
+        this.mergeMethodDescription.textContent = this.mergeMethod === "SQUASH" ? ( localize(3527, "Combine all changes into one commit on the base branch.")) : this.mergeMethod === "REBASE" ? ( localize(3528, "Replay each commit on the base branch without a merge commit.")) : ( localize(3529, "Preserve all commits and add a merge commit."));
     }
     updateSubmitButton() {
         this.createButton.enabled = !this.loading && !this.submitting && this.titleInput.value.trim().length > 0;
-        const label = this.submitting ? this.primaryAction === "sendToChat" ? ( localize(3507, "Sending Message...")) : ( localize(3508, "Creating PR...")) : this.actionLabel(this.primaryAction);
+        const label = this.submitting ? this.primaryAction === "sendToChat" ? ( localize(3530, "Sending Message...")) : ( localize(3531, "Creating PR...")) : this.actionLabel(this.primaryAction);
         this.createButton.label = this.submitting ? `$(loading~spin) ${label}` : label;
         this.createButton.setAriaLabel(label);
     }
     actionLabel(action) {
-        return action === "sendToChat" ? ( localize(3509, "Send Create PR Message")) : ( localize(3510, "Create PR"));
+        return action === "sendToChat" ? ( localize(3532, "Send Create PR Message")) : ( localize(3533, "Create PR"));
     }
     applyAgentMergeOptions(options) {
         for (const action of ( Object.keys(this.agentMergeCheckboxes))) {
@@ -604,10 +604,10 @@ let CreatePullRequestWidget = class CreatePullRequestWidget extends Disposable {
                 return;
             }
             this.error.textContent = action === "sendToChat" ? ( localize(
-                3511,
+                3534,
                 "Could not send the create pull request message: {0}",
                 toErrorMessage(error)
-            )) : ( localize(3512, "Could not create the pull request: {0}", toErrorMessage(error)));
+            )) : ( localize(3535, "Could not create the pull request: {0}", toErrorMessage(error)));
             this.error.hidden = false;
             return;
         } finally {

package/vscode/src/vs/sessions/contrib/changes/browser/sessionChangesEditor.js

@@ -123,7 +123,7 @@ class SessionChangesResourceLabel extends Disposable {
                     added.textContent = `+${stats.insertions}`;
                     removed.textContent = `-${stats.deletions}`;
                     accessoryContainer.setAttribute("aria-label", ( localize(
-                        3513,
+                        3536,
                         "{0} lines added, {1} lines removed",
                         stats.insertions,
                         stats.deletions
@@ -411,7 +411,7 @@ class ChangesetReviewActionViewItem extends CheckboxActionViewItem {
         this.updateTooltip();
     }
     getTooltip() {
-        return this.action.checked ? ( localize(3514, "Mark as Not Viewed")) : ( localize(3515, "Mark as Viewed"));
+        return this.action.checked ? ( localize(3537, "Mark as Not Viewed")) : ( localize(3538, "Mark as Viewed"));
     }
 }
 

package/vscode/src/vs/sessions/contrib/changes/browser/sessionChangesEditorInput.js

@@ -63,12 +63,12 @@ let SessionChangesEditorInput = class SessionChangesEditorInput extends DockedEd
         return this.layoutService.isVisible(Parts.EDITOR_PART, mainWindow) ? capabilities : capabilities | EditorInputCapabilities.CannotClose;
     }
     getName() {
-        return localize(3516, "Changes");
+        return localize(3539, "Changes");
     }
     getAriaLabel() {
         const changeCount = this.sessionChangesService.activeSessionUncommittedChangesCountObs.get();
         return !changeCount ? this.getName() : ( localize(
-            3517,
+            3540,
             "{0}, {1}",
             this.getName(),
             getSessionChangesFileCountLabel(changeCount)

package/vscode/src/vs/sessions/contrib/changes/browser/sessionChangesService.js

@@ -43,7 +43,7 @@ let SessionChangesService = class SessionChangesService extends Disposable {
             return;
         }
         const provider = {
-            label: ( localize(3518, "Changes")),
+            label: ( localize(3541, "Changes")),
             onDidChange: this._onDidChangeDecorations.event,
             provideDecorations: resource => this._provideDecoration(resource)
         };
@@ -120,7 +120,7 @@ let SessionChangesService = class SessionChangesService extends Disposable {
         }
         const pane = await this.editorService.openEditor({
             multiDiffSource,
-            label: ( localize(3519, "Session Changes")),
+            label: ( localize(3542, "Session Changes")),
             options: editorOptions
         }, group);
         await this.expandRevealTarget(pane?.input, editorOptions);

package/vscode/src/vs/sessions/contrib/changes/common/changes.js

@@ -8,7 +8,7 @@ const CreatePullRequestFocusedContext = new RawContextKey("sessions.createPullRe
 const VIEW_SESSION_CHANGES_COMMAND_ID = "workbench.agentSessions.action.viewChanges";
 const SESSIONS_CHANGES_OPEN_SINGLE_FILE_DIFF_SETTING = "sessions.changes.openSingleFileDiff";
 function getSessionChangesFileCountLabel(changeCount) {
-    return changeCount === 1 ? ( localize(3547, "1 file")) : ( localize(3548, "{0} files", changeCount));
+    return changeCount === 1 ? ( localize(3570, "1 file")) : ( localize(3571, "{0} files", changeCount));
 }
 var ChangesViewMode;
 (function(ChangesViewMode) {

package/vscode/src/vs/sessions/contrib/chat/browser/branchPicker.js

@@ -22,7 +22,7 @@ let BranchPicker = class BranchPicker extends Disposable {
         this._actionWidgetService = _actionWidgetService;
         this._renderDisposables = this._register(( new DisposableStore()));
         this._state = {
-            label: ( localize(3562, "Branch")),
+            label: ( localize(3585, "Branch")),
             branches: [],
             status: "empty",
             canOpen: false
@@ -151,12 +151,12 @@ let BranchPicker = class BranchPicker extends Disposable {
         this._actionWidgetService.show(this._options.user, false, items, delegate, anchor, undefined, [], {
             getAriaLabel: item => {
                 const label = item.label ?? "";
-                return item.item?.unavailable ? ( localize(3563, "{0}, unavailable locally", label)) : label;
+                return item.item?.unavailable ? ( localize(3586, "{0}, unavailable locally", label)) : label;
             },
-            getWidgetAriaLabel: () => ( localize(3564, "Branch Picker"))
+            getWidgetAriaLabel: () => ( localize(3587, "Branch Picker"))
         }, branchCount > FILTER_THRESHOLD ? {
             showFilter: true,
-            filterPlaceholder: ( localize(3565, "Filter branches…"))
+            filterPlaceholder: ( localize(3588, "Filter branches…"))
         } : undefined);
     }
     _getItems() {
@@ -164,7 +164,7 @@ let BranchPicker = class BranchPicker extends Disposable {
         case "loading":
             return [{
                 kind: ActionListItemKind.Action,
-                label: ( localize(3566, "Loading branches…")),
+                label: ( localize(3589, "Loading branches…")),
                 disabled: true,
                 item: {
                     kind: "branch"
@@ -173,7 +173,7 @@ let BranchPicker = class BranchPicker extends Disposable {
         case "error":
             return [{
                 kind: ActionListItemKind.Action,
-                label: ( localize(3567, "Retry Loading Branches")),
+                label: ( localize(3590, "Retry Loading Branches")),
                 group: {
                     title: "",
                     icon: Codicon.refresh
@@ -186,7 +186,7 @@ let BranchPicker = class BranchPicker extends Disposable {
         case "empty":
             return [{
                 kind: ActionListItemKind.Action,
-                label: ( localize(3568, "No local branches")),
+                label: ( localize(3591, "No local branches")),
                 disabled: true,
                 item: {
                     kind: "branch"
@@ -196,7 +196,7 @@ let BranchPicker = class BranchPicker extends Disposable {
             return this._state.branches.map(branch => ({
                 kind: ActionListItemKind.Action,
                 label: branch.name,
-                detail: branch.unavailable ? ( localize(3569, "Unavailable locally")) : undefined,
+                detail: branch.unavailable ? ( localize(3592, "Unavailable locally")) : undefined,
                 group: {
                     title: "",
                     icon: branch.unavailable ? Codicon.warning : Codicon.gitBranch
@@ -229,7 +229,7 @@ let BranchPicker = class BranchPicker extends Disposable {
         const disabled = !this._state.canOpen;
         const renderAsStatic = disabled && this._options.renderDisabledAsStatic === true;
         const reason = this._state.disabledReason;
-        this._triggerElement.setAttribute("aria-label", disabled && reason ? ( localize(3570, "{0}. {1}", this._state.label, reason)) : ( localize(3571, "Pick Branch, {0}", this._state.label)));
+        this._triggerElement.setAttribute("aria-label", disabled && reason ? ( localize(3593, "{0}. {1}", this._state.label, reason)) : ( localize(3594, "Pick Branch, {0}", this._state.label)));
         this._triggerElement.setAttribute("aria-disabled", String(disabled));
         this._triggerElement.setAttribute("aria-busy", String(this._state.status === "loading"));
         this._triggerElement.tabIndex = !disabled || this._options.keepDisabledFocusable && !renderAsStatic ? 0 : -1;