--- a/browser/components/preferences/cookies.xul
+++ b/browser/components/preferences/cookies.xul
@@ -3,113 +3,109 @@
 # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 # 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/.
 
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
 
-<!DOCTYPE dialog [
-<!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-%browserDTD;
-<!ENTITY % cookiesDTD SYSTEM "chrome://browser/locale/preferences/cookies.dtd">
-%cookiesDTD;
-]>
-
 <window id="CookiesDialog" windowtype="Browser:Cookies"
-        class="windowDialog" title="&window.title;"
+        data-l10n-id="cookies-window"
+        data-l10n-attrs="title, style"
+        class="windowDialog"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        style="width: &window.width;;"
         onload="gCookiesWindow.init();"
         onunload="gCookiesWindow.uninit();"
         persist="screenX screenY width height"
         onkeypress="gCookiesWindow.onWindowKeyPress(event);">
 
+  <link rel="localization" href="browser/preferences/cookies.ftl"/>
+  <script type="text/javascript" src="chrome://global/content/l10n.js"></script>
+
   <script src="chrome://browser/content/preferences/cookies.js"/>
 
   <stringbundle id="bundlePreferences"
                 src="chrome://browser/locale/preferences/preferences.properties"/>
 
   <keyset>
-    <key key="&windowClose.key;" modifiers="accel" oncommand="window.close();"/>
-    <key key="&focusSearch1.key;" modifiers="accel" oncommand="gCookiesWindow.focusFilterBox();"/>
-    <key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
+    <key data-l10n-id="cookies-close-key" modifiers="accel" oncommand="window.close();"/>
+    <key data-l10n-id="cookies-focus-search-key" modifiers="accel" oncommand="gCookiesWindow.focusFilterBox();"/>
+    <key id="key_selectAll" data-l10n-id="cookies-select-all-key" modifiers="accel"/>
   </keyset>
 
   <vbox flex="1" class="contentPane largeDialogContainer">
     <hbox align="center">
       <textbox type="search" id="filter" flex="1"
                aria-controls="cookiesList"
                oncommand="gCookiesWindow.filter();"
-               placeholder="&searchFilter.label;"
-               accesskey="&searchFilter.accesskey;"/>
+               data-l10n-id="cookies-search-filter" />
     </hbox>
     <separator class="thin"/>
-    <label control="cookiesList" id="cookiesIntro">&cookiesonsystem2.label;</label>
+    <label control="cookiesList" data-l10n-id="cookies-on-system" id="cookiesIntro"/>
     <separator class="thin"/>
     <tree id="cookiesList" flex="1" style="height: 10em;"
           onkeypress="gCookiesWindow.onCookieKeyPress(event)"
           onselect="gCookiesWindow.onCookieSelected();"
           hidecolumnpicker="true" seltype="single">
       <treecols>
-        <treecol id="domainCol" label="&cookiedomain.label;" flex="2" primary="true"
+        <treecol id="domainCol" data-l10n-id="cookies-domain" flex="2" primary="true"
                  persist="width" onclick="gCookiesWindow.sort('rawHost');"/>
         <splitter class="tree-splitter"/>
-        <treecol id="nameCol" label="&cookiename.label;" flex="1"
+        <treecol id="nameCol" data-l10n-id="cookies-name" flex="1"
                  persist="width"
                  onclick="gCookiesWindow.sort('name');"/>
       </treecols>
       <treechildren id="cookiesChildren"/>
     </tree>
     <hbox id="cookieInfoBox">
       <grid flex="1" id="cookieInfoGrid">
         <columns>
           <column/>
           <column flex="1"/>
         </columns>
         <rows>
           <row align="center">
-            <hbox pack="end"><label id="nameLabel" control="name">&props.name.label;</label></hbox>
+            <hbox pack="end"><label id="nameLabel" control="name" data-l10n-id="cookies-props-name"/></hbox>
             <textbox id="name" readonly="true" class="plain"/>
           </row>
           <row align="center">
-            <hbox pack="end"><label id="valueLabel" control="value">&props.value.label;</label></hbox>
+            <hbox pack="end"><label id="valueLabel" control="value" data-l10n-id="cookies-props-value"/></hbox>
             <textbox id="value" readonly="true" class="plain"/>
           </row>
           <row align="center">
-            <hbox pack="end"><label id="isDomain" control="host">&props.domain.label;</label></hbox>
+            <hbox pack="end"><label id="isDomain" control="host" data-l10n-id="cookies-props-domain"/></hbox>
             <textbox id="host" readonly="true" class="plain"/>
           </row>
           <row align="center">
-            <hbox pack="end"><label id="pathLabel" control="path">&props.path.label;</label></hbox>
+            <hbox pack="end"><label id="pathLabel" control="path" data-l10n-id="cookies-props-path" /></hbox>
             <textbox id="path" readonly="true" class="plain"/>
           </row>
           <row align="center">
-            <hbox pack="end"><label id="isSecureLabel" control="isSecure">&props.secure.label;</label></hbox>
+            <hbox pack="end"><label id="isSecureLabel" control="isSecure" data-l10n-id="cookies-props-secure"/></hbox>
             <textbox id="isSecure" readonly="true" class="plain"/>
           </row>
           <row align="center">
-            <hbox pack="end"><label id="expiresLabel" control="expires">&props.expires.label;</label></hbox>
+            <hbox pack="end"><label id="expiresLabel" control="expires" data-l10n-id="cookies-props-expires"/></hbox>
             <textbox id="expires" readonly="true" class="plain"/>
           </row>
           <row align="center" id="userContextRow">
-            <hbox pack="end"><label id="userContextLabel" control="userContext">&props.container.label;</label></hbox>
+            <hbox pack="end"><label id="userContextLabel" control="userContext" data-l10n-id="cookies-props-container"/></hbox>
             <textbox id="userContext" readonly="true" class="plain"/>
           </row>
         </rows>
       </grid>
     </hbox>
   </vbox>
   <hbox align="end">
     <hbox class="actionButtons" flex="1">
       <button id="removeSelectedCookies" disabled="true" icon="clear"
               oncommand="gCookiesWindow.deleteCookie();"/>
       <button id="removeAllCookies" disabled="true" icon="clear"
               oncommand="gCookiesWindow.deleteAllCookies();"/>
       <spacer flex="1"/>
 #ifndef XP_MACOSX
       <button oncommand="close();" icon="close"
-              label="&button.close.label;" accesskey="&button.close.accesskey;"/>
+              data-l10n-id="cookies-button-close" />
 #endif
     </hbox>
   </hbox>
 </window>

new file mode 100644
--- /dev/null
+++ b/browser/locales/en-US/browser/preferences/cookies.ftl
@@ -0,0 +1,39 @@
+# 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/.
+
+cookies-window =
+    .title = Cookies
+    .style = width: 36em
+
+cookies-close-key =
+    .key = w
+
+cookies-focus-search-key =
+    .key = w
+
+cookies-select-all-key =
+    .key = A
+
+cookies-search-filter =
+    .placeholder = Search
+    .accesskey = S
+
+cookies-on-system = The following cookies are stored on your computer
+
+cookies-domain =
+    .label = Site
+cookies-name =
+    .label = Cookie Name
+
+cookies-props-name = Name:
+cookies-props-value = Content:
+cookies-props-domain = Host:
+cookies-props-path = Path:
+cookies-props-secure = Send For:
+cookies-props-expires = Expires:
+cookies-props-container = Container:
+
+cookies-button-close =
+    .label = Close
+    .accesskey = C

deleted file mode 100644
--- a/browser/locales/en-US/chrome/browser/preferences/cookies.dtd
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- 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 window.width                       "36em">
-
-<!ENTITY     cookiesonsystem2.label         "The following cookies are stored on your computer">
-<!ENTITY     cookiename.label               "Cookie Name">
-<!ENTITY     cookiedomain.label             "Site">
-
-<!ENTITY     props.name.label               "Name:">
-<!ENTITY     props.value.label              "Content:">
-<!ENTITY     props.domain.label             "Host:">
-<!ENTITY     props.path.label               "Path:">
-<!ENTITY     props.secure.label             "Send For:">
-<!ENTITY     props.expires.label            "Expires:">
-<!ENTITY     props.container.label          "Container:">
-
-<!ENTITY     window.title                   "Cookies">
-<!ENTITY     windowClose.key                "w">
-<!ENTITY     focusSearch1.key               "f">
-
-<!ENTITY     searchFilter.label             "Search">
-<!ENTITY     searchFilter.accesskey         "S">
-
-<!ENTITY     button.close.label             "Close">
-<!ENTITY     button.close.accesskey         "C">

--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -54,17 +54,16 @@
     locale/browser/safebrowsing/report-phishing.dtd                    (%chrome/browser/safebrowsing/report-phishing.dtd)
     locale/browser/safebrowsing/safebrowsing.properties   (%chrome/browser/safebrowsing/safebrowsing.properties)
     locale/browser/feeds/subscribe.dtd              (%chrome/browser/feeds/subscribe.dtd)
     locale/browser/feeds/subscribe.properties       (%chrome/browser/feeds/subscribe.properties)
     locale/browser/migration/migration.dtd         (%chrome/browser/migration/migration.dtd)
     locale/browser/migration/migration.properties  (%chrome/browser/migration/migration.properties)
     locale/browser/preferences/clearSiteData.properties     (%chrome/browser/preferences/clearSiteData.properties)
     locale/browser/preferences/content.dtd            (%chrome/browser/preferences/content.dtd)
-    locale/browser/preferences/cookies.dtd            (%chrome/browser/preferences/cookies.dtd)
     locale/browser/preferences/fonts.dtd              (%chrome/browser/preferences/fonts.dtd)
     locale/browser/preferences/languages.dtd          (%chrome/browser/preferences/languages.dtd)
     locale/browser/preferences/permissions.dtd        (%chrome/browser/preferences/permissions.dtd)
     locale/browser/preferences/preferences.properties     (%chrome/browser/preferences/preferences.properties)
     locale/browser/preferences/privacy.dtd            (%chrome/browser/preferences/privacy.dtd)
     locale/browser/preferences/security.dtd           (%chrome/browser/preferences/security.dtd)
     locale/browser/preferences/selectBookmark.dtd     (%chrome/browser/preferences/selectBookmark.dtd)
     locale/browser/preferences/siteDataSettings.dtd     (%chrome/browser/preferences/siteDataSettings.dtd)