From a94aebf8132f1a09110d439c7c29beeea7e8d057 Mon Sep 17 00:00:00 2001
From: "mnyromyr%tprac.de"
 <mnyromyr%tprac.de@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 8 Nov 2005 20:23:24 +0000
Subject: [PATCH] Bug 313383: Phishing detection needs to be documented;
 p=<stefan_h@hem.utfors.se>, r=iann

git-svn-id: svn://10.0.0.236/trunk@184311 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../locale/en-US/shortcuts-mailnews.xhtml     | 40 +++++++++++++++----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml b/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml
index cac0bac8f41..62902954edd 100644
--- a/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml
+++ b/mozilla/extensions/help/resources/locale/en-US/shortcuts-mailnews.xhtml
@@ -222,6 +222,18 @@
     <td>Cmd+E</td>
     <td>Ctrl+E</td>
   </tr>
+  <tr class="even">
+    <td>Remove Message Label</td>
+    <td>0</td>
+    <td>0</td>
+    <td>0</td>
+  </tr>
+  <tr>
+    <td>Label Message (5 customizable labels)</td>
+    <td>1, 2, 3, 4 and 5</td>
+    <td>1, 2, 3, 4 and 5</td>
+    <td>1, 2, 3, 4 and 5</td>
+  </tr>
   <tr class="even">
     <td>Mark Message As Read</td>
     <td>M</td>
@@ -229,23 +241,23 @@
     <td>M</td>
   </tr>
   <tr>
-    <td>Mark Message As Read by Date</td>
-    <td>C</td>
-    <td>C</td>
-    <td>C</td>
-  </tr>
-  <tr class="even">
     <td>Mark Thread As Read</td>
     <td>R</td>
     <td>R</td>
     <td>R</td>
   </tr>
-  <tr>
+  <tr class="even">
     <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 Messages As Read by Date</td>
+    <td>C</td>
+    <td>C</td>
+    <td>C</td>
+  </tr>
   <tr class="even">
     <td>Mark All Messages in Selected Folder As Read</td>
     <td>Ctrl+Shift+C</td>
@@ -253,17 +265,29 @@
     <td>Ctrl+Shift+M</td>
   </tr>
   <tr>
+    <td>Flag Message</td>
+    <td>I</td>
+    <td>I</td>
+    <td>I</td>
+  </tr>
+  <tr class="even">
     <td>Mark Message As Junk</td>
     <td>J</td>
     <td>J</td>
     <td>J</td>
   </tr>
-  <tr class="even">
+  <tr>
     <td>Mark Message As Not Junk</td>
     <td>Shift+J</td>
     <td>Shift+J</td>
     <td>Shift+J</td>
   </tr>
+  <tr class="even">
+    <td>Mark Message As Not Scam</td>
+    <td>Shift+P</td>
+    <td>Shift+P</td>
+    <td>Shift+P</td>
+  </tr>
 </tbody>
 </table>