diff --git a/mozilla/composer/base/content/editorOverlay.xul b/mozilla/composer/base/content/editorOverlay.xul index 63ba11269ba..bb18bc4746e 100644 --- a/mozilla/composer/base/content/editorOverlay.xul +++ b/mozilla/composer/base/content/editorOverlay.xul @@ -165,7 +165,7 @@ - + @@ -345,7 +345,7 @@ - + diff --git a/mozilla/editor/ui/composer/content/ComposerCommands.js b/mozilla/editor/ui/composer/content/ComposerCommands.js index 7d848695533..c8a9ea43d1a 100644 --- a/mozilla/editor/ui/composer/content/ComposerCommands.js +++ b/mozilla/editor/ui/composer/content/ComposerCommands.js @@ -180,7 +180,7 @@ function SetupComposerWindowCommands() commandTable.registerCommand("cmd_save", nsSaveCommand); commandTable.registerCommand("cmd_saveAs", nsSaveAsCommand); commandTable.registerCommand("cmd_exportToText", nsExportToTextCommand); - commandTable.registerCommand("cmd_saveAsCharset", nsSaveAsCharsetCommand); + commandTable.registerCommand("cmd_saveAndChangeEncoding", nsSaveAndChangeEncodingCommand); commandTable.registerCommand("cmd_publish", nsPublishCommand); commandTable.registerCommand("cmd_publishAs", nsPublishAsCommand); commandTable.registerCommand("cmd_publishSettings",nsPublishSettingsCommand); @@ -614,7 +614,7 @@ var nsExportToTextCommand = } } -var nsSaveAsCharsetCommand = +var nsSaveAndChangeEncodingCommand = { isCommandEnabled: function(aCommand, dummy) { diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul index b850fe3ca77..2e53c70418c 100644 --- a/mozilla/editor/ui/composer/content/editorOverlay.xul +++ b/mozilla/editor/ui/composer/content/editorOverlay.xul @@ -160,7 +160,7 @@ - + @@ -341,7 +341,7 @@ - + diff --git a/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd b/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd index 56632763ccb..6b30017b721 100644 --- a/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd +++ b/mozilla/editor/ui/composer/locale/en-US/editorOverlay.dtd @@ -55,8 +55,8 @@ - - + + diff --git a/mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd b/mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd index 226e02f3069..8e3005dc4cf 100644 --- a/mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd +++ b/mozilla/editor/ui/dialogs/locale/en-US/EditorSaveAsCharset.dtd @@ -25,10 +25,10 @@ - + - - + + diff --git a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.html b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.html index bf3ce472e60..2f359f20bcc 100644 --- a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.html +++ b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.html @@ -104,8 +104,9 @@ double-click Appearance to expand the list.) does not have fonts available for that style.

    -
  • Fonts for: Choose a language character set. For instance, to set - default fonts for the Western (Roman) character set, choose "Western." +
  • Fonts for: Choose a language group/script. For instance, to set + default fonts for West European languages/script (Latin), +choose "Western."
    • Proportional: Select whether proportional text should be serif (like Times Roman) or sans-serif (like Arial). You can also specify what font size diff --git a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.xhtml b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.xhtml index bf3ce472e60..7e734ba5813 100644 --- a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_appearance.xhtml @@ -104,8 +104,9 @@ double-click Appearance to expand the list.)
      • does not have fonts available for that style.

        -
      • Fonts for: Choose a language character set. For instance, to set - default fonts for the Western (Roman) character set, choose "Western." +
      • Fonts for: Choose a language group/script. For instance, to set + default fonts for West European languages/script (Latin), + choose "Western."
        • Proportional: Select whether proportional text should be serif (like Times Roman) or sans-serif (like Arial). You can also specify what font size diff --git a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.html b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.html index f3696c590f2..145f708f689 100644 --- a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.html +++ b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.html @@ -131,7 +131,7 @@ bar menu.

          •  

          - +

          Navigator Preferences - Languages

          @@ -143,7 +143,7 @@ bar menu. 2. Under the Navigator category, click Languages. (If no subcategories are visible, double-click Navigator to expand the list.)


          -

          The Languages preferences panel allows you to choose the languages and character coding for displaying web pages:

          +

          The Languages preferences panel allows you to choose the languages and character encoding for displaying web pages:

          • Languages for Web Pages:
              • @@ -152,10 +152,10 @@ language up or down, which sets the order of preference for the listed languages
            • Add: Click this to add additional languages for displaying web pages.
            • Remove: Click this to remove a selected language.
            -
          • Character Coding:
            • +
          • Character Encoding:
              • -
            • Default Character Coding: Use the drop-down list to select the character -coding you want for displaying web pages.
              • +
            • Default Character Encoding: Use the drop-down list to select the +character encoding you want for displaying web pages.

           

          diff --git a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.xhtml b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.xhtml index 014e3834b45..c10180e1877 100644 --- a/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/cs_nav_prefs_navigator.xhtml @@ -131,7 +131,7 @@ bar menu.

           

          - +

          Navigator Preferences - Languages

          @@ -143,7 +143,7 @@ bar menu. 2. Under the Navigator category, click Languages. (If no subcategories are visible, double-click Navigator to expand the list.)


          -

          The Languages preferences panel allows you to choose the languages and character coding for displaying web pages:

          +

          The Languages preferences panel allows you to choose the languages and character encoding for displaying web pages:

          • Languages for Web Pages:
              • @@ -152,10 +152,10 @@ language up or down, which sets the order of preference for the listed languages
            • Add: Click this to add additional languages for displaying web pages.
            • Remove: Click this to remove a selected language.
            -
          • Character Coding:
            • +
          • Character Encoding:
              • -
            • Default Character Coding: Use the drop-down list to select the character -coding you want for displaying web pages.
              • +
            • Default Character Encoding: Use the drop-down list to select the character +encoding you want for displaying web pages.

           

          diff --git a/mozilla/extensions/help/resources/locale/en-US/customize_help.html b/mozilla/extensions/help/resources/locale/en-US/customize_help.html index a2147ef6557..d9d1afec9c1 100644 --- a/mozilla/extensions/help/resources/locale/en-US/customize_help.html +++ b/mozilla/extensions/help/resources/locale/en-US/customize_help.html @@ -422,11 +422,13 @@ or in a font chosen by the web pages' authors.

        • Open the Edit menu and choose Preferences.
        • Under the Appearance category, choose Fonts. (If no options are visible in this category, double-click Appearance to expand the list.) -
        • From the "Fonts for" drop-down list, choose a character set. For instance, -to set default fonts for the Western (roman) character set, choose "Western." +
        • From the "Fonts for" drop-down list, choose a language group/script. +For instance, +to set default fonts for West European languages/script (Latin), +choose "Western."
        • Select whether proportional text should be serif (like Times Roman) or sans-serif (like Arial). Then specify the font size you want for proportional text. -
        • If an appropriate font is available for your language character set, select +
        • If an appropriate font is available for your language/script, select fonts for Serif, Sans-Serif, Cursive, Fantasy, and Monospace. You can also specify what font size you want for monospace text.
        • Specify whether the default font should be serif or sans serif. diff --git a/mozilla/extensions/help/resources/locale/en-US/customize_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/customize_help.xhtml index 9f159fd3ecb..6ab658f2780 100644 --- a/mozilla/extensions/help/resources/locale/en-US/customize_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/customize_help.xhtml @@ -422,11 +422,12 @@ or in a font chosen by the web pages' authors.

        • Open the Edit menu and choose Preferences.
        • Under the Appearance category, choose Fonts. (If no options are visible in this category, double-click Appearance to expand the list.) -
        • From the "Fonts for" drop-down list, choose a character set. For instance, -to set default fonts for the Western (roman) character set, choose "Western." +
        • From the "Fonts for" drop-down list, choose a language group/script. +For instance, to set default fonts for West European +languages/script (Latin), choose "Western."
        • Select whether proportional text should be serif (like Times Roman) or sans-serif (like Arial). Then specify the font size you want for proportional text. -
        • If an appropriate font is available for your language character set, select +
        • If an appropriate font is available for your language/script, select fonts for Serif, Sans-Serif, Cursive, Fantasy, and Monospace. You can also specify what font size you want for monospace text.
        • Specify whether the default font should be serif or sans serif. diff --git a/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf b/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf index 7ee0bb385e5..5d46dee8687 100644 --- a/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf +++ b/mozilla/extensions/help/resources/locale/en-US/help-toc.rdf @@ -102,7 +102,7 @@ - + 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 4a4d92679b3..b268d6c0cab 100644 --- a/mozilla/extensions/help/resources/locale/en-US/mail_help.html +++ b/mozilla/extensions/help/resources/locale/en-US/mail_help.html @@ -5728,21 +5728,21 @@ for example:
        • -

          Languages: Click the Character Coding drop-down list to +

          Languages: Click the Character Encoding drop-down list to select the language you want Mail & Newsgroups to use as the default for incoming mail and newsgroup messages. This is recommended if it's likely you might receive messages in which the -character set is not indicated, such as when reading messages in -international newsgroups.

          +character encoding (MIME charset) is not indicated, such as when reading +messages in international newsgroups.

        • Apply default to all messages: Select this to apply the -default character coding to all messages. +default character encoding to all messages. -

          Tip: You can later view or change the character set -coding (language) for a specific folder. In the Mail window, select +

          Tip: You can later view or change the character encoding +for a specific folder. In the Mail window, select a folder from the list of Mail folders. Open the View menu, and -choose Character Coding.

          +choose Character Encoding.

        @@ -5790,13 +5790,13 @@ to place your reply in the message area.
        • Newsgroups always check the spelling of your messages when you click Send. Choose to have Mail & Newsgroups use "quoted printable" MIME encoding when sending regular messages that use an -8-bit character set (for example, Latin ISO88359). +8-bit character encoding (for example, Latin ISO-8859-3).
      • Wrap plain text messages at __ characters: Enter a number to set the right margin for text in the message area.
        • -
      • Character Coding: Select the language you want +
      • Character Encoding: Select the language you want Mail & Newsgroups to use as the default for outgoing mail and newsgroup messages.
      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 67e7a540bcb..cc680346ee5 100644 --- a/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/mail_help.xhtml @@ -5259,21 +5259,21 @@ for example:
    • -

      Languages: Click the Character Coding drop-down -list to select the language you want Mail & Newsgroups to use +

      Character Encodings: Click the Character Encoding drop-down +list to select the character encoding you want Mail & Newsgroups to use as the default for incoming mail and newsgroup messages. This is recommended if it's likely you might receive messages in which the -character set is not indicated, such as when reading messages in -international newsgroups.

      +character encoding (MIME charset) is not indicated, such as when reading +messages in international newsgroups.

    • Apply default to all messages: Select this to -apply the default character coding to all messages. +apply the default character encoding to all messages.

      Tip: You can later view or change the character -set coding (language) for a specific folder. In the Mail window, +encoding for a specific folder. In the Mail window, select a folder from the list of Mail folders. Open the View menu, -and choose Character Coding.

      +and choose Character Encoding.

    @@ -5368,7 +5368,7 @@ as an attachment or inline (in the body of your message).
    • Newsgroups always check the spelling of your messages when you click Send. Choose to have Mail & Newsgroups use "quoted printable" MIME encoding when sending regular messages that use an -8-bit character set (for example, Latin ISO-8859-3). +8-bit character encoding (for example, Latin ISO-8859-3).
  • Confirm when using keyboard shortcut to send message: Check this option if want to be asked if you're sure to be ready to send the @@ -5380,7 +5380,7 @@ mistake when composing a message.
    • Enter a number to set the right margin for text in the message area. -
  • Character Coding: Select the language you want +
  • Character Encoding: Select the character encoding you want Mail & Newsgroups to use as the default for outgoing mail and newsgroup messages.
    • 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 c1fd61570f2..e808c7a9a72 100644 --- a/mozilla/extensions/help/resources/locale/en-US/nav_help.html +++ b/mozilla/extensions/help/resources/locale/en-US/nav_help.html @@ -999,67 +999,69 @@ Preview.

    In this section:

    -

    Selecting Character Codings and Fonts

    +

    Selecting Character Encodings and Fonts

    Setting Language Preferences

    Finding International Web Content

     

    - -

    Selecting Character Codings and Fonts

    + +

    Selecting Character Encodings and Fonts

    If you browse, compose, or send and receive email in more than one language, - you need to select the appropriate character codings and fonts.

    -

    A character coding method is the way a document or message has been converted + you need to select the appropriate character encodings and fonts.

    +

    A character encoding method is the way a document or message has been converted to data to be used by your computer. All web documents and mail and news messages -use a character-coding method (also known as a character encoding or character -set).

    -

    The character coding method for a document depends on its language. Some languages—such - as most of the Western languages—share the same coding method. Others, such - as Chinese, Japanese, and Russian, use different methods.

    -

    Your version of Mozilla is set to a default character coding appropriate +use a character encoding method (also known as a character set, character coding, or charset).

    +

    The character encoding method for a document may depend on its language. +Some languages e.g. most West European languages, share the same encoding +method. Others such as Chinese, Japanese, and Russian use different methods. +In contrast, Unicode provides language-independent encoding methods. UTF-8, +for examples, can be used for any language document.

    +

    Your version of Mozilla is set to a default character encoding appropriate for your region. However, if you use more than one language, you may need to -select appropriate character-coding methods and designate the fonts you wish -to use for your coding method.

    -

    To select character codings, begin from the Navigator window: +select appropriate character encoding methods and designate the fonts you wish +to use for your language/script.

    +

    To select character encodings, begin from the Navigator window:

      -
    1. Open the View menu, choose Character Coding, and then choose More.
      2. +
    2. Open the View menu, choose Character Encoding, and then choose More.
    3. Choose a region from the top section of the submenu.
      4. -
    4. Choose a character coding within the region submenu. Repeat steps 1-3 for -each character-coding method you want.
      5. +
    5. Choose a character encoding within the region submenu. Repeat steps 1-3 for +each character encoding method you want.
    -

    The character coding methods you select are added to the Character Coding menu. - If you have more than one coding method selected, the active one has a bullet +

    The character encoding methods you select are added to the Character Encoding menu. + If you have more than one encoding method selected, the active one has a bullet (dot) next to it. -

    Mozilla can detect which character coding a document uses, and can display +

    Mozilla can detect which character encoding a document uses, and can display it correctly on your screen. To take advantage of this capability, begin from the Navigator window:

      -
    1. Open the View menu, choose Character Coding, and then choose Auto-Detect. +
    2. Open the View menu, choose Character Encoding, and then choose Auto-Detect.
    3. Choose one of the Auto-Detect options, or choose Off from the submenu.
    -

    To make changes to your list of active character sets: +

    To make changes to your list of active character encodings:

      -
    1. Open the View menu, choose Character Coding, and then choose Customize. - You can see the Customize Coding dialog box. +
    2. Open the View menu, choose Character Encoding, and then choose Customize. + You can see the Customize Encoding dialog box.
    3. Choose from the following procedures:
        4. -
      • To add to the list of active character sets, choose a character set - from the list on the left and click Add. +
      • To add to the list of active character encodings, choose a character + encoding from the list on the left and click Add. -
      • To remove a character set from the active list, choose a character set - from the list on the right and click Remove. +
      • To remove a character encoding from the active list, choose a + character encoding from the list on the right and click Remove. -
      • To change the order in which the browser checks for character sets, - highlight character sets in the list on the right, and use the arrow buttons - to move the character sets up or down in the list. +
      • To change the order in which active encodings appear in the +Character Encoding menu, + highlight character encodings in the list on the right, and use the arrow buttons + to move the character encodings up or down in the list.
    @@ -1070,9 +1072,9 @@ each character-coding method you want.
  • Under the Appearance category, click Fonts. (If no subcategories are visible, double-click Appearance to expand the list.) -
  • From the "Fonts for" drop-down list, choose a character coding method. For - instance, to set default fonts for the Western character set, choose "Western." - +
  • From the "Fonts for" drop-down list, choose a language group/script. For + instance, to set default fonts for West European languages/script, +choose "Western."
  • Select whether proportional text should be serif (like Times Roman) or sans serif (like Arial). You can also specify what font size you want for proportional text. Proportional text varies in width. 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 04a265b9f12..50143d368f8 100644 --- a/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/nav_help.xhtml @@ -927,67 +927,69 @@ Preview.

    In this section:

    -

    Selecting Character Codings and Fonts

    +

    Selecting Character Encodings and Fonts

    Setting Language Preferences

    Finding International Web Content

     

    - -

    Selecting Character Codings and Fonts

    + +

    Selecting Character Encodings and Fonts

    If you browse, compose, or send and receive email in more than one language, - you need to select the appropriate character codings and fonts.

    -

    A character coding method is the way a document or message has been converted + you need to select the appropriate character encodings and fonts.

    +

    A character encoding method is the way a document or message has been converted to data to be used by your computer. All web documents and mail and news messages -use a character-coding method (also known as a character encoding or character -set).

    -

    The character coding method for a document depends on its language. Some languages—such - as most of the Western languages—share the same coding method. Others, such - as Chinese, Japanese, and Russian, use different methods.

    -

    Your version of Mozilla is set to a default character coding appropriate +use a character encoding method (also known as a character set, character coding, or charset).

    +

    The character encoding method for a document may depend on its language. +Some languages e.g. most West European languages, share the same encoding +method. Others such as Chinese, Japanese, and Russian use different methods. +In contrast, Unicode provides language-independent encoding methods. UTF-8, +for examples, can be used for any language document.

    +

    Your version of Mozilla is set to a default character encoding appropriate for your region. However, if you use more than one language, you may need to -select appropriate character-coding methods and designate the fonts you wish -to use for your coding method.

    -

    To select character codings, begin from the Navigator window: +select appropriate character encoding methods and designate the fonts you wish +to use for your language/script.

    +

    To select character encodings, begin from the Navigator window:

      -
    1. Open the View menu, choose Character Coding, and then choose More.
      2. +
    2. Open the View menu, choose Character Encoding, and then choose More.
    3. Choose a region from the top section of the submenu.
      4. -
    4. Choose a character coding within the region submenu. Repeat steps 1-3 for -each character-coding method you want.
      5. +
    5. Choose a character encoding within the region submenu. Repeat steps 1-3 for +each character encoding method you want.
    -

    The character coding methods you select are added to the Character Coding menu. - If you have more than one coding method selected, the active one has a bullet - (dot) next to it. -

    Mozilla can detect which character coding a document uses, and can display - it correctly on your screen. To take advantage of this capability, begin from the Navigator window: +

    The character encoding methods you select are added to the Character Coding menu. + If you have more than one encoding method selected, the active one has a bullet + (dot) next to it.

    +

    Mozilla can detect which character encoding a document uses, and can display + it correctly on your screen. To take advantage of this capability, begin from the Navigator window:

      -
    1. Open the View menu, choose Character Coding, and then choose Auto-Detect. +
    2. Open the View menu, choose Character Encoding, and then choose Auto-Detect.
    3. Choose one of the Auto-Detect options, or choose Off from the submenu.
    -

    To make changes to your list of active character sets: +

    To make changes to your list of active character sets:

      -
    1. Open the View menu, choose Character Coding, and then choose Customize. - You can see the Customize Coding dialog box. +
    2. Open the View menu, choose Character Encoding, and then choose Customize. + You can see the Customize Encoding dialog box.
    3. Choose from the following procedures:
        4. -
      • To add to the list of active character sets, choose a character set - from the list on the left and click Add. +
      • To add to the list of active character encodings, choose a character + encoding from the list on the left and click Add. -
      • To remove a character set from the active list, choose a character set - from the list on the right and click Remove. +
      • To remove a character encoding from the active list, choose a character + encoding from the list on the right and click Remove. -
      • To change the order in which the browser checks for character sets, - highlight character sets in the list on the right, and use the arrow buttons - to move the character sets up or down in the list. +
      • To change the order in which active encodings appear in +the Character Encoding menu, + highlight character encodings in the list on the right, and use the arrow buttons + to move the character encodings up or down in the list.
    @@ -998,8 +1000,9 @@ each character-coding method you want.
  • Under the Appearance category, click Fonts. (If no subcategories are visible, double-click Appearance to expand the list.) -
  • From the "Fonts for" drop-down list, choose a character coding method. For - instance, to set default fonts for the Western character set, choose "Western." +
  • From the "Fonts for" drop-down list, choose a language group/script. For + instance, to set default fonts for West European languages/script, + choose "Western."
  • Select whether proportional text should be serif (like Times Roman) or sans serif (like Arial). You can also specify what font size you want for proportional diff --git a/mozilla/extensions/help/resources/locale/en-US/page_info_help.html b/mozilla/extensions/help/resources/locale/en-US/page_info_help.html index 4134f68024b..622d63a5e2b 100644 --- a/mozilla/extensions/help/resources/locale/en-US/page_info_help.html +++ b/mozilla/extensions/help/resources/locale/en-US/page_info_help.html @@ -51,7 +51,7 @@
  • URL:  The Uniform Resource Locator for the page—that is, the standardized address that appears in the Location Bar near the top of the browser window.
  • Render mode:  Indicates whether the browser is using quirks mode or standards compliance mode to lay out the page. Quirks mode takes account of nonstandard behavior that may be used by some older web pages designed for older versions of web browsers that are not fully standards compliant. Standards compliance mode adheres strictly to standards specifications. Your browser chooses the render mode automatically according to information contained in the web page itself.
  • Source:  Indicates whether the source code for this page has been cached. -
  • Encoding:  The character set encoding used for this HTML document. +
  • Encoding:  The character encoding used for this HTML document.
  • Size:  The size of the file, if available.
  • Modified:  The date the page was last modified, if available.
  • Expires:  The date on which the information displayed by the page expires. diff --git a/mozilla/extensions/help/resources/locale/en-US/page_info_help.xhtml b/mozilla/extensions/help/resources/locale/en-US/page_info_help.xhtml index 2788765766f..ab3b3d98ded 100644 --- a/mozilla/extensions/help/resources/locale/en-US/page_info_help.xhtml +++ b/mozilla/extensions/help/resources/locale/en-US/page_info_help.xhtml @@ -51,7 +51,7 @@
  • URL:  The Uniform Resource Locator for the page—that is, the standardized address that appears in the Location Bar near the top of the browser window.
  • Render mode:  Indicates whether the browser is using quirks mode or standards compliance mode to lay out the page. Quirks mode takes account of nonstandard behavior that may be used by some older web pages designed for older versions of web browsers that are not fully standards compliant. Standards compliance mode adheres strictly to standards specifications. Your browser chooses the render mode automatically according to information contained in the web page itself.
  • Source:  Indicates whether the source code for this page has been cached. -
  • Encoding:  The character set encoding used for this HTML document. +
  • Encoding:  The character encoding used for this HTML document.
  • Size:  The size of the file, if available.
  • Modified:  The date the page was last modified, if available.
  • Expires:  The date on which the information displayed by the page expires. diff --git a/mozilla/extensions/irc/xul/locale/en-US/pref-irc.dtd b/mozilla/extensions/irc/xul/locale/en-US/pref-irc.dtd index 7b65dbacf76..520facf591c 100644 --- a/mozilla/extensions/irc/xul/locale/en-US/pref-irc.dtd +++ b/mozilla/extensions/irc/xul/locale/en-US/pref-irc.dtd @@ -88,10 +88,10 @@ - - + + - + diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul index 064829cc1df..5a1dc1c8725 100644 --- a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul +++ b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul @@ -89,7 +89,7 @@ - &coding.label; + &encoding.label;