Backing out bug 406083 - landed after b4 string freeze. :(

git-svn-id: svn://10.0.0.236/trunk@246557 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul

@@ -48,7 +48,7 @@
   </broadcasterset>
   <menupopup id="menu_HelpPopup">
     <menuitem id="menu_HelpPopup_reportPhishingtoolmenu"
-              label="&reportPhishSiteMenu.title2;"
+              label="&reportPhishSiteMenu.title;..."
               accesskey="&reportPhishSiteMenu.accesskey;"
               insertbefore="updateSeparator"
               observes="reportPhishingBroadcaster"
@@ -56,7 +56,7 @@
               onclick="checkForMiddleClick(this, event);"/>
     <!-- XXX Bug 415846
     <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu"
-              label="&safeb.palm.notforgery.label2;"
+              label="&safeb.palm.notforgery.label;..."
               accesskey="&reportPhishSiteMenu.accesskey;"
               insertbefore="updateSeparator"
               observes="reportPhishingErrorBroadcaster"

mozilla/browser/locales/en-US/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd

@@ -12,6 +12,6 @@
 <!ENTITY safeb.palm.accept.statustext "Navigate to my home page">
 <!ENTITY safeb.palm.decline.label "Ignore this warning">
 <!ENTITY safeb.palm.decline.statustext "Close warning" >
-<!ENTITY safeb.palm.notforgery.label2 "This isn't a web forgery…">
+<!ENTITY safeb.palm.notforgery.label "This isn't a web forgery">
 
 <!ENTITY safeb.urlbaricon.tooltip "This page might be dangerous; click for details.">

mozilla/browser/locales/en-US/chrome/browser/safebrowsing/report-phishing.dtd

@@ -1,2 +1,2 @@
-<!ENTITY reportPhishSiteMenu.title2         "Report Web Forgery…">
+<!ENTITY reportPhishSiteMenu.title          "Report Web Forgery">
 <!ENTITY reportPhishSiteMenu.accesskey      "F">