From c83bf7862afb46f1c1a16ad4e6ec41d3f466fd5c Mon Sep 17 00:00:00 2001 From: "tao%netscape.com" Date: Thu, 20 Jul 2000 21:40:42 +0000 Subject: [PATCH] 41054 : Bundle 2-3 language packs with Seamonkey. Change en-GB->en-DE in build and packaging process. r=ssu & sfraser. --- l10n/langpacks/Makefile.in | 2 +- l10n/langpacks/makefile.win | 4 ++-- l10n/makefiles.all | 12 ++++++------ xpinstall/packager/packages-mac | 6 ++++++ xpinstall/packager/packages-unix | 8 ++++---- xpinstall/packager/packages-win | 8 ++++---- xpinstall/packager/unix/.cvsignore | 2 +- xpinstall/packager/unix/config.it | 8 ++++---- xpinstall/packager/unix/makeall.pl | 2 +- xpinstall/packager/windows/config.it | 10 +++++----- xpinstall/packager/windows/makeall.pl | 2 +- .../mac/macbuild/Installer Modules/config.ini_tmpl | 8 ++++---- xpinstall/wizard/mac/macbuild/config.ini_tmpl | 8 ++++---- 13 files changed, 43 insertions(+), 37 deletions(-) diff --git a/l10n/langpacks/Makefile.in b/l10n/langpacks/Makefile.in index 3a009456c8c..72096ad0fa1 100644 --- a/l10n/langpacks/Makefile.in +++ b/l10n/langpacks/Makefile.in @@ -26,6 +26,6 @@ srcdir = @srcdir@ include $(DEPTH)/config/autoconf.mk -DIRS = en-GB +DIRS = en-DE include $(topsrcdir)/config/rules.mk diff --git a/l10n/langpacks/makefile.win b/l10n/langpacks/makefile.win index 82bb369c8e6..0ee8a7f2e4a 100644 --- a/l10n/langpacks/makefile.win +++ b/l10n/langpacks/makefile.win @@ -19,7 +19,7 @@ DEPTH = ..\.. DIRS= \ - en-GB \ + en-DE \ $(NULL) -include <$(DEPTH)\config\rules.mak> \ No newline at end of file +include <$(DEPTH)\config\rules.mak> diff --git a/l10n/makefiles.all b/l10n/makefiles.all index 98db0b3a03e..882cf96f6ed 100644 --- a/l10n/makefiles.all +++ b/l10n/makefiles.all @@ -1,8 +1,8 @@ -l10n/langpacks/en-GB/chrome/en-GB/Makefile -l10n/langpacks/en-GB/chrome/Makefile -l10n/langpacks/en-GB/Makefile -l10n/langpacks/en-GB/defaults/profile/en-GB/Makefile -l10n/langpacks/en-GB/defaults/profile/Makefile -l10n/langpacks/en-GB/defaults/Makefile +l10n/langpacks/en-DE/chrome/en-DE/Makefile +l10n/langpacks/en-DE/chrome/Makefile +l10n/langpacks/en-DE/Makefile +l10n/langpacks/en-DE/defaults/profile/en-DE/Makefile +l10n/langpacks/en-DE/defaults/profile/Makefile +l10n/langpacks/en-DE/defaults/Makefile l10n/langpacks/Makefile l10n/Makefile diff --git a/xpinstall/packager/packages-mac b/xpinstall/packager/packages-mac index d13d3f97829..dfe2d6ea4f3 100644 --- a/xpinstall/packager/packages-mac +++ b/xpinstall/packager/packages-mac @@ -8,6 +8,12 @@ ; ; file comment ; +[langende] +; +; en-DE +viewer:defaults:profile:en-DE:* +viewer:chrome:locales:en-DE:* + [xpcom] viewer:Component Registry viewer:Components:libjar.shlb diff --git a/xpinstall/packager/packages-unix b/xpinstall/packager/packages-unix index 4f02a429d03..75f4dafe4c2 100644 --- a/xpinstall/packager/packages-unix +++ b/xpinstall/packager/packages-unix @@ -8,11 +8,11 @@ ; ; file comment ; -[langengb] +[langende] ; -; en-GB -bin/defaults/profile/en-GB/* -bin/chrome/locales/en-GB/* +; en-DE +bin/defaults/profile/en-DE/* +bin/chrome/locales/en-DE/* [deflenus] ; diff --git a/xpinstall/packager/packages-win b/xpinstall/packager/packages-win index d8f2645f2dd..0ed578767ed 100644 --- a/xpinstall/packager/packages-win +++ b/xpinstall/packager/packages-win @@ -14,11 +14,11 @@ bin\defaults\profile\en-US\* bin\chrome\locales\en-US\* -[langengb] +[langende] ; -; en-GB -bin\defaults\profile\en-GB\* -bin\chrome\locales\en-GB\* +; en-DE +bin\defaults\profile\en-DE\* +bin\chrome\locales\en-DE\* [deflenus] ; diff --git a/xpinstall/packager/unix/.cvsignore b/xpinstall/packager/unix/.cvsignore index ab7cba89987..fa120934dc7 100644 --- a/xpinstall/packager/unix/.cvsignore +++ b/xpinstall/packager/unix/.cvsignore @@ -5,4 +5,4 @@ mail.js chatzilla.js talkback.js deflenus.js -langengb.js +langende.js diff --git a/xpinstall/packager/unix/config.it b/xpinstall/packager/unix/config.it index 78bc70c74fa..f7f531f453f 100644 --- a/xpinstall/packager/unix/config.it +++ b/xpinstall/packager/unix/config.it @@ -125,10 +125,10 @@ Attributes=SELECTED|INVISIBLE URL0=$URLPath$ [Component6] -Description Short=English GB Language Pack -Description Long=English GB Language Pack -Archive=langengb.xpi -$InstallSize$:langengb +Description Short=English German Language Pack +Description Long=English German Language Pack +Archive=langende.xpi +$InstallSize$:langende Attributes=SELECTED|INVISIBLE URL0=$URLPath$ diff --git a/xpinstall/packager/unix/makeall.pl b/xpinstall/packager/unix/makeall.pl index e1b98f73340..46d0403e382 100755 --- a/xpinstall/packager/unix/makeall.pl +++ b/xpinstall/packager/unix/makeall.pl @@ -70,7 +70,7 @@ MakeXpiFile("mail"); MakeXpiFile("chatzilla"); MakeXpiFile("talkback"); MakeXpiFile("deflenus"); -MakeXpiFile("langengb"); +MakeXpiFile("langende"); # Make the config.ini file MakeConfigFile(); diff --git a/xpinstall/packager/windows/config.it b/xpinstall/packager/windows/config.it index a06435e2bab..d0183b8c6d4 100644 --- a/xpinstall/packager/windows/config.it +++ b/xpinstall/packager/windows/config.it @@ -453,13 +453,13 @@ Domain0=$Domain$ Server Path0=$ServerPath$ [Component7] -Description Short=English-GB language pack +Description Short=English-German language pack ;*** LOCALIZE ME BABY *** -Description Long=English-GB language pack -Archive=langengb.xpi -$InstallSize$:langengb +Description Long=English-German language pack +Archive=langende.xpi +$InstallSize$:langende $InstallSizeSystem$ -$InstallSizeArchive$:langengb.xpi +$InstallSizeArchive$:langende.xpi ;Dependency0= ; Attributes can be the following values: ; SELECTED - the component is selected to be installed by default. diff --git a/xpinstall/packager/windows/makeall.pl b/xpinstall/packager/windows/makeall.pl index 8f6d7fca78b..2cccfe1d315 100644 --- a/xpinstall/packager/windows/makeall.pl +++ b/xpinstall/packager/windows/makeall.pl @@ -105,7 +105,7 @@ MakeXpiFile("mail"); MakeXpiFile("chatzilla"); MakeXpiFile("deflenus"); MakeXpiFile("langenus"); -MakeXpiFile("langengb"); +MakeXpiFile("langende"); MakeUninstall(); MakeConfigFile(); diff --git a/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl b/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl index 84af59d2b21..76e6eb467e9 100644 --- a/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl +++ b/xpinstall/wizard/mac/macbuild/Installer Modules/config.ini_tmpl @@ -82,10 +82,10 @@ Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/ Attributes=SELECTED|INVISIBLE [Component5] -Description Short=English GB Language Pack -Description Long=English GB Language Pack -Archive=langengb.xpi -Install Size=(#langengb_size) +Description Short=English German Language Pack +Description Long=English German Language Pack +Archive=langende.xpi +Install Size=(#langende_size) Domain0=http://sweetlou.mcom.com/ Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/ Attributes=SELECTED|INVISIBLE diff --git a/xpinstall/wizard/mac/macbuild/config.ini_tmpl b/xpinstall/wizard/mac/macbuild/config.ini_tmpl index 84af59d2b21..76e6eb467e9 100644 --- a/xpinstall/wizard/mac/macbuild/config.ini_tmpl +++ b/xpinstall/wizard/mac/macbuild/config.ini_tmpl @@ -82,10 +82,10 @@ Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/ Attributes=SELECTED|INVISIBLE [Component5] -Description Short=English GB Language Pack -Description Long=English GB Language Pack -Archive=langengb.xpi -Install Size=(#langengb_size) +Description Short=English German Language Pack +Description Long=English German Language Pack +Archive=langende.xpi +Install Size=(#langende_size) Domain0=http://sweetlou.mcom.com/ Server Path0=products/client/seamonkey/macos/8.x/ppc/(#buildID)/ Attributes=SELECTED|INVISIBLE