From a9c7574aec8e42edf983e9798076101ba8d3ec17 Mon Sep 17 00:00:00 2001 From: "jwalden%mit.edu" Date: Thu, 7 Oct 2004 14:48:23 +0000 Subject: [PATCH] Bug 259883 - "accel" is Cmd, not Ctrl on Mac. r=steffen --- .../help/locale/en-US/download_manager.xhtml | 2 +- .../help/locale/en-US/mouse_shortcuts.xhtml | 48 ++-- .../help/locale/en-US/platformStrings.dtd | 3 +- .../components/help/locale/en-US/prefs.xhtml | 6 +- .../help/locale/en-US/shortcuts.xhtml | 269 +++++++++--------- .../help/locale/en-US/using_firebird.xhtml | 44 ++- 6 files changed, 187 insertions(+), 185 deletions(-) diff --git a/browser/components/help/locale/en-US/download_manager.xhtml b/browser/components/help/locale/en-US/download_manager.xhtml index 342ec2689ab..c7cdaa384d5 100644 --- a/browser/components/help/locale/en-US/download_manager.xhtml +++ b/browser/components/help/locale/en-US/download_manager.xhtml @@ -38,7 +38,7 @@ Contributors:

The Download Manager will appear when you download files, when you select Tools > Downloads, and when you type - Ctrl+JCtrl+Y + &accelKey;+J&accelKey;+Y on your keyboard.

diff --git a/browser/components/help/locale/en-US/mouse_shortcuts.xhtml b/browser/components/help/locale/en-US/mouse_shortcuts.xhtml index f87c894bae9..791e9595424 100644 --- a/browser/components/help/locale/en-US/mouse_shortcuts.xhtml +++ b/browser/components/help/locale/en-US/mouse_shortcuts.xhtml @@ -37,33 +37,33 @@ Contributors: Back - Shift+Scroll Down - Shift+Scroll Down - Shift+Scroll Down + &shiftKey;+Scroll Down + &shiftKey;+Scroll Down + &shiftKey;+Scroll Down Close Tab Middle-click on Tab   - Shift+Left-click + &shiftKey;+Left-click Decrease Text Size - Ctrl+Scroll up - Ctrl+Scroll up - Ctrl+Scroll up + &accelKey;+Scroll up + &accelKey;+Scroll up + &accelKey;+Scroll up Forward - Shift+Scroll up - Shift+Scroll up - Shift+Scroll up + &shiftKey;+Scroll up + &shiftKey;+Scroll up + &shiftKey;+Scroll up Increase Text Size - Ctrl+Scroll down - Ctrl+Scroll down - Ctrl+Scroll down + &accelKey;+Scroll down + &accelKey;+Scroll down + &accelKey;+Scroll down New Tab @@ -73,21 +73,21 @@ Contributors: Open in Background Tab - Ctrl+Left-click
Middle-click + &accelKey;+Left-click
Middle-click   - Ctrl+Shift+Left-click
Middle-click + &accelKey;+&shiftKey;+Left-click
Middle-click Open in Foreground Tab - Ctrl+Shift+Left-click
Shift+ + &accelKey;+&shiftKey;+Left-click
&shiftKey;+ Middle-click   - Shift+Left-click + &shiftKey;+Left-click Open in New Window - Shift+Left-click - Shift+Left-click + &shiftKey;+Left-click + &shiftKey;+Left-click   @@ -98,26 +98,26 @@ Contributors: Reload (override cache) - Shift+Reload button - Shift+Reload button + &shiftKey;+Reload button + &shiftKey;+Reload button   Save Page As - Alt+Left-click + &altKey;+Left-click     Scroll line by line - Alt+Scroll + &altKey;+Scroll     -
02 October 2004
+
06 October 2004

Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/components/help/locale/en-US/platformStrings.dtd b/browser/components/help/locale/en-US/platformStrings.dtd index 188c3e58059..ba470ae4458 100644 --- a/browser/components/help/locale/en-US/platformStrings.dtd +++ b/browser/components/help/locale/en-US/platformStrings.dtd @@ -25,8 +25,7 @@ -CtrlCmd' > +Ctrl' > CtrlCmd' > AltDownload Manager History

The Download Manager (accessible from Tools or by pressing - Ctrl+JCtrl+Y) + &accelKey;+J&accelKey;+Y) stores shortcuts to your recent downloads. The Download &pref.plural; are available in the Downloads panel.

@@ -430,7 +430,7 @@ Contributors: shown. Uncheck this &pref.singular; to always show the tab bar.

Select new tabs opened from links
When you middle-click on - Web links (or hold down Ctrl while clicking with the left mouse + Web links (or hold down &accelKey; while clicking with the left mouse button), the links will be opened in a new tab. That tab will not be shown directly; it will be loaded in a background tab. Check this &pref.singular; to load the link in a foreground tab instead, which will show that tab @@ -535,7 +535,7 @@ Contributors: you can do so here. You will most likely only need to change this if your Internet environment requires it.

-
02 October 2004
+
06 October 2004

Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/components/help/locale/en-US/shortcuts.xhtml b/browser/components/help/locale/en-US/shortcuts.xhtml index e253db3a144..de0e7626518 100644 --- a/browser/components/help/locale/en-US/shortcuts.xhtml +++ b/browser/components/help/locale/en-US/shortcuts.xhtml @@ -28,7 +28,7 @@ Contributors: Opera. If you have enabled Emacs-style text editing shortcuts in GNOME, they will also work in &brandShortName;. When an Emacs text editing shortcut conflicts with the default shortcuts (as occurs with - Ctrl+K), the Emacs shortcut will take preference if + &accelKey;+K), the Emacs shortcut will take preference if focus is inside a textbox (which would include the location bar and search bar). In such cases you should use the alternate keyboard shortcut if one is listed below.

@@ -45,30 +45,31 @@ Contributors: Add Bookmark - Ctrl+D - Ctrl+D - Ctrl+T + &accelKey;+D + &accelKey;+D + &accelKey;+T Back - Backspace
- Alt+Left Arrow - Backspace
- Alt+Left Arrow - Backspace
- Alt+Left Arrow
- Ctrl+Left Arrow
+ Backspace
 + &altKey;+Left Arrow + &accelKey;+Left Arrow +
&accelKey;+[ + Backspace
+ &altKey;+Left Arrow + Backspace
+ &altKey;+Left Arrow
+ &accelKey;+Left Arrow
Z Bookmarks - Ctrl+B -
- Ctrl+I - Ctrl+I + &accelKey;+B +
&accelKey;+I + &accelKey;+I F4
- Ctrl+Alt+B
- Ctrl+1 + &accelKey;+&altKey;+B
+ &accelKey;+1 Caret Browsing @@ -78,54 +79,54 @@ Contributors: Close Tab - Ctrl+W
- Ctrl+F4 + &accelKey;+W
+ &accelKey;+F4   - Ctrl+W
- Ctrl+F4 + &accelKey;+W
+ &accelKey;+F4 Close Window - Ctrl+Shift+W
- Alt+F4 - Ctrl+W
- Alt+F4 - Ctrl+W
- Alt+F4 + &accelKey;+&shiftKey;+W
+ &altKey;+F4 + &accelKey;+W
+ &altKey;+F4 + &accelKey;+W
+ &altKey;+F4 Complete .com Address - Ctrl+Enter - Ctrl+Enter - Enter + &accelKey;+&enterKey; + &accelKey;+&enterKey; + &enterKey; Complete .net Address - Shift+Enter + &shiftKey;+&enterKey;     Complete .org Address - Ctrl+Shift+Enter + &accelKey;+&shiftKey;+&enterKey;     Copy - Ctrl+C - Ctrl+C - Ctrl+C + &accelKey;+C + &accelKey;+C + &accelKey;+C Cut - Ctrl+X - Ctrl+X - Ctrl+X + &accelKey;+X + &accelKey;+X + &accelKey;+X Decrease Text Size - Ctrl+- + &accelKey;+-   9 @@ -137,22 +138,22 @@ Contributors: Delete Selected Autocomplete Entry - Shift+Del + &shiftKey;+Del Del   Downloads - Ctrl+J - Ctrl+Y + &accelKey;+J + &accelKey;+Y   - Ctrl+Alt+T
- Ctrl+5 + &accelKey;+&altKey;+T
+ &accelKey;+5 Find Again F3
- Ctrl+G + &accelKey;+G   F3 @@ -161,7 +162,7 @@ Contributors: '   ,
- Shift+/ + &shiftKey;+/ Find As You Type Text @@ -171,25 +172,27 @@ Contributors: Find Previous - Shift+F3 + &shiftKey;+F3   - Shift+F3 + &shiftKey;+F3 Find in This Page - Ctrl+F - Ctrl+F - Ctrl+F + &accelKey;+F + &accelKey;+F + &accelKey;+F Forward - Shift+Backspace
- Alt+Right Arrow - Shift+Backspace
- Alt+Right Arrow - Shift+Backspace
- Alt+Right Arrow
- Ctrl+Right Arrow
+ &shiftKey;+Backspace
 + &altKey;+Right Arrow + &accelKey;+Right Arrow +
&accelKey;+] + &shiftKey;+Backspace
+ &altKey;+Right Arrow + &shiftKey;+Backspace
+ &altKey;+Right Arrow
+ &accelKey;+Right Arrow
X @@ -200,20 +203,21 @@ Contributors: History - Ctrl+H - Ctrl+H - Ctrl+Alt+H
- Ctrl+4 + &accelKey;+H + &accelKey;+&shiftKey;+H + &accelKey;+H + &accelKey;+&altKey;+H
+ &accelKey;+4 Home - Alt+Home - Alt+Home - Ctrl+Space + &altKey;+Home + &altKey;+Home + &accelKey;+Space Increase Text Size - Ctrl++ + &accelKey;++   0 @@ -225,7 +229,7 @@ Contributors: Move to Previous Frame - Shift+F6 + &shiftKey;+F6     @@ -243,141 +247,142 @@ Contributors: New Message - Ctrl+M + &accelKey;+M   - Ctrl+E + &accelKey;+E New Tab - Ctrl+T + &accelKey;+T   - Ctrl+Alt+N + &accelKey;+&altKey;+N Next Tab - Ctrl+Tab
- Ctrl+PageDown + &accelKey;+Tab
+ &accelKey;+PageDown   - Ctrl+Tab
- Alt+Page Down
- Ctrl+F6
+ &accelKey;+Tab
+ &altKey;+Page Down
+ &accelKey;+F6
2 New Window - Ctrl+N - Ctrl+N - Ctrl+Alt+N + &accelKey;+N + &accelKey;+N + &accelKey;+&altKey;+N Open File - Ctrl+O - Ctrl+O - Ctrl+O + &accelKey;+O + &accelKey;+O + &accelKey;+O Open Address in New Tab - Alt+Enter + &altKey;+&enterKey;   - Shift+Enter + &shiftKey;+&enterKey; Page Info - Ctrl+I + &accelKey;+I   - Ctrl+8 + &accelKey;+8 Page Source - Ctrl+U + &accelKey;+U   - Ctrl+F3 + &accelKey;+F3 Paste - Ctrl+V - Ctrl+V - Ctrl+V + &accelKey;+V + &accelKey;+V + &accelKey;+V Previous Tab - Ctrl+Shift+Tab
- Ctrl+PageUp + &accelKey;+&shiftKey;+Tab
+ &accelKey;+PageUp   - Ctrl+Shift+Tab
- Alt+Page Up
- Ctrl+Shift+F6
+ &accelKey;+&shiftKey;+Tab
+ &altKey;+Page Up
+ &accelKey;+&shiftKey;+F6
I Print - Ctrl+P - Ctrl+P - Ctrl+P + &accelKey;+P + &accelKey;+P + &accelKey;+P Redo - Ctrl+Y - Ctrl+Shift+Z - Ctrl+Y - Ctrl+Y
- Ctrl+Shift+Z + &accelKey;+Y + &accelKey;+&shiftKey;+Z + &accelKey;+Y + &accelKey;+Y
+ &accelKey;+&shiftKey;+Z Reload F5
 - Ctrl+R + &accelKey;+R F5
- Ctrl+R + &accelKey;+R F5
- Ctrl+R + &accelKey;+R Reload (override cache) - Ctrl+F5
- Ctrl+Shift+R - Ctrl+F5 + &accelKey;+F5
+ &accelKey;+&shiftKey;+R + &accelKey;+F5   Restore Text Size - Ctrl+0 + &accelKey;+0   6 Save Page As - Ctrl+S + &accelKey;+S   - Ctrl+S + &accelKey;+S Select All - Ctrl+A - Ctrl+A - Ctrl+A + &accelKey;+A + &accelKey;+A + &accelKey;+A Select Location Bar - Alt+D
+ &altKey;+D
F6
- Ctrl+L - Alt+D
+ &accelKey;+L + &altKey;+D
F6
F4
- Ctrl+Tab - Ctrl+H
+ &accelKey;+Tab + &accelKey;+H
F8 Select Next Search Engine in Search Bar - Ctrl+Down + &accelKey;+Down     Select Tab (1 to 9) - Ctrl+(1 to 9) + &accelKey;&altKey;+(1 to 9)     @@ -389,22 +394,22 @@ Contributors: Undo - Ctrl+Z - Ctrl+Z - Ctrl+Z + &accelKey;+Z + &accelKey;+Z + &accelKey;+Z Web Search - Ctrl+K -
Ctrl+E -
Ctrl+J - Ctrl+E - Shift+F8 + &accelKey;+K +
&accelKey;+E +
&accelKey;+J + &accelKey;+E + &shiftKey;+F8 -
02 October 2004
+
06 October 2004

Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.

diff --git a/browser/components/help/locale/en-US/using_firebird.xhtml b/browser/components/help/locale/en-US/using_firebird.xhtml index d48c39cabf2..97ecc7c0619 100644 --- a/browser/components/help/locale/en-US/using_firebird.xhtml +++ b/browser/components/help/locale/en-US/using_firebird.xhtml @@ -47,8 +47,8 @@ Contributors: toolbar. To enable Full Screen mode, simply select View > Full Screen or press F11. -
  • To go to your home page quickly, press Alt - Cmd+Home
    • +
  • To go to your home page quickly, press &altKey;&accelKey;+Home.

    • Moving to Another Page

    @@ -61,11 +61,11 @@ Contributors:
  • Click the Location Bar to select the URL that is already there.
  • Type the URL of the page you want to visit. The URL you type replaces any text already in the Location Bar.
    • -
  • Press Enter.
    • +
  • Press &enterKey;.

    • Tip: To quickly select the URL of the Location Bar, press - Ctrl+L.

    + &accelKey;+L.

    @@ -122,8 +122,7 @@ Contributors: click the Stop button.

    To refresh the current page or to get the most up-to-date version, click - the Reload button or press Ctrl - Cmd+Shift+R.

    + the Reload button or press &accelKey;+&shiftKey;+R.

    Tabbed Browsing

    When you visit more then one web page at a time, you can use Tabbed @@ -157,7 +156,7 @@ Contributors:

  • Click in the Search Bar.
  • Type the phrase baby doll. Your typing replaces any text currently in the search bar.
    • -
  • Hit Enter to search.
    • +
  • Hit &enterKey; to search.

    • Search results for "baby doll" appear in the &brandShortName; window.

    @@ -170,9 +169,9 @@ Contributors:
    1. Select (highlight) any words in a web page.
      2. -
    2. Right-click and choose "Search Web for [your selected words]" from the - menu. (To right-click on Mac OS, press Ctrl and click the mouse - button.)
      3. +
    3. Right-clickPress &accelKey;, + click the mouse button, and choose "Search Web for [your selected + words]" from the menu.

    &brandShortName; opens a new window and uses your default search engine to @@ -226,8 +225,8 @@ Contributors:

    1. Position the pointer over the link or image.
      2. -
    2. Right-click the link or image to display a popup menu. (On Mac OS, press - Ctrl and click the mouse button.)
      3. +
    3. Right-clickPress &accelKey; + on the link or image to display a popup menu.
    4. Choose Copy Link Location or Copy Image Location. If an image is also a link, you can choose either menu item.
    @@ -267,8 +266,8 @@ Contributors:
    1. Position the mouse pointer within the frame.
      2. -
    2. Right-click the frame (on Mac OS, press Ctrl and click the - mouse button) to display a popup menu.
      3. +
    3. Press &accelKey; and click the mouse button onRight-click the frame to display a popup menu.
    4. Select This Frame > Save Frame As from the submenu. You will see the Save As dialog box.
    5. Choose a location for the saved page.
      6. @@ -282,8 +281,8 @@ Contributors:

      To save an image from a page:

      1. Position the mouse pointer over the image.
        2. -
      2. Right-click the image (on Mac OS, press Ctrl and click the - mouse button) to display a popup menu.
        3. +
      3. Right-clickPress &accelKey; and + click the mouse button on the image to display a popup menu.
      4. Select Save Image As. You will see the Save Image dialog box.
      5. Choose a location for the saved image.
        6. @@ -295,9 +294,8 @@ Contributors:
        1. Position the mouse pointer over a link to the page.
          2. -
        2. Right-click the link - Press Ctrl and click the mouse button - to display a popup menu.
          3. +
        3. Right-click the linkPress + &accelKey; and click the mouse button to display a popup menu.
        4. Select Save Link to Disk. You will see the Save As dialog box.
        5. Choose a location for the saved page.
          6. @@ -311,7 +309,7 @@ Contributors: sound, or movie files and can launch helper applications that support the files.

          -

          Tip: To set an image as your desktop wallpaper on Windows, +

          Tip: To set an image as your desktop wallpaper on Windows, right-click on an image and choose Set As Wallpaper from the popup menu. You can choose various display &pref.plural; through the dialog that is shown.

          @@ -373,11 +371,11 @@ Contributors: pages. -

          Note: Some Print Preview functions are different or +

          Note: Some Print Preview functions are different or unavailable on Mac OS and Linux.

          Using Page Setup

          -

          Note: Some Page Setup functions are different or +

          Note: Some Page Setup functions are different or unavailable on Mac OS and Linux.

          To customize how pages are printed in &brandShortName;, you can use Page Setup:

          @@ -564,7 +562,7 @@ Contributors: latest version of the page. -
          02 October 2004
          +
          06 October 2004

          Copyright © 2003-2004 Contributors to the Mozilla Help Viewer Project.