Backed out changeset f769584a86da (bug 916823) for xpcshell failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 10 Oct 2013 15:26:51 -0400
changeset 8089 ec31e6440074da0262a3f35c039fdd5b554b53d4
parent 8088 1d3e00fb9fbb362f3dd2bad976f683795f56ece0
child 8090 5b6fe2070485ecd7b1ae6a6f296831d04a6958ec
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
bugs916823
Backed out changeset f769584a86da (bug 916823) for xpcshell failures. X-Channel-Repo: comm-central X-Channel-Converted-Revision: 48ea5d2497f46be72d0560547e1f3953d227a756
mail/chrome/messenger/folderProps.dtd
suite/chrome/mailnews/folderProps.dtd
--- a/mail/chrome/messenger/folderProps.dtd
+++ b/mail/chrome/messenger/folderProps.dtd
@@ -1,19 +1,19 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!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">
 <!ENTITY folderRebuildSummaryFile.explanation    "Sometimes the folder index (.msf) file becomes damaged and messages may appear missing or deleted messages continue showing; repairing the folder may fix these issues.">
 <!ENTITY folderIncludeInGlobalSearch.label       "Include messages in this folder in Global Search results">
 <!ENTITY folderIncludeInGlobalSearch.accesskey   "G">
      
 <!ENTITY retention.label "Retention Policy">
--- a/suite/chrome/mailnews/folderProps.dtd
+++ b/suite/chrome/mailnews/folderProps.dtd
@@ -1,19 +1,19 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!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">
 <!ENTITY folderRebuildSummaryFile.explanation    "Sometimes the folder index (.msf) file becomes damaged and messages may appear missing or deleted messages continue showing; repairing the folder may fix these issues.">
 <!ENTITY folderIncludeInGlobalSearch.label       "Include messages in this folder in Global Search results">
 <!ENTITY folderIncludeInGlobalSearch.accesskey   "G">
 
 <!ENTITY retention.label "Retention Policy">