@codingame/monaco-vscode-view-common-service-override 32.0.0 → 32.0.2

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(11254, "Merge Editor (Dev)"));
+const MERGE_EDITOR_CATEGORY = ( localize2(11279, "Merge Editor (Dev)"));
 class MergeEditorCopyContentsToJSON extends Action2 {
     constructor() {
         super({
             id: "merge.dev.copyContentsJson",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(11255, "Copy Merge Editor State as JSON")),
+            title: ( localize2(11280, "Copy Merge Editor State as JSON")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor
@@ -34,8 +34,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const notificationService = accessor.get(INotificationService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(11256, "Merge Editor")),
-                message: ( localize(11257, "No active merge editor"))
+                name: ( localize(11281, "Merge Editor")),
+                message: ( localize(11282, "No active merge editor"))
             });
             return;
         }
@@ -54,8 +54,8 @@ class MergeEditorCopyContentsToJSON extends Action2 {
         const jsonStr = JSON.stringify(contents, undefined, 4);
         clipboardService.writeText(jsonStr);
         notificationService.info({
-            name: ( localize(11256, "Merge Editor")),
-            message: ( localize(11258, "Successfully copied merge editor state"))
+            name: ( localize(11281, "Merge Editor")),
+            message: ( localize(11283, "Successfully copied merge editor state"))
         });
     }
 }
@@ -64,7 +64,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         super({
             id: "merge.dev.saveContentsToFolder",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(11259, "Save Merge Editor State to Folder")),
+            title: ( localize2(11284, "Save Merge Editor State to Folder")),
             icon: Codicon.layoutCentered,
             f1: true,
             precondition: ctxIsMergeEditor
@@ -80,8 +80,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
         const languageService = accessor.get(ILanguageService);
         if (!(activeEditorPane instanceof MergeEditor)) {
             notificationService.info({
-                name: ( localize(11256, "Merge Editor")),
-                message: ( localize(11257, "No active merge editor"))
+                name: ( localize(11281, "Merge Editor")),
+                message: ( localize(11282, "No active merge editor"))
             });
             return;
         }
@@ -93,7 +93,7 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             canSelectFiles: false,
             canSelectFolders: true,
             canSelectMany: false,
-            title: ( localize(11260, "Select folder to save to"))
+            title: ( localize(11285, "Select folder to save to"))
         });
         if (!result) {
             return;
@@ -115,8 +115,8 @@ class MergeEditorSaveContentsToFolder extends Action2 {
             write("initialResult", model.getInitialResultValue())
         ]);
         notificationService.info({
-            name: ( localize(11256, "Merge Editor")),
-            message: ( localize(11261, "Successfully saved merge editor state to folder"))
+            name: ( localize(11281, "Merge Editor")),
+            message: ( localize(11286, "Successfully saved merge editor state to folder"))
         });
     }
 }
@@ -125,7 +125,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
         super({
             id: "merge.dev.loadContentsFromFolder",
             category: MERGE_EDITOR_CATEGORY,
-            title: ( localize2(11262, "Load Merge Editor State from Folder")),
+            title: ( localize2(11287, "Load Merge Editor State from Folder")),
             icon: Codicon.layoutCentered,
             f1: true
         });
@@ -144,7 +144,7 @@ class MergeEditorLoadContentsFromFolder extends Action2 {
                 canSelectFiles: false,
                 canSelectFolders: true,
                 canSelectMany: false,
-                title: ( localize(11260, "Select folder to save to"))
+                title: ( localize(11285, "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(11263, "Merge Editor"))), [( new SyncDescriptor(MergeEditorInput))]);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(MergeEditor, MergeEditor.ID, ( localize(11288, "Merge Editor"))), [( new SyncDescriptor(MergeEditorInput))]);
 ( Registry.as(EditorExtensions.EditorFactory)).registerEditorSerializer(MergeEditorInput.ID, MergeEditorSerializer);
 ( Registry.as(Extensions.Configuration)).registerConfiguration({
     properties: {
@@ -24,7 +24,7 @@ import { MergeEditorAccessibilityHelpProvider } from './mergeEditorAccessibility
             type: "string",
             enum: ["legacy", "advanced"],
             default: "advanced",
-            markdownEnumDescriptions: [( localize(11264, "Uses the legacy diffing algorithm.")), ( localize(11265, "Uses the advanced diffing algorithm."))]
+            markdownEnumDescriptions: [( localize(11289, "Uses the legacy diffing algorithm.")), ( localize(11290, "Uses the advanced diffing algorithm."))]
         },
         "mergeEditor.showDeletionMarkers": {
             type: "boolean",

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

@@ -18,18 +18,18 @@ class MergeEditorAccessibilityHelpProvider {
         if (!codeEditor) {
             return;
         }
-        const content = [( localize(11266, "You are in a merge editor.")), ( localize(
-            11267,
+        const content = [( localize(11291, "You are in a merge editor.")), ( localize(
+            11292,
             "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(
-            11268,
+            11293,
             "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(11269, "Complete the Merge{0}.", "<keybinding:mergeEditor.acceptMerge>")), ( localize(
-            11270,
+        )), ( localize(11294, "Complete the Merge{0}.", "<keybinding:mergeEditor.acceptMerge>")), ( localize(
+            11295,
             "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,51 +12,51 @@ 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(11306, "The background color for changes.")));
+registerColor("mergeEditor.change.background", "#9bb95533", ( localize(11331, "The background color for changes.")));
 registerColor("mergeEditor.change.word.background", {
     dark: "#9ccc2c33",
     light: "#9ccc2c66",
     hcDark: "#9ccc2c33",
     hcLight: "#9ccc2c66"
-}, ( localize(11307, "The background color for word changes.")));
+}, ( localize(11332, "The background color for word changes.")));
 registerColor("mergeEditor.changeBase.background", {
     dark: "#4B1818FF",
     light: "#FFCCCCFF",
     hcDark: "#4B1818FF",
     hcLight: "#FFCCCCFF"
-}, ( localize(11308, "The background color for changes in base.")));
+}, ( localize(11333, "The background color for changes in base.")));
 registerColor("mergeEditor.changeBase.word.background", {
     dark: "#6F1313FF",
     light: "#FFA3A3FF",
     hcDark: "#6F1313FF",
     hcLight: "#FFA3A3FF"
-}, ( localize(11309, "The background color for word changes in base.")));
+}, ( localize(11334, "The background color for word changes in base.")));
 registerColor("mergeEditor.conflict.unhandledUnfocused.border", {
     dark: "#ffa6007a",
     light: "#ffa600FF",
     hcDark: "#ffa6007a",
     hcLight: "#ffa6007a"
-}, ( localize(11310, "The border color of unhandled unfocused conflicts.")));
-registerColor("mergeEditor.conflict.unhandledFocused.border", "#ffa600", ( localize(11311, "The border color of unhandled focused conflicts.")));
+}, ( localize(11335, "The border color of unhandled unfocused conflicts.")));
+registerColor("mergeEditor.conflict.unhandledFocused.border", "#ffa600", ( localize(11336, "The border color of unhandled focused conflicts.")));
 registerColor(
     "mergeEditor.conflict.handledUnfocused.border",
     "#86868649",
-    ( localize(11312, "The border color of handled unfocused conflicts."))
+    ( localize(11337, "The border color of handled unfocused conflicts."))
 );
-registerColor("mergeEditor.conflict.handledFocused.border", "#c1c1c1cc", ( localize(11313, "The border color of handled focused conflicts.")));
+registerColor("mergeEditor.conflict.handledFocused.border", "#c1c1c1cc", ( localize(11338, "The border color of handled focused conflicts.")));
 const handledConflictMinimapOverViewRulerColor = registerColor(
     "mergeEditor.conflict.handled.minimapOverViewRuler",
     "#adaca8ee",
-    ( localize(11314, "The foreground color for changes in input 1."))
+    ( localize(11339, "The foreground color for changes in input 1."))
 );
 const unhandledConflictMinimapOverViewRulerColor = registerColor(
     "mergeEditor.conflict.unhandled.minimapOverViewRuler",
     "#fcba03FF",
-    ( localize(11315, "The foreground color for changes in input 1."))
+    ( localize(11340, "The foreground color for changes in input 1."))
 );
-registerColor("mergeEditor.conflictingLines.background", "#ffea0047", ( localize(11316, "The background of the \"Conflicting Lines\" text.")));
+registerColor("mergeEditor.conflictingLines.background", "#ffea0047", ( localize(11341, "The background of the \"Conflicting Lines\" text.")));
 const contentTransparency = 0.4;
-registerColor("mergeEditor.conflict.input1.background", ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(11317, "The background color of decorations in input 1.")));
-registerColor("mergeEditor.conflict.input2.background", ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(11318, "The background color of decorations in input 2.")));
+registerColor("mergeEditor.conflict.input1.background", ( transparent(mergeCurrentHeaderBackground, contentTransparency)), ( localize(11342, "The background color of decorations in input 1.")));
+registerColor("mergeEditor.conflict.input2.background", ( transparent(mergeIncomingHeaderBackground, contentTransparency)), ( localize(11343, "The background color of decorations in input 2.")));
 
 export { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor };

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

@@ -92,14 +92,14 @@ class ActionsSource {
             const result = [];
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
                 result.push({
-                    text: ( localize(11319, "Manual Resolution")),
-                    tooltip: ( localize(11320, "This conflict has been resolved manually."))
+                    text: ( localize(11344, "Manual Resolution")),
+                    tooltip: ( localize(11345, "This conflict has been resolved manually."))
                 });
             } else if (state.kind === ModifiedBaseRangeStateKind.base) {
                 result.push({
-                    text: ( localize(11321, "No Changes Accepted")),
+                    text: ( localize(11346, "No Changes Accepted")),
                     tooltip: ( localize(
-                        11322,
+                        11347,
                         "The current resolution of this conflict equals the common ancestor of both the right and left changes."
                     ))
                 });
@@ -120,33 +120,33 @@ class ActionsSource {
             }
             const stateToggles = [];
             if (state.includesInput1) {
-                stateToggles.push(command(( localize(11323, "Remove {0}", model.input1.title)), async () => {
+                stateToggles.push(command(( localize(11348, "Remove {0}", model.input1.title)), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, state.withInputValue(1, false), true, tx);
                         model.telemetry.reportRemoveInvoked(1, state.includesInput(2));
                     });
-                }, ( localize(11324, "Remove {0} from the result document.", model.input1.title))));
+                }, ( localize(11349, "Remove {0} from the result document.", model.input1.title))));
             }
             if (state.includesInput2) {
-                stateToggles.push(command(( localize(11323, "Remove {0}", model.input2.title)), async () => {
+                stateToggles.push(command(( localize(11348, "Remove {0}", model.input2.title)), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, state.withInputValue(2, false), true, tx);
                         model.telemetry.reportRemoveInvoked(2, state.includesInput(1));
                     });
-                }, ( localize(11324, "Remove {0} from the result document.", model.input2.title))));
+                }, ( localize(11349, "Remove {0} from the result document.", model.input2.title))));
             }
             if (state.kind === ModifiedBaseRangeStateKind.both && state.firstInput === 2) {
                 stateToggles.reverse();
             }
             result.push(...stateToggles);
             if (state.kind === ModifiedBaseRangeStateKind.unrecognized) {
-                result.push(command(( localize(11325, "Reset to base")), async () => {
+                result.push(command(( localize(11350, "Reset to base")), async () => {
                     transaction(tx => {
                         model.setState(modifiedBaseRange, ModifiedBaseRangeState.base, true, tx);
                         model.telemetry.reportResetToBaseInvoked();
                     });
                 }, ( localize(
-                    11326,
+                    11351,
                     "Reset this conflict to the common ancestor of both the right and left changes."
                 ))));
             }
@@ -178,7 +178,7 @@ class ActionsSource {
             const otherInputNumber = inputNumber === 1 ? 2 : 1;
             if (state.kind !== ModifiedBaseRangeStateKind.unrecognized && !state.isInputIncluded(inputNumber)) {
                 if (!state.isInputIncluded(otherInputNumber) || !this.viewModel.shouldUseAppendInsteadOfAccept.read(reader)) {
-                    result.push(command(( localize(11327, "Accept {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11352, "Accept {0}", inputData.title)), async () => {
                         transaction(tx => {
                             model.setState(
                                 modifiedBaseRange,
@@ -188,9 +188,9 @@ class ActionsSource {
                             );
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11328, "Accept {0} in the result document.", inputData.title))));
+                    }, ( localize(11353, "Accept {0} in the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        const commandName = modifiedBaseRange.isOrderRelevant ? ( localize(11329, "Accept Combination ({0} First)", inputData.title)) : ( localize(11330, "Accept Combination"));
+                        const commandName = modifiedBaseRange.isOrderRelevant ? ( localize(11354, "Accept Combination ({0} First)", inputData.title)) : ( localize(11355, "Accept Combination"));
                         result.push(command(commandName, async () => {
                             transaction(tx => {
                                 model.setState(
@@ -202,12 +202,12 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11331,
+                            11356,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 } else {
-                    result.push(command(( localize(11332, "Append {0}", inputData.title)), async () => {
+                    result.push(command(( localize(11357, "Append {0}", inputData.title)), async () => {
                         transaction(tx => {
                             model.setState(
                                 modifiedBaseRange,
@@ -217,9 +217,9 @@ class ActionsSource {
                             );
                             model.telemetry.reportAcceptInvoked(inputNumber, state.includesInput(otherInputNumber));
                         });
-                    }, ( localize(11333, "Append {0} to the result document.", inputData.title))));
+                    }, ( localize(11358, "Append {0} to the result document.", inputData.title))));
                     if (modifiedBaseRange.canBeCombined) {
-                        result.push(command(( localize(11334, "Accept Combination", inputData.title)), async () => {
+                        result.push(command(( localize(11359, "Accept Combination", inputData.title)), async () => {
                             transaction(tx => {
                                 model.setState(
                                     modifiedBaseRange,
@@ -230,17 +230,17 @@ class ActionsSource {
                                 model.telemetry.reportSmartCombinationInvoked(state.includesInput(otherInputNumber));
                             });
                         }, ( localize(
-                            11331,
+                            11356,
                             "Accept an automatic combination of both sides in the result document."
                         ))));
                     }
                 }
                 if (!model.isInputHandled(modifiedBaseRange, inputNumber).read(reader)) {
-                    result.push(command(( localize(11335, "Ignore")), async () => {
+                    result.push(command(( localize(11360, "Ignore")), async () => {
                         transaction(tx => {
                             model.setInputHandled(modifiedBaseRange, inputNumber, true, tx);
                         });
-                    }, ( localize(11336, "Don't take this side of the conflict."))));
+                    }, ( localize(11361, "Don't take this side of the conflict."))));
                 }
             }
             return result;

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

@@ -122,16 +122,16 @@ let BaseCodeEditorView = class BaseCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.base);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11337, "Base"))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11362, "Base"))));
             const baseShowDiffAgainst = vm.baseShowDiffAgainst.read(reader);
             let node = undefined;
             if (baseShowDiffAgainst) {
                 const label = ( localize(
-                    11338,
+                    11363,
                     "Comparing with {0}",
                     baseShowDiffAgainst === 1 ? vm.model.input1.title : vm.model.input2.title
                 ));
-                const tooltip = ( localize(11339, "Differences are highlighted with a background color."));
+                const tooltip = ( localize(11364, "Differences are highlighted with a background color."));
                 node = h("span", {
                     title: tooltip
                 }, [label]).root;

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

@@ -178,7 +178,7 @@ 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(11340, "Input 1")) : vm.model.input2.title || ( localize(11341, "Input 2"));
+            const title = this.inputNumber === 1 ? vm.model.input1.title || ( localize(11365, "Input 1")) : vm.model.input2.title || ( localize(11366, "Input 2"));
             const description = this.inputNumber === 1 ? vm.model.input1.description : vm.model.input2.description;
             const detail = this.inputNumber === 1 ? vm.model.input1.detail : vm.model.input2.detail;
             reset(this.htmlElements.title, ...renderLabelWithIcons(title));
@@ -255,16 +255,16 @@ class ModifiedBaseRangeGutterItemModel {
         }
         const both = state.includesInput1 && state.includesInput2;
         return [
-            this.baseRange.input1Diffs.length > 0 ? action("mergeEditor.acceptInput1", ( localize(11342, "Accept {0}", this.model.input1.title)), state.toggle(1), state.includesInput1) : undefined,
-            this.baseRange.input2Diffs.length > 0 ? action("mergeEditor.acceptInput2", ( localize(11342, "Accept {0}", this.model.input2.title)), state.toggle(2), state.includesInput2) : undefined,
-            this.baseRange.isConflicting ? setFields(action("mergeEditor.acceptBoth", ( localize(11343, "Accept Both")), state.withInputValue(1, !both).withInputValue(2, !both), both), {
+            this.baseRange.input1Diffs.length > 0 ? action("mergeEditor.acceptInput1", ( localize(11367, "Accept {0}", this.model.input1.title)), state.toggle(1), state.includesInput1) : undefined,
+            this.baseRange.input2Diffs.length > 0 ? action("mergeEditor.acceptInput2", ( localize(11367, "Accept {0}", this.model.input2.title)), state.toggle(2), state.includesInput2) : undefined,
+            this.baseRange.isConflicting ? setFields(action("mergeEditor.acceptBoth", ( localize(11368, "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(11344, "Swap")), state.swap(), false), {
+            this.baseRange.isConflicting ? setFields(action("mergeEditor.swap", ( localize(11369, "Swap")), state.swap(), false), {
                 enabled: !state.kind && (!both || this.baseRange.isOrderRelevant)
             }) : undefined,
-            setFields(( new Action("mergeEditor.markAsHandled", ( localize(11345, "Mark as Handled")), undefined, true, () => {
+            setFields(( new Action("mergeEditor.markAsHandled", ( localize(11370, "Mark as Handled")), undefined, true, () => {
                 transaction(tx => {
                     this.model.setHandled(this.baseRange, !handled, tx);
                 });
@@ -311,22 +311,22 @@ class MergeConflictGutterItemView extends Disposable {
                 [InputState.excluded]: {
                     icon: undefined,
                     checked: false,
-                    title: ( localize(11346, "Accept"))
+                    title: ( localize(11371, "Accept"))
                 },
                 [InputState.unrecognized]: {
                     icon: Codicon.circleFilled,
                     checked: false,
-                    title: ( localize(11347, "Accept (result is dirty)"))
+                    title: ( localize(11372, "Accept (result is dirty)"))
                 },
                 [InputState.first]: {
                     icon: Codicon.check,
                     checked: true,
-                    title: ( localize(11348, "Undo accept"))
+                    title: ( localize(11373, "Undo accept"))
                 },
                 [InputState.second]: {
                     icon: Codicon.checkAll,
                     checked: true,
-                    title: ( localize(11349, "Undo accept (currently second)"))
+                    title: ( localize(11374, "Undo accept (currently second)"))
                 }
             };
             const state = iconMap[value];

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

@@ -139,7 +139,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11350, "Result"))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(11375, "Result"))));
             reset(
                 this.htmlElements.description,
                 ...renderLabelWithIcons(this._labelService.getUriLabel(vm.model.resultTextModel.uri, {
@@ -158,7 +158,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             const count = model.unhandledConflictsCount.read(reader);
-            const text = count === 1 ? ( localize(11351, "{0} Conflict Remaining", count)) : ( localize(11352, "{0} Conflicts Remaining ", count));
+            const text = count === 1 ? ( localize(11376, "{0} Conflict Remaining", count)) : ( localize(11377, "{0} Conflicts Remaining ", count));
             remainingConflictsActionBar.clear();
             remainingConflictsActionBar.push({
                 class: undefined,
@@ -169,7 +169,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                     vm.model.telemetry.reportConflictCounterClicked();
                     vm.goToNextModifiedBaseRange(m => !model.isHandled(m).read(undefined));
                 },
-                tooltip: count > 0 ? ( localize(11353, "Go to next conflict")) : ( localize(11354, "All conflicts handled, the merge can be completed now."))
+                tooltip: count > 0 ? ( localize(11378, "Go to next conflict")) : ( localize(11379, "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

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

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

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

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

@@ -26,11 +26,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(12073, "Keyboard Layout"));
+        const name = ( localize(12098, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(12074, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(12099, "Layout: {0}", layoutInfo.label));
             this.pickerElement.value = this.statusbarService.addEntry({
                 name,
                 text,
@@ -42,7 +42,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
             const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
             const layoutInfo = parseKeyboardLayoutDescription(layout);
             if (this.pickerElement.value) {
-                const text = ( localize(12074, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(12099, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -50,7 +50,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                     command: KEYBOARD_LAYOUT_OPEN_PICKER
                 });
             } else {
-                const text = ( localize(12074, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(12099, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value = this.statusbarService.addEntry({
                     name,
                     text,
@@ -68,17 +68,17 @@ registerWorkbenchContribution2(
     WorkbenchPhase.BlockStartup
 );
 const DEFAULT_CONTENT = [`// ${( localize(
-    12075,
+    12100,
     "Defines the keyboard layout used in VS Code in the browser environment."
 ))}`, `// ${( localize(
-    12076,
+    12101,
     "Open VS Code and run \"Developer: Inspect Key Mappings (JSON)\" from Command Palette."
 ))}`, ``, `// Once you have the keyboard layout info, please paste it below.`, "\n"].join("\n");
 registerAction2(class extends Action2 {
     constructor() {
         super({
             id: KEYBOARD_LAYOUT_OPEN_PICKER,
-            title: ( localize2(12077, "Change Keyboard Layout")),
+            title: ( localize2(12102, "Change Keyboard Layout")),
             f1: true
         });
     }
@@ -113,21 +113,21 @@ registerAction2(class extends Action2 {
             const platform = isMacintosh ? "Mac" : isWindows ? "Win" : "Linux";
             picks.unshift({
                 type: "separator",
-                label: ( localize(12078, "Keyboard Layouts ({0})", platform))
+                label: ( localize(12103, "Keyboard Layouts ({0})", platform))
             });
         }
         const configureKeyboardLayout = {
-            label: ( localize(12079, "Configure Keyboard Layout"))
+            label: ( localize(12104, "Configure Keyboard Layout"))
         };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(12080, "Auto Detect")),
+            label: ( localize(12105, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
         const pick = await quickInputService.pick(picks, {
-            placeHolder: ( localize(12081, "Select Keyboard Layout")),
+            placeHolder: ( localize(12106, "Select Keyboard Layout")),
             matchOnDescription: true
         });
         if (!pick) {
@@ -153,7 +153,7 @@ registerAction2(class extends Action2 {
                     }
                 });
             }, error => {
-                throw ( new Error(( localize(12082, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(12107, "Unable to create '{0}' ({1}).", (file.toString()), error))));
             });
             return Promise.resolve();
         }

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

@@ -21,7 +21,7 @@ registerWorkbenchContribution2(
             minimum: 1,
             maximum: 20,
             description: ( localize(
-                12646,
+                12671,
                 "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."
             ))
         },
@@ -31,7 +31,7 @@ registerWorkbenchContribution2(
             minimum: 0,
             maximum: 2000,
             description: ( localize(
-                12647,
+                12672,
                 "Controls the hover feedback delay in milliseconds of the dragging area in between views/editors."
             ))
         }

package/vscode/src/vs/workbench/contrib/scrollLocking/browser/scrollLocking.js

@@ -122,8 +122,8 @@ let SyncScroll = class SyncScroll extends Disposable {
     toggleStatusbarItem(active) {
         if (active) {
             if (!this.statusBarEntry.value) {
-                const text = ( localize(12847, "Scrolling Locked"));
-                const tooltip = ( localize(12848, "Lock Scrolling Enabled"));
+                const text = ( localize(12872, "Scrolling Locked"));
+                const tooltip = ( localize(12873, "Lock Scrolling Enabled"));
                 this.statusBarEntry.value = this.statusbarService.addEntry({
                     name: text,
                     text,
@@ -148,13 +148,13 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.toggleLockedScrolling",
                     title: {
-                        ...( localize2(12849, "Toggle Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(12850, "Locked Scrolling"))
+                        ...( localize2(12874, "Toggle Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(12875, "Locked Scrolling"))
                     },
                     category: Categories.View,
                     f1: true,
                     metadata: {
-                        description: ( localize(12851, "Synchronize Scrolling Editors"))
+                        description: ( localize(12876, "Synchronize Scrolling Editors"))
                     }
                 });
             }
@@ -167,8 +167,8 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: "workbench.action.holdLockedScrolling",
                     title: {
-                        ...( localize2(12852, "Hold Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(12853, "Locked Scrolling"))
+                        ...( localize2(12877, "Hold Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(12878, "Locked Scrolling"))
                     },
                     category: Categories.View
                 });