From eddbc6b024d7a1e4cd7043d237a59fec01a2a821 Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 24 Sep 2003 07:34:49 +0000
Subject: [PATCH] try to fix ^M characters in file

git-svn-id: svn://10.0.0.236/trunk@147227 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mail/base/content/mailWindowOverlay.xul | 12 ++++++------
 mozilla/mail/base/locale/messenger.dtd          |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index c14c3c8033b..12047cb1400 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -275,9 +275,9 @@
   <key id="space" key=" " oncommand="SpaceHit(event)"/>
 
   <!-- File Menu -->
-  <key id="key_close"/>
-#ifndef XP_MACOSX
-  <key id="key_renameFolder" keycode="&renameFolder.key;" oncommand="goDoCommand('cmd_renameFolder')"/>
+  <key id="key_close"/>
+#ifndef XP_MACOSX
+  <key id="key_renameFolder" keycode="&renameFolder.key;" oncommand="goDoCommand('cmd_renameFolder')"/>
 #endif
   <key id="key_quit"/>
   <!-- Edit Menu -->
@@ -1044,7 +1044,7 @@
            oncommand="MsgSubscribe();"/>
            <menuseparator/>
           <menuitem id="menu_renameFolder" label="&renameFolder.label;"
-                 accesskey="&renameFolder.accesskey;"
+                 accesskey="&renameFolder.accesskey;"
                  key="key_renameFolder"
                  observes="cmd_renameFolder"/>
           <menuitem id="menu_compactFolder" label="&compactFolders.label;" accesskey="&compactFolder.accesskey;" observes="cmd_compactFolder"/>
@@ -1471,11 +1471,11 @@
             <menuseparator/>
             <menuitem type="checkbox" id="markFlaggedMenuItem" label="&markFlaggedCmd.label;" accesskey="&markFlaggedCmd.accesskey;" observes="cmd_markAsFlagged"/>
             <menuseparator/>
-            <menuitem label="&markAsJunkCmd.label;" 
+            <menuitem label="&markAsJunkCmd.label;" 
                       key="key_markJunk"
                       accesskey="&markAsJunkCmd.accesskey;" 
                       observes="cmd_markAsJunk"/>
-            <menuitem label="&markAsNotJunkCmd.label;"
+            <menuitem label="&markAsNotJunkCmd.label;"
                       key="key_markNotJunk" 
                       accesskey="&markAsNotJunkCmd.accesskey;" 
                       observes="cmd_markAsNotJunk"/>
diff --git a/mozilla/mail/base/locale/messenger.dtd b/mozilla/mail/base/locale/messenger.dtd
index 9eb74cfeacd..891503ce23d 100644
--- a/mozilla/mail/base/locale/messenger.dtd
+++ b/mozilla/mail/base/locale/messenger.dtd
@@ -35,7 +35,7 @@
 <!ENTITY subscribeCmd.label "Subscribe...">
 <!ENTITY subscribeCmd.accesskey "b">
 <!ENTITY renameFolder.label "Rename Folder...">
-<!ENTITY renameFolder.accesskey "R">
+<!ENTITY renameFolder.accesskey "R">
 <!ENTITY renameFolder.key "VK_F2"> 
 <!ENTITY compactFolders.label "Compact Folders">
 <!ENTITY compactFolder.accesskey		"F">