@codingame/monaco-vscode-view-common-service-override 23.3.0 → 24.1.0

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

@@ -17,8 +17,8 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IContextMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextview/browser/contextView.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { defaultToggleStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
-import { InputState } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
-import { applyObservableDecorations, setFields } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { InputState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange';
+import { applyObservableDecorations, setFields } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.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(9025, 'Input 1'))
-                : vm.model.input2.title || ( localize(9026, 'Input 2'));
+                ? vm.model.input1.title || ( localize(9157, 'Input 1'))
+                : vm.model.input2.title || ( localize(9158, '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(9027, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
+                ? action('mergeEditor.acceptInput1', ( localize(9159, 'Accept {0}', this.model.input1.title)), state.toggle(1), state.includesInput1)
                 : undefined,
             this.baseRange.input2Diffs.length > 0
-                ? action('mergeEditor.acceptInput2', ( localize(9027, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
+                ? action('mergeEditor.acceptInput2', ( localize(9159, 'Accept {0}', this.model.input2.title)), state.toggle(2), state.includesInput2)
                 : undefined,
             this.baseRange.isConflicting
-                ? setFields(action('mergeEditor.acceptBoth', ( localize(9028, 'Accept Both')), state.withInputValue(1, !both).withInputValue(2, !both), both), { enabled: this.baseRange.canBeCombined })
+                ? setFields(action('mergeEditor.acceptBoth', ( localize(9160, '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(9029, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
+                ? setFields(action('mergeEditor.swap', ( localize(9161, 'Swap')), state.swap(), false), { enabled: !state.kind && (!both || this.baseRange.isOrderRelevant) })
                 : undefined,
-            setFields(( new Action('mergeEditor.markAsHandled', ( localize(9030, 'Mark as Handled')), undefined, true, () => {
+            setFields(( new Action('mergeEditor.markAsHandled', ( localize(9162, '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(9031, "Accept")) },
-                [InputState.unrecognized]: { icon: Codicon.circleFilled, checked: false, title: ( localize(9032, "Accept (result is dirty)")) },
-                [InputState.first]: { icon: Codicon.check, checked: true, title: ( localize(9033, "Undo accept")) },
-                [InputState.second]: { icon: Codicon.checkAll, checked: true, title: ( localize(9034, "Undo accept (currently second)")) },
+                [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)")) },
             };
             const state = iconMap[value];
             checkBox.setIcon(state.icon);

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

@@ -14,11 +14,11 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
-import { MergeEditorLineRange } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { join, applyObservableDecorations } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { MergeEditorLineRange } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { join, applyObservableDecorations } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { handledConflictMinimapOverViewRulerColor, unhandledConflictMinimapOverViewRulerColor } from '../colors.js';
 import { EditorGutter } from '../editorGutter.js';
-import { ctxIsMergeResultEditor } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
+import { ctxIsMergeResultEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
 import { CodeEditorView, createSelectionsAutorun, TitleMenu } from './codeEditorView.js';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
 import { autorunWithStore, autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
@@ -131,7 +131,7 @@ let ResultCodeEditorView = class ResultCodeEditorView extends CodeEditorView {
                 return;
             }
             this.editor.setModel(vm.model.resultTextModel);
-            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9035, 'Result'))));
+            reset(this.htmlElements.title, ...renderLabelWithIcons(( localize(9167, '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(9036, '{0} Conflict Remaining', count))
-                : ( localize(9037, '{0} Conflicts Remaining ', count));
+                ? ( localize(9168, '{0} Conflict Remaining', count))
+                : ( localize(9169, '{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(9038, 'Go to next conflict'))
-                    : ( localize(9039, 'All conflicts handled, the merge can be completed now.')),
+                    ? ( localize(9170, 'Go to next conflict'))
+                    : ( localize(9171, '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/lineAlignment.d.ts

@@ -1,4 +1,4 @@
-import { ModifiedBaseRange } from "@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
+import { ModifiedBaseRange } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
 export type LineAlignment = [
     input1LineNumber: number | undefined,
     baseLineNumber: number,

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

@@ -5,8 +5,8 @@ import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/ty
 import { Position } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/position';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { TextLength } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/text/textLength';
-import { RangeMapping } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { lengthOfRange, lengthBetweenPositions, addLength } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils';
+import { RangeMapping } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
+import { lengthOfRange, lengthBetweenPositions, addLength } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/rangeUtils';
 
 function getAlignments(m) {
     const equalRanges1 = toEqualRangeMappings(m.input1Diffs.flatMap(d => d.rangeMappings), m.baseRange.toExclusiveRange(), m.input1Range.toExclusiveRange());

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.d.ts

@@ -16,13 +16,13 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
-import { AbstractTextEditor } from "@codingame/monaco-vscode-0b011daf-0f15-57de-bd5b-8953592c556c-common/vscode/vs/workbench/browser/parts/editor/textEditor";
+import { AbstractTextEditor } from "@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/textEditor";
 import { IEditorOpenContext } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor";
 import { EditorInput } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorInput";
-import { IMergeEditorInputModel } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel";
-import { MergeEditorModel } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
+import { IMergeEditorInputModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInputModel";
+import { MergeEditorModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
 import { MergeEditorViewModel } from "./viewModel.js";
-import { MergeEditorLayoutKind } from "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor";
+import { MergeEditorLayoutKind } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor";
 import { IEditorGroup } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service";

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

@@ -2,7 +2,7 @@
 import { registerCss } from '@codingame/monaco-vscode-api/css';
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { reset } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
-import { SerializableGrid } from '@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common/vscode/vs/base/browser/ui/grid/grid';
+import { SerializableGrid } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/grid/grid';
 import '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/splitview/splitview';
 import { Color } from '@codingame/monaco-vscode-api/vscode/vs/base/common/color';
 import { BugIndicatingError, onUnexpectedError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
@@ -23,18 +23,18 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
-import { AbstractTextEditor } from '@codingame/monaco-vscode-0b011daf-0f15-57de-bd5b-8953592c556c-common/vscode/vs/workbench/browser/parts/editor/textEditor';
+import { AbstractTextEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/textEditor';
 import { DEFAULT_EDITOR_ASSOCIATION } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 import { applyTextEditorOptions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/editorOptions';
 import { readTransientState, writeTransientState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/codeEditor/browser/toggleWordWrap';
-import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { PersistentStore, deepMerge } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { MergeEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
+import { PersistentStore, deepMerge } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
 import { BaseCodeEditorView } from './editors/baseCodeEditorView.js';
 import { ScrollSynchronizer } from './scrollSynchronizer.js';
 import { MergeEditorViewModel } from './viewModel.js';
 import { ViewZoneComputer } from './viewZones.js';
-import { ctxIsMergeEditor, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeResultUri, ctxMergeBaseUri, ctxMergeEditorShowNonConflictingChanges } from '@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
-import { settingsSashBorder } from '@codingame/monaco-vscode-02fe61a6-05e4-5021-8c27-16e910b9182c-common/vscode/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
+import { ctxIsMergeEditor, ctxMergeEditorLayout, ctxMergeEditorShowBase, ctxMergeEditorShowBaseAtTop, ctxMergeResultUri, ctxMergeBaseUri, ctxMergeEditorShowNonConflictingChanges } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/common/mergeEditor';
+import { settingsSashBorder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { RegisteredEditorPriority } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService';
 import { IEditorResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorResolverService.service';
@@ -118,7 +118,7 @@ let MergeEditor = class MergeEditor extends AbstractTextEditor {
         if (this.input) {
             return this.input.getName();
         }
-        return localize(9040, "Text Merge Editor");
+        return localize(9172, "Text Merge Editor");
     }
     createEditorControl(parent, initialOptions) {
         this.rootHtmlElement = parent;

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

@@ -2,8 +2,8 @@
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { ScrollType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/editorCommon';
-import { DocumentLineRangeMap } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
-import { ReentrancyBarrier } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/base/common/controlFlow';
+import { DocumentLineRangeMap } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/mapping';
+import { ReentrancyBarrier } from '@codingame/monaco-vscode-api/vscode/vs/base/common/controlFlow';
 import { BugIndicatingError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';

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

@@ -3,8 +3,8 @@ import { IObservable, ITransaction } from "@codingame/monaco-vscode-api/vscode/v
 import { Range } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
-import { MergeEditorModel } from "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
-import { InputNumber, ModifiedBaseRange, ModifiedBaseRangeState } from "@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
+import { MergeEditorModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/mergeEditorModel";
+import { InputNumber, ModifiedBaseRange, ModifiedBaseRangeState } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/modifiedBaseRange";
 import { BaseCodeEditorView } from "./editors/baseCodeEditorView.js";
 import { CodeEditorView } from "./editors/codeEditorView.js";
 import { InputCodeEditorView } from "./editors/inputCodeEditorView.js";

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

@@ -8,7 +8,7 @@ import { ScrollType } from '@codingame/monaco-vscode-api/vscode/vs/editor/common
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
-import { MergeEditorLineRange } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { MergeEditorLineRange } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derivedObservableWithWritableCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/utils/utils';
@@ -222,7 +222,7 @@ let MergeEditorViewModel = class MergeEditorViewModel extends Disposable {
     toggleActiveConflict(inputNumber) {
         const activeModifiedBaseRange = this.activeModifiedBaseRange.get();
         if (!activeModifiedBaseRange) {
-            this.notificationService.error(( localize(9041, "There is currently no conflict focused that can be toggled.")));
+            this.notificationService.error(( localize(9173, "There is currently no conflict focused that can be toggled.")));
             return;
         }
         transaction(tx => {

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

@@ -1,9 +1,9 @@
 
 import { $ } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/dom';
 import { CompareResult } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
-import { MergeEditorLineRange } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
-import { join } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
-import { ConflictActionsFactory, ActionsSource } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
+import { MergeEditorLineRange } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/model/lineRange';
+import { join } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/utils';
+import { ConflictActionsFactory, ActionsSource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mergeEditor/browser/view/conflictActions';
 import { getAlignments } from './lineAlignment.js';
 
 class ViewZoneComputer {

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

@@ -4,10 +4,10 @@ import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls'
 import { StatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
 import { Disposable, MutableDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
-import { parseKeyboardLayoutDescription, areKeyboardLayoutsEqual, getKeyboardLayoutId } from '@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
+import { parseKeyboardLayoutDescription, areKeyboardLayoutsEqual, getKeyboardLayoutId } from '@codingame/monaco-vscode-api/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
 import { IKeyboardLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keyboardLayout/common/keyboardLayout.service';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { KEYBOARD_LAYOUT_OPEN_PICKER } from '@codingame/monaco-vscode-7869cfe8-f42c-5721-9f2b-7d04a6a41f16-common/vscode/vs/workbench/contrib/preferences/common/preferences';
+import { KEYBOARD_LAYOUT_OPEN_PICKER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/preferences/common/preferences';
 import { isMacintosh, isWindows } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
@@ -24,11 +24,11 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
         this.keyboardLayoutService = keyboardLayoutService;
         this.statusbarService = statusbarService;
         this.pickerElement = this._register(( new MutableDisposable()));
-        const name = ( localize(9709, "Keyboard Layout"));
+        const name = ( localize(9844, "Keyboard Layout"));
         const layout = this.keyboardLayoutService.getCurrentKeyboardLayout();
         if (layout) {
             const layoutInfo = parseKeyboardLayoutDescription(layout);
-            const text = ( localize(9710, "Layout: {0}", layoutInfo.label));
+            const text = ( localize(9845, "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(9710, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9845, "Layout: {0}", layoutInfo.label));
                 this.pickerElement.value.update({
                     name,
                     text,
@@ -49,7 +49,7 @@ let KeyboardLayoutPickerContribution = class KeyboardLayoutPickerContribution ex
                 });
             }
             else {
-                const text = ( localize(9710, "Layout: {0}", layoutInfo.label));
+                const text = ( localize(9845, "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(
-        9711,
+        9846,
         'Defines the keyboard layout used in VS Code in the browser environment.'
     ))}`,
     `// ${( localize(
-        9712,
+        9847,
         '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(9713, "Change Keyboard Layout")),
+            title: ( localize2(9848, "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(9714, "Keyboard Layouts ({0})", platform)) });
+            picks.unshift({ type: 'separator', label: ( localize(9849, "Keyboard Layouts ({0})", platform)) });
         }
-        const configureKeyboardLayout = { label: ( localize(9715, "Configure Keyboard Layout")) };
+        const configureKeyboardLayout = { label: ( localize(9850, "Configure Keyboard Layout")) };
         picks.unshift(configureKeyboardLayout);
         const autoDetectMode = {
-            label: ( localize(9716, "Auto Detect")),
+            label: ( localize(9851, "Auto Detect")),
             description: isAutoDetect ? `Current: ${parseKeyboardLayoutDescription(currentLayout).label}` : undefined,
             picked: isAutoDetect ? true : undefined
         };
         picks.unshift(autoDetectMode);
-        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9717, "Select Keyboard Layout")), matchOnDescription: true });
+        const pick = await quickInputService.pick(picks, { placeHolder: ( localize(9852, "Select Keyboard Layout")), matchOnDescription: true });
         if (!pick) {
             return;
         }
@@ -144,7 +144,7 @@ registerAction2(class extends Action2 {
                     options: { pinned: true }
                 });
             }, (error) => {
-                throw ( new Error(( localize(9718, "Unable to create '{0}' ({1}).", (file.toString()), error))));
+                throw ( new Error(( localize(9853, "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(
-                10269,
+                10404,
                 "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(
-                10270,
+                10405,
                 "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

@@ -5,9 +5,9 @@ import { localize, localize2 } from '@codingame/monaco-vscode-api/vscode/vs/nls'
 import { Categories } from '@codingame/monaco-vscode-api/vscode/vs/platform/action/common/actionCommonCategories';
 import { registerAction2, Action2 } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IKeybindingService } from '@codingame/monaco-vscode-api/vscode/vs/platform/keybinding/common/keybinding.service';
-import { SideBySideEditor } from '@codingame/monaco-vscode-ef156ae1-7926-5925-b78f-228b206ed123-common/vscode/vs/workbench/browser/parts/editor/sideBySideEditor';
+import { SideBySideEditor } from '@codingame/monaco-vscode-api/vscode/vs/workbench/browser/parts/editor/sideBySideEditor';
 import { isEditorPaneWithScrolling } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { ReentrancyBarrier } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/base/common/controlFlow';
+import { ReentrancyBarrier } from '@codingame/monaco-vscode-api/vscode/vs/base/common/controlFlow';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { StatusbarAlignment } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar';
 import { IStatusbarService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/statusbar/browser/statusbar.service';
@@ -117,8 +117,8 @@ let SyncScroll = class SyncScroll extends Disposable {
     toggleStatusbarItem(active) {
         if (active) {
             if (!this.statusBarEntry.value) {
-                const text = ( localize(10486, 'Scrolling Locked'));
-                const tooltip = ( localize(10487, 'Lock Scrolling Enabled'));
+                const text = ( localize(10621, 'Scrolling Locked'));
+                const tooltip = ( localize(10622, 'Lock Scrolling Enabled'));
                 this.statusBarEntry.value = this.statusbarService.addEntry({
                     name: text,
                     text,
@@ -144,13 +144,13 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: 'workbench.action.toggleLockedScrolling',
                     title: {
-                        ...( localize2(10488, "Toggle Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(10489, "Locked Scrolling")),
+                        ...( localize2(10623, "Toggle Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10624, "Locked Scrolling")),
                     },
                     category: Categories.View,
                     f1: true,
                     metadata: {
-                        description: ( localize(10490, "Synchronize Scrolling Editors")),
+                        description: ( localize(10625, "Synchronize Scrolling Editors")),
                     }
                 });
             }
@@ -163,8 +163,8 @@ let SyncScroll = class SyncScroll extends Disposable {
                 super({
                     id: 'workbench.action.holdLockedScrolling',
                     title: {
-                        ...( localize2(10491, "Hold Locked Scrolling Across Editors")),
-                        mnemonicTitle: ( localize(10492, "Locked Scrolling")),
+                        ...( localize2(10626, "Hold Locked Scrolling Across Editors")),
+                        mnemonicTitle: ( localize(10627, "Locked Scrolling")),
                     },
                     category: Categories.View,
                 });

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

@@ -19,15 +19,15 @@ import { KeybindingWeight } from '@codingame/monaco-vscode-api/vscode/vs/platfor
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { TypeHierarchyTreePeekWidget } from './typeHierarchyPeek.js';
-import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { TypeHierarchyDirection, TypeHierarchyProviderRegistry, TypeHierarchyModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 
 var TypeHierarchyController_1;
-const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(12648, 'Whether a type hierarchy provider is available'))));
-const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(12649, 'Whether type hierarchy peek is currently showing'))));
+const _ctxHasTypeHierarchyProvider = ( new RawContextKey('editorHasTypeHierarchyProvider', false, ( localize(12788, 'Whether a type hierarchy provider is available'))));
+const _ctxTypeHierarchyVisible = ( new RawContextKey('typeHierarchyVisible', false, ( localize(12789, 'Whether type hierarchy peek is currently showing'))));
 const _ctxTypeHierarchyDirection = ( new RawContextKey(
     'typeHierarchyDirection',
     undefined,
-    { type: 'string', description: ( localize(12650, 'whether type hierarchy shows super types or subtypes')) }
+    { type: 'string', description: ( localize(12790, 'whether type hierarchy shows super types or subtypes')) }
 ));
 function sanitizedDirection(candidate) {
     return candidate === TypeHierarchyDirection.Subtypes || candidate === TypeHierarchyDirection.Supertypes
@@ -96,14 +96,14 @@ let TypeHierarchyController = class TypeHierarchyController {
                 this._widget.showModel(model);
             }
             else {
-                this._widget.showMessage(( localize(12651, "No results")));
+                this._widget.showMessage(( localize(12791, "No results")));
             }
         }).catch(err => {
             if (isCancellationError(err)) {
                 this.endTypeHierarchy();
                 return;
             }
-            this._widget.showMessage(( localize(12652, "Failed to show type hierarchy")));
+            this._widget.showMessage(( localize(12792, "Failed to show type hierarchy")));
         });
     }
     async startTypeHierarchyFromTypeHierarchy() {
@@ -148,7 +148,7 @@ registerAction2(class PeekTypeHierarchyAction extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showTypeHierarchy',
-            title: ( localize2(12653, 'Peek Type Hierarchy')),
+            title: ( localize2(12793, 'Peek Type Hierarchy')),
             menu: {
                 id: MenuId.EditorContextPeek,
                 group: 'navigation',
@@ -167,7 +167,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSupertypes',
-            title: ( localize2(12654, 'Show Supertypes')),
+            title: ( localize2(12794, 'Show Supertypes')),
             icon: Codicon.typeHierarchySuper,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Subtypes)))),
             keybinding: {
@@ -189,7 +189,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.showSubtypes',
-            title: ( localize2(12655, 'Show Subtypes')),
+            title: ( localize2(12795, 'Show Subtypes')),
             icon: Codicon.typeHierarchySub,
             precondition: ( ContextKeyExpr.and(_ctxTypeHierarchyVisible, ( _ctxTypeHierarchyDirection.isEqualTo(TypeHierarchyDirection.Supertypes)))),
             keybinding: {
@@ -211,7 +211,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.refocusTypeHierarchy',
-            title: ( localize2(12656, 'Refocus Type Hierarchy')),
+            title: ( localize2(12796, 'Refocus Type Hierarchy')),
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {
                 weight: KeybindingWeight.WorkbenchContrib,
@@ -227,7 +227,7 @@ registerAction2(class extends EditorAction2 {
     constructor() {
         super({
             id: 'editor.closeTypeHierarchy',
-            title: ( localize(12657, 'Close')),
+            title: ( localize(12797, 'Close')),
             icon: Codicon.close,
             precondition: _ctxTypeHierarchyVisible,
             keybinding: {

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.d.ts

@@ -8,7 +8,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { IThemeService } from "@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service";
 import * as typeHTree from "./typeHierarchyTree.js";
-import { TypeHierarchyDirection, TypeHierarchyModel } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy";
+import { TypeHierarchyDirection, TypeHierarchyModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { PeekViewWidget } from "@codingame/monaco-vscode-api/vscode/vs/editor/contrib/peekView/browser/peekView";
 import { IPeekViewService } from "@codingame/monaco-vscode-api/vscode/vs/editor/contrib/peekView/browser/peekView.service";

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

@@ -25,7 +25,7 @@ import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { themeColorFromId } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService';
 import { IThemeService } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/common/themeService.service';
 import { IdentityProvider, AccessibilityProvider, Sorter, VirtualDelegate, TypeRenderer, DataSource } from './typeHierarchyTree.js';
-import { TypeHierarchyDirection } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { TypeHierarchyDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { PeekViewWidget, peekViewBorder, peekViewTitleInfoForeground, peekViewTitleForeground, peekViewTitleBackground, peekViewResultsBackground, peekViewEditorMatchHighlight } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/peekView/browser/peekView';
 import { IPeekViewService } from '@codingame/monaco-vscode-api/vscode/vs/editor/contrib/peekView/browser/peekView.service';
@@ -265,13 +265,13 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         }
         this._previewDisposable.add(value);
         const title = this._direction === TypeHierarchyDirection.Supertypes
-            ? ( localize(12658, "Supertypes of '{0}'", element.model.root.name))
-            : ( localize(12659, "Subtypes of '{0}'", element.model.root.name));
+            ? ( localize(12798, "Supertypes of '{0}'", element.model.root.name))
+            : ( localize(12799, "Subtypes of '{0}'", element.model.root.name));
         this.setTitle(title);
     }
     showLoading() {
         this._parent.dataset['state'] = State.Loading;
-        this.setTitle(( localize(12660, "Loading...")));
+        this.setTitle(( localize(12800, "Loading...")));
         this._show();
     }
     showMessage(message) {
@@ -290,8 +290,8 @@ let TypeHierarchyTreePeekWidget = class TypeHierarchyTreePeekWidget extends Peek
         await this._tree.expand(root.element);
         if (root.children.length === 0) {
             this.showMessage(this._direction === TypeHierarchyDirection.Supertypes
-                ? ( localize(12661, "No supertypes of '{0}'", model.root.name))
-                : ( localize(12662, "No subtypes of '{0}'", model.root.name)));
+                ? ( localize(12801, "No supertypes of '{0}'", model.root.name))
+                : ( localize(12802, "No subtypes of '{0}'", model.root.name)));
         }
         else {
             this._parent.dataset['state'] = State.Data;

package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.d.ts

@@ -1,5 +1,5 @@
 import { IAsyncDataSource, ITreeRenderer, ITreeNode, ITreeSorter } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/tree/tree";
-import { TypeHierarchyDirection, TypeHierarchyItem, TypeHierarchyModel } from "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy";
+import { TypeHierarchyDirection, TypeHierarchyItem, TypeHierarchyModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy";
 import { IIdentityProvider, IListVirtualDelegate } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/list/list";
 import { FuzzyScore } from "@codingame/monaco-vscode-api/vscode/vs/base/common/filters";
 import { IconLabel } from "@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabel";

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

@@ -1,5 +1,5 @@
 
-import { TypeHierarchyModel, TypeHierarchyDirection } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
+import { TypeHierarchyModel, TypeHierarchyDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { createMatches } from '@codingame/monaco-vscode-api/vscode/vs/base/common/filters';
 import { IconLabel } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/iconLabel/iconLabel';
@@ -106,14 +106,14 @@ class AccessibilityProvider {
         this.getDirection = getDirection;
     }
     getWidgetAriaLabel() {
-        return localize(12663, "Type Hierarchy");
+        return localize(12803, "Type Hierarchy");
     }
     getAriaLabel(element) {
         if (this.getDirection() === TypeHierarchyDirection.Supertypes) {
-            return localize(12664, "supertypes of {0}", element.item.name);
+            return localize(12804, "supertypes of {0}", element.item.name);
         }
         else {
-            return localize(12665, "subtypes of {0}", element.item.name);
+            return localize(12805, "subtypes of {0}", element.item.name);
         }
     }
 }