From 4913cd6bdbd4ecd4d2fecf84e3ef066e572d8b74 Mon Sep 17 00:00:00 2001
From: "philringnalda%gmail.com" <philringnalda%gmail.com>
Date: Tue, 15 Jan 2008 03:57:16 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20329441=20=EF=BF=BD=EF=BF=BD=EF=BF=BD=20do?=
 =?UTF-8?q?n't=20reuse=20accesskey=20for=20selecting=20newsgroups=20and=20?=
 =?UTF-8?q?IMAP=20folders=20for=20offline=20use,=20p=3Ddwayne@translate.or?=
 =?UTF-8?q?g.za=20(Dwayne=20Bailey),=20r=3Dme,=20sr=3Dneil?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mail/locales/en-US/chrome/messenger/am-offline.dtd      | 3 ++-
 mailnews/base/prefs/resources/content/am-offline.xul    | 4 ++--
 suite/locales/en-US/chrome/mailnews/pref/am-offline.dtd | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mail/locales/en-US/chrome/messenger/am-offline.dtd b/mail/locales/en-US/chrome/messenger/am-offline.dtd
index 7fb40829a51..802b8a9d4d1 100644
--- a/mail/locales/en-US/chrome/messenger/am-offline.dtd
+++ b/mail/locales/en-US/chrome/messenger/am-offline.dtd
@@ -24,8 +24,9 @@
 <!ENTITY nntpRemoveBody.label "Only message bodies less than">
 <!ENTITY nntpRemoveBody.accesskey "O">
 <!ENTITY offlineSelectNntp.label "Select newsgroups for offline use...">
+<!ENTITY offlineSelectNntp.accesskey "S">
 <!ENTITY offlineSelectImap.label "Select folders for offline use...">
-<!ENTITY offlineSelect.accesskey "S">
+<!ENTITY offlineSelectImap.accesskey "S">
 <!ENTITY offlineDesc.label "You can download your messages locally so that they are available when you are working offline.">
 <!ENTITY makeInboxMsgsAvailable.label "Make the messages in my Inbox available when I am working offline">
 <!ENTITY makeInboxMsgsAvailable.accesskey "b">
diff --git a/mailnews/base/prefs/resources/content/am-offline.xul b/mailnews/base/prefs/resources/content/am-offline.xul
index e38dddc9469..a1b0dbea91f 100644
--- a/mailnews/base/prefs/resources/content/am-offline.xul
+++ b/mailnews/base/prefs/resources/content/am-offline.xul
@@ -76,12 +76,12 @@
     <separator class="thin" hidefor="movemail,pop3,nntp,none"/>
 
     <hbox hidefor="movemail,pop3,nntp,none" align="right">
-        <button label="&offlineSelectImap.label;" accesskey="&offlineSelect.accesskey;"
+        <button label="&offlineSelectImap.label;" accesskey="&offlineSelectImap.accesskey;"
                 oncommand="onClickSelect()" id="selectImapFoldersButton" class="selectForOfflineUseButton"/>
     </hbox>
 
     <hbox hidefor="movemail,pop3,imap,none" align="right">
-        <button label="&offlineSelectNntp.label;" accesskey="&offlineSelect.accesskey;"
+        <button label="&offlineSelectNntp.label;" accesskey="&offlineSelectNntp.accesskey;"
                 oncommand="onClickSelect()" id="selectNewsgroupsButton" class="selectForOfflineUseButton"/>
     </hbox>
 
diff --git a/suite/locales/en-US/chrome/mailnews/pref/am-offline.dtd b/suite/locales/en-US/chrome/mailnews/pref/am-offline.dtd
index 7fb40829a51..802b8a9d4d1 100644
--- a/suite/locales/en-US/chrome/mailnews/pref/am-offline.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/am-offline.dtd
@@ -24,8 +24,9 @@
 <!ENTITY nntpRemoveBody.label "Only message bodies less than">
 <!ENTITY nntpRemoveBody.accesskey "O">
 <!ENTITY offlineSelectNntp.label "Select newsgroups for offline use...">
+<!ENTITY offlineSelectNntp.accesskey "S">
 <!ENTITY offlineSelectImap.label "Select folders for offline use...">
-<!ENTITY offlineSelect.accesskey "S">
+<!ENTITY offlineSelectImap.accesskey "S">
 <!ENTITY offlineDesc.label "You can download your messages locally so that they are available when you are working offline.">
 <!ENTITY makeInboxMsgsAvailable.label "Make the messages in my Inbox available when I am working offline">
 <!ENTITY makeInboxMsgsAvailable.accesskey "b">