From e653f7d673435206c18a0f33c4740f703b659797 Mon Sep 17 00:00:00 2001
From: "ssu%netscape.com"
 <ssu%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 1 Feb 2001 09:54:55 +0000
Subject: [PATCH] fixing bug 47959 - New component names and descriptions
 (suggestions/patches from Henrik Gemal)

bug 40708 - Mozilla installer should not install files into a subfolder

r=dveditz
sr=mscott

affects only windows platforms.
Not part of tinderbox builds.


git-svn-id: svn://10.0.0.236/trunk@85957 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpinstall/packager/windows/config.it | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/mozilla/xpinstall/packager/windows/config.it b/mozilla/xpinstall/packager/windows/config.it
index 8a84cd55d67..e09ec5bf47d 100644
--- a/mozilla/xpinstall/packager/windows/config.it
+++ b/mozilla/xpinstall/packager/windows/config.it
@@ -16,8 +16,16 @@ User Agent=$UserAgent$
 ;   WINDISK
 ;   WINDIR
 ;   WINSYSDIR
-Path=[PROGRAMFILESDIR]\$CompanyName$
-Sub Path=$ProductName$
+Path=[PROGRAMFILESDIR]\$CompanyName$\$ProductName$
+
+; Sub Path, when set will indicate to Setup to create a subfolder from
+; what is offered to the user to change.  It will not be shown to the user
+; but simply created:
+;
+; ie: shown to user   : [Path]
+;     actually created: [Path]\[Sub Path]
+;     (where [Path] is the Path= key above)
+Sub Path=
 Program Name=$MainExeFile$
 
 ; Program Folder Path values:
@@ -363,9 +371,9 @@ Attributes=SELECTED|INVISIBLE|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\xpcom.dll
 
 [Component Navigator]
-Description Short=Mozilla Navigator
+Description Short=Navigator
 ;*** LOCALIZE ME BABY ***
-Description Long=The Mozilla internet browser
+Description Long=Web Browser
 Archive=browser.xpi
 $InstallSize$:browser
 $InstallSizeSystem$
@@ -376,7 +384,7 @@ Force Upgrade File0=[SETUP PATH]\$MainExeFile$
 [Component MailNews]
 Description Short=Mail & News
 ;*** LOCALIZE ME BABY ***
-Description Long=Mozilla Mail & News
+Description Long=Email and Newsgroup Software
 Archive=mail.xpi
 $InstallSize$:mail
 $InstallSizeSystem$
@@ -403,7 +411,7 @@ Path=[WINDIR]
 [Component Chatzilla]
 Description Short=Chatzilla
 ;*** LOCALIZE ME BABY ***
-Description Long=Chatzilla IRC client
+Description Long=IRC Client
 Archive=chatzilla.xpi
 $InstallSize$:chatzilla
 $InstallSizeSystem$