Bug 941454: Update text in clear private data prompt.r=mbrubeck
authorAllison Naaktgeboren <ally@mozilla.com>
Sat, 01 Feb 2014 19:48:31 -0800
changeset 166466 5744bf41d817d9ef8dc37875b3ea6caf09338990
parent 166465 c6f045e87c351de03e09ec5a7d9e95b704437790
child 166467 4e95343c93e6c4d49457a4391dd866d3117a9620
push id26127
push userphilringnalda@gmail.com
push dateSun, 02 Feb 2014 17:11:12 +0000
treeherdermozilla-central@2918a9e625b4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmbrubeck
bugs941454
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 941454: Update text in clear private data prompt.r=mbrubeck
browser/metro/base/content/browser-ui.js
browser/metro/locales/en-US/chrome/browser.properties
--- a/browser/metro/base/content/browser-ui.js
+++ b/browser/metro/base/content/browser-ui.js
@@ -1120,18 +1120,19 @@ var BrowserUI = {
       case "cmd_savePage":
         this.savePage();
         break;
     }
   },
 
   confirmSanitizeDialog: function () {
     let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
-    let title = bundle.GetStringFromName("clearPrivateData.title");
-    let message = bundle.GetStringFromName("clearPrivateData.message");
+    let title = bundle.GetStringFromName("clearPrivateData.title2");
+    let options = bundle.GetStringFromName("optionsCharm");
+    let message = bundle.GetStringFromName("clearPrivateData.message2").replace("#1", options);
     let clearbutton = bundle.GetStringFromName("clearPrivateData.clearButton");
 
     let prefsClearButton = document.getElementById("prefs-clear-data");
     prefsClearButton.disabled = true; 
 
     let buttonPressed = Services.prompt.confirmEx(
                           null,
                           title,
--- a/browser/metro/locales/en-US/chrome/browser.properties
+++ b/browser/metro/locales/en-US/chrome/browser.properties
@@ -33,18 +33,19 @@ contextAppbar2.delete=Delete
 # Button with this label only appears immediately after a deletion.
 contextAppbar2.restore=Undo delete
 
 # LOCALIZATION NOTE (contextAppbar2.clear): Unselects pages without modification.
 contextAppbar2.clear=Clear selection
 
 # Clear private data
 clearPrivateData.clearButton=Clear
-clearPrivateData.title=Clear Private Data
-clearPrivateData.message=Clear your private data?
+clearPrivateData.title2=Clear private data
+# LOCALIZATION NOTE (clearPrivateData.message2): #1 is optionsCharm
+clearPrivateData.message2=This will permanently delete the private data you have selected in #1
 
 # Settings Charms
 aboutCharm1=About
 optionsCharm=Options
 searchCharm=Search
 helpOnlineCharm=Help (online)
 
 # General