From b47a369f22d9929babe603dfc7b55f9a3359bf01 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan.akhgari@gmail.com>
Date: Mon, 17 Aug 2009 00:22:39 +0430
Subject: [PATCH] Bug 495577 - Rename the "Automatically start Firefox in a
 private browsing session" checkbox in privacy prefpane to cause less
 confusion; r=dao

---
 browser/components/preferences/privacy.xul                | 4 ++--
 .../locales/en-US/chrome/browser/preferences/privacy.dtd  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/browser/components/preferences/privacy.xul b/browser/components/preferences/privacy.xul
index 7d86cc84038..c0d62f4097f 100644
--- a/browser/components/preferences/privacy.xul
+++ b/browser/components/preferences/privacy.xul
@@ -178,8 +178,8 @@
         <vbox id="historyCustomPane">
           <separator class="thin"/>
           <checkbox id="privateBrowsingAutoStart" class="indent"
-                    label="&privateBrowsingAutoStart.label;"
-                    accesskey="&privateBrowsingAutoStart.accesskey;"
+                    label="&privateBrowsingPermanent.label;"
+                    accesskey="&privateBrowsingPermanent.accesskey;"
                     preference="browser.privatebrowsing.autostart"/>
 
           <vbox class="indent">
diff --git a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
index 406187035d0..25574a79140 100644
--- a/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/privacy.dtd
@@ -12,10 +12,10 @@
 
 
 <!ENTITY  acceptCookies.label           "Accept cookies from sites">
-<!ENTITY  acceptCookies.accesskey       "c">
+<!ENTITY  acceptCookies.accesskey       "A">
 
 <!ENTITY  acceptThirdParty.label        "Accept third-party cookies">
-<!ENTITY  acceptThirdParty.accesskey    "p">
+<!ENTITY  acceptThirdParty.accesskey    "c">
 
 <!ENTITY  keepUntil.label               "Keep until:">
 <!ENTITY  keepUntil.accesskey           "K">
@@ -57,8 +57,8 @@
 <!ENTITY  dontrememberActions.clearHistory.label "clear all current history">
 <!ENTITY  dontrememberActions.post.label         ".">
 
-<!ENTITY  privateBrowsingAutoStart.label "Automatically start &brandShortName; in a private browsing session">
-<!ENTITY  privateBrowsingAutoStart.accesskey "A">
+<!ENTITY  privateBrowsingPermanent.label "Permanent Private Browsing mode">
+<!ENTITY  privateBrowsingPermanent.accesskey "P">
 
 <!-- LOCALIZATION NOTE:
   The entities rememberHistory.pre.label and rememberHistory.post.label appear on a single