diff options
Diffstat (limited to 'perl-install/standalone.pm')
| -rw-r--r-- | perl-install/standalone.pm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index 0681d2f2d..4a3cb0c0a 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -58,8 +58,8 @@ default mode: offer to configure autologin feature"), OPTIONS: --help - print this help message. - --report - program should be one of mandrake tools - --incident - program should be one of mandrake tools"), + --report - program should be one of mandrakelinux tools + --incident - program should be one of mandrakelinux tools"), 'drakconnect' => N_("[--add] --add - \"add a network interface\" wizard --del - \"delete a network interface\" wizard @@ -72,7 +72,7 @@ Font Importation and monitoring application OPTIONS: --windows_import : import from all available windows partitions. --xls_fonts : show all fonts that already exist from xls ---install : accept any font file and any directry. +--install : accept any font file and any directory. --uninstall : uninstall any font or any directory of font. --replace : replace all font if already exist --application : 0 none application. @@ -82,7 +82,7 @@ OPTIONS: 'draksec' => "[--debug] --debug: print debugging information", 'drakTermServ' => N_("[OPTIONS]... -Mandrake Terminal Server Configurator +Mandrakelinux Terminal Server Configurator --enable : enable MTS --disable : disable MTS --start : start MTS @@ -119,13 +119,19 @@ Network & Internet connection and monitoring application $usages{$_} = $usages{rpmdrake} foreach qw(rpmdrake-remove MandrakeUpdate); $usages{Xdrakres} = $usages{XFdrake}; +sub version() { + print 'Drakxtools version 10 +Copyright (C) 1999-2004 Mandrakesoft by <install@mandrakesoft.com> +', $::license, "\n"; +} my ($i, @new_ARGV); foreach (@ARGV) { $i++; if (/^-(-help|h)$/) { version(); - print N("\nUsage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] ", $progname), if_($usages{$progname}, $usages{$progname}), "\n"; + print N("\nUsage: %s [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--testing] [-v|--version] ", $progname), + if_($usages{$progname}, common::translate($usages{$progname})), "\n"; # print N("\nUsage: "), $::usage, "\n" if $::usage; exit(0); } elsif (/^-(-version|v)$/) { @@ -152,12 +158,6 @@ foreach (@ARGV) { @ARGV = @new_ARGV; -sub version { - print 'Drakxtools version 10 -Copyright (C) 1999-2004 Mandrakesoft by <install@mandrakesoft.com> -', $::license, "\n"; -} - ################################################################################ #- stuff will go to special /var/log/explanations file @@ -170,16 +170,16 @@ our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::mo $SIG{SEGV} = sub { my $progname = $0; $progname =~ s|.*/||; exec("drakbug --incident $progname") }; -sub import { +sub import() { ($standalone_name = $0) =~ s|.*/||; - c::openlog($standalone_name."[$$]"); + c::openlog($standalone_name . "[$$]"); explanations('### Program is starting ###'); eval "*common::$_ = *$_" foreach @common_functs; foreach my $f (@builtin_functs) { - eval "*$_"."::$f = *$f" foreach @drakx_modules; - eval "*".caller()."::$f = *$f"; + eval "*$_" . "::$f = *$f" foreach @drakx_modules; + eval "*" . caller() . "::$f = *$f"; } } @@ -283,7 +283,7 @@ sub symlink { } sub rename { - explanations "renamed file $_[0] to $_[1]"; + explanations "renamed file $_[0] to $_[1]" if -r $_[0]; CORE::rename($_[0], $_[1]); } |