Bug 1266166 - Menuitems to report as phishing attempt or as a false positive/non-phishing attempt should use different accesskeys. r=francois

MozReview-Commit-ID: HBoewKU3LS

browser/base/content/report-phishing-overlay.xul

@@ -26,7 +26,7 @@
               onclick="checkForMiddleClick(this, event);"/>
     <menuitem id="menu_HelpPopup_reportPhishingErrortoolmenu"
               label="&safeb.palm.notdeceptive.label;"
-              accesskey="&reportDeceptiveSiteMenu.accesskey;"
+              accesskey="&safeb.palm.notdeceptive.accesskey;"
               insertbefore="aboutSeparator"
               observes="reportPhishingErrorBroadcaster"
               oncommand="openUILinkIn(gSafeBrowsing.getReportURL('PhishMistake'), 'tab');"

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

@@ -4,8 +4,15 @@
 
 <!ENTITY safeb.palm.accept.label "Get me out of here!">
 <!ENTITY safeb.palm.decline.label "Ignore this warning">
-<!-- Localization note (safeb.palm.notdeceptive.label) - Label of the Help menu item. -->
+<!-- Localization note (safeb.palm.notdeceptive.label) - Label of the Help menu
+  item. Either this or reportDeceptiveSiteMenu.label from report-phishing.dtd is
+  shown. -->
 <!ENTITY safeb.palm.notdeceptive.label "This isn’t a deceptive site…">
+<!-- Localization note (safeb.palm.notdeceptive.accesskey) - Because
+  safeb.palm.notdeceptive.label and reportDeceptiveSiteMenu.title from
+  report-phishing.dtd are never shown at the same time, the same accesskey can
+  be used for them. -->
+<!ENTITY safeb.palm.notdeceptive.accesskey "d">
 <!ENTITY safeb.palm.reportPage.label "Why was this page blocked?">
 <!ENTITY safeb.palm.whyForbidden.label "Why was this page blocked?">
 

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

@@ -2,5 +2,12 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
+<!-- Localization note (reportDeceptiveSiteMenu.title) - Label of the Help menu
+  item. Either this or safeb.palm.notdeceptive.label from
+  phishing-afterload-warning-message.dtd is shown. -->
 <!ENTITY reportDeceptiveSiteMenu.title      "Report deceptive site…">
+<!-- Localization note (reportDeceptiveSiteMenu.accesskey) - Because
+  safeb.palm.notdeceptive.label from phishing-afterload-warning-message.dtd and
+  reportDeceptiveSiteMenu.title are never shown at the same time, the same
+  accesskey can be used for them. -->
 <!ENTITY reportDeceptiveSiteMenu.accesskey  "D">