--- a/mail/extensions/smime/jar.mn
+++ b/mail/extensions/smime/jar.mn
@@ -5,19 +5,19 @@ messenger.jar:
% overlay chrome://messenger/content/messenger.xul chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
% overlay chrome://messenger/content/messageWindow.xul chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
% overlay chrome://messenger/content/am-identity-edit.xul chrome://messenger/content/am-smimeIdentityEditOverlay.xul
* content/messenger-smime/msgReadSMIMEOverlay.xul (content/msgReadSMIMEOverlay.xul)
* content/messenger-smime/msgCompSMIMEOverlay.xul (content/msgCompSMIMEOverlay.xul)
* content/messenger-smime/msgCompSMIMEOverlay.js (content/msgCompSMIMEOverlay.js)
* content/messenger-smime/msgCompSecurityInfo.xul (content/msgCompSecurityInfo.xul)
* content/messenger-smime/msgHdrViewSMIMEOverlay.js (content/msgHdrViewSMIMEOverlay.js)
- content/messenger/am-smime.xul (/mailnews/extensions/smime/resources/content/am-smime.xul)
- content/messenger/am-smime.js (/mailnews/extensions/smime/resources/content/am-smime.js)
- content/messenger/am-smimeIdentityEditOverlay.xul (/mailnews/extensions/smime/resources/content/am-smimeIdentityEditOverlay.xul)
- content/messenger/am-smimeOverlay.xul (/mailnews/extensions/smime/resources/content/am-smimeOverlay.xul)
- content/messenger-smime/msgReadSMIMEOverlay.js (/mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.js)
- content/messenger-smime/msgHdrViewSMIMEOverlay.xul (/mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.xul)
- content/messenger-smime/msgCompSecurityInfo.js (/mailnews/extensions/smime/resources/content/msgCompSecurityInfo.js)
- content/messenger-smime/msgReadSecurityInfo.xul (/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.xul)
- content/messenger-smime/msgReadSecurityInfo.js (/mailnews/extensions/smime/resources/content/msgReadSecurityInfo.js)
- content/messenger-smime/certFetchingStatus.xul (/mailnews/extensions/smime/resources/content/certFetchingStatus.xul)
- content/messenger-smime/certFetchingStatus.js (/mailnews/extensions/smime/resources/content/certFetchingStatus.js)
+ content/messenger/am-smime.xul (/mailnews/extensions/smime/content/am-smime.xul)
+ content/messenger/am-smime.js (/mailnews/extensions/smime/content/am-smime.js)
+ content/messenger/am-smimeIdentityEditOverlay.xul (/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul)
+ content/messenger/am-smimeOverlay.xul (/mailnews/extensions/smime/content/am-smimeOverlay.xul)
+ content/messenger-smime/msgReadSMIMEOverlay.js (/mailnews/extensions/smime/content/msgReadSMIMEOverlay.js)
+ content/messenger-smime/msgHdrViewSMIMEOverlay.xul (/mailnews/extensions/smime/content/msgHdrViewSMIMEOverlay.xul)
+ content/messenger-smime/msgCompSecurityInfo.js (/mailnews/extensions/smime/content/msgCompSecurityInfo.js)
+ content/messenger-smime/msgReadSecurityInfo.xul (/mailnews/extensions/smime/content/msgReadSecurityInfo.xul)
+ content/messenger-smime/msgReadSecurityInfo.js (/mailnews/extensions/smime/content/msgReadSecurityInfo.js)
+ content/messenger-smime/certFetchingStatus.xul (/mailnews/extensions/smime/content/certFetchingStatus.xul)
+ content/messenger-smime/certFetchingStatus.js (/mailnews/extensions/smime/content/certFetchingStatus.js)
rename from mailnews/addrbook/resources/content/abAddressBookNameDialog.js
rename to mailnews/addrbook/content/abAddressBookNameDialog.js
rename from mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
rename to mailnews/addrbook/content/abAddressBookNameDialog.xul
rename from mailnews/addrbook/resources/content/abCardOverlay.xul
rename to mailnews/addrbook/content/abCardOverlay.xul
rename from mailnews/addrbook/resources/content/abCardViewOverlay.xul
rename to mailnews/addrbook/content/abCardViewOverlay.xul
rename from mailnews/addrbook/resources/content/abDirTreeOverlay.xul
rename to mailnews/addrbook/content/abDirTreeOverlay.xul
rename from mailnews/addrbook/resources/content/abDragDrop.js
rename to mailnews/addrbook/content/abDragDrop.js
rename from mailnews/addrbook/resources/content/abEditCardDialog.xul
rename to mailnews/addrbook/content/abEditCardDialog.xul
rename from mailnews/addrbook/resources/content/abListOverlay.xul
rename to mailnews/addrbook/content/abListOverlay.xul
rename from mailnews/addrbook/resources/content/abMailListDialog.js
rename to mailnews/addrbook/content/abMailListDialog.js
rename from mailnews/addrbook/resources/content/abNewCardDialog.xul
rename to mailnews/addrbook/content/abNewCardDialog.xul
rename from mailnews/addrbook/resources/content/abResultsPane.js
rename to mailnews/addrbook/content/abResultsPane.js
rename from mailnews/addrbook/resources/content/abResultsPaneOverlay.xul
rename to mailnews/addrbook/content/abResultsPaneOverlay.xul
rename from mailnews/addrbook/resources/content/abSelectAddressesDialog.js
rename to mailnews/addrbook/content/abSelectAddressesDialog.js
rename from mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
rename to mailnews/addrbook/content/abSelectAddressesDialog.xul
rename from mailnews/addrbook/resources/content/addrbookWidgets.xml
rename to mailnews/addrbook/content/addrbookWidgets.xml
rename from mailnews/addrbook/resources/content/addressbook-panel.js
rename to mailnews/addrbook/content/addressbook-panel.js
rename from mailnews/addrbook/resources/content/addressbook-panel.xul
rename to mailnews/addrbook/content/addressbook-panel.xul
rename from mailnews/addrbook/resources/content/print.css
rename to mailnews/addrbook/content/print.css
rename from mailnews/addrbook/prefs/resources/content/pref-directory-add.js
rename to mailnews/addrbook/prefs/content/pref-directory-add.js
rename from mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
rename to mailnews/addrbook/prefs/content/pref-directory-add.xul
rename from mailnews/addrbook/prefs/resources/content/pref-editdirectories.js
rename to mailnews/addrbook/prefs/content/pref-editdirectories.js
rename from mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
rename to mailnews/addrbook/prefs/content/pref-editdirectories.xul
rename from mailnews/base/resources/content/dateFormat.js
rename to mailnews/base/content/dateFormat.js
rename from mailnews/base/resources/content/folderProps.js
rename to mailnews/base/content/folderProps.js
rename from mailnews/base/resources/content/folderProps.xul
rename to mailnews/base/content/folderProps.xul
rename from mailnews/base/resources/content/folderWidgets.xml
rename to mailnews/base/content/folderWidgets.xml
rename from mailnews/base/resources/content/junkCommands.js
rename to mailnews/base/content/junkCommands.js
rename from mailnews/base/resources/content/junkLog.js
rename to mailnews/base/content/junkLog.js
rename from mailnews/base/resources/content/junkLog.xul
rename to mailnews/base/content/junkLog.xul
rename from mailnews/base/resources/content/junkMailInfo.xul
rename to mailnews/base/content/junkMailInfo.xul
rename from mailnews/base/resources/content/markByDate.js
rename to mailnews/base/content/markByDate.js
rename from mailnews/base/resources/content/markByDate.xul
rename to mailnews/base/content/markByDate.xul
rename from mailnews/base/resources/content/messengerdnd.js
rename to mailnews/base/content/messengerdnd.js
rename from mailnews/base/resources/content/msgAccountCentral.js
rename to mailnews/base/content/msgAccountCentral.js
rename from mailnews/base/resources/content/msgAccountCentral.xul
rename to mailnews/base/content/msgAccountCentral.xul
rename from mailnews/base/resources/content/msgFolderPickerOverlay.js
rename to mailnews/base/content/msgFolderPickerOverlay.js
rename from mailnews/base/resources/content/msgPrintEngine.js
rename to mailnews/base/content/msgPrintEngine.js
rename from mailnews/base/resources/content/msgSynchronize.js
rename to mailnews/base/content/msgSynchronize.js
rename from mailnews/base/resources/content/msgSynchronize.xul
rename to mailnews/base/content/msgSynchronize.xul
rename from mailnews/base/resources/content/newFolderDialog.js
rename to mailnews/base/content/newFolderDialog.js
rename from mailnews/base/resources/content/newFolderDialog.xul
rename to mailnews/base/content/newFolderDialog.xul
rename from mailnews/base/resources/content/renameFolderDialog.js
rename to mailnews/base/content/renameFolderDialog.js
rename from mailnews/base/resources/content/renameFolderDialog.xul
rename to mailnews/base/content/renameFolderDialog.xul
rename from mailnews/base/resources/content/retention.js
rename to mailnews/base/content/retention.js
rename from mailnews/base/resources/content/shareglue.js
rename to mailnews/base/content/shareglue.js
rename from mailnews/base/resources/content/shutdownWindow.js
rename to mailnews/base/content/shutdownWindow.js
rename from mailnews/base/resources/content/shutdownWindow.xul
rename to mailnews/base/content/shutdownWindow.xul
rename from mailnews/base/resources/content/start.xhtml
rename to mailnews/base/content/start.xhtml
rename from mailnews/base/resources/content/virtualFolderListDialog.js
rename to mailnews/base/content/virtualFolderListDialog.js
rename from mailnews/base/resources/content/virtualFolderListDialog.xul
rename to mailnews/base/content/virtualFolderListDialog.xul
rename from mailnews/base/resources/content/virtualFolderProperties.js
rename to mailnews/base/content/virtualFolderProperties.js
rename from mailnews/base/resources/content/virtualFolderProperties.xul
rename to mailnews/base/content/virtualFolderProperties.xul
rename from mailnews/base/prefs/resources/content/AccountManager.js
rename to mailnews/base/prefs/content/AccountManager.js
rename from mailnews/base/prefs/resources/content/AccountManager.xul
rename to mailnews/base/prefs/content/AccountManager.xul
rename from mailnews/base/prefs/resources/content/AccountWizard.js
rename to mailnews/base/prefs/content/AccountWizard.js
rename from mailnews/base/prefs/resources/content/AccountWizard.xul
rename to mailnews/base/prefs/content/AccountWizard.xul
rename from mailnews/base/prefs/resources/content/SmtpServerEdit.js
rename to mailnews/base/prefs/content/SmtpServerEdit.js
rename from mailnews/base/prefs/resources/content/SmtpServerEdit.xul
rename to mailnews/base/prefs/content/SmtpServerEdit.xul
rename from mailnews/base/prefs/resources/content/accountUtils.js
rename to mailnews/base/prefs/content/accountUtils.js
rename from mailnews/base/prefs/resources/content/accountcreation/MyBadCertHandler.js
rename to mailnews/base/prefs/content/accountcreation/MyBadCertHandler.js
rename from mailnews/base/prefs/resources/content/accountcreation/accountConfig.js
rename to mailnews/base/prefs/content/accountcreation/accountConfig.js
rename from mailnews/base/prefs/resources/content/accountcreation/createInBackend.js
rename to mailnews/base/prefs/content/accountcreation/createInBackend.js
rename from mailnews/base/prefs/resources/content/accountcreation/emailWizard.js
rename to mailnews/base/prefs/content/accountcreation/emailWizard.js
rename from mailnews/base/prefs/resources/content/accountcreation/emailWizard.xul
rename to mailnews/base/prefs/content/accountcreation/emailWizard.xul
rename from mailnews/base/prefs/resources/content/accountcreation/fetchConfig.js
rename to mailnews/base/prefs/content/accountcreation/fetchConfig.js
rename from mailnews/base/prefs/resources/content/accountcreation/fetchhttp.js
rename to mailnews/base/prefs/content/accountcreation/fetchhttp.js
rename from mailnews/base/prefs/resources/content/accountcreation/guessConfig.js
rename to mailnews/base/prefs/content/accountcreation/guessConfig.js
rename from mailnews/base/prefs/resources/content/accountcreation/readFromXML.js
rename to mailnews/base/prefs/content/accountcreation/readFromXML.js
rename from mailnews/base/prefs/resources/content/accountcreation/sanitizeDatatypes.js
rename to mailnews/base/prefs/content/accountcreation/sanitizeDatatypes.js
rename from mailnews/base/prefs/resources/content/accountcreation/util.js
rename to mailnews/base/prefs/content/accountcreation/util.js
rename from mailnews/base/prefs/resources/content/accountcreation/verifyConfig.js
rename to mailnews/base/prefs/content/accountcreation/verifyConfig.js
rename from mailnews/base/prefs/resources/content/am-addressing.js
rename to mailnews/base/prefs/content/am-addressing.js
rename from mailnews/base/prefs/resources/content/am-addressing.xul
rename to mailnews/base/prefs/content/am-addressing.xul
rename from mailnews/base/prefs/resources/content/am-addressingOverlay.xul
rename to mailnews/base/prefs/content/am-addressingOverlay.xul
rename from mailnews/base/prefs/resources/content/am-copies.js
rename to mailnews/base/prefs/content/am-copies.js
rename from mailnews/base/prefs/resources/content/am-copies.xul
rename to mailnews/base/prefs/content/am-copies.xul
rename from mailnews/base/prefs/resources/content/am-copiesOverlay.xul
rename to mailnews/base/prefs/content/am-copiesOverlay.xul
rename from mailnews/base/prefs/resources/content/am-help.js
rename to mailnews/base/prefs/content/am-help.js
rename from mailnews/base/prefs/resources/content/am-identities-list.js
rename to mailnews/base/prefs/content/am-identities-list.js
rename from mailnews/base/prefs/resources/content/am-identities-list.xul
rename to mailnews/base/prefs/content/am-identities-list.xul
rename from mailnews/base/prefs/resources/content/am-identity-advanced.js
rename to mailnews/base/prefs/content/am-identity-advanced.js
rename from mailnews/base/prefs/resources/content/am-identity-advanced.xul
rename to mailnews/base/prefs/content/am-identity-advanced.xul
rename from mailnews/base/prefs/resources/content/am-identity-edit.js
rename to mailnews/base/prefs/content/am-identity-edit.js
rename from mailnews/base/prefs/resources/content/am-identity-edit.xul
rename to mailnews/base/prefs/content/am-identity-edit.xul
rename from mailnews/base/prefs/resources/content/am-imap-advanced.js
rename to mailnews/base/prefs/content/am-imap-advanced.js
rename from mailnews/base/prefs/resources/content/am-imap-advanced.xul
rename to mailnews/base/prefs/content/am-imap-advanced.xul
rename from mailnews/base/prefs/resources/content/am-junk.js
rename to mailnews/base/prefs/content/am-junk.js
rename from mailnews/base/prefs/resources/content/am-junk.xul
rename to mailnews/base/prefs/content/am-junk.xul
rename from mailnews/base/prefs/resources/content/am-main.js
rename to mailnews/base/prefs/content/am-main.js
rename from mailnews/base/prefs/resources/content/am-main.xul
rename to mailnews/base/prefs/content/am-main.xul
rename from mailnews/base/prefs/resources/content/am-offline.js
rename to mailnews/base/prefs/content/am-offline.js
rename from mailnews/base/prefs/resources/content/am-offline.xul
rename to mailnews/base/prefs/content/am-offline.xul
rename from mailnews/base/prefs/resources/content/am-prefs.js
rename to mailnews/base/prefs/content/am-prefs.js
rename from mailnews/base/prefs/resources/content/am-server-advanced.js
rename to mailnews/base/prefs/content/am-server-advanced.js
rename from mailnews/base/prefs/resources/content/am-server-advanced.xul
rename to mailnews/base/prefs/content/am-server-advanced.xul
rename from mailnews/base/prefs/resources/content/am-server-top.xul
rename to mailnews/base/prefs/content/am-server-top.xul
rename from mailnews/base/prefs/resources/content/am-server.js
rename to mailnews/base/prefs/content/am-server.js
rename from mailnews/base/prefs/resources/content/am-server.xul
rename to mailnews/base/prefs/content/am-server.xul
rename from mailnews/base/prefs/resources/content/am-serverwithnoidentities.js
rename to mailnews/base/prefs/content/am-serverwithnoidentities.js
rename from mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
rename to mailnews/base/prefs/content/am-serverwithnoidentities.xul
rename from mailnews/base/prefs/resources/content/am-smtp.js
rename to mailnews/base/prefs/content/am-smtp.js
rename from mailnews/base/prefs/resources/content/am-smtp.xul
rename to mailnews/base/prefs/content/am-smtp.xul
rename from mailnews/base/prefs/resources/content/amUtils.js
rename to mailnews/base/prefs/content/amUtils.js
rename from mailnews/base/prefs/resources/content/aw-accname.js
rename to mailnews/base/prefs/content/aw-accname.js
rename from mailnews/base/prefs/resources/content/aw-accounttype.js
rename to mailnews/base/prefs/content/aw-accounttype.js
rename from mailnews/base/prefs/resources/content/aw-done.js
rename to mailnews/base/prefs/content/aw-done.js
rename from mailnews/base/prefs/resources/content/aw-identity.js
rename to mailnews/base/prefs/content/aw-identity.js
rename from mailnews/base/prefs/resources/content/aw-login.js
rename to mailnews/base/prefs/content/aw-login.js
rename from mailnews/base/prefs/resources/content/aw-server.js
rename to mailnews/base/prefs/content/aw-server.js
rename from mailnews/base/prefs/resources/content/ispUtils.js
rename to mailnews/base/prefs/content/ispUtils.js
rename from mailnews/base/prefs/resources/content/smtpEditOverlay.js
rename to mailnews/base/prefs/content/smtpEditOverlay.js
rename from mailnews/base/prefs/resources/content/smtpEditOverlay.xul
rename to mailnews/base/prefs/content/smtpEditOverlay.xul
--- a/mailnews/base/public/nsIMsgIncomingServer.idl
+++ b/mailnews/base/public/nsIMsgIncomingServer.idl
@@ -537,17 +537,17 @@ interface nsIMsgIncomingServer : nsISupp
* Following values for offline support have been used by
* various files. If you are modifying any of the values
* below, please do take care of the following files.
* - mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp
* - mozilla/mailnews/base/util/nsMsgIncomingServer.cpp
* - mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
* - mozilla/mailnews/local/src/nsPop3IncomingServer.cpp
* - mozilla/mailnews/news/src/nsNntpIncomingServer.cpp
- * - mozilla/mailnews/base/resources/content/msgAccountCentral.js
+ * - mozilla/mailnews/base/content/msgAccountCentral.js
* - mozilla/modules/libpref/src/init/mailnews.js
* - ns/modules/libpref/src/init/mailnews-ns.js
* - ns/mailnews/base/ispdata/aol.rdf
* - ns/mailnews/base/ispdata/nswebmail.rdf
*/
#define OFFLINE_SUPPORT_LEVEL_NONE 0
#define OFFLINE_SUPPORT_LEVEL_REGULAR 10
#define OFFLINE_SUPPORT_LEVEL_EXTENDED 20
rename from mailnews/base/search/resources/content/CustomHeaders.js
rename to mailnews/base/search/content/CustomHeaders.js
rename from mailnews/base/search/resources/content/CustomHeaders.xul
rename to mailnews/base/search/content/CustomHeaders.xul
rename from mailnews/base/search/resources/content/FilterEditor.js
rename to mailnews/base/search/content/FilterEditor.js
rename from mailnews/base/search/resources/content/FilterEditor.xul
rename to mailnews/base/search/content/FilterEditor.xul
rename from mailnews/base/search/resources/content/searchTermOverlay.js
rename to mailnews/base/search/content/searchTermOverlay.js
rename from mailnews/base/search/resources/content/searchTermOverlay.xul
rename to mailnews/base/search/content/searchTermOverlay.xul
rename from mailnews/base/search/resources/content/searchWidgets.xml
rename to mailnews/base/search/content/searchWidgets.xml
rename from mailnews/base/search/resources/content/viewLog.js
rename to mailnews/base/search/content/viewLog.js
rename from mailnews/base/search/resources/content/viewLog.xul
rename to mailnews/base/search/content/viewLog.xul
rename from mailnews/compose/resources/content/MsgAttachPage.js
rename to mailnews/compose/content/MsgAttachPage.js
rename from mailnews/compose/resources/content/MsgAttachPage.xul
rename to mailnews/compose/content/MsgAttachPage.xul
rename from mailnews/compose/resources/content/askSendFormat.js
rename to mailnews/compose/content/askSendFormat.js
rename from mailnews/compose/resources/content/askSendFormat.xul
rename to mailnews/compose/content/askSendFormat.xul
rename from mailnews/compose/resources/content/mailComposeEditorOverlay.xul
rename to mailnews/compose/content/mailComposeEditorOverlay.xul
rename from mailnews/compose/resources/content/sendProgress.js
rename to mailnews/compose/content/sendProgress.js
rename from mailnews/compose/resources/content/sendProgress.xul
rename to mailnews/compose/content/sendProgress.xul
--- a/mailnews/extensions/dsn/Makefile.in
+++ b/mailnews/extensions/dsn/Makefile.in
@@ -45,13 +45,13 @@ include $(DEPTH)/config/autoconf.mk
MODULE = msgdsn
EXTRA_COMPONENTS = src/dsn-service.js
include $(topsrcdir)/config/rules.mk
libs::
- $(INSTALL) $(srcdir)/resources/content/dsn.js $(DIST)/bin/defaults/pref
+ $(INSTALL) $(srcdir)/content/dsn.js $(DIST)/bin/defaults/pref
install::
- $(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/dsn.js $(DESTDIR)$(mozappdir)/defaults/pref
+ $(SYSINSTALL) $(IFLAGS1) $(srcdir)/content/dsn.js $(DESTDIR)$(mozappdir)/defaults/pref
rename from mailnews/extensions/dsn/resources/content/am-dsn.js
rename to mailnews/extensions/dsn/content/am-dsn.js
rename from mailnews/extensions/dsn/resources/content/am-dsn.xul
rename to mailnews/extensions/dsn/content/am-dsn.xul
rename from mailnews/extensions/dsn/resources/content/dsn.js
rename to mailnews/extensions/dsn/content/dsn.js
--- a/mailnews/extensions/dsn/jar.mn
+++ b/mailnews/extensions/dsn/jar.mn
@@ -1,5 +1,5 @@
#ifdef MOZ_SUITE
messenger.jar:
- content/messenger/am-dsn.xul (resources/content/am-dsn.xul)
- content/messenger/am-dsn.js (resources/content/am-dsn.js)
+ content/messenger/am-dsn.xul (content/am-dsn.xul)
+ content/messenger/am-dsn.js (content/am-dsn.js)
#endif
--- a/mailnews/extensions/mailviews/Makefile.in
+++ b/mailnews/extensions/mailviews/Makefile.in
@@ -39,15 +39,15 @@ DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = mailview
-PARALLEL_DIRS = public src resources/content
+PARALLEL_DIRS = public src content
ifndef MOZ_STATIC_MAIL_BUILD
DIRS = build
endif
include $(topsrcdir)/config/rules.mk
rename from mailnews/extensions/mailviews/resources/content/Makefile.in
rename to mailnews/extensions/mailviews/content/Makefile.in
--- a/mailnews/extensions/mailviews/resources/content/Makefile.in
+++ b/mailnews/extensions/mailviews/content/Makefile.in
@@ -30,17 +30,17 @@
# use your version of this file under the terms of the MPL, indicate your
# decision by deleting the provisions above and replace them with the notice
# and other provisions required by the GPL or the LGPL. If you do not delete
# the provisions above, a recipient may use your version of this file under
# the terms of any one of the MPL, the GPL or the LGPL.
#
# ***** END LICENSE BLOCK *****
-DEPTH = ../../../../..
+DEPTH = ../../../..
topsrcdir = @top_srcdir@
VPATH = @srcdir@
srcdir = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = mailview
rename from mailnews/extensions/mailviews/resources/content/mailViews.dat
rename to mailnews/extensions/mailviews/content/mailViews.dat
--- a/mailnews/extensions/mdn/Makefile.in
+++ b/mailnews/extensions/mdn/Makefile.in
@@ -48,12 +48,12 @@ DIRS = src
ifndef MOZ_STATIC_MAIL_BUILD
DIRS += build
endif
include $(topsrcdir)/config/rules.mk
libs::
- $(INSTALL) $(srcdir)/resources/content/mdn.js $(DIST)/bin/defaults/pref
+ $(INSTALL) $(srcdir)/content/mdn.js $(DIST)/bin/defaults/pref
install::
- $(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/mdn.js $(DESTDIR)$(mozappdir)/defaults/pref
+ $(SYSINSTALL) $(IFLAGS1) $(srcdir)/content/mdn.js $(DESTDIR)$(mozappdir)/defaults/pref
rename from mailnews/extensions/mdn/resources/content/am-mdn.js
rename to mailnews/extensions/mdn/content/am-mdn.js
rename from mailnews/extensions/mdn/resources/content/am-mdn.xul
rename to mailnews/extensions/mdn/content/am-mdn.xul
rename from mailnews/extensions/mdn/resources/content/mdn.js
rename to mailnews/extensions/mdn/content/mdn.js
--- a/mailnews/extensions/mdn/jar.mn
+++ b/mailnews/extensions/mdn/jar.mn
@@ -1,3 +1,3 @@
messenger.jar:
- content/messenger/am-mdn.xul (resources/content/am-mdn.xul)
- content/messenger/am-mdn.js (resources/content/am-mdn.js)
+ content/messenger/am-mdn.xul (content/am-mdn.xul)
+ content/messenger/am-mdn.js (content/am-mdn.js)
--- a/mailnews/extensions/smime/Makefile.in
+++ b/mailnews/extensions/smime/Makefile.in
@@ -46,12 +46,12 @@ MODULE = msgsmime
PARALLEL_DIRS = public src
DIRS = build
include $(topsrcdir)/config/rules.mk
libs::
- $(INSTALL) $(srcdir)/resources/content/smime.js $(DIST)/bin/defaults/pref
+ $(INSTALL) $(srcdir)/content/smime.js $(DIST)/bin/defaults/pref
install::
- $(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/smime.js $(DESTDIR)$(mozappdir)/defaults/pref
+ $(SYSINSTALL) $(IFLAGS1) $(srcdir)/content/smime.js $(DESTDIR)$(mozappdir)/defaults/pref
rename from mailnews/extensions/smime/resources/content/am-smime.js
rename to mailnews/extensions/smime/content/am-smime.js
rename from mailnews/extensions/smime/resources/content/am-smime.xul
rename to mailnews/extensions/smime/content/am-smime.xul
rename from mailnews/extensions/smime/resources/content/am-smimeIdentityEditOverlay.xul
rename to mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul
rename from mailnews/extensions/smime/resources/content/am-smimeOverlay.xul
rename to mailnews/extensions/smime/content/am-smimeOverlay.xul
rename from mailnews/extensions/smime/resources/content/certFetchingStatus.js
rename to mailnews/extensions/smime/content/certFetchingStatus.js
rename from mailnews/extensions/smime/resources/content/certFetchingStatus.xul
rename to mailnews/extensions/smime/content/certFetchingStatus.xul
rename from mailnews/extensions/smime/resources/content/msgCompSMIMEOverlay.js
rename to mailnews/extensions/smime/content/msgCompSMIMEOverlay.js
rename from mailnews/extensions/smime/resources/content/msgCompSMIMEOverlay.xul
rename to mailnews/extensions/smime/content/msgCompSMIMEOverlay.xul
rename from mailnews/extensions/smime/resources/content/msgCompSecurityInfo.js
rename to mailnews/extensions/smime/content/msgCompSecurityInfo.js
rename from mailnews/extensions/smime/resources/content/msgCompSecurityInfo.xul
rename to mailnews/extensions/smime/content/msgCompSecurityInfo.xul
rename from mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.js
rename to mailnews/extensions/smime/content/msgHdrViewSMIMEOverlay.js
rename from mailnews/extensions/smime/resources/content/msgHdrViewSMIMEOverlay.xul
rename to mailnews/extensions/smime/content/msgHdrViewSMIMEOverlay.xul
rename from mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.js
rename to mailnews/extensions/smime/content/msgReadSMIMEOverlay.js
rename from mailnews/extensions/smime/resources/content/msgReadSMIMEOverlay.xul
rename to mailnews/extensions/smime/content/msgReadSMIMEOverlay.xul
rename from mailnews/extensions/smime/resources/content/msgReadSecurityInfo.js
rename to mailnews/extensions/smime/content/msgReadSecurityInfo.js
rename from mailnews/extensions/smime/resources/content/msgReadSecurityInfo.xul
rename to mailnews/extensions/smime/content/msgReadSecurityInfo.xul
rename from mailnews/extensions/smime/resources/content/smime.js
rename to mailnews/extensions/smime/content/smime.js
--- a/mailnews/extensions/smime/jar.mn
+++ b/mailnews/extensions/smime/jar.mn
@@ -1,24 +1,24 @@
#ifdef MOZ_SUITE
messenger.jar:
% content messenger-smime %content/messenger-smime/
% overlay chrome://messenger/content/messengercompose/messengercompose.xul chrome://messenger-smime/content/msgCompSMIMEOverlay.xul
% overlay chrome://messenger/content/msgHdrViewOverlay.xul chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.xul
% overlay chrome://messenger/content/mailWindowOverlay.xul chrome://messenger-smime/content/msgReadSMIMEOverlay.xul
% overlay chrome://messenger/content/am-identity-edit.xul chrome://messenger/content/am-smimeIdentityEditOverlay.xul
- content/messenger/am-smime.xul (resources/content/am-smime.xul)
- content/messenger/am-smime.js (resources/content/am-smime.js)
- content/messenger/am-smimeIdentityEditOverlay.xul (resources/content/am-smimeIdentityEditOverlay.xul)
- content/messenger/am-smimeOverlay.xul (resources/content/am-smimeOverlay.xul)
- content/messenger-smime/msgCompSMIMEOverlay.js (resources/content/msgCompSMIMEOverlay.js)
- content/messenger-smime/msgCompSMIMEOverlay.xul (resources/content/msgCompSMIMEOverlay.xul)
- content/messenger-smime/msgReadSMIMEOverlay.js (resources/content/msgReadSMIMEOverlay.js)
- content/messenger-smime/msgReadSMIMEOverlay.xul (resources/content/msgReadSMIMEOverlay.xul)
- content/messenger-smime/msgHdrViewSMIMEOverlay.xul (resources/content/msgHdrViewSMIMEOverlay.xul)
- content/messenger-smime/msgHdrViewSMIMEOverlay.js (resources/content/msgHdrViewSMIMEOverlay.js)
- content/messenger-smime/msgCompSecurityInfo.xul (resources/content/msgCompSecurityInfo.xul)
- content/messenger-smime/msgCompSecurityInfo.js (resources/content/msgCompSecurityInfo.js)
- content/messenger-smime/msgReadSecurityInfo.xul (resources/content/msgReadSecurityInfo.xul)
- content/messenger-smime/msgReadSecurityInfo.js (resources/content/msgReadSecurityInfo.js)
- content/messenger-smime/certFetchingStatus.xul (resources/content/certFetchingStatus.xul)
- content/messenger-smime/certFetchingStatus.js (resources/content/certFetchingStatus.js)
+ content/messenger/am-smime.xul (content/am-smime.xul)
+ content/messenger/am-smime.js (content/am-smime.js)
+ content/messenger/am-smimeIdentityEditOverlay.xul (content/am-smimeIdentityEditOverlay.xul)
+ content/messenger/am-smimeOverlay.xul (content/am-smimeOverlay.xul)
+ content/messenger-smime/msgCompSMIMEOverlay.js (content/msgCompSMIMEOverlay.js)
+ content/messenger-smime/msgCompSMIMEOverlay.xul (content/msgCompSMIMEOverlay.xul)
+ content/messenger-smime/msgReadSMIMEOverlay.js (content/msgReadSMIMEOverlay.js)
+ content/messenger-smime/msgReadSMIMEOverlay.xul (content/msgReadSMIMEOverlay.xul)
+ content/messenger-smime/msgHdrViewSMIMEOverlay.xul (content/msgHdrViewSMIMEOverlay.xul)
+ content/messenger-smime/msgHdrViewSMIMEOverlay.js (content/msgHdrViewSMIMEOverlay.js)
+ content/messenger-smime/msgCompSecurityInfo.xul (content/msgCompSecurityInfo.xul)
+ content/messenger-smime/msgCompSecurityInfo.js (content/msgCompSecurityInfo.js)
+ content/messenger-smime/msgReadSecurityInfo.xul (content/msgReadSecurityInfo.xul)
+ content/messenger-smime/msgReadSecurityInfo.js (content/msgReadSecurityInfo.js)
+ content/messenger-smime/certFetchingStatus.xul (content/certFetchingStatus.xul)
+ content/messenger-smime/certFetchingStatus.js (content/certFetchingStatus.js)
#endif
deleted file mode 100644
--- a/mailnews/import/Makefile.win
+++ /dev/null
@@ -1,57 +0,0 @@
-#!gmake
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH=..\..
-
-LocalDirs=public src resources eudora text comm4x
-
-MODULE=import
-
-!if "$(_MSC_VER)" != "" && "$(_MSC_VER)" != "1100"
-DIRS=$(LocalDirs) oexpress outlook
-!else
-DIRS=$(LocalDirs)
-!endif
-
-include <$(DEPTH)\config\rules.mak>
-
-
-install::
-!if "$(_MSC_VER)" == "" || "$(_MSC_VER)" == "1100"
- @echo NOTE: Skipping oexpress and outlook import modules, requires _MSC_VER=1200
-!endif
\ No newline at end of file
rename from mailnews/import/resources/content/fieldMapImport.js
rename to mailnews/import/content/fieldMapImport.js
rename from mailnews/import/resources/content/fieldMapImport.xul
rename to mailnews/import/content/fieldMapImport.xul
rename from mailnews/import/resources/content/import-test.html
rename to mailnews/import/content/import-test.html
rename from mailnews/import/resources/content/importDialog.js
rename to mailnews/import/content/importDialog.js
rename from mailnews/import/resources/content/importDialog.xul
rename to mailnews/import/content/importDialog.xul
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -1,133 +1,133 @@
messenger.jar:
- content/messenger/addressbook/pref-directory-add.js (addrbook/prefs/resources/content/pref-directory-add.js)
- content/messenger/addressbook/pref-directory-add.xul (addrbook/prefs/resources/content/pref-directory-add.xul)
- content/messenger/addressbook/pref-editdirectories.js (addrbook/prefs/resources/content/pref-editdirectories.js)
- content/messenger/addressbook/pref-editdirectories.xul (addrbook/prefs/resources/content/pref-editdirectories.xul)
- content/messenger/addressbook/abAddressBookNameDialog.js (addrbook/resources/content/abAddressBookNameDialog.js)
- content/messenger/addressbook/abAddressBookNameDialog.xul (addrbook/resources/content/abAddressBookNameDialog.xul)
- content/messenger/addressbook/abCardOverlay.xul (addrbook/resources/content/abCardOverlay.xul)
- content/messenger/addressbook/abCardViewOverlay.xul (addrbook/resources/content/abCardViewOverlay.xul)
- content/messenger/addressbook/abDirTreeOverlay.xul (addrbook/resources/content/abDirTreeOverlay.xul)
- content/messenger/addressbook/abEditCardDialog.xul (addrbook/resources/content/abEditCardDialog.xul)
- content/messenger/addressbook/abNewCardDialog.xul (addrbook/resources/content/abNewCardDialog.xul)
- content/messenger/addressbook/abResultsPaneOverlay.xul (addrbook/resources/content/abResultsPaneOverlay.xul)
- content/messenger/addressbook/abResultsPane.js (addrbook/resources/content/abResultsPane.js)
- content/messenger/addressbook/abSelectAddressesDialog.js (addrbook/resources/content/abSelectAddressesDialog.js)
- content/messenger/addressbook/abSelectAddressesDialog.xul (addrbook/resources/content/abSelectAddressesDialog.xul)
- content/messenger/addressbook/addrbookWidgets.xml (addrbook/resources/content/addrbookWidgets.xml)
- content/messenger/addressbook/abDragDrop.js (addrbook/resources/content/abDragDrop.js)
- content/messenger/addressbook/abMailListDialog.js (addrbook/resources/content/abMailListDialog.js)
- content/messenger/addressbook/abListOverlay.xul (addrbook/resources/content/abListOverlay.xul)
- content/messenger/addressbook/addressbook-panel.xul (addrbook/resources/content/addressbook-panel.xul)
- content/messenger/addressbook/addressbook-panel.js (addrbook/resources/content/addressbook-panel.js)
- content/messagebody/addressbook/print.css (addrbook/resources/content/print.css)
-* content/messenger/AccountManager.xul (base/prefs/resources/content/AccountManager.xul)
- content/messenger/AccountManager.js (base/prefs/resources/content/AccountManager.js)
- content/messenger/am-main.xul (base/prefs/resources/content/am-main.xul)
- content/messenger/am-main.js (base/prefs/resources/content/am-main.js)
- content/messenger/am-help.js (base/prefs/resources/content/am-help.js)
- content/messenger/am-server.xul (base/prefs/resources/content/am-server.xul)
- content/messenger/am-serverwithnoidentities.xul (base/prefs/resources/content/am-serverwithnoidentities.xul)
- content/messenger/am-serverwithnoidentities.js (base/prefs/resources/content/am-serverwithnoidentities.js)
- content/messenger/am-server.js (base/prefs/resources/content/am-server.js)
- content/messenger/am-server-top.xul (base/prefs/resources/content/am-server-top.xul)
- content/messenger/am-copies.xul (base/prefs/resources/content/am-copies.xul)
- content/messenger/am-copies.js (base/prefs/resources/content/am-copies.js)
- content/messenger/am-junk.xul (base/prefs/resources/content/am-junk.xul)
- content/messenger/am-junk.js (base/prefs/resources/content/am-junk.js)
- content/messenger/am-offline.xul (base/prefs/resources/content/am-offline.xul)
- content/messenger/am-offline.js (base/prefs/resources/content/am-offline.js)
- content/messenger/am-addressing.xul (base/prefs/resources/content/am-addressing.xul)
-* content/messenger/am-addressingOverlay.xul (base/prefs/resources/content/am-addressingOverlay.xul)
- content/messenger/am-addressing.js (base/prefs/resources/content/am-addressing.js)
- content/messenger/am-server-advanced.xul (base/prefs/resources/content/am-server-advanced.xul)
- content/messenger/am-server-advanced.js (base/prefs/resources/content/am-server-advanced.js)
- content/messenger/am-smtp.xul (base/prefs/resources/content/am-smtp.xul)
- content/messenger/am-smtp.js (base/prefs/resources/content/am-smtp.js)
- content/messenger/am-prefs.js (base/prefs/resources/content/am-prefs.js)
- content/messenger/am-identities-list.js (base/prefs/resources/content/am-identities-list.js)
- content/messenger/am-identities-list.xul (base/prefs/resources/content/am-identities-list.xul)
-* content/messenger/am-identity-edit.js (base/prefs/resources/content/am-identity-edit.js)
- content/messenger/am-identity-edit.xul (base/prefs/resources/content/am-identity-edit.xul)
- content/messenger/am-copiesOverlay.xul (base/prefs/resources/content/am-copiesOverlay.xul)
-* content/messenger/AccountWizard.xul (base/prefs/resources/content/AccountWizard.xul)
- content/messenger/AccountWizard.js (base/prefs/resources/content/AccountWizard.js)
- content/messenger/aw-accounttype.js (base/prefs/resources/content/aw-accounttype.js)
- content/messenger/aw-identity.js (base/prefs/resources/content/aw-identity.js)
- content/messenger/aw-server.js (base/prefs/resources/content/aw-server.js)
- content/messenger/aw-login.js (base/prefs/resources/content/aw-login.js)
- content/messenger/aw-accname.js (base/prefs/resources/content/aw-accname.js)
- content/messenger/aw-done.js (base/prefs/resources/content/aw-done.js)
- content/messenger/accountUtils.js (base/prefs/resources/content/accountUtils.js)
- content/messenger/amUtils.js (base/prefs/resources/content/amUtils.js)
- content/messenger/ispUtils.js (base/prefs/resources/content/ispUtils.js)
- content/messenger/SmtpServerEdit.xul (base/prefs/resources/content/SmtpServerEdit.xul)
- content/messenger/SmtpServerEdit.js (base/prefs/resources/content/SmtpServerEdit.js)
- content/messenger/smtpEditOverlay.xul (base/prefs/resources/content/smtpEditOverlay.xul)
- content/messenger/smtpEditOverlay.js (base/prefs/resources/content/smtpEditOverlay.js)
+ content/messenger/addressbook/pref-directory-add.js (addrbook/prefs/content/pref-directory-add.js)
+ content/messenger/addressbook/pref-directory-add.xul (addrbook/prefs/content/pref-directory-add.xul)
+ content/messenger/addressbook/pref-editdirectories.js (addrbook/prefs/content/pref-editdirectories.js)
+ content/messenger/addressbook/pref-editdirectories.xul (addrbook/prefs/content/pref-editdirectories.xul)
+ content/messenger/addressbook/abAddressBookNameDialog.js (addrbook/content/abAddressBookNameDialog.js)
+ content/messenger/addressbook/abAddressBookNameDialog.xul (addrbook/content/abAddressBookNameDialog.xul)
+ content/messenger/addressbook/abCardOverlay.xul (addrbook/content/abCardOverlay.xul)
+ content/messenger/addressbook/abCardViewOverlay.xul (addrbook/content/abCardViewOverlay.xul)
+ content/messenger/addressbook/abDirTreeOverlay.xul (addrbook/content/abDirTreeOverlay.xul)
+ content/messenger/addressbook/abEditCardDialog.xul (addrbook/content/abEditCardDialog.xul)
+ content/messenger/addressbook/abNewCardDialog.xul (addrbook/content/abNewCardDialog.xul)
+ content/messenger/addressbook/abResultsPaneOverlay.xul (addrbook/content/abResultsPaneOverlay.xul)
+ content/messenger/addressbook/abResultsPane.js (addrbook/content/abResultsPane.js)
+ content/messenger/addressbook/abSelectAddressesDialog.js (addrbook/content/abSelectAddressesDialog.js)
+ content/messenger/addressbook/abSelectAddressesDialog.xul (addrbook/content/abSelectAddressesDialog.xul)
+ content/messenger/addressbook/addrbookWidgets.xml (addrbook/content/addrbookWidgets.xml)
+ content/messenger/addressbook/abDragDrop.js (addrbook/content/abDragDrop.js)
+ content/messenger/addressbook/abMailListDialog.js (addrbook/content/abMailListDialog.js)
+ content/messenger/addressbook/abListOverlay.xul (addrbook/content/abListOverlay.xul)
+ content/messenger/addressbook/addressbook-panel.xul (addrbook/content/addressbook-panel.xul)
+ content/messenger/addressbook/addressbook-panel.js (addrbook/content/addressbook-panel.js)
+ content/messagebody/addressbook/print.css (addrbook/content/print.css)
+* content/messenger/AccountManager.xul (base/prefs/content/AccountManager.xul)
+ content/messenger/AccountManager.js (base/prefs/content/AccountManager.js)
+ content/messenger/am-main.xul (base/prefs/content/am-main.xul)
+ content/messenger/am-main.js (base/prefs/content/am-main.js)
+ content/messenger/am-help.js (base/prefs/content/am-help.js)
+ content/messenger/am-server.xul (base/prefs/content/am-server.xul)
+ content/messenger/am-serverwithnoidentities.xul (base/prefs/content/am-serverwithnoidentities.xul)
+ content/messenger/am-serverwithnoidentities.js (base/prefs/content/am-serverwithnoidentities.js)
+ content/messenger/am-server.js (base/prefs/content/am-server.js)
+ content/messenger/am-server-top.xul (base/prefs/content/am-server-top.xul)
+ content/messenger/am-copies.xul (base/prefs/content/am-copies.xul)
+ content/messenger/am-copies.js (base/prefs/content/am-copies.js)
+ content/messenger/am-junk.xul (base/prefs/content/am-junk.xul)
+ content/messenger/am-junk.js (base/prefs/content/am-junk.js)
+ content/messenger/am-offline.xul (base/prefs/content/am-offline.xul)
+ content/messenger/am-offline.js (base/prefs/content/am-offline.js)
+ content/messenger/am-addressing.xul (base/prefs/content/am-addressing.xul)
+* content/messenger/am-addressingOverlay.xul (base/prefs/content/am-addressingOverlay.xul)
+ content/messenger/am-addressing.js (base/prefs/content/am-addressing.js)
+ content/messenger/am-server-advanced.xul (base/prefs/content/am-server-advanced.xul)
+ content/messenger/am-server-advanced.js (base/prefs/content/am-server-advanced.js)
+ content/messenger/am-smtp.xul (base/prefs/content/am-smtp.xul)
+ content/messenger/am-smtp.js (base/prefs/content/am-smtp.js)
+ content/messenger/am-prefs.js (base/prefs/content/am-prefs.js)
+ content/messenger/am-identities-list.js (base/prefs/content/am-identities-list.js)
+ content/messenger/am-identities-list.xul (base/prefs/content/am-identities-list.xul)
+* content/messenger/am-identity-edit.js (base/prefs/content/am-identity-edit.js)
+ content/messenger/am-identity-edit.xul (base/prefs/content/am-identity-edit.xul)
+ content/messenger/am-copiesOverlay.xul (base/prefs/content/am-copiesOverlay.xul)
+* content/messenger/AccountWizard.xul (base/prefs/content/AccountWizard.xul)
+ content/messenger/AccountWizard.js (base/prefs/content/AccountWizard.js)
+ content/messenger/aw-accounttype.js (base/prefs/content/aw-accounttype.js)
+ content/messenger/aw-identity.js (base/prefs/content/aw-identity.js)
+ content/messenger/aw-server.js (base/prefs/content/aw-server.js)
+ content/messenger/aw-login.js (base/prefs/content/aw-login.js)
+ content/messenger/aw-accname.js (base/prefs/content/aw-accname.js)
+ content/messenger/aw-done.js (base/prefs/content/aw-done.js)
+ content/messenger/accountUtils.js (base/prefs/content/accountUtils.js)
+ content/messenger/amUtils.js (base/prefs/content/amUtils.js)
+ content/messenger/ispUtils.js (base/prefs/content/ispUtils.js)
+ content/messenger/SmtpServerEdit.xul (base/prefs/content/SmtpServerEdit.xul)
+ content/messenger/SmtpServerEdit.js (base/prefs/content/SmtpServerEdit.js)
+ content/messenger/smtpEditOverlay.xul (base/prefs/content/smtpEditOverlay.xul)
+ content/messenger/smtpEditOverlay.js (base/prefs/content/smtpEditOverlay.js)
#ifdef MOZ_THUNDERBIRD
- content/messenger/accountcreation/accountConfig.js (base/prefs/resources/content/accountcreation/accountConfig.js)
- content/messenger/accountcreation/createInBackend.js (base/prefs/resources/content/accountcreation/createInBackend.js)
- content/messenger/accountcreation/emailWizard.js (base/prefs/resources/content/accountcreation/emailWizard.js)
- content/messenger/accountcreation/emailWizard.xul (base/prefs/resources/content/accountcreation/emailWizard.xul)
- content/messenger/accountcreation/fetchConfig.js (base/prefs/resources/content/accountcreation/fetchConfig.js)
- content/messenger/accountcreation/fetchhttp.js (base/prefs/resources/content/accountcreation/fetchhttp.js)
- content/messenger/accountcreation/guessConfig.js (base/prefs/resources/content/accountcreation/guessConfig.js)
- content/messenger/accountcreation/MyBadCertHandler.js (base/prefs/resources/content/accountcreation/MyBadCertHandler.js)
- content/messenger/accountcreation/readFromXML.js (base/prefs/resources/content/accountcreation/readFromXML.js)
- content/messenger/accountcreation/sanitizeDatatypes.js (base/prefs/resources/content/accountcreation/sanitizeDatatypes.js)
- content/messenger/accountcreation/util.js (base/prefs/resources/content/accountcreation/util.js)
- content/messenger/accountcreation/verifyConfig.js (base/prefs/resources/content/accountcreation/verifyConfig.js)
+ content/messenger/accountcreation/accountConfig.js (base/prefs/content/accountcreation/accountConfig.js)
+ content/messenger/accountcreation/createInBackend.js (base/prefs/content/accountcreation/createInBackend.js)
+ content/messenger/accountcreation/emailWizard.js (base/prefs/content/accountcreation/emailWizard.js)
+ content/messenger/accountcreation/emailWizard.xul (base/prefs/content/accountcreation/emailWizard.xul)
+ content/messenger/accountcreation/fetchConfig.js (base/prefs/content/accountcreation/fetchConfig.js)
+ content/messenger/accountcreation/fetchhttp.js (base/prefs/content/accountcreation/fetchhttp.js)
+ content/messenger/accountcreation/guessConfig.js (base/prefs/content/accountcreation/guessConfig.js)
+ content/messenger/accountcreation/MyBadCertHandler.js (base/prefs/content/accountcreation/MyBadCertHandler.js)
+ content/messenger/accountcreation/readFromXML.js (base/prefs/content/accountcreation/readFromXML.js)
+ content/messenger/accountcreation/sanitizeDatatypes.js (base/prefs/content/accountcreation/sanitizeDatatypes.js)
+ content/messenger/accountcreation/util.js (base/prefs/content/accountcreation/util.js)
+ content/messenger/accountcreation/verifyConfig.js (base/prefs/content/accountcreation/verifyConfig.js)
#endif
- content/messenger/msgSynchronize.xul (base/resources/content/msgSynchronize.xul)
- content/messenger/msgSynchronize.js (base/resources/content/msgSynchronize.js)
- content/messenger/folderProps.xul (base/resources/content/folderProps.xul)
- content/messenger/folderProps.js (base/resources/content/folderProps.js)
- content/messenger/folderWidgets.xml (base/resources/content/folderWidgets.xml)
- content/messenger/retention.js (base/resources/content/retention.js)
- content/messenger/shareglue.js (base/resources/content/shareglue.js)
- content/messenger/newFolderDialog.xul (base/resources/content/newFolderDialog.xul)
- content/messenger/newFolderDialog.js (base/resources/content/newFolderDialog.js)
-* content/messenger/msgAccountCentral.xul (base/resources/content/msgAccountCentral.xul)
- content/messenger/msgAccountCentral.js (base/resources/content/msgAccountCentral.js)
- content/messenger/msgFolderPickerOverlay.js (base/resources/content/msgFolderPickerOverlay.js)
- content/messenger/renameFolderDialog.xul (base/resources/content/renameFolderDialog.xul)
- content/messenger/renameFolderDialog.js (base/resources/content/renameFolderDialog.js)
- content/messenger/virtualFolderProperties.xul (base/resources/content/virtualFolderProperties.xul)
- content/messenger/virtualFolderProperties.js (base/resources/content/virtualFolderProperties.js)
- content/messenger/virtualFolderListDialog.xul (base/resources/content/virtualFolderListDialog.xul)
- content/messenger/virtualFolderListDialog.js (base/resources/content/virtualFolderListDialog.js)
- content/messenger/messengerdnd.js (base/resources/content/messengerdnd.js)
- content/messenger/msgPrintEngine.js (base/resources/content/msgPrintEngine.js)
-* content/messenger/junkMailInfo.xul (base/resources/content/junkMailInfo.xul)
- content/messenger/junkCommands.js (base/resources/content/junkCommands.js)
- content/messenger/junkLog.xul (base/resources/content/junkLog.xul)
- content/messenger/junkLog.js (base/resources/content/junkLog.js)
- content/messenger/searchTermOverlay.js (base/search/resources/content/searchTermOverlay.js)
- content/messenger/searchTermOverlay.xul (base/search/resources/content/searchTermOverlay.xul)
- content/messenger/CustomHeaders.xul (base/search/resources/content/CustomHeaders.xul)
- content/messenger/CustomHeaders.js (base/search/resources/content/CustomHeaders.js)
- content/messenger/FilterEditor.xul (base/search/resources/content/FilterEditor.xul)
- content/messenger/FilterEditor.js (base/search/resources/content/FilterEditor.js)
-* content/messenger/searchWidgets.xml (base/search/resources/content/searchWidgets.xml)
- content/messenger/viewLog.xul (base/search/resources/content/viewLog.xul)
- content/messenger/viewLog.js (base/search/resources/content/viewLog.js)
- content/messenger/messengercompose/askSendFormat.js (compose/resources/content/askSendFormat.js)
- content/messenger/messengercompose/askSendFormat.xul (compose/resources/content/askSendFormat.xul)
- content/messenger/messengercompose/sendProgress.xul (compose/resources/content/sendProgress.xul)
- content/messenger/messengercompose/sendProgress.js (compose/resources/content/sendProgress.js)
- content/messenger/messengercompose/MsgAttachPage.xul (compose/resources/content/MsgAttachPage.xul)
- content/messenger/messengercompose/MsgAttachPage.js (compose/resources/content/MsgAttachPage.js)
- content/messenger/messengercompose/mailComposeEditorOverlay.xul (compose/resources/content/mailComposeEditorOverlay.xul)
-* content/messenger/importDialog.js (import/resources/content/importDialog.js)
-* content/messenger/importDialog.xul (import/resources/content/importDialog.xul)
- content/messenger/fieldMapImport.xul (import/resources/content/fieldMapImport.xul)
- content/messenger/fieldMapImport.js (import/resources/content/fieldMapImport.js)
- content/messenger/downloadheaders.js (news/resources/content/downloadheaders.js)
- content/messenger/downloadheaders.xul (news/resources/content/downloadheaders.xul)
- content/messenger/markByDate.js (base/resources/content/markByDate.js)
- content/messenger/markByDate.xul (base/resources/content/markByDate.xul)
- content/messenger/dateFormat.js (base/resources/content/dateFormat.js)
- content/messenger/start.xhtml (base/resources/content/start.xhtml)
- content/messenger/shutdownWindow.xul (base/resources/content/shutdownWindow.xul)
- content/messenger/shutdownWindow.js (base/resources/content/shutdownWindow.js)
+ content/messenger/msgSynchronize.xul (base/content/msgSynchronize.xul)
+ content/messenger/msgSynchronize.js (base/content/msgSynchronize.js)
+ content/messenger/folderProps.xul (base/content/folderProps.xul)
+ content/messenger/folderProps.js (base/content/folderProps.js)
+ content/messenger/folderWidgets.xml (base/content/folderWidgets.xml)
+ content/messenger/retention.js (base/content/retention.js)
+ content/messenger/shareglue.js (base/content/shareglue.js)
+ content/messenger/newFolderDialog.xul (base/content/newFolderDialog.xul)
+ content/messenger/newFolderDialog.js (base/content/newFolderDialog.js)
+* content/messenger/msgAccountCentral.xul (base/content/msgAccountCentral.xul)
+ content/messenger/msgAccountCentral.js (base/content/msgAccountCentral.js)
+ content/messenger/msgFolderPickerOverlay.js (base/content/msgFolderPickerOverlay.js)
+ content/messenger/renameFolderDialog.xul (base/content/renameFolderDialog.xul)
+ content/messenger/renameFolderDialog.js (base/content/renameFolderDialog.js)
+ content/messenger/virtualFolderProperties.xul (base/content/virtualFolderProperties.xul)
+ content/messenger/virtualFolderProperties.js (base/content/virtualFolderProperties.js)
+ content/messenger/virtualFolderListDialog.xul (base/content/virtualFolderListDialog.xul)
+ content/messenger/virtualFolderListDialog.js (base/content/virtualFolderListDialog.js)
+ content/messenger/messengerdnd.js (base/content/messengerdnd.js)
+ content/messenger/msgPrintEngine.js (base/content/msgPrintEngine.js)
+* content/messenger/junkMailInfo.xul (base/content/junkMailInfo.xul)
+ content/messenger/junkCommands.js (base/content/junkCommands.js)
+ content/messenger/junkLog.xul (base/content/junkLog.xul)
+ content/messenger/junkLog.js (base/content/junkLog.js)
+ content/messenger/searchTermOverlay.js (base/search/content/searchTermOverlay.js)
+ content/messenger/searchTermOverlay.xul (base/search/content/searchTermOverlay.xul)
+ content/messenger/CustomHeaders.xul (base/search/content/CustomHeaders.xul)
+ content/messenger/CustomHeaders.js (base/search/content/CustomHeaders.js)
+ content/messenger/FilterEditor.xul (base/search/content/FilterEditor.xul)
+ content/messenger/FilterEditor.js (base/search/content/FilterEditor.js)
+* content/messenger/searchWidgets.xml (base/search/content/searchWidgets.xml)
+ content/messenger/viewLog.xul (base/search/content/viewLog.xul)
+ content/messenger/viewLog.js (base/search/content/viewLog.js)
+ content/messenger/messengercompose/askSendFormat.js (compose/content/askSendFormat.js)
+ content/messenger/messengercompose/askSendFormat.xul (compose/content/askSendFormat.xul)
+ content/messenger/messengercompose/sendProgress.xul (compose/content/sendProgress.xul)
+ content/messenger/messengercompose/sendProgress.js (compose/content/sendProgress.js)
+ content/messenger/messengercompose/MsgAttachPage.xul (compose/content/MsgAttachPage.xul)
+ content/messenger/messengercompose/MsgAttachPage.js (compose/content/MsgAttachPage.js)
+ content/messenger/messengercompose/mailComposeEditorOverlay.xul (compose/content/mailComposeEditorOverlay.xul)
+* content/messenger/importDialog.js (import/content/importDialog.js)
+* content/messenger/importDialog.xul (import/content/importDialog.xul)
+ content/messenger/fieldMapImport.xul (import/content/fieldMapImport.xul)
+ content/messenger/fieldMapImport.js (import/content/fieldMapImport.js)
+ content/messenger/downloadheaders.js (news/content/downloadheaders.js)
+ content/messenger/downloadheaders.xul (news/content/downloadheaders.xul)
+ content/messenger/markByDate.js (base/content/markByDate.js)
+ content/messenger/markByDate.xul (base/content/markByDate.xul)
+ content/messenger/dateFormat.js (base/content/dateFormat.js)
+ content/messenger/start.xhtml (base/content/start.xhtml)
+ content/messenger/shutdownWindow.xul (base/content/shutdownWindow.xul)
+ content/messenger/shutdownWindow.js (base/content/shutdownWindow.js)
--- a/mailnews/makefiles.sh
+++ b/mailnews/makefiles.sh
@@ -71,17 +71,17 @@ mailnews/db/msgdb/test/Makefile
mailnews/extensions/Makefile
mailnews/extensions/bayesian-spam-filter/Makefile
mailnews/extensions/bayesian-spam-filter/build/Makefile
mailnews/extensions/bayesian-spam-filter/src/Makefile
mailnews/extensions/bayesian-spam-filter/test/Makefile
mailnews/extensions/mailviews/Makefile
mailnews/extensions/mailviews/build/Makefile
mailnews/extensions/mailviews/public/Makefile
-mailnews/extensions/mailviews/resources/content/Makefile
+mailnews/extensions/mailviews/content/Makefile
mailnews/extensions/mailviews/src/Makefile
mailnews/extensions/mdn/Makefile
mailnews/extensions/mdn/build/Makefile
mailnews/extensions/mdn/src/Makefile
mailnews/extensions/newsblog/Makefile
mailnews/extensions/offline-startup/Makefile
mailnews/extensions/smime/Makefile
mailnews/extensions/smime/build/Makefile
deleted file mode 100644
--- a/mailnews/mime/cthandlers/resources/smime.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# The following are used by the smime content type handler
-#
-
-## @name NS_MSG_UNABLE_TO_OPEN_FILE
-## LOCALIZATION NOTE: the text can contain HTML tags.
-1000=This is an <B>ENCRYPTED</B> or <B>SIGNED</B> message.<br> This Mail application does not support encrypted or signed mail.
-
-
deleted file mode 100644
--- a/mailnews/mime/cthandlers/resources/vcard.properties
+++ /dev/null
@@ -1,355 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla 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/MPL/
-#
-# 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.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# The following are used by the vcard content type handler to
-# to emit header display in HTML
-#
-
-# Out of memory
-## @name VCARD_OUT_OF_MEMORY
-## @loc None
--1000=Application is out of memory.
-
-# VCARD_LDAP_REGION
-## @name VCARD_LDAP_REGION
-## @loc None
-1001=State
-
-# VCARD_LDAP_DOM_TYPE
-## @name VCARD_LDAP_DOM_TYPE
-## @loc None
-1002=Domestic
-
-# VCARD_LDAP_INTL_TYPE
-## @name VCARD_LDAP_INTL_TYPE
-## @loc None
-1003=International
-
-# VCARD_LDAP_POSTAL_TYPE
-## @name VCARD_LDAP_POSTAL_TYPE
-## @loc None
-1004=Postal
-
-# VCARD_LDAP_PARCEL_TYPE
-## @name VCARD_LDAP_PARCEL_TYPE
-## @loc None
-1005=Parcel
-
-# VCARD_LDAP_WORK_TYPE
-## @name VCARD_LDAP_WORK_TYPE
-## @loc None
-1006=Work
-
-# VCARD_LDAP_HOME_TYPE
-## @name VCARD_LDAP_HOME_TYPE
-## @loc None
-1007=Home
-
-# VCARD_LDAP_PREF_TYPE
-## @name VCARD_LDAP_PREF_TYPE
-## @loc None
-1008=Preferred
-
-# VCARD_LDAP_VOICE_TYPE
-## @name VCARD_LDAP_VOICE_TYPE
-## @loc None
-1009=Voice
-
-# VCARD_LDAP_FAX_TYPE
-## @name VCARD_LDAP_FAX_TYPE
-## @loc None
-1010=Fax
-
-# VCARD_LDAP_MSG_TYPE
-## @name VCARD_LDAP_MSG_TYPE
-## @loc None
-1011=Message
-
-# VCARD_LDAP_CELL_TYPE
-## @name VCARD_LDAP_CELL_TYPE
-## @loc None
-1012=Mobile
-
-# VCARD_LDAP_PAGER_TYPE
-## @name VCARD_LDAP_PAGER_TYPE
-## @loc None
-1013=Pager
-
-# VCARD_LDAP_BBS_TYPE
-## @name VCARD_LDAP_BBS_TYPE
-## @loc None
-1014=BBS
-
-# VCARD_LDAP_MODEM_TYPE
-## @name VCARD_LDAP_MODEM_TYPE
-## @loc None
-1015=Modem
-
-# VCARD_LDAP_CAR_TYPE
-## @name VCARD_LDAP_CAR_TYPE
-## @loc None
-1016=Car
-
-# VCARD_LDAP_ISDN_TYPE
-## @name VCARD_LDAP_ISDN_TYPE
-## @loc None
-1017=ISDN
-
-# VCARD_LDAP_VIDEO_TYPE
-## @name VCARD_LDAP_VIDEO_TYPE
-## @loc None
-1018=Video
-
-# VCARD_LDAP_AOL_TYPE
-## @name VCARD_LDAP_AOL_TYPE
-## @loc None
-1019=AOL
-
-# VCARD_LDAP_APPLELINK_TYPE
-## @name VCARD_LDAP_APPLELINK_TYPE
-## @loc None
-1020=Applelink
-
-# VCARD_LDAP_ATTMAIL_TYPE
-## @name VCARD_LDAP_ATTMAIL_TYPE
-## @loc None
-1021=AT&T Mail
-
-# VCARD_LDAP_CSI_TYPE
-## @name VCARD_LDAP_CSI_TYPE
-## @loc None
-1022=Compuserve
-
-# VCARD_LDAP_EWORLD_TYPE
-## @name VCARD_LDAP_EWORLD_TYPE
-## @loc None
-1023=eWorld
-
-# VCARD_LDAP_INTERNET_TYPE
-## @name VCARD_LDAP_INTERNET_TYPE
-## @loc None
-1024=Internet
-
-# VCARD_LDAP_IBMMAIL_TYPE
-## @name VCARD_LDAP_IBMMAIL_TYPE
-## @loc None
-1025=IBM Mail
-
-# VCARD_LDAP_MCIMAIL_TYPE
-## @name VCARD_LDAP_MCIMAIL_TYPE
-## @loc None
-1026=MCI Mail
-
-# VCARD_LDAP_POWERSHARE_TYPE
-## @name VCARD_LDAP_POWERSHARE_TYPE
-## @loc None
-1027=Powershare
-
-# VCARD_LDAP_PRODIGY_TYPE
-## @name VCARD_LDAP_PRODIGY_TYPE
-## @loc None
-1028=Prodigy
-
-# VCARD_LDAP_TLX_TYPE
-## @name VCARD_LDAP_TLX_TYPE
-## @loc None
-1029=Telex
-
-# VCARD_LDAP_MIDDLE_NAME
-## @name VCARD_LDAP_MIDDLE_NAME
-## @loc None
-1030=Additional Name
-
-# VCARD_LDAP_NAME_PREFIX
-## @name VCARD_LDAP_NAME_PREFIX
-## @loc None
-1031=Prefix
-
-# VCARD_LDAP_NAME_SUFFIX
-## @name VCARD_LDAP_NAME_SUFFIX
-## @loc None
-1032=Suffix
-
-# VCARD_LDAP_TZ
-## @name VCARD_LDAP_TZ
-## @loc None
-1033=Time Zone
-
-# VCARD_LDAP_GEO
-## @name VCARD_LDAP_GEO
-## @loc None
-1034=Geographic Position
-
-# VCARD_LDAP_SOUND
-## @name VCARD_LDAP_SOUND
-## @loc None
-1035=Sound
-
-# VCARD_LDAP_REVISION
-## @name VCARD_LDAP_REVISION
-## @loc None
-1036=Revision
-
-# VCARD_LDAP_VERSION
-## @name VCARD_LDAP_VERSION
-## @loc None
-1037=Version
-
-# VCARD_LDAP_KEY
-## @name VCARD_LDAP_KEY
-## @loc None
-1038=Public Key
-
-# VCARD_LDAP_LOGO
-## @name VCARD_LDAP_LOGO
-## @loc None
-1039=Logo
-
-# VCARD_LDAP_BIRTHDAY
-## @name VCARD_LDAP_BIRTHDAY
-## @loc None
-1040=Birthday
-
-# VCARD_LDAP_X400
-## @name VCARD_LDAP_X400
-## @loc None
-1041=X400
-
-# VCARD_LDAP_ADDRESS
-## @name VCARD_LDAP_ADDRESS
-## @loc None
-1042=Address
-
-# VCARD_LDAP_LABEL
-## @name VCARD_LDAP_LABEL
-## @loc None
-1043=Label
-
-# VCARD_LDAP_MAILER
-## @name VCARD_LDAP_MAILER
-## @loc None
-1044=Mailer
-
-# VCARD_LDAP_ROLE
-## @name VCARD_LDAP_ROLE
-## @loc None
-1045=Role
-
-# VCARD_LDAP_UPDATEURL
-## @name VCARD_LDAP_UPDATEURL
-## @loc None
-1046=Update From
-
-# VCARD_LDAP_COOLTALKADDRESS
-## @name VCARD_LDAP_COOLTALKADDRESS
-## @loc None
-1047=Conference Address
-
-# VCARD_LDAP_USEHTML
-## @name VCARD_LDAP_USEHTML
-## @loc None
-1048=HTML Mail
-
-# VCARD_MSG_ADD_TO_ADDR_BOOK
-## @name VCARD_MSG_ADD_TO_ADDR_BOOK
-## @loc None
-1049=Add to Personal Address Book
-
-# VCARD_ADDR_ADDINFO
-## @name VCARD_ADDR_ADDINFO
-## @loc None
-1050=Additional Information:
-
-# VCARD_ADDR_VIEW_COMPLETE_VCARD
-## @name VCARD_ADDR_VIEW_COMPLETE_VCARD
-## @loc None
-1051=View Complete Card
-
-# VCARD_ADDR_VIEW_CONDENSED_VCARD
-## @name VCARD_ADDR_VIEW_CONDENSED_VCARD
-## @loc None
-1052=View Condensed Card
-
-# VCARD_ADDR_CONFINFO
-## @name VCARD_ADDR_CONFINFO
-## @loc None
-1053=Conference Address
-
-# VCARD_ADDR_DEFAULT_DLS
-## @name VCARD_ADDR_DEFAULT_DLS
-## @loc None
-1054=Default Directory Server
-
-# VCARD_ADDR_SPECIFIC_DLS
-## @name VCARD_ADDR_SPECIFIC_DLS
-## @loc None
-1055=Specific Directory Server
-
-# VCARD_ADDR_HOSTNAMEIP
-## @name VCARD_ADDR_HOSTNAMEIP
-## @loc None
-1056=Hostname or IP Address
-
-# VCARD_LDAP_PHONE_NUMBER
-## @name VCARD_LDAP_PHONE_NUMBER
-## @loc None
-1057=Phone Number
-
-# VCARD_LDAP_PHOTOGRAPH
-## @name VCARD_LDAP_PHOTOGRAPH
-## @loc None
-1058=Photograph
-
-# VCARD_LDAP_EMAIL_ADDRESS
-## @name VCARD_LDAP_EMAIL_ADDRESS
-## @loc None
-1059=Email
-
-# VCARD_LDAP_SURNAME
-## @name VCARD_LDAP_SURNAME
-## @loc None
-1060=Last Name
-
-# VCARD_LDAP_GIVEN_NAME
-## @name VCARD_LDAP_GIVEN_NAME
-## @loc None
-1061=First Name
-
-# VCARD_LDAP_SECRETARY
-## @name VCARD_LDAP_SECRETARY
-## @loc None
-1062=Administrative Assistant
rename from mailnews/news/resources/content/downloadheaders.js
rename to mailnews/news/content/downloadheaders.js
rename from mailnews/news/resources/content/downloadheaders.xul
rename to mailnews/news/content/downloadheaders.xul
