From 56071f8271c64a98e5c03ff74fd75ab38db54c58 Mon Sep 17 00:00:00 2001
From: "racham%netscape.com"
 <racham%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 31 Mar 2007 22:15:07 +0000
Subject: [PATCH] Fixing bugs 14301, 29745, 46450, 60668 and 63251. Fixes to
 bug 63251 includes introduction os new AccountCentral page. When user selects
 an account in the folder pane of the messenger, AccountCentral page is
 displayed inplace of threadpane and messagepane. This page contains links to
 various account related activities like read, search, compose messages and
 others. Bugs 14301 and 60668 are fixed so that we logon to the default
 account all other accounts that have been asked to login at startup. Fix to
 bug 29745 displays customized email description text on AcctWizard identity
 page. r=sspitzer sr=bienvenu

git-svn-id: svn://10.0.0.236/trunk@223125 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../chrome/mailnews/messenger.properties      |  6 +++
 .../chrome/mailnews/msgAccountCentral.dtd     | 40 +++++++++++++++++++
 .../chrome/mailnews/pref/prefs.properties     |  6 +++
 3 files changed, 52 insertions(+)
 create mode 100644 mozilla/suite/locales/en-US/chrome/mailnews/msgAccountCentral.dtd

diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/messenger.properties b/mozilla/suite/locales/en-US/chrome/mailnews/messenger.properties
index 2806414dc80..7d41dce6faf 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/messenger.properties
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/messenger.properties
@@ -136,6 +136,12 @@ In the future, you can select which messages or folders to read offline. To do \
 this, choose Offline from the file menu and then select Synchronize. You can \n\
 adjust the Disk Space preference to prevent the downloading of large messages.
 
+# accountCentral
+mailnews.account_central_page.url=chrome://messenger/content/msgAccountCentral.xul
+acctCentralTitleFormat=%brandName% %accountType% for %accountName%
+mailAcctType=Mail
+newsAcctType=News
+
 # LOCALIZATION NOTES(nocachedbodytitle): Do not translate "<TITLE>" or "</TITLE>" in the line below
 nocachedbodytitle=<TITLE>Go Online to View This Message</TITLE>\n\
 
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/msgAccountCentral.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/msgAccountCentral.dtd
new file mode 100644
index 00000000000..95d0ed08f62
--- /dev/null
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/msgAccountCentral.dtd
@@ -0,0 +1,40 @@
+<!--
+The contents of this file are subject to the Netscape Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/NPL/
+
+Software distributed under the License is distributed on an "AS
+IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+implied. See the License for the specific language governing
+rights and limitations under the License.
+
+The Original Code is Mozilla Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+--> 
+
+<!ENTITY emailSectionHdr.label        "Email"> 
+<!ENTITY readMsgsLink.label           "Read"> 
+<!ENTITY readMsgsSuffix.label         "my Email messages"> 
+<!ENTITY composeMsgLink.label         "Compose"> 
+<!ENTITY composeMsgSuffix.label       "a new message"> 
+
+<!ENTITY accountsSectionHdr.label     "Accounts"> 
+<!ENTITY settingsPrefix.label         "View"> 
+<!ENTITY settingsLink.label           "Settings"> 
+<!ENTITY settingsSuffix.label         "for this account"> 
+<!ENTITY newAcctPrefix.label          "Create a"> 
+<!ENTITY newAcctLink.label            "new account"> 
+
+<!ENTITY advFeaturesSectionHdr.label  "Advanced Features"> 
+<!ENTITY searchMsgsLink.label         "Search"> 
+<!ENTITY searchMsgsSuffix.label       "my messages"> 
+<!ENTITY filtersPrefix.label          "Create message"> 
+<!ENTITY filtersLink.label            "filters"> 
+
+<!ENTITY spacer.label                 " "> 
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/pref/prefs.properties b/mozilla/suite/locales/en-US/chrome/mailnews/pref/prefs.properties
index dc06276d8be..663dd2ae0f9 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/pref/prefs.properties
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/pref/prefs.properties
@@ -38,6 +38,12 @@ failedDeleteAccount=Failed to delete this account.
 failedDuplicateAccount=Failed to duplicate this account.
 confirmDeleteAccount=Are you sure you want to delete this account?
 
+#Provide default example values for sample email address
+exampleEmailUserName=example
+exampleEmailDomain=netscape.net
+defaultEmailText=Enter your email address. This is the address others will use to send email to you. (For example, "%username%@%domain%".) 
+customizedEmailText=Enter your %emailProvider% %mailIDDesc%. (For example, if your %emailProvider% email address is "%sampleEmail%", your %mailIDDesc% is "%sampleUserName%".) 
+
 # account manager stuff
 prefPanel-server=Server
 prefPanel-copies=Copies and Folders