Bug 1608022 - Migrate browser-sets to Fluent. r=fluent-reviewers,Gijs,flod

Differential Revision: https://phabricator.services.mozilla.com/D60068

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Zibi Braniecki 2020-01-30 21:07:20 +00:00
Родитель 55d15562fd
Коммит f3db980355
9 изменённых файлов: 456 добавлений и 177 удалений

Просмотреть файл

@ -108,10 +108,10 @@
#endif
#ifdef XP_MACOSX
<command id="minimizeWindow"
label="&minimizeWindow.label;"
data-l10n-id="window-minimize-command"
oncommand="window.minimize();" />
<command id="zoomWindow"
label="&zoomWindow.label;"
data-l10n-id="window-zoom-command"
oncommand="zoomWindow();" />
#endif
</commandset>
@ -120,15 +120,15 @@
<keyset id="mainKeyset">
<key id="key_newNavigator"
key="&newNavigatorCmd.key;"
data-l10n-id="window-new-shortcut"
command="cmd_newNavigator"
modifiers="accel" reserved="true"/>
<key id="key_newNavigatorTab" key="&tabCmd.commandkey;" modifiers="accel"
<key id="key_newNavigatorTab" data-l10n-id="tab-new-shortcut" modifiers="accel"
command="cmd_newNavigatorTabNoEvent" reserved="true"/>
<key id="focusURLBar" key="&openCmd.commandkey;" command="Browser:OpenLocation"
<key id="focusURLBar" data-l10n-id="location-open-shortcut" command="Browser:OpenLocation"
modifiers="accel"/>
#ifndef XP_MACOSX
<key id="focusURLBar2" key="&urlbar.accesskey;" command="Browser:OpenLocation"
<key id="focusURLBar2" data-l10n-id="location-open-shortcut-alt" command="Browser:OpenLocation"
modifiers="alt"/>
#endif
@ -149,26 +149,31 @@
# is a fundamental keybinding and we are maintaining a XP binding so that it is easy
# for people to switch to Linux.
#
<key id="key_search" key="&searchFocus.commandkey;" command="Tools:Search" modifiers="accel"/>
<key id="key_search" data-l10n-id="search-focus-shortcut" command="Tools:Search" modifiers="accel"/>
<key id="key_search2"
#ifdef XP_MACOSX
<key id="key_search2" key="&findOnCmd.commandkey;" command="Tools:Search" modifiers="accel,alt"/>
#endif
#ifdef XP_WIN
<key id="key_search2" key="&searchFocus.commandkey2;" command="Tools:Search" modifiers="accel"/>
#endif
#ifdef XP_GNOME
<key id="key_search2" key="&searchFocusUnix.commandkey;" command="Tools:Search" modifiers="accel"/>
<key id="key_openDownloads" key="&downloadsUnix.commandkey;" command="Tools:Downloads" modifiers="accel,shift"/>
data-l10n-id="find-shortcut"
modifiers="accel,alt"
#else
<key id="key_openDownloads" key="&downloads.commandkey;" command="Tools:Downloads" modifiers="accel"/>
data-l10n-id="search-focus-shortcut-alt"
modifiers="accel"
#endif
<key id="key_openAddons" key="&addons.commandkey;" command="Tools:Addons" modifiers="accel,shift"/>
<key id="openFileKb" key="&openFileCmd.commandkey;" command="Browser:OpenFile" modifiers="accel"/>
<key id="key_savePage" key="&savePageCmd.commandkey;" command="Browser:SavePage" modifiers="accel"/>
<key id="printKb" key="&printCmd.commandkey;" command="cmd_print" modifiers="accel"/>
<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel" reserved="true"/>
<key id="key_closeWindow" key="&closeCmd.key;" command="cmd_closeWindow" modifiers="accel,shift" reserved="true"/>
<key id="key_toggleMute" key="&toggleMuteCmd.key;" command="cmd_toggleMute" modifiers="control"/>
command="Tools:Search"/>
<key id="key_openDownloads"
data-l10n-id="downloads-shortcut"
#ifdef XP_GNOME
modifiers="accel,shift"
#else
modifiers="accel"
#endif
command="Tools:Downloads"/>
<key id="key_openAddons" data-l10n-id="addons-shortcut" command="Tools:Addons" modifiers="accel,shift"/>
<key id="openFileKb" data-l10n-id="file-open-shortcut" command="Browser:OpenFile" modifiers="accel"/>
<key id="key_savePage" data-l10n-id="save-page-shortcut" command="Browser:SavePage" modifiers="accel"/>
<key id="printKb" data-l10n-id="print-shortcut" command="cmd_print" modifiers="accel"/>
<key id="key_close" data-l10n-id="close-shortcut" command="cmd_close" modifiers="accel" reserved="true"/>
<key id="key_closeWindow" data-l10n-id="close-shortcut" command="cmd_closeWindow" modifiers="accel,shift" reserved="true"/>
<key id="key_toggleMute" data-l10n-id="mute-toggle-shortcut" command="cmd_toggleMute" modifiers="control"/>
<key id="key_undo"
data-l10n-id="text-action-undo-shortcut"
modifiers="accel"/>
@ -203,65 +208,65 @@
<key id="goForwardKb" keycode="VK_RIGHT" command="Browser:Forward" modifiers="accel" />
#endif
#ifdef XP_UNIX
<key id="goBackKb2" key="&goBackCmd.commandKey;" command="Browser:Back" modifiers="accel"/>
<key id="goForwardKb2" key="&goForwardCmd.commandKey;" command="Browser:Forward" modifiers="accel"/>
<key id="goBackKb2" data-l10n-id="nav-back-shortcut-alt" command="Browser:Back" modifiers="accel"/>
<key id="goForwardKb2" data-l10n-id="nav-fwd-shortcut-alt" command="Browser:Forward" modifiers="accel"/>
#endif
<key id="goHome" keycode="VK_HOME" oncommand="BrowserHome();" modifiers="alt"/>
<key keycode="VK_F5" command="Browser:Reload"/>
#ifndef XP_MACOSX
<key id="showAllHistoryKb" key="&showAllHistoryCmd.commandkey;" command="Browser:ShowAllHistory" modifiers="accel,shift"/>
<key id="showAllHistoryKb" data-l10n-id="history-show-all-shortcut" command="Browser:ShowAllHistory" modifiers="accel,shift"/>
<key keycode="VK_F5" command="Browser:ReloadSkipCache" modifiers="accel"/>
<key id="key_fullScreen" keycode="VK_F11" command="View:FullScreen"/>
#else
<key id="key_fullScreen" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,control"/>
<key id="key_fullScreen_old" key="&fullScreenCmd.macCommandKey;" command="View:FullScreen" modifiers="accel,shift"/>
<key id="key_fullScreen" data-l10n-id="full-screen-shortcut" command="View:FullScreen" modifiers="accel,control"/>
<key id="key_fullScreen_old" data-l10n-id="full-screen-shortcut" command="View:FullScreen" modifiers="accel,shift"/>
<key keycode="VK_F11" command="View:FullScreen"/>
#endif
<key id="key_toggleReaderMode"
data-l10n-id="reader-mode-toggle-shortcut"
command="View:ReaderView"
#ifndef XP_WIN
<key id="key_toggleReaderMode" key="&toggleReaderMode.key;" command="View:ReaderView" modifiers="accel,alt" disabled="true"/>
#else
<key id="key_toggleReaderMode" keycode="&toggleReaderMode.win.keycode;" command="View:ReaderView" disabled="true"/>
modifiers="accel,alt"
#endif
disabled="true"/>
#ifndef XP_MACOSX
<key id="key_togglePictureInPicture" key="&togglePictureInPicture.key;" command="View:PictureInPicture" modifiers="accel,shift"/>
<key key="&togglePictureInPicture.key2;" command="View:PictureInPicture" modifiers="accel,shift"/>
<key id="key_togglePictureInPicture" data-l10n-id="picture-in-picture-toggle-shortcut" command="View:PictureInPicture" modifiers="accel,shift"/>
<key data-l10n-id="picture-in-picture-toggle-shortcut-alt" command="View:PictureInPicture" modifiers="accel,shift"/>
#endif
<key key="&reloadCmd.commandkey;" command="Browser:Reload" modifiers="accel" id="key_reload"/>
<key key="&reloadCmd.commandkey;" command="Browser:ReloadSkipCache" modifiers="accel,shift" id="key_reload_skip_cache"/>
<key id="key_viewSource" key="&pageSourceCmd.commandkey;" command="View:PageSource" modifiers="accel"/>
<key data-l10n-id="nav-reload-shortcut" command="Browser:Reload" modifiers="accel" id="key_reload"/>
<key data-l10n-id="nav-reload-shortcut" command="Browser:ReloadSkipCache" modifiers="accel,shift" id="key_reload_skip_cache"/>
<key id="key_viewSource" data-l10n-id="page-source-shortcut" command="View:PageSource" modifiers="accel"/>
#ifdef XP_MACOSX
<key id="key_viewSourceSafari" key="&pageSourceCmd.SafariCommandKey;" command="View:PageSource" modifiers="accel,alt"/>
<key id="key_viewSourceSafari" data-l10n-id="page-source-shortcut-safari" command="View:PageSource" modifiers="accel,alt"/>
#endif
<key id="key_viewInfo" key="&pageInfoCmd.commandkey;" command="View:PageInfo" modifiers="accel"/>
<key id="key_find" key="&findOnCmd.commandkey;" command="cmd_find" modifiers="accel"/>
<key id="key_findAgain" key="&findAgainCmd.commandkey;" command="cmd_findAgain" modifiers="accel"/>
<key id="key_findPrevious" key="&findAgainCmd.commandkey;" command="cmd_findPrevious" modifiers="accel,shift"/>
<key id="key_viewInfo" data-l10n-id="page-info-shortcut" command="View:PageInfo" modifiers="accel"/>
<key id="key_find" data-l10n-id="find-shortcut" command="cmd_find" modifiers="accel"/>
<key id="key_findAgain" data-l10n-id="search-find-again-shortcut" command="cmd_findAgain" modifiers="accel"/>
<key id="key_findPrevious" data-l10n-id="search-find-again-shortcut" command="cmd_findPrevious" modifiers="accel,shift"/>
#ifdef XP_MACOSX
<key id="key_findSelection" key="&findSelectionCmd.commandkey;" command="cmd_findSelection" modifiers="accel"/>
<key id="key_findSelection" data-l10n-id="search-find-selection-shortcut" command="cmd_findSelection" modifiers="accel"/>
#endif
<key keycode="&findAgainCmd.commandkey2;" command="cmd_findAgain"/>
<key keycode="&findAgainCmd.commandkey2;" command="cmd_findPrevious" modifiers="shift"/>
<key data-l10n-id="search-find-again-shortcut-alt" command="cmd_findAgain"/>
<key data-l10n-id="search-find-again-shortcut-alt" command="cmd_findPrevious" modifiers="shift"/>
<key id="addBookmarkAsKb" key="&bookmarkThisPageCmd.commandkey;" command="Browser:AddBookmarkAs" modifiers="accel"/>
<key id="bookmarkAllTabsKb" key="&bookmarkThisPageCmd.commandkey;" oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueCurrentPages);" modifiers="accel,shift"/>
# Accel+Shift+A-F are reserved on GTK
#ifndef MOZ_WIDGET_GTK
<key id="manBookmarkKb" key="&bookmarksCmd.commandkey;" command="Browser:ShowAllBookmarks" modifiers="accel,shift"/>
#else
<key id="manBookmarkKb" key="&bookmarksGtkCmd.commandkey;" command="Browser:ShowAllBookmarks" modifiers="accel,shift"/>
#endif
<key id="viewBookmarksSidebarKb" key="&bookmarksCmd.commandkey;" oncommand="SidebarUI.toggle('viewBookmarksSidebar');" modifiers="accel"/>
<key id="addBookmarkAsKb" data-l10n-id="bookmark-this-page-shortcut" command="Browser:AddBookmarkAs" modifiers="accel"/>
<key id="bookmarkAllTabsKb" data-l10n-id="bookmark-this-page-shortcut" oncommand="PlacesCommandHook.bookmarkPages(PlacesCommandHook.uniqueCurrentPages);" modifiers="accel,shift"/>
<key id="manBookmarkKb" data-l10n-id="bookmark-show-all-shortcut" command="Browser:ShowAllBookmarks" modifiers="accel,shift"/>
<key id="viewBookmarksSidebarKb"
data-l10n-id="bookmark-show-sidebar-shortcut"
modifiers="accel"
oncommand="SidebarUI.toggle('viewBookmarksSidebar');"/>
<key id="key_stop" keycode="VK_ESCAPE" command="Browser:Stop"/>
#ifdef XP_MACOSX
<key id="key_stop_mac" modifiers="accel" key="&stopCmd.macCommandKey;" command="Browser:Stop"/>
<key id="key_stop_mac" modifiers="accel" data-l10n-id="nav-stop-shortcut" command="Browser:Stop"/>
#endif
<key id="key_gotoHistory"
key="&historySidebarCmd.commandKey;"
data-l10n-id="history-sidebar-shortcut"
#ifdef XP_MACOSX
modifiers="accel,shift"
#else
@ -269,25 +274,25 @@
#endif
oncommand="SidebarUI.toggle('viewHistorySidebar');"/>
<key id="key_fullZoomReduce" key="&fullZoomReduceCmd.commandkey;" command="cmd_fullZoomReduce" modifiers="accel"/>
<key key="&fullZoomReduceCmd.commandkey2;" command="cmd_fullZoomReduce" modifiers="accel"/>
<key id="key_fullZoomEnlarge" key="&fullZoomEnlargeCmd.commandkey;" command="cmd_fullZoomEnlarge" modifiers="accel"/>
<key key="&fullZoomEnlargeCmd.commandkey2;" command="cmd_fullZoomEnlarge" modifiers="accel"/>
<key key="&fullZoomEnlargeCmd.commandkey3;" command="cmd_fullZoomEnlarge" modifiers="accel"/>
<key id="key_fullZoomReset" key="&fullZoomResetCmd.commandkey;" command="cmd_fullZoomReset" modifiers="accel"/>
<key key="&fullZoomResetCmd.commandkey2;" command="cmd_fullZoomReset" modifiers="accel"/>
<key id="key_fullZoomReduce" data-l10n-id="full-zoom-reduce-shortcut" command="cmd_fullZoomReduce" modifiers="accel"/>
<key data-l10n-id="full-zoom-reduce-shortcut-alt" command="cmd_fullZoomReduce" modifiers="accel"/>
<key id="key_fullZoomEnlarge" data-l10n-id="full-zoom-enlarge-shortcut" command="cmd_fullZoomEnlarge" modifiers="accel"/>
<key data-l10n-id="full-zoom-enlarge-shortcut-alt" command="cmd_fullZoomEnlarge" modifiers="accel"/>
<key data-l10n-id="full-zoom-enlarge-shortcut-alt2" command="cmd_fullZoomEnlarge" modifiers="accel"/>
<key id="key_fullZoomReset" data-l10n-id="full-zoom-reset-shortcut" command="cmd_fullZoomReset" modifiers="accel"/>
<key data-l10n-id="full-zoom-reset-shortcut-alt" command="cmd_fullZoomReset" modifiers="accel"/>
<key id="key_showAllTabs" keycode="VK_TAB" modifiers="control,shift"/>
<key id="key_switchTextDirection" key="&bidiSwitchTextDirectionItem.commandkey;" command="cmd_switchTextDirection" modifiers="accel,shift" />
<key id="key_switchTextDirection" data-l10n-id="bidi-switch-direction-shortcut" command="cmd_switchTextDirection" modifiers="accel,shift" />
<key id="key_privatebrowsing" command="Tools:PrivateBrowsing" key="&privateBrowsingCmd.commandkey;"
<key id="key_privatebrowsing" command="Tools:PrivateBrowsing" data-l10n-id="private-browsing-shortcut"
modifiers="accel,shift" reserved="true"/>
<key id="key_sanitize" command="Tools:Sanitize" keycode="VK_DELETE" modifiers="accel,shift"/>
#ifdef XP_MACOSX
<key id="key_sanitize_mac" command="Tools:Sanitize" keycode="VK_BACK" modifiers="accel,shift"/>
#endif
<key id="key_quitApplication" key="&quitApplicationCmd.key;"
<key id="key_quitApplication" data-l10n-id="quit-app-shortcut"
#ifdef XP_WIN
modifiers="accel,shift"
#else
@ -301,8 +306,8 @@
#endif
reserved="true"/>
<key id="key_undoCloseTab" command="History:UndoCloseTab" key="&tabCmd.commandkey;" modifiers="accel,shift"/>
<key id="key_undoCloseWindow" command="History:UndoCloseWindow" key="&newNavigatorCmd.key;" modifiers="accel,shift"/>
<key id="key_undoCloseTab" command="History:UndoCloseTab" data-l10n-id="tab-new-shortcut" modifiers="accel,shift"/>
<key id="key_undoCloseWindow" command="History:UndoCloseWindow" data-l10n-id="window-new-shortcut" modifiers="accel,shift"/>
#ifdef XP_GNOME
#define NUM_SELECT_TAB_MODIFIER alt
@ -346,22 +351,22 @@
#ifdef XP_MACOSX
<key id="key_minimizeWindow"
command="minimizeWindow"
key="&minimizeWindow.key;"
data-l10n-id="window-minimize-shortcut"
modifiers="accel"/>
<key id="key_openHelpMac"
oncommand="openHelpLink('firefox-osxkey');"
key="&helpMac.commandkey;"
data-l10n-id="help-shortcut"
modifiers="accel"/>
<!-- These are used to build the Application menu -->
<key id="key_preferencesCmdMac"
key="&preferencesCmdMac.commandkey;"
data-l10n-id="preferences-shortcut"
reserved="true"
modifiers="accel"/>
<key id="key_hideThisAppCmdMac"
key="&hideThisAppCmdMac2.commandkey;"
data-l10n-id="hide-app-shortcut"
modifiers="accel"/>
<key id="key_hideOtherAppsCmdMac"
key="&hideOtherAppsCmdMac.commandkey;"
data-l10n-id="hide-other-apps-shortcut"
modifiers="accel,alt"/>
#endif
</keyset>

Просмотреть файл

@ -62,6 +62,7 @@
<link rel="localization" href="toolkit/global/textActions.ftl"/>
<link rel="localization" href="browser/browser.ftl"/>
<link rel="localization" href="browser/browserContext.ftl"/>
<link rel="localization" href="browser/browserSets.ftl"/>
<link rel="localization" href="browser/menubar.ftl"/>
<link rel="localization" href="browser/protectionsPanel.ftl"/>
<link rel="localization" href="browser/appmenu.ftl"/>

Просмотреть файл

@ -14,6 +14,7 @@
<html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="browser/browserSets.ftl"/>
<html:link rel="localization" href="browser/menubar.ftl"/>
</linkset>

Просмотреть файл

@ -44,6 +44,7 @@
<linkset>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="browser/browserSets.ftl"/>
</linkset>
<script src="chrome://browser/content/places/places.js"/>
@ -129,11 +130,11 @@
#endif
#ifdef XP_UNIX
<key id="placesKey_goBackKb2"
key="&goBackCmd.commandKey;"
data-l10n-id="nav-back-shortcut-alt"
command="OrganizerCommand:Back"
modifiers="accel"/>
<key id="placesKey_goForwardKb2"
key="&goForwardCmd.commandKey;"
data-l10n-id="nav-fwd-shortcut-alt"
command="OrganizerCommand:Forward"
modifiers="accel"/>
#endif

Просмотреть файл

@ -0,0 +1,203 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
window-minimize-command =
.label = Minimize
window-zoom-command =
.label = Zoom
window-new-shortcut =
.key = N
window-minimize-shortcut =
.key = M
close-shortcut =
.key = W
tab-new-shortcut =
.key = T
location-open-shortcut =
.key = L
location-open-shortcut-alt =
.key = D
search-focus-shortcut =
.key = K
# This shortcut is used in two contexts:
# - web search
# - find in page
find-shortcut =
.key = F
search-find-again-shortcut =
.key = G
search-find-again-shortcut-alt =
.keycode = VK_F3
search-find-selection-shortcut =
.key = E
# Verify what shortcut for that operation
# are recommended by the Human Interface Guidelines
# of each platform for your locale.
search-focus-shortcut-alt =
.key = { PLATFORM() ->
[linux] J
*[other] E
}
# Verify what shortcut for that operation
# are recommended by the Human Interface Guidelines
# of each platform for your locale.
downloads-shortcut =
.key = { PLATFORM() ->
[linux] Y
*[other] J
}
addons-shortcut =
.key = A
file-open-shortcut =
.key = O
save-page-shortcut =
.key = S
page-source-shortcut =
.key = U
# This should match the Option+Command keyboard shortcut letter that Safari
# and Chrome use for "View Source" on macOS. `page-source-shortcut` above
# is Firefox's official keyboard shortcut shown in the GUI.
# Safari variant is an alias provided for the convenience of Safari and Chrome
# users on macOS. See bug 1398988.
page-source-shortcut-safari =
.key = U
page-info-shortcut =
.key = I
print-shortcut =
.key = P
mute-toggle-shortcut =
.key = M
nav-back-shortcut-alt =
.key = [
nav-fwd-shortcut-alt =
.key = ]
nav-reload-shortcut =
.key = R
# Shortcut available only on macOS.
nav-stop-shortcut =
.key = .
history-show-all-shortcut =
.key = H
history-sidebar-shortcut =
.key = H
full-screen-shortcut =
.key = F
# Verify what shortcut for that operation
# are recommended by the Human Interface Guidelines
# of each platform for your locale.
reader-mode-toggle-shortcut =
.key = { PLATFORM() ->
[windows] VK_F9
*[other] R
}
picture-in-picture-toggle-shortcut =
.key = ]
# Pick the key that is commonly present
# in your locale keyboards above the
# `picture-in-picture-toggle-shortcut` key.
picture-in-picture-toggle-shortcut-alt =
.key = {"}"}
bookmark-this-page-shortcut =
.key = D
# Verify what shortcut for that operation
# are recommended by the Human Interface Guidelines
# of each platform for your locale.
bookmark-show-all-shortcut =
.key = { PLATFORM() ->
[linux] O
*[other] B
}
# Verify what shortcut for that operation
# are recommended by the Human Interface Guidelines
# of each platform for your locale.
bookmark-show-sidebar-shortcut =
.key = B
## All `-alt*` messages are alternative acceleration keys for zoom.
## If shift key is needed with your locale popular keyboard for them,
## you can use these alternative items. Otherwise, their values should be empty.
full-zoom-reduce-shortcut =
.key = -
# If in keyboard layouts popular for your locale you need to use the shift key
# to access the original shortcuts, the following shortcuts can be used.
# Otherwise their values should remain empty.
full-zoom-reduce-shortcut-alt =
.key = {""}
full-zoom-enlarge-shortcut =
.key = +
full-zoom-enlarge-shortcut-alt =
.key = =
full-zoom-enlarge-shortcut-alt2 =
.key = {""}
full-zoom-reset-shortcut =
.key = 0
full-zoom-reset-shortcut-alt =
.key = {""}
##
bidi-switch-direction-shortcut =
.key = X
private-browsing-shortcut =
.key = P
## The shortcuts below are for Mac specific
## global menu.
quit-app-shortcut =
.key = Q
help-shortcut =
.key = ?
preferences-shortcut =
.key = ,
hide-app-shortcut =
.key = H
hide-other-apps-shortcut =
.key = H

Просмотреть файл

@ -2,24 +2,16 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!ENTITY minimizeWindow.key "m">
<!ENTITY minimizeWindow.label "Minimize">
<!ENTITY zoomWindow.label "Zoom">
<!ENTITY aboutProduct2.label "About &brandShorterName;">
<!ENTITY aboutProduct2.accesskey "A">
<!ENTITY helpMac.commandkey "?">
<!ENTITY preferencesCmdMac.label "Preferences…">
<!ENTITY preferencesCmdMac.commandkey ",">
<!ENTITY servicesMenuMac.label "Services">
<!ENTITY hideThisAppCmdMac2.label "Hide &brandShorterName;">
<!ENTITY hideThisAppCmdMac2.commandkey "H">
<!ENTITY hideOtherAppsCmdMac.label "Hide Others">
<!ENTITY hideOtherAppsCmdMac.commandkey "H">
<!ENTITY showAllAppsCmdMac.label "Show All">

Просмотреть файл

@ -26,11 +26,8 @@ in "Search through tabs". -->
<!ENTITY allTabsMenu.searchTabs.label "Search Tabs">
<!ENTITY tabCmd.label "New Tab">
<!ENTITY tabCmd.commandkey "t">
<!ENTITY openFileCmd.label "Open File…">
<!ENTITY openFileCmd.commandkey "o">
<!ENTITY printCmd.label "Print…">
<!ENTITY printCmd.commandkey "p">
<!ENTITY taskManagerCmd.label "Task Manager">
@ -48,22 +45,7 @@ this container is a toolbar. This avoids double-speaking. -->
<!ENTITY personalbar.accessibleLabel "Bookmarks">
<!ENTITY bookmarksToolbarItem.label "Bookmarks Toolbar Items">
<!ENTITY pageSourceCmd.commandkey "u">
<!-- LOCALIZATION NOTE (pageSourceCmd.SafariCommandKey should match the
Option+Command keyboard shortcut letter that Safari and Chrome use for "View
Source" on macOS. pageSourceCmd.commandkey above is Firefox's official keyboard
shortcut shown in the GUI. SafariCommandKey is an alias provided for the
convenience of Safari and Chrome users on macOS. See bug 1398988. -->
<!ENTITY pageSourceCmd.SafariCommandKey "u">
<!ENTITY pageInfoCmd.commandkey "i">
<!ENTITY fullScreenCmd.label "Full Screen">
<!ENTITY fullScreenCmd.macCommandKey "f">
<!ENTITY toggleReaderMode.key "R">
<!ENTITY toggleReaderMode.win.keycode "VK_F9">
<!ENTITY togglePictureInPicture.key2 "}">
<!ENTITY togglePictureInPicture.key "]"> <!-- } is above this key on many keyboards -->
<!ENTITY fullScreenMinimize.tooltip "Minimize">
<!ENTITY fullScreenRestore.tooltip "Restore">
@ -116,13 +98,10 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
<!ENTITY pointerlockWarning.afterDomain.label "has control of your pointer. Press Esc to take back control.">
<!ENTITY pointerlockWarning.generic.label "This document has control of your pointer. Press Esc to take back control.">
<!ENTITY bookmarkThisPageCmd.commandkey "d">
<!ENTITY showAllBookmarks2.label "Show All Bookmarks">
<!ENTITY recentBookmarks.label "Recently Bookmarked">
<!ENTITY bookmarksToolbarChevron.tooltip "Show more bookmarks">
<!ENTITY stopCmd.macCommandKey ".">
<!ENTITY goEndCap.tooltip "Go to the address in the Location Bar">
<!ENTITY printButton.label "Print">
<!ENTITY printButton.tooltip "Print this page">
@ -141,7 +120,6 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
<!ENTITY homeButton.defaultPage.tooltip "&brandShortName; Home Page">
<!ENTITY bookmarksButton.label "Bookmarks">
<!ENTITY bookmarksCmd.commandkey "b">
<!ENTITY bookmarksSubview.label "Bookmarks">
<!ENTITY bookmarksMenuButton2.label "Bookmarks Menu">
@ -156,22 +134,13 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
<!ENTITY addBookmarksMenu.label "Add Bookmarks Menu to Toolbar">
<!ENTITY removeBookmarksMenu.label "Remove Bookmarks Menu from Toolbar">
<!-- LOCALIZATION NOTE (bookmarksGtkCmd.commandkey): This command
- key should not contain the letters A-F, since these are reserved
- shortcut keys on Linux. -->
<!ENTITY bookmarksGtkCmd.commandkey "o">
<!ENTITY historyButton.label "History">
<!ENTITY historySidebarCmd.commandKey "h">
<!ENTITY downloads.label "Downloads">
<!-- LOCALIZATION NOTE (libraryDownloads.label): This label is similar to
- downloads.label, but used in the Library panel. -->
<!ENTITY libraryDownloads.label "Downloads">
<!ENTITY downloads.commandkey "j">
<!ENTITY downloadsUnix.commandkey "y">
<!ENTITY addons.label "Add-ons">
<!ENTITY addons.commandkey "A">
<!ENTITY webDeveloperMenu.label "Web Developer">
@ -179,7 +148,6 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
<!ENTITY manageUserContext.label "Manage Containers">
<!ENTITY manageUserContext.accesskey "O">
<!ENTITY newNavigatorCmd.label "New Window">
<!ENTITY newNavigatorCmd.key "N">
<!ENTITY newPrivateWindow.label "New Private Window">
<!ENTITY editMenu.label "Edit">
@ -187,8 +155,6 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
<!ENTITY preferencesCmdUnix.label "Preferences">
<!ENTITY logins.label "Logins and Passwords">
<!ENTITY privateBrowsingCmd.commandkey "P">
<!ENTITY viewCustomizeToolbar.label "Customize…">
<!ENTITY viewCustomizeToolbar.accesskey "C">
<!ENTITY overflowCustomizeToolbar.label "Customize Toolbar…">
@ -199,8 +165,6 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
<!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
<!ENTITY historyUndoWindowMenu.label "Recently Closed Windows">
<!ENTITY showAllHistoryCmd.commandkey "H">
<!ENTITY appMenuHistory.showAll.label "Show All History">
<!ENTITY appMenuHistory.clearRecent.label "Clear Recent History…">
<!ENTITY appMenuHistory.restoreSession.label "Restore Previous Session">
@ -276,37 +240,11 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
secondary commands. -->
<!ENTITY moreMenu.label "More">
<!ENTITY openCmd.commandkey "l">
<!ENTITY urlbar.placeholder2 "Search or enter address">
<!ENTITY urlbar.accesskey "d">
<!-- LOCALIZATION NOTE (urlbar.extension.label): Used to indicate that a selected autocomplete entry is provided by an extension. -->
<!ENTITY urlbar.extension.label "Extension:">
<!ENTITY urlbar.switchToTab.label "Switch to tab:">
<!--
Comment duplicated from browser-sets.inc:
Search Command Key Logic works like this:
Unix: Ctrl+J (0.8, 0.9 support)
Ctrl+K (cross platform binding)
Mac: Cmd+K (cross platform binding)
Cmd+Opt+F (platform convention)
Win: Ctrl+K (cross platform binding)
Ctrl+E (IE compat)
We support Ctrl+K on all platforms now and advertise it in the menu since it is
our standard - it is a "safe" choice since it is near no harmful keys like "W" as
"E" is. People mourning the loss of Ctrl+K for emacs compat can switch their GTK
system setting to use emacs emulation, and we should respect it. Focus-Search-Box
is a fundamental keybinding and we are maintaining a XP binding so that it is easy
for people to switch to Linux.
-->
<!ENTITY searchFocus.commandkey "k">
<!ENTITY searchFocus.commandkey2 "e">
<!ENTITY searchFocusUnix.commandkey "j">
<!ENTITY contentSearchSubmit.tooltip "Submit search">
<!-- LOCALIZATION NOTE (searchInput.placeholder):
@ -316,7 +254,6 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
<!ENTITY openLinkCmdInTab.accesskey "T">
<!ENTITY reloadCmd.commandkey "r">
<!ENTITY pageAction.copyLink.label "Copy Link">
<!-- LOCALIZATION NOTE(pocket-button.tooltiptext, saveToPocketCmd.label, saveLinkToPocketCmd.label, pocketMenuitem.label):
@ -326,24 +263,6 @@ convenience of Safari and Chrome users on macOS. See bug 1398988. -->
<!ENTITY pocketMenuitem.label "View Pocket List">
<!ENTITY emailPageCmd.label "Email Link…">
<!-- alternate for content area context menu -->
<!ENTITY savePageCmd.commandkey "s">
<!-- LOCALIZATION NOTE :
fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
If shift key is needed with your locale popular keyboard for them,
you can use these alternative items. Otherwise, their values should be empty. -->
<!ENTITY fullZoomEnlargeCmd.commandkey "+">
<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
<!ENTITY fullZoomReduceCmd.commandkey "-">
<!ENTITY fullZoomReduceCmd.commandkey2 "">
<!ENTITY fullZoomResetCmd.commandkey "0">
<!ENTITY fullZoomResetCmd.commandkey2 "">
<!ENTITY fullZoom.label "Zoom">
@ -353,16 +272,9 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY quitApplicationCmdWin2.label "Exit">
<!ENTITY quitApplicationCmdWin2.accesskey "x">
<!ENTITY quitApplicationCmdWin2.tooltip "Exit &brandShorterName;">
<!ENTITY goBackCmd.commandKey "[">
<!ENTITY goForwardCmd.commandKey "]">
<!ENTITY quitApplicationCmd.label "Quit">
<!ENTITY quitApplicationCmd.accesskey "Q">
<!ENTITY quitApplicationCmdMac2.label "Quit &brandShorterName;">
<!ENTITY quitApplicationCmd.key "Q">
<!ENTITY closeCmd.key "W">
<!ENTITY toggleMuteCmd.key "M">
<!ENTITY allowPopups.accesskey "p">
<!-- On Windows we use the term "Options" to describe settings, but
@ -373,13 +285,7 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY editPopupSettings.accesskey "E">
<!ENTITY dontShowMessage.accesskey "D">
<!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
<!ENTITY findOnCmd.label "Find in This Page…">
<!ENTITY findOnCmd.commandkey "f">
<!ENTITY findAgainCmd.commandkey "g">
<!ENTITY findAgainCmd.commandkey2 "VK_F3">
<!ENTITY findSelectionCmd.commandkey "e">
<!ENTITY spellAddDictionaries.label "Add Dictionaries…">
<!ENTITY spellAddDictionaries.accesskey "A">

Просмотреть файл

@ -191,3 +191,173 @@ menu-bookmark-edit =
.label = { COPY(from_path, "editThisBookmarkCmd.label") }
""", from_path="browser/chrome/browser/browser.dtd")
)
ctx.add_transforms(
'browser/browser/browserSets.ftl',
'browser/browser/browserSets.ftl',
transforms_from(
"""
window-minimize-command =
.label = { COPY(baseMenuOverlay_path, "minimizeWindow.label") }
window-zoom-command =
.label = { COPY(baseMenuOverlay_path, "zoomWindow.label") }
window-new-shortcut =
.key = { COPY(browser_path, "newNavigatorCmd.key") }
window-minimize-shortcut =
.key = { COPY(baseMenuOverlay_path, "minimizeWindow.key") }
close-shortcut =
.key = { COPY(browser_path, "closeCmd.key") }
tab-new-shortcut =
.key = { COPY(browser_path, "tabCmd.commandkey") }
location-open-shortcut =
.key = { COPY(browser_path, "openCmd.commandkey") }
location-open-shortcut-alt =
.key = { COPY(browser_path, "urlbar.accesskey") }
search-focus-shortcut =
.key = { COPY(browser_path, "searchFocus.commandkey") }
find-shortcut =
.key = { COPY(browser_path, "findOnCmd.commandkey") }
search-find-again-shortcut =
.key = { COPY(browser_path, "findAgainCmd.commandkey") }
search-find-again-shortcut-alt =
.keycode = { COPY(browser_path, "findAgainCmd.commandkey2") }
search-find-selection-shortcut =
.key = { COPY(browser_path, "findSelectionCmd.commandkey") }
search-focus-shortcut-alt =
.key = { PLATFORM() ->
[linux] { COPY(browser_path, "searchFocusUnix.commandkey") }
*[other] { COPY(browser_path, "searchFocus.commandkey2") }
}
downloads-shortcut =
.key = { PLATFORM() ->
[linux] { COPY(browser_path, "downloadsUnix.commandkey") }
*[other] { COPY(browser_path, "downloads.commandkey") }
}
addons-shortcut =
.key = { COPY(browser_path, "addons.commandkey") }
file-open-shortcut =
.key = { COPY(browser_path, "openFileCmd.commandkey") }
save-page-shortcut =
.key = { COPY(browser_path, "savePageCmd.commandkey") }
page-source-shortcut =
.key = { COPY(browser_path, "pageSourceCmd.commandkey") }
page-source-shortcut-safari =
.key = { COPY(browser_path, "pageSourceCmd.SafariCommandKey") }
page-info-shortcut =
.key = { COPY(browser_path, "pageInfoCmd.commandkey") }
print-shortcut =
.key = { COPY(browser_path, "printCmd.commandkey") }
mute-toggle-shortcut =
.key = { COPY(browser_path, "toggleMuteCmd.key") }
nav-back-shortcut-alt =
.key = { COPY(browser_path, "goBackCmd.commandKey") }
nav-fwd-shortcut-alt =
.key = { COPY(browser_path, "goForwardCmd.commandKey") }
nav-reload-shortcut =
.key = { COPY(browser_path, "reloadCmd.commandkey") }
nav-stop-shortcut =
.key = { COPY(browser_path, "stopCmd.macCommandKey") }
history-show-all-shortcut =
.key = { COPY(browser_path, "showAllHistoryCmd.commandkey") }
history-sidebar-shortcut =
.key = { COPY(browser_path, "historySidebarCmd.commandKey") }
full-screen-shortcut =
.key = { COPY(browser_path, "fullScreenCmd.macCommandKey") }
reader-mode-toggle-shortcut =
.key = { PLATFORM() ->
[windows] { COPY(browser_path, "toggleReaderMode.win.keycode") }
*[other] { COPY(browser_path, "toggleReaderMode.key") }
}
picture-in-picture-toggle-shortcut =
.key = { COPY(browser_path, "togglePictureInPicture.key") }
picture-in-picture-toggle-shortcut-alt =
.key = { "}" }
bookmark-this-page-shortcut =
.key = { COPY(browser_path, "bookmarkThisPageCmd.commandkey") }
bookmark-show-all-shortcut =
.key = { PLATFORM() ->
[linux] { COPY(browser_path, "bookmarksGtkCmd.commandkey") }
*[other] { COPY(browser_path, "bookmarksWinCmd.commandkey") }
}
bookmark-show-sidebar-shortcut =
.key = { COPY(browser_path, "bookmarksCmd.commandkey") }
full-zoom-reduce-shortcut =
.key = { COPY(browser_path, "fullZoomReduceCmd.commandkey") }
full-zoom-reduce-shortcut-alt =
.key = { COPY(browser_path, "fullZoomReduceCmd.commandkey2") }
full-zoom-enlarge-shortcut =
.key = { COPY(browser_path, "fullZoomEnlargeCmd.commandkey") }
full-zoom-enlarge-shortcut-alt =
.key = { COPY(browser_path, "fullZoomEnlargeCmd.commandkey2") }
full-zoom-enlarge-shortcut-alt2 =
.key = { COPY(browser_path, "fullZoomEnlargeCmd.commandkey3") }
full-zoom-reset-shortcut =
.key = { COPY(browser_path, "fullZoomResetCmd.commandkey") }
full-zoom-reset-shortcut-alt =
.key = { COPY(browser_path, "fullZoomResetCmd.commandkey2") }
bidi-switch-direction-shortcut =
.key = { COPY(browser_path, "bidiSwitchTextDirectionItem.commandkey") }
private-browsing-shortcut =
.key = { COPY(browser_path, "privateBrowsingCmd.commandkey") }
quit-app-shortcut =
.key = { COPY(browser_path, "quitApplicationCmd.key") }
help-shortcut =
.key = { COPY(baseMenuOverlay_path, "helpMac.commandkey") }
preferences-shortcut =
.key = { COPY(baseMenuOverlay_path, "preferencesCmdMac.commandkey") }
hide-app-shortcut =
.key = { COPY(baseMenuOverlay_path, "hideThisAppCmdMac2.commandkey") }
hide-other-apps-shortcut =
.key = { COPY(baseMenuOverlay_path, "hideOtherAppsCmdMac.commandkey") }
""", baseMenuOverlay_path="browser/chrome/browser/baseMenuOverlay.dtd",
browser_path="browser/chrome/browser/browser.dtd")
)

Просмотреть файл

@ -223,7 +223,7 @@ add_task(async function e10sLostKeys() {
let initialValue = findBar._findField.value;
await EventUtils.synthesizeAndWaitKey(
"f",
"F",
{ accelKey: true },
window,
null,