no_comment

5 files changed, 26 insertions, 35 deletions

diff --git a/perl-install/help.pm b/perl-install/help.pm
index 604124b20..233bd1ced 100644
--- a/perl-install/help.pm
+++ b/perl-install/help.pm
@@ -164,14 +164,8 @@ If you want to access a SMB printer (which means, a printer located
 on a remote Windows 9x/NT machine), you will have to specify its
 SMB name (which is not its TCP/IP name), and possibly its IP address,
 plus the username, workgroup and password required in order to
-access the printer, and of course the name of the printer.
-
-
-The same goes for a NetWare printer, except that you need no
-workgroup information. As for SMB printers, keep in mind that
-the Netware name (which is the one you have to enter) is not
-the name as its TCP/IP name, therefore you may also want to
-enter the IP address of the print server as well."),
+access the printer, and of course the name of the printer. The same goes
+for a NetWare printer, except that you need no workgroup information."),
 
 setRootPassword =>
  __("You must now enter the root password for your Linux-Mandrake
@@ -402,14 +396,8 @@ If you want to access a SMB printer (which means, a printer located
 on a remote Windows 9x/NT machine), you will have to specify its
 SMB name (which is not its TCP/IP name), and possibly its IP address,
 plus the username, workgroup and password required in order to
-access the printer, and of course the name of the printer.
-
-
-The same goes for a NetWare printer, except that you need no
-workgroup information. As for SMB printers, keep in mind that
-the Netware name (which is the one you have to enter) is not
-the name as its TCP/IP name, therefore you may also want to
-enter the IP address of the print server as well."),
+access the printer, and of course the name of the printer.The same goes
+for a NetWare printer, except that you need no workgroup information."),
 
 setRootPassword =>
  __("You must now enter the root password for your Linux-Mandrake
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 37b97a844..d19240f9c 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -75,7 +75,8 @@ $installSteps{first} = $installSteps[0];
 #-#####################################################################################
 #-INTERN CONSTANT
 #-#####################################################################################
-my @install_classes = (__("Beginner"), __("Developer"), __("Server"), __("Expert"));
+#- these strings are used in quite a lot of places and must not be changed!!!!!
+my @install_classes = (__("beginner"), __("developer"), __("server"), __("expert"));
 
 #-#####################################################################################
 #-Default value
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index b2e84025a..41052c851 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -181,7 +181,7 @@ sub configureNetwork($) {
 			_("Do you want to configure LAN (not dialup) networking for your system?")) or $r = "Don't";
     }
 
-    if ($r =~ /^Don\'t/) {
+    if ($r =~ /^Don't/) { #-' for xgettext
 	$o->{netc}{NETWORKING} = "false";
     } elsif ($r !~ /^Keep/) {
 	$o->setup_thiskind('net', !$::expert, 1);
@@ -608,6 +608,7 @@ You can add some more or change the existent ones."),
 	    $e = $b->{entries}{$name};
 	}
 	my $old_name = $name;
+	my %old_e = %$e;
 	my $default = my $old_default = $e->{label} eq $b->{default};
 	    
 	my @l;
@@ -634,16 +635,18 @@ _("Label") => \$e->{label},
 _("Default") => { val => \$default, type => 'bool' },
 	);
 
-	$o->ask_from_entries_ref('',
-				 '',
-				 [ grep_index { even($::i) } @l ],
-				 [ grep_index {  odd($::i) } @l ],
-				 ) or return;
-
-	$b->{default} = $old_default ^ $default ? $default && $e->{label} : $b->{default};
-
-	delete $b->{entries}{$old_name};
-	$b->{entries}{$name} = $e;
+	if ($o->ask_from_entries_ref('',
+				     '',
+				     [ grep_index { even($::i) } @l ],
+				     [ grep_index {  odd($::i) } @l ],
+				    )) {
+	    $b->{default} = $old_default ^ $default ? $default && $e->{label} : $b->{default};
+	    
+	    delete $b->{entries}{$old_name};
+	    $b->{entries}{$name} = $e;
+	} else {
+	    %$e = %old_e;
+	}
     }
     eval { $o->SUPER::setupBootloader };
     if ($@) {
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index caff2f2a5..0b53dfa7a 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -292,14 +292,9 @@ sub load_thiskind($;&) {
 
 sub get_pcmcia_devices($) {
     my ($type) = @_;
-    my $file = "/var/run/stab";
-    my @devs;
-    my $module;
-    my $desc;
+    my (@devs, $module, $desc);
 
-    local *F;
-    open F, $file or return; #- no pcmcia is not an error.
-    while (<F>) {
+    foreach (cat_("/var/run/stab")) {
 	$desc = $1 if /^Socket\s+\d+:\s+(.*)/;
 	$module = $1 if /^\d+\s+$type[^\s]*\s+([^\s]+)/;
 	if ($desc && $module) {
diff --git a/perl-install/share/po/Makefile b/perl-install/share/po/Makefile
index ad4f9486b..3e8e1a72b 100644
--- a/perl-install/share/po/Makefile
+++ b/perl-install/share/po/Makefile
@@ -7,6 +7,10 @@ all: $(POFILES)
 clean:
 	rm -f empty.po $(POFILES:%=%t) $(PMSCFILES)
 
+verif:
+	perl -ne '/^\s*#/ or $$i += my @l = /\b__?\(/g; END { print "$$i\n" }' $(PMSFILES)
+	perl -ne '$$i += my @l = /\.c:/g; END { print "$$i\n" }' panoramix.pot
+
 $(POFILES): panoramix.pot
 	cp -f $@ $@t
 	msgmerge $@t $< > $@