@codingame/monaco-vscode-view-common-service-override 8.0.0 → 8.0.2

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

@@ -55,7 +55,7 @@ class OpenMergeEditor extends Action2 {
     constructor() {
         super({
             id: '_open.mergeEditor',
-            title: ( localize2(9741, 'Open Merge Editor')),
+            title: ( localize2(9743, 'Open Merge Editor')),
         });
     }
     run(accessor, ...args) {
@@ -134,7 +134,7 @@ class SetMixedLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.mixedLayout',
-            title: ( localize2(9742, "Mixed Layout")),
+            title: ( localize2(9744, "Mixed Layout")),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('mixed'))),
             menu: [
                 {
@@ -158,7 +158,7 @@ class SetColumnLayout extends Action2 {
     constructor() {
         super({
             id: 'merge.columnLayout',
-            title: ( localize2(9743, 'Column Layout')),
+            title: ( localize2(9745, 'Column Layout')),
             toggled: ( (ctxMergeEditorLayout.isEqualTo('columns'))),
             menu: [{
                     id: MenuId.EditorTitle,
@@ -180,7 +180,7 @@ class ShowNonConflictingChanges extends Action2 {
     constructor() {
         super({
             id: 'merge.showNonConflictingChanges',
-            title: ( localize2(9744, "Show Non-Conflicting Changes")),
+            title: ( localize2(9746, "Show Non-Conflicting Changes")),
             toggled: ( (ctxMergeEditorShowNonConflictingChanges.isEqualTo(true))),
             menu: [
                 {
@@ -204,7 +204,7 @@ class ShowHideBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBase',
-            title: ( localize2(9745, "Show Base")),
+            title: ( localize2(9747, "Show Base")),
             toggled: ( (ctxMergeEditorShowBase.isEqualTo(true))),
             menu: [
                 {
@@ -230,7 +230,7 @@ class ShowHideTopBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseTop',
-            title: ( localize2(9746, "Show Base Top")),
+            title: ( localize2(9748, "Show Base Top")),
             toggled: ( (ContextKeyExpr.and(ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop))),
             menu: [
                 {
@@ -253,7 +253,7 @@ class ShowHideCenterBase extends Action2 {
     constructor() {
         super({
             id: 'merge.showBaseCenter',
-            title: ( localize2(9747, "Show Base Center")),
+            title: ( localize2(9749, "Show Base Center")),
             toggled: ( (ContextKeyExpr.and(
                 ctxMergeEditorShowBase,
                  (ctxMergeEditorShowBaseAtTop.negate())
@@ -275,13 +275,13 @@ class ShowHideCenterBase extends Action2 {
         }
     }
 }
-const mergeEditorCategory = ( localize2(9748, "Merge Editor"));
+const mergeEditorCategory = ( localize2(9750, "Merge Editor"));
 class OpenResultResource extends MergeEditorAction {
     constructor() {
         super({
             id: 'merge.openResult',
             icon: Codicon.goToFile,
-            title: ( localize2(9749, "Open File")),
+            title: ( localize2(9751, "Open File")),
             category: mergeEditorCategory,
             menu: [{
                     id: MenuId.EditorTitle,
@@ -302,7 +302,7 @@ class GoToNextUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToNextUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9750, "Go to Next Unhandled Conflict")),
+            title: ( localize2(9752, "Go to Next Unhandled Conflict")),
             icon: Codicon.arrowDown,
             menu: [
                 {
@@ -326,7 +326,7 @@ class GoToPreviousUnhandledConflict extends MergeEditorAction {
         super({
             id: 'merge.goToPreviousUnhandledConflict',
             category: mergeEditorCategory,
-            title: ( localize2(9751, "Go to Previous Unhandled Conflict")),
+            title: ( localize2(9753, "Go to Previous Unhandled Conflict")),
             icon: Codicon.arrowUp,
             menu: [
                 {
@@ -350,7 +350,7 @@ class ToggleActiveConflictInput1 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9752, "Toggle Current Conflict from Left")),
+            title: ( localize2(9754, "Toggle Current Conflict from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -364,7 +364,7 @@ class ToggleActiveConflictInput2 extends MergeEditorAction {
         super({
             id: 'merge.toggleActiveConflictInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9753, "Toggle Current Conflict from Right")),
+            title: ( localize2(9755, "Toggle Current Conflict from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -378,8 +378,8 @@ class CompareInput1WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput1WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9754, "Compare Input 1 With Base")),
-            shortTitle: ( localize(9755, 'Compare With Base')),
+            title: ( localize2(9756, "Compare Input 1 With Base")),
+            shortTitle: ( localize(9757, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -396,8 +396,8 @@ class CompareInput2WithBaseCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.compareInput2WithBase',
             category: mergeEditorCategory,
-            title: ( localize2(9756, "Compare Input 2 With Base")),
-            shortTitle: ( localize(9756, 'Compare With Base')),
+            title: ( localize2(9758, "Compare Input 2 With Base")),
+            shortTitle: ( localize(9757, 'Compare With Base')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -433,7 +433,7 @@ class OpenBaseFile extends MergeEditorAction {
         super({
             id: 'merge.openBaseEditor',
             category: mergeEditorCategory,
-            title: ( localize2(9757, "Open Base File")),
+            title: ( localize2(9759, "Open Base File")),
             f1: true,
             precondition: ctxIsMergeEditor,
         });
@@ -448,7 +448,7 @@ class AcceptAllInput1 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput1',
             category: mergeEditorCategory,
-            title: ( localize2(9758, "Accept All Changes from Left")),
+            title: ( localize2(9760, "Accept All Changes from Left")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput1Toolbar, group: 'primary' },
@@ -464,7 +464,7 @@ class AcceptAllInput2 extends MergeEditorAction {
         super({
             id: 'merge.acceptAllInput2',
             category: mergeEditorCategory,
-            title: ( localize2(9759, "Accept All Changes from Right")),
+            title: ( localize2(9761, "Accept All Changes from Right")),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInput2Toolbar, group: 'primary' },
@@ -480,8 +480,8 @@ class ResetToBaseAndAutoMergeCommand extends MergeEditorAction {
         super({
             id: 'mergeEditor.resetResultToBaseAndAutoMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9760, "Reset Result")),
-            shortTitle: ( localize(9761, 'Reset')),
+            title: ( localize2(9762, "Reset Result")),
+            shortTitle: ( localize(9763, 'Reset')),
             f1: true,
             precondition: ctxIsMergeEditor,
             menu: { id: MenuId.MergeInputResultToolbar, group: 'primary' },
@@ -497,7 +497,7 @@ class ResetCloseWithConflictsChoice extends Action2 {
         super({
             id: 'mergeEditor.resetCloseWithConflictsChoice',
             category: mergeEditorCategory,
-            title: ( localize2(9762, "Reset Choice for \'Close with Conflicts\'")),
+            title: ( localize2(9764, "Reset Choice for \'Close with Conflicts\'")),
             f1: true,
         });
     }
@@ -510,7 +510,7 @@ class AcceptMerge extends MergeEditorAction2 {
         super({
             id: 'mergeEditor.acceptMerge',
             category: mergeEditorCategory,
-            title: ( localize2(9763, "Complete Merge")),
+            title: ( localize2(9765, "Complete Merge")),
             f1: false,
             precondition: ctxIsMergeEditor
         });
@@ -521,12 +521,12 @@ class AcceptMerge extends MergeEditorAction2 {
         if (viewModel.model.unhandledConflictsCount.get() > 0) {
             const { confirmed } = await dialogService.confirm({
                 message: ( localize(
-                    9764,
+                    9766,
                     "Do you want to complete the merge of {0}?",
                     basename(inputModel.resultUri)
                 )),
-                detail: ( localize(9765, "The file contains unhandled conflicts.")),
-                primaryButton: ( localize(9766, "&&Complete with Conflicts"))
+                detail: ( localize(9767, "The file contains unhandled conflicts.")),
+                primaryButton: ( localize(9768, "&&Complete with Conflicts"))
             });
             if (!confirmed) {
                 return {

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(9767, 'Merge Editor (Dev)'));
+const MERGE_EDITOR_CATEGORY = ( localize2(9769, 'Merge Editor (Dev)'));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: 'merge.dev.copyContentsJson',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9768, "Copy Merge Editor State as JSON")),
+            title: ( localize2(9770, "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(9769, 'Merge Editor')),
-                message: ( localize(9770, "No active merge editor"))
+                name: ( localize(9771, 'Merge Editor')),
+                message: ( localize(9772, "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(9770, 'Merge Editor')),
-            message: ( localize(9771, "Successfully copied merge editor state")),
+            name: ( localize(9771, 'Merge Editor')),
+            message: ( localize(9773, "Successfully copied merge editor state")),
         });
     }
 }
@@ -61,7 +61,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: 'merge.dev.saveContentsToFolder',
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(9772, "Save Merge Editor State to Folder")),
+            title: ( localize2(9774, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor,
@@ -75,7 +75,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(9772, 'Merge Editor')),
+                name: ( localize(9771, 'Merge Editor')),
                 message: ( localize(9772, "No active merge editor"))
             });
             return;
@@ -88,7 +88,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(9773, 'Select folder to save to'))
+            title: ( localize(9775, 'Select folder to save to'))
         });
         if (!result) {
             return;
@@ -106,8 +106,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write('initialResult', model.getInitialResultValue()),
         ]);
         notificationService.info({
-            name: ( localize(9773, 'Merge Editor')),
-            message: ( localize(9774, "Successfully saved merge editor state to folder")),
+            name: ( localize(9771, 'Merge Editor')),
+            message: ( localize(9776, "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(9775, "Load Merge Editor State from Folder")),
+            title: ( localize2(9777, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });

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

@@ -13,7 +13,7 @@ import { MergeEditor, MergeEditorOpenHandlerContribution, MergeEditorResolverCon
 import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 import { MergeEditorSerializer } from './mergeEditorSerializer.js';
 
-( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4356, "Merge Editor"))), [
+( (Registry.as(EditorExtensions.EditorPane))).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(4363, "Merge Editor"))), [
     ( (new SyncDescriptor(MergeEditorInput)))
 ]);
 ( (Registry.as(EditorExtensions.EditorFactory))).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
@@ -24,8 +24,8 @@ import { MergeEditorSerializer } from './mergeEditorSerializer.js';
             enum: ['legacy', 'advanced'],
             default: 'advanced',
             markdownEnumDescriptions: [
-                ( localize(4357, "Uses the legacy diffing algorithm.")),
-                ( localize(4358, "Uses the advanced diffing algorithm.")),
+                ( localize(4364, "Uses the legacy diffing algorithm.")),
+                ( localize(4365, "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(11201, 'The background color for changes.')));
-registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11202, 'The background color for word changes.')));
-registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11203, 'The background color for changes in base.')));
-registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11204, 'The background color for word changes in base.')));
-registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11205, 'The border color of unhandled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11206, 'The border color of unhandled focused conflicts.')));
-registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11207, 'The border color of handled unfocused conflicts.')));
-registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11208, 'The border color of handled focused conflicts.')));
-const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11209, 'The foreground color for changes in input 1.')));
-const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11210, 'The foreground color for changes in input 1.')));
-registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11211, 'The background of the "Conflicting Lines" text.')));
+registerColor('mergeEditor.change.background', '#9bb95533', ( localize(11198, 'The background color for changes.')));
+registerColor('mergeEditor.change.word.background', { dark: '#9ccc2c33', light: '#9ccc2c66', hcDark: '#9ccc2c33', hcLight: '#9ccc2c66', }, ( localize(11199, 'The background color for word changes.')));
+registerColor('mergeEditor.changeBase.background', { dark: '#4B1818FF', light: '#FFCCCCFF', hcDark: '#4B1818FF', hcLight: '#FFCCCCFF', }, ( localize(11200, 'The background color for changes in base.')));
+registerColor('mergeEditor.changeBase.word.background', { dark: '#6F1313FF', light: '#FFA3A3FF', hcDark: '#6F1313FF', hcLight: '#FFA3A3FF', }, ( localize(11201, 'The background color for word changes in base.')));
+registerColor('mergeEditor.conflict.unhandledUnfocused.border', { dark: '#ffa6007a', light: '#ffa600FF', hcDark: '#ffa6007a', hcLight: '#ffa6007a', }, ( localize(11202, 'The border color of unhandled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.unhandledFocused.border', '#ffa600', ( localize(11203, 'The border color of unhandled focused conflicts.')));
+registerColor('mergeEditor.conflict.handledUnfocused.border', '#86868649', ( localize(11204, 'The border color of handled unfocused conflicts.')));
+registerColor('mergeEditor.conflict.handledFocused.border', '#c1c1c1cc', ( localize(11205, 'The border color of handled focused conflicts.')));
+const handledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.handled.minimapOverViewRuler', '#adaca8ee', ( localize(11206, 'The foreground color for changes in input 1.')));
+const unhandledConflictMinimapOverViewRulerColor = registerColor('mergeEditor.conflict.unhandled.minimapOverViewRuler', '#fcba03FF', ( localize(11207, 'The foreground color for changes in input 1.')));
+registerColor('mergeEditor.conflictingLines.background', '#ffea0047', ( localize(11208, 'The background of the "Conflicting Lines" text.')));
 const contentTransparency = 0.4;
-registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11212, 'The background color of decorations in input 1.')));
-registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11213, 'The background color of decorations in input 2.')));
+registerColor('mergeEditor.conflict.input1.background', ( (transparent(mergeCurrentHeaderBackground, contentTransparency))), ( localize(11209, 'The background color of decorations in input 1.')));
+registerColor('mergeEditor.conflict.input2.background', ( (transparent(mergeIncomingHeaderBackground, contentTransparency))), ( localize(11210, 'The background color of decorations in input 2.')));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -123,7 +123,7 @@ class ActionsSource {
                 }, ( localize(11488, 'Remove {0} from the result document.', model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localize(11488, 'Remove {0}', model.input2.title)), async () => {
+                stateToggles.push(command(( localize(11487, 'Remove {0}', model.input2.title)), async () => {
                     transaction((tx) => {
                         model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
                         model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
@@ -211,7 +211,7 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11498,
+                            11495,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }

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

@@ -115,16 +115,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11197, 'Base'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11194, 'Base'))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    11198,
+                    11195,
                     'Comparing with {0}',
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(11199, 'Differences are highlighted with a background color.'));
+                const tooltip = ( localize(11196, '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(11214, 'Input 1'))
-                : vm.model.input2.title || ( localize(11215, 'Input 2'));
+                ? vm.model.input1.title || ( localize(11211, 'Input 1'))
+                : vm.model.input2.title || ( localize(11212, '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(11216, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(11213, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(11216, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(11213, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(11217, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(11214, '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(11218, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(11215, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11219, 'Mark as Handled')), undefined, true, () => {
+            setFields(( (new Action('mergeEditor.markAsHandled', ( localize(11216, '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 = {
-                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(11220, "Accept")) },
-                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11221, "Accept (result is dirty)")) },
-                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(11222, "Undo accept")) },
-                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(11223, "Undo accept (currently second)")) },
+                [InputState.excluded]: { icon: undefined, checked: false, title: ( localize(11217, "Accept")) },
+                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(11218, "Accept (result is dirty)")) },
+                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(11219, "Undo accept")) },
+                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(11220, "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(11224, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11221, '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(11225, '{0} Conflict Remaining', count))
-                : ( localize(11226, '{0} Conflicts Remaining ', count));
+                ? ( localize(11222, '{0} Conflict Remaining', count))
+                : ( localize(11223, '{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).get());
                 },
                 tooltip: count > 0
-                    ? ( localize(11227, 'Go to next conflict'))
-                    : ( localize(11228, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(11224, 'Go to next conflict'))
+                    : ( localize(11225, '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

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

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

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

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

@@ -23,11 +23,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( (new MutableDisposable())));
-        const name = ( localize(4372, "Keyboard Layout"));
+        const name = ( localize(4379, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(4373, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(4380, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -39,7 +39,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(4373, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(4380, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -48,7 +48,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(4373, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(4380, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -66,11 +66,11 @@ KeyboardLayoutPickerContribution = ( (__decorate([
 registerWorkbenchContribution2(KeyboardLayoutPickerContribution.ID, KeyboardLayoutPickerContribution, WorkbenchPhase.BlockStartup);
 const DEFAULT_CONTENT = [
     `// ${( localize(
-        4374,
+        4381,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        4375,
+        4382,
         'Open VS Code and run "Developer: Inspect Key Mappings (JSON)" from Command Palette.'
     ))}`,
     ``,
@@ -81,7 +81,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(4376, "Change Keyboard Layout")),
+            title: ( localize2(4383, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -111,17 +111,17 @@ registerAction2(class extends Action2 {
         });
         if (picks.length > 0) {
             const platform = isMacintosh ? 'Mac' : isWindows ? 'Win' : 'Linux';
-            picks.unshift({ type: 'separator', label: ( localize(4377, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(4384, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(4378, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(4385, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(4379, "Auto Detect")),
+            label: ( localize(4386, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(4380, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(4387, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +144,7 @@ registerAction2(class extends Action2 {
                 });
             }, (error) => {
                 throw ( (new Error(
-                    localize(4381, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
+                    localize(4388, "Unable to create '{0}' ({1}).", ( (file.toString())), error)
                 )));
             });
             return Promise.resolve();

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

@@ -19,7 +19,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                4370,
+                4377,
                 "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."
             ))
         },
@@ -29,7 +29,7 @@ import { isIOS } from 'vscode/vscode/vs/base/common/platform';
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                4371,
+                4378,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         },