From c6bb75b746504a2536148bdb17d214caace4e69f Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 29 Oct 2009 17:14:07 +0000 Subject: better messages --- perl-install/standalone/notify-x11-free-driver-switch | 2 +- perl-install/standalone/service_harddrake | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/perl-install/standalone/notify-x11-free-driver-switch b/perl-install/standalone/notify-x11-free-driver-switch index 1a7ecc1b5..38bd8cba3 100755 --- a/perl-install/standalone/notify-x11-free-driver-switch +++ b/perl-install/standalone/notify-x11-free-driver-switch @@ -18,6 +18,6 @@ my $reason = cat_($ENV{LOCK}); $in->ask_warn(N("Warning"), join("\n\n", N("The proprietary driver for your graphic card can not be found, the system is now using the free software driver (%s).", $driver), - if_($reason, N("Reason: %s", $reason)), + if_($reason, N("Reason: %s.", $reason)), )); unlink $0 if $0 =~ m!/etc/X11/xsetup.d/!; diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index d2a4cd6a9..9ce34d608 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -135,7 +135,8 @@ foreach my $device (@devices) { next if $previous_xorg_config{XORG_DRV} eq $new_key; if (!member($current_driver, $card_data->{Driver}, $card_data->{Driver2}, 'fbdev', 'vesa')) { - my $reason = N("no more supported by this driver"); + my $reason = N("The graphic card '%s' is no more supported by the '%s' driver", + $device->{description}, $current_driver); switch_x_driver($current_driver, $card_data->{Driver}, $reason); schedule_warn_about_switch($reason) if any { $current_driver =~ $_->{xorg_driver_regexp} } @cards; next; @@ -163,7 +164,8 @@ foreach my $card (@cards) { my $driver = $cards[0]{Driver}; my $old_driver = cat_('/etc/X11/xorg.conf') =~ /Driver "($card->{xorg_driver_regexp})"/ && $1; if ($old_driver) { - my $reason = N("proprietary driver not found for current driver"); + my $reason = N("The proprietary kernel driver was not found for '%s' xorg driver", + $old_driver); switch_x_driver($card->{xorg_driver_regexp}, $driver, $reason); schedule_warn_about_switch($reason); } -- cgit v1.2.1