--- a/browser/components/preferences/in-content/privacy.xul
+++ b/browser/components/preferences/in-content/privacy.xul
@@ -80,17 +80,17 @@
                     search-l10n-ids="history-remember-description"/>
           <menuitem data-l10n-id="history-remember-option-never"
                     value="dontremember"
                     search-l10n-ids="history-dontremember-description"/>
           <menuitem data-l10n-id="history-remember-option-custom"
                     value="custom"
                     search-l10n-ids="
                       history-private-browsing-permanent.label,
-                      history-remember-option.label,
+                      history-remember-browser-option.label,
                       history-remember-search-option.label,
                       history-clear-on-close-option.label,
                       history-clear-on-close-settings.label"/>
         </menupopup>
       </menulist>
     </hbox>
   </hbox>
   <hbox>
@@ -115,17 +115,17 @@
       </vbox>
       <vbox id="historyCustomPane">
         <vbox>
           <checkbox id="privateBrowsingAutoStart"
                     data-l10n-id="history-private-browsing-permanent"
                     preference="browser.privatebrowsing.autostart"/>
           <vbox class="indent">
             <checkbox id="rememberHistory"
-                      data-l10n-id="history-remember-option"
+                      data-l10n-id="history-remember-browser-option"
                       preference="places.history.enabled"/>
             <checkbox id="rememberForms"
                       data-l10n-id="history-remember-search-option"
                       preference="browser.formfill.enable"/>
             <hbox id="clearDataBox"
                   align="center">
               <checkbox id="alwaysClear"
                         preference="privacy.sanitize.sanitizeOnShutdown"
@@ -141,17 +141,17 @@
               class="accessory-button"
               icon="clear"
               data-l10n-id="history-clear-button"/>
       <!-- Please don't remove the wrapping hbox/vbox/box for these elements. It's used to properly compute the search tooltip position. -->
       <hbox>
         <button id="clearDataSettings"
                 class="accessory-button"
                 data-l10n-id="history-clear-on-close-settings"
-                searchkeywords="&clearDataSettings3.label;
+                searchkeywords="&clearDataSettings4.label;
                                 &historySection.label;
                                 &itemHistoryAndDownloads.label;
                                 &itemCookies.label;
                                 &itemActiveLogins.label;
                                 &itemCache.label;
                                 &itemFormSearchHistory.label;
                                 &dataSection.label;
                                 &itemSitePreferences.label;

--- a/browser/components/preferences/sanitize.xul
+++ b/browser/components/preferences/sanitize.xul
@@ -34,17 +34,17 @@
   <keyset>
     <key key="&windowClose.key;" modifiers="accel" oncommand="Preferences.close(event)"/>
   </keyset>
 
   <vbox id="SanitizeDialogPane" class="prefpane">
 
     <script type="application/javascript" src="chrome://browser/content/preferences/sanitize.js"/>
 
-    <description>&clearDataSettings3.label;</description>
+    <description>&clearDataSettings4.label;</description>
 
     <groupbox orient="horizontal">
       <caption><label>&historySection.label;</label></caption>
       <grid flex="1">
         <columns>
           <column style="width: &sanitizePrefs2.column.width;"/>
           <column flex="1"/>
         </columns>

--- a/browser/locales/en-US/browser/preferences/preferences.ftl
+++ b/browser/locales/en-US/browser/preferences/preferences.ftl
@@ -691,18 +691,18 @@ history-remember-option-custom =
 
 history-remember-description = { -brand-short-name } will remember your browsing, download, form and search history.
 history-dontremember-description = { -brand-short-name } will use the same settings as private browsing, and will not remember any history as you browse the Web.
 
 history-private-browsing-permanent =
     .label = Always use private browsing mode
     .accesskey = p
 
-history-remember-option =
-    .label = Remember my browsing and download history
+history-remember-browser-option =
+    .label = Remember browsing and download history
     .accesskey = b
 
 history-remember-search-option =
     .label = Remember search and form history
     .accesskey = f
 
 history-clear-on-close-option =
     .label = Clear history when { -brand-short-name } closes

--- a/browser/locales/en-US/chrome/browser/sanitize.dtd
+++ b/browser/locales/en-US/chrome/browser/sanitize.dtd
@@ -8,17 +8,17 @@
      The column width should be set at half of the dialog width. -->
 <!ENTITY sanitizePrefs2.modal.width    "34em">
 <!ENTITY sanitizePrefs2.column.width   "17em">
 
 <!ENTITY sanitizeDialog2.title         "Clear Recent History">
 <!-- LOCALIZATION NOTE (sanitizeDialog2.width): width of the Clear Recent History dialog -->
 <!ENTITY sanitizeDialog2.width         "34em">
 
-<!ENTITY clearDataSettings3.label     "When I quit &brandShortName;, it should automatically clear all">
+<!ENTITY clearDataSettings4.label     "When closed, &brandShortName; should automatically clear all">
 
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->
 <!-- LOCALIZATION NOTE (clearTimeDuration.*): "Time range to clear" dropdown.
      See UI mockup at bug 480169 -->
 <!ENTITY clearTimeDuration.label          "Time range to clear: ">
 <!ENTITY clearTimeDuration.accesskey      "T">
 <!ENTITY clearTimeDuration.lastHour       "Last Hour">
 <!ENTITY clearTimeDuration.last2Hours     "Last Two Hours">