diff options
| author | Anssi Hannula <anssi@mageia.org> | 2011-12-04 02:23:58 +0000 |
|---|---|---|
| committer | Anssi Hannula <anssi@mageia.org> | 2011-12-04 02:23:58 +0000 |
| commit | cb81da8dff967a061522f2027f85706669ee058c (patch) | |
| tree | 7953b91381b393fc86fd53fa37fa30cc97935bcd /perl-install | |
| parent | 0de778ccea2e000b83be774271f8c0596a516b7e (diff) | |
| download | drakx-backup-do-not-use-cb81da8dff967a061522f2027f85706669ee058c.tar drakx-backup-do-not-use-cb81da8dff967a061522f2027f85706669ee058c.tar.gz drakx-backup-do-not-use-cb81da8dff967a061522f2027f85706669ee058c.tar.bz2 drakx-backup-do-not-use-cb81da8dff967a061522f2027f85706669ee058c.tar.xz drakx-backup-do-not-use-cb81da8dff967a061522f2027f85706669ee058c.zip | |
service_harddrake: better messages in notify-x11-free-driver-switch
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/notify-x11-free-driver-switch | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index ab296ced9..0cb062ab3 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- service_harddrake: + o better notification message when the driver has been automatically + switched + Version 13.70.2 - 27 November 2011 - fix crashing on creating temp file if temp dir doesn't exist (mga#1396) diff --git a/perl-install/standalone/notify-x11-free-driver-switch b/perl-install/standalone/notify-x11-free-driver-switch index 51e9cf85a..e871d2ee9 100755 --- a/perl-install/standalone/notify-x11-free-driver-switch +++ b/perl-install/standalone/notify-x11-free-driver-switch @@ -15,9 +15,9 @@ my $driver = eval { my $reason = cat_utf8($ENV{LOCK}); -$in->ask_warn(N("Warning"), +$in->ask_warn(N("Display driver setup"), join("\n\n", - N("The proprietary driver for your graphic card cannot be found, the system is now using the free software driver (%s).", $driver), + N("The display driver has been automatically switched to '%s'.", $driver), 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 316088431..236ed3c77 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -150,7 +150,7 @@ sub should_reconfigure_x_driver { # auto reconfigure x11 only on first time default driver have changed: if ($previous_xorg_config{XORG_DRV} ne $new_key) { if (!member($current_driver, $card_data->{Driver}, $card_data->{Driver2}, 'fbdev', 'vesa')) { - $reason = N("The graphic card '%s' is no more supported by the '%s' driver", + $reason = N("The graphics card '%s' is no longer supported by driver '%s'", $device->{description}, $current_driver); $reconfigure = 1; } @@ -251,7 +251,7 @@ 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("The proprietary kernel driver was not found for '%s' X.org driver", + my $reason = N("The proprietary kernel driver was not found for X.org driver '%s'", $old_driver); $reboot_needed |= switch_x_driver($card->{xorg_driver_regexp}, $driver, $reason); $do_udev_settle = 1; |