From d936a6fb958c77c92ebf6a6e03bb4275a8f1c9ea Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com" <alecf%netscape.com>
Date: Wed, 15 Sep 1999 04:46:26 +0000
Subject: [PATCH] move strings into AccountManager.xul and remove old DTD

---
 .../base/prefs/resources/locale/en-US/AccountManager.dtd   | 3 +++
 mailnews/base/prefs/resources/locale/en-US/MANIFEST        | 1 -
 mailnews/base/prefs/resources/locale/en-US/Makefile.in     | 1 -
 mailnews/base/prefs/resources/locale/en-US/accounttree.dtd | 7 -------
 mailnews/base/prefs/resources/locale/en-US/makefile.win    | 1 -
 .../locales/en-US/chrome/mailnews/pref/AccountManager.dtd  | 3 +++
 6 files changed, 6 insertions(+), 10 deletions(-)
 delete mode 100644 mailnews/base/prefs/resources/locale/en-US/accounttree.dtd

diff --git a/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd b/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd
index c608085a306f..ec4175f11701 100644
--- a/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/AccountManager.dtd
@@ -6,3 +6,6 @@
 <!ENTITY setDefaultButton.label "Set as Default">
 <!ENTITY duplicateButton.label "Duplicate">
 <!ENTITY deleteButton.label "Delete">
+
+<!ENTITY nameCol.label "Name">
+<!ENTITY duplicate.label "Duplicate">
diff --git a/mailnews/base/prefs/resources/locale/en-US/MANIFEST b/mailnews/base/prefs/resources/locale/en-US/MANIFEST
index dd3916e484ee..bb2f53cbe9c8 100644
--- a/mailnews/base/prefs/resources/locale/en-US/MANIFEST
+++ b/mailnews/base/prefs/resources/locale/en-US/MANIFEST
@@ -32,7 +32,6 @@ aw-mailtype.dtd
 aw-server.dtd
 AccountManager.dtd
 AccountWizard.dtd
-accounttree.dtd
 am-advanced.dtd
 am-copies.dtd
 am-main.dtd
diff --git a/mailnews/base/prefs/resources/locale/en-US/Makefile.in b/mailnews/base/prefs/resources/locale/en-US/Makefile.in
index 4425acce1c54..62d2058de134 100644
--- a/mailnews/base/prefs/resources/locale/en-US/Makefile.in
+++ b/mailnews/base/prefs/resources/locale/en-US/Makefile.in
@@ -41,7 +41,6 @@ EXPORT_RESOURCE_SAMPLES = \
 		aw-server.dtd \
 		AccountManager.dtd \
 		AccountWizard.dtd \
-		accounttree.dtd \
 		am-advanced.dtd \
 		am-copies.dtd \
 		am-main.dtd \
diff --git a/mailnews/base/prefs/resources/locale/en-US/accounttree.dtd b/mailnews/base/prefs/resources/locale/en-US/accounttree.dtd
deleted file mode 100644
index 93a9cac37fc7..000000000000
--- a/mailnews/base/prefs/resources/locale/en-US/accounttree.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- extracted from accounttree.xul -->
-
-<!ENTITY nameCol.label "Name">
-<!ENTITY duplicate.label "Duplicate">
-<!ENTITY delete.label "Delete">
-<!ENTITY newAccount.label "New Account">
-<!ENTITY setAsDefault.label "Set As Default">
diff --git a/mailnews/base/prefs/resources/locale/en-US/makefile.win b/mailnews/base/prefs/resources/locale/en-US/makefile.win
index 0235d251db78..12dc3862815a 100644
--- a/mailnews/base/prefs/resources/locale/en-US/makefile.win
+++ b/mailnews/base/prefs/resources/locale/en-US/makefile.win
@@ -38,7 +38,6 @@ install::
 	$(MAKE_INSTALL) aw-server.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) AccountManager.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) AccountWizard.dtd $(DISTBROWSER)
-	$(MAKE_INSTALL) accounttree.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) am-advanced.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) am-copies.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) am-main.dtd $(DISTBROWSER)
diff --git a/suite/locales/en-US/chrome/mailnews/pref/AccountManager.dtd b/suite/locales/en-US/chrome/mailnews/pref/AccountManager.dtd
index c608085a306f..ec4175f11701 100644
--- a/suite/locales/en-US/chrome/mailnews/pref/AccountManager.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/AccountManager.dtd
@@ -6,3 +6,6 @@
 <!ENTITY setDefaultButton.label "Set as Default">
 <!ENTITY duplicateButton.label "Duplicate">
 <!ENTITY deleteButton.label "Delete">
+
+<!ENTITY nameCol.label "Name">
+<!ENTITY duplicate.label "Duplicate">