diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-08-05 02:38:55 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-08-05 02:38:55 +0000 |
| commit | d1b72e2fffaa74c2a886118db06f89cd36e4a8df (patch) | |
| tree | ffb799e1b9b5cff95bcb87379c09e3bbb47dc344 /perl-install/Xconfig | |
| parent | bd991a1b73d7b0fb7cc9bfab9474ecf87a2f816c (diff) | |
| download | drakx-backup-do-not-use-d1b72e2fffaa74c2a886118db06f89cd36e4a8df.tar drakx-backup-do-not-use-d1b72e2fffaa74c2a886118db06f89cd36e4a8df.tar.gz drakx-backup-do-not-use-d1b72e2fffaa74c2a886118db06f89cd36e4a8df.tar.bz2 drakx-backup-do-not-use-d1b72e2fffaa74c2a886118db06f89cd36e4a8df.tar.xz drakx-backup-do-not-use-d1b72e2fffaa74c2a886118db06f89cd36e4a8df.zip | |
replaced XFree86 and XFree with Xorg (bugzilla #10531)
Diffstat (limited to 'perl-install/Xconfig')
| -rw-r--r-- | perl-install/Xconfig/card.pm | 6 | ||||
| -rw-r--r-- | perl-install/Xconfig/various.pm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 60c7f4505..702abb9077 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -147,10 +147,10 @@ sub card_config__not_listed { my @xf4 = grep { $options->{allowFB} || $_ ne 'fbdev' } @xfree4_Drivers; my @list = ( (map { 'Vendor|' . $_ } keys %$cards), - (map { 'XFree 4|' . $_ } @xf4), + (map { 'Xorg|' . $_ } @xf4), ); - my $r = exists $cards->{$card->{BoardName}} ? "Vendor|$card->{BoardName}" : 'XFree 4|vesa'; + my $r = exists $cards->{$card->{BoardName}} ? "Vendor|$card->{BoardName}" : 'Xorg|vesa'; $in->ask_from_({ title => N("X server"), messages => N("Choose an X server"), interactive_help_id => 'configureX_card_list', @@ -251,7 +251,7 @@ sub configure { eval { install_server($card, $options, $do_pkgs) }; if ($@) { - $in->ask_warn('', N("Can't install XFree package: %s", $@)); + $in->ask_warn('', N("Can't install Xorg package: %s", $@)); goto card_config__not_listed; } diff --git a/perl-install/Xconfig/various.pm b/perl-install/Xconfig/various.pm index e69d40549..98ea8fd2f 100644 --- a/perl-install/Xconfig/various.pm +++ b/perl-install/Xconfig/various.pm @@ -40,7 +40,7 @@ sub info { $info .= N("Color depth: %s\n", translate($Xconfig::resolution_and_depth::depth2text{$resolution->{Depth}})); $info .= N("Resolution: %s\n", join('x', @$resolution{'X', 'Y'})); } - $info .= N("XFree86 driver: %s\n", $device->{Driver}) if $device->{Driver}; + $info .= N("Xorg driver: %s\n", $device->{Driver}) if $device->{Driver}; "$title\n\n$info"; } @@ -71,8 +71,8 @@ sub choose_xdm { $xdm = $in->ask_yesorno_({ title => N("Graphical interface at startup"), messages => -N("I can setup your computer to automatically start the graphical interface (XFree) upon booting. -Would you like XFree to start when you reboot?"), +N("I can setup your computer to automatically start the graphical interface (Xorg) upon booting. +Would you like Xorg to start when you reboot?"), interactive_help_id => 'configureXxdm', }, $xdm); } |