@theia/core 1.19.0 → 1.20.0

package/src/browser/color-registry.ts

@@ -17,95 +17,13 @@
 import { injectable } from 'inversify';
 import { DisposableCollection, Disposable } from '../common/disposable';
 import { Emitter } from '../common/event';
+import { ColorDefinition, ColorCssVariable } from '../common/color';
 
 /**
- * Either be a reference to an existing color or a color value as a hex string, rgba, or hsla.
+ * @deprecated since 1.20.0. Import from `@theia/core/lib/common/color` instead.
  */
-export type Color = string | RGBA | HSLA | ColorTransformation;
-export namespace Color {
-    export function rgba(r: number, g: number, b: number, a: number = 1): Color {
-        return { r, g, b, a };
-    }
-    export function hsla(h: number, s: number, l: number, a: number = 1): Color {
-        return { h, s, l, a };
-    }
-    export const white = rgba(255, 255, 255, 1);
-    export const black = rgba(0, 0, 0, 1);
-    export function transparent(v: string, f: number): ColorTransformation {
-        return { v, f, kind: 'transparent' };
-    }
-    export function lighten(v: string, f: number): ColorTransformation {
-        return { v, f, kind: 'lighten' };
-    }
-    export function darken(v: string, f: number): ColorTransformation {
-        return { v, f, kind: 'darken' };
-    }
-}
-export interface ColorTransformation {
-    kind: 'transparent' | 'lighten' | 'darken'
-    v: string
-    f: number
-}
-export interface RGBA {
-    /**
-     * Red: integer in [0-255]
-     */
-    readonly r: number;
-
-    /**
-     * Green: integer in [0-255]
-     */
-    readonly g: number;
-
-    /**
-     * Blue: integer in [0-255]
-     */
-    readonly b: number;
-
-    /**
-     * Alpha: float in [0-1]
-     */
-    readonly a: number;
-}
-export interface HSLA {
-    /**
-     * Hue: integer in [0, 360]
-     */
-    readonly h: number;
-    /**
-     * Saturation: float in [0, 1]
-     */
-    readonly s: number;
-    /**
-     * Luminosity: float in [0, 1]
-     */
-    readonly l: number;
-    /**
-     * Alpha: float in [0, 1]
-     */
-    readonly a: number;
-}
-
-export interface ColorDefaults {
-    light?: Color
-    dark?: Color
-    hc?: Color
-}
-
-export interface ColorDefinition {
-    id: string
-    defaults?: ColorDefaults
-    description: string
-}
-
-export interface ColorCssVariable {
-    name: string
-    value: string
-}
+export * from '../common/color';
 
-/**
- * It should be implemented by an extension, e.g. by the monaco extension.
- */
 @injectable()
 export class ColorRegistry {
 

package/src/browser/common-frontend-contribution.ts

@@ -90,67 +90,67 @@ export namespace CommonMenus {
 
 export namespace CommonCommands {
 
-    export const FILE_CATEGORY_KEY = 'vscode/menubarControl/mFile';
-    export const VIEW_CATEGORY_KEY = 'vscode/menubarControl/mView';
-    export const PREFERENCES_CATEGORY_KEY = 'vscode/actions/preferences';
     export const FILE_CATEGORY = 'File';
     export const VIEW_CATEGORY = 'View';
     export const PREFERENCES_CATEGORY = 'Preferences';
+    export const FILE_CATEGORY_KEY = nls.getDefaultKey(FILE_CATEGORY);
+    export const VIEW_CATEGORY_KEY = nls.getDefaultKey(VIEW_CATEGORY);
+    export const PREFERENCES_CATEGORY_KEY = nls.getDefaultKey(PREFERENCES_CATEGORY);
 
     export const OPEN: Command = {
         id: 'core.open',
     };
 
-    export const CUT = Command.toLocalizedCommand({
+    export const CUT = Command.toDefaultLocalizedCommand({
         id: 'core.cut',
         label: 'Cut'
-    }, 'vscode/fileActions.contribution/cut');
-    export const COPY = Command.toLocalizedCommand({
+    });
+    export const COPY = Command.toDefaultLocalizedCommand({
         id: 'core.copy',
         label: 'Copy'
-    }, 'vscode/fileActions/copyFile');
-    export const PASTE = Command.toLocalizedCommand({
+    });
+    export const PASTE = Command.toDefaultLocalizedCommand({
         id: 'core.paste',
         label: 'Paste'
-    }, 'vscode/fileActions/pasteFile');
+    });
 
-    export const COPY_PATH = Command.toLocalizedCommand({
+    export const COPY_PATH = Command.toDefaultLocalizedCommand({
         id: 'core.copy.path',
         label: 'Copy Path'
-    }, 'vscode/fileActions.contribution/copyPath');
+    });
 
-    export const UNDO = Command.toLocalizedCommand({
+    export const UNDO = Command.toDefaultLocalizedCommand({
         id: 'core.undo',
         label: 'Undo'
-    }, 'vscode/textInputActions/undo');
-    export const REDO = Command.toLocalizedCommand({
+    });
+    export const REDO = Command.toDefaultLocalizedCommand({
         id: 'core.redo',
         label: 'Redo'
-    }, 'vscode/textInputActions/redo');
-    export const SELECT_ALL = Command.toLocalizedCommand({
+    });
+    export const SELECT_ALL = Command.toDefaultLocalizedCommand({
         id: 'core.selectAll',
         label: 'Select All'
-    }, 'vscode/textInputActions/selectAll');
+    });
 
-    export const FIND = Command.toLocalizedCommand({
+    export const FIND = Command.toDefaultLocalizedCommand({
         id: 'core.find',
         label: 'Find'
-    }, 'vscode/simpleFindReplaceWidget/label.find');
-    export const REPLACE = Command.toLocalizedCommand({
+    });
+    export const REPLACE = Command.toDefaultLocalizedCommand({
         id: 'core.replace',
         label: 'Replace'
-    }, 'vscode/simpleFindReplaceWidget/label.replace');
+    });
 
-    export const NEXT_TAB = Command.toLocalizedCommand({
+    export const NEXT_TAB = Command.toDefaultLocalizedCommand({
         id: 'core.nextTab',
         category: VIEW_CATEGORY,
-        label: 'Switch to Next Tab'
-    }, 'vscode/menubar/mShowNextTab', VIEW_CATEGORY_KEY);
-    export const PREVIOUS_TAB = Command.toLocalizedCommand({
+        label: 'Show Next Tab'
+    });
+    export const PREVIOUS_TAB = Command.toDefaultLocalizedCommand({
         id: 'core.previousTab',
         category: VIEW_CATEGORY,
-        label: 'Switch to Previous Tab'
-    }, 'vscode/menubar/mShowPreviousTab', VIEW_CATEGORY_KEY);
+        label: 'Show Previous Tab'
+    });
     export const NEXT_TAB_IN_GROUP = Command.toLocalizedCommand({
         id: 'core.nextTabInGroup',
         category: VIEW_CATEGORY,
@@ -221,70 +221,70 @@ export namespace CommonCommands {
         category: VIEW_CATEGORY,
         label: 'Toggle Bottom Panel'
     }, 'theia/core/common/collapseBottomPanel', VIEW_CATEGORY_KEY);
-    export const TOGGLE_STATUS_BAR = Command.toLocalizedCommand({
+    export const TOGGLE_STATUS_BAR = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.toggleStatusbarVisibility',
         category: VIEW_CATEGORY,
         label: 'Toggle Status Bar Visibility'
-    }, 'vscode/layoutActions/toggleStatusbar');
+    });
     export const TOGGLE_MAXIMIZED = Command.toLocalizedCommand({
         id: 'core.toggleMaximized',
         category: VIEW_CATEGORY,
         label: 'Toggle Maximized'
     }, 'theia/core/common/toggleMaximized', VIEW_CATEGORY_KEY);
-    export const OPEN_VIEW = Command.toLocalizedCommand({
+    export const OPEN_VIEW = Command.toDefaultLocalizedCommand({
         id: 'core.openView',
         category: VIEW_CATEGORY,
         label: 'Open View...'
-    }, 'vscode/quickAccess.contribution/miOpenView', VIEW_CATEGORY_KEY);
+    });
 
-    export const SAVE = Command.toLocalizedCommand({
+    export const SAVE = Command.toDefaultLocalizedCommand({
         id: 'core.save',
         category: FILE_CATEGORY,
         label: 'Save',
-    }, 'vscode/fileCommands/save', FILE_CATEGORY_KEY);
-    export const SAVE_WITHOUT_FORMATTING = Command.toLocalizedCommand({
+    });
+    export const SAVE_WITHOUT_FORMATTING = Command.toDefaultLocalizedCommand({
         id: 'core.saveWithoutFormatting',
         category: FILE_CATEGORY,
         label: 'Save without Formatting',
-    }, 'vscode/fileCommands/saveWithoutFormatting', FILE_CATEGORY_KEY);
-    export const SAVE_ALL = Command.toLocalizedCommand({
+    });
+    export const SAVE_ALL = Command.toDefaultLocalizedCommand({
         id: 'core.saveAll',
         category: FILE_CATEGORY,
         label: 'Save All',
-    }, 'vscode/fileCommands/saveAll', FILE_CATEGORY_KEY);
+    });
 
-    export const AUTO_SAVE = Command.toLocalizedCommand({
+    export const AUTO_SAVE = Command.toDefaultLocalizedCommand({
         id: 'textEditor.commands.autosave',
         category: FILE_CATEGORY,
         label: 'Auto Save',
-    }, 'vscode/fileActions.contribution/miAutoSave', FILE_CATEGORY_KEY);
+    });
 
-    export const ABOUT_COMMAND = Command.toLocalizedCommand({
+    export const ABOUT_COMMAND = Command.toDefaultLocalizedCommand({
         id: 'core.about',
         label: 'About'
-    }, 'vscode/windowActions/about');
+    });
 
-    export const OPEN_PREFERENCES = Command.toLocalizedCommand({
+    export const OPEN_PREFERENCES = Command.toDefaultLocalizedCommand({
         id: 'preferences:open',
         category: PREFERENCES_CATEGORY,
-        label: 'Open Preferences',
-    }, 'vscode/preferences.contribution/preferences', PREFERENCES_CATEGORY_KEY);
+        label: 'Open Settings (UI)',
+    });
 
-    export const SELECT_COLOR_THEME = Command.toLocalizedCommand({
+    export const SELECT_COLOR_THEME = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.selectTheme',
         label: 'Color Theme',
         category: PREFERENCES_CATEGORY
-    }, 'vscode/themes.contribution/selectTheme.label', PREFERENCES_CATEGORY_KEY);
-    export const SELECT_ICON_THEME = Command.toLocalizedCommand({
+    });
+    export const SELECT_ICON_THEME = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.selectIconTheme',
         label: 'File Icon Theme',
         category: PREFERENCES_CATEGORY
-    }, 'vscode/themes.contribution/selectIconTheme.label', PREFERENCES_CATEGORY_KEY);
+    });
 
-    export const CONFIGURE_DISPLAY_LANGUAGE = Command.toLocalizedCommand({
+    export const CONFIGURE_DISPLAY_LANGUAGE = Command.toDefaultLocalizedCommand({
         id: 'workbench.action.configureLanguage',
         label: 'Configure Display Language'
-    }, 'vscode/localizationsActions/configureLocale');
+    });
 
 }
 
@@ -374,14 +374,14 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         app.shell.leftPanelHandler.addBottomMenu({
             id: 'settings-menu',
             iconClass: 'codicon codicon-settings-gear',
-            title: nls.localize(CommonCommands.PREFERENCES_CATEGORY_KEY, CommonCommands.PREFERENCES_CATEGORY),
+            title: nls.localizeByDefault(CommonCommands.PREFERENCES_CATEGORY),
             menuPath: SETTINGS_MENU,
             order: 0,
         });
         const accountsMenu = {
             id: 'accounts-menu',
             iconClass: 'codicon codicon-person',
-            title: nls.localize('vscode/activitybarPart/accounts', 'Accounts'),
+            title: nls.localizeByDefault('Accounts'),
             menuPath: ACCOUNTS_MENU,
             order: 1,
         };
@@ -446,7 +446,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
                     this.shell.leftPanelHandler.addTopMenu({
                         id: mainMenuId,
                         iconClass: 'codicon codicon-menu',
-                        title: nls.localize('vscode/menubar/mAppMenu', 'Application Menu'),
+                        title: nls.localizeByDefault('Application Menu'),
                         menuPath: ['menubar'],
                         order: 0,
                     });
@@ -479,10 +479,10 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
     }
 
     registerMenus(registry: MenuModelRegistry): void {
-        registry.registerSubmenu(CommonMenus.FILE, nls.localize('vscode/menubarControl/mFile', 'File'));
-        registry.registerSubmenu(CommonMenus.EDIT, nls.localize('vscode/menubarControl/mEdit', 'Edit'));
-        registry.registerSubmenu(CommonMenus.VIEW, nls.localize('vscode/menubarControl/mView', 'View'));
-        registry.registerSubmenu(CommonMenus.HELP, nls.localize('vscode/menubarControl/mHelp', 'Help'));
+        registry.registerSubmenu(CommonMenus.FILE, nls.localizeByDefault('File'));
+        registry.registerSubmenu(CommonMenus.EDIT, nls.localizeByDefault('Edit'));
+        registry.registerSubmenu(CommonMenus.VIEW, nls.localizeByDefault('View'));
+        registry.registerSubmenu(CommonMenus.HELP, nls.localizeByDefault('Help'));
 
         registry.registerMenuAction(CommonMenus.FILE_SAVE, {
             commandId: CommonCommands.SAVE.id
@@ -495,7 +495,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
             commandId: CommonCommands.AUTO_SAVE.id
         });
 
-        registry.registerSubmenu(CommonMenus.FILE_SETTINGS_SUBMENU, nls.localize(CommonCommands.PREFERENCES_CATEGORY_KEY, CommonCommands.PREFERENCES_CATEGORY));
+        registry.registerSubmenu(CommonMenus.FILE_SETTINGS_SUBMENU, nls.localizeByDefault(CommonCommands.PREFERENCES_CATEGORY));
 
         registry.registerMenuAction(CommonMenus.EDIT_UNDO, {
             commandId: CommonCommands.UNDO.id,
@@ -548,22 +548,22 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
 
         registry.registerMenuAction(SHELL_TABBAR_CONTEXT_MENU, {
             commandId: CommonCommands.CLOSE_TAB.id,
-            label: nls.localize('vscode/editor.contribution/close', 'Close'),
+            label: nls.localizeByDefault('Close'),
             order: '0'
         });
         registry.registerMenuAction(SHELL_TABBAR_CONTEXT_MENU, {
             commandId: CommonCommands.CLOSE_OTHER_TABS.id,
-            label: nls.localize('vscode/editor.contribution/closeOthers', 'Close Others'),
+            label: nls.localizeByDefault('Close Others'),
             order: '1'
         });
         registry.registerMenuAction(SHELL_TABBAR_CONTEXT_MENU, {
             commandId: CommonCommands.CLOSE_RIGHT_TABS.id,
-            label: nls.localize('vscode/editor.contribution/closeRight', 'Close to the Right'),
+            label: nls.localizeByDefault('Close to the Right'),
             order: '2'
         });
         registry.registerMenuAction(SHELL_TABBAR_CONTEXT_MENU, {
             commandId: CommonCommands.CLOSE_ALL_TABS.id,
-            label: nls.localize('vscode/editor.contribution/closeAll', 'Close All'),
+            label: nls.localizeByDefault('Close All'),
             order: '3'
         });
         registry.registerMenuAction(SHELL_TABBAR_CONTEXT_MENU, {
@@ -1076,7 +1076,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
 
         this.quickInputService?.showQuickPick(items,
             {
-                placeholder: nls.localize('vscode/extensionsActions/select file icon theme', 'Select File Icon Theme'),
+                placeholder: nls.localizeByDefault('Select File Icon Theme'),
                 activeItem: items.find(item => item.id === resetTo),
                 onDidChangeSelection: (quickPick: QuickPick<QuickPickItem>, selectedItems: Array<QuickPickItem>) => {
                     resetTo = undefined;
@@ -1115,7 +1115,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
         const items = [...itemsByTheme.light, ...itemsByTheme.dark, ...itemsByTheme.hc];
         this.quickInputService?.showQuickPick(items,
             {
-                placeholder: nls.localize('vscode/extensionActions/select color theme', 'Select Color Theme (Up/Down Keys to Preview)'),
+                placeholder: nls.localizeByDefault('Select Color Theme (Up/Down Keys to Preview)'),
                 activeItem: items.find((item: QuickPickItem) => item.id === resetTo),
                 // eslint-disable-next-line @typescript-eslint/no-explicit-any
                 onDidChangeSelection: (quickPick: any, selectedItems: Array<QuickPickItem>) => {

package/src/browser/core-preferences.ts

@@ -32,19 +32,20 @@ export const corePreferenceSchema: PreferenceSchema = {
                 'always',
             ],
             default: 'ifRequired',
-            description: nls.localize('vscode/workbench.contribution/confirmBeforeCloseWeb', 'When to confirm before closing the application window.'),
+            // eslint-disable-next-line max-len
+            description: nls.localizeByDefault('Controls whether to show a confirmation dialog before closing the browser tab or window. Note that even if enabled, browsers may still decide to close a tab or window without confirmation and that this setting is only a hint that may not work in all cases.'),
         },
         'breadcrumbs.enabled': {
             'type': 'boolean',
             'default': true,
-            'description': nls.localize('vscode/breadcrumbs/enabled', 'Enable/disable navigation breadcrumbs.'),
+            'description': nls.localizeByDefault('Enable/disable navigation breadcrumbs.'),
             'scope': 'application'
         },
         'files.encoding': {
             'type': 'string',
             'enum': Object.keys(SUPPORTED_ENCODINGS),
             'default': 'utf8',
-            'description': nls.localize('vscode/files.contribution/encoding',
+            'description': nls.localizeByDefault(
                 'The default character set encoding to use when reading and writing files. This setting can also be configured per language.'),
             'scope': 'language-overridable',
             'enumDescriptions': Object.keys(SUPPORTED_ENCODINGS).map(key => SUPPORTED_ENCODINGS[key].labelLong),
@@ -57,22 +58,22 @@ export const corePreferenceSchema: PreferenceSchema = {
                 'keyCode',
             ],
             default: 'code',
-            description: nls.localize('vscode/keybindingService/dispatch',
-                'Whether to interpret keypresses by the `code` of the physical key, or by the `keyCode` provided by the OS.')
+            description: nls.localizeByDefault(
+                'Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`.')
         },
         'window.menuBarVisibility': {
             type: 'string',
             enum: ['classic', 'visible', 'hidden', 'compact'],
             markdownEnumDescriptions: [
-                nls.localize('vscode/workbench.contribution/window.menuBarVisibility.default', 'Menu is displayed at the top of the window and only hidden in full screen mode.'),
-                nls.localize('vscode/workbench.contribution/window.menuBarVisibility.visible', 'Menu is always visible at the top of the window even in full screen mode.'),
-                nls.localize('vscode/workbench.contribution/window.menuBarVisibility.hidden', 'Menu is always hidden.'),
-                nls.localize('vscode/workbench.contribution/window.menuBarVisibility.compact', 'Menu is displayed as a compact button in the sidebar.')
+                nls.localizeByDefault('Menu is only hidden in full screen mode.'),
+                nls.localizeByDefault('Menu is always visible even in full screen mode.'),
+                nls.localizeByDefault('Menu is always hidden.'),
+                nls.localizeByDefault('Menu is displayed as a compact button in the sidebar. This value is ignored when `#window.titleBarStyle#` is `native`.')
             ],
             default: 'classic',
             scope: 'application',
-            markdownDescription: nls.localize('vscode/workbench.contribution/menuBarVisibility', `Control the visibility of the menu bar.
-            A setting of 'compact' will move the menu into the sidebar.`),
+            // eslint-disable-next-line max-len
+            markdownDescription: nls.localizeByDefault("Control the visibility of the menu bar. A setting of 'toggle' means that the menu bar is hidden and a single press of the Alt key will show it. By default, the menu bar will be visible, unless the window is full screen."),
             included: !isOSX
         },
         'workbench.list.openMode': {
@@ -82,17 +83,19 @@ export const corePreferenceSchema: PreferenceSchema = {
                 'doubleClick'
             ],
             default: 'singleClick',
-            description: nls.localize('vscode/listService/openModeModifier', 'Controls how to open items in trees using the mouse.')
+            // eslint-disable-next-line max-len
+            description: nls.localizeByDefault('Controls how to open items in trees and lists using the mouse (if supported). For parents with children in trees, this setting will control if a single click expands the parent or a double click. Note that some trees and lists might choose to ignore this setting if it is not applicable. ')
         },
         'workbench.editor.highlightModifiedTabs': {
             'type': 'boolean',
-            'description': nls.localize('vscode/workbench.contribution/highlightModifiedTabs', 'Controls whether a top border is drawn on modified (dirty) editor tabs or not.'),
+            // eslint-disable-next-line max-len
+            'description': nls.localizeByDefault('Controls whether a top border is drawn on modified (dirty) editor tabs or not. This value is ignored when `#workbench.editor.showTabs#` is disabled.'),
             'default': false
         },
         'workbench.editor.closeOnFileDelete': {
             'type': 'boolean',
             // eslint-disable-next-line max-len
-            'description': nls.localize('vscode/workbench.contribution/closeOnFileDelete', 'Controls whether editors showing a file that was opened during the session should close automatically when getting deleted or renamed by some other process. Disabling this will keep the editor open  on such an event. Note that deleting from within the application will always close the editor and that dirty files will never close to preserve your data.'),
+            'description': nls.localizeByDefault('Controls whether editors showing a file that was opened during the session should close automatically when getting deleted or renamed by some other process. Disabling this will keep the editor open  on such an event. Note that deleting from within the application will always close the editor and that dirty files will never close to preserve your data.'),
             'default': false
         },
         'workbench.commandPalette.history': {
@@ -100,38 +103,38 @@ export const corePreferenceSchema: PreferenceSchema = {
             default: 50,
             minimum: 0,
             // eslint-disable-next-line max-len
-            description: nls.localize('vscode/workbench.contribution/commandHistory', 'Controls the number of recently used commands to keep in history for the command palette. Set to 0 to disable command history.')
+            description: nls.localizeByDefault('Controls the number of recently used commands to keep in history for the command palette. Set to 0 to disable command history.')
         },
         'workbench.colorTheme': {
             type: 'string',
             default: FrontendApplicationConfigProvider.get().defaultTheme,
-            description: nls.localize('vscode/themeConfiguration/colorTheme', 'Specifies the color theme used in the workbench.')
+            description: nls.localizeByDefault('Specifies the color theme used in the workbench.')
         },
         'workbench.iconTheme': {
             type: ['string', 'null'],
             default: FrontendApplicationConfigProvider.get().defaultIconTheme,
-            description: nls.localize('vscode/themeConfiguration/iconTheme', "Specifies the icon theme used in the workbench or 'null' to not show any file icons.")
+            description: nls.localizeByDefault("Specifies the file icon theme used in the workbench or 'null' to not show any file icons.")
         },
         'workbench.silentNotifications': {
             type: 'boolean',
             default: false,
-            description: nls.localize('vscode/workbench.contribution/zenMode.silentNotifications', 'Controls whether to suppress notification popups.')
+            description: nls.localize('theia/core/silentNotifications', 'Controls whether to suppress notification popups.')
         },
         'workbench.statusBar.visible': {
             type: 'boolean',
             default: true,
-            description: 'Controls the visibility of the status bar at the bottom of the workbench.'
+            description: nls.localizeByDefault('Controls the visibility of the status bar at the bottom of the workbench.')
         },
         'workbench.tree.renderIndentGuides': {
             type: 'string',
             enum: ['onHover', 'none', 'always'],
             default: 'onHover',
-            description: nls.localize('vscode/listService/render tree indent guides', 'Controls whether the tree should render indent guides.')
+            description: nls.localizeByDefault('Controls whether the tree should render indent guides.')
         },
         'workbench.hover.delay': {
             type: 'number',
             default: isOSX ? 1500 : 500,
-            description: 'Controls the delay in milliseconds after which the hover is shown for workbench items (ex. some extension provided tree view items).'
+            description: nls.localizeByDefault('Controls the delay in milliseconds after which the hover is shown.')
         },
     }
 };

package/src/browser/dialogs.ts

@@ -67,10 +67,10 @@ export namespace DialogError {
 }
 
 export namespace Dialog {
-    export const YES = nls.localize('vscode/extensionsUtils/yes', 'Yes');
-    export const NO = nls.localize('vscode/extensionsUtils/no', 'No');
-    export const OK = nls.localize('vscode/dialog/ok', 'OK');
-    export const CANCEL = nls.localize('vscode/explorerViewer/cancel', 'Cancel');
+    export const YES = nls.localizeByDefault('Yes');
+    export const NO = nls.localizeByDefault('No');
+    export const OK = nls.localizeByDefault('OK');
+    export const CANCEL = nls.localizeByDefault('Cancel');
 }
 
 @injectable()

package/src/browser/keyboard/browser-keyboard-frontend-contribution.ts

@@ -23,8 +23,8 @@ import { nls } from '../../common/nls';
 
 export namespace KeyboardCommands {
 
-    const KEYBOARD_CATEGORY_KEY = 'vscode/settingsLayout/keyboard';
     const KEYBOARD_CATEGORY = 'Keyboard';
+    const KEYBOARD_CATEGORY_KEY = nls.getDefaultKey(KEYBOARD_CATEGORY);
 
     export const CHOOSE_KEYBOARD_LAYOUT = Command.toLocalizedCommand({
         id: 'core.keyboard.choose',
@@ -52,7 +52,7 @@ export class BrowserKeyboardFrontendContribution implements CommandContribution
     protected async chooseLayout(): Promise<KeyboardLayoutData | undefined> {
         const current = this.layoutProvider.currentLayoutData;
         const autodetect: QuickPickValue<'autodetect'> = {
-            label: nls.localize('vscode/editorStatus/autoDetect', 'Auto-detect'),
+            label: nls.localizeByDefault('Auto-detect'),
             description: this.layoutProvider.currentLayoutSource !== 'user-choice' ? nls.localize('theia/core/keyboard/current', '(current: {0})', current.name) : undefined,
             detail: nls.localize('theia/core/keyboard/tryDetect', 'Try to detect the keyboard layout from browser information and pressed keys.'),
             value: 'autodetect'

package/src/browser/keyboard/browser-keyboard-layout-provider.spec.ts

@@ -14,6 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 
+import { enableJSDOM } from '../test/jsdom';
+
+let disableJSDOM = enableJSDOM();
+
 import { Container, injectable } from 'inversify';
 import type { IMacKeyboardLayoutInfo } from 'native-keymap';
 import * as chai from 'chai';
@@ -26,11 +30,15 @@ import { WindowService } from '../window/window-service';
 import { BrowserKeyboardLayoutProvider } from './browser-keyboard-layout-provider';
 import { Key } from './keys';
 
+disableJSDOM();
+
 describe('browser keyboard layout provider', function (): void {
 
     let stubOSX: sinon.SinonStub;
     let stubWindows: sinon.SinonStub;
-    let stubNavigator: sinon.SinonStub;
+
+    before(() => disableJSDOM = enableJSDOM());
+    after(() => disableJSDOM());
 
     const setup = (system: 'mac' | 'win' | 'linux') => {
         switch (system) {
@@ -47,7 +55,6 @@ describe('browser keyboard layout provider', function (): void {
                 stubWindows = sinon.stub(os, 'isWindows').value(false);
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        stubNavigator = sinon.stub(global, 'navigator' as any).value({});
         const container = new Container();
         container.bind(BrowserKeyboardLayoutProvider).toSelf();
         container.bind(ILogger).to(MockLogger);
@@ -61,7 +68,6 @@ describe('browser keyboard layout provider', function (): void {
     afterEach(() => {
         stubOSX.restore();
         stubWindows.restore();
-        stubNavigator.restore();
     });
 
     it('detects German Mac layout', async () => {
@@ -83,7 +89,7 @@ describe('browser keyboard layout provider', function (): void {
             currentLayout = l;
         });
 
-        chai.expect((currentLayout.info as IMacKeyboardLayoutInfo).id).to.equal('com.apple.keylayout.US');
+        chai.expect((currentLayout.info as IMacKeyboardLayoutInfo).id).to.equal('com.apple.keylayout.German');
         service.validateKey({ code: Key.SEMICOLON.code, character: 'm' });
         chai.expect((currentLayout.info as IMacKeyboardLayoutInfo).id).to.equal('com.apple.keylayout.French');
     });