replaced XFree86 and XFree with Xorg (bugzilla #10531)

4 files changed, 9 insertions, 9 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);
     }
diff --git a/perl-install/services.pm b/perl-install/services.pm
index 2c6fa1051..2eb4b1655 100644
--- a/perl-install/services.pm
+++ b/perl-install/services.pm
@@ -62,7 +62,7 @@ This service provides NFS server functionality, which is configured via the
 nfslock => N_("NFS is a popular protocol for file sharing across TCP/IP
 networks. This service provides NFS file locking functionality."),
 numlock => N_("Automatically switch on numlock key locker under console
-and XFree at boot."),
+and Xorg at boot."),
 oki4daemon => N_("Support the OKI 4w and compatible winprinters."),
 pcmcia => N_("PCMCIA support is usually to support things like ethernet and
 modems in laptops.  It won't get started unless configured so it is safe to have
@@ -88,7 +88,7 @@ sound => N_("Launch the sound system on your machine"),
 syslog => N_("Syslog is the facility by which many daemons use to log messages
 to various system log files.  It is a good idea to always run syslog."),
 usb => N_("Load the drivers for your usb devices."),
-xfs => N_("Starts the X Font Server (this is mandatory for XFree to run)."),
+xfs => N_("Starts the X Font Server (this is mandatory for Xorg to run)."),
     );
     my ($name) = @_;
     my $s = $services{$name};
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index b896543d3..ee5fda955 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -69,7 +69,7 @@ sub check_XFree {
 
     my $f = "/usr/X11R6/lib/X11/rgb.txt"; #- this one is on all platform
     -e $f or $in->do_pkgs->install('xorg-x11', 'xorg-x11-75dpi-fonts');
-    -e $f or die "install XFree86 first!\n";
+    -e $f or die "install Xorg first!\n";
 
     system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
 }