summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-11-07 14:04:55 +0000
committerFrancois Pons <fpons@mandriva.com>2000-11-07 14:04:55 +0000
commita820561a66504ca7e5d833dfaf6bceb0dda5ee6e (patch)
tree1666a0bac98b5c20d2d239a1eb8cec07b4f3aa53
parentbe746a36679d2da5cf985406369e7a8bcdc3d51d (diff)
downloaddrakx-a820561a66504ca7e5d833dfaf6bceb0dda5ee6e.tar
drakx-a820561a66504ca7e5d833dfaf6bceb0dda5ee6e.tar.gz
drakx-a820561a66504ca7e5d833dfaf6bceb0dda5ee6e.tar.bz2
drakx-a820561a66504ca7e5d833dfaf6bceb0dda5ee6e.tar.xz
drakx-a820561a66504ca7e5d833dfaf6bceb0dda5ee6e.zip
fixed text for card prefered in XFree 3.3 (RIVA128).
-rw-r--r--perl-install/Xconfigurator.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index d244c5e92..6469c3369 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -228,7 +228,7 @@ sub cardConfiguration(;$$$) {
#- try to figure if 3D acceleration is supported
#- by XFree 3.3 but not XFree 4.0 then ask user to keep XFree 3.3 ?
if ($card->{Utah_glx}) {
- $msg = ($card->{use_xf4} && !$card->{DRI_glx} ?
+ $msg = ($card->{use_xf4} && !$card->{DRI_glx} && !$card->{prefer_xf3} ?
_("Your card can have 3D hardware acceleration support but only with XFree %s.
Your card is supported by XFree %s which may have a better support in 2D.", $xf3_ver, $xf4_ver) :
_("Your card can have 3D hardware acceleration support with XFree %s.", $xf3_ver)) . "\n\n\n" . $msg;
@@ -241,7 +241,7 @@ _("Your card can have 3D hardware acceleration support with XFree %s.", $xf3_ver
#- an expert user may want to try to use an EXPERIMENTAL 3D acceleration, currenlty
#- this is with Utah GLX and so, it can provide a way of testing.
if ($::expert && $card->{Utah_glx_EXPERIMENTAL}) {
- $msg = ($card->{use_xf4} && !$card->{DRI_glx} ?
+ $msg = ($card->{use_xf4} && !$card->{DRI_glx} && !$card->{prefer_xf3} ?
_("Your card can have 3D hardware acceleration support but only with XFree %s,
NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.
Your card is supported by XFree %s which may have a better support in 2D.", $xf3_ver, $xf4_ver) :