@codingame/monaco-vscode-view-common-service-override 10.1.2 → 10.1.4

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js

@@ -13,13 +13,13 @@ import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxIsMergeEditor } from 'vscode/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const MERGE_EDITOR_CATEGORY = ( localize2(9879, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(9876, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9880, "Copy Merge Editor State as JSON")),
+            title: ( localize2(9877, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -31,8 +31,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9881, 'Merge Editor')),
-                message: ( localize(9882, "No active merge editor"))
+                name: ( localize(9878, 'Merge Editor')),
+                message: ( localize(9879, "No active merge editor"))
             });
             return;
         }
@@ -51,8 +51,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(9881, 'Merge Editor')),
-            message: ( localize(9883, "Successfully copied merge editor state")),
+            name: ( localize(9878, 'Merge Editor')),
+            message: ( localize(9880, "Successfully copied merge editor state")),
         });
     }
 }
@@ -61,7 +61,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9884, "Save Merge Editor State to Folder")),
+            title: ( localize2(9881, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -75,8 +75,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9881, 'Merge Editor')),
-                message: ( localize(9882, "No active merge editor"))
+                name: ( localize(9878, 'Merge Editor')),
+                message: ( localize(9879, "No active merge editor"))
             });
             return;
         }
@@ -88,7 +88,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9885, 'Select folder to save to'))
+            title: ( localize(9882, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -106,8 +106,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(9881, 'Merge Editor')),
-            message: ( localize(9886, "Successfully saved merge editor state to folder")),
+            name: ( localize(9878, 'Merge Editor')),
+            message: ( localize(9883, "Successfully saved merge editor state to folder")),
         });
     }
 }
@@ -116,7 +116,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9887, "Load Merge Editor State from Folder")),
+            title: ( localize2(9884, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -135,7 +135,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(9885, 'Select folder to save to'))
+                title: ( localize(9882, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -12,7 +12,7 @@ import { MergeEditorInput } from 'vscode/vscode/vs/workbench/contrib/mergeEditor
 import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverContribution } from './view/mergeEditor.js';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4447, "Merge Editor"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4438, "Merge Editor"))), [
     ( (new SyncDescriptor(MergeEditorInput)))
 ]);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -23,8 +23,8 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(4448, "Uses the legacy diffing algorithm.")),
-                ( localize(4449, "Uses the advanced diffing algorithm.")),
+                ( localize(4439, "Uses the legacy diffing algorithm.")),
+                ( localize(4440, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js

@@ -11,19 +11,19 @@ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
 import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 
-registerColor('mergeEditor.change.background', '#9bb95533', ( localize(11372, 'The background color for changes.')));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11373, 'The background color for word changes.')));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11374, 'The background color for changes in base.')));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11375, 'The background color for word changes in base.')));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11376, 'The border color of unhandled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11377, 'The border color of unhandled focused conflicts.')));
-registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11378, 'The border color of handled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11379, 'The border color of handled focused conflicts.')));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11380, 'The foreground color for changes in input 1.')));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11381, 'The foreground color for changes in input 1.')));
-registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11382, 'The background of the "Conflicting Lines" text.')));
+registerColor('mergeEditor.change.background', '#9bb95533', ( localize(11369, 'The background color for changes.')));
+registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11370, 'The background color for word changes.')));
+registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11371, 'The background color for changes in base.')));
+registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11372, 'The background color for word changes in base.')));
+registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11373, 'The border color of unhandled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11374, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11375, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11376, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11377, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11378, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11379, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11383, 'The background color of decorations in input 1.')));
-registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11384, 'The background color of decorations in input 2.')));
+registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11380, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11381, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js

@@ -117,16 +117,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11368, 'Base'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11365, 'Base'))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    11369,
+                    11366,
                     'Comparing with {0}',
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(11370, 'Differences are highlighted with a background color.'));
+                const tooltip = ( localize(11367, 'Differences are highlighted with a background color.'));
                 node = h('span', { title: tooltip }, [label]).root;
             }
             reset(this.htmlElements.description, ...(node ? [node] : []));

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js

@@ -159,8 +159,8 @@ let InputCodeEditorView = class InputCodeEditorView extends CodeEditorView {
             }
             this.editor.setModel(this.inputNumber === 1 ? vm.model.input1.textModel : vm.model.input2.textModel);
             const title = this.inputNumber === 1
-                ? vm.model.input1.title || ( localize(11385, 'Input 1'))
-                : vm.model.input2.title || ( localize(11386, 'Input 2'));
+                ? vm.model.input1.title || ( localize(11382, 'Input 1'))
+                : vm.model.input2.title || ( localize(11383, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -242,19 +242,19 @@ class ModifiedBaseRangeGutterItemModel {
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localize(11387, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(11384, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(11387, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(11384, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(11388, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(11385, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
                 : undefined,
             ( (new Separator())),
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.swap', ( localize(11389, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(11386, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11390, 'Mark as Handled')), undefined, true, () => {
+            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11387, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -297,10 +297,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [0 ]: { icon: undefined, checked: false, title: ( localize(11391, "Accept")) },
-                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11392, "Accept (result is dirty)")) },
-                [1 ]: { icon: Codicon.check, checked: true, title: ( localize(11393, "Undo accept")) },
-                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localize(11394, "Undo accept (currently second)")) },
+                [0 ]: { icon: undefined, checked: false, title: ( localize(11388, "Accept")) },
+                [3 ]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11389, "Accept (result is dirty)")) },
+                [1 ]: { icon: Codicon.check, checked: true, title: ( localize(11390, "Undo accept")) },
+                [2 ]: { icon: Codicon.checkAll, checked: true, title: ( localize(11391, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js

@@ -132,7 +132,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11395, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11392, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
         const remainingConflictsActionBar = this._register(( (new ActionBar(this.htmlElements.detail))));
@@ -147,8 +147,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localize(11396, '{0} Conflict Remaining', count))
-                : ( localize(11397, '{0} Conflicts Remaining ', count));
+                ? ( localize(11393, '{0} Conflict Remaining', count))
+                : ( localize(11394, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -160,8 +160,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).get());
                 },
                 tooltip: count > 0
-                    ? ( localize(11398, 'Go to next conflict'))
-                    : ( localize(11399, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(11395, 'Go to next conflict'))
+                    : ( localize(11396, 'All conflicts handled, the merge can be completed now.')),
             });
         }));
         this._register(applyObservableDecorations(this.editor, this.decorations));

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

@@ -122,7 +122,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return ( localize(9888, "Text Merge Editor"));
+        return ( localize(9885, "Text Merge Editor"));
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js

@@ -206,7 +206,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(11371, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(11368, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js

@@ -22,11 +22,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( (new MutableDisposable())));
-        const name = ( localize(4463, "Keyboard Layout"));
+        const name = ( localize(4454, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(4464, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(4455, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -38,7 +38,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(4464, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(4455, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -47,7 +47,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(4464, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(4455, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -65,11 +65,11 @@ KeyboardLayoutPickerContribution = ( (__decorate([
 registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, 1 );
 const DEFAULT_CONTENT = [
     `// ${( localize(
-        4465,
+        4456,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        4466,
+        4457,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -80,7 +80,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(4467, "Change Keyboard Layout")),
+            title: ( localize2(4458, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -110,17 +110,17 @@ registerAction2(class extends Action2 {
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localize(4468, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(4459, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(4469, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(4460, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(4470, "Auto Detect")),
+            label: ( localize(4461, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(4471, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(4462, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -143,7 +143,7 @@ registerAction2(class extends Action2 {
                 });
             }, (error) => {
                 throw ( (new Error(
-                    localize(4472, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
+                    localize(4463, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
                 )));
             });
             return Promise.resolve();

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

@@ -18,7 +18,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                4461,
+                4452,
                 "Controls the feedback area size in pixels of the dragging area in between views/editors. Set it to a larger value if you feel it's hard to resize views using the mouse."
             ))
         },
@@ -28,7 +28,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                4462,
+                4453,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },

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

@@ -18,12 +18,12 @@ import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
 import { TypeHierarchyProviderRegistry, TypeHierarchyModel } from 'vscode/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(4247, 'Whether a type hierarchy provider is available')))));
-const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(4248, 'Whether type hierarchy peek is currently showing')))));
+const _ctxHasTypeHierarchyProvider = ( (new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(4238, 'Whether a type hierarchy provider is available')))));
+const _ctxTypeHierarchyVisible = ( (new RawContextKey('typeHierarchyVisible', false, ( localize(4239, 'Whether type hierarchy peek is currently showing')))));
 const _ctxTypeHierarchyDirection = ( (new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(4249, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(4240, 'whether type hierarchy shows super types or subtypes')) }
 )));
 function sanitizedDirection(candidate) {
     return candidate === "subtypes"  || candidate === "supertypes"
@@ -92,14 +92,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(4250, "No results")));
+                this._widget.showMessage(( localize(4241, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(4251, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(4242, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -144,7 +144,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(4252, 'Peek Type Hierarchy')),
+            title: ( localize2(4243, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -163,7 +163,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(4253, 'Show Supertypes')),
+            title: ( localize2(4244, 'Show Supertypes')),
             icon: Codicon.typeHierarchySuper,
             precondition: ( (ContextKeyExpr.and(
                 _ctxTypeHierarchyVisible,
@@ -188,7 +188,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSubtypes',
-            title: ( localize2(4254, 'Show Subtypes')),
+            title: ( localize2(4245, 'Show Subtypes')),
             icon: Codicon.typeHierarchySub,
             precondition: ( (ContextKeyExpr.and(
                 _ctxTypeHierarchyVisible,
@@ -213,7 +213,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusTypeHierarchy',
-            title: ( localize2(4255, 'Refocus Type Hierarchy')),
+            title: ( localize2(4246, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: 200 ,
@@ -229,7 +229,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(4256, 'Close')),
+            title: ( localize(4247, 'Close')),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js

@@ -252,13 +252,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === "supertypes"
-            ? ( localize(9635, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(9636, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(9632, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(9633, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = "loading" ;
-        this.setTitle(( localize(9637, "Loading...")));
+        this.setTitle(( localize(9634, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -277,8 +277,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === "supertypes"
-                ? ( localize(9638, "No supertypes of '{0}'", model.root.name))
-                : ( localize(9639, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(9635, "No supertypes of '{0}'", model.root.name))
+                : ( localize(9636, "No subtypes of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = "data" ;

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js

@@ -116,14 +116,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return ( localize(11359, "Type Hierarchy"));
+        return ( localize(11356, "Type Hierarchy"));
     }
     getAriaLabel(element) {
         if (this.getDirection() === "supertypes" ) {
-            return ( localize(11360, "supertypes of {0}", element.item.name));
+            return ( localize(11357, "supertypes of {0}", element.item.name));
         }
         else {
-            return ( localize(11361, "subtypes of {0}", element.item.name));
+            return ( localize(11358, "subtypes of {0}", element.item.name));
         }
     }
 }

package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js

@@ -157,7 +157,7 @@ let WebviewElement = class WebviewElement extends Disposable {
             this._hasFindResult.fire(didFind);
         }));
         this._register(this.on('fatal-error', (e) => {
-            notificationService.error(( localize(9622, "Error loading webview: {0}", e.message)));
+            notificationService.error(( localize(9619, "Error loading webview: {0}", e.message)));
             this._onFatalError.fire({ message: e.message });
         }));
         this._register(this.on('did-keydown', (data) => {

package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js

@@ -15,7 +15,7 @@ const webviewActiveContextKeyExpr = ( (ContextKeyExpr.and(
 )));
 class ShowWebViewEditorFindWidgetAction extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.showFind'; }
-    static { this.LABEL = ( localize(9848, "Show find")); }
+    static { this.LABEL = ( localize(9644, "Show find")); }
     constructor() {
         super({
             id: ShowWebViewEditorFindWidgetAction.ID,
@@ -36,7 +36,7 @@ class ShowWebViewEditorFindWidgetAction extends Action2 {
 }
 class HideWebViewEditorFindCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.hideFind'; }
-    static { this.LABEL = ( localize(9849, "Stop find")); }
+    static { this.LABEL = ( localize(9645, "Stop find")); }
     constructor() {
         super({
             id: HideWebViewEditorFindCommand.ID,
@@ -57,7 +57,7 @@ class HideWebViewEditorFindCommand extends Action2 {
 }
 class WebViewEditorFindNextCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findNext'; }
-    static { this.LABEL = ( localize(9850, 'Find next')); }
+    static { this.LABEL = ( localize(9646, 'Find next')); }
     constructor() {
         super({
             id: WebViewEditorFindNextCommand.ID,
@@ -78,7 +78,7 @@ class WebViewEditorFindNextCommand extends Action2 {
 }
 class WebViewEditorFindPreviousCommand extends Action2 {
     static { this.ID = 'editor.action.webvieweditor.findPrevious'; }
-    static { this.LABEL = ( localize(9851, 'Find previous')); }
+    static { this.LABEL = ( localize(9647, 'Find previous')); }
     constructor() {
         super({
             id: WebViewEditorFindPreviousCommand.ID,
@@ -99,7 +99,7 @@ class WebViewEditorFindPreviousCommand extends Action2 {
 }
 class ReloadWebviewAction extends Action2 {
     static { this.ID = 'workbench.action.webview.reloadWebviewAction'; }
-    static { this.LABEL = ( localize2(9852, "Reload Webviews")); }
+    static { this.LABEL = ( localize2(9648, "Reload Webviews")); }
     constructor() {
         super({
             id: ReloadWebviewAction.ID,

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

@@ -16,7 +16,7 @@ import 'vscode/vscode/vs/workbench/contrib/webviewPanel/browser/webviewWorkbench
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService.service';
 
-(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(4438, "webview editor"))), [( (new SyncDescriptor(WebviewInput)))]);
+(( (Registry.as(EditorExtensions.EditorPane)))).registerEditorPane(EditorPaneDescriptor.create(WebviewEditor, WebviewEditor.ID, ( localize(4299, "webview editor"))), [( (new SyncDescriptor(WebviewInput)))]);
 let WebviewPanelContribution = class WebviewPanelContribution extends Disposable {
     static { this.ID = 'workbench.contrib.webviewPanel'; }
     constructor(editorService, editorGroupService) {

package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js

@@ -448,8 +448,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         if (storedChoices[globForResource] && storedChoices[globForResource].find(editorID => editorID === currentEditor.editorId)) {
             return;
         }
-        const handle = this.notificationService.prompt(Severity$1.Warning, ( localize(4160, 'There are multiple default editors available for the resource.')), [{
-                label: ( localize(4161, 'Configure Default')),
+        const handle = this.notificationService.prompt(Severity$1.Warning, ( localize(4149, 'There are multiple default editors available for the resource.')), [{
+                label: ( localize(4150, 'Configure Default')),
                 run: async () => {
                     const picked = await this.doPickEditor(untypedInput, true);
                     if (!picked) {
@@ -470,7 +470,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
                 }
             },
             {
-                label: ( localize(4162, 'Keep {0}', editorName)),
+                label: ( localize(4151, 'Keep {0}', editorName)),
                 run: writeCurrentEditorsToStorage
             }
         ]);
@@ -496,9 +496,9 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             }
         });
         const quickPickEntries = [];
-        const currentlyActiveLabel = ( localize(4163, "Active"));
-        const currentDefaultLabel = ( localize(4164, "Default"));
-        const currentDefaultAndActiveLabel = ( localize(4165, "Active and Default"));
+        const currentlyActiveLabel = ( localize(4152, "Active"));
+        const currentDefaultLabel = ( localize(4153, "Default"));
+        const currentDefaultAndActiveLabel = ( localize(4154, "Active and Default"));
         let defaultViewType = defaultSetting;
         if (!defaultViewType && registeredEditors.length > 2 && registeredEditors[1]?.editorInfo.priority !== RegisteredEditorPriority.option) {
             defaultViewType = registeredEditors[1]?.editorInfo.id;
@@ -523,7 +523,7 @@ let EditorResolverService = class EditorResolverService extends Disposable {
             quickPickEntries.push(separator);
             const configureDefaultEntry = {
                 id: EditorResolverService_1.configureDefaultID,
-                label: ( localize(4166, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
+                label: ( localize(4155, "Configure default editor for '{0}'...", `*${extname(resource)}`)),
             };
             quickPickEntries.push(configureDefaultEntry);
         }
@@ -538,8 +538,8 @@ let EditorResolverService = class EditorResolverService extends Disposable {
         const disposables = ( (new DisposableStore()));
         const editorPicker = disposables.add(this.quickInputService.createQuickPick({ useSeparators: true }));
         const placeHolderMessage = showDefaultPicker ?
-            ( localize(4167, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
-            ( localize(4168, "Select editor for '{0}'", basename(resource)));
+            ( localize(4156, "Select new default editor for '{0}'", `*${extname(resource)}`)) :
+            ( localize(4157, "Select editor for '{0}'", basename(resource)));
         editorPicker.placeholder = placeHolderMessage;
         editorPicker.canAcceptInBackground = true;
         editorPicker.items = editorPicks;