From fd8bbba2f02b8bccd69e67c326fd320c0827941d Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Sun, 6 Feb 2011 22:37:08 +0000 Subject: Synthesized commit during git-svn import combining previous Mandriva history with Mageia. This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line Add drakx structure on the SVN ------------------------------------------------------------------------ r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned advertising ------------------------------------------------------------------------ r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line Import Clean perl-install ------------------------------------------------------------------------ r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line Add cleaned files ------------------------------------------------------------------------ r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned kernel ------------------------------------------------------------------------ r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line Import cleaned tools ------------------------------------------------------------------------ r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line Import stage1 ------------------------------------------------------------------------ r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line Import images ------------------------------------------------------------------------ r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines readd missing file ------------------------------------------------------------------------ r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line Import rescue ------------------------------------------------------------------------ r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines import cleaned rescue for Mageia ------------------------------------------------------------------------ r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line import (cleaned) doc ------------------------------------------------------------------------ --- perl-install/standalone.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'perl-install/standalone.pm') diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index 2d7986c24..2dd530254 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -1,4 +1,4 @@ -package standalone; # $Id$ +package standalone; # $Id: standalone.pm 262870 2009-10-27 10:53:55Z tv $ use c; use strict; @@ -61,8 +61,8 @@ default mode: offer to configure autologin feature"), OPTIONS: --help - print this help message. - --report - program should be one of Mandriva Linux tools - --incident - program should be one of Mandriva Linux tools"), + --report - program should be one of %s tools + --incident - program should be one of %s tools"), 'drakconnect' => N_("[--add] --add - \"add a network interface\" wizard --del - \"delete a network interface\" wizard @@ -85,7 +85,7 @@ OPTIONS: 'draksec' => "[--debug] --debug: print debugging information", 'drakTermServ' => N_("[OPTIONS]... -Mandriva Linux Terminal Server Configurator +%s Terminal Server Configurator --enable : enable MTS --disable : disable MTS --start : start MTS @@ -109,7 +109,7 @@ Network & Internet connection and monitoring application --quiet : do not be interactive. To be used with (dis)connect."), 'printerdrake' => " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]", 'rpmdrake' => N_("[OPTION]... - --no-confirmation do not ask first confirmation question in Mandriva Update mode + --no-confirmation do not ask first confirmation question in %s Update mode --no-verify-rpm do not verify packages signatures --changelog-first display changelog before filelist in the description window --merge-all-rpmnew propose to merge all .rpmnew/.rpmsave files found"), @@ -119,7 +119,7 @@ Network & Internet connection and monitoring application XFdrake resolution"), ); -$usages{$_} = $usages{rpmdrake} foreach qw(rpmdrake-remove MandrivaUpdate); +$usages{$_} = $usages{rpmdrake} foreach qw(rpmdrake-remove MageiaUpdate); $usages{Xdrakres} = $usages{XFdrake}; -- cgit v1.2.1