diff --git a/mozilla/mail/config/installed-chrome.txt b/mozilla/mail/config/installed-chrome.txt index 05721625098..7f10c01f20f 100644 --- a/mozilla/mail/config/installed-chrome.txt +++ b/mozilla/mail/config/installed-chrome.txt @@ -50,16 +50,14 @@ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/communicator/ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/global/ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/global-region/ locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/global-platform/ +locale,install,url,jar:resource:/chrome/en-US-mail.jar!/locale/navigator-platform/ #ifdef XP_WIN locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/communicator-platform/ -locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/navigator-platform/ #else #ifdef XP_OS2 locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/communicator-platform/ -locale,install,url,jar:resource:/chrome/en-win.jar!/locale/en-US/navigator-platform/ #else locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/communicator-platform/ -locale,install,url,jar:resource:/chrome/en-unix.jar!/locale/en-US/navigator-platform/ #endif #endif skin,install,select,classic/1.0 diff --git a/mozilla/mail/installer/windows/langenus.jst b/mozilla/mail/installer/windows/langenus.jst index f663f7fb4f2..5d55241ee80 100644 --- a/mozilla/mail/installer/windows/langenus.jst +++ b/mozilla/mail/installer/windows/langenus.jst @@ -80,7 +80,7 @@ if(verifyDiskSpace(fProgram, srDest)) registerChrome(chromeType, cf, "locale/communicator/"); registerChrome(chromeType, pf, localeName + "communicator-platform/"); registerChrome(chromeType, cf, "locale/navigator/"); - registerChrome(chromeType, pf, localeName + "navigator-platform/"); + registerChrome(chromeType, cf, "locale/navigator-platform/"); err = performInstall(); logComment("performInstall() returned: " + err); diff --git a/mozilla/mail/locales/en-US/chrome/messenger/am-advanced.dtd b/mozilla/mail/locales/en-US/chrome/messenger/am-advanced.dtd new file mode 100644 index 00000000000..96335e8d8e6 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/am-advanced.dtd @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/mozilla/mail/locales/en-US/chrome/messenger/comm4xMailImportMsgs.properties b/mozilla/mail/locales/en-US/chrome/messenger/comm4xMailImportMsgs.properties new file mode 100644 index 00000000000..25ef9002476 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/comm4xMailImportMsgs.properties @@ -0,0 +1,69 @@ +# ***** 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) 2002 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Srilatha Moturi +# +# Alternatively, the contents of this file may be used under the terms of +# either 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 ***** + +# Short name of import module +# LOCALIZATION NOTE : "Communicator 4.x" below is the used for previous versions of Netscape Communicator +# Please translate using the brandname in respective languages for Netscape Communicator 4 releases. +## @name COMM4XMAILIMPORT_NAME +## @loc None +2000=Communicator 4.x + +# Description of import module +# LOCALIZATION NOTE : "Communicator 4.x" below is the used for previous versions of Netscape Communicator +# Please translate using the brandname in respective languages for Netscape Communicator 4 releases. +## @name COMM4XMAILIMPORT_DESCRIPTION +## @loc None +2001=Import Local Mail from Communicator 4.x. + +# Success Message +# LOCALIZATION NOTE : Do not translate the word "%S" below. +## @name COMM4XMAILIMPORT_MAILBOX_SUCCESS +## @loc None +2002=Local messages were successfully imported from %S + +# Error Message +## @name COMM4XMAILIMPORT_MAILBOX_BADPARAM +## @loc None +2003=An internal error occurred. Importing failed. Try importing again. + +# Error message +# LOCALIZATION NOTE : Do not translate the word "%S" below. +## @name COMM4XMAILIMPORT_MAILBOX_CONVERTERROR +## @loc None +2004=An error occurred while importing messages from %S. Messages were not imported. Make more disk space available and try again. + + diff --git a/mozilla/mail/locales/en-US/chrome/messenger/eudoraImportMsgs.properties b/mozilla/mail/locales/en-US/chrome/messenger/eudoraImportMsgs.properties new file mode 100644 index 00000000000..c709a25d49b --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/eudoraImportMsgs.properties @@ -0,0 +1,109 @@ +# The contents of this file are subject to the Netscape Public License +# Version 1.0 (the "NPL"); you may not use this file except in +# compliance with the NPL. You may obtain a copy of the NPL at +# http://www.mozilla.org/NPL/ +# +# Software distributed under the NPL is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL +# for the specific language governing rights and limitations under the +# NPL. +# +# The Initial Developer of this code under the NPL is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All Rights +# Reserved. +# + +# +# The following are used by the outlook express import code to display status/error +# and informational messages +# + +# Short name of import module +## @name EUDORAIMPORT_NAME +## @loc None +2000=Eudora + +# Description of import module +## @name EUDORAIMPORT_DESCRIPTION +## @loc None +2001=Eudora mail and address books + +# Success message +## @name EUDORAIMPORT_MAILBOX_SUCCESS +## @loc None +# LOCALIZATION NOTE (2002): In the following sentence, +# the %S represents a string to be inserted at runtime (the name of the Mailbox), +# and the %d is a number (the number of messages imported). Do not translate %d or %S, but +# instead insert them in your text at the appropriate places. + +2002=Mailbox %S, imported %d messages + +# Error message +## @name EUDORAIMPORT_MAILBOX_BADPARAM +## @loc None + +2003=Bad parameter passed to import mailbox. + +# Error message +## @name EUDORAIMPORT_MAILBOX_BADSOURCEFILE +## @loc None +# LOCALIZATION NOTE (2004): In the following sentence, do not translate the "%S". Instead, +# place it in your sentence where you wish to display the name of the mailbox. + +2004=Error accessing file for mailbox %S. + +# Error message +## @name EUDORAIMPORT_MAILBOX_CONVERTERROR +## @loc None +# LOCALIZATION NOTE (2005): In the following sentence, do not translate the "%S". Instead, +# place it in your sentence where you wish to display the name of the mailbox. + +2005=Error importing mailbox %S, all messages may not be imported from this mailbox. + +# Description +## @name EUDORAIMPORT_ACCOUNTNAME +## @loc None +# LOCALIZATION NOTE (2006): Do not translate "Eudora" below. + +2006=Eudora Settings + +# Description +## @name EUDORAIMPORT_NICKNAMES_NAME +## @loc None +# LOCALIZATION NOTE (2007): Do not translate "Eudora" below. + +2007=Eudora Nicknames + +# Description +## @name EUDORAIMPORT_ADDRESS_SUCCESS +## @loc None +# LOCALIZATION NOTE (2008): In the following sentence, do not translate the "%S". Instead, +# place it in your sentence where you wish to display the name of the address book. + +2008=Imported address book %S + +# Error message +## @name EUDORAIMPORT_ADDRESS_BADPARAM +## @loc None + +2009=Bad parameter passed to import address book. + +# Error message +## @name EUDORAIMPORT_ADDRESS_BADSOURCEFILE +## @loc None +# LOCALIZATION NOTE (2010): In the following sentence, do not translate the "%S". Instead, +# place it in your sentence where you wish to display the name of the address book. + +2010=Error accessing file for address book %S. + +# Error message +## @name EUDORAIMPORT_ADDRESS_CONVERTERROR +## @loc None +# LOCALIZATION NOTE (2011): In the following sentence, do not translate the "%S". Instead, +# place it in your sentence where you wish to display the name of the address book. + +2011=Error importing address book %S, all addresses may not have been imported. + + + diff --git a/mozilla/mail/locales/en-US/chrome/messenger/fieldMapExport.dtd b/mozilla/mail/locales/en-US/chrome/messenger/fieldMapExport.dtd new file mode 100644 index 00000000000..79af44021d2 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/fieldMapExport.dtd @@ -0,0 +1,24 @@ + + + +"> +"> + diff --git a/mozilla/mail/locales/en-US/chrome/messenger/fieldMapImport.dtd b/mozilla/mail/locales/en-US/chrome/messenger/fieldMapImport.dtd new file mode 100644 index 00000000000..475b14d3a3c --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/fieldMapImport.dtd @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + diff --git a/mozilla/mail/locales/en-US/chrome/messenger/importDialog.dtd b/mozilla/mail/locales/en-US/chrome/messenger/importDialog.dtd new file mode 100644 index 00000000000..aa2a3b3b68d --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/importDialog.dtd @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mozilla/mail/locales/en-US/chrome/messenger/importMsgs.properties b/mozilla/mail/locales/en-US/chrome/messenger/importMsgs.properties new file mode 100644 index 00000000000..f669432e846 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/importMsgs.properties @@ -0,0 +1,335 @@ +# 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.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 2001 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +# +# The following are used by the import code to display status/error +# and informational messages +# + +# Success message when no address books are found to import +## @name IMPORT_NO_ADDRBOOKS +## @loc None +2000=No address books were found to import. + +# Error: Address book import not intialized +## @name IMPORT_ERROR_AB_NOTINITIALIZED +## @loc None +2001=Unable to import address books: initialization error. + +# Error: Unable to create the import thread +## @name IMPORT_ERROR_AB_NOTHREAD +## @loc None +2002=Unable to import address books: cannot create import thread. + +# Error: Unable to create the import thread +## @name IMPORT_ERROR_GETABOOK +## @loc None +# LOCALIZATION NOTE (Error 2003): Do not translate the word "%S" below. +2003=Error importing %S: unable to create address book. + +# Success message when no mailboxes are found to import +## @name IMPORT_NO_MAILBOXES +## @loc None +2004=No mailboxes were found to import + +# Error: Mailbox import not intialized +## @name IMPORT_ERROR_MB_NOTINITIALIZED +## @loc None +2005=Unable to import mailboxes, initialization error + +# Error: Unable to create the import thread +## @name IMPORT_ERROR_MB_NOTHREAD +## @loc None +2006=Unable to import mailboxes, cannot create import thread + +# Error: Unable to create the proxy object for importing mailboxes +## @name IMPORT_ERROR_MB_NOPROXY +## @loc None +2007=Unable to import mailboxes, cannot create proxy object for destination mailboxes + +# Error: Error creating destination mailboxes +## @name IMPORT_ERROR_MB_FINDCHILD +## @loc None +# LOCALIZATION NOTE (Error 2008): Do not translate the word "%S" below. +# Place %S in your translation where the name of the mailbox should appear. +2008=Error creating destination mailboxes, cannot find mailbox %S + +# Error: Error creating destination mailboxes +## @name IMPORT_ERROR_MB_CREATE +## @loc None +# LOCALIZATION NOTE (Error 2009): Do not translate the word "%S" below. +# Place %S in your translation where the name of the mailbox should appear. +2009=Error importing mailbox %S, unable to create destination mailbox + +# Error: No destination folder to import mailboxes +## @name IMPORT_ERROR_MB_NODESTFOLDER +## @loc None +2010=Unable to create folder to import mail into + +# Description: Address book field name +## @name IMPORT_FIELD_DESC_START +## @loc None +2100=First Name + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2101=Last Name + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2102=Display Name + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2103=Nickname + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2104=Primary Email + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2105=Secondary Email + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2106=Work Phone + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2107=Home Phone + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2108=Fax Number + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2109=Pager Number + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2110=Mobile Number + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2111=Home Address + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2112=Home Address 2 + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2113=Home City + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2114=Home State + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2115=Home ZipCode + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2116=Home Country + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2117=Work Address + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2118=Work Address 2 + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2119=Work City + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2120=Work State + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2121=Work ZipCode + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2122=Work Country + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2123=Job Title + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2124=Department + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2125=Organization + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2126=Web Page 1 + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2127=Web Page 2 + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2128=Birth Year + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2129=Birth Month + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2130=Birth Day + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2131=Custom 1 + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2132=Custom 2 + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2133=Custom 3 + +# Description: Address book field name +## @name IMPORT_FIELD_DESC +## @loc None +2134=Custom 4 + +# Description: Address book field name +## @name IMPORT_FIELD_DESC_END +## @loc None +2135=Notes + +# Description: Strings for the import dialog +ImportMailDialogTitle=Import Mail +ImportAddressBooksDialogTitle=Import Address Books +ImportSettingsDialogTitle=Import Settings +ImportMailListLabel=Select application to import mail from: +ImportAddressBooksListLabel=Select address book format: +ImportSettingsListLabel=Select application to import settings from: + +#Error strings +ImportAlreadyInProgress=An import operation is currently in progress. Try again when the current import has finished. + +#Error strings for settings import +ImportSettingsBadModule=Unable to load settings module +ImportSettingsNotFound=Unable to find settings. Check to make sure the application is installed on this machine. +ImportSettingsFailed=An error occurred while importing settings. Some, or all, of the settings may not have been imported. +# LOCALIZATION NOTE : Do not translate the word "%S" below. +ImportSettingsSuccess=Settings were imported from %S + +#Error string for mail import +ImportMailBadModule=Unable to load mail import module +ImportMailNotFound=Unable to find mail to import. Check to make sure the mail application is correctly installed on this machine. +# LOCALIZATION NOTE : Do not translate the word "%S" below. +ImportMailFailed=An error occurred importing mail from %S +# LOCALIZATION NOTE : Do not translate the word "%S" below. +ImportMailSuccess=Mail was successfully imported from %S + +# Error string for address import +ImportAddressBadModule=Unable to load address book import module. +ImportAddressNotFound=Unable to find any address books to import. Check to make sure the selected application or format is correctly installed on this machine. +# LOCALIZATION NOTE : Do not translate the word "%S" below. +ImportAddressFailed=An error occurred importing addresses from %S. +# LOCALIZATION NOTE : Do not translate the word "%S" below. +ImportAddressSuccess=Addresses successfully imported from %S. + + +#Progress strings +MailProgressTitle=Importing Mail +AddrProgressTitle=Importing Address Books +# LOCALIZATION NOTE : Do not translate the word "%S" below. +MailProgressMeterText=Converting mailboxes from %S +# LOCALIZATION NOTE : Do not translate the word "%S" below. +AddrProgressMeterText=Converting address books from %S + +#Import file dialog strings +ImportSelectSettings=Select settings file +ImportSelectMailDir=Select mail directory +ImportSelectAddrDir=Select address book directory +ImportSelectAddrFile=Select address book file + +# LOCALIZATION NOTE : "Communicator 4.x" is the used for previous versions of Netscape Communicator +# Please translate using the brandname in respective languages for Netscape Communicator 4 releases. +# LOCALIZATION NOTE : Please do not translate "*.na2", this represents the extension of the address book +# files from the Netscape Communicator 4 releases. +# Comm4.xTo6.xImport user selection string +Comm4xImportName=Communicator 4.x +Comm4xFiles=Communicator Address Book files (*.na2) +HomeButtonDesc=Home +WorkButtonDesc=Work + +# Folder Names for imported Mail +DefaultFolderName=Imported Mail +# LOCALIZATION NOTE: Do not translate the word "%S" below. +ModuleFolderName=%S Mail + +# LOCALIZATION NOTE : "Communicator 4.x" is the used for previous versions of Netscape Communicator +# Please translate using the brandname in respective languages for Netscape Communicator 4 releases. +# strings profile dialog that comes up when importing mail from 4.x +profileTitle=Communicator 4.x profiles +profileText=Choose the profile that contains the Local Mail you want to import: + diff --git a/mozilla/mail/locales/en-US/chrome/messenger/oeImportMsgs.properties b/mozilla/mail/locales/en-US/chrome/messenger/oeImportMsgs.properties new file mode 100644 index 00000000000..3f4b92b2cb9 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/oeImportMsgs.properties @@ -0,0 +1,93 @@ +# 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.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +# +# The following are used by the outlook express import code to display status/error +# and informational messages +# + +# Short name of import module +## @name OEIMPORT_NAME +## @loc None +## LOCALIZATION NOTE (2000): DONT_TRANSLATE +2000=Outlook Express + +# Description of import module +## @name OEIMPORT_DESCRIPTION +## @loc None +## LOCALIZATION NOTE (2001): In this item, don't translate "Outlook Express" +2001=Outlook Express mail and address books + +# Success message +## @name OEIMPORT_MAILBOX_SUCCESS +## @loc None +## LOCALIZATION NOTE (2002): In this item, don't translate "%S" or "%d" +## The variable %S will contain the name of the Mailbox +## The variable %d will contain the number of messages + +2002=Mailbox %S, imported %d messages + +# Error message +## @name OEIMPORT_MAILBOX_BADPARAM +## @loc None +2003=Bad parameter passed to import mailbox. + +# Error message +## @name OEIMPORT_MAILBOX_BADSOURCEFILE +## @loc None +## LOCALIZATION NOTE (2004): In this item, don't translate "%S" +## The variable %S will contain the name of the Mailbox +2004=Error accessing file for mailbox %S. + +# Error message +## @name OEIMPORT_MAILBOX_CONVERTERROR +## @loc None +## LOCALIZATION NOTE (2005): In this item, don't translate "%S" +## The variable %S will contain the name of the Mailbox +2005=Error importing mailbox %S, all messages may not be imported from this mailbox. + +# Default name of imported addressbook +## @name OEIMPORT_DEFAULT_NAME +## @loc None +2006=Outlook Express Address Book + +# Autofind description +## @name OEIMPORT_AUTOFIND +## @loc None +2007=Outlook Express address book (windows address book) + +# Description +## @name OEIMPORT_ADDRESS_SUCCESS +## @loc None +## LOCALIZATION NOTE (2006): In this item, don't translate "%S" +## The variable %S will receive the name of the address book +2008=Imported address book %S + +# Error message +## @name OEIMPORT_ADDRESS_CONVERTERROR +## @loc None +## LOCALIZATION NOTE (2009): In this item, don't translate "%S" +## The variable %S will receive the name of the address book +2009=Error importing address book %S, all addresses may not have been imported. + +# Error message +## @name OEIMPORT_ADDRESS_BADPARAM +## @loc None +2010=Bad parameter passed to import addressbook. diff --git a/mozilla/mail/locales/en-US/chrome/messenger/outlookImportMsgs.properties b/mozilla/mail/locales/en-US/chrome/messenger/outlookImportMsgs.properties new file mode 100644 index 00000000000..665aaeec1c0 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/outlookImportMsgs.properties @@ -0,0 +1,93 @@ +# 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.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +# +# The following are used by the outlook express import code to display status/error +# and informational messages +# + +# Short name of import module +## @name OUTLOOKIMPORT_NAME +## @loc None +## LOCALIZATION NOTE (2000): DONT_TRANSLATE +2000=Outlook + +# Description of import module +## @name OUTLOOKIMPORT_DESCRIPTION +## @loc None +## LOCALIZATION NOTE (2001): In this item, don't translate "Outlook" +2001=Outlook mail and address books + +# Success message +## @name OUTLOOKIMPORT_MAILBOX_SUCCESS +## @loc None +## LOCALIZATION NOTE (2002): In this item, don't translate "%S" or "%d" +## The variable %S will receive the name of the mailbox +## The variable %d will receive the number of messages +2002=Mailbox %S, imported %d messages + +# Error message +## @name OUTLOOKIMPORT_MAILBOX_BADPARAM +## @loc None +2003=Bad parameter passed to import mailbox. + +# Error message +## @name OUTLOOKIMPORT_MAILBOX_CONVERTERROR +## @loc None +## LOCALIZATION NOTE (2004): In this item, don't translate "%S" +## The variable %S will receive the name of the mailbox +2004=Error importing mailbox %S, all messages may not be imported from this mailbox. + +# Address book name +## @name OUTLOOKIMPORT_ADDRNAME +## @loc None +## LOCALIZATION NOTE (2005): In this item, don't translate "Outlook" +2005=Outlook address books + +# Description +## @name OUTLOOKIMPORT_ADDRESS_SUCCESS +## @loc None +## LOCALIZATION NOTE (2006): In this item, don't translate "%S" +## The variable %S will receive the name of the address book +2006=Imported address book %S + +# Error message +## @name OUTLOOKIMPORT_ADDRESS_BADPARAM +## @loc None +2007=Bad parameter passed to import address book. + +# Error message +## @name OUTLOOKIMPORT_ADDRESS_BADSOURCEFILE +## @loc None +## LOCALIZATION NOTE (2008): In this item, don't translate "%S" +## The variable %S will receive the name of the address book +2008=Error accessing file for address book %S. + +# Error message +## @name OUTLOOKIMPORT_ADDRESS_CONVERTERROR +## @loc None +## LOCALIZATION NOTE (2009): In this item, don't translate "%S" +## The variable %S will receive the name of the address book +2009=Error importing address book %S, all addresses may not have been imported. + + + + + diff --git a/mozilla/mail/locales/en-US/chrome/messenger/textImportMsgs.properties b/mozilla/mail/locales/en-US/chrome/messenger/textImportMsgs.properties new file mode 100644 index 00000000000..cba2255679d --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/messenger/textImportMsgs.properties @@ -0,0 +1,58 @@ +# The contents of this file are subject to the Netscape Public License +# Version 1.0 (the "NPL"); you may not use this file except in +# compliance with the NPL. You may obtain a copy of the NPL at +# http://www.mozilla.org/NPL/ +# +# Software distributed under the NPL is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL +# for the specific language governing rights and limitations under the +# NPL. +# +# The Initial Developer of this code under the NPL is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All Rights +# Reserved. +# + +# +# The following are used by the outlook express import code to display status/error +# and informational messages +# + +# Short name of import module +## @name TEXTIMPORT_NAME +## @loc None +2000=Text file (LDIF, .tab, .csv, .txt) + +# Description of import module +## @name TEXTIMPORT_DESCRIPTION +## @loc None +2001=Import an address book from a text file, including: LDIF (.ldif, .ldi), tab-delimited (.tab, .txt) or comma-separated (.csv) formats. + +# Description of import module +## @name TEXTIMPORT_ADDRESS_NAME +## @loc None +2002=Text Address Book + +# Description +## @name TEXTIMPORT_ADDRESS_SUCCESS +## @loc None +2003=Imported address book %S + +# Error message +## @name TEXTIMPORT_ADDRESS_BADPARAM +## @loc None +2004=Bad parameter passed to import address book. + +# Error message +## @name TEXTIMPORT_ADDRESS_BADSOURCEFILE +## @loc None +2005=Error accessing file for address book %S. + +# Error message +## @name TEXTIMPORT_ADDRESS_CONVERTERROR +## @loc None +2006=Error importing address book %S, all addresses may not have been imported. + + + diff --git a/mozilla/mail/locales/en-US/chrome/navigator-platform/mac/navigator.properties b/mozilla/mail/locales/en-US/chrome/navigator-platform/mac/navigator.properties new file mode 100644 index 00000000000..e7613667b45 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/navigator-platform/mac/navigator.properties @@ -0,0 +1,5 @@ +# moved from navigator/locale/navigator.properties +# valid collation options are: or useCodePointOrder +intl.collationOption= +intl.charset.default=ISO-8859-1 + diff --git a/mozilla/mail/locales/en-US/chrome/navigator-platform/mac/platformNavigationBindings.dtd b/mozilla/mail/locales/en-US/chrome/navigator-platform/mac/platformNavigationBindings.dtd new file mode 100644 index 00000000000..7e0a094cc34 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/navigator-platform/mac/platformNavigationBindings.dtd @@ -0,0 +1,7 @@ + + + + + + + diff --git a/mozilla/mail/locales/en-US/chrome/navigator-platform/unix/navigator.properties b/mozilla/mail/locales/en-US/chrome/navigator-platform/unix/navigator.properties new file mode 100644 index 00000000000..e7613667b45 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/navigator-platform/unix/navigator.properties @@ -0,0 +1,5 @@ +# moved from navigator/locale/navigator.properties +# valid collation options are: or useCodePointOrder +intl.collationOption= +intl.charset.default=ISO-8859-1 + diff --git a/mozilla/mail/locales/en-US/chrome/navigator-platform/unix/platformNavigationBindings.dtd b/mozilla/mail/locales/en-US/chrome/navigator-platform/unix/platformNavigationBindings.dtd new file mode 100644 index 00000000000..c115ad88831 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/navigator-platform/unix/platformNavigationBindings.dtd @@ -0,0 +1,6 @@ + + + + + + diff --git a/mozilla/mail/locales/en-US/chrome/navigator-platform/win/navigator.properties b/mozilla/mail/locales/en-US/chrome/navigator-platform/win/navigator.properties new file mode 100644 index 00000000000..e7613667b45 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/navigator-platform/win/navigator.properties @@ -0,0 +1,5 @@ +# moved from navigator/locale/navigator.properties +# valid collation options are: or useCodePointOrder +intl.collationOption= +intl.charset.default=ISO-8859-1 + diff --git a/mozilla/mail/locales/en-US/chrome/navigator-platform/win/platformNavigationBindings.dtd b/mozilla/mail/locales/en-US/chrome/navigator-platform/win/platformNavigationBindings.dtd new file mode 100644 index 00000000000..57a1ed40226 --- /dev/null +++ b/mozilla/mail/locales/en-US/chrome/navigator-platform/win/platformNavigationBindings.dtd @@ -0,0 +1,5 @@ + + + + + diff --git a/mozilla/mail/locales/generic/chrome/navigator-platform/contents.rdf b/mozilla/mail/locales/generic/chrome/navigator-platform/contents.rdf new file mode 100755 index 00000000000..e4eed0f4a55 --- /dev/null +++ b/mozilla/mail/locales/generic/chrome/navigator-platform/contents.rdf @@ -0,0 +1,21 @@ + + +#filter substitution + + + + + + + + + + + + + + + + + diff --git a/mozilla/mail/locales/generic/chrome/navigator-region/contents.rdf b/mozilla/mail/locales/generic/chrome/navigator-region/contents.rdf new file mode 100755 index 00000000000..988cca24b50 --- /dev/null +++ b/mozilla/mail/locales/generic/chrome/navigator-region/contents.rdf @@ -0,0 +1,26 @@ + + +#filter substitution + + + + + + + + + + + + + + + + + + + + diff --git a/mozilla/mail/locales/jar.mn b/mozilla/mail/locales/jar.mn index 40d6d16d6f0..a67505f5428 100644 --- a/mozilla/mail/locales/jar.mn +++ b/mozilla/mail/locales/jar.mn @@ -25,6 +25,7 @@ locale/messenger/pref-viewing_messages.dtd (@AB_CD@/chrome/messenger/pref-viewing_messages.dtd) locale/messenger/AccountManager.dtd (@AB_CD@/chrome/messenger/AccountManager.dtd) locale/messenger/AccountWizard.dtd (@AB_CD@/chrome/messenger/AccountWizard.dtd) + locale/messenger/am-advanced.dtd (@AB_CD@/chrome/messenger/am-advanced.dtd) locale/messenger/am-server-advanced.dtd (@AB_CD@/chrome/messenger/am-server-advanced.dtd) locale/messenger/am-copies.dtd (@AB_CD@/chrome/messenger/am-copies.dtd) locale/messenger/am-offline.dtd (@AB_CD@/chrome/messenger/am-offline.dtd) @@ -85,7 +86,16 @@ locale/messenger/msgViewPickerOverlay.dtd (@AB_CD@/chrome/messenger/msgViewPickerOverlay.dtd) locale/messenger/mailViewSetup.dtd (@AB_CD@/chrome/messenger/mailViewSetup.dtd) locale/messenger/mailViewList.dtd (@AB_CD@/chrome/messenger/mailViewList.dtd) - loclae/messenger/offlineStartup.properties (@AB_CD@/chrome/messenger/offlineStartup.properties) + locale/messenger/offlineStartup.properties (@AB_CD@/chrome/messenger/offlineStartup.properties) + locale/messenger/importMsgs.properties (@AB_CD@/chrome/messenger/importMsgs.properties) + locale/messenger/importDialog.dtd (@AB_CD@/chrome/messenger/importDialog.dtd) + locale/messenger/fieldMapImport.dtd (@AB_CD@/chrome/messenger/fieldMapImport.dtd) + locale/messenger/fieldMapExport.dtd (@AB_CD@/chrome/messenger/fieldMapExport.dtd) + locale/messenger/textImportMsgs.properties (@AB_CD@/chrome/messenger/textImportMsgs.properties) + locale/messenger/commMail4xImportMsgs.properties (@AB_CD@/chrome/messenger/comm4xMailImportMsgs.properties) + locale/messenger/eudoraImportMsgs.properties (@AB_CD@/chrome/messenger/eudoraImportMsgs.properties) + locale/messenger/oeImportMsgs.properties (@AB_CD@/chrome/messenger/oeImportMsgs.properties) + locale/messenger/outlookImportMsgs.properties (@AB_CD@/chrome/messenger/outlookImportMsgs.properties) locale/messenger/addressbook/abMainWindow.dtd (@AB_CD@/chrome/messenger/addressbook/abMainWindow.dtd) locale/messenger/addressbook/abNewCardDialog.dtd (@AB_CD@/chrome/messenger/addressbook/abNewCardDialog.dtd) locale/messenger/addressbook/abContactsPanel.dtd (@AB_CD@/chrome/messenger/addressbook/abContactsPanel.dtd) @@ -162,6 +172,13 @@ locale/communicator/wallet/SignonViewer.dtd (@AB_CD@/chrome/communicator/wallet/SignonViewer.dtd) * locale/navigator/contents.rdf (generic/chrome/navigator/contents.rdf) locale/navigator/navigator.properties (@AB_CD@/chrome/navigator/navigator.properties) + locale/navigator-platform/contents.rdf (generic/chrome/navigator-region/contents.rdf) + locale/navigator-platform/win/platformNavigationBindings.dtd (@AB_CD@/chrome/navigator-platform/win/platformNavigationBindings.dtd) + locale/navigator-platform/win/navigator.properties (@AB_CD@/chrome/navigator-platform/win/navigator.properties) + locale/navigator-platform/mac/platformNavigationBindings.dtd (@AB_CD@/chrome/navigator-platform/mac/platformNavigationBindings.dtd) + locale/navigator-platform/mac/navigator.properties (@AB_CD@/chrome/navigator-platform/mac/navigator.properties) + locale/navigator-platform/unix/platformNavigationBindings.dtd (@AB_CD@/chrome/navigator-platform/unix/platformNavigationBindings.dtd) + locale/navigator-platform/unix/navigator.properties (@AB_CD@/chrome/navigator-platform/unix/navigator.properties) + locale/global/charset.dtd (@AB_CD@/chrome/global/charset.dtd) + locale/global/brand.properties (@AB_CD@/chrome/global/brand.properties) * locale/global/brand.dtd (@AB_CD@/chrome/global/brand.dtd) diff --git a/mozilla/xpfe/browser/jar.mn b/mozilla/xpfe/browser/jar.mn index e17947bdae2..2fd5525b748 100644 --- a/mozilla/xpfe/browser/jar.mn +++ b/mozilla/xpfe/browser/jar.mn @@ -29,6 +29,15 @@ comm.jar: content/navigator/viewPartialSource.xul (resources/content/viewPartialSource.xul) content/navigator/mailNavigatorOverlay.xul (resources/content/mailNavigatorOverlay.xul) content/navigator/searchconfig.properties (resources/content/searchconfig.properties) +#ifdef MOZ_XUL_APP + content/navigator-platform/contents.rdf (resources/content/contents-platform.rdf) + content/navigator-platform/win/platformNavigationBindings.xul (resources/content/win/platformNavigationBindings.xul) + content/navigator-platform/win/platformMailOverlay.xul (resources/content/win/platformMailOverlay.xul) + content/navigator-platform/mac/platformNavigationBindings.xul (resources/content/mac/platformNavigationBindings.xul) + content/navigator-platform/mac/platformMailOverlay.xul (resources/content/mac/platformMailOverlay.xul) + content/navigator-platform/unix/platformNavigationBindings.xul (resources/content/unix/platformNavigationBindings.xul) + content/navigator-platform/unix/platformMailOverlay.xul (resources/content/unix/platformMailOverlay.xul) +#endif #ifndef MOZ_XUL_APP en-US.jar: diff --git a/mozilla/xpfe/browser/resources/content/Makefile.in b/mozilla/xpfe/browser/resources/content/Makefile.in index fc473fe65f3..862aece73d1 100644 --- a/mozilla/xpfe/browser/resources/content/Makefile.in +++ b/mozilla/xpfe/browser/resources/content/Makefile.in @@ -26,6 +26,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +ifndef MOZ_XUL_APP ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) DIRS = win else @@ -35,6 +36,7 @@ else DIRS = unix endif endif +endif # MOZ_XUL_APP include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in b/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in index 2556e7babc1..ae5fc509f51 100644 --- a/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in +++ b/mozilla/xpfe/browser/resources/locale/en-US/Makefile.in @@ -26,7 +26,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +ifndef MOZ_XUL_APP DIRS = mac unix win +endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpfe/global/jar.mn b/mozilla/xpfe/global/jar.mn index 4bfda1abd54..14159bdeced 100644 --- a/mozilla/xpfe/global/jar.mn +++ b/mozilla/xpfe/global/jar.mn @@ -122,6 +122,7 @@ US.jar: locale/US/global-region/region.properties (resources/locale/en-US/region.properties) locale/US/global-region/builtinURLs.rdf (resources/locale/en-US/builtinURLs.rdf) +#ifndef MOZ_XUL_APP en-win.jar: * locale/en-US/global-platform/contents.rdf (resources/locale/en-US/win/contents-platform.rdf) locale/en-US/global-platform/platformDialogOverlay.dtd (resources/locale/en-US/win/platformDialogOverlay.dtd) @@ -140,4 +141,4 @@ en-mac.jar: locale/en-US/global-platform/platformDialogOverlay.dtd (resources/locale/en-US/mac/platformDialogOverlay.dtd) locale/en-US/global-platform/platformKeys.properties (resources/locale/en-US/mac/platformKeys.properties) locale/en-US/global-platform/wizard.properties (resources/locale/en-US/mac/wizard.properties) - +#endif