Bug 1448865 - Add the strings removed in bug 1448853 to our preferences.dtd. r=jorgk,frg

common/bindings/preferences.xml

@@ -1,7 +1,11 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE bindings [
-  <!ENTITY % preferencesDTD SYSTEM "chrome://global/locale/preferences.dtd">
+#ifdef MOZ_SUITE
+  <!ENTITY % preferencesDTD SYSTEM "chrome://communicator/locale/pref/preferences.dtd">
+#else
+  <!ENTITY % preferencesDTD SYSTEM "chrome://messenger/locale/preferences/preferences.dtd">
+#endif
   %preferencesDTD;
   <!ENTITY % globalKeysDTD SYSTEM "chrome://global/locale/globalKeys.dtd">
   %globalKeysDTD;

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

@@ -2,6 +2,12 @@
    - 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  windowClose.key                  "w">
+<!ENTITY  preferencesDefaultTitleMac.title "Preferences">
+<!ENTITY  preferencesDefaultTitleWin.title "Options">
+<!ENTITY  preferencesCloseButton.label     "Close">
+<!ENTITY  preferencesCloseButton.accesskey "C">
+
 <!ENTITY  prefWindow.titleWin     "Options">
 <!ENTITY  prefWindow.titleGNOME   "&brandShortName; Preferences">
 <!ENTITY  prefWindow.titleMAC     "Preferences">

suite/locales/en-US/chrome/common/pref/preferences.dtd

@@ -2,6 +2,12 @@
    - 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  windowClose.key "w">
+<!ENTITY  preferencesDefaultTitleMac.title "Preferences">
+<!ENTITY  preferencesDefaultTitleWin.title "Options">
+<!ENTITY  preferencesCloseButton.label "Close">
+<!ENTITY  preferencesCloseButton.accesskey "C">
+
 <!--LOCALIZATION NOTE (.label): Preferences categories that appear on the left of the preferences dialog -->
 <!ENTITY prefWindow.title "Preferences">
 <!ENTITY categoryHeader "Category">