Backed out changeset f769584a86da (bug 916823) for xpcshell failures.

mail/locales/en-US/chrome/messenger/folderProps.dtd

@@ -5,10 +5,10 @@
 <!ENTITY folderProps.windowtitle.label           "Properties">
 
 <!ENTITY generalInfo.label                       "General Information">
-<!ENTITY folderCharsetFallback.label             "Fallback Character Encoding:">
-<!ENTITY folderCharsetFallback.accesskey         "E">
-<!ENTITY folderCharsetEnforce.label              "Apply encoding to all messages in the folder (individual message character encoding settings and auto-detection will be ignored)">
-<!ENTITY folderCharsetEnforce.accesskey          "A">
+<!ENTITY folderCharsetTab.label                  "Default Character Encoding:">
+<!ENTITY folderCharsetTab.accesskey              "E">
+<!ENTITY folderCharsetOverride.label             "Apply default to all messages in the folder (individual message character encoding settings and auto-detection will be ignored)">
+<!ENTITY folderCharsetOverride.accesskey         "A">
 <!ENTITY folderRebuildSummaryFileTip2.label      "Rebuild Summary File Index">
 <!ENTITY folderRebuildSummaryFile2.label         "Repair Folder">
 <!ENTITY folderRebuildSummaryFile2.accesskey     "R">

mailnews/base/content/folderProps.xul

@@ -70,9 +70,8 @@
                 accesskey="&folderCheckForNewMessages2.accesskey;"/>
       <vbox>
         <hbox align="center" valign="middle">
-          <label value="&folderCharsetFallback.label;"
-                 accesskey="&folderCharsetFallback.accesskey;"
-                 control="folderCharsetList"/>
+          <label value="&folderCharsetTab.label;" control="folderCharsetList"
+                 accesskey="&folderCharsetTab.accesskey;"/>
           <menulist id="folderCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"> 
             <template>
               <menupopup>
@@ -82,8 +81,8 @@
           </menulist>
         </hbox> 
         <checkbox class="indent" id="folderCharsetOverride"
-                  label="&folderCharsetEnforce.label;"
-                  accesskey="&folderCharsetEnforce.accesskey;"/>
+                  label="&folderCharsetOverride.label;"
+                  accesskey="&folderCharsetOverride.accesskey;"/>
       </vbox>
       <groupbox id="folderRebuildSummaryGroupBox" align="baseline">
         <grid>

suite/locales/en-US/chrome/mailnews/folderProps.dtd

@@ -5,10 +5,10 @@
 <!ENTITY folderProps.windowtitle.label           "Properties">
 
 <!ENTITY generalInfo.label                       "General Information">
-<!ENTITY folderCharsetFallback.label             "Fallback Character Encoding:">
-<!ENTITY folderCharsetFallback.accesskey         "E">
-<!ENTITY folderCharsetEnforce.label              "Apply encoding to all messages in the folder (individual message character encoding settings and auto-detection will be ignored)">
-<!ENTITY folderCharsetEnforce.accesskey          "A">
+<!ENTITY folderCharsetTab.label                  "Default Character Encoding:">
+<!ENTITY folderCharsetTab.accesskey              "E">
+<!ENTITY folderCharsetOverride.label             "Apply default to all messages in the folder (individual message character encoding settings and auto-detection will be ignored)">
+<!ENTITY folderCharsetOverride.accesskey         "A">
 <!ENTITY folderRebuildSummaryFileTip2.label      "Rebuild Summary File Index">
 <!ENTITY folderRebuildSummaryFile2.label         "Repair Folder">
 <!ENTITY folderRebuildSummaryFile2.accesskey     "R">