@codingame/monaco-vscode-api 10.0.1 → 10.1.0

package/vscode/src/vs/workbench/contrib/files/browser/views/explorerView.js

@@ -50,6 +50,7 @@ import { basename, relativePath } from '../../../../../base/common/resources.js'
 import { IFilesConfigurationService } from '../../../../services/filesConfiguration/common/filesConfigurationService.service.js';
 import { getExcludes } from '../../../../services/search/common/search.js';
 import { ISearchService } from '../../../../services/search/common/search.service.js';
+import { Schemas } from '../../../../../base/common/network.js';
 var ExplorerView_1;
 function hasExpandedRootChild(tree, treeInput) {
     for (const folder of treeInput) {
@@ -134,7 +135,7 @@ let ExplorerFindProvider = class ExplorerFindProvider {
         this.progressService = progressService;
         this.explorerService = explorerService;
         this.toggles = [explorerFuzzyMatch];
-        this.placeholder = ( localize(10187, "Type to search files"));
+        this.placeholder = ( localize(10186, "Type to search files"));
     }
     async *getFindResults(pattern, sessionId, token, toggleStates) {
         const isFuzzyMatch = toggleStates.find(t => t.id === explorerFuzzyMatch.id)?.isChecked;
@@ -291,7 +292,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
         const setHeader = () => {
             titleElement.textContent = this.name;
             this.updateTitle(this.name);
-            this.ariaHeaderLabel = ( localize(10188, "Explorer Section: {0}", this.name));
+            this.ariaHeaderLabel = ( localize(10187, "Explorer Section: {0}", this.name));
             titleElement.setAttribute('aria-label', this.ariaHeaderLabel);
         };
         this._register(this.contextService.onDidChangeWorkspaceName(setHeader));
@@ -417,6 +418,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
         this._register(createFileIconThemableTreeContainerScope(container, this.themeService));
         const isCompressionEnabled = () => this.configurationService.getValue('explorer.compactFolders');
         const getFileNestingSettings = (item) => this.configurationService.getValue({ resource: item?.root.resource }).explorer.fileNesting;
+        const rootsSupportFindProvider = this.explorerService.roots.every(root => root.resource.scheme === Schemas.file || root.resource.scheme === Schemas.vscodeRemote);
         this.tree = this.instantiationService.createInstance(WorkbenchCompressibleAsyncDataTree, 'FileExplorer', container, ( (new ExplorerDelegate())), ( (new ExplorerCompressionDelegate())), [this.renderer], this.instantiationService.createInstance(ExplorerDataSource, this.filter), {
             compressionEnabled: isCompressionEnabled(),
             accessibilityProvider: this.renderer,
@@ -461,7 +463,7 @@ let ExplorerView = class ExplorerView extends ViewPane {
             },
             paddingBottom: ExplorerDelegate.ITEM_HEIGHT,
             overrideStyles: this.getLocationBasedColors().listOverrideStyles,
-            findResultsProvider: this.instantiationService.createInstance(ExplorerFindProvider),
+            findResultsProvider: rootsSupportFindProvider ? this.instantiationService.createInstance(ExplorerFindProvider) : undefined,
         });
         this._register(this.tree);
         this._register(this.themeService.onDidColorThemeChange(() => this.tree.rerender()));
@@ -882,7 +884,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.createFileFromExplorer',
-            title: ( localize(10189, "New File...")),
+            title: ( localize(10188, "New File...")),
             f1: false,
             icon: Codicon.newFile,
             precondition: ExplorerResourceNotReadonlyContext,
@@ -903,7 +905,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.createFolderFromExplorer',
-            title: ( localize(10190, "New Folder...")),
+            title: ( localize(10189, "New Folder...")),
             f1: false,
             icon: Codicon.newFolder,
             precondition: ExplorerResourceNotReadonlyContext,
@@ -924,7 +926,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.refreshFilesExplorer',
-            title: ( localize2(10191, "Refresh Explorer")),
+            title: ( localize2(10190, "Refresh Explorer")),
             f1: true,
             icon: Codicon.refresh,
             menu: {
@@ -934,7 +936,7 @@ registerAction2(class extends Action2 {
                 order: 30
             },
             metadata: {
-                description: ( localize2(10192, "Forces a refresh of the Explorer."))
+                description: ( localize2(10191, "Forces a refresh of the Explorer."))
             }
         });
     }
@@ -949,7 +951,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.files.action.collapseExplorerFolders',
-            title: ( localize2(10193, "Collapse Folders in Explorer")),
+            title: ( localize2(10192, "Collapse Folders in Explorer")),
             f1: true,
             icon: Codicon.collapseAll,
             menu: {
@@ -959,7 +961,7 @@ registerAction2(class extends Action2 {
                 order: 40
             },
             metadata: {
-                description: ( localize2(10194, "Folds all folders in the Explorer."))
+                description: ( localize2(10193, "Folds all folders in the Explorer."))
             }
         });
     }

package/vscode/src/vs/workbench/contrib/files/browser/workspaceWatcher.js

@@ -58,10 +58,10 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
         if (msg.indexOf('ENOSPC') >= 0) {
             reason = 'ENOSPC';
             this.notificationService.prompt(Severity$1.Warning, ( localize(
-                9887,
+                9895,
                 "Unable to watch for file changes. Please follow the instructions link to resolve this issue."
             )), [{
-                    label: ( localize(9888, "Instructions")),
+                    label: ( localize(9896, "Instructions")),
                     run: () => this.openerService.open(( (URI.parse('https://go.microsoft.com/fwlink/?linkid=867693'))))
                 }], {
                 sticky: true,
@@ -71,10 +71,10 @@ let WorkspaceWatcher = class WorkspaceWatcher extends Disposable {
         else if (msg.indexOf('EUNKNOWN') >= 0) {
             reason = 'EUNKNOWN';
             this.notificationService.prompt(Severity$1.Warning, ( localize(
-                9889,
+                9897,
                 "File changes watcher stopped unexpectedly. A reload of the window may enable the watcher again unless the workspace cannot be watched for file changes."
             )), [{
-                    label: ( localize(9890, "Reload")),
+                    label: ( localize(9898, "Reload")),
                     run: () => this.hostService.reload()
                 }], {
                 sticky: true,

package/vscode/src/vs/workbench/contrib/files/common/dirtyFilesIndicator.js

@@ -34,7 +34,7 @@ let DirtyFilesIndicator = class DirtyFilesIndicator extends Disposable {
         const dirtyCount = this.lastKnownDirtyCount = this.workingCopyService.dirtyCount;
         if (dirtyCount > 0) {
             this.badgeHandle.value = this.activityService.showViewContainerActivity(VIEWLET_ID, {
-                badge: ( (new NumberBadge(dirtyCount, num => num === 1 ? ( localize(9891, "1 unsaved file")) : ( localize(9892, "{0} unsaved files", dirtyCount))))),
+                badge: ( (new NumberBadge(dirtyCount, num => num === 1 ? ( localize(9899, "1 unsaved file")) : ( localize(9900, "{0} unsaved files", dirtyCount))))),
             });
         }
         else {

package/vscode/src/vs/workbench/contrib/folding/browser/folding.contribution.js

@@ -29,8 +29,8 @@ let DefaultFoldingRangeProvider = class DefaultFoldingRangeProvider extends Disp
         DefaultFoldingRangeProvider_1.extensionItemLabels.length = 0;
         DefaultFoldingRangeProvider_1.extensionDescriptions.length = 0;
         DefaultFoldingRangeProvider_1.extensionIds.push(null);
-        DefaultFoldingRangeProvider_1.extensionItemLabels.push(( localize(665, 'All')));
-        DefaultFoldingRangeProvider_1.extensionDescriptions.push(( localize(666, "All active folding range providers")));
+        DefaultFoldingRangeProvider_1.extensionItemLabels.push(( localize(792, 'All')));
+        DefaultFoldingRangeProvider_1.extensionDescriptions.push(( localize(793, "All active folding range providers")));
         const languageExtensions = [];
         const otherExtensions = [];
         for (const extension of this._extensionService.extensions) {
@@ -72,7 +72,7 @@ DefaultFoldingRangeProvider = DefaultFoldingRangeProvider_1 = ( (__decorate([
     properties: {
         [DefaultFoldingRangeProvider.configName]: {
             description: ( localize(
-                667,
+                794,
                 "Defines a default folding range provider that takes precedence over all other folding range providers. Must be the identifier of an extension contributing a folding range provider."
             )),
             type: ['string', 'null'],

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsMultiple.js

@@ -78,8 +78,8 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         DefaultFormatter_1.extensionItemLabels.length = 0;
         DefaultFormatter_1.extensionDescriptions.length = 0;
         DefaultFormatter_1.extensionIds.push(null);
-        DefaultFormatter_1.extensionItemLabels.push(( localize(4505, 'None')));
-        DefaultFormatter_1.extensionDescriptions.push(( localize(4506, "None")));
+        DefaultFormatter_1.extensionItemLabels.push(( localize(4594, 'None')));
+        DefaultFormatter_1.extensionDescriptions.push(( localize(4595, "None")));
         for (const extension of extensions) {
             if (extension.main || extension.browser) {
                 DefaultFormatter_1.extensionIds.push(extension.identifier.value);
@@ -106,13 +106,13 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
                 const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
                 const detail = kind === 1
                     ? ( localize(
-                    4507,
+                    4596,
                     "Extension '{0}' is configured as formatter but it cannot format '{1}'-files",
                     extension.displayName || extension.name,
                     langName
                 ))
                     : ( localize(
-                    4508,
+                    4597,
                     "Extension '{0}' is configured as formatter but it can only format '{1}'-files as a whole, not selections or parts of it.",
                     extension.displayName || extension.name,
                     langName
@@ -126,12 +126,12 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
         const message = !defaultFormatterId
             ? ( localize(
-            4509,
+            4598,
             "There are multiple formatters for '{0}' files. One of them should be configured as default formatter.",
             DefaultFormatter_1._maybeQuotes(langName)
         ))
             : ( localize(
-            4510,
+            4599,
             "Extension '{0}' is configured as formatter but not available. Select a different default formatter to continue.",
             defaultFormatterId
         ));
@@ -144,16 +144,16 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         }
         if (mode !== 2 ) {
             const { confirmed } = await this._dialogService.confirm({
-                message: ( localize(4511, "Configure Default Formatter")),
+                message: ( localize(4600, "Configure Default Formatter")),
                 detail: formatterOrMessage,
-                primaryButton: ( localize(4512, "&&Configure..."))
+                primaryButton: ( localize(4601, "&&Configure..."))
             });
             if (confirmed) {
                 return this._pickAndPersistDefaultFormatter(formatter, document);
             }
         }
         else {
-            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(4513, "Configure...")), run: () => this._pickAndPersistDefaultFormatter(formatter, document) }], { priority: NotificationPriority.SILENT });
+            this._notificationService.prompt(Severity$1.Info, formatterOrMessage, [{ label: ( localize(4602, "Configure...")), run: () => this._pickAndPersistDefaultFormatter(formatter, document) }], { priority: NotificationPriority.SILENT });
         }
         return undefined;
     }
@@ -167,7 +167,7 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
         })));
         const langName = this._languageService.getLanguageName(document.getLanguageId()) || document.getLanguageId();
         const pick = await this._quickInputService.pick(picks, { placeHolder: ( localize(
-            4514,
+            4603,
             "Select a default formatter for '{0}' files",
             DefaultFormatter_1._maybeQuotes(langName)
         )) });
@@ -200,14 +200,14 @@ let DefaultFormatter = class DefaultFormatter extends Disposable {
             if (typeof result !== 'string') {
                 return;
             }
-            const command = { id: `formatter/configure/dfl/${generateUuid()}`, title: ( localize(4515, "Configure...")) };
+            const command = { id: `formatter/configure/dfl/${generateUuid()}`, title: ( localize(4604, "Configure...")) };
             this._languageStatusStore.add(CommandsRegistry.registerCommand(command.id, () => this._pickAndPersistDefaultFormatter(formatter, document)));
             this._languageStatusStore.add(this._languageStatusService.addStatus({
                 id: 'formatter.conflict',
-                name: ( localize(4516, "Formatter Conflicts")),
+                name: ( localize(4605, "Formatter Conflicts")),
                 selector: { language: document.getLanguageId(), pattern: document.uri.fsPath },
                 severity: Severity$1.Error,
-                label: ( localize(4517, "Formatting")),
+                label: ( localize(4606, "Formatting")),
                 detail: result,
                 busy: false,
                 source: '',
@@ -235,7 +235,7 @@ DefaultFormatter = DefaultFormatter_1 = ( (__decorate([
     properties: {
         [DefaultFormatter.configName]: {
             description: ( localize(
-                4518,
+                4607,
                 "Defines a default formatter which takes precedence over all other formatter settings. Must be the identifier of an extension contributing a formatter."
             )),
             type: ['string', 'null'],
@@ -268,7 +268,7 @@ async function showFormatterPick(accessor, model, formatters) {
         const pick = {
             index,
             label: provider.displayName || '',
-            description: isDefault ? ( localize(4519, "(default)")) : undefined,
+            description: isDefault ? ( localize(4608, "(default)")) : undefined,
         };
         if (isDefault) {
             defaultFormatterPick = pick;
@@ -276,10 +276,10 @@ async function showFormatterPick(accessor, model, formatters) {
         return pick;
     })));
     const configurePick = {
-        label: ( localize(4520, "Configure Default Formatter..."))
+        label: ( localize(4609, "Configure Default Formatter..."))
     };
     const pick = await quickPickService.pick([...picks, { type: 'separator' }, configurePick], {
-        placeHolder: ( localize(4521, "Select a formatter")),
+        placeHolder: ( localize(4610, "Select a formatter")),
         activeItem: defaultFormatterPick
     });
     if (!pick) {
@@ -288,7 +288,7 @@ async function showFormatterPick(accessor, model, formatters) {
     else if (pick === configurePick) {
         const langName = languageService.getLanguageName(model.getLanguageId()) || model.getLanguageId();
         const pick = await quickPickService.pick(picks, { placeHolder: ( localize(
-            4514,
+            4603,
             "Select a default formatter for '{0}' files",
             DefaultFormatter._maybeQuotes(langName)
         )) });
@@ -305,7 +305,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument.multiple',
-            label: ( localize(4522, "Format Document With...")),
+            label: ( localize(4611, "Format Document With...")),
             alias: 'Format Document...',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -337,7 +337,7 @@ registerEditorAction(class FormatSelectionMultipleAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatSelection.multiple',
-            label: ( localize(4523, "Format Selection With...")),
+            label: ( localize(4612, "Format Selection With...")),
             alias: 'Format Code...',
             precondition: ( (ContextKeyExpr.and(
                  (ContextKeyExpr.and(EditorContextKeys.writable)),

package/vscode/src/vs/workbench/contrib/format/browser/formatActionsNone.js

@@ -11,7 +11,7 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatDocument.none',
-            label: ( localize(4524, "Format Document")),
+            label: ( localize(4613, "Format Document")),
             alias: 'Format Document',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,
@@ -43,14 +43,14 @@ registerEditorAction(class FormatDocumentMultipleAction extends EditorAction {
             return commandService.executeCommand('editor.action.formatDocument');
         }
         else if (model.isTooLargeForSyncing()) {
-            notificationService.warn(( localize(4525, "This file cannot be formatted because it is too large")));
+            notificationService.warn(( localize(4614, "This file cannot be formatted because it is too large")));
         }
         else {
             const langName = model.getLanguageId();
-            const message = ( localize(4526, "There is no formatter for '{0}' files installed.", langName));
+            const message = ( localize(4615, "There is no formatter for '{0}' files installed.", langName));
             const { confirmed } = await dialogService.confirm({
                 message,
-                primaryButton: ( localize(4527, "&&Install Formatter..."))
+                primaryButton: ( localize(4616, "&&Install Formatter..."))
             });
             if (confirmed) {
                 extensionsWorkbenchService.openSearch(`category:formatters ${langName}`);

package/vscode/src/vs/workbench/contrib/format/browser/formatModified.js

@@ -17,7 +17,7 @@ registerEditorAction(class FormatModifiedAction extends EditorAction {
     constructor() {
         super({
             id: 'editor.action.formatChanges',
-            label: ( localize(4498, "Format Modified Lines")),
+            label: ( localize(4593, "Format Modified Lines")),
             alias: 'Format Modified Lines',
             precondition: ( (ContextKeyExpr.and(
                 EditorContextKeys.writable,

package/vscode/src/vs/workbench/contrib/inlayHints/browser/inlayHintsAccessibilty.js

@@ -20,7 +20,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
     static { this.IsReading = ( (new RawContextKey(
         'isReadingLineWithInlayHints',
         false,
-        { type: 'boolean', description: ( localize(668, "Whether the current line and its inlay hints are currently focused")) }
+        { type: 'boolean', description: ( localize(788, "Whether the current line and its inlay hints are currently focused")) }
     ))); }
     static { this.ID = 'editor.contrib.InlayHintsAccessibility'; }
     static get(editor) {
@@ -35,7 +35,7 @@ let InlayHintsAccessibility = class InlayHintsAccessibility {
         this._ariaElement.style.position = 'fixed';
         this._ariaElement.className = 'inlayhint-accessibility-element';
         this._ariaElement.tabIndex = 0;
-        this._ariaElement.setAttribute('aria-description', ( localize(669, "Code with Inlay Hint Information")));
+        this._ariaElement.setAttribute('aria-description', ( localize(789, "Code with Inlay Hint Information")));
         this._ctxIsReading = InlayHintsAccessibility_1.IsReading.bindTo(contextKeyService);
     }
     dispose() {
@@ -135,7 +135,7 @@ registerAction2(class StartReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.startReadingLineWithHint',
-            title: ( localize2(670, "Read Line With Inline Hints")),
+            title: ( localize2(790, "Read Line With Inline Hints")),
             precondition: EditorContextKeys.hasInlayHintsProvider,
             f1: true
         });
@@ -149,7 +149,7 @@ registerAction2(class StopReadHints extends EditorAction2 {
     constructor() {
         super({
             id: 'inlayHints.stopReadingLineWithHint',
-            title: ( localize2(671, "Stop Inlay Hints Reading")),
+            title: ( localize2(791, "Stop Inlay Hints Reading")),
             precondition: InlayHintsAccessibility.IsReading,
             f1: true,
             keybinding: {

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

@@ -216,14 +216,14 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
             delete options.position;
         }
         const widgetPosition = this._showWidget(options.headless ?? session?.headless, true, initPosition);
-        let errorMessage = ( localize(5648, "Failed to start editor chat"));
+        let errorMessage = ( localize(5652, "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 === 32 ) {
                     options.autoSend = true;
-                    this._ui.value.widget.updateInfo(( localize(5649, "Getting ready...")));
+                    this._ui.value.widget.updateInfo(( localize(5653, "Getting ready...")));
                 }
                 else {
                     createSessionCts.cancel();
@@ -541,7 +541,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         let newPosition;
         if (response.result?.errorDetails) ;
         else if (response.response.value.length === 0) {
-            const status = ( localize(5650, "No results, please refine your input and try again"));
+            const status = ( localize(5654, "No results, please refine your input and try again"));
             this._ui.value.widget.updateStatus(status, { classes: ['warn'] });
         }
         else {
@@ -575,7 +575,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
             await this._strategy.apply();
         }
         catch (err) {
-            this._dialogService.error(( localize(5651, "Failed to apply changes.", toErrorMessage(err))));
+            this._dialogService.error(( localize(5655, "Failed to apply changes.", toErrorMessage(err))));
             this._log('FAILED to apply changes');
             this._log(err);
         }
@@ -595,7 +595,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
                 undoCancelEdits = this._strategy.cancel();
             }
             catch (err) {
-                this._dialogService.error(( localize(5652, "Failed to discard changes.", toErrorMessage(err))));
+                this._dialogService.error(( localize(5656, "Failed to discard changes.", toErrorMessage(err))));
                 this._log('FAILED to discard changes');
                 this._log(err);
             }
@@ -721,7 +721,7 @@ let InlineChatController = InlineChatController_1 = class InlineChatController {
         if (!this._session) {
             return;
         }
-        const status = ( localize(5653, "Accept or discard changes to continue saving."));
+        const status = ( localize(5657, "Accept or discard changes to continue saving."));
         this._ui.value.widget.updateStatus(status, { classes: ['warn'] });
         if (this._ui.value.position) {
             this._editor.revealLineInCenterIfOutsideViewport(this._ui.value.position.lineNumber);

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

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

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

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

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

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

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

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