From ca012347134ab4eec6f196b5f86c9fc1f25cb5b7 Mon Sep 17 00:00:00 2001 From: Pablo Saratxaga Date: Sat, 23 Apr 2005 16:20:27 +0000 Subject: s/Mandrivalinux/Mandriva Linux/ --- perl-install/standalone/drakbug | 10 +++++----- perl-install/standalone/drakconnect | 6 +++--- perl-install/standalone/drakedm | 4 ++-- perl-install/standalone/drakhelp | 2 +- perl-install/standalone/logdrake | 4 ++-- perl-install/standalone/net_applet | 2 +- perl-install/standalone/net_monitor | 4 ++-- perl-install/standalone/scannerdrake | 8 ++++---- 8 files changed, 20 insertions(+), 20 deletions(-) (limited to 'perl-install/standalone') diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index 69dd95f24..b7b9fcbd9 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -1,8 +1,8 @@ #!/usr/bin/perl # Drak Bug Report -# Copyright (C) 2002-2004 Mandriva (daouda at mandrakesoft dot com) -# Stew Benedict (sbenedict at mandrakesoft dot com) +# Copyright (C) 2002-2004 Mandriva (daouda at mandriva dot com) +# Stew Benedict (sbenedict at mandriva dot com) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,12 +38,12 @@ foreach (@ARGV) { /^--incident$/ && shift @ARGV and do { $incident = 1; $prog = shift @ARGV }; } -my $window = ugtk2->new(N("Mandrivalinux Bug Report Tool"), center => 1); +my $window = ugtk2->new(N("Mandriva Linux Bug Report Tool"), center => 1); $window->{rwindow}->set_border_width(5); $window->{window}->signal_connect("delete_event", sub { ugtk2->exit(0) }); my $mdk_app = { - N("Mandrivalinux Control Center") => 'drakconf', + N("Mandriva Linux Control Center") => 'drakconf', N("First Time Wizard") => 'drakfw', N("Synchronization tool") => 'draksync', N("Standalone Tools") => ['adduserdrake', 'diskdrake', 'drakautoinst', 'drakbackup', 'drakboot', 'DrakBug', 'DrakClock', 'DrakConnect', 'drakfloppy', 'drakfirewall', 'drakfont', 'drakgw', 'DrakSec', 'draksplash', 'drakvpn', 'drakxservices', 'drakxtools', 'drakxtv', 'keyboardrake', 'logdrake', 'mousedrake', 'net_monitor', 'printerdrake', 'scannerdrake', 'XFdrake'], @@ -74,7 +74,7 @@ if ($mandrake_release =~ /(official|community)/i) { } else { $distrocode = "cooker"; } -$bugzilla = 'http://qa.mandrakesoft.com/enter_bug.cgi'; +$bugzilla = 'http://qa.mandriva.com/enter_bug.cgi'; $wizard_name = "Bugzilla"; $table = create_packtable({ col_spacings => 5, row_spacings => 10 }, diff --git a/perl-install/standalone/drakconnect b/perl-install/standalone/drakconnect index 2a2337733..16a237ea8 100755 --- a/perl-install/standalone/drakconnect +++ b/perl-install/standalone/drakconnect @@ -5,7 +5,7 @@ # Copyright (C) 1999-2004 Mandriva # Damien "Dam's" Krotkine # Damien "poulpy" Chaumette -# Thierry Vignaud +# Thierry Vignaud # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -951,7 +951,7 @@ Configure them first by clicking on 'Configure'"))); update(); }); } else { - $widget_temp = N("This interface has not been configured yet.\nRun the \"Add an interface\" assistant from the Mandrivalinux Control Center"); + $widget_temp = N("This interface has not been configured yet.\nRun the \"Add an interface\" assistant from the Mandriva Linux Control Center"); } $vbox_local->pack_start(gtkpack__(Gtk2::HBox->new(0,0), $widget_temp @@ -1007,7 +1007,7 @@ sub configure_net { N("Warning"), #-PO: here "Add Connection" should be translated the same was as in control-center N("You do not have any configured Internet connection. -Run the \"%s\" assistant from the Mandrivalinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))); +Run the \"%s\" assistant from the Mandriva Linux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)"))); $in->exit; } my $cnx = {}; diff --git a/perl-install/standalone/drakedm b/perl-install/standalone/drakedm index 5ba4894c7..e3bc373ac 100644 --- a/perl-install/standalone/drakedm +++ b/perl-install/standalone/drakedm @@ -1,6 +1,6 @@ #!/usr/bin/perl # DrakxDM -- Display Manager chooser -# Copyright (C) 2003-2004 Mandriva (tvignaud@mandrakesoft.com) +# Copyright (C) 2003-2004 Mandriva (tvignaud@mandriva.com) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ my $cfg_file = '/etc/sysconfig/desktop'; my %dm = ('GNOME' => [ N("GDM (GNOME Display Manager)"), '/usr/bin/gdm', 'gdm' ], 'KDM' => [ N("KDM (KDE Display Manager)"), '/usr/bin/kdm', 'kdebase-kdm' ], - 'KDE' => [ N("MdkKDM (Mandrivalinux Display Manager)"), '/usr/bin/mdkkdm', 'mdkkdm' ], + 'KDE' => [ N("MdkKDM (Mandriva Linux Display Manager)"), '/usr/bin/mdkkdm', 'mdkkdm' ], 'XDM' => [ N("XDM (X Display Manager)"), '/usr/bin/X11/xdm', 'xorg-x11' ], ); diff --git a/perl-install/standalone/drakhelp b/perl-install/standalone/drakhelp index 303c06d9a..4c13e79dd 100644 --- a/perl-install/standalone/drakhelp +++ b/perl-install/standalone/drakhelp @@ -33,6 +33,6 @@ my $in = interactive->vnew; my ($instpath, $ancpath, $package) = ctxhelp::path2help($opt, $idlabel); -e $instpath or system("/usr/sbin/drakhelp_inst $package"); --e $instpath or $in->ask_warn(N("Mandrivalinux Help Center"), N("%s cannot be displayed \n. No Help entry of this type\n", $instpath)); +-e $instpath or $in->ask_warn(N("Mandriva Linux Help Center"), N("%s cannot be displayed \n. No Help entry of this type\n", $instpath)); system("/usr/bin/www-browser $ancpath &") if -e $instpath; diff --git a/perl-install/standalone/logdrake b/perl-install/standalone/logdrake index 339509723..fd2a27cb6 100755 --- a/perl-install/standalone/logdrake +++ b/perl-install/standalone/logdrake @@ -2,7 +2,7 @@ # $Id$ # Copyright (C) 2001-2004 Mandriva -# Yves Duret +# Yves Duret # some code is Copyright: (C) 1999, Michael T. Babcock # # This program is free software; you can redistribute it and/or modify @@ -47,7 +47,7 @@ $| = 1 if $isTail; my $h = chomp_(`hostname -s`); $ugtk2::wm_icon = "logdrake"; -my $explain_title = N("Mandrivalinux Tools Logs"); +my $explain_title = N("Mandriva Linux Tools Logs"); my $my_win = ugtk2->new($isExplain ? $explain_title : N("Logdrake")); unless ($::isEmbedded) { diff --git a/perl-install/standalone/net_applet b/perl-install/standalone/net_applet index c7e5d581a..e3bab7c67 100644 --- a/perl-install/standalone/net_applet +++ b/perl-install/standalone/net_applet @@ -59,7 +59,7 @@ my %appletstate = ( menu => [ 'confNetwork', 'refresh', 'help' ], tt => [ N_("You do not have any configured Internet connection. -Run the \"%s\" assistant from the Mandrivalinux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)")) +Run the \"%s\" assistant from the Mandriva Linux Control Center", N("Set up a new network interface (LAN, ISDN, ADSL, ...)")) ] } ); diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index 78e7eab4f..05828517d 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -4,7 +4,7 @@ # Copyright (C) 1999-2004 Mandriva # Damien "Dam's" Krotkine -# Thierry Vignaud +# Thierry Vignaud # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -233,7 +233,7 @@ sub connection() { N("Disconnection from Internet complete.")) : ($isconnected ? N("Connection complete.") : - N("Connection failed.\nVerify your configuration in the Mandrivalinux Control Center.")) + N("Connection failed.\nVerify your configuration in the Mandriva Linux Control Center.")) ); # remove the connection time timer if connection is down or failed $isconnected or Glib::Source->remove($ct_tag); diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake index be0ec07b2..fdfc92303 100755 --- a/perl-install/standalone/scannerdrake +++ b/perl-install/standalone/scannerdrake @@ -1,8 +1,8 @@ #!/usr/bin/perl # scannerdrake $Id$ -# Yves Duret -# Till Kamppeter +# Yves Duret +# Till Kamppeter # Copyright (C) 2001-2004 Mandriva # # This program is free software; you can redistribute it and/or modify @@ -30,8 +30,8 @@ use handle_configs; use services; my $companyname = "Mandriva"; -my $distroname = "Mandrivalinux"; -my $shortdistroname = "Mandrivalinux"; +my $distroname = "Mandriva Linux"; +my $shortdistroname = "Mandriva Linux"; my $domainname = "mandriva.com"; foreach (@ARGV) { -- cgit v1.2.1