diff --git a/mozilla/extensions/help/resources/locale/en-US/composer_help.html b/mozilla/extensions/help/resources/locale/en-US/composer_help.html index 71d15b6df84..7737d6b9eb9 100644 --- a/mozilla/extensions/help/resources/locale/en-US/composer_help.html +++ b/mozilla/extensions/help/resources/locale/en-US/composer_help.html @@ -165,7 +165,7 @@ window.
  • Go to a web page by typing the URL of the page (for example, http://www.mozilla.org) in the Location Bar and pressing Enter -(Return on Macintosh OS).
    • +(Return on Mac OS).
  • Open the File menu and choose Edit Page.
    • @@ -446,7 +446,7 @@ section @@ -1220,7 +1220,7 @@ table within a table cell.) select neighboring cells to delete more than one row at a time. To select neighboring cells, drag over the cells you want to select. To select individual cells in a table, hold down the Ctrl key -(Windows and Linux) or the Command key (Macintosh OS) and click on +(Windows, Linux or Unix) or the Command key (Mac OS) and click on the cells you want to select.
  • Open the Table menu and choose Delete.
    • @@ -1317,9 +1317,9 @@ Select, and then choose Table. drag to select the cells you want. Drag the mouse left or right to select a row; up or down to select a column. -
  • To select non-adjacent cells: press Ctrl (Windows or Linux) or -Command (Macintosh OS) and then click inside a cell. Keep pressing -Ctrl (Windows or Linux) or Command (Macintosh OS) as you click to +
  • To select non-adjacent cells: press Ctrl (Windows, Linux or Unix) or +Command (Mac OS) and then click inside a cell. Keep pressing +Ctrl (Windows, Linux or Unix) or Command (Mac OS) as you click to select additional cells.
  • To extend a selection to include adjacent cells: click inside a @@ -1925,7 +1925,7 @@ then click the link to make sure it works as expected.
    • the link from another window and then dropping it onto your page. For example, you can click and drag a link from a web page, bookmark, or Mail window and drop it onto your page. You can also -right-click (Control+click on Macintosh OS) a link on a web page +right-click (Control+click on Mac OS) a link on a web page and choose Copy Link Location from the menu. Then you can paste the link location into the Link Location field in the Link Properties dialog box.

    diff --git a/mozilla/extensions/help/resources/locale/en-US/composer_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/composer_help.xhtml index 71d15b6df84..7737d6b9eb9 100644 --- a/mozilla/extensions/help/resources/locale/en-US/composer_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/composer_help.xhtml @@ -165,7 +165,7 @@ window.
  • Go to a web page by typing the URL of the page (for example, http://www.mozilla.org) in the Location Bar and pressing Enter -(Return on Macintosh OS).
    • +(Return on Mac OS).
  • Open the File menu and choose Edit Page.
    • @@ -446,7 +446,7 @@ section @@ -1220,7 +1220,7 @@ table within a table cell.) select neighboring cells to delete more than one row at a time. To select neighboring cells, drag over the cells you want to select. To select individual cells in a table, hold down the Ctrl key -(Windows and Linux) or the Command key (Macintosh OS) and click on +(Windows, Linux or Unix) or the Command key (Mac OS) and click on the cells you want to select.
  • Open the Table menu and choose Delete.
    • @@ -1317,9 +1317,9 @@ Select, and then choose Table. drag to select the cells you want. Drag the mouse left or right to select a row; up or down to select a column. -
  • To select non-adjacent cells: press Ctrl (Windows or Linux) or -Command (Macintosh OS) and then click inside a cell. Keep pressing -Ctrl (Windows or Linux) or Command (Macintosh OS) as you click to +
  • To select non-adjacent cells: press Ctrl (Windows, Linux or Unix) or +Command (Mac OS) and then click inside a cell. Keep pressing +Ctrl (Windows, Linux or Unix) or Command (Mac OS) as you click to select additional cells.
  • To extend a selection to include adjacent cells: click inside a @@ -1925,7 +1925,7 @@ then click the link to make sure it works as expected.
    • the link from another window and then dropping it onto your page. For example, you can click and drag a link from a web page, bookmark, or Mail window and drop it onto your page. You can also -right-click (Control+click on Macintosh OS) a link on a web page +right-click (Control+click on Mac OS) a link on a web page and choose Copy Link Location from the menu. Then you can paste the link location into the Link Location field in the Link Properties dialog box.

    diff --git a/mozilla/extensions/help/resources/locale/en-US/mail_help.html b/mozilla/extensions/help/resources/locale/en-US/mail_help.html index 3ee59e7e97b..4a4d92679b3 100644 --- a/mozilla/extensions/help/resources/locale/en-US/mail_help.html +++ b/mozilla/extensions/help/resources/locale/en-US/mail_help.html @@ -1747,7 +1747,7 @@ section ]

  • In the right side of the message envelope, under "Attachments," select the attachment that you want to save.
    • -
  • Right-click (Control-click on Macintosh) the attachment and +
  • Right-click (Control-click on Mac OS) the attachment and choose Save As from the pop-up menu.
  • Choose a filename and location for the attachment on your hard @@ -3600,7 +3600,7 @@ dialog box.
    • another newsgroup account.
  • Select a newsgroup. To select more than one newsgroup, -Ctrl+click (Windows and Linux) or Command+click (Macintosh OS) each +Ctrl+click (Windows, Linux or Unix) or Command+click (Mac OS) each additional newsgroup.
  • Click Subscribe or click in the Subscribe column next to the @@ -4054,7 +4054,7 @@ message, and then Shift-click to select the last message in the group.
  • To select messages anywhere in the message list, hold down the -Ctrl key (Windows and Linux) or the Command key (Macintosh OS) and +Ctrl key (Windows, Linux or Unix) or the Command key (Mac OS) and click each message.
    • diff --git a/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml index 2c1e68956b9..67e7a540bcb 100644 --- a/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml @@ -1509,7 +1509,7 @@ section ]

  • In the right side of the message envelope, under "Attachments," select the attachment that you want to save.
    • -
  • Right-click (Control-click on Macintosh) the attachment and +
  • Right-click (Control-click on Mac OS) the attachment and choose Save As from the pop-up menu.
  • Choose a filename and location for the attachment on your hard @@ -3331,7 +3331,7 @@ dialog box.
    • another newsgroup account.
  • Select a newsgroup. To select more than one newsgroup, -Ctrl+click (Windows and Linux) or Command+click (Macintosh OS) each +Ctrl+click (Windows, Linux or Unix) or Command+click (Mac OS) each additional newsgroup.
  • Click Subscribe or click in the Subscribe column next to the @@ -3714,7 +3714,7 @@ message, and then Shift-click to select the last message in the group.
  • To select messages anywhere in the message list, hold down the -Ctrl key (Windows and Linux) or the Command key (Macintosh OS) and +Ctrl key (Windows, Linux or Unix) or the Command key (Mac OS) and click each message.
    • @@ -5323,7 +5323,7 @@ will take you to the first folder that has new mail.

    continue to work even after you close the Mail window (as long as another &brandShortName; application is running).

    -

    Note: This feature is not available on Linux & Mac.

    +

    Note: This feature is not available on Mac OS, Linux or Unix.

  • diff --git a/mozilla/extensions/help/resources/locale/en-US/nav_help.html b/mozilla/extensions/help/resources/locale/en-US/nav_help.html index 3f88a23be24..c1fd61570f2 100644 --- a/mozilla/extensions/help/resources/locale/en-US/nav_help.html +++ b/mozilla/extensions/help/resources/locale/en-US/nav_help.html @@ -900,12 +900,12 @@ want to print.
  • Go to Print: Click Print to print pages.

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

    +Mac OS, Linux or Unix.

     

    Using Page Setup

    -

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

    +

    Note: Some Page Setup functions are different or unavailable on +Mac OS, Linux or Unix.

    To customize how pages are printed in Mozilla, you can use Page Setup:

    [ Return to beginning of section ]

    diff --git a/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml index df5fba3f858..04a265b9f12 100644 --- a/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml @@ -828,12 +828,12 @@ want to print.
  • Go to Print: Click Print to print pages.

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

    +Mac OS, Linux or Unix.

     

    Using Page Setup

    -

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

    +

    Note: Some Page Setup functions are different or unavailable on +Mac OS, Linux or Unix.

    To customize how pages are printed in Mozilla, you can use Page Setup:

    [ Return to beginning of section ]

    diff --git a/mozilla/extensions/help/resources/locale/en-US/profiles_help.html b/mozilla/extensions/help/resources/locale/en-US/profiles_help.html index 637d7707baf..f1d25f3e851 100644 --- a/mozilla/extensions/help/resources/locale/en-US/profiles_help.html +++ b/mozilla/extensions/help/resources/locale/en-US/profiles_help.html @@ -42,7 +42,7 @@
  • Click Create Profile, read the Profile description, and then click Next.
  • Enter a profile name. This can be anything you like, such as your real name or a name that's related to what you use the profile for, such as "School." @@ -70,7 +70,7 @@
  • To delete a profile, select its name and click Delete Profile.
  • To rename a profile, select its name, click Rename Profile, and follow the instructions. diff --git a/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml index 637d7707baf..f1d25f3e851 100644 --- a/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/profiles_help.xhtml @@ -42,7 +42,7 @@
  • Click Create Profile, read the Profile description, and then click Next.
  • Enter a profile name. This can be anything you like, such as your real name or a name that's related to what you use the profile for, such as "School." @@ -70,7 +70,7 @@
  • To delete a profile, select its name and click Delete Profile.
  • To rename a profile, select its name, click Rename Profile, and follow the instructions. diff --git a/mozilla/extensions/help/resources/locale/en-US/shortcuts-composer.xhtml b/mozilla/extensions/help/resources/locale/en-US/shortcuts-composer.xhtml index eeffa75ea32..dc9b71f624b 100644 --- a/mozilla/extensions/help/resources/locale/en-US/shortcuts-composer.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/shortcuts-composer.xhtml @@ -16,8 +16,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Save Page diff --git a/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml b/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml index 43b7e2d3654..5b918a6c8c7 100644 --- a/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml @@ -26,8 +26,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Move to Next Mail Pane (Folder, QuickSearch, Thread, Message Panes) @@ -49,8 +49,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Save Message as File @@ -182,8 +182,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Send Message Now diff --git a/mozilla/extensions/help/resources/locale/en-US/shortcuts-navigator.xhtml b/mozilla/extensions/help/resources/locale/en-US/shortcuts-navigator.xhtml index 7b7628f49ad..038b4608a84 100644 --- a/mozilla/extensions/help/resources/locale/en-US/shortcuts-navigator.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/shortcuts-navigator.xhtml @@ -29,8 +29,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Open Manage Bookmarks Window @@ -64,8 +64,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Open History Window @@ -238,8 +238,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Full Screen (toggle) @@ -285,8 +285,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix New Navigator Tab @@ -334,8 +334,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Open/Close Sidebar (toggle) @@ -363,8 +363,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Move to Next/Previous Item in Form diff --git a/mozilla/extensions/help/resources/locale/en-US/shortcuts.xhtml b/mozilla/extensions/help/resources/locale/en-US/shortcuts.xhtml index 4ab79f953e9..510f168a992 100644 --- a/mozilla/extensions/help/resources/locale/en-US/shortcuts.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/shortcuts.xhtml @@ -36,8 +36,8 @@ Command Windows - Mac - Linux + Mac OS + Linux or Unix Copy @@ -58,7 +58,7 @@

    Note: Some keyboard shortcuts perform different functions based on cursor @@ -72,8 +72,8 @@ Command Windows - Mac - Linux + Mac OS + Linux or Unix Copy @@ -244,8 +244,8 @@ Command Windows - Macintosh - Linux + Mac OS + Linux or Unix Open Help and Support Center within Navigator, Mail & Newsgroups,