From dc2ac1b3fdb1974f2b8b81cce8da00fe9d6dc297 Mon Sep 17 00:00:00 2001
From: "rlk%trfenv.com" <rlk%trfenv.com>
Date: Sun, 8 Feb 2004 15:48:50 +0000
Subject: [PATCH] Bug 232722 - change 'character coding' to 'character
 encoding'. Patch by Jungshik Shin <jshin@mailaps.org>. r=rlk@trfenv.com,
 sr=ben@mozilla.org

---
 browser/components/help/locale/en-US/firebird-toc.rdf  |  2 +-
 .../components/help/locale/en-US/menu_reference.xhtml  |  4 ++--
 mail/components/prefwindow/locale/pref-fonts.dtd       |  2 +-
 toolkit/locale/charsetOverlay.dtd                      |  2 +-
 toolkit/locale/customizeCharset.dtd                    | 10 +++++-----
 toolkit/obsolete/locale/charset.dtd                    |  2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/browser/components/help/locale/en-US/firebird-toc.rdf b/browser/components/help/locale/en-US/firebird-toc.rdf
index e40b6b2d1b58..16187b347b37 100644
--- a/browser/components/help/locale/en-US/firebird-toc.rdf
+++ b/browser/components/help/locale/en-US/firebird-toc.rdf
@@ -282,7 +282,7 @@
         <rdf:li> <rdf:Description ID="menu-view-reload" nc:name="Reload" nc:link="menu_reference.xhtml#reload"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-view-increase-text-size" nc:name="Increase Text Size" nc:link="menu_reference.xhtml#increase_text_size"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-view-decrease-text-size" nc:name="Decrease Text Size" nc:link="menu_reference.xhtml#decrease_text_size"/> </rdf:li>
-        <rdf:li> <rdf:Description ID="menu-view-character-coding" nc:name="Character Coding" nc:link="menu_reference.xhtml#character_coding"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="menu-view-character-encoding" nc:name="Character Encoding" nc:link="menu_reference.xhtml#character_encoding"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-view-page-source" nc:name="Page Source" nc:link="menu_reference.xhtml#page_source"/> </rdf:li>
         <rdf:li> <rdf:Description ID="menu-view-full-screen" nc:name="Full Screen" nc:link="menu_reference.xhtml#full_screen"/> </rdf:li>
       </rdf:Seq>
diff --git a/browser/components/help/locale/en-US/menu_reference.xhtml b/browser/components/help/locale/en-US/menu_reference.xhtml
index 8bd89b864290..b6bc22d8f105 100644
--- a/browser/components/help/locale/en-US/menu_reference.xhtml
+++ b/browser/components/help/locale/en-US/menu_reference.xhtml
@@ -172,8 +172,8 @@
     mouse (see Increase Text Size for instructions). To restore the text size,
     press <kbd>Ctrl</kbd>+<kbd>0</kbd>.</p>
 
-  <h3 id="character_coding">Character Coding</h3>
-  <p>Allows you to manually change the character coding on a web page.
+  <h3 id="character_encoding">Character Encoding</h3>
+  <p>Allows you to manually change the character encoding on a web page.
     &brandShortName; is usually capable of detecting this automatically.</p>
 
   <h3 id="page_source">Page Source</h3>
diff --git a/mail/components/prefwindow/locale/pref-fonts.dtd b/mail/components/prefwindow/locale/pref-fonts.dtd
index 3c4e10cbddb5..897914f2f5c7 100644
--- a/mail/components/prefwindow/locale/pref-fonts.dtd
+++ b/mail/components/prefwindow/locale/pref-fonts.dtd
@@ -91,5 +91,5 @@
 
 <!ENTITY viewDefaultCharsetList.label         "Incoming Mail:">
 <!ENTITY viewDefaultCharsetList.accesskey	  "I">
-<!ENTITY forceCharsetOverride.label       "Apply default to all messages (ignore character coding specified by MIME header)">
+<!ENTITY forceCharsetOverride.label       "Apply default to all messages (ignore character encoding specified by MIME header)">
 <!ENTITY forceCharsetOverride.accesskey   "d">
diff --git a/toolkit/locale/charsetOverlay.dtd b/toolkit/locale/charsetOverlay.dtd
index dea7d9311a81..0925f816ad12 100644
--- a/toolkit/locale/charsetOverlay.dtd
+++ b/toolkit/locale/charsetOverlay.dtd
@@ -1,5 +1,5 @@
 <!-- extracted from charsetOverlay.xul -->
-<!ENTITY charsetMenu.label				"Character Coding">
+<!ENTITY charsetMenu.label				"Character Encoding">
 <!ENTITY charsetMenu.accesskey				"C">
 <!ENTITY charsetMenuAutodet.label			"Auto-Detect">
 <!ENTITY charsetMenuAutodet.accesskey			"a">
diff --git a/toolkit/locale/customizeCharset.dtd b/toolkit/locale/customizeCharset.dtd
index 51a6d94a5f2f..85a3427b0622 100644
--- a/toolkit/locale/customizeCharset.dtd
+++ b/toolkit/locale/customizeCharset.dtd
@@ -37,10 +37,10 @@
 #
 #***** END LICENSE BLOCK ***** -->
 
-# LOCALIZATION NOTE  Charset Coding Preferences Dialog: Do NOT localize the term "Character Coding"
-<!ENTITY title.label      "Customize Character Coding">
-<!ENTITY left.header      "Character Coding">
-<!ENTITY current.label    "Active Character Codings:">
+# LOCALIZATION NOTE  Character Encoding Preferences Dialog: Do NOT localize the term "Character Encoding"
+<!ENTITY title.label      "Customize Character Encoding">
+<!ENTITY left.header      "Character Encoding">
+<!ENTITY current.label    "Active Character Encodings:">
 <!ENTITY remove.label     "Remove">
-<!ENTITY additional.label "Available Character Codings:">
+<!ENTITY additional.label "Available Character Encodings:">
 <!ENTITY add.label        "Add">
diff --git a/toolkit/obsolete/locale/charset.dtd b/toolkit/obsolete/locale/charset.dtd
index 29249df28009..f5bc2efd61b2 100644
--- a/toolkit/obsolete/locale/charset.dtd
+++ b/toolkit/obsolete/locale/charset.dtd
@@ -1,4 +1,4 @@
-<!ENTITY charsetMenu.label        "Character Coding">
+<!ENTITY charsetMenu.label        "Character Encoding">
 <!ENTITY charsetMenu.accesskey        "C">
 <!ENTITY charsetMenuAutodet.label     "Auto-Detect">
 <!ENTITY charsetMenuAutodet.accesskey     "a">