From abf74d16b07afea3a4a8f8f10e0281e7782f2cf6 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Thu, 14 Mar 2013 11:08:13 -0700
Subject: [PATCH] Bug 851156 (part 1) - Clean Metro strings for button and menu
 labels [r=jimm]

---
 browser/metro/base/content/browser.xul           |  4 ++--
 browser/metro/locales/en-US/chrome/browser.dtd   |  4 ++--
 .../locales/en-US/chrome/browser.properties      | 16 ++++++++++------
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/browser/metro/base/content/browser.xul b/browser/metro/base/content/browser.xul
index e6e523e9efc..cd3d6568956 100644
--- a/browser/metro/base/content/browser.xul
+++ b/browser/metro/base/content/browser.xul
@@ -621,10 +621,10 @@
 
           <!-- App bar: 'more' button context menu -->
           <richlistitem id="context-findinpage" type="find-in-page" onclick="ContextCommands.findInPage();">
-          <label value="&appbarFindInPage.label;"/>
+          <label value="&appbarFindInPage2.label;"/>
           </richlistitem>
           <richlistitem id="context-viewondesktop" type="view-on-desktop" onclick="ContextCommands.viewOnDesktop();">
-          <label value="&appbarViewOnDesktop.label;"/>
+          <label value="&appbarViewOnDesktop2.label;"/>
           </richlistitem>
         </richlistbox>
       </vbox>
diff --git a/browser/metro/locales/en-US/chrome/browser.dtd b/browser/metro/locales/en-US/chrome/browser.dtd
index 1220976a5d2..eda9ab906c5 100644
--- a/browser/metro/locales/en-US/chrome/browser.dtd
+++ b/browser/metro/locales/en-US/chrome/browser.dtd
@@ -12,8 +12,8 @@
 <!ENTITY closetab.label        "Close Tab">
 <!ENTITY undoclosetab.label    "Undo Close Tab">
 
-<!ENTITY appbarFindInPage.label    "Find in Page">
-<!ENTITY appbarViewOnDesktop.label "View on Desktop">
+<!ENTITY appbarFindInPage2.label    "Find in page">
+<!ENTITY appbarViewOnDesktop2.label "View on desktop">
 
 <!ENTITY startTopSitesHeader.label        "Top Sites">
 <!ENTITY startBookmarksHeader.label       "Bookmarks">
diff --git a/browser/metro/locales/en-US/chrome/browser.properties b/browser/metro/locales/en-US/chrome/browser.properties
index a8232511748..21ab7479997 100644
--- a/browser/metro/locales/en-US/chrome/browser.properties
+++ b/browser/metro/locales/en-US/chrome/browser.properties
@@ -38,16 +38,16 @@ alertDownloadsNoSpace=Not enough storage space
 # Popup Blocker
 popupWarning=%S prevented this site from opening a pop-up window.
 popupWarningMultiple=%S prevented this site from opening %S pop-up windows.
-popupButtonAllowOnce2=Allow Once
-popupButtonAlwaysAllow3=Always Allow
-popupButtonNeverWarn3=Never Allow
+popupButtonAllowOnce2=Allow once
+popupButtonAlwaysAllow3=Always allow
+popupButtonNeverWarn3=Never allow
 
 # ContentPermissionsPrompt
-contentPermissions.alwaysForSite=Always for this Site
-contentPermissions.neverForSite=Never for this Site
+contentPermissions.alwaysForSite=Always for this site
+contentPermissions.neverForSite=Never for this site
 
 # Geolocation UI
-geolocation2.allow=Share Location
+geolocation2.allow=Share location
 geolocation2.wantsTo=Share your location with %S?
 
 geolocation.learnMore=Learn more…
@@ -82,6 +82,10 @@ tabs.emptyTabTitle=New Tab
 # Open Search
 opensearch.search=Search: %S
 
+# Clear Private Data
+clearPrivateData.title=Clear Private Data
+clearPrivateData.message=Delete your browsing history and settings, including passwords and cookies?
+
 # Open in Another App
 # LOCALIZATION NOTE: openinapp.specific is the text displayed if there is a single external app
 # %S is the name of the app, like "YouTube" or "Picassa"