From ad657e7507b6dd00d15044570751cca1452a6d77 Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Fri, 13 May 2005 19:54:01 +0000 Subject: [PATCH] Bug 286108 - build Thunderbird locales from CVS: repackaging and installer changes to match the Firefox packaging process r=gandalf+mscott a=asa --- mail/app/Makefile.in | 3 - mail/installer/windows/Makefile.in | 51 +++- .../windows/{langenus.jst => ab-CD.jst} | 12 +- mail/installer/windows/basemail-win | 22 +- mail/installer/windows/config.it | 263 ++++++------------ mail/installer/windows/deflenus.jst | 42 --- mail/installer/windows/install.it | 140 +--------- mail/installer/windows/installer.cfg | 11 +- mail/locales/Makefile.in | 128 ++++++++- mail/{app => locales/en-US}/README.txt | 0 mail/locales/en-US/all-l10n.js | 39 +++ mail/locales/en-US/defines.inc | 10 + mail/locales/en-US/installer/installer.inc | 84 ++++++ mail/locales/generic/install.rdf | 60 ++++ 14 files changed, 470 insertions(+), 395 deletions(-) rename mail/installer/windows/{langenus.jst => ab-CD.jst} (71%) mode change 100644 => 100755 delete mode 100644 mail/installer/windows/deflenus.jst rename mail/{app => locales/en-US}/README.txt (100%) create mode 100755 mail/locales/en-US/all-l10n.js create mode 100755 mail/locales/en-US/defines.inc create mode 100755 mail/locales/en-US/installer/installer.inc create mode 100755 mail/locales/generic/install.rdf diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in index 978f4ef4ea52..e021671f516f 100644 --- a/mail/app/Makefile.in +++ b/mail/app/Makefile.in @@ -298,10 +298,7 @@ clean clobber:: rm -rf $(DIST)/$(APP_NAME).app endif -README_FILE = $(srcdir)/README.txt - libs:: - $(INSTALL) $(README_FILE) $(DIST)/bin $(INSTALL) $(topsrcdir)/mail/LICENSE.txt $(DIST)/bin libs:: $(srcdir)/profile/prefs.js diff --git a/mail/installer/windows/Makefile.in b/mail/installer/windows/Makefile.in index 96d76dbfc476..fc7b88d6ce6c 100644 --- a/mail/installer/windows/Makefile.in +++ b/mail/installer/windows/Makefile.in @@ -43,17 +43,56 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CONFIG_DIR=$(shell cygpath -a $(srcdir)) +include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk + +CONFIG_DIR=$(shell cygpath -a instgen) OBJ_DIR=$(shell cygpath -a $(DEPTH)) SRC_DIR=$(shell cygpath -a $(topsrcdir)) -ifeq (,$(INSTALLER_URL)) -INSTALLER_URL = "http://ftp.mozilla.org/pub/mozilla.org/pub/thunderbird/nightly/latest-trunk/windows-xpi" -endif +PP_LOCALIZED_FILES = \ + basemail-win \ + uninstall.it \ + installer.cfg \ + $(NULL) + +INSTALLER_FILES = \ + config.it \ + app.tag \ + adt.jst \ + mail.jst \ + newsblog.jst \ + offline.jst \ + talkback.jst \ + xpcom.jst \ + 7zip.bat \ + $(NULL) + +DEFINES += -DAB_CD=$(AB_CD) -DPKG_BASENAME=$(PKG_BASENAME) -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) + +include $(topsrcdir)/config/config.mk + +include $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/charset.mk installer: - cd $(topsrcdir)/toolkit/mozapps/installer && perl build_static.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" -objDir "$(OBJ_DIR)" -aurl "$(INSTALLER_URL)" - cd $(topsrcdir)/toolkit/mozapps/installer/windows/msi && perl make-msi.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" -objDir "$(OBJ_DIR)" -project thunderbird + $(NSINSTALL) -D instgen + $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) instgen + iconv -f UTF-8 -t $(WIN_INSTALLER_CHARSET) $(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer/installer.inc > instgen/installer.inc + $(EXIT_ON_ERROR) \ + for i in $(PP_LOCALIZED_FILES); do \ + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + $(srcdir)/$$i > instgen/$$i; \ + done + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + $(srcdir)/ab-CD.jst > instgen/$(AB_CD).jst + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/install.it \ + $(srcdir)/install.it instgen/installer.inc > instgen/install.it + cd $(topsrcdir)/toolkit/mozapps/installer && \ + perl build_static.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" \ + -objDir "$(OBJ_DIR)" + cd $(topsrcdir)/toolkit/mozapps/installer/windows/msi && \ + perl make-msi.pl -config "$(CONFIG_DIR)" -srcDir "$(SRC_DIR)" \ + -objDir "$(OBJ_DIR)" -project thunderbird include $(topsrcdir)/config/rules.mk diff --git a/mail/installer/windows/langenus.jst b/mail/installer/windows/ab-CD.jst old mode 100644 new mode 100755 similarity index 71% rename from mail/installer/windows/langenus.jst rename to mail/installer/windows/ab-CD.jst index 9f5e8ced546f..88732f04a394 --- a/mail/installer/windows/langenus.jst +++ b/mail/installer/windows/ab-CD.jst @@ -1,3 +1,5 @@ +#filter substitution + // main var srDest; var err; @@ -7,16 +9,8 @@ logComment("initInstall"); // end // end - OS type detection -// ----LOCALIZATION NOTE: translate only these ------ -var prettyName = "English (US) Language Pack"; -var chromeNode = "en-US"; -// --- END CHANGABLE STUFF --- -var regName = "locales/mozilla/" + chromeNode; -var chromeName = chromeNode + "-mail.jar"; -var localeName = "locale/" + chromeNode + "/"; - srDest = $SpaceRequired$:bin; -err = initInstall(prettyName, chromeNode, "$Version$"); +err = initInstall("@AB_CD@ Langpack", "@AB_CD@", "$Version$"); logComment("initInstall: " + err); fProgram = getFolder("Program"); diff --git a/mail/installer/windows/basemail-win b/mail/installer/windows/basemail-win index 69ee3f82e782..48465b00cd21 100644 --- a/mail/installer/windows/basemail-win +++ b/mail/installer/windows/basemail-win @@ -1,22 +1,14 @@ +#filter substitution + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Base Thunderbird Package File for Win32 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -[langenus] -bin\chrome\en-US.jar -bin\chrome\en-win.jar -bin\chrome\en-US.manifest +[@AB_CD@] +bin\chrome\@AB_CD@.jar +bin\chrome\@AB_CD@.manifest bin\chrome\mail-locales.manifest - -[regus] -bin\defaults\profile\US\localstore.rdf -bin\defaults\profile\US\mimeTypes.rdf - -[deflenus] bin\defaults\messenger\mailViews.dat -bin\defaults\profile\localstore.rdf -bin\defaults\profile\prefs.js -bin\defaults\profile\mimeTypes.rdf [xpcom] bin\xpcom.dll @@ -70,6 +62,10 @@ bin\README.txt ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Mail Specific Files ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +bin\defaults\profile\localstore.rdf +bin\defaults\profile\prefs.js +bin\defaults\profile\mimeTypes.rdf + bin\components\addrbook.xpt bin\components\mime.xpt bin\components\mailnews.xpt diff --git a/mail/installer/windows/config.it b/mail/installer/windows/config.it index 21a60dc1cb1b..c32ff12b31f9 100644 --- a/mail/installer/windows/config.it +++ b/mail/installer/windows/config.it @@ -182,49 +182,33 @@ Verify Existence= [Dialog Welcome] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=$ProductName$ Setup -;*** LOCALIZE ME BABY *** -MessageWelcome=Welcome to %s! -;*** LOCALIZE ME BABY *** -Message0=You are about to install %s $Version$. -;*** LOCALIZE ME BABY *** -Message1=It is strongly recommended that you exit all Windows programs before running this Setup program. -;*** LOCALIZE ME BABY *** -Message2=Click Cancel to quit Setup and then close any programs you have running. Click Next to continue the Setup program. -;*** LOCALIZE ME BABY *** -Message3=Click Next to continue installing %s $Version$. +Title={Welcome_Title} +MessageWelcome={Welcome_MessageWelcome} +Message0={Welcome_Message0} +Message1={Welcome_Message1} +Message2={Welcome_Message2} +Message3={Welcome_Message3} [Dialog License] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=Software License Agreement -;*** LOCALIZE ME BABY *** -Sub Title=Terms and conditions for using this software. +Title={License_Title} +Sub Title={License_SubTitle} License File=license.txt -;*** LOCALIZE ME BABY *** -Message0=Please read the following license agreement. Use the scroll bar to view the rest of this agreement. -;*** LOCALIZE ME BABY *** -RadioAccept=I &Accept the terms of the License Agreement -;*** LOCALIZE ME BABY *** -RadioDecline=I do NO&T Accept the terms of the License Agreement +Message0={License_Message0} +RadioAccept={License_Accept} +RadioDecline={License_Decline} [Dialog Setup Type] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=Setup Type -;*** LOCALIZE ME BABY *** -Sub Title=Choose setup options. -;*** LOCALIZE ME BABY *** -Message0=Choose the type of Setup you prefer, then click Next. +Title={Type_Title} +Sub Title={Type_SubTitle} +Message0={Type_Message0} ; at least one Setup Type needs to be set, and up to 4 can be ; set (Setup Type0, Setup Type1, Setup Type2, Setup Type3). [Setup Type0] -;*** LOCALIZE ME BABY *** -Description Short=&Standard -;*** LOCALIZE ME BABY *** -Description Long=Thunderbird will be installed with the most common options. +Description Short={Standard_Short} +Description Long={Standard_Long} ; List of components to install/enable for this Setup Type. ; All other components not listed here will be disabled if @@ -232,19 +216,16 @@ Description Long=Thunderbird will be installed with the most common options. C0=Component XPCOM C1=Component Mail C2=Component Uninstaller -C3=Component US English Profile Defaults -C4=Component En US lang pack -C5=Component Offline -C6=Component RSS +C3=Component Langpack +C4=Component Offline +C5=Component RSS ; Make sure Component QFA is LAST so 3rd party developers who might not want ; this component can easily remove it. -C7=Component QFA +C6=Component QFA [Setup Type1] -;*** LOCALIZE ME BABY *** -Description Short=&Custom -;*** LOCALIZE ME BABY *** -Description Long=You may choose individual options to be installed. Recommended for experienced users. +Description Short={Custom_Short} +Description Long={Custom_Long} ; List of components to install/enable for this Setup Type. ; All other components not listed here will be disabled if @@ -252,32 +233,25 @@ Description Long=You may choose individual options to be installed. Recommended C0=Component XPCOM C1=Component Mail C2=Component Uninstaller -C3=Component US English Profile Defaults -C4=Component En US lang pack -C5=Component Offline -C6=Component RSS +C3=Component Langpack +C4=Component Offline +C5=Component RSS ;C7=Component ADT ; Make sure Component QFA is LAST so 3rd party developers who might not want ; this component can easily remove it. -C7=Component QFA +C6=Component QFA [Dialog Select Components] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=Select Components -;*** LOCALIZE ME BABY *** -Sub Title=Additional components that enhance $ProductName$. -;*** LOCALIZE ME BABY *** -Message0=Choose additional components you want to install, then click Next. +Title={Select_Title} +Sub Title={Select_SubTitle} +Message0={Select_Message0} [Dialog Select Install Path] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=Install Folder -;*** LOCALIZE ME BABY *** -Sub Title=Where $ProductName$ will be installed. -;*** LOCALIZE ME BABY *** -Message0=$ProductName$ will be installed into the following folder: +Title={Path_Title} +Sub Title={Path_SubTitle} +Message0={Path_Message0} [Dialog Upgrade] Show Dialog=FALSE @@ -312,40 +286,31 @@ Message0=Select or clear the additional components you want to install. ; Note - this dialog isn't actually used yet! Show Dialog=TRUE Registry Key=SOFTWARE\\$CompanyName$\\$ProductName$\\$UserAgent$\\Main -;*** LOCALIZE ME BABY *** -Title=Set Up Shortcuts -;*** LOCALIZE ME BABY *** -Sub Title=Creates Program Icons -;*** LOCALIZE ME BABY *** -Message0=Create icons for $ProductShortName$: - +Title={Integration_Title} +Sub Title={Integration_SubTitle} +Message0={Integration_Message0} ; Only a maximum of 3 "Windows Integration-Item"s are allowded. Each Item ; shows up as a checkbox in the Windows Integration dialog. [Windows Integration-Item0] CheckBoxState=FALSE -;*** LOCALIZE ME BABY *** -Description=On my Desktop +Description={Integration_Desktop} Archive= [Windows Integration-Item1] CheckBoxState=TRUE -;*** LOCALIZE ME BABY *** -Description=In my Start Menu Programs folder +Description={Integration_StartMenu} Archive= [Windows Integration-Item2] CheckBoxState=TRUE -;*** LOCALIZE ME BABY *** -Description=In my Quick Launch bar +Description={Integration_QuickLaunch} Archive= [Dialog Program Folder] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=$ProductName$ Setup - Select Program Folder -;*** LOCALIZE ME BABY *** -Message0=Setup will add program icons to the Program Folder listed below. You may type a new folder name, or select one from the Existing Folders list. Click Next to continue. +Title={SelectFolder_Title} +Message0={SelectFolder_Message0} [Dialog Additional Options] Show Dialog=TRUE @@ -364,10 +329,8 @@ Recapture Homepage=FALSE [Dialog Advanced Settings] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=$ProductName$ Setup - Advanced Settings -;*** LOCALIZE ME BABY *** -Message0=If your Internet connection requires a proxy server, enter your server name and port information. If your Internet connection doesn't require a proxy server, leave the fields blank. +Title={Advanced_Title} +Message0={Advanced_Message0} Proxy Server= Proxy Port= Proxy User= @@ -406,55 +369,35 @@ Turbo Mode Enabled=TRUE [Dialog Start Install] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=Summary -;*** LOCALIZE ME BABY *** -Sub Title=Ready to start installing $ProductName$. -;*** LOCALIZE ME BABY *** -Message Install=Setup will now install the following components: -;*** LOCALIZE ME BABY *** -Message Download=Setup will now download and install the following components: -;*** LOCALIZE ME BABY *** -Message0=Click Next to continue. +Title={Install_Title} +Sub Title={Install_SubTitle} +Message Install={Install_MessageInstall} +Message Download={Install_MessageDownload} +Message0={Install_Message0} [Dialog Downloading] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=Downloading -;*** LOCALIZE ME BABY *** -Sub Title=Downloading required components... -;*** LOCALIZE ME BABY *** -Blurb=Setup is downloading the files required to install $ProductName$. -;*** LOCALIZE ME BABY *** -File Name=Currently Downloading: -;*** LOCALIZE ME BABY *** -Time Remaining=Time Remaining: +Title={Downloading_Title} +Sub Title={Downloading_SubTitle} +Blurb={Downloading_Blurb} +File Name={Downloading_FileName} +Time Remaining={Downloading_Time} [Dialog Installing] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=Installing -;*** LOCALIZE ME BABY *** -Sub Title=Installing $ProductName$... -;*** LOCALIZE ME BABY *** -Blurb=Setup is installing application files. -;*** LOCALIZE ME BABY *** -Status File=Preparing File: -;*** LOCALIZE ME BABY *** -Status Component=Currently Installing: +Title={Installing_Title} +Sub Title={Installing_SubTitle} +Blurb={Installing_Blurb} +Status File={Installing_Status} +Status Component={Installing_Component} [Dialog Install Successful] Show Dialog=TRUE -;*** LOCALIZE ME BABY *** -Title=Install Complete -;*** LOCALIZE ME BABY *** -MessageHeader=Install Complete -;*** LOCALIZE ME BABY *** -Message0=%s $Version$ was successfully installed. -;*** LOCALIZE ME BABY *** -Message1=Click Finish to complete Setup. -;*** LOCALIZE ME BABY *** -Launch App=Launch %s $Version$ now. +Title={Success_Title} +MessageHeader={Success_Header} +Message0={Success_Message0} +Message1={Success_Message1} +Launch App={Success_Launch} Launch App Checked=TRUE [Dialog Download] @@ -482,12 +425,9 @@ Class Name=ThunderbirdMessageWindow Window Name= Process Name=$MainExeFile$ Pretty Name=$ProductNameInternal$ -;*** LOCALIZE ME BABY *** -Message=Download of $ProductName$ was successful. $ProductNameInternal$ must be closed to proceed with installation. Click OK to exit $ProductNameInternal$ automatically and to begin installation. -;*** LOCALIZE ME BABY *** -Message Full Installer=$ProductNameInternal$ must be closed to proceed with installation. Click OK to exit $ProductNameInternal$ automatically and to begin installation. -;*** LOCALIZE ME BABY *** -Message wait=Shutting down $ProductNameInternal$. Please wait... +Message={Check_Message} +Message Full Installer={Check_FullMessage} +Message wait={Check_Wait} ; This key indicates whether or not to close all the windows associated with ; the process id of this app instance window found. @@ -595,9 +535,8 @@ Extra Cmd0 Parameter=-kill ;for it's xpinstall engine from the TEMP dir. The files that ;this component has are already in Component GRE. [Component XPCOM] -Description Short=Cross Platform COM -;*** LOCALIZE ME BABY *** -Description Long=Cross Platform COM +Description Short={Component_XPCOM} +Description Long={Component_XPCOM} Archive=xpcom.xpi $InstallSize$:xpcom $InstallSizeSystem$ @@ -606,9 +545,8 @@ Attributes=SELECTED|INVISIBLE FileCount=$FileCount$ [Component Mail] -Description Short=$ProductName$ Mail -;*** LOCALIZE ME BABY *** -Description Long=The $ProductName$ Mail +Description Short={Component_Mail} +Description Long={Component_Mail} Archive=mail.xpi $InstallSize$:mail $InstallSizeSystem$ @@ -618,9 +556,8 @@ Force Upgrade File0=[SETUP PATH]\$MainExeFile$ FileCount=$FileCount$ [Component Offline] -Description Short=Offline Support -;*** LOCALIZE ME BABY *** -Description Long=Adds Offline support to $ProductName$ Mail. +Description Short={Component_Offline} +Description Long={Component_Offline_Long} Archive=offline.xpi $InstallSize$:offline $InstallSizeArchive$:offline.xpi @@ -629,9 +566,8 @@ Force Upgrade File0=[SETUP PATH]\chrome\offline.jar FileCount=$FileCount$ [Component RSS] -Description Short=RSS Support -;*** LOCALIZE ME BABY *** -Description Long=Adds RSS support to $ProductName$ Mail. +Description Short={Component_RSS} +Description Long={Component_RSS_Long} Archive=newsblog.xpi $InstallSize$:newsblog $InstallSizeArchive$:newsblog.xpi @@ -652,8 +588,7 @@ FileCount=$FileCount$ [Component Uninstaller] Description Short=$CompanyName$ Uninstaller -;*** LOCALIZE ME BABY *** -Description Long=Uninstaller for $ProductName$ +Description Long=$CompanyName$ Uninstaller Archive=$UninstallFileZip$ $InstallSize$:$UninstallFileZip$ $InstallSizeSystem$ @@ -667,35 +602,20 @@ FileCount=$FileCount$ [Component Uninstaller-Destination Path0] Path=[WINDIR] -[Component US English Profile Defaults] -Description Short=US English Defaults -;*** LOCALIZE ME BABY *** -Description Long=US English Default Profile Data -Archive=deflenus.xpi -$InstallSize$:deflenus -$InstallSizeSystem$ -$InstallSizeArchive$:deflenus.xpi +[Component Langpack] +Description Short={AB_CD} {LANGPACK_TITLE} +Description Long={AB_CD} {LANGPACK_TITLE} +Archive={AB_CD}.xpi +Install Size=512 +Install Size System=1 +Install Size Archive=512 Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE -Force Upgrade File0=[SETUP PATH]\defaults\profile\bookmarks.html -FileCount=$FileCount$ - -[Component En US lang pack] -;*** LOCALIZE ME BABY *** -Description Short=English (US) Language Pack -;*** LOCALIZE ME BABY *** -Description Long=English (US) Language Pack -Archive=langenus.xpi -$InstallSize$:langenus -$InstallSizeSystem$ -$InstallSizeArchive$:langenus.xpi -Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE -Force Upgrade File0=[SETUP PATH]\chrome\en-US.jar +Force Upgrade File0=[SETUP PATH]\chrome\{AB_CD}.jar FileCount=$FileCount$ [Component QFA] -Description Short=Quality Feedback Agent -;*** LOCALIZE ME BABY *** -Description Long=for reporting $ProductName$ crash information +Description Short={Component_QFA} +Description Long={Component_QFA_Long} Archive=talkback.xpi $InstallSize$:talkback $InstallSizeSystem$ @@ -882,7 +802,6 @@ Condition=RecaptureHPChecked [Windows Registry0] Root Key=HKEY_LOCAL_MACHINE -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$ Name= Name Value= @@ -896,7 +815,6 @@ Timing=pre smartupdate [Windows Registry1] Root Key=HKEY_LOCAL_MACHINE -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$ Name= Name Value= @@ -910,7 +828,6 @@ Timing=pre smartupdate [Windows Registry2] Root Key=HKEY_LOCAL_MACHINE -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$\$UserAgent$ Name= Name Value= @@ -924,7 +841,6 @@ Timing=pre smartupdate [Windows Registry3] Root Key=HKEY_LOCAL_MACHINE -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Main Name=Program Folder Path Name Value=[Default Folder] @@ -938,7 +854,6 @@ Timing=pre smartupdate [Windows Registry4] Root Key=HKEY_LOCAL_MACHINE -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall Name=Description Name Value=$ProductName$ ($UserAgentShort$) @@ -952,7 +867,6 @@ Timing=pre smartupdate [Windows Registry5] Root Key=HKEY_LOCAL_MACHINE -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall Name=Uninstall Log Folder Name Value=[SETUP PATH]\uninstall @@ -966,7 +880,6 @@ Timing=pre smartupdate [Windows Registry6] Root Key=HKEY_CURRENT_USER -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$ Name= Name Value= @@ -980,7 +893,6 @@ Timing=pre smartupdate [Windows Registry7] Root Key=HKEY_CURRENT_USER -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$ Name= Name Value= @@ -994,7 +906,6 @@ Timing=pre smartupdate [Windows Registry8] Root Key=HKEY_CURRENT_USER -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$\$UserAgent$ Name= Name Value= @@ -1008,7 +919,6 @@ Timing=pre smartupdate [Windows Registry9] Root Key=HKEY_CURRENT_USER -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Main Name=Program Folder Path Name Value=[Default Folder] @@ -1022,7 +932,6 @@ Timing=pre smartupdate [Windows Registry10] Root Key=HKEY_CURRENT_USER -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall Name=Description Name Value=$ProductName$ ($UserAgentShort$) @@ -1036,7 +945,6 @@ Timing=pre smartupdate [Windows Registry11] Root Key=HKEY_CURRENT_USER -;*** LOCALIZE ME BABY *** Key=Software\$CompanyName$\$ProductName$\$UserAgent$\Uninstall Name=Uninstall Log Folder Name Value=[SETUP PATH]\uninstall @@ -1065,7 +973,6 @@ Timing=post smartupdate Root Key=HKEY_LOCAL_MACHINE Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) Name=UninstallString -;*** LOCALIZE ME BABY *** Name Value=[WINDIR]\$UninstallFile$ /ua "$UserAgent$" Type=REG_SZ Decrypt Key=FALSE @@ -1170,7 +1077,6 @@ Timing=post smartupdate Root Key=HKEY_LOCAL_MACHINE Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) Name=URLInfoAbout -;*** LOCALIZE ME BABY *** Name Value=http://www.mozilla.org/ Type=REG_SZ Decrypt Key=FALSE @@ -1184,7 +1090,6 @@ Timing=post smartupdate Root Key=HKEY_LOCAL_MACHINE Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\$ProductName$ ($UserAgentShort$) Name=URLUpdateInfo -;*** LOCALIZE ME BABY *** Name Value=http://www.mozilla.org/products/thunderbird/ Type=REG_SZ Decrypt Key=FALSE diff --git a/mail/installer/windows/deflenus.jst b/mail/installer/windows/deflenus.jst deleted file mode 100644 index f13fc7f97adf..000000000000 --- a/mail/installer/windows/deflenus.jst +++ /dev/null @@ -1,42 +0,0 @@ -// main -var srDest; -var err; -var fProgram; - -// ----LOCALIZATION NOTE: translate only these ------ -var prettyName = "US English profile default"; -var regName = "defaults/mozilla/en-US"; -// --- END CHANGABLE STUFF --- - -srDest = $SpaceRequired$:bin; -err = initInstall(prettyName, regName, "$Version$"); -logComment("initInstall: " + err); - -fProgram = getFolder("Program"); -logComment("fProgram: " + fProgram); - -if(verifyDiskSpace(fProgram, srDest)) -{ - setPackageFolder(fProgram); - - err = addDirectory("", - "$Version$", - "bin", // dir name in jar to extract - fProgram, // Where to put this file (Returned from GetFolder) - "", // subdir name to create relative to fProgram - true); // Force Flag - logComment("addDirectory() returned: " + err); - - // check return value - if(err == SUCCESS) - { - err = performInstall(); - logComment("performInstall() returned: " + err); - } - else - cancelInstall(err); -} -else - cancelInstall(INSUFFICIENT_DISK_SPACE); - -// end main diff --git a/mail/installer/windows/install.it b/mail/installer/windows/install.it index ee1cbcefce68..a8dac1591d17 100644 --- a/mail/installer/windows/install.it +++ b/mail/installer/windows/install.it @@ -1,137 +1,3 @@ -[General] -FONTNAME=MS Sans Serif -FONTSIZE=8 -CHARSET=0 -;Here is a partial list CHAR_SETS -; ANSI_CHARSET = 0 -; DEFAULT_CHARSET = 1 -; SYMBOL_CHARSET = 2 -; SHIFTJIS_CHARSET = 128 -; GB2312_CHARSET = 134 -; HANGEUL_CHARSET = 129 -; CHINESEBIG5_CHARSET = 136 -; OEM_CHARSET 255 - -OK_=&OK -OK=OK -CANCEL=Cancel -CANCEL_=&Cancel -NEXT_=&Next > -BACK_=< &Back -IGNORE_=&Ignore -PROXY_MESSAGE=To configure a Proxy server for this download, click the Connection... button. -PROXY_BUTTON=&Connection... -PROXYSETTINGS=Proxy Settings: -PROXYSETTINGS_=&Proxy Settings -SERVER=Server: -PORT=Port: -USERID=User id: -PASSWORD=Password: -SELECTDIRECTORY=Select a directory -DIRECTORIES_=&Directories: -DRIVES_=Dri&ves: -STATUS=Remaining: -FILE=File: -URL=URL: -TO=To Path: -ACCEPT_=&Accept -DECLINE_=&Decline -PROGRAMFOLDER_=&Program Folder: -EXISTINGFOLDERS_=E&xisting Folders: -SETUPMESSAGE=Setup has finished copying files to your computer. Before you can use $ProductNameInternal$, you must restart Windows or your computer. Choose one of the following options and click OK to finish setup. -RESTART=Restart -YESRESTART=Yes, I want to restart my computer now. -NORESTART=No, I will restart my computer later. -ADDITIONALCOMPONENTS_=&Additional Components: -DESCRIPTION=Description -TOTALDOWNLOADSIZE=Total download size: -SPACEAVAILABLE=Space Available: -COMPONENTS_=C&omponents: -BROWSEINFO=Choose a Folder to install $ProductName$ into: -DESTINATIONDIRECTORY=Install Folder -BROWSE_=B&rowse... -DOWNLOADSIZE=Download Size: %u KB -CURRENTSETTINGS=Current Settings: -INSTALLFOLDER=...to the following location: -ADDTLCOMPWRAPPER=- %s -PRIMCOMPOTHERS=%s and: -PRIMCOMPNOOTHERS=%s -INSTALL_=&Install -DELETE_=&Delete -CONTINUE_=&Continue -SKIP_=&Skip -README=Re&ad Me -PAUSE_=&Pause -RESUME_=&Resume -CHECKED=Checked -UNCHECKED=Unchecked - -EXTRACTING=Extracting... - - -[Messages] - -ERROR_DIALOG_CREATE=Could not create %s dialog. -ERROR_FAILED=%s failed. -ERROR_FILE_NOT_FOUND=File not found: %s -ERROR_GET_SYSTEM_DIRECTORY_FAILED=GetSystemDirectory() failed. -ERROR_GET_WINDOWS_DIRECTORY_FAILED =GetWindowsDirectory() failed. -DLGQUITTITLE=Exit Setup -DLGQUITMSG=You have not finished installing $ProductName$. If you exit Setup now, $ProductName$ will not be installed. Are you sure you want to cancel Setup? -DLG_REBOOT_TITLE=Restarting Windows -ERROR_GETPROCADDRESS=GetProcAddress() of %s failed. -ERROR_WRITEPRIVATEPROFILESTRING=WritePrivateProfileString() failed for file %s -MSG_RETRIEVE_CONFIGINI=Please wait while Setup retrieves its configuration script from the web... -ERROR_CREATE_TEMP_DIR=Setup was unable to create the TEMP directory: %s -DLGBROWSETITLE=Select a directory -ERROR_DETERMINING_DISK_SPACE=Could not determine available disk space for: %s -DLG_DISK_SPACE_CHECK_TITLE=Disk space check -DLG_DISK_SPACE_CHECK_CRUTIAL_MSG=Setup has detected insufficient disk space to continue with installation on %s for the path: %sRequired: %sAvailable: %sClick Retry if more disk space has been made available, or click Cancel to cancel Setup. -DLG_DISK_SPACE_CHECK_MSG=Setup has detected insufficient disk space to continue with installation process on %s for the path: %sRequired: %sAvailable: %sClick OK to go back and choose a different destination path. -ERROR_CREATE_DIRECTORY=Could not create folder: %sMake sure you have access to create the folder. -ERROR_MESSAGE_TITLE=$ProductNameInternal$ Setup Error -STR_FILE_NUMBER=File count: -STR_FILENAME=Filename: -MSG_SMARTUPDATE_START=Preparing Install, please wait... -MSG_CONFIGURING=Configuring %s, please wait... -ERROR_XPI_INSTALL=Error occurred during installation -ERROR_SETUP_REQUIREMENT=$ProductName$ can only run on Windows 95 or newer. Setup will now exit. -DLG_EXTRACTING_TITLE=$ProductName$ Setup - Install Progress -STR_PROCESSINGFILE=Preparing file: %s -STR_INSTALLING=Currently installing %s -STR_COPYINGFILE=Copying file: %s -MB_WARNING_STR=Warning -MB_MESSAGE_STR=Message -MB_ATTENTION_STR=Attention -MSG_CREATE_DIRECTORY=The following directory does not exist:%sWould you like to create it? -STR_CREATE_DIRECTORY=Create Directory? -ERROR_PROGRAM_FOLDER_NAME=Invalid Program folder name entered. -CB_DEFAULT=Default -ERROR_DESTINATION_PATH=Invalid path entered. -STR_SETUP_TYPE=Setup Type: -STR_SELECTED_COMPONENTS=Selected Components: -STR_DESTINATION_DIRECTORY=Destination Directory: -STR_PROGRAM_FOLDER=Program Folder: -STR_DELETING_DESTINATION_DIR=Deleting destination directory to be able to upgrade, please wait... -STR_SETUP=Setup -STR_DOWNLOAD_SITE=Download Site: -STR_SAVE_INSTALLER_FILES=Save downloaded and Setup program files to: -MSG_INIT_SETUP=Initializing Setup, please wait... -STR_MESSAGEBOX_TITLE=%s Setup -ERROR_GETVERSION=GetVersionEx() failed! -DLG_USAGE_TITLE=Usage - -STATUS_EXTRACTING=Extracting %s -STATUS_LAUNCHING_SETUP=Launching Setup... -ERROR_FILE_WRITE=Unable to write file %s -TITLE=Installation -ERROR_OUT_OF_MEMORY=Out of memory! - -ERROR_DLL_LOAD=Could not load %s -ERROR_STRING_LOAD=Could not load string resource ID %d -ERROR_STRING_NULL=Null pointer encountered. -ERROR_GLOBALALLOC=Memory allocation error. -MSG_FORCE_QUIT_PROCESS=Setup has detected that %s (%s) is still running. Click OK to quit %s and proceed with installation. Alternatively, use the Windows Task Manager to quit %s, and then click OK to continue with installation. -MSG_FORCE_QUIT_PROCESS_FAILED=Setup will now exit. Setup could not continue because %s (%s) is still running. Try manually quitting %s using Windows Task Manager, and then run Setup again. -ERROR_PATH_WITHIN_WINDIR=$ProductName$ cannot be installed into a folder that is inside the Windows folder. Please choose a different folder. - +#filter substitution +AB_CD=@AB_CD@ +LANGPACK_TITLE=Language Pack diff --git a/mail/installer/windows/installer.cfg b/mail/installer/windows/installer.cfg index c74b8df3cb99..247fdf9779fd 100644 --- a/mail/installer/windows/installer.cfg +++ b/mail/installer/windows/installer.cfg @@ -1,4 +1,5 @@ -VersionLanguage = en +#filter substitution +VersionLanguage = @AB_CD@ NameCompany = Mozilla NameProduct = Mozilla Thunderbird NameProductInternal = Mozilla Thunderbird @@ -6,12 +7,12 @@ ShortNameProduct = Thunderbird VersionProduct = 1.0.0+ DistSubdir = bin packagesFile = basemail-win -FileInstallerEXE = ThunderbirdSetup.exe -FileInstallerMSI = ThunderbirdSetup.msi +FileInstallerEXE = @PKG_BASENAME@.installer.exe +FileInstallerMSI = @PKG_BASENAME@.installer.msi FileMainEXE = thunderbird.exe FileUninstall = UninstallThunderbird.exe FileUninstallZIP = UninstallThunderbird.zip -FileInstallerNETRoot = ThunderbirdNetSetup -ComponentList = xpcom,mail,talkback,deflenus,langenus,offline,newsblog +FileInstallerNETRoot = @PKG_BASENAME@.net-installer +ComponentList = xpcom,mail,talkback,@AB_CD@,offline,newsblog LicenseFile = mail/LICENSE.txt 7ZipSFXModule = other-licenses/7zstub/thunderbird/7zSD.sfx diff --git a/mail/locales/Makefile.in b/mail/locales/Makefile.in index 88e7f2af9cf4..6f836020e6be 100644 --- a/mail/locales/Makefile.in +++ b/mail/locales/Makefile.in @@ -42,12 +42,138 @@ relativesrcdir = mail/locales include $(DEPTH)/config/autoconf.mk +_ABS_DIST := $(shell cd $(DIST) && pwd) + +# This makefile uses variable overrides from the libs-% target to +# build non-default locales to non-default dist/ locations. Be aware! + +AB = $(firstword $(subst -, ,$(AB_CD))) + APP_VERSION = $(shell cat $(srcdir)/../config/version.txt) -DEFINES += -DAB_CD=$(AB_CD) -DAPP_VERSION=$(APP_VERSION) +DEFINES += \ + -DAB_CD=$(AB_CD) \ + -DAPP_VERSION=$(APP_VERSION) \ + -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \ + $(NULL) ifdef MOZ_USE_OFFICIAL_BRANDING DEFINES += -DMOZ_USE_OFFICIAL_BRANDING endif +PREF_JS_EXPORTS = $(LOCALE_SRCDIR)/all-l10n.js + include $(topsrcdir)/config/rules.mk + +README_FILES = \ + README.txt \ + $(NULL) + +libs:: $(addprefix $(LOCALE_SRCDIR)/,$(README_FILES)) + $(INSTALL) $^ $(FINAL_TARGET) + +libs-%: + @$(MAKE) -C ../../toolkit/locales libs-$* + @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref +ifdef MOZ_USE_OFFICIAL_BRANDING + @$(MAKE) -C ../../other-licenses/branding/thunderbird/locales AB_CD=$* XPI_NAME=locale-$* +endif + +PACKAGER_NO_LIBS = 1 +include $(topsrcdir)/toolkit/mozapps/installer/packager.mk +include $(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/charset.mk + +repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/install/sea/$(PKG_BASENAME).installer.exe +repackage-win32-installer: $(WIN32_INSTALLER_IN) + @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." + $(RM) -rf $(DIST)/l10n-stage + mkdir $(DIST)/l10n-stage + cd $(DIST)/l10n-stage && + $(CYGWIN_WRAPPER) 7z e $(WIN32_INSTALLER_IN) + $(RM) $(DIST)/l10n-stage/en-US.xpi + $(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD) + $(MAKE) libs-$(AB_CD) + $(RM) -rf $(DIST)/l10n-temp-stage + mkdir $(DIST)/l10n-temp-stage + mv $(DIST)/xpi-stage/locale-$(AB_CD) $(DIST)/l10n-temp-stage/bin + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + -I$(topsrcdir)/xpinstall/packager/common/share.t $(topsrcdir)/mail/installer/windows/ab-CD.jst | \ + sed -e 's/$$SpaceRequired\$$:bin/50/' > $(DIST)/l10n-temp-stage/install.js + cd $(DIST)/l10n-temp-stage && \ + $(ZIP) -D -0 -r ../l10n-stage/$(AB_CD).xpi . + iconv -f UTF-8 -t $(WIN_INSTALLER_CHARSET) $(call EXPAND_LOCALE_SRCDIR,mail/locales)/installer/installer.inc > \ + $(DIST)/l10n-temp-stage/installer.inc + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + -I$(DIST)/l10n-temp-stage/installer.inc \ + -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/installer/windows/install.in \ + $(topsrcdir)/browser/installer/windows/install.it > $(DIST)/l10n-stage/install.ini + cd $(DIST)/l10n-stage && \ + $(CYGWIN_WRAPPER) 7z a -tz7 ../l10n-temp-stage/app.7z *.* -mx -m0=BCJ2 -m1=LZMA:d24 -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3 + $(CYGWIN_WRAPPER) upx -9 -o $(DIST)/l10n-temp-stage/7zSD.sfxc $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx + $(INSTALL) $(topsrcdir)/mail/installer/windows/app.tag $(DIST)/l10n-temp-stage + cd $(DIST)/l10n-temp-stage && + $(CYGWIN_WRAPPER) cmd /C copy /b 7zSD.sfxc+app.tag+app.7z firefox-installer.exe + mv -f $(DIST)/l10n-temp-stage/firefox-installer.exe $(WIN32_INSTALLER_OUT) + +repackage-win32-installer-%: WIN32_INSTALLER_IN=$(_ABS_DIST)/install/sea/$(PKG_BASENAME).installer.exe +repackage-win32-installer-%: $(WIN32_INSTALLER_IN) + @$(MAKE) repackage-win32-installer AB_CD=$* WIN32_INSTALLER_IN=$(WIN32_INSTALLER_IN) + +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) +STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/MacOS +else +STAGEDIST = $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME) +endif + +repackage-zip: ZIP_OUT=$(_ABS_DIST)/$(PACKAGE) +repackage-zip: UNPACKAGE=$(ZIP_IN) +repackage-zip: $(ZIP_IN) + $(RM) -r $(DIST)/l10n-stage + mkdir $(DIST)/l10n-stage + cd $(DIST)/l10n-stage && \ + $(UNMAKE_PACKAGE) + $(RM) $(STAGEDIR)/chrome/en-US.jar \ + $(STAGEDIST)/chrome/en-US.manifest \ + $(STAGEDIST)/defaults/pref/all-l10n.js + $(RM) -r $(STAGEDIST)/searchplugins \ + $(STAGEDIST)/chrome/en-US + $(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD) + $(MAKE) libs-$(AB_CD) + $(RM) -r $(DIST)/xpi-stage/locale-$(AB_CD)/chrome/$(AB_CD) + cd $(DIST)/xpi-stage/locale-$(AB_CD) && \ + tar $(TAR_CREATE_FLAGS) - * | ( cd $(STAGEDIST) && tar -xf - ) +ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) + mv $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/en.lproj $(_ABS_DIST)/l10n-stage/$(MOZ_PKG_APPNAME)/$(_APPNAME)/Contents/Resources/$(AB).lproj +endif + cd $(DIST)/l10n-stage; \ + $(MAKE_PACKAGE) + mv -f $(DIST)/l10n-stage/$(PACKAGE) $(DIST) + +repackage-zip-%: ZIP_IN=$(_ABS_DIST)/$(PACKAGE) +repackage-zip-%: $(ZIP_IN) + @$(MAKE) repackage-zip AB_CD=$* ZIP=IN=$(ZIP_IN) + +langpack-%: LANGPACK_FILE=$(_ABS_DIST)/install/firefox-$(MOZ_APP_VERSION).$(AB_CD).langpack.xpi +langpack-%: AB_CD=%* +langpack-%: XPI_NAME=locale-$* +langpack-%: + @echo "Making langpack $(LANGPACK_FILE)" + @$(RM) -rf $(DIST)/xpi-stage/locale-$(AB_CD) + @$(MAKE) libs-$(AB_CD) + $(PERL) $(topsrcdir)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) \ + -I$(call EXPAND_LOCALE_SRCDIR,toolkit/locales)/defines.inc \ + -I$(LOCALE_SRCDIR)/defines.inc $(srcdir)/generic/install.rdf > + $(FINAL_TARGET)/install.rdf + cd $(DIST)/xpi-stage/locale-$(AB_CD) && \ + $(ZIP) -r9D $(LANGPACK_FILE) install.rdf chrome + +# This is a generic target that will make a langpack, repack ZIP (tarball) +# builds, and repack and installer if applicable. It is called from the +# tinderbox scripts. Alter it with caution. + +installers-%: + @$(MAKE) langpack-$* + @$(MAKE) repackage-zip-$* +ifeq (WINNT,$(OS_ARCH)) + @$(MAKE) repackage-win32-installer-$* +endif diff --git a/mail/app/README.txt b/mail/locales/en-US/README.txt similarity index 100% rename from mail/app/README.txt rename to mail/locales/en-US/README.txt diff --git a/mail/locales/en-US/all-l10n.js b/mail/locales/en-US/all-l10n.js new file mode 100755 index 000000000000..e9027aaeb93d --- /dev/null +++ b/mail/locales/en-US/all-l10n.js @@ -0,0 +1,39 @@ +# ***** 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 the Firefox browser. +# +# The Initial Developer of the Original Code is +# Benjamin Smedberg +# Portions created by the Initial Developer are Copyright (C) 2004 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# 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 ***** + +#filter substitution + +pref("general.useragent.locale", "@AB_CD@"); diff --git a/mail/locales/en-US/defines.inc b/mail/locales/en-US/defines.inc new file mode 100755 index 000000000000..d90294efecea --- /dev/null +++ b/mail/locales/en-US/defines.inc @@ -0,0 +1,10 @@ +#filter emptyLines + +#define MOZ_LANGPACK_EID {fc121405-5aef-4291-86c6-8b43b04194b7} +#define MOZ_LANGPACK_CREATOR mozilla.org + +# If non-English locales wish to credit multiple contributors, uncomment this +# variable definition and use the format specified. +# #define MOZ_LANGPACK_CONTRIBUTORS Joe Solon Suzy Solon + +#unfilter emptyLines diff --git a/mail/locales/en-US/installer/installer.inc b/mail/locales/en-US/installer/installer.inc new file mode 100755 index 000000000000..c934e34a4946 --- /dev/null +++ b/mail/locales/en-US/installer/installer.inc @@ -0,0 +1,84 @@ +# This file is in the UTF-8 encoding. It is *not* +# a Java .properties file and does *not* use \escapes + +Welcome_Title=$ProductName$ Setup +Welcome_MessageWelcome=Welcome to %s! +Welcome_Message0=You are about to install %s $Version$. +Welcome_Message1=It is strongly recommended that you exit all Windows programs before running this Setup program. +Welcome_Message2=Click Cancel to quit Setup and then close any programs you have running. Click Next to continue the Setup program. +Welcome_Message3=Click Next to continue installing %s $Version$. + +License_Title=Software License Agreement +License_SubTitle=Terms and conditions for using this software. +License_Message0=Please read the following license agreement. Use the scroll bar to view the rest of this agreement. +License_Accept=I &Accept the terms of the License Agreement +License_Decline=I do NO&T Accept the terms of the License Agreement + +Type_Title=Setup Type +Type_SubTitle=Choose setup options. +Type_Message0=Choose the type of Setup you prefer, then click Next. + +Standard_Short=&Standard +Standard_Long=Thunderbird will be installed with the most common options. + +Custom_Short=&Custom +Custom_Long=You may choose individual options to be installed. Recommended for experienced users. + +Select_Title=Select Components +Select_SubTitle=Additional components that enhance $ProductName$. +Select_Message0=Choose additional components you want to install, then click Next. + +Path_Title=Install Folder +Path_SubTitle=Where $ProductName$ will be installed. +Path_Message0=$ProductName$ will be installed into the following folder: + +Integration_Title=Set Up Shortcuts +Integration_SubTitle=Creates Program Icons +Integration_Message0=Create icons for $ProductShortName$: + +Integration_Desktop=On my Desktop +Integration_StartMenu=In my Start Menu Programs folder +Integration_QuickLaunch=In my Quick Launch bar + +SelectFolder_Title=$ProductName$ Setup - Select Program Folder +SelectFolder_Message0=Setup will add program icons to the Program Folder listed below. You may type a new folder name, or select one from the Existing Folders list. Click Next to continue. + +Advanced_Title=$ProductName$ Setup - Advanced Settings +Advanced_Message0=If your Internet connection requires a proxy server, enter your server name and port information. If your Internet connection doesn't require a proxy server, leave the fields blank. + +Install_Title=Summary +Install_SubTitle=Ready to start installing $ProductName$. +Install_MessageInstall=Setup will now install the following components: +Install_MessageDownload=Setup will now download and install the following components: +Install_Message0=Click Next to continue. + +Downloading_Title=Downloading +Downloading_SubTitle=Downloading required components... +Downloading_Blurb=Setup is downloading the files required to install $ProductName$. +Downloading_FileName=Currently Downloading: +Downloading_Time=Time Remaining: + +Installing_Title=Installing +Installing_SubTitle=Installing $ProductName$... +Installing_Blurb=Setup is installing application files. +Installing_Status=Preparing File: +Installing_Component=Currently Installing: + +Success_Title=Install Complete +Success_Header=Install Complete +Success_Message0=%s $Version$ was successfully installed. +Success_Message1=Click Finish to complete Setup. +Success_Launch=Launch %s $Version$ now. + +Check_Message=Download of $ProductName$ was successful. $ProductNameInternal$ must be closed to proceed with installation. Click OK to exit $ProductNameInternal$ automatically and to begin installation. +Check_FullMessage=$ProductNameInternal$ must be closed to proceed with installation. Click OK to exit $ProductNameInternal$ automatically and to begin installation. +Check_Wait=Shutting down $ProductNameInternal$. Please wait... + +Component_XPCOM=Cross Platform COM +Component_Mail=$ProductName$ +Component_Offline=Offline Support +Component_Offline_Long=Adds Offline support to $ProductName$ Mail. +Component_RSS=RSS Support +Component_RSS_Long=Adds RSS support to $ProductName$. +Component_QFA=Quality Feedback Agent +Component_QFA_Long=for reporting $ProductName$ crash information diff --git a/mail/locales/generic/install.rdf b/mail/locales/generic/install.rdf new file mode 100755 index 000000000000..cbb1620e9a8a --- /dev/null +++ b/mail/locales/generic/install.rdf @@ -0,0 +1,60 @@ + + + + + +#ifdef MOZ_LANGPACK_CONTRIBUTORS + @MOZ_LANGPACK_CONTRIBUTORS@ +#endif + + + {3550f703-e582-4d05-9a08-453d09bdfdc6} + 1.0+ + 1.1 + + + +