Bug 349452: Safe Browsing changes: remove third paragraph, change final link to "This isn't a web forgery", patch by Reed Loden <reed@reedloden.com>, r=me

browser/components/safebrowsing/content/phishing-afterload-displayer.js

@@ -649,8 +649,6 @@ PROT_PhishMsgDisplayerCanvas.prototype.showMessageAfterOverlay_ = function() {
   // (6)
   var link = this.doc_.getElementById('safebrowsing-palm-falsepositive-link');
   link.href = this.getReportErrorURL_();
-  link = this.doc_.getElementById('safebrowsing-palm-report-link');
-  link.href = this.getReportGenericURL_();
 
   // (7)
   this.doc_.getElementById(this.messageContentId_).focus();

browser/components/safebrowsing/content/warning-overlay.xul

@@ -70,7 +70,6 @@
 
         <vbox id="safebrowsing-palm-extended-message" hidden="true"
           class="safebrowsing-palm-fixed-width">
-
           <description class="safebrowsing-palm-paragraph">
             &safeb.palm.message.p2.start;
             <label class="text-link plain"
@@ -78,14 +77,6 @@
               value="&safeb.palm.message.p2.linkText;" />
             &safeb.palm.message.p2.end;
           </description>
-
-          <description class="safebrowsing-palm-paragraph">
-            &safeb.palm.message.p3.start;
-            <label class="text-link plain"
-              id="safebrowsing-palm-falsepositive-link"
-              value="&safeb.palm.message.p3.linkText;" />&safeb.palm.message.p3.end;
-
-          </description>
         </vbox>
 
         <!-- Main action links -->
@@ -118,9 +109,9 @@
           <spacer flex="1" />
           <description>
             [
-            <label id="safebrowsing-palm-report-link"
+            <label id="safebrowsing-palm-falsepositive-link"
               class="safebrowsing-palm-smalltext text-link plain"
-              value="&safeb.palm.sendreport.label;" />
+              value="&safeb.palm.notforgery.label;" />
             ]
           </description>
         </hbox>

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

@@ -9,15 +9,11 @@
 <!ENTITY safeb.palm.message.p2.linkURL "http://www.mozilla.org/projects/bonecho/anti-phishing/">
 <!ENTITY safeb.palm.message.p2.end " from phishing attacks.">
 
-<!ENTITY safeb.palm.message.p3.start "If you believe this page has been falsely reported as a web forgery, you can ">
-<!ENTITY safeb.palm.message.p3.linkText "let us know">
-<!ENTITY safeb.palm.message.p3.end ".">
-
 <!ENTITY safeb.palm.accept.label "Get me out of here!">
 <!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.sendreport.label "Send report">
+<!ENTITY safeb.palm.notforgery.label "This isn't a web forgery">
 
 <!ENTITY safeb.palm.addbutton.label "Add to blacklist">
 <!ENTITY safeb.palm.addbutton.tooltip "Add to blacklist">