*** empty log message ***

2 files changed, 23 insertions, 14 deletions

diff --git a/perl-install/help.pm b/perl-install/help.pm
index 9de77c2ee..9179a7ef0 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -15,7 +15,7 @@ installed, or if you wish to use multiple distributions or versions.
 
 
 Choose \"Upgrade\" if you wish to update a previous version of Mandrake
-Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen) or 6.0 (Venus)."),
+Linux: 5.1 (Venice), 5.2 (Leeloo), 5.3 (Festen), 6.0 (Venus) or 6.1 (Helios)."),
 
 selectInstallClass =>
  __("Select:
@@ -60,9 +60,6 @@ on your system), as suggested by the installation guide. These
 are the options you will need to provide to the driver."),
 
 partitionDisks =>
-#- __("In this stage, you may choose what partition(s) use to install your
-#-Linux-Mandrake system."),
-
  __("At this point, you may choose what partition(s) to use to install
 your Linux-Mandrake system if they have been already defined (from a
 previous install of Linux or from another partitionning tool). In other
@@ -100,10 +97,9 @@ choosePackages =>
  __("You may now select the packages you wish to install.
 
 
-First you can select the size of your installed system and an automated
-selection of packages will be done according to your system usage. After
-that you can select more packages by group or click on Ok to keep the
-previous selection.
+First you can select group of package to install or upgrade. After that
+you can select more packages according to the total size you wish to
+select.
 
 
 If you are in expert mode, you can select packages individually.
@@ -168,6 +164,13 @@ a modem will be configured. DrakX will try to find your modem,
 if it fails you will have to select the right serial port where
 your modem is connected to."),
 
+installCrypto =>
+ __("You can install cryptographic package if your internet connection has been
+set up correctly. First choose a mirror where you wish to download packages and
+after that select the packages to install.
+
+Note you have to select mirror and cryptographic according to your legislation."),
+
 configureTimezone =>
  __("You can now select your timezone according to where you live.
 
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 369227b9a..ada4b10d2 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -598,22 +598,28 @@ sub kdeicons_postinstall($) {
     foreach (<F>) {
 	if (/^\/dev\/(\S+)\s+\/mnt\/cdrom (\d*)\s+/x) {
 	    my %toreplace = ( device => $1, id => $2 );
-	    template2userfile($prefix, "/usr/share/cdrom.fsdev.kdelnk.in", "Desktop/cdrom$2.kdelnk", 1, %toreplace);
+	    template2userfile($prefix, "/usr/share/cdrom.fsdev.kdelnk.in", "Desktop/Cd-Rom". ($2 && "_$2") ."kdelnk",
+			      1, %toreplace);
 	} elsif (/^\/dev\/(\S+)\s+\/mnt\/zip (\d*)\s+/x) {
 	    my %toreplace = ( device => $1, id => $2 );
-	    template2userfile($prefix, "/usr/share/zip.fsdev.kdelnk.in", "Desktop/zip$2.kdelnk", 1, %toreplace);
+	    template2userfile($prefix, "/usr/share/zip.fsdev.kdelnk.in", "Desktop/Zip". ($2 && "_$2") ."kdelnk",
+			      1, %toreplace);
 	} elsif (/^\/dev\/(\S+)\s+\/mnt\/floppy (\d*)\s+/x) {
 	    my %toreplace = ( device => $1, id => $2 );
-	    template2userfile($prefix, "/usr/share/floppy.fsdev.kdelnk.in", "Desktop/floppy$2.kdelnk", 1, %toreplace);
+	    template2userfile($prefix, "/usr/share/floppy.fsdev.kdelnk.in", "Desktop/Floppy". ($2 && "_$2") ."kdelnk",
+			      1, %toreplace);
 	} elsif (/^\/mnt\/cdrom (\d*)\s+\/mnt\/cdrom\d*\s+supermount/x) {
 	    my %toreplace = ( id => $1 );
-	    template2userfile($prefix, "/usr/share/cdrom.kdelnk.in", "Desktop/cdrom$2.kdelnk", 1, %toreplace);
+	    template2userfile($prefix, "/usr/share/cdrom.kdelnk.in", "Desktop/Cd-Rom". ($2 && "_$2") ."kdelnk",
+			      1, %toreplace);
 	} elsif (/^\/mnt\/zip (\d*)\s+\/mnt\/zip\d*\s+supermount/x) {
 	    my %toreplace = ( id => $1 );
-	    template2userfile($prefix, "/usr/share/zip.kdelnk.in", "Desktop/zip$2.kdelnk", 1, %toreplace);
+	    template2userfile($prefix, "/usr/share/zip.kdelnk.in", "Desktop/Zip". ($2 && "_$2") ."kdelnk",
+			      1, %toreplace);
 	} elsif (/^\/mnt\/floppy (\d*)\s+\/mnt\/floppy\d*\s+supermount/x) {
 	    my %toreplace = ( id => $1 );
-	    template2userfile($prefix, "/usr/share/floppy.kdelnk.in", "Desktop/floppy$2.kdelnk", 1, %toreplace);
+	    template2userfile($prefix, "/usr/share/floppy.kdelnk.in", "Desktop/Floppy". ($2 && "_$2") ."kdelnk",
+			      1, %toreplace);
 	} elsif (/^\/dev\/(\S+)\s+\/mnt\/DOS_ (\S*)\s+/x) {
 	    my %toreplace = ( device => $1, id => $2, mntpoint => "/mnt/DOS_$2" );
 	    template2userfile($prefix, "/usr/share/Dos_.kdelnk.in", "Desktop/Dos_$2.kdelnk", 1, %toreplace);