From 126777bc019a54afb4ec51299f2cf9d2841698aa Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 25 Apr 2007 12:26:16 +0000 Subject: re-sync after the big svn loss --- perl-install/standalone.pm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'perl-install/standalone.pm') diff --git a/perl-install/standalone.pm b/perl-install/standalone.pm index ec5b379c5..a03f7a68a 100644 --- a/perl-install/standalone.pm +++ b/perl-install/standalone.pm @@ -2,7 +2,7 @@ package standalone; # $Id$ use c; use strict; -use common qw(N N_ if_); +use common qw(N N_ if_ backtrace); use Config; #- for sanity (if a use standalone is made during install, MANY problems will happen) @@ -17,6 +17,7 @@ $ENV{SHARE_PATH} ||= "/usr/share"; eval { #- allow standalone.pm to be used in drakxtools-backend without perl-Locale-gettext c::init_setlocale(); + push @::textdomains, 'libDrakX-standalone', 'drakx-net', 'drakx-kbd-mouse-x11'; Locale::gettext::bindtextdomain('libDrakX', "/usr/share/locale"); }; @@ -32,7 +33,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. "); my $progname = common::basename($0); @@ -106,7 +107,7 @@ Network & Internet connection and monitoring application --force : used with (dis)connect : force (dis)connection. --status : returns 1 if connected 0 otherwise, then exit. --quiet : do not be interactive. To be used with (dis)connect."), - 'printerdrake' => N_(" [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"), + 'printerdrake' => " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]", 'rpmdrake' => N_("[OPTION]... --no-confirmation do not ask first confirmation question in Mandriva Update mode --no-verify-rpm do not verify packages signatures @@ -136,7 +137,7 @@ sub __exit { sub version() { print 'Drakxtools version 10 -Copyright (C) 1999-2004 Mandriva by +Copyright (C) 1999-2006 Mandriva by ', $::license, "\n"; } @@ -182,7 +183,7 @@ sub explanations { log::explanations("@_") } our @common_functs = qw(renamef linkf symlinkf output substInFile mkdir_p rm_rf cp_af touch setVarsInSh setExportedVarsInSh setExportedVarsInCsh update_gnomekderc); our @builtin_functs = qw(chmod chown __exit exit unlink link symlink rename system); -our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree any bootloader bootlook c commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modules::parameters modules mouse my_gtk network network::adsl network::ethernet network::isdn_consts network::isdn network::modem network::netconnect network::network network::nfs network::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall); +our @drakx_modules = qw(Xconfig::card Xconfig::default Xconfig::main Xconfig::monitor Xconfig::parse Xconfig::proprietary Xconfig::resolution_and_depth Xconfig::screen Xconfig::test Xconfig::various Xconfig::xfree any bootloader bootlook c commands crypto detect_devices devices diskdrake diskdrake::hd_gtk diskdrake::interactive diskdrake::removable diskdrake::removable_gtk diskdrake::smbnfs_gtk fs fsedit http keyboard lang log loopback lvm modules::parameters modules mouse my_gtk network network::adsl network::ethernet network::connection network::isdn_consts network::isdn network::modem network::netconnect network::network fs::remote::nfs fs::remote::smb network::tools partition_table partition_table_bsd partition_table::dos partition_table::empty partition_table::gpt partition_table::mac partition_table::raw partition_table::sun printer printerdrake proxy raid run_program scanner services steps swap timezone network::drakfirewall network::shorewall); $SIG{SEGV} = sub { my $progname = $0; $progname =~ s|.*/||; exec("drakbug --incident $progname") }; -- cgit v1.2.1