Merge labels and access keys into one string in locales

chrome/locale/en-US/sendReport.dtd

Index: chrome/locale/en-US/sendReport.dtd
===================================================================
--- a/chrome/locale/en-US/sendReport.dtd
+++ b/chrome/locale/en-US/sendReport.dtd
@@ -8,43 +8,38 @@
 <!ENTITY typeSelector.heading           "Select issue type">
 
 <!ENTITY typeSelector.description       "
   This window will guide you through the steps required for the submission of an Adblock
   Plus issue report. First, please select the type of issue that you are experiencing
   on this page:
 ">
 
-<!ENTITY typeSelector.falsePositive.label       "Adblock Plus is blocking too much">
-<!ENTITY typeSelector.falsePositive.accesskey   "m">
+<!ENTITY typeSelector.falsePositive.label       "Adblock Plus is blocking too &amp;much">
 <!ENTITY typeSelector.falsePositive.description "
   Select this option if the page lacks important content, displays incorrectly or
   fails to function properly. You can determine whether Adblock Plus is the cause
   of the problem by disabling it temporarily.
 ">
 
-<!ENTITY typeSelector.falseNegative.label       "Adblock Plus doesn't block an advertisement">
-<!ENTITY typeSelector.falseNegative.accesskey   "v">
+<!ENTITY typeSelector.falseNegative.label       "Adblock Plus doesn't block an ad&amp;vertisement">
 <!ENTITY typeSelector.falseNegative.description "
   Select this option if an advertisement is displayed despite
   Adblock Plus being enabled.
 ">
 
-<!ENTITY typeSelector.other.label               "Other issue">
-<!ENTITY typeSelector.other.accesskey           "t">
+<!ENTITY typeSelector.other.label               "O&amp;ther issue">
 <!ENTITY typeSelector.other.description         "
   Select this option if you suspect an issue with Adblock Plus itself rather
   than its filters.
 ">
 
 <!ENTITY showRecentReports.label                "Show recently submitted reports">
 <!ENTITY recentReports.label                    "Your recently submitted reports">
-<!ENTITY recentReports.clear.label              "Remove all reports">
-<!ENTITY recentReports.clear.accesskey          "R">
-
+<!ENTITY recentReports.clear.label              "&amp;Remove all reports">
 <!ENTITY update.inProgress.description          "
   Adblock Plus needs to update your filter subscriptions to make sure that the
   issue hasn't been resolved already. Please wait...
 ">
 
 <!ENTITY update.fixed.description               "
   The updates to your filter subscriptions likely resolved the issue that you
   were reporting. Please reload the page and retry, hit Report again if the
@@ -109,98 +104,78 @@
 ">
 <!ENTITY issues.disabledgroups.enable.label     "Enable filter subscription / filter group">
 
 <!ENTITY issues.disabledfilters.description     "
   The following filters are disabled, yet they might have an effect on this page:
 ">
 <!ENTITY issues.disabledfilters.enable.label    "Enable filter">
 
-<!ENTITY issues.override.label                  "The configuration is correct, continue with the report">
-<!ENTITY issues.override.accesskey              "c">
+<!ENTITY issues.override.label                  "The &amp;configuration is correct, continue with the report">
 <!ENTITY issues.change.description              "
   Your configuration has been changed. Please reload the page to test the changes
   and submit a report if the issue hasn't been resolved by the alterations.
 ">
 
 <!ENTITY typeWarning.description                "
   You have indicated that you want to report a general issue with Adblock Plus rather
   than a problem with the filters. Please note that such issues are best reported
   in the [link]Adblock Plus forum[/link]. You should only use the issue reporter to
   supplement an existing discussion, as nobody will notice your report
   unless you provide them with the link to it. The automatically generated link
   will be provided after submitting the report.
 ">
 
-<!ENTITY typeWarning.override.label             "I understand and want to submit the report anyway">
-<!ENTITY typeWarning.override.accesskey         "s">
-
-<!ENTITY reloadButton.label                     "Reload page">
-<!ENTITY reloadButton.accesskey                 "R">
-
+<!ENTITY typeWarning.override.label             "I under&amp;stand and want to submit the report anyway">
+<!ENTITY reloadButton.label                     "&amp;Reload page">
 <!-- Please keep screenshot.heading short - it is shown in the progress bar, not much space there -->
 <!ENTITY screenshot.heading           "Attach screenshot">
 
 <!ENTITY screenshot.description       "
   The same page can look different for different people. It may help us to
   understand the problem if you attach a screenshot to your report. You can remove
   sections containing sensitive information as well as mark areas where the
   problem is noticeable. To do that click the corresponding button and select
   a section of the image with your mouse.
 ">
 
-<!ENTITY screenshot.attach.label      "Attach a page image to the report">
-<!ENTITY screenshot.attach.accesskey  "t">
-<!ENTITY screenshot.mark.label        "Mark the problem">
-<!ENTITY screenshot.mark.accesskey    "M">
-<!ENTITY screenshot.remove.label      "Remove sensitive data">
-<!ENTITY screenshot.remove.accesskey  "R">
-<!ENTITY screenshot.undo.label        "Undo">
-<!ENTITY screenshot.undo.accesskey    "U">
-
+<!ENTITY screenshot.attach.label      "A&amp;ttach a page image to the report">
+<!ENTITY screenshot.mark.label        "&amp;Mark the problem">
+<!ENTITY screenshot.remove.label      "&amp;Remove sensitive data">
+<!ENTITY screenshot.undo.label        "&amp;Undo">
 <!-- Please keep commentPage.heading short - it is shown in the progress bar, not much space there -->
 <!ENTITY commentPage.heading          "Enter comment">
 
 <!ENTITY commentPage.description      "
   The text field below allows you to enter a comment to help us understand the issue.
   This step is optional but recommended if the problem isn't obvious.
   You can also review the report data before it is sent.
 ">
 
 <!ENTITY emailComment.label           "
   We encourage you to enter a valid email address so that we can contact you if there are questions
   about your report. It will also allow us to recognize your contributions and to prioritize them higher.
 ">
-<!ENTITY comment.label                "Comment (optional):">
-<!ENTITY comment.accesskey            "C">
+<!ENTITY comment.label                "&amp;Comment (optional):">
 <!ENTITY comment.lengthWarning        "The length of your comment exceeds 1000 characters. Only the first 1000 characters will be sent.">
-<!ENTITY email.label                  "Email:">
-<!ENTITY email.accesskey              "m">
-<!ENTITY anonymous.label              "Anonymous submission">
-<!ENTITY anonymous.accesskey          "a">
+<!ENTITY email.label                  "E&amp;mail:">
+<!ENTITY anonymous.label              "&amp;Anonymous submission">
 <!ENTITY anonymity.warning            "We won't be able to come back to you and will likely prioritize the report lower.">
 
-<!ENTITY attachExtensions.label       "Attach a list of active extensions to the report in case add-on conflict is the cause of the problem">
-<!ENTITY attachExtensions.accesskey   "x">
-
-<!ENTITY sendButton.label             "Send report">
-<!ENTITY sendButton.accesskey         "n">
-
+<!ENTITY attachExtensions.label       "Attach a list of active e&amp;xtensions to the report in case add-on conflict is the cause of the problem">
+<!ENTITY sendButton.label             "Se&amp;nd report">
 <!ENTITY showData.label               "Show report data">
-<!ENTITY data.label                   "Report data:">
-<!ENTITY data.accesskey               "p">
-
+<!ENTITY data.label                   "Re&amp;port data:">
 <!-- Please keep sendPage.heading short - it is shown in the progress bar, not much space there -->
 <!ENTITY sendPage.heading             "Send report">
 <!ENTITY sendPage.waitMessage         "Please wait while Adblock Plus is submitting your report.">
 <!ENTITY sendPage.confirmation        "Your report has been saved. You can access it at the following address:">
 <!ENTITY sendPage.knownIssue          "The issue you reported is probably already known. More information:">
 
 <!-- Note: the placeholder ?1? will be replaced by the error code -->
 <!ENTITY sendPage.errorMessage        "
   An attempt to send the report failed with error code &quot;?1?&quot;. Please ensure you are
   connected to the Internet and retry. If the problem persists please request
   assistance in the [link]Adblock Plus forum[/link].
 ">
 <!ENTITY sendPage.retry.label         "Send again">
 
-<!ENTITY copyLink.label               "Copy report link">
-<!ENTITY copyLink.accesskey           "C">
+<!ENTITY copyLink.label               "&amp;Copy report link">