Merge labels and access keys into one string in locales

chrome/content/ui/sendReport.xul

Index: chrome/content/ui/sendReport.xul
===================================================================
--- a/chrome/content/ui/sendReport.xul
+++ b/chrome/content/ui/sendReport.xul
@@ -33,17 +33,16 @@
 <wizard
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&wizard.title;"
   id="abpSendReportWizard"
   onload="initWizard();"
   width="800"
   height="550"
   sendbuttonlabel="&sendButton.label;"
-  sendbuttonaccesskey="&sendButton.accesskey;"
   windowtype="abp:sendReport">
 
 <script type="application/x-javascript;version=1.7" src="utils.js"/>
 <script type="application/x-javascript;version=1.7" src="sendReport.js"/>
 
 <keyset id="wizardKeys">
   <key id="undoKey" modifiers="accel" key="Z" oncommand="if (document.documentElement.currentPage.id == 'screenshotPage') screenshotDataSource.undo();"/>
 </keyset>
@@ -69,21 +68,21 @@
 
   <progressmeter id="dataCollectorProgress" mode="undetermined"/>
 </wizardpage>
 
 <wizardpage id="typeSelectorPage" pageid="typeSelector" next="screenshot" label="&typeSelector.heading;" onpageshow="initTypeSelectorPage();">
   <description>&typeSelector.description;</description>
 
   <radiogroup id="typeGroup" oncommand="typeSelectionUpdated();">
-    <radio id="typeFalsePositive" value="false positive" label="&typeSelector.falsePositive.label;" accesskey="&typeSelector.falsePositive.accesskey;"/>
+    <radio id="typeFalsePositive" value="false positive" label="&typeSelector.falsePositive.label;"/>
     <description class="radioDescription">&typeSelector.falsePositive.description;</description>
-    <radio id="typeFalseNegative" value="false negative" label="&typeSelector.falseNegative.label;" accesskey="&typeSelector.falseNegative.accesskey;"/>
+    <radio id="typeFalseNegative" value="false negative" label="&typeSelector.falseNegative.label;"/>
     <description class="radioDescription">&typeSelector.falseNegative.description;</description>
-    <radio id="typeOther" value="other" label="&typeSelector.other.label;" accesskey="&typeSelector.other.accesskey;"/>
+    <radio id="typeOther" value="other" label="&typeSelector.other.label;"/>
     <description class="radioDescription">&typeSelector.other.description;</description>
   </radiogroup>
 
   <deck id="recentReports" currentIndex="0" flex="1">
     <vbox pack="end">
       <label class="text-link" value="&showRecentReports.label;" onclick="E('recentReports').selectedIndex = 1;"/>
     </vbox>
     <groupbox flex="1">
@@ -91,25 +90,25 @@
       <grid flex="1" id="recentReportsList">
         <columns>
           <column flex="2"/>
           <column flex="1"/>
           <column/>
         </columns>
         <rows id="recentReportsRows" onclick="reportsListDataSource.handleClick(event);"/>
       </grid>
-  
+
       <hbox pack="start">
-        <button label="&recentReports.clear.label;" accesskey="&recentReports.clear.accesskey;" oncommand="reportsListDataSource.clear();"/>
+        <button label="&recentReports.clear.label;" oncommand="reportsListDataSource.clear();"/>
       </hbox>
     </groupbox>
   </deck>
 </wizardpage>
 
-<wizardpage id="updatePage" pageid="update" next="screenshot" onpageshow="subscriptionUpdateDataSource.showPage();" reloadButtonLabel="&reloadButton.label;" reloadButtonAccesskey="&reloadButton.accesskey;">
+<wizardpage id="updatePage" pageid="update" next="screenshot" onpageshow="subscriptionUpdateDataSource.showPage();" reloadButtonLabel="&reloadButton.label;">
   <vbox id="updateInProgress">
     <description>&update.inProgress.description;</description>
     <progressmeter mode="undetermined"/>
   </vbox>
 
   <description id="updateFixedIssue" hidden="true">&update.fixed.description;</description>
 
   <vbox id="outdatedSubscriptions">
@@ -121,17 +120,17 @@
 
     <hbox>
       <button label="&update.start.label;" oncommand="subscriptionUpdateDataSource.updateOutdated();window.close();"/>
       <button label="&issues.openPreferences.label;" oncommand="UI.openFiltersDialog();window.close();"/>
     </hbox>
   </vbox>
 </wizardpage>
 
-<wizardpage id="issuesPage" pageid="issues" next="screenshot" onpageshow="initIssuesPage();" reloadButtonLabel="&reloadButton.label;" reloadButtonAccesskey="&reloadButton.accesskey;">
+<wizardpage id="issuesPage" pageid="issues" next="screenshot" onpageshow="initIssuesPage();" reloadButtonLabel="&reloadButton.label;">
   <description>&issues.description;</description>
 
   <vbox id="issuesBox" flex="1">
     <groupbox id="issuesWhitelistBox" hidden="true">
       <description>&issues.whitelist.description;</description>
       <hbox pack="end">
         <button label="&issues.whitelist.remove.label;" oncommand="issuesDataSource.removeWhitelist();"/>
       </hbox>
@@ -178,65 +177,65 @@
       <hbox id="issuesDisabledFiltersTemplate" align="center" hidden="true">
         <description flex="1" crop="end"/>
         <button label="&issues.disabledfilters.enable.label;" oncommand="issuesDataSource.enableFilter(this.parentNode);"/>
       </hbox>
       <vbox id="issuesDisabledFilters"/>
     </groupbox>
   </vbox>
 
-  <checkbox id="issuesOverride" label="&issues.override.label;" accesskey="&issues.override.accesskey;" oncommand="updateIssuesOverride();"/>
+  <checkbox id="issuesOverride" label="&issues.override.label;" oncommand="updateIssuesOverride();"/>
   <description id="issuesChangeMessage" hidden="true">&issues.change.description;</description>
 </wizardpage>
 
 <wizardpage id="typeWarningPage" pageid="typeWarning" next="screenshot" onpageshow="initTypeWarningPage();">
   <description id="typeWarningText">
     &typeWarning.description;
     <label id="typeWarningTextLink" class="text-link" onclick="UI.loadDocLink('reporter_other_link');"/>
   </description>
 
-  <checkbox id="typeWarningOverride" label="&typeWarning.override.label;" accesskey="&typeWarning.override.accesskey;" oncommand="updateTypeWarningOverride();"/>
+  <checkbox id="typeWarningOverride" label="&typeWarning.override.label;" oncommand="updateTypeWarningOverride();"/>
 </wizardpage>
 
 <wizardpage id="screenshotPage" pageid="screenshot" next="comment" label="&screenshot.heading;" onpageshow="initScreenshotPage();">
   <description>&screenshot.description;</description>
 
-  <checkbox id="screenshotCheckbox" checked="true" label="&screenshot.attach.label;" accesskey="&screenshot.attach.accesskey;" oncommand="screenshotDataSource.enabled = this.checked;"/>
+  <checkbox id="screenshotCheckbox" checked="true" label="&screenshot.attach.label;" oncommand="screenshotDataSource.enabled = this.checked;"/>
   <hbox id="screenshotButtons" pack="end">
-    <button id="screenshotMarkButton" type="radio" group="selectionType" oncommand="screenshotDataSource.selectionType = 'mark';" checked="true" label="&screenshot.mark.label;" accesskey="&screenshot.mark.accesskey;"/>
-    <button id="screenshotRemoveButton" type="radio" group="selectionType" oncommand="screenshotDataSource.selectionType = 'remove';" label="&screenshot.remove.label;" accesskey="&screenshot.remove.accesskey;"/>
-    <button id="screenshotUndoButton" oncommand="screenshotDataSource.undo();" disabled="true" label="&screenshot.undo.label;" accesskey="&screenshot.undo.accesskey;"/>
+    <button id="screenshotMarkButton" type="radio" group="selectionType" oncommand="screenshotDataSource.selectionType = 'mark';" checked="true" label="&screenshot.mark.label;"/>
+    <button id="screenshotRemoveButton" type="radio" group="selectionType" oncommand="screenshotDataSource.selectionType = 'remove';" label="&screenshot.remove.label;"/>
+    <button id="screenshotUndoButton" oncommand="screenshotDataSource.undo();" disabled="true" label="&screenshot.undo.label;"/>
   </hbox>
   <vbox id="screenshotBox" flex="1">
     <canvas xmlns="http://www.w3.org/1999/xhtml" id="screenshotCanvas" onmousedown="screenshotDataSource.startSelection(event);" onmouseup="screenshotDataSource.stopSelection(event);" onmouseout="screenshotDataSource.stopSelection(event);" onmousemove="screenshotDataSource.updateSelection(event);"/>
   </vbox>
 </wizardpage>
 
 <wizardpage id="commentPage" pageid="comment" next="send" label="&commentPage.heading;" onpageshow="initCommentPage();">
   <description>&emailComment.label;</description>
   <hbox class="topLabel" align="baseline">
-    <label id="emailLabel" control="email" value="&email.label;" accesskey="&email.accesskey;"/>
+    <label id="emailLabel" control="email" value="&email.label;"/>
     <textbox id="email" persist="value" flex="1" maxlength="200" oninput="updateEmail();"/>
   </hbox>
-  <checkbox id="anonymousCheckbox" label="&anonymous.label;" accesskey="&anonymous.accesskey;" oncommand="updateEmail();"/>
+  <checkbox id="anonymousCheckbox" label="&anonymous.label;" oncommand="updateEmail();"/>
   <description id="anonymityWarning" visible="false">&anonymity.warning;</description>
 
   <description class="topLabel">&commentPage.description;</description>
-  <label class="topLabel" control="comment" value="&comment.label;" accesskey="&comment.accesskey;"/>
+  <label class="topLabel" control="comment" value="&comment.label;"/>
   <textbox id="comment" multiline="true" flex="1" oninput="updateComment();"/>
   <description id="commentLengthWarning" visible="false">&comment.lengthWarning;</description>
 
-  <checkbox id="extensionsCheckbox" label="&attachExtensions.label;" accesskey="&attachExtensions.accesskey;" oncommand="updateExtensions(this.checked);"/>
+  <checkbox id="extensionsCheckbox" label="&attachExtensions.label;" oncommand="updateExtensions(this.checked);"/>
 
   <deck id="dataDeck" selectedIndex="0" flex="2">
     <vbox pack="start">
       <label class="text-link" value="&showData.label;" onclick="showDataField();"/>
     </vbox>
     <vbox>
-      <label control="data" value="&data.label;" accesskey="&data.accesskey;"/>
+      <label control="data" value="&data.label;"/>
       <textbox id="data" readonly="true" multiline="true" wrap="off" flex="1"/>
     </vbox>
   </deck>
 </wizardpage>
 
 <wizardpage id="sendPage" pageid="send" label="&sendPage.heading;" onpageshow="initSendPage();">
   <description id="sendReportMessage">&sendPage.waitMessage;</description>
 
@@ -248,13 +247,13 @@
   </vbox>
 
   <progressmeter id="sendReportProgress" mode="undetermined"/>
 
   <iframe id="result" type="content" flex="1" hidden="true" onclick="processLinkClick(event);"
           confirmationMessage="&sendPage.confirmation;" knownIssueMessage="&sendPage.knownIssue;"/>
 
   <hbox id="copyLinkBox" pack="end" hidden="true">
-    <button id="copyLink" disabled="true" label="&copyLink.label;" accesskey="&copyLink.accesskey;" oncommand="copyLink(this.getAttribute('url'));"/>
+    <button id="copyLink" disabled="true" label="&copyLink.label;" oncommand="copyLink(this.getAttribute('url'));"/>
   </hbox>
 </wizardpage>
 
 </wizard>