@codingame/monaco-vscode-api 29.1.0 → 30.0.0

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpServerWidgets.js

@@ -167,7 +167,7 @@ let PublisherWidget = class PublisherWidget extends McpServerWidget {
             this.element.setAttribute("role", "button");
             this.element.tabIndex = 0;
             this.containerHover = this.disposables.add(
-                this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), this.element, ( localize(10599, "Publisher ({0})", this.mcpServer.publisherDisplayName)))
+                this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), this.element, ( localize(10664, "Publisher ({0})", this.mcpServer.publisherDisplayName)))
             );
             append(this.element, publisherDisplayName);
             if (this.mcpServer.gallery?.publisherDomain?.verified) {
@@ -176,7 +176,7 @@ let PublisherWidget = class PublisherWidget extends McpServerWidget {
                 verifiedPublisher.tabIndex = 0;
                 verifiedPublisher.setAttribute("role", "button");
                 this.containerHover.update(( localize(
-                    10600,
+                    10665,
                     "This publisher has verified ownership of {0}",
                     this.mcpServer.gallery?.publisherDomain.link
                 )));
@@ -325,12 +325,12 @@ let McpServerHoverWidget = class McpServerHoverWidget extends McpServerWidget {
         let addSeparator = false;
         if (this.mcpServer.local?.scope === LocalMcpServerScope.Workspace) {
             markdown.appendMarkdown(`$(${mcpServerWorkspaceIcon.id}) `);
-            markdown.appendMarkdown(( localize(10601, "Workspace MCP Server")));
+            markdown.appendMarkdown(( localize(10666, "Workspace MCP Server")));
             addSeparator = true;
         }
         if (this.mcpServer.local?.scope === LocalMcpServerScope.RemoteUser) {
             markdown.appendMarkdown(`$(${mcpServerRemoteIcon.id}) `);
-            markdown.appendMarkdown(( localize(10602, "Remote MCP Server")));
+            markdown.appendMarkdown(( localize(10667, "Remote MCP Server")));
             addSeparator = true;
         }
         if (this.mcpServer.installState === McpServerInstallState.Installed) {
@@ -448,7 +448,7 @@ const mcpStarredIconColor = registerColor("mcpIcon.starForeground", {
     dark: "#FF8E00",
     hcDark: "#FF8E00",
     hcLight: textLinkForeground
-}, ( localize(10603, "The icon color for mcp starred.")), false);
+}, ( localize(10668, "The icon color for mcp starred.")), false);
 registerThemingParticipant((theme, collector) => {
     const mcpStarredIconColorValue = theme.getColor(mcpStarredIconColor);
     if (mcpStarredIconColorValue) {

package/vscode/src/vs/workbench/contrib/mcp/common/mcpConfiguration.js

@@ -24,16 +24,16 @@ const allDiscoverySources = ( Object.keys({
     [DiscoverySource.CursorWorkspace]: true
 }));
 const discoverySourceLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(10629, "Claude Desktop")),
-    [DiscoverySource.Windsurf]: ( localize(10630, "Windsurf")),
-    [DiscoverySource.CursorGlobal]: ( localize(10631, "Cursor (Global)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(10632, "Cursor (Workspace)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(10694, "Claude Desktop")),
+    [DiscoverySource.Windsurf]: ( localize(10695, "Windsurf")),
+    [DiscoverySource.CursorGlobal]: ( localize(10696, "Cursor (Global)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(10697, "Cursor (Workspace)"))
 };
 const discoverySourceSettingsLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(10633, "Claude Desktop configuration (`claude_desktop_config.json`)")),
-    [DiscoverySource.Windsurf]: ( localize(10634, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
-    [DiscoverySource.CursorGlobal]: ( localize(10635, "Cursor global configuration (`~/.cursor/mcp.json`)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(10636, "Cursor workspace configuration (`.cursor/mcp.json`)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(10698, "Claude Desktop configuration (`claude_desktop_config.json`)")),
+    [DiscoverySource.Windsurf]: ( localize(10699, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
+    [DiscoverySource.CursorGlobal]: ( localize(10700, "Cursor global configuration (`~/.cursor/mcp.json`)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(10701, "Cursor workspace configuration (`.cursor/mcp.json`)"))
 };
 const mcpConfigurationSection = "mcp";
 const mcpDiscoverySection = "chat.mcp.discovery.enabled";
@@ -55,7 +55,7 @@ const mcpDevModeProps = stdio => ({
     dev: {
         type: "object",
         markdownDescription: ( localize(
-            10637,
+            10702,
             "Enabled development mode for the server. When present, the server will be started eagerly and output will be included in its output. Properties inside the `dev` object can configure additional behavior."
         )),
         examples: [{
@@ -67,7 +67,7 @@ const mcpDevModeProps = stdio => ({
         properties: {
             watch: {
                 description: ( localize(
-                    10638,
+                    10703,
                     "A glob pattern or list of glob patterns relative to the workspace folder to watch. The MCP server will be restarted when these files change."
                 )),
                 examples: ["src/**/*.ts"],
@@ -83,7 +83,7 @@ const mcpDevModeProps = stdio => ({
             ...(stdio && {
                 debug: {
                     markdownDescription: ( localize(
-                        10639,
+                        10704,
                         "If set, debugs the MCP server using the given runtime as it's started."
                     )),
                     oneOf: [{
@@ -93,7 +93,7 @@ const mcpDevModeProps = stdio => ({
                             type: {
                                 type: "string",
                                 enum: ["node"],
-                                description: ( localize(10640, "Debug the MCP server using Node.js."))
+                                description: ( localize(10705, "Debug the MCP server using Node.js."))
                             }
                         },
                         additionalProperties: false
@@ -104,11 +104,11 @@ const mcpDevModeProps = stdio => ({
                             type: {
                                 type: "string",
                                 enum: ["debugpy"],
-                                description: ( localize(10641, "Debug the MCP server using Python and debugpy."))
+                                description: ( localize(10706, "Debug the MCP server using Python and debugpy."))
                             },
                             debugpyPath: {
                                 type: "string",
-                                description: ( localize(10642, "Path to the debugpy executable."))
+                                description: ( localize(10707, "Path to the debugpy executable."))
                             }
                         },
                         additionalProperties: false
@@ -126,39 +126,39 @@ const mcpStdioServerSchema = {
         type: {
             type: "string",
             enum: ["stdio"],
-            description: ( localize(10643, "The type of the server."))
+            description: ( localize(10708, "The type of the server."))
         },
         sandboxEnabled: {
             type: "boolean",
             default: false,
-            description: ( localize(10644, "Whether to run the server in a sandboxed environment."))
+            description: ( localize(10709, "Whether to run the server in a sandboxed environment."))
         },
         command: {
             type: "string",
-            description: ( localize(10645, "The command to run the server."))
+            description: ( localize(10710, "The command to run the server."))
         },
         cwd: {
             type: "string",
             description: ( localize(
-                10646,
+                10711,
                 "The working directory for the server command. Defaults to the workspace folder when run in a workspace."
             )),
             examples: ["${workspaceFolder}"]
         },
         args: {
             type: "array",
-            description: ( localize(10647, "Arguments passed to the server.")),
+            description: ( localize(10712, "Arguments passed to the server.")),
             items: {
                 type: "string"
             }
         },
         envFile: {
             type: "string",
-            description: ( localize(10648, "Path to a file containing environment variables for the server.")),
+            description: ( localize(10713, "Path to a file containing environment variables for the server.")),
             examples: ["${workspaceFolder}/.env"]
         },
         env: {
-            description: ( localize(10649, "Environment variables passed to the server.")),
+            description: ( localize(10714, "Environment variables passed to the server.")),
             additionalProperties: {
                 anyOf: [{
                     type: "null"
@@ -175,27 +175,27 @@ const mcpStdioServerSchema = {
 const mcpServerSchema = {
     id: mcpSchemaId,
     type: "object",
-    title: ( localize(10650, "Model Context Protocol Servers")),
+    title: ( localize(10715, "Model Context Protocol Servers")),
     allowTrailingCommas: true,
     allowComments: true,
     additionalProperties: false,
     properties: {
         sandbox: {
             description: ( localize(
-                10651,
+                10716,
                 "Sandbox config that determines file system and network access. Sandboxing is enabled when sandboxEnabled property is set at the server level on Mac OS and Linux only."
             )),
             type: "object",
             additionalProperties: false,
             properties: {
                 network: {
-                    description: ( localize(10652, "Network access settings for the sandboxed server.")),
+                    description: ( localize(10717, "Network access settings for the sandboxed server.")),
                     type: "object",
                     additionalProperties: false,
                     properties: {
                         allowedDomains: {
                             description: ( localize(
-                                10653,
+                                10718,
                                 "List of domains that the server is allowed to access. Wildcards are supported, e.g. `*.example.com`."
                             )),
                             type: "array",
@@ -206,7 +206,7 @@ const mcpServerSchema = {
                         },
                         deniedDomains: {
                             description: ( localize(
-                                10654,
+                                10719,
                                 "List of domains that the server is not allowed to access. e.g. `invalid.example.com`."
                             )),
                             type: "array",
@@ -219,7 +219,7 @@ const mcpServerSchema = {
                 },
                 filesystem: {
                     description: ( localize(
-                        10655,
+                        10720,
                         "Filesystem access settings for the sandboxed server. Glob patterns are supported for Mac OS only."
                     )),
                     type: "object",
@@ -227,7 +227,7 @@ const mcpServerSchema = {
                     properties: {
                         denyRead: {
                             description: ( localize(
-                                10656,
+                                10721,
                                 "List of file paths that the server is not allowed to read. By default, all files are allowed to be read. e.g. `~/src/secrets`."
                             )),
                             type: "array",
@@ -238,7 +238,7 @@ const mcpServerSchema = {
                         },
                         allowWrite: {
                             description: ( localize(
-                                10657,
+                                10722,
                                 "List of file paths that the server is allowed to write to. e.g. `~/src/`."
                             )),
                             type: "array",
@@ -249,7 +249,7 @@ const mcpServerSchema = {
                         },
                         denyWrite: {
                             description: ( localize(
-                                10658,
+                                10723,
                                 "List of file paths that the server is not allowed to write to. e.g. `~/src/auth/`."
                             )),
                             type: "array",
@@ -274,18 +274,18 @@ const mcpServerSchema = {
                         type: {
                             type: "string",
                             enum: ["http", "sse"],
-                            description: ( localize(10643, "The type of the server."))
+                            description: ( localize(10708, "The type of the server."))
                         },
                         url: {
                             type: "string",
                             format: "uri",
                             pattern: "^https?:\\/\\/.+",
-                            patternErrorMessage: ( localize(10659, "The URL must start with 'http://' or 'https://'.")),
-                            description: ( localize(10660, "The URL of the Streamable HTTP or SSE endpoint."))
+                            patternErrorMessage: ( localize(10724, "The URL must start with 'http://' or 'https://'.")),
+                            description: ( localize(10725, "The URL of the Streamable HTTP or SSE endpoint."))
                         },
                         headers: {
                             type: "object",
-                            description: ( localize(10661, "Additional headers sent to the server.")),
+                            description: ( localize(10726, "Additional headers sent to the server.")),
                             additionalProperties: {
                                 type: "string"
                             }
@@ -309,7 +309,7 @@ const mcpContributionPoint = {
     },
     jsonSchema: {
         description: ( localize(
-            10662,
+            10727,
             "Contributes Model Context Protocol servers. Users of this should also use `vscode.lm.registerMcpServerDefinitionProvider`."
         )),
         type: "array",
@@ -330,15 +330,15 @@ const mcpContributionPoint = {
             }],
             properties: {
                 id: {
-                    description: ( localize(10663, "Unique ID for the collection.")),
+                    description: ( localize(10728, "Unique ID for the collection.")),
                     type: "string"
                 },
                 label: {
-                    description: ( localize(10664, "Display name for the collection.")),
+                    description: ( localize(10729, "Display name for the collection.")),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(10665, "Condition which must be true to enable this collection.")),
+                    description: ( localize(10730, "Condition which must be true to enable this collection.")),
                     type: "string"
                 }
             }
@@ -355,7 +355,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
     }
     render(manifest) {
         const mcpServerDefinitionProviders = manifest.contributes?.mcpServerDefinitionProviders ?? [];
-        const headers = [( localize(10666, "ID")), ( localize(10667, "Name"))];
+        const headers = [( localize(10731, "ID")), ( localize(10732, "Name"))];
         const rows = ( mcpServerDefinitionProviders.map(mcpServerDefinitionProvider => {
             return [( new MarkdownString()).appendMarkdown(`\`${mcpServerDefinitionProvider.id}\``), mcpServerDefinitionProvider.label];
         }));
@@ -370,7 +370,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: mcpConfigurationSection,
-    label: ( localize(10668, "MCP Servers")),
+    label: ( localize(10733, "MCP Servers")),
     access: {
         canToggle: false
     },

package/vscode/src/vs/workbench/contrib/mcp/common/mcpServer.js

@@ -538,7 +538,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         if (cnx.definition.sandboxEnabled) {
             if (!this.showSandboxConfigSuggestionFromPotentialBlocks(cnx, this._potentialSandboxBlocks)) {
                 this._notificationService.warn(( localize(
-                    10705,
+                    10770,
                     "The MCP server {0} could not be started: {1}",
                     cnx.definition.label,
                     error.message
@@ -563,36 +563,36 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 break;
             }
             const options = [{
-                label: ( localize(10706, "Show Output")),
+                label: ( localize(10771, "Show Output")),
                 run: () => this.showOutput()
             }];
             if (cnx.definition.devMode?.debug?.type === "debugpy" && debug) {
                 this._notificationService.prompt(Severity$1.Error, ( localize(
-                    10707,
+                    10772,
                     "The command \"{0}\" was not found. You can specify the path to debugpy in the `dev.debug.debugpyPath` option.",
                     cnx.launchDefinition.command,
                     cnx.definition.label
                 )), [...options, {
-                    label: ( localize(10708, "View Docs")),
+                    label: ( localize(10773, "View Docs")),
                     run: () => this._openerService.open(( URI.parse("https://aka.ms/vscode-mcp-install/debugpy")))
                 }]);
                 return;
             }
             if (docsLink) {
                 options.push({
-                    label: ( localize(10709, "Install {0}", cnx.launchDefinition.command)),
+                    label: ( localize(10774, "Install {0}", cnx.launchDefinition.command)),
                     run: () => this._openerService.open(( URI.parse(docsLink)))
                 });
             }
             this._notificationService.prompt(Severity$1.Error, ( localize(
-                10710,
+                10775,
                 "The command \"{0}\" needed to run {1} was not found.",
                 cnx.launchDefinition.command,
                 cnx.definition.label
             )), options);
         } else {
             this._notificationService.warn(( localize(
-                10705,
+                10770,
                 "The MCP server {0} could not be started: {1}",
                 cnx.definition.label,
                 error.message
@@ -622,20 +622,20 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         void this._dialogService.confirm({
             type: "warning",
             message: ( localize(
-                10711,
+                10776,
                 "Update sandbox configuration in mcp.json for {0}?",
                 cnx.definition.label
             )),
             detail: suggestion.message,
-            primaryButton: ( localize(10712, "Yes")),
-            cancelButton: ( localize(10713, "No"))
+            primaryButton: ( localize(10777, "Yes")),
+            cancelButton: ( localize(10778, "No"))
         }).then(async result => {
             if (!result.confirmed) {
                 return;
             }
             if (!mcpResource || configTarget === undefined) {
                 this._notificationService.warn(( localize(
-                    10714,
+                    10779,
                     "Couldn't determine where to update sandbox configuration for {0}.",
                     cnx.definition.label
                 )));
@@ -652,14 +652,14 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 if (updated) {
                     this._removePotentialSandboxBlocks(potentialBlocks);
                     this._notificationService.info(( localize(
-                        10715,
+                        10780,
                         "Updated sandbox configuration for {0} in mcp.json. Restart server.",
                         cnx.definition.label
                     )));
                 }
             } catch (e) {
                 this._notificationService.error(( localize(
-                    10716,
+                    10781,
                     "Failed to update sandbox configuration for {0}: {1}",
                     cnx.definition.label,
                     e instanceof Error ? e.message : String(e)
@@ -768,7 +768,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         const validated = [];
         for (const [i, result] of validations.entries()) {
             if ("error" in result) {
-                error += ( localize(10717, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
+                error += ( localize(10782, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
                 for (const message of result.error) {
                     error += `\t- ${message}\n`;
                 }
@@ -1095,7 +1095,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
         notificationService.notify({
             severity: Severity$1.Warning,
             message: ( localize(
-                10718,
+                10783,
                 "MCP server `{0}` has tools with invalid parameters which will be omitted.",
                 serverName
             )),
@@ -1105,7 +1105,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
                     enabled: true,
                     id: "mcpBadSchema.show",
                     tooltip: "",
-                    label: ( localize(10719, "Show")),
+                    label: ( localize(10784, "Show")),
                     run: () => {
                         editorService.openEditor({
                             resource: undefined,

package/vscode/src/vs/workbench/contrib/mcp/common/mcpTypes.js

@@ -182,13 +182,13 @@ var McpConnectionState;
     McpConnectionState.toString = s => {
         switch (s.state) {
         case Kind.Stopped:
-            return localize(10723, "Stopped");
+            return localize(10788, "Stopped");
         case Kind.Starting:
-            return localize(10724, "Starting");
+            return localize(10789, "Starting");
         case Kind.Running:
-            return localize(10725, "Running");
+            return localize(10790, "Running");
         case Kind.Error:
-            return localize(10726, "Error {0}", s.message);
+            return localize(10791, "Error {0}", s.message);
         default:
             assertNever();
         }

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

@@ -106,7 +106,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return localize(10772, "Merging: {0}", super.getName());
+        return localize(10837, "Merging: {0}", super.getName());
     }
     async resolve() {
         if (!this._inputModel) {
@@ -190,13 +190,13 @@ MergeEditorInput = MergeEditorInput_1 = ( __decorate([( __param(4, IInstantiatio
 function alertFocusedEditor(editor) {
     switch (editor) {
     case "input1":
-        alert(( localize(10773, "Incoming, Left Input")));
+        alert(( localize(10838, "Incoming, Left Input")));
         break;
     case "input2":
-        alert(( localize(10774, "Current, Right Input")));
+        alert(( localize(10839, "Current, Right Input")));
         break;
     case "result":
-        alert(( localize(10775, "Merge Result")));
+        alert(( localize(10840, "Merge Result")));
         break;
     }
 }

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

@@ -134,32 +134,32 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
         if (someDirty) {
             const isMany = inputModels.length > 1;
             const message = isMany ? ( localize(
-                10776,
+                10841,
                 "Do you want keep the merge result of {0} files?",
                 inputModels.length
             )) : ( localize(
-                10777,
+                10842,
                 "Do you want keep the merge result of {0}?",
                 basename(inputModels[0].model.resultTextModel.uri)
             ));
             const hasUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
             const buttons = [{
-                label: hasUnhandledConflicts ? ( localize(10778, "&&Save With Conflicts")) : ( localize(10779, "&&Save")),
+                label: hasUnhandledConflicts ? ( localize(10843, "&&Save With Conflicts")) : ( localize(10844, "&&Save")),
                 run: () => ConfirmResult.SAVE
             }, {
-                label: ( localize(10780, "Do&&n't Save")),
+                label: ( localize(10845, "Do&&n't Save")),
                 run: () => ConfirmResult.DONT_SAVE
             }];
             choice = (await this.dialogService.prompt({
                 type: Severity$1.Info,
                 message,
                 detail: hasUnhandledConflicts ? isMany ? ( localize(
-                    10781,
+                    10846,
                     "The files contain unhandled conflicts. The merge results will be lost if you don't save them."
                 )) : ( localize(
-                    10782,
+                    10847,
                     "The file contains unhandled conflicts. The merge result will be lost if you don't save it."
-                )) : isMany ? ( localize(10783, "The merge results will be lost if you don't save them.")) : ( localize(10784, "The merge result will be lost if you don't save it.")),
+                )) : isMany ? ( localize(10848, "The merge results will be lost if you don't save them.")) : ( localize(10849, "The merge result will be lost if you don't save it.")),
                 buttons,
                 cancelButton: {
                     run: () => ConfirmResult.CANCEL
@@ -184,12 +184,12 @@ let TempFileMergeEditorInputModel = class TempFileMergeEditorInputModel extends
             const {
                 confirmed
             } = await this.dialogService.confirm({
-                message: ( localize(10785, "Do you want to accept the merge result?")),
+                message: ( localize(10850, "Do you want to accept the merge result?")),
                 detail: ( localize(
-                    10786,
+                    10851,
                     "This will write the merge result to the original file and close the merge editor."
                 )),
-                primaryButton: ( localize(10787, "&&Accept Merge"))
+                primaryButton: ( localize(10852, "&&Accept Merge"))
             });
             if (confirmed) {
                 await this.accept();
@@ -221,7 +221,7 @@ let WorkspaceMergeEditorModeFactory = class WorkspaceMergeEditorModeFactory {
         this._languageService = _languageService;
     }
     static {
-        this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource("merge-editor.source", ( localize(10788, "Before Resolving Conflicts In Merge Editor")));
+        this.FILE_SAVED_SOURCE = SaveSourceRegistry.registerSource("merge-editor.source", ( localize(10853, "Before Resolving Conflicts In Merge Editor")));
     }
     async createInputModel(args) {
         const store = ( new DisposableStore());
@@ -356,11 +356,11 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
         const someUnhandledConflicts = ( inputModels.some(m => m.model.hasUnhandledConflicts.get()));
         if (someDirty) {
             const message = isMany ? ( localize(
-                10789,
+                10854,
                 "Do you want to save the changes you made to {0} files?",
                 inputModels.length
             )) : ( localize(
-                10790,
+                10855,
                 "Do you want to save the changes you made to {0}?",
                 basename(inputModels[0].resultUri)
             ));
@@ -370,17 +370,17 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 type: Severity$1.Info,
                 message,
                 detail: someUnhandledConflicts ? isMany ? ( localize(
-                    10791,
+                    10856,
                     "The files contain unhandled conflicts. Your changes will be lost if you don't save them."
                 )) : ( localize(
-                    10792,
+                    10857,
                     "The file contains unhandled conflicts. Your changes will be lost if you don't save them."
-                )) : isMany ? ( localize(10793, "Your changes will be lost if you don't save them.")) : ( localize(10794, "Your changes will be lost if you don't save them.")),
+                )) : isMany ? ( localize(10858, "Your changes will be lost if you don't save them.")) : ( localize(10859, "Your changes will be lost if you don't save them.")),
                 buttons: [{
-                    label: someUnhandledConflicts ? ( localize(10795, "&&Save with Conflicts")) : ( localize(10796, "&&Save")),
+                    label: someUnhandledConflicts ? ( localize(10860, "&&Save with Conflicts")) : ( localize(10861, "&&Save")),
                     run: () => ConfirmResult.SAVE
                 }, {
-                    label: ( localize(10797, "Do&&n't Save")),
+                    label: ( localize(10862, "Do&&n't Save")),
                     run: () => ConfirmResult.DONT_SAVE
                 }],
                 cancelButton: {
@@ -393,15 +393,15 @@ let WorkspaceMergeEditorInputModel = class WorkspaceMergeEditorInputModel extend
                 confirmed,
                 checkboxChecked
             } = await this._dialogService.confirm({
-                message: isMany ? ( localize(10798, "Do you want to close {0} merge editors?", inputModels.length)) : ( localize(
-                    10799,
+                message: isMany ? ( localize(10863, "Do you want to close {0} merge editors?", inputModels.length)) : ( localize(
+                    10864,
                     "Do you want to close the merge editor for {0}?",
                     basename(inputModels[0].resultUri)
                 )),
-                detail: someUnhandledConflicts ? isMany ? ( localize(10800, "The files contain unhandled conflicts.")) : ( localize(10801, "The file contains unhandled conflicts.")) : undefined,
-                primaryButton: someUnhandledConflicts ? ( localize(10802, "&&Close with Conflicts")) : ( localize(10803, "&&Close")),
+                detail: someUnhandledConflicts ? isMany ? ( localize(10865, "The files contain unhandled conflicts.")) : ( localize(10866, "The file contains unhandled conflicts.")) : undefined,
+                primaryButton: someUnhandledConflicts ? ( localize(10867, "&&Close with Conflicts")) : ( localize(10868, "&&Close")),
                 checkbox: {
-                    label: ( localize(10804, "Do not ask me again"))
+                    label: ( localize(10869, "Do not ask me again"))
                 }
             });
             if (checkboxChecked) {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel.js

@@ -403,7 +403,7 @@ let MergeEditorModel = class MergeEditorModel extends EditorModel {
             type: UndoRedoElementType.Resource,
             resource: this.resultTextModel.uri,
             code: "setInputHandled",
-            label: ( localize(10805, "Set Input Handled")),
+            label: ( localize(10870, "Set Input Handled")),
             redo() {
                 const model = modelRef.deref();
                 const data = dataRef.deref();
@@ -628,7 +628,7 @@ class MarkAsHandledUndoRedoElement {
         this.input1Handled = input1Handled;
         this.input2Handled = input2Handled;
         this.code = "undoMarkAsHandled";
-        this.label = ( localize(10806, "Undo Mark As Handled"));
+        this.label = ( localize(10871, "Undo Mark As Handled"));
         this.type = UndoRedoElementType.Resource;
     }
     redo() {