@codingame/monaco-vscode-api 7.1.0 → 8.0.0

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

@@ -1,5 +1,4 @@
-import { localizeWithPath } from '../../../../nls.js';
-const _moduleId = "vs/workbench/contrib/preferences/browser/settingsLayout";
+import { localize } from '../../../../nls.js';
 const defaultCommonlyUsedSettings = [
     'files.autoSave',
     'editor.fontSize',
@@ -17,7 +16,7 @@ const defaultCommonlyUsedSettings = [
 function getCommonlyUsedData(toggleData) {
     return {
         id: 'commonlyUsed',
-        label: ( localizeWithPath(_moduleId, 0, "Commonly Used")),
+        label: ( localize(10324, "Commonly Used")),
         settings: toggleData?.commonlyUsed ?? defaultCommonlyUsedSettings
     };
 }
@@ -27,250 +26,250 @@ const tocData = {
     children: [
         {
             id: 'editor',
-            label: ( localizeWithPath(_moduleId, 1, "Text Editor")),
+            label: ( localize(10325, "Text Editor")),
             settings: ['editor.*'],
             children: [
                 {
                     id: 'editor/cursor',
-                    label: ( localizeWithPath(_moduleId, 2, "Cursor")),
+                    label: ( localize(10326, "Cursor")),
                     settings: ['editor.cursor*']
                 },
                 {
                     id: 'editor/find',
-                    label: ( localizeWithPath(_moduleId, 3, "Find")),
+                    label: ( localize(10327, "Find")),
                     settings: ['editor.find.*']
                 },
                 {
                     id: 'editor/font',
-                    label: ( localizeWithPath(_moduleId, 4, "Font")),
+                    label: ( localize(10328, "Font")),
                     settings: ['editor.font*']
                 },
                 {
                     id: 'editor/format',
-                    label: ( localizeWithPath(_moduleId, 5, "Formatting")),
+                    label: ( localize(10329, "Formatting")),
                     settings: ['editor.format*']
                 },
                 {
                     id: 'editor/diffEditor',
-                    label: ( localizeWithPath(_moduleId, 6, "Diff Editor")),
+                    label: ( localize(10330, "Diff Editor")),
                     settings: ['diffEditor.*']
                 },
                 {
                     id: 'editor/multiDiffEditor',
-                    label: ( localizeWithPath(_moduleId, 7, "Multi-File Diff Editor")),
+                    label: ( localize(10331, "Multi-File Diff Editor")),
                     settings: ['multiDiffEditor.*']
                 },
                 {
                     id: 'editor/minimap',
-                    label: ( localizeWithPath(_moduleId, 8, "Minimap")),
+                    label: ( localize(10332, "Minimap")),
                     settings: ['editor.minimap.*']
                 },
                 {
                     id: 'editor/suggestions',
-                    label: ( localizeWithPath(_moduleId, 9, "Suggestions")),
+                    label: ( localize(10333, "Suggestions")),
                     settings: ['editor.*suggest*']
                 },
                 {
                     id: 'editor/files',
-                    label: ( localizeWithPath(_moduleId, 10, "Files")),
+                    label: ( localize(10334, "Files")),
                     settings: ['files.*']
                 }
             ]
         },
         {
             id: 'workbench',
-            label: ( localizeWithPath(_moduleId, 11, "Workbench")),
+            label: ( localize(10335, "Workbench")),
             settings: ['workbench.*'],
             children: [
                 {
                     id: 'workbench/appearance',
-                    label: ( localizeWithPath(_moduleId, 12, "Appearance")),
+                    label: ( localize(10336, "Appearance")),
                     settings: ['workbench.activityBar.*', 'workbench.*color*', 'workbench.fontAliasing', 'workbench.iconTheme', 'workbench.sidebar.location', 'workbench.*.visible', 'workbench.tips.enabled', 'workbench.tree.*', 'workbench.view.*']
                 },
                 {
                     id: 'workbench/breadcrumbs',
-                    label: ( localizeWithPath(_moduleId, 13, "Breadcrumbs")),
+                    label: ( localize(10337, "Breadcrumbs")),
                     settings: ['breadcrumbs.*']
                 },
                 {
                     id: 'workbench/editor',
-                    label: ( localizeWithPath(_moduleId, 14, "Editor Management")),
+                    label: ( localize(10338, "Editor Management")),
                     settings: ['workbench.editor.*']
                 },
                 {
                     id: 'workbench/settings',
-                    label: ( localizeWithPath(_moduleId, 15, "Settings Editor")),
+                    label: ( localize(10339, "Settings Editor")),
                     settings: ['workbench.settings.*']
                 },
                 {
                     id: 'workbench/zenmode',
-                    label: ( localizeWithPath(_moduleId, 16, "Zen Mode")),
+                    label: ( localize(10340, "Zen Mode")),
                     settings: ['zenmode.*']
                 },
                 {
                     id: 'workbench/screencastmode',
-                    label: ( localizeWithPath(_moduleId, 17, "Screencast Mode")),
+                    label: ( localize(10341, "Screencast Mode")),
                     settings: ['screencastMode.*']
                 }
             ]
         },
         {
             id: 'window',
-            label: ( localizeWithPath(_moduleId, 18, "Window")),
+            label: ( localize(10342, "Window")),
             settings: ['window.*'],
             children: [
                 {
                     id: 'window/newWindow',
-                    label: ( localizeWithPath(_moduleId, 19, "New Window")),
+                    label: ( localize(10343, "New Window")),
                     settings: ['window.*newwindow*']
                 }
             ]
         },
         {
             id: 'features',
-            label: ( localizeWithPath(_moduleId, 20, "Features")),
+            label: ( localize(10344, "Features")),
             children: [
                 {
                     id: 'features/accessibilitySignals',
-                    label: ( localizeWithPath(_moduleId, 21, 'Accessibility Signals')),
+                    label: ( localize(10345, 'Accessibility Signals')),
                     settings: ['accessibility.signal*']
                 },
                 {
                     id: 'features/accessibility',
-                    label: ( localizeWithPath(_moduleId, 22, "Accessibility")),
+                    label: ( localize(10346, "Accessibility")),
                     settings: ['accessibility.*']
                 },
                 {
                     id: 'features/explorer',
-                    label: ( localizeWithPath(_moduleId, 23, "Explorer")),
+                    label: ( localize(10347, "Explorer")),
                     settings: ['explorer.*', 'outline.*']
                 },
                 {
                     id: 'features/search',
-                    label: ( localizeWithPath(_moduleId, 24, "Search")),
+                    label: ( localize(10348, "Search")),
                     settings: ['search.*']
                 },
                 {
                     id: 'features/debug',
-                    label: ( localizeWithPath(_moduleId, 25, "Debug")),
+                    label: ( localize(10349, "Debug")),
                     settings: ['debug.*', 'launch']
                 },
                 {
                     id: 'features/testing',
-                    label: ( localizeWithPath(_moduleId, 26, "Testing")),
+                    label: ( localize(10350, "Testing")),
                     settings: ['testing.*']
                 },
                 {
                     id: 'features/scm',
-                    label: ( localizeWithPath(_moduleId, 27, "Source Control")),
+                    label: ( localize(10351, "Source Control")),
                     settings: ['scm.*']
                 },
                 {
                     id: 'features/extensions',
-                    label: ( localizeWithPath(_moduleId, 28, "Extensions")),
+                    label: ( localize(10352, "Extensions")),
                     settings: ['extensions.*']
                 },
                 {
                     id: 'features/terminal',
-                    label: ( localizeWithPath(_moduleId, 29, "Terminal")),
+                    label: ( localize(10353, "Terminal")),
                     settings: ['terminal.*']
                 },
                 {
                     id: 'features/task',
-                    label: ( localizeWithPath(_moduleId, 30, "Task")),
+                    label: ( localize(10354, "Task")),
                     settings: ['task.*']
                 },
                 {
                     id: 'features/problems',
-                    label: ( localizeWithPath(_moduleId, 31, "Problems")),
+                    label: ( localize(10355, "Problems")),
                     settings: ['problems.*']
                 },
                 {
                     id: 'features/output',
-                    label: ( localizeWithPath(_moduleId, 32, "Output")),
+                    label: ( localize(10356, "Output")),
                     settings: ['output.*']
                 },
                 {
                     id: 'features/comments',
-                    label: ( localizeWithPath(_moduleId, 33, "Comments")),
+                    label: ( localize(10357, "Comments")),
                     settings: ['comments.*']
                 },
                 {
                     id: 'features/remote',
-                    label: ( localizeWithPath(_moduleId, 34, "Remote")),
+                    label: ( localize(10358, "Remote")),
                     settings: ['remote.*']
                 },
                 {
                     id: 'features/timeline',
-                    label: ( localizeWithPath(_moduleId, 35, "Timeline")),
+                    label: ( localize(10359, "Timeline")),
                     settings: ['timeline.*']
                 },
                 {
                     id: 'features/notebook',
-                    label: ( localizeWithPath(_moduleId, 36, 'Notebook')),
+                    label: ( localize(10360, 'Notebook')),
                     settings: ['notebook.*', 'interactiveWindow.*']
                 },
                 {
                     id: 'features/mergeEditor',
-                    label: ( localizeWithPath(_moduleId, 37, 'Merge Editor')),
+                    label: ( localize(10361, 'Merge Editor')),
                     settings: ['mergeEditor.*']
                 },
                 {
                     id: 'features/chat',
-                    label: ( localizeWithPath(_moduleId, 38, 'Chat')),
+                    label: ( localize(10362, 'Chat')),
                     settings: ['chat.*', 'inlineChat.*']
                 }
             ]
         },
         {
             id: 'application',
-            label: ( localizeWithPath(_moduleId, 39, "Application")),
+            label: ( localize(10363, "Application")),
             children: [
                 {
                     id: 'application/http',
-                    label: ( localizeWithPath(_moduleId, 40, "Proxy")),
+                    label: ( localize(10364, "Proxy")),
                     settings: ['http.*']
                 },
                 {
                     id: 'application/keyboard',
-                    label: ( localizeWithPath(_moduleId, 41, "Keyboard")),
+                    label: ( localize(10365, "Keyboard")),
                     settings: ['keyboard.*']
                 },
                 {
                     id: 'application/update',
-                    label: ( localizeWithPath(_moduleId, 42, "Update")),
+                    label: ( localize(10366, "Update")),
                     settings: ['update.*']
                 },
                 {
                     id: 'application/telemetry',
-                    label: ( localizeWithPath(_moduleId, 43, "Telemetry")),
+                    label: ( localize(10367, "Telemetry")),
                     settings: ['telemetry.*']
                 },
                 {
                     id: 'application/settingsSync',
-                    label: ( localizeWithPath(_moduleId, 44, "Settings Sync")),
+                    label: ( localize(10368, "Settings Sync")),
                     settings: ['settingsSync.*']
                 },
                 {
                     id: 'application/experimental',
-                    label: ( localizeWithPath(_moduleId, 45, "Experimental")),
+                    label: ( localize(10369, "Experimental")),
                     settings: ['application.experimental.*']
                 },
                 {
                     id: 'application/other',
-                    label: ( localizeWithPath(_moduleId, 46, "Other")),
+                    label: ( localize(10370, "Other")),
                     settings: ['application.*']
                 }
             ]
         },
         {
             id: 'security',
-            label: ( localizeWithPath(_moduleId, 47, "Security")),
+            label: ( localize(10371, "Security")),
             settings: ['security.*'],
             children: [
                 {
                     id: 'security/workspace',
-                    label: ( localizeWithPath(_moduleId, 48, "Workspace")),
+                    label: ( localize(10372, "Workspace")),
                     settings: ['security.workspace.*']
                 }
             ]

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

@@ -104,7 +104,7 @@ class SettingsTreeSettingElement extends SettingsTreeElement {
     initLabels() {
         if (this.setting.title) {
             this._displayLabel = this.setting.title;
-            this._displayCategory = '';
+            this._displayCategory = this.setting.categoryLabel ?? null;
             return;
         }
         const displayKeyFormat = settingKeyToDisplayFormat(this.setting.key, this.parent.id, this.setting.isLanguageTagSetting);
@@ -255,7 +255,8 @@ class SettingsTreeSettingElement extends SettingsTreeElement {
             this.scopeValue = isConfigured && overrideValues[targetSelector];
             this.defaultValue = overrideValues.defaultValue ?? inspected.defaultValue;
             const registryValues = ( Registry.as(Extensions.Configuration)).getConfigurationDefaultsOverrides();
-            const overrideValueSource = registryValues.get(`[${languageSelector}]`)?.valuesSources?.get(this.setting.key);
+            const source = registryValues.get(`[${languageSelector}]`)?.source;
+            const overrideValueSource = source instanceof Map ? source.get(this.setting.key) : undefined;
             if (overrideValueSource) {
                 this.defaultValueSource = overrideValueSource;
             }

package/vscode/src/vs/workbench/contrib/preferences/common/settingsEditorColorRegistry.js

@@ -1,5 +1,5 @@
 import { Color, RGBA } from '../../../../base/common/color.js';
-import { localizeWithPath } from '../../../../nls.js';
+import { localize } from '../../../../nls.js';
 import { registerColor, transparent } from '../../../../platform/theme/common/colorUtils.js';
 import { focusBorder } from '../../../../platform/theme/common/colors/baseColors.js';
 import '../../../../platform/theme/common/colors/chartsColors.js';
@@ -12,53 +12,46 @@ import '../../../../platform/theme/common/colors/miscColors.js';
 import '../../../../platform/theme/common/colors/quickpickColors.js';
 import '../../../../platform/theme/common/colors/searchColors.js';
 import { PANEL_BORDER } from '../../../common/theme.js';
-const _moduleId = "vs/workbench/contrib/preferences/common/settingsEditorColorRegistry";
-const settingsHeaderForeground = registerColor('settings.headerForeground', { light: '#444444', dark: '#e7e7e7', hcDark: '#ffffff', hcLight: '#292929' }, ( localizeWithPath(_moduleId, 0, "The foreground color for a section header or active title.")));
-const settingsHeaderHoverForeground = registerColor('settings.settingsHeaderHoverForeground', ( (transparent(settingsHeaderForeground, 0.7))), ( localizeWithPath(
-    _moduleId,
-    1,
-    "The foreground color for a section header or hovered title."
-)));
+const settingsHeaderForeground = registerColor('settings.headerForeground', { light: '#444444', dark: '#e7e7e7', hcDark: '#ffffff', hcLight: '#292929' }, ( localize(10283, "The foreground color for a section header or active title.")));
+const settingsHeaderHoverForeground = registerColor('settings.settingsHeaderHoverForeground', ( (transparent(settingsHeaderForeground, 0.7))), ( localize(10284, "The foreground color for a section header or hovered title.")));
 registerColor('settings.modifiedItemIndicator', {
     light: ( (new Color( (new RGBA(102, 175, 224))))),
     dark: ( (new Color( (new RGBA(12, 125, 157))))),
     hcDark: ( (new Color( (new RGBA(0, 73, 122))))),
     hcLight: ( (new Color( (new RGBA(102, 175, 224))))),
-}, ( localizeWithPath(_moduleId, 2, "The color of the modified setting indicator.")));
-const settingsHeaderBorder = registerColor('settings.headerBorder', PANEL_BORDER, ( localizeWithPath(_moduleId, 3, "The color of the header container border.")));
-const settingsSashBorder = registerColor('settings.sashBorder', PANEL_BORDER, ( localizeWithPath(_moduleId, 4, "The color of the Settings editor splitview sash border.")));
-const settingsSelectBackground = registerColor(`settings.dropdownBackground`, selectBackground, ( localizeWithPath(_moduleId, 5, "Settings editor dropdown background.")));
-const settingsSelectForeground = registerColor('settings.dropdownForeground', selectForeground, ( localizeWithPath(_moduleId, 6, "Settings editor dropdown foreground.")));
-const settingsSelectBorder = registerColor('settings.dropdownBorder', selectBorder, ( localizeWithPath(_moduleId, 7, "Settings editor dropdown border.")));
-const settingsSelectListBorder = registerColor('settings.dropdownListBorder', editorWidgetBorder, ( localizeWithPath(
-    _moduleId,
-    8,
+}, ( localize(10285, "The color of the modified setting indicator.")));
+const settingsHeaderBorder = registerColor('settings.headerBorder', PANEL_BORDER, ( localize(10286, "The color of the header container border.")));
+const settingsSashBorder = registerColor('settings.sashBorder', PANEL_BORDER, ( localize(10287, "The color of the Settings editor splitview sash border.")));
+const settingsSelectBackground = registerColor(`settings.dropdownBackground`, selectBackground, ( localize(10288, "Settings editor dropdown background.")));
+const settingsSelectForeground = registerColor('settings.dropdownForeground', selectForeground, ( localize(10289, "Settings editor dropdown foreground.")));
+const settingsSelectBorder = registerColor('settings.dropdownBorder', selectBorder, ( localize(10290, "Settings editor dropdown border.")));
+const settingsSelectListBorder = registerColor('settings.dropdownListBorder', editorWidgetBorder, ( localize(
+    10291,
     "Settings editor dropdown list border. This surrounds the options and separates the options from the description."
 )));
-registerColor('settings.checkboxBackground', checkboxBackground, ( localizeWithPath(_moduleId, 9, "Settings editor checkbox background.")));
-registerColor('settings.checkboxForeground', checkboxForeground, ( localizeWithPath(_moduleId, 10, "Settings editor checkbox foreground.")));
-registerColor('settings.checkboxBorder', checkboxBorder, ( localizeWithPath(_moduleId, 11, "Settings editor checkbox border.")));
-const settingsTextInputBackground = registerColor('settings.textInputBackground', inputBackground, ( localizeWithPath(_moduleId, 12, "Settings editor text input box background.")));
-const settingsTextInputForeground = registerColor('settings.textInputForeground', inputForeground, ( localizeWithPath(_moduleId, 13, "Settings editor text input box foreground.")));
-const settingsTextInputBorder = registerColor('settings.textInputBorder', inputBorder, ( localizeWithPath(_moduleId, 14, "Settings editor text input box border.")));
-const settingsNumberInputBackground = registerColor('settings.numberInputBackground', inputBackground, ( localizeWithPath(_moduleId, 15, "Settings editor number input box background.")));
-const settingsNumberInputForeground = registerColor('settings.numberInputForeground', inputForeground, ( localizeWithPath(_moduleId, 16, "Settings editor number input box foreground.")));
-const settingsNumberInputBorder = registerColor('settings.numberInputBorder', inputBorder, ( localizeWithPath(_moduleId, 17, "Settings editor number input box border.")));
+registerColor('settings.checkboxBackground', checkboxBackground, ( localize(10292, "Settings editor checkbox background.")));
+registerColor('settings.checkboxForeground', checkboxForeground, ( localize(10293, "Settings editor checkbox foreground.")));
+registerColor('settings.checkboxBorder', checkboxBorder, ( localize(10294, "Settings editor checkbox border.")));
+const settingsTextInputBackground = registerColor('settings.textInputBackground', inputBackground, ( localize(10295, "Settings editor text input box background.")));
+const settingsTextInputForeground = registerColor('settings.textInputForeground', inputForeground, ( localize(10296, "Settings editor text input box foreground.")));
+const settingsTextInputBorder = registerColor('settings.textInputBorder', inputBorder, ( localize(10297, "Settings editor text input box border.")));
+const settingsNumberInputBackground = registerColor('settings.numberInputBackground', inputBackground, ( localize(10298, "Settings editor number input box background.")));
+const settingsNumberInputForeground = registerColor('settings.numberInputForeground', inputForeground, ( localize(10299, "Settings editor number input box foreground.")));
+const settingsNumberInputBorder = registerColor('settings.numberInputBorder', inputBorder, ( localize(10300, "Settings editor number input box border.")));
 registerColor('settings.focusedRowBackground', {
     dark: ( (transparent(listHoverBackground, .6))),
     light: ( (transparent(listHoverBackground, .6))),
     hcDark: null,
     hcLight: null,
-}, ( localizeWithPath(_moduleId, 18, "The background color of a settings row when focused.")));
+}, ( localize(10301, "The background color of a settings row when focused.")));
 registerColor('settings.rowHoverBackground', {
     dark: ( (transparent(listHoverBackground, .3))),
     light: ( (transparent(listHoverBackground, .3))),
     hcDark: null,
     hcLight: null
-}, ( localizeWithPath(_moduleId, 19, "The background color of a settings row when hovered.")));
-registerColor('settings.focusedRowBorder', focusBorder, ( localizeWithPath(
-    _moduleId,
-    20,
+}, ( localize(10302, "The background color of a settings row when hovered.")));
+registerColor('settings.focusedRowBorder', focusBorder, ( localize(
+    10303,
     "The color of the row's top and bottom border when the row is focused."
 )));
 export { settingsHeaderBorder, settingsHeaderForeground, settingsHeaderHoverForeground, settingsNumberInputBackground, settingsNumberInputBorder, settingsNumberInputForeground, settingsSashBorder, settingsSelectBackground, settingsSelectBorder, settingsSelectForeground, settingsSelectListBorder, settingsTextInputBackground, settingsTextInputBorder, settingsTextInputForeground };

package/vscode/src/vs/workbench/contrib/remote/browser/remoteExplorer.js

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
-import { localizeWithPath, localize2WithPath } from '../../../../nls.js';
+import { localize, localize2 } from '../../../../nls.js';
 import { Disposable, MutableDisposable } from '../../../../base/common/lifecycle.js';
 import { Extensions, ViewContainerLocation } from '../../../common/views.js';
 import { TUNNEL_VIEW_ID, TUNNEL_VIEW_CONTAINER_ID, PORT_AUTO_SOURCE_SETTING, PORT_AUTO_FALLBACK_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS, PORT_AUTO_SOURCE_SETTING_HYBRID, PORT_AUTO_SOURCE_SETTING_OUTPUT, PORT_AUTO_FORWARD_SETTING } from '../../../services/remote/common/remoteExplorerService.js';
@@ -37,7 +37,6 @@ import { Action } from '../../../../base/common/actions.js';
 import { IPreferencesService } from '../../../services/preferences/common/preferences.service.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
-const _moduleId = "vs/workbench/contrib/remote/browser/remoteExplorer";
 const VIEWLET_ID = 'workbench.view.remote';
 let ForwardedPortsView = class ForwardedPortsView extends Disposable {
     constructor(contextKeyService, environmentService, remoteExplorerService, tunnelService, activityService, statusbarService) {
@@ -51,15 +50,13 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
         this.contextKeyListener = this._register(( (new MutableDisposable())));
         this.activityBadge = this._register(( (new MutableDisposable())));
         this._register(( (Registry.as(Extensions.ViewsRegistry))).registerViewWelcomeContent(TUNNEL_VIEW_ID, {
-            content: this.environmentService.remoteAuthority ? ( localizeWithPath(
-                _moduleId,
-                0,
+            content: this.environmentService.remoteAuthority ? ( localize(
+                8689,
                 "No forwarded ports. Forward a port to access your running services locally.\n[Forward a Port]({0})",
                 `command:${ForwardPortAction.INLINE_ID}`
             ))
-                : ( localizeWithPath(
-                _moduleId,
-                1,
+                : ( localize(
+                8690,
                 "No forwarded ports. Forward a port to access your locally running services over the internet.\n[Forward a Port]({0})",
                 `command:${ForwardPortAction.INLINE_ID}`
             )),
@@ -70,7 +67,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
     async getViewContainer() {
         return ( (Registry.as(Extensions.ViewContainersRegistry))).registerViewContainer({
             id: TUNNEL_VIEW_CONTAINER_ID,
-            title: ( localize2WithPath(_moduleId, 2, "Ports")),
+            title: ( localize2(8691, "Ports")),
             icon: portsViewIcon,
             ctorDescriptor: ( (new SyncDescriptor(
                 ViewPaneContainer,
@@ -126,7 +123,7 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
             this.activityBadge.value = this.activityService.showViewActivity(TUNNEL_VIEW_ID, {
                 badge: ( (new NumberBadge(
                     this.remoteExplorerService.tunnelModel.forwarded.size,
-                    n => n === 1 ? ( localizeWithPath(_moduleId, 3, "1 forwarded port")) : ( localizeWithPath(_moduleId, 4, "{0} forwarded ports", n))
+                    n => n === 1 ? ( localize(8692, "1 forwarded port")) : ( localize(8693, "{0} forwarded ports", n))
                 )))
             });
         }
@@ -144,20 +141,19 @@ let ForwardedPortsView = class ForwardedPortsView extends Disposable {
         const count = this.remoteExplorerService.tunnelModel.forwarded.size + this.remoteExplorerService.tunnelModel.detected.size;
         const text = `${count}`;
         if (count === 0) {
-            tooltip = ( localizeWithPath(_moduleId, 5, "No Ports Forwarded"));
+            tooltip = ( localize(8694, "No Ports Forwarded"));
         }
         else {
             const allTunnels = Array.from(( (this.remoteExplorerService.tunnelModel.forwarded.values())));
             allTunnels.push(...Array.from(( (this.remoteExplorerService.tunnelModel.detected.values()))));
-            tooltip = ( localizeWithPath(
-                _moduleId,
-                6,
+            tooltip = ( localize(
+                8695,
                 "Forwarded Ports: {0}",
                 ( (allTunnels.map(forwarded => forwarded.remotePort))).join(', ')
             ));
         }
         return {
-            name: ( localizeWithPath(_moduleId, 7, "Forwarded Ports")),
+            name: ( localize(8696, "Forwarded Ports")),
             text: `$(radio-tower) ${text}`,
             ariaLabel: tooltip,
             tooltip,
@@ -261,21 +257,20 @@ let AutomaticPortForwarding = class AutomaticPortForwarding extends Disposable {
                 if (Array.from(( (this.remoteExplorerService.tunnelModel.forwarded.values()))).filter(tunnel => tunnel.source.source === TunnelSource.Auto).length > fallbackAt) {
                     await this.configurationService.updateValue(PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_HYBRID);
                     this.notificationService.notify({
-                        message: ( localizeWithPath(
-                            _moduleId,
-                            8,
+                        message: ( localize(
+                            8697,
                             "Over 20 ports have been automatically forwarded. The `process` based automatic port forwarding has been switched to `hybrid` in settings. Some ports may no longer be detected."
                         )),
                         severity: Severity$1.Warning,
                         actions: {
                             primary: [
-                                ( (new Action('switchBack', ( localizeWithPath(_moduleId, 9, "Undo")), undefined, true, async () => {
-                                await this.configurationService.updateValue(PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS);
-                                await this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, ConfigurationTarget.WORKSPACE);
-                                this.portListener?.dispose();
-                                this.portListener = undefined;
-                            }))),
-                                ( (new Action('showPortSourceSetting', ( localizeWithPath(_moduleId, 10, "Show Setting")), undefined, true, async () => {
+                                ( (new Action('switchBack', ( localize(8698, "Undo")), undefined, true, async () => {
+                                    await this.configurationService.updateValue(PORT_AUTO_SOURCE_SETTING, PORT_AUTO_SOURCE_SETTING_PROCESS);
+                                    await this.configurationService.updateValue(PORT_AUTO_FALLBACK_SETTING, 0, ConfigurationTarget.WORKSPACE);
+                                    this.portListener?.dispose();
+                                    this.portListener = undefined;
+                                }))),
+                                ( (new Action('showPortSourceSetting', ( localize(8699, "Show Setting")), undefined, true, async () => {
                                 await this.preferencesService.openSettings({
                                     query: 'remote.autoForwardPortsSource'
                                 });
@@ -486,21 +481,15 @@ class OnAutoForwardedAction extends Disposable {
     async basicMessage(tunnel) {
         const properties = await this.remoteExplorerService.tunnelModel.getAttributes([{ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }], false);
         const label = properties?.get(tunnel.tunnelRemotePort)?.label;
-        return ( localizeWithPath(
-            _moduleId,
-            11,
+        return ( localize(
+            8700,
             "Your application{0} running on port {1} is available.  ",
             label ? ` (${label})` : '',
             tunnel.tunnelRemotePort
         ));
     }
     linkMessage() {
-        return ( localizeWithPath(
-            _moduleId,
-            12,
-            "[See all forwarded ports]({0})",
-            `command:${TunnelPanel.ID}.focus`
-        ));
+        return ( localize(8701, "[See all forwarded ports]({0})", `command:${TunnelPanel.ID}.focus`));
     }
     async showNotification(tunnel) {
         if (!(await this.hostService.hadLastFocus())) {
@@ -513,9 +502,8 @@ class OnAutoForwardedAction extends Disposable {
             choices.push(this.openPreviewChoice(tunnel));
         }
         if ((tunnel.tunnelLocalPort !== tunnel.tunnelRemotePort) && this.tunnelService.canElevate && this.tunnelService.isPortPrivileged(tunnel.tunnelRemotePort)) {
-            message += ( localizeWithPath(
-                _moduleId,
-                13,
+            message += ( localize(
+                8702,
                 "You'll need to run as superuser to use port {0} locally.  ",
                 tunnel.tunnelRemotePort
             ));
@@ -535,7 +523,7 @@ class OnAutoForwardedAction extends Disposable {
     }
     makePublicChoice(tunnel) {
         return {
-            label: ( localizeWithPath(_moduleId, 14, "Make Public")),
+            label: ( localize(8703, "Make Public")),
             run: async () => {
                 const oldTunnelDetails = mapHasAddressLocalhostOrAllInterfaces(this.remoteExplorerService.tunnelModel.forwarded, tunnel.tunnelRemoteHost, tunnel.tunnelRemotePort);
                 await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, TunnelCloseReason.Other);
@@ -566,7 +554,7 @@ class OnAutoForwardedAction extends Disposable {
     }
     elevateChoice(tunnel) {
         return {
-            label: ( localizeWithPath(_moduleId, 15, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
+            label: ( localize(8704, "Use Port {0} as Sudo...", tunnel.tunnelRemotePort)),
             run: async () => {
                 await this.remoteExplorerService.close({ host: tunnel.tunnelRemoteHost, port: tunnel.tunnelRemotePort }, TunnelCloseReason.Other);
                 const newTunnel = await this.remoteExplorerService.forward({