fixed i18n

6 files changed, 11 insertions, 8 deletions

diff --git a/perl-install/bootlook.pm b/perl-install/bootlook.pm
index a9cac7b0f..6f38455c8 100644
--- a/perl-install/bootlook.pm
+++ b/perl-install/bootlook.pm
@@ -222,7 +222,7 @@ sub get_main_menu {
 sub isXlaunched
 {
     my $line;
-    open INITTAB, "/etc/inittab" or die _("can not open /etc/inittab for reading: $!");
+    open INITTAB, "/etc/inittab" or die _("can not open /etc/inittab for reading: %s", $!);
     while (<INITTAB>) {
 	if (/id:([1-6]):initdefault:/) { $line = $_; last; }
     }
@@ -276,7 +276,7 @@ sub isAutologin
 {
     my $line;
     
-    open AUTOLOGIN, "/etc/sysconfig/autologin" or die _("can not open /etc/sysconfig/autologin for reading: $!");
+    open AUTOLOGIN, "/etc/sysconfig/autologin" or die _("can not open /etc/sysconfig/autologin for reading: %s", $!);
     while (<AUTOLOGIN>) {
 	if (/AUTOLOGIN=(yes|no)/) { $line = $_; last; }
     }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 41ec2cf19..92ce4ffcd 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -786,7 +786,7 @@ sub loadO {
     } else {
 	-e "$f.pl" and $f .= ".pl" unless -e $f;
 
-	my $fh = -e $f ? do { local *F; open F, $f; *F } : getFile($f) or die _("Error reading file $f");
+	my $fh = -e $f ? do { local *F; open F, $f; *F } : getFile($f) or die _("Error reading file %s", $f);
 	{
 	    local $/ = "\0";
 	    no strict;
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 518834848..fcc07b5d0 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -176,7 +176,7 @@ sub go_ethernet {
     configureNetwork($netc, $intf, $first_time) or return;
     if ( $::isStandalone and $netc->{NET_DEVICE}) {
 	$in->ask_yesorno(_("Network interface"),
-			 _("I'm about to restart the network device $netc->{NET_DEVICE}. Do you agree?"), 1) and system("$prefix/sbin/ifdown $netc->{NET_DEVICE}; $prefix/sbin/ifup $netc->{NET_DEVICE}");
+			 _("I'm about to restart the network device %s. Do you agree?", $netc->{NET_DEVICE}), 1) and system("$prefix/sbin/ifdown $netc->{NET_DEVICE}; $prefix/sbin/ifup $netc->{NET_DEVICE}");
     }
     1;
 }
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm
index 628b9278a..14706ea01 100644
--- a/perl-install/network/network.pm
+++ b/perl-install/network/network.pm
@@ -287,7 +287,7 @@ notation (for example, 1.2.3.4).");
     my @fields = qw(IPADDR NETMASK);
     $::isStandalone or $in->set_help('configureNetworkIP');
     $in->ask_from_entries_refH(_("Configuring network device %s", $intf->{DEVICE}),
-			      (_("Configuring network device %s", $intf->{DEVICE}) . ( $module ? _(" (driver $module)") : '' ) ."\n\n") .
+			      (_("Configuring network device %s", $intf->{DEVICE}) . ( $module ? _(" (driver %s)", $module) : '' ) ."\n\n") .
 			      $text,
 			     [ { label => _("IP address"), val => \$intf->{IPADDR}, disabled => sub { $pump } },
 			       { label => _("Netmask"),     val => \$intf->{NETMASK}, disabled => sub { $pump } },
diff --git a/perl-install/raid.pm b/perl-install/raid.pm
index 9ae8db8ce..c59e7f691 100644
--- a/perl-install/raid.pm
+++ b/perl-install/raid.pm
@@ -107,7 +107,7 @@ sub write {
     my ($raids, $file) = @_;
     local *F;
     local $\ = "\n";
-    open F, ">$file" or die _("Can't write file $file");
+    open F, ">$file" or die _("Can't write file %s", $file);
 
     foreach (grep {$_} @$raids) {
 	print F <<"EOF";
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw
index 35257a6ad..377e780eb 100755
--- a/perl-install/standalone/drakgw
+++ b/perl-install/standalone/drakgw
@@ -250,7 +250,7 @@ my $lan_address = "192.168.0";
 foreach (grep { $_ ne $device } @configured_devices)
 {
     grep(/$lan_address/, cat_("/etc/sysconfig/network-scripts/ifcfg-$_")) and
-      ($in->ask_warn('', _("Potential LAN address conflict found in current config of $_!\n")) or goto step_detectsetup);
+      ($in->ask_warn('', _("Potential LAN address conflict found in current config of %s!\n", $_)) or goto step_detectsetup);
 }
 
 
@@ -308,7 +308,7 @@ $in->do_pkgs->install(grep { !-e $rpm2file{$_} } keys %rpm2file);
 if (grep { !-e $rpm2file{$_} } keys %rpm2file) {
     foreach (keys %rpm2file) {
 	-e $rpm2file{$_} or $in->do_pkgs->install($_);
-	-e $rpm2file{$_} or fatal_quit(_("Problems installing package $_"));
+	-e $rpm2file{$_} or fatal_quit(_("Problems installing package %s", $_));
     }
 }
 
@@ -665,6 +665,9 @@ Click on Configure to launch the setup wizard.", $setup_state));
 
 #-------------------------------------------------
 #- $Log$
+#- Revision 1.50  2001/08/18 00:06:32  siegel
+#- fixed i18n
+#-
 #- Revision 1.49  2001/08/09 09:35:37  gc
 #- use vnew the right way everywhere
 #-