diff options
Diffstat (limited to 'perl-install/standalone/drakbug')
| -rwxr-xr-x | perl-install/standalone/drakbug | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/perl-install/standalone/drakbug b/perl-install/standalone/drakbug index a5f02c5c5..365be533f 100755 --- a/perl-install/standalone/drakbug +++ b/perl-install/standalone/drakbug @@ -73,18 +73,18 @@ if (!check_for_xserver()) { mygtk2::init(); $ugtk2::wm_icon = 'drakbug-16'; -my $window = ugtk2->new(N("Mandriva Linux Bug Report Tool"), center => 1); +my $window = ugtk2->new(N("%s 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("Mandriva Linux Control Center") => 'drakconf', + N("%s Control Center") => 'drakconf', N("First Time Wizard") => 'drakfw', N("Synchronization tool") => 'draksync', N("Standalone Tools") => 'drakxtools', "harddrake" => 'harddrake2', - N("Mandriva Online") => 'mdkonline', - N("Mandriva Online") => 'mdkapplet', + N("%s Online") => 'mdkonline', + N("%s Online") => 'mdkapplet', N("Remote Control") => 'rfbdrake', N("Software Manager") => 'rpmdrake', N("Windows Migration tool") => 'transfugdrake', @@ -93,24 +93,24 @@ my $mdk_app = { my @generic_tool = keys %$mdk_app; my @all_drakxtools = qw(adduserdrake diskdrake drakautoinst drakboot drakbug drakclock drakfloppy drakfont draksec drakxservices drakxtools drakxtv logdrake scannerdrake); -push @generic_tool, @all_drakxtools, qw(MandrivaUpdate drakbackup drakconnect drakfirewall drakhosts drakmenustyle draknfs draksambashare drakgw drakroam drakvpn keyboarddrake msec mousedrake net_monitor printerdrake urpmi userdrake XFdrake); +push @generic_tool, @all_drakxtools, qw(MageiaUpdate drakbackup drakconnect drakfirewall drakhosts drakmenustyle draknfs draksambashare drakgw drakroam drakvpn keyboarddrake msec mousedrake net_monitor urpmi userdrake XFdrake); my $kernel_release = chomp_(`uname -r`); -my $mandrake_release = chomp_(cat_('/etc/mandrakelinux-release')); +my $mageia_release = chomp_(cat_('/etc/release')); #- unused for now -#- (my $mandrake_version) = $mandrake_release =~ /(\d+\.\d+)/; +#- (my $mageia_version) = $mageia_release =~ /(\d+\.\d+)/; -if ($mandrake_release =~ /(official|community)/i) { - $distrocode = $mandrake_release; +if ($mageia_release =~ /(official|community)/i) { + $distrocode = $mageia_release; $distrocode =~ s/^.*?(\d+\.\d+) \((\w+)\).*$/$1-\l$2/; } else { $distrocode = "cooker"; } -my $bugzilla_url = 'http://qa.mandriva.com/enter_bug.cgi'; +my $bugzilla_url = 'http://bugs.mageia.org/enter_bug.cgi'; my $wizard_name = "Bugzilla"; $table = create_packtable({ col_spacings => 5, row_spacings => 10 }, - [ gtknew('Label_Left', text => N("Select Mandriva Tool:")), $comb_app = Gtk2::ComboBox->new_text, $comb_app->set_wrap_width(3) ], + [ gtknew('Label_Left', text => N("Select %s Tool:")), $comb_app = Gtk2::ComboBox->new_text, $comb_app->set_wrap_width(3) ], [ gtknew('Label_Left', text => N("or Application Name\n(or Full Path):")), gtkpack_(Gtk2::HBox->new(0, 5), 1, $com_app = gtkset_editable(Gtk2::Entry->new, 1), @@ -141,7 +141,7 @@ my $parent_uid = get_parent_uid(); my $width = 600; gtkadd($window->{window}, gtkpack_(Gtk2::VBox->new(0, 5), - 0, gtknew('Title1', label => $mandrake_release, width => $width), + 0, gtknew('Title1', label => $mageia_release, width => $width), 1, create_scrolled_window( gtknew('TextView', editable => 0, height => 150, text => [ @@ -250,7 +250,7 @@ sub get_top_of_trace { sub report_bug_to_bugzilla() { my $p = $package->get_text; - my ($product, $version) = $p =~ /^(.*)-([^-]+-[^-]+(mdk|mdv.*))$/; # FIXME: fragile! + my ($product, $version) = $p =~ /^(.*)-([^-]+-[^-]+(mga.*))$/; # FIXME: fragile! my $app = $comb_app->entry->get_text; my $_component = $app ? if_(member($app, @all_drakxtools), $app) || $mdk_app->{$app} : @@ -266,7 +266,7 @@ sub report_bug_to_bugzilla() { return; } } - my $rel_data = mandrake_release_info(); + my $rel_data = mageia_release_info(); my $rel = standalone::real_version(); my $cpuinfo; if (cat_('/proc/cpuinfo') =~ /model name\s*:\s*(.*)$/m) { @@ -276,9 +276,9 @@ sub report_bug_to_bugzilla() { $arch = 'i586' if arch =~ /^i.86/; my $options = join('&', ($product || $version ? 'cf_rpmpkg=' . join('-', $product, $version) : ()), - 'version=' . ($rel_data->{branch} eq 'Devel' ? 'Cooker' : $rel_data->{version}), + 'version=' . ($rel_data->{branch} eq 'Devel' ? 'Cauldron' : $rel_data->{version}), 'component=Core%20Packages', - 'classification=Mandriva%20Linux', + 'classification=Mageia', "rep_platform=$arch", if_($incident, join('', "short_desc=$prog%20", |