bug 246968 - Update changes in kbd shortcuts and add "Paste As Quotation". Patch by Stefan <stefan_h@hem.utfors.se>. r=rlk@trfenv.com

extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml

@@ -78,6 +78,12 @@
     <td>Cmd+Shift+T</td>
     <td>Ctrl+Shift+T</td>
   </tr>
+  <tr>
+    <td>Search Messages</td>
+    <td>Ctrl+Shift+S</td>
+    <td>Cmd+Shift+S</td>
+    <td>Ctrl+Shift+S</td>
+  </tr>
 </tbody>
 </table>
 
@@ -137,116 +143,122 @@
     <td>Alt+A</td>
   </tr>
   <tr>
+    <td>Select Thread</td>
+    <td>Ctrl+Shift+A</td>
+    <td>Cmd+Shift+A</td>
+    <td>Alt+Shift+A</td>
+  </tr>
+  <tr class="even">
     <td>Collapse All Threads</td>
     <td>\ (backslash key)</td>
     <td>\ (backslash key)</td>
     <td>\ (backslash key)</td>
   </tr>
-  <tr class="even">
+  <tr>
     <td>Expand All Threads</td>
     <td>* (asterisk key)</td>
     <td>* (asterisk key)</td>
     <td>* (asterisk key)</td>
   </tr>
-  <tr>
+  <tr class="even">
     <td>Message Source</td>
     <td>Ctrl+U</td>
     <td>Cmd+U</td>
     <td>Ctrl+U</td>
   </tr>
-  <tr class="even">
+  <tr>
     <td>Go to Next Message</td>
     <td>F</td>
     <td>F</td>
     <td>F</td>
   </tr>
-  <tr>
+  <tr class="even">
     <td>Go to Next Unread Message</td>
     <td>N</td>
     <td>N</td>
     <td>N</td>
   </tr>
-  <tr class="even">
+  <tr>
     <td>Go to Next Unread Thread</td>
     <td>T</td>
     <td>T</td>
     <td>T</td>
   </tr>
-  <tr>
+  <tr class="even">
     <td>Go to Previous Message</td>
     <td>B</td>
     <td>B</td>
     <td>B</td>
   </tr>
-  <tr class="even">
+  <tr>
     <td>Go to Previous Unread Message</td>
     <td>P</td>
     <td>P</td>
     <td>P</td>
   </tr>
-  <tr>
+  <tr class="even">
     <td>Reply to Message (replies only to sender)</td>
     <td>Ctrl+R</td>
     <td>Cmd+R</td>
     <td>Ctrl+R</td>
   </tr>
-  <tr class="even">
+  <tr>
    <td>Reply to All in Message (replies to sender and to other email addresses
      in message)</td>
    <td>Ctrl+Shift+R</td>
    <td>Cmd+Shift+R</td>
    <td>Ctrl+Shift+R</td>
   </tr>
-  <tr>
+  <tr class="even">
     <td>Forward Message</td>
     <td>Ctrl+L</td>
     <td>Cmd+L</td>
     <td>Ctrl+L</td>
   </tr>
-  <tr class="even">
+  <tr>
     <td>Edit Message As New (compose new email using the body and attachments
       of the selected message)</td>
     <td>Ctrl+E</td>
     <td>Cmd+E</td>
     <td>Ctrl+E</td>
   </tr>
-  <tr>
+  <tr class="even">
     <td>Mark Message As Read</td>
     <td>M</td>
     <td>M</td>
     <td>M</td>
   </tr>
-  <tr class="even">
+  <tr>
     <td>Mark Message As Read by Date</td>
     <td>C</td>
     <td>C</td>
     <td>C</td>
   </tr>
-  <tr>
+  <tr class="even">
     <td>Mark Thread As Read</td>
     <td>R</td>
     <td>R</td>
     <td>R</td>
   </tr>
-  <tr class="even">
+  <tr>
     <td>Mark Thread As Read and Move to Next Unread Message</td>
     <td>T</td>
     <td>T</td>
     <td>T</td>
   </tr>
-  <tr>
-    <td>Mark All Messages in Selected Folder As Read</td>
-    <td>Ctrl+Shift+C</td>
-    <td>Cmd+Shift+C</td>
-    <td>Ctrl+Shift+C</td>
-  </tr>
   <tr class="even">
+    <td>Mark All Messages in Selected Folder As Read</td>
+    <td>Ctrl+Shift+M</td>
+    <td>Cmd+Shift+M</td>
+    <td>Ctrl+Shift+M</td>
+  </tr>
+  <tr>
     <td>Mark Message As Junk</td>
     <td>J</td>
     <td>J</td>
     <td>J</td>
   </tr>
-  <tr>
+  <tr class="even">
     <td>Mark Message As Not Junk</td>
     <td>Shift+J</td>
     <td>Shift+J</td>
@@ -274,12 +286,18 @@
 </thead>
 <tbody>
   <tr>
+    <td>Paste As Quotation</td>
+    <td>Ctrl+Shift+V</td>
+    <td>Cmd+Shift+V</td>
+    <td>Ctrl+Shift+V</td>
+  </tr>
+  <tr class="even">
     <td>Send Message Now</td>
     <td>Ctrl+Enter</td>
     <td>Cmd+Enter</td>
     <td>Ctrl+Enter</td>
   </tr>
-  <tr class="even">
+  <tr>
     <td>Send Message Later</td>
     <td>Ctrl+Shift+Enter</td>
     <td>Cmd+Shift+Enter</td>

extensions/help/resources/locale/en-US/shortcuts-navigator.xhtml

@@ -44,21 +44,21 @@
 <tbody>
   <tr>
     <td>Open Manage Bookmarks Window </td>
-    <td><kbd>Ctrl</kbd>+<kbd>B</kbd></td>
+    <td>Ctrl+B</td>
     <td>Cmd+B</td>
     <td>Ctrl+B</td>
   </tr>
   <tr class="even">
     <td>Add Page to Bookmarks</td>
-    <td>Ctrl+D</td>
-    <td>Cmd+D</td>
-    <td>Ctrl+D</td>
+    <td>Ctrl+Shift+D</td>
+    <td>Cmd+Shift+D</td>
+    <td></td>
   </tr>
   <tr>
     <td>File Bookmark (to customize and file a page you are bookmarking)</td>
-    <td>Ctrl+Shift+D</td>
-    <td>Cmd+Shift+D</td>
-    <td>Ctrl+Shift+D</td>
+    <td>Ctrl+D</td>
+    <td>Cmd+D</td>
+    <td>Ctrl+D</td>
   </tr>
   <tr class="even">
     <td>Bookmark Properties (for selected bookmark in Manage Bookmarks window)
@@ -162,9 +162,9 @@
   </tr>
   <tr>
     <td>Open search engine page</td>
-    <td>Ctrl+Shift+F</td>
-    <td>Cmd+Shift+F</td>
-    <td>Ctrl+Shift+F</td>
+    <td>Ctrl+Shift+S</td>
+    <td>Cmd+Shift+S</td>
+    <td>Ctrl+Shift+S</td>
   </tr>
   <tr class="even">
     <td>Move to Next Frame (in web pages using frames)</td>