integrated changes suggested by docs

7 files changed, 51 insertions, 47 deletions

diff --git a/iw/account_gui.py b/iw/account_gui.py
index 6c66976bc..e6d345579 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -253,7 +253,7 @@ class AccountWindow (InstallWindow):
             a.set (0.0, 0.0, 0.0, 0.0)
             hbox.pack_start (a, FALSE)
 
-        label = GtkLabel (_("Please enter a password for the root user."))
+        label = GtkLabel (_("Enter the password for the root user (administrator) of this system."))
         a = GtkAlignment ()
         a.add (label)
         a.set (0.0, 0.5, 0.0, 0.0)
@@ -337,8 +337,14 @@ class AccountWindow (InstallWindow):
             hbox.pack_start (a, FALSE)
 
         a = GtkAlignment (0.0, 0.5)
-        label = GtkLabel (_("Additional accounts can be created for users that need to access the system.  Please enter user accounts here."))
+        label = GtkLabel (_("Additional accounts can be created for other "
+                            "users of this system. Such accounts could be for "
+                            "a personal login account, or for other "
+                            "non-administrative users who need to use this "
+                            "system. Use the <Add> button to enter additional "
+                            "user accounts."))
         label.set_line_wrap(TRUE)
+        label.set_usize(400, -1)
         a.add(label)
         hbox.pack_start(a, FALSE)
 
diff --git a/iw/bootdisk_gui.py b/iw/bootdisk_gui.py
index 9510afb87..d8303f7bb 100644
--- a/iw/bootdisk_gui.py
+++ b/iw/bootdisk_gui.py
@@ -7,7 +7,7 @@ from constants import *
 class BootdiskWindow (InstallWindow):
 
     htmlTag = "bootdisk"
-    windowTitle =  N_("Bootdisk Creation")
+    windowTitle =  N_("Boot Disk Creation")
 
     def __init__ (self, ics):
 	InstallWindow.__init__ (self, ics)
@@ -41,9 +41,11 @@ class BootdiskWindow (InstallWindow):
 
 	if dir == DISPATCH_FORWARD:
 	    label = GtkLabel (
-		_("Please remove the install floppy (if used) and insert a "
-		  "blank floppy in the first floppy drive. All data on this "
-		  "disk will be erased during creation of the boot disk."))
+                _("The boot disk allows you to boot your Red Hat Linux system "
+                  "from a floppy diskette.\n\n"
+                  "Please remove any diskettes from the floppy drive and "
+                  "insert a blank diskette. All data will be ERASED "
+		  "during creation of the boot disk."))
 	else:
             label = GtkLabel (
 		_("An error occured while making the boot disk. "
diff --git a/iw/bootloader_gui.py b/iw/bootloader_gui.py
index e29d31f18..0fc760828 100644
--- a/iw/bootloader_gui.py
+++ b/iw/bootloader_gui.py
@@ -258,7 +258,7 @@ class BootloaderWindow (InstallWindow):
         spacer.set_usize(10, 1)
         self.radioBox.attach(spacer, 0, 1, 2, 4, FALSE)
 
-        label = GtkLabel(_("Install boot loader on:"))
+        label = GtkLabel(_("Install Boot Loader record on:"))
         label.set_alignment(0.0, 0.5)
         self.liloLocationBox = GtkVBox (FALSE, 0)
         self.liloLocationBox.pack_start(label)
@@ -279,7 +279,7 @@ class BootloaderWindow (InstallWindow):
 
 		count = count + 1
 
-        label = GtkLabel(_("Kernel parameters") + ":")
+        label = GtkLabel(_("Kernel Parameters") + ":")
         label.set_alignment(0.0, 0.5)
         self.appendEntry = GtkEntry()
         if bl.args.get():
@@ -296,13 +296,13 @@ class BootloaderWindow (InstallWindow):
 
         optionBox = GtkVBox (FALSE, 5)
         optionBox.set_border_width (5)
-        self.bootdisk = GtkCheckButton (_("Create boot disk"))
+        self.bootdisk = GtkCheckButton (_("Create Boot Disk"))
 
 	self.bootdisk.set_active(not dispatch.stepInSkipList("bootdisk"))
 
         optionBox.pack_start (self.bootdisk)
 
-        self.bootloader = GtkCheckButton (_("Install Bootloader"))
+        self.bootloader = GtkCheckButton (_("Install Boot Loader"))
 
 	if not dispatch.stepInSkipList("instbootloader"):
 	    self.bootloader.set_active (TRUE)
@@ -320,7 +320,7 @@ class BootloaderWindow (InstallWindow):
         box.pack_start (optionBox, FALSE)
 
         box.pack_start(GtkHSeparator(), FALSE)
-        label = GtkLabel(_("Boot loader:"))
+        label = GtkLabel(_("Boot Loader To Be Installed:"))
         self.grub_radio = GtkRadioButton(None, (_("GRUB")))
         self.lilo_radio = GtkRadioButton(self.grub_radio, (_("LILO")))
 
diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index 3711a8ca4..26184be45 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -31,16 +31,18 @@ class CongratulationWindow (InstallWindow):
             hbox.pack_start (a, FALSE)
 
 	label = GtkLabel(
-                     _("Congratulations, installation is complete.\n\n"
-                       "Press return to reboot, and be sure to remove your "
-		       "boot medium after the system reboots, or your system "
-		       "will rerun the install. For information on fixes which "
-                       "are available for this release of Red Hat Linux, "
-                       "consult the "
-                       "Errata available from http://www.redhat.com/errata.\n\n"
-                       "Information on configuring and using your Red Hat "
-		       "Linux system is contained in the Red Hat Linux "
-		       "manuals."))
+             _("Congratulations, your Red Hat Linux installation is "
+               "complete.\n\n"
+               "Remove any CD-ROMs or floppy diskettes you used during the "
+               "installation process and press <Enter> to reboot your system. "
+               "\n\n"
+               "If you created a boot disk to use to boot your Red Hat Linux "
+               "system, insert it before you press <Enter> to reboot.\n\n"
+               "For information on errata (updates and bug fixes), visit "
+               "http://www.redhat.com/errata.\n\n"
+               "Information on using and configuring your "
+               "system is available in the Red Hat Linux manuals."),
+             )
                 
         label.set_line_wrap (TRUE)
         label.set_alignment (0.0, 0.5)
@@ -79,11 +81,10 @@ class ReconfigCongratulationWindow (InstallWindow):
             hbox.pack_start (a, FALSE)
 
         label = GtkLabel(_("Congratulations, configuration is complete.\n\n"
-                           "For information on fixes which are "
-                           "available for this release of Red Hat Linux, consult the "
-                           "Errata available from http://www.redhat.com.\n\n"
-                           "Information on further configuring your system is available in the Official "
-                           "Red Hat Linux Manuals available at http://www.redhat.com/support/manuals/."))
+                  "For information on errata (updates and bug fixes), visit "
+                  "http://www.redhat.com/errata.\n\n"
+                  "Information on using and configuring your "
+                  "system is available in the Red Hat Linux manuals."))
         
         label.set_line_wrap (TRUE)
         label.set_alignment (0.0, 0.5)
diff --git a/iw/language_support_gui.py b/iw/language_support_gui.py
index 353e6b3a1..bed8831ed 100644
--- a/iw/language_support_gui.py
+++ b/iw/language_support_gui.py
@@ -20,7 +20,7 @@ class LanguageSupportWindow (InstallWindow):
     checkMark_Off = foo.make_pixmap()
     del foo
 
-    windowTitle = _("Language Selection")
+    windowTitle = _("Additional Language Support")
     htmlTag = "langsupport"
 
     def getNext (self):
@@ -138,7 +138,7 @@ class LanguageSupportWindow (InstallWindow):
         vbox = GtkVBox (FALSE, 10)
         hbox = GtkHBox (FALSE)
         
-        label = GtkLabel (_("Choose the default language:   "))
+        label = GtkLabel (_("Choose the default language for this system:   "))
         hbox.pack_start (label, FALSE, 20)
 
         self.combo = GtkCombo ()
@@ -152,10 +152,12 @@ class LanguageSupportWindow (InstallWindow):
         if flags.reconfig:
             label = GtkLabel (_("Currently installed languages:"))
         else:
-            label = GtkLabel (_("Choose the languages to install:"))
+            label = GtkLabel (_("Choose additional languages you would "
+                                "like to use on this system:"))
 
         label.set_alignment (0.0, 0.5)
         label.set_line_wrap (TRUE)
+        label.set_usize(400, -1)
         vbox.pack_start (label, FALSE)
         
         hbox = GtkHBox (FALSE)
diff --git a/iw/partmethod_gui.py b/iw/partmethod_gui.py
index b24c59f48..a58410456 100644
--- a/iw/partmethod_gui.py
+++ b/iw/partmethod_gui.py
@@ -16,11 +16,12 @@
 from iw_gui import *
 from gtk import *
 from translate import _
+from autopart import PARTMETHOD_TYPE_DESCR_TEXT
 
 class PartitionMethodWindow(InstallWindow):
     def __init__(self, ics):
 	InstallWindow.__init__(self, ics)
-        ics.setTitle (_("Disk Partitioning"))
+        ics.setTitle (_("Disk Partitioning Setup"))
 
     def getNext(self):
         
@@ -44,19 +45,7 @@ class PartitionMethodWindow(InstallWindow):
         box = GtkVBox (FALSE)
         box.set_border_width (5)
 
-        label = GtkLabel(
-             _("Autopartitioning sets up your partitioning in a reasonable "
-               "way depending on your installation type and then gives you a "
-               "chance to customize this setup.\n"
-               "\n"
-               "Disk Druid is a tool designed for partitioning and setting "
-               "up mount points.  It is designed to be easier to use than "
-               "Linux's traditional disk partitioning software, fdisk, as "
-               "well as more powerful.  However, there are some cases where "
-               "fdisk may be preferred.\n"
-               "\n"
-               "Which tool would you like to use?"))
-
+        label=GtkLabel(PARTMETHOD_TYPE_DESCR_TEXT)
         label.set_line_wrap(1)
         label.set_alignment(0.0, 0.0)
         label.set_usize(400, -1)
@@ -91,4 +80,8 @@ class PartitionMethodWindow(InstallWindow):
 
         self.ics.setNextEnabled (TRUE)
 
-	return box
+        align = GtkAlignment()
+        align.add(box)
+        align.set(0.5, 0.5, 0.0, 0.0)
+
+	return align
diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py
index d5274246c..068e6596b 100644
--- a/iw/xconfig_gui.py
+++ b/iw/xconfig_gui.py
@@ -652,7 +652,7 @@ class MonitorWindow (InstallWindow):
 class XConfigWindow (InstallWindow):
 
     htmlTag ="xconf"
-    windowTitle = N_("X Configuration")
+    windowTitle = N_("Graphical Interface (X) Configuration")
         
     def __init__ (self, ics):
 	InstallWindow.__init__ (self, ics)
@@ -812,8 +812,8 @@ class XConfigWindow (InstallWindow):
             self.autoBox.pack_start (label, FALSE)
 
             label = makeFormattedLabel (_("If the probed settings do not "
-                                          "match your hardware select the "
-                                          "correct setting below:"))
+                                          "match your hardware, select the "
+                                          "correct hardware settings below:"))
             self.autoBox.pack_start (label, FALSE)
 
             box.pack_start (self.autoBox, FALSE)