diff --git a/apps/common/main/lib/controller/HintManager.js b/apps/common/main/lib/controller/HintManager.js index e75a75dd2c..57252cc753 100644 --- a/apps/common/main/lib/controller/HintManager.js +++ b/apps/common/main/lib/controller/HintManager.js @@ -642,10 +642,9 @@ Common.UI.HintManager = new(function() { } _needShow = (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !e.shiftKey && - (!Common.Utils.isMac && e.keyCode == Common.UI.Keys.ALT || Common.Utils.isMac && e.metaKey && e.keyCode === Common.UI.Keys.F6) && - !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0 && + e.keyCode == Common.UI.Keys.ALT && !Common.Utils.ModalWindow.isVisible() && _isDocReady && _arrAlphabet.length > 0 && !(window.PE && $('#pe-preview').is(':visible'))); - if (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && !Common.Utils.isMac && e.altKey && e.keyCode !== 115 && _isInternalEditorLoading) { + if (Common.Utils.InternalSettings.get(_appPrefix + "settings-show-alt-hints") && e.altKey && e.keyCode !== 115 && _isInternalEditorLoading) { e.preventDefault(); } }); diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 1a1f559d69..6fe2c68a64 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1096,7 +1096,7 @@ define([ txtWorkspace: 'Workspace', txtHieroglyphs: 'Hieroglyphs', txtUseAltKey: 'Use Alt key to navigate the user interface using the keyboard', - txtUseOptionKey: 'Use ⌘F6 to navigate the user interface using the keyboard', + txtUseOptionKey: 'Use Option key to navigate the user interface using the keyboard', strShowComments: 'Show comments in text', strShowResolvedComments: 'Show resolved comments', txtFastTip: 'Real-time co-editing. All changes are saved automatically', diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 5c80ab0626..f0f68bad02 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -875,7 +875,7 @@ define([ txtWorkspace: 'Workspace', txtHieroglyphs: 'Hieroglyphs', txtUseAltKey: 'Use Alt key to navigate the user interface using the keyboard', - txtUseOptionKey: 'Use ⌘F6 to navigate the user interface using the keyboard', + txtUseOptionKey: 'Use Option key to navigate the user interface using the keyboard', txtFastTip: 'Real-time co-editing. All changes are saved automatically', txtStrictTip: 'Use the \'Save\' button to sync the changes you and others make', strIgnoreWordsInUPPERCASE: 'Ignore words in UPPERCASE', diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index e42fbf926d..5627c36ed9 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1264,7 +1264,7 @@ define([ txtWorkspace: 'Workspace', strReferenceStyle: 'R1C1 reference style', txtUseAltKey: 'Use Alt key to navigate the user interface using the keyboard', - txtUseOptionKey: 'Use ⌘F6 to navigate the user interface using the keyboard', + txtUseOptionKey: 'Use Option key to navigate the user interface using the keyboard', txtRegion: 'Region', txtProofing: 'Proofing', strDictionaryLanguage: 'Dictionary language',