From fb7c19d2be65a6cef31862c2854fea9bb1387652 Mon Sep 17 00:00:00 2001
From: aeghn <[email protected]>
Date: Tue, 28 Jul 2020 12:16:50 +0800
Subject: [PATCH] test1

---
 chrome/browser/content/browser/browser.xhtml | 34 +++++++++++++-------
 localization/en-US/browser/browserSets.ftl   |  4 +--
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/chrome/browser/content/browser/browser.xhtml b/chrome/browser/content/browser/browser.xhtml
index b5e8b77..ad5490d 100644
--- a/chrome/browser/content/browser/browser.xhtml
+++ b/chrome/browser/content/browser/browser.xhtml
@@ -194,8 +194,14 @@ if (AppConstants.platform == "macosx") {
     <command id="Browser:ReloadSkipCache" oncommand="BrowserReloadSkipCache()" disabled="true">
       <observes element="Browser:Reload" attribute="disabled"/>
     </command>
-    <command id="Browser:NextTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(1, true);"/>
-    <command id="Browser:PrevTab" oncommand="gBrowser.tabContainer.advanceSelectedTab(-1, true);"/>
+    <command id="Browser:NextTab"
+             oncommand="gBrowser.tabContainer.advanceSelectedTab(1, true);"
+             data-l10n-id="window-new-shortcut"
+             modifiers="alt"/>
+    <command id="Browser:PrevTab"
+             oncommand="gBrowser.tabContainer.advanceSelectedTab(-1, true);"
+             data-l10n-id="private-browsing-shortcut"
+             modifiers="alt"/>
     <command id="Browser:ShowAllTabs" oncommand="gTabsPanel.showAllTabsPanel();"/>
     <command id="cmd_fullZoomReduce"  oncommand="FullZoom.reduce()"/>
     <command id="cmd_fullZoomEnlarge" oncommand="FullZoom.enlarge()"/>
@@ -270,11 +276,11 @@ if (AppConstants.platform == "macosx") {
 </commandset>

   <keyset id="mainKeyset">
-    <key id="key_newNavigator"
-         data-l10n-id="window-new-shortcut"
-         command="cmd_newNavigator"
-         modifiers="accel" reserved="true"/>
-    <key id="key_newNavigatorTab" data-l10n-id="tab-new-shortcut" modifiers="accel"
+    <!-- <key id="key_newNavigator" -->
+    <!--      data-l10n-id="window-new-shortcut" -->
+    <!--      command="cmd_newNavigator" -->
+    <!--      modifiers="accel" reserved="true"/> -->
+    <key id="key_newNavigatorTab" data-l10n-id="location-open-shortcut" modifiers="alt"
          command="cmd_newNavigatorTabNoEvent" reserved="true"/>
     <key id="focusURLBar" data-l10n-id="location-open-shortcut" command="Browser:OpenLocation"
          modifiers="accel"/>
@@ -293,7 +299,7 @@ if (AppConstants.platform == "macosx") {
     <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="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"/>
@@ -318,8 +324,14 @@ if (AppConstants.platform == "macosx") {

     <key keycode="VK_BACK" command="cmd_handleBackspace" reserved="false"/>
     <key keycode="VK_BACK" command="cmd_handleShiftBackspace" modifiers="shift" reserved="false"/>
-    <key id="goBackKb"  keycode="VK_LEFT" command="Browser:Back" modifiers="alt"/>
-    <key id="goForwardKb"  keycode="VK_RIGHT" command="Browser:Forward" modifiers="alt"/>
+    <key id="goBackKb"
+         data-l10n-id="bookmark-show-sidebar-shortcut"
+         command="Browser:Back"
+         modifiers="alt"/>
+    <key id="goForwardKb"
+         data-l10n-id="full-screen-shortcut"
+         command="Browser:Forward"
+         modifiers="alt"/>
     <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"/>
     <key id="goHome" keycode="VK_HOME" oncommand="BrowserHome();" modifiers="alt"/>
@@ -385,7 +397,7 @@ if (AppConstants.platform == "macosx") {
          command="cmd_quitApplication"
          reserved="true"/>

-    <key id="key_undoCloseTab" command="History:UndoCloseTab" data-l10n-id="tab-new-shortcut" modifiers="accel,shift"/>
+    <key id="key_undoCloseTab" command="History:UndoCloseTab" data-l10n-id="location-open-shortcut" modifiers="accel,shift"/>
     <key id="key_undoCloseWindow" command="History:UndoCloseWindow" data-l10n-id="window-new-shortcut" modifiers="accel,shift"/>


diff --git a/localization/en-US/browser/browserSets.ftl b/localization/en-US/browser/browserSets.ftl
index 7eb98ca..03f5269 100644
--- a/localization/en-US/browser/browserSets.ftl
+++ b/localization/en-US/browser/browserSets.ftl
@@ -36,7 +36,7 @@ find-shortcut =
     .key = F

 search-find-again-shortcut =
-    .key = G
+    .key = S

 search-find-again-shortcut-alt =
     .keycode = VK_F3
@@ -69,7 +69,7 @@ file-open-shortcut =
     .key = O

 save-page-shortcut =
-    .key = S
+    .key = Y

 page-source-shortcut =
     .key = U
--
2.27.0