@codingame/monaco-vscode-view-common-service-override 24.2.0 → 25.0.0

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

@@ -61,7 +61,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2(9043, 'Open Merge Editor')),
+            title: ( localize2(9068, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -132,7 +132,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2(9044, "Mixed Layout")),
+            title: ( localize2(9069, "Mixed Layout")),
             toggled: ( ctxMergeEditorLayout.isEqualTo('mixed')),
             menu: [
                 {
@@ -156,7 +156,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2(9045, 'Column Layout')),
+            title: ( localize2(9070, 'Column Layout')),
             toggled: ( ctxMergeEditorLayout.isEqualTo('columns')),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -178,7 +178,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2(9046, "Show Non-Conflicting Changes")),
+            title: ( localize2(9071, "Show Non-Conflicting Changes")),
             toggled: ( ctxMergeEditorShowNonConflictingChanges.isEqualTo(true)),
             menu: [
                 {
@@ -202,7 +202,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2(9047, "Show Base")),
+            title: ( localize2(9072, "Show Base")),
             toggled: ( ctxMergeEditorShowBase.isEqualTo(true)),
             menu: [
                 {
@@ -225,7 +225,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2(9048, "Show Base Top")),
+            title: ( localize2(9073, "Show Base Top")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop)),
             menu: [
                 {
@@ -248,7 +248,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2(9049, "Show Base Center")),
+            title: ( localize2(9074, "Show Base Center")),
             toggled: ( ContextKeyExpr.and(ctxMergeEditorShowBase, ( ctxMergeEditorShowBaseAtTop.negate()))),
             menu: [
                 {
@@ -267,13 +267,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(9050, "Merge Editor"));
+const mergeEditorCategory = ( localize2(9075, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2(9051, "Open File")),
+            title: ( localize2(9076, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -294,7 +294,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9052, "Go to Next Unhandled Conflict")),
+            title: ( localize2(9077, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -318,7 +318,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9053, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(9078, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -342,7 +342,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9054, "Toggle Current Conflict from Left")),
+            title: ( localize2(9079, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -356,7 +356,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9055, "Toggle Current Conflict from Right")),
+            title: ( localize2(9080, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -370,8 +370,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9056, "Compare Input 1 With Base")),
-            shortTitle: ( localize(9057, 'Compare With Base')),
+            title: ( localize2(9081, "Compare Input 1 With Base")),
+            shortTitle: ( localize(9082, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -388,8 +388,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9058, "Compare Input 2 With Base")),
-            shortTitle: ( localize(9057, 'Compare With Base')),
+            title: ( localize2(9083, "Compare Input 2 With Base")),
+            shortTitle: ( localize(9082, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -425,7 +425,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2(9059, "Open Base File")),
+            title: ( localize2(9084, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -440,7 +440,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9060, "Accept All Incoming Changes from Left")),
+            title: ( localize2(9085, "Accept All Incoming Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -456,7 +456,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9061, "Accept All Current Changes from Right")),
+            title: ( localize2(9086, "Accept All Current Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -472,8 +472,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9062, "Reset Result")),
-            shortTitle: ( localize(9063, 'Reset')),
+            title: ( localize2(9087, "Reset Result")),
+            shortTitle: ( localize(9088, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -489,7 +489,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2(9064, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(9089, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
@@ -502,7 +502,7 @@ class AcceptAllCombination extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptAllCombination',
             category: mergeEditorCategory,
-            title: ( localize2(9065, "Accept All Combination")),
+            title: ( localize2(9090, "Accept All Combination")),
             f1: true,
         });
     }
@@ -529,7 +529,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9066, "Complete Merge")),
+            title: ( localize2(9091, "Complete Merge")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [
@@ -547,12 +547,12 @@ class AcceptMerge extends MergeEditorAction2 {
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
                 message: ( localize(
-                    9067,
+                    9092,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(9068, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(9069, "&&Complete with Conflicts"))
+                detail: ( localize(9093, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(9094, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {
@@ -572,7 +572,7 @@ class ToggleBetweenInputs extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.toggleBetweenInputs',
             category: mergeEditorCategory,
-            title: ( localize2(9070, "Toggle Between Merge Editor Inputs")),
+            title: ( localize2(9095, "Toggle Between Merge Editor Inputs")),
             f1: true,
             precondition: ctxIsMergeEditor,
             keybinding: [

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

@@ -14,13 +14,13 @@ import { MergeEditor } from '../view/mergeEditor.js';
 import { ctxIsMergeEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 
-const MERGE_EDITOR_CATEGORY = ( localize2(9071, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(9096, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9072, "Copy Merge Editor State as JSON")),
+            title: ( localize2(9097, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -32,8 +32,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9073, 'Merge Editor')),
-                message: ( localize(9074, "No active merge editor"))
+                name: ( localize(9098, 'Merge Editor')),
+                message: ( localize(9099, "No active merge editor"))
             });
             return;
         }
@@ -52,8 +52,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(9073, 'Merge Editor')),
-            message: ( localize(9075, "Successfully copied merge editor state")),
+            name: ( localize(9098, 'Merge Editor')),
+            message: ( localize(9100, "Successfully copied merge editor state")),
         });
     }
 }
@@ -62,7 +62,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9076, "Save Merge Editor State to Folder")),
+            title: ( localize2(9101, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -76,8 +76,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9073, 'Merge Editor')),
-                message: ( localize(9074, "No active merge editor"))
+                name: ( localize(9098, 'Merge Editor')),
+                message: ( localize(9099, "No active merge editor"))
             });
             return;
         }
@@ -89,7 +89,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9077, 'Select folder to save to'))
+            title: ( localize(9102, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -107,8 +107,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(9073, 'Merge Editor')),
-            message: ( localize(9078, "Successfully saved merge editor state to folder")),
+            name: ( localize(9098, 'Merge Editor')),
+            message: ( localize(9103, "Successfully saved merge editor state to folder")),
         });
     }
 }
@@ -117,7 +117,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: 'merge.dev.loadContentsFromFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9079, "Load Merge Editor State from Folder")),
+            title: ( localize2(9104, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -136,7 +136,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(9077, 'Select folder to save to'))
+                title: ( localize(9102, 'Select folder to save to'))
             });
             if (!result) {
                 return;

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

@@ -16,7 +16,7 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 import { AccessibleViewRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/accessibility/browser/accessibleViewRegistry';
 import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibilityHelp.js';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(9080, "Merge Editor"))), [
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(9105, "Merge Editor"))), [
     ( new SyncDescriptor(MergeEditorInput))
 ]);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -27,8 +27,8 @@ import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibility
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(9081, "Uses the legacy diffing algorithm.")),
-                ( localize(9082, "Uses the advanced diffing algorithm.")),
+                ( localize(9106, "Uses the legacy diffing algorithm.")),
+                ( localize(9107, "Uses the advanced diffing algorithm.")),
             ]
         },
         'mergeEditor.showDeletionMarkers': {

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

@@ -19,22 +19,22 @@ class MergeEditorAccessibilityHelpProvider {
             return;
         }
         const content = [
-            ( localize(9083, "You are in a merge editor.")),
+            ( localize(9108, "You are in a merge editor.")),
             ( localize(
-            9084,
+            9109,
             "Navigate between merge conflicts using the commands Go to Next Unhandled Conflict{0} and Go to Previous Unhandled Conflict{1}.",
             '<keybinding:merge.goToNextUnhandledConflict>',
             '<keybinding:merge.goToPreviousUnhandledConflict>'
         )),
             ( localize(
-            9085,
+            9110,
             "Run the command Merge Editor: Accept All Incoming Changes from the Left{0} and Merge Editor: Accept All Current Changes from the Right{1}",
             '<keybinding:merge.acceptAllInput1>',
             '<keybinding:merge.acceptAllInput2>'
         )),
-            ( localize(9086, "Complete the Merge{0}.", '<keybinding:mergeEditor.acceptMerge>')),
+            ( localize(9111, "Complete the Merge{0}.", '<keybinding:mergeEditor.acceptMerge>')),
             ( localize(
-            9087,
+            9112,
             "Toggle between merge editor inputs, incoming and current changes {0}.",
             '<keybinding:mergeEditor.toggleBetweenInputs>'
         )),

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

@@ -12,19 +12,19 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/misc
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/quickpickColors';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/colors/searchColors';
 
-registerColor('mergeEditor.change.background', '#9bb95533', ( localize(9123, 'The background color for changes.')));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(9124, 'The background color for word changes.')));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(9125, 'The background color for changes in base.')));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(9126, 'The background color for word changes in base.')));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(9127, 'The border color of unhandled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(9128, 'The border color of unhandled focused conflicts.')));
-registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(9129, 'The border color of handled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(9130, 'The border color of handled focused conflicts.')));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(9131, 'The foreground color for changes in input 1.')));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(9132, 'The foreground color for changes in input 1.')));
-registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(9133, 'The background of the "Conflicting Lines" text.')));
+registerColor('mergeEditor.change.background', '#9bb95533', ( localize(9148, 'The background color for changes.')));
+registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(9149, 'The background color for word changes.')));
+registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(9150, 'The background color for changes in base.')));
+registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(9151, 'The background color for word changes in base.')));
+registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(9152, 'The border color of unhandled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(9153, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(9154, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(9155, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(9156, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(9157, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(9158, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(9134, 'The background color of decorations in input 1.')));
-registerColor('mergeEditor.conflict.input2.background', ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(9135, 'The background color of decorations in input 2.')));
+registerColor('mergeEditor.conflict.input1.background', ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(9159, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(9160, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -114,16 +114,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9154, 'Base'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9179, 'Base'))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    9155,
+                    9180,
                     'Comparing with {0}',
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(9156, 'Differences are highlighted with a background color.'));
+                const tooltip = ( localize(9181, '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

@@ -155,8 +155,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(9157, 'Input 1'))
-                : vm.model.input2.title || ( localize(9158, 'Input 2'));
+                ? vm.model.input1.title || ( localize(9182, 'Input 1'))
+                : vm.model.input2.title || ( localize(9183, 'Input 2'));
             const description = this.inputNumber === 1
                 ? vm.model.input1.description
                 : vm.model.input2.description;
@@ -238,19 +238,19 @@ class ModifiedBaseRangeGutterItemModel {
         const both = state.includesInput1 && state.includesInput2;
         return [
             this.baseRange.input1Diffs.length > 0
-                ? action('mergeEditor.acceptInput1', ( localize(9159, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(9184, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(9159, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(9184, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(9160, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(9185, '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(9161, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(9186, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( new Action('mergeEditor.markAsHandled', ( localize(9162, 'Mark as Handled')), undefined, true, () => {
+            setFields(( new Action('mergeEditor.markAsHandled', ( localize(9187, 'Mark as Handled')), undefined, true, () => {
                 transaction((tx) => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -293,10 +293,10 @@ class MergeConflictGutterItemView extends Disposable {
             const item = this.item.read(reader);
             const value = item.toggleState.read(reader);
             const iconMap = {
-                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(9163, "Accept")) },
-                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(9164, "Accept (result is dirty)")) },
-                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(9165, "Undo accept")) },
-                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(9166, "Undo accept (currently second)")) },
+                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(9188, "Accept")) },
+                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(9189, "Accept (result is dirty)")) },
+                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(9190, "Undo accept")) },
+                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(9191, "Undo accept (currently second)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

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

@@ -131,7 +131,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9167, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9192, 'Result'))));
             reset(this.htmlElements.description, ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, { relative: true })));
         }));
         const remainingConflictsActionBar = this._register(( new ActionBar(this.htmlElements.detail)));
@@ -146,8 +146,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
             }
             const count = model.unhandledConflictsCount.read(reader);
             const text = count === 1
-                ? ( localize(9168, '{0} Conflict Remaining', count))
-                : ( localize(9169, '{0} Conflicts Remaining ', count));
+                ? ( localize(9193, '{0} Conflict Remaining', count))
+                : ( localize(9194, '{0} Conflicts Remaining ', count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -159,8 +159,8 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).read(undefined));
                 },
                 tooltip: count > 0
-                    ? ( localize(9170, 'Go to next conflict'))
-                    : ( localize(9171, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(9195, 'Go to next conflict'))
+                    : ( localize(9196, '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

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

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

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

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

@@ -24,11 +24,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(9844, "Keyboard Layout"));
+        const name = ( localize(9874, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(9845, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(9875, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -40,7 +40,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(9845, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9875, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -49,7 +49,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(9845, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9875, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -67,11 +67,11 @@ KeyboardLayoutPickerContribution = ( __decorate([
 registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, WorkbenchPhase.BlockStartup);
 const DEFAULT_CONTENT = [
     `// ${( localize(
-        9846,
+        9876,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        9847,
+        9877,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -82,7 +82,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(9848, "Change Keyboard Layout")),
+            title: ( localize2(9878, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -112,17 +112,17 @@ registerAction2(class extends Action2 {
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localize(9849, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(9879, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(9850, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(9880, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(9851, "Auto Detect")),
+            label: ( localize(9881, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9852, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9882, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +144,7 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw ( new Error(( localize(9853, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(9883, "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 @@ registerWorkbenchContribution2(SashSettingsController.ID, SashSettingsController
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                10404,
+                10434,
                 "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 @@ registerWorkbenchContribution2(SashSettingsController.ID, SashSettingsController
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                10405,
+                10435,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },