2007-07-02 Jeremy Katz <katzj@redhat.com>

	* autopart.py: Change references of "Reboot" -> "Exit installer"
	to make more sense in live install case.
	* exception.py: Likewise.
	* fsset.py: Likewise.
	* gui.py: Likewise.
	* harddrive.py: Likewise.
	* image.py: Likewise.
	* packages.py: Likewise.
	* upgrade.py: Likewise.
	* urlinstall: Likewise.
	* yuminstall.py: Likewise.

	* livecd.py (LiveCDCopyBackend.doRepoSetup): Add mnemonics

12 files changed, 73 insertions, 59 deletions

diff --git a/ChangeLog b/ChangeLog
index 316740918..ec9dd1cbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2007-07-02  Jeremy Katz  <katzj@redhat.com>
+
+	* autopart.py: Change references of "Reboot" -> "Exit installer"
+	to make more sense in live install case.
+	* exception.py: Likewise.
+	* fsset.py: Likewise.
+	* gui.py: Likewise.
+	* harddrive.py: Likewise.
+	* image.py: Likewise.
+	* packages.py: Likewise.
+	* upgrade.py: Likewise.
+	* urlinstall: Likewise.
+	* yuminstall.py: Likewise.
+
+	* livecd.py (LiveCDCopyBackend.doRepoSetup): Add mnemonics
+
 2007-06-29  Chris Lumens  <clumens@redhat.com>
 
 	* fsset.py (FileSystemSet.add):  Fix an fsset entry sorting
diff --git a/autopart.py b/autopart.py
index 5d5cb0137..3edc2befb 100644
--- a/autopart.py
+++ b/autopart.py
@@ -1259,7 +1259,7 @@ def doAutoPartition(anaconda):
                 anaconda.intf.messageWindow(_("Requested Partition Does Not Exist"),
                                    _("Unable to locate partition %s to use "
                                      "for %s.\n\n"
-                                     "Press 'OK' to reboot your system.")
+                                     "Press 'OK' to exit the installer.")
                                    % (request.device, request.mountpoint),
 				   custom_icon='error')
                 sys.exit(0)
@@ -1287,7 +1287,7 @@ def doAutoPartition(anaconda):
                  anaconda.intf.messageWindow(_("Requested Raid Device Does Not Exist"),
                                     _("Unable to locate raid device %s to use "
                                       "for %s.\n\n"
-                                      "Press 'OK' to reboot your system.")
+                                      "Press 'OK' to exit the installer.")
                                     % (request.device,
                                        request.mountpoint),
                                     custom_icon='error')
@@ -1319,7 +1319,7 @@ def doAutoPartition(anaconda):
                  anaconda.intf.messageWindow(_("Requested Volume Group Does Not Exist"),
                                     _("Unable to locate volume group %s to use "
                                       "for %s.\n\n"
-                                      "Press 'OK' to reboot your system.")
+                                      "Press 'OK' to exit the installer.")
                                    % (request.volumeGroupName,
                                       request.mountpoint),
                                     custom_icon='error')
@@ -1357,7 +1357,7 @@ def doAutoPartition(anaconda):
                 anaconda.intf.messageWindow(_("Requested Logical Volume Does Not Exist"),
                                    _("Unable to locate logical volume %s to use "
                                      "for %s.\n\n"
-                                     "Press 'OK' to reboot your system.")
+                                     "Press 'OK' to exit the installer.")
                                    % (request.logicalVolumeName,
                                       request.mountpoint),
 				   custom_icon='error')
@@ -1484,7 +1484,7 @@ def doAutoPartition(anaconda):
             anaconda.intf.messageWindow(_("Automatic Partitioning Errors"),
                                _("The following errors occurred with your "
                                  "partitioning:\n\n%s\n\n"
-                                 "Press 'OK' to reboot your system.") %
+                                 "Press 'OK' to exit the installer.") %
                                (errors,), custom_icon='error')
             sys.exit(0)
 
@@ -1507,7 +1507,7 @@ def doAutoPartition(anaconda):
             extra = ""
             anaconda.dispatch.skipStep("partition", skip = 0)
         else:
-            extra = _("\n\nPress 'OK' to reboot your system.")
+            extra = _("\n\nPress 'OK' to exit the installer.")
         anaconda.intf.messageWindow(_("Error Partitioning"),
                _("Could not allocate requested partitions: \n\n"
                  "%s.%s") % (msg.value, extra), custom_icon='error')
@@ -1524,7 +1524,7 @@ def doAutoPartition(anaconda):
     if errors:
         errortxt = string.join(errors, '\n')
         if anaconda.isKickstart:
-            extra = _("\n\nPress 'OK' to reboot your system.")
+            extra = _("\n\nPress 'OK' to exit the installer.")
         else:
             extra = _("\n\nPress 'OK' to choose a different partitioning option.")
 
diff --git a/exception.py b/exception.py
index 5cbc6e01c..1fbe15075 100644
--- a/exception.py
+++ b/exception.py
@@ -411,9 +411,9 @@ def handleException(anaconda, (type, value, tb)):
             if floppyRc == 0:
                 anaconda.intf.messageWindow(_("Dump Written"),
                     _("Your system's state has been successfully written to "
-                      "the floppy. Your system will now be rebooted."),
+                      "the floppy. The installer will now exit."),
                     type="custom", custom_icon="info",
-                    custom_buttons=[_("_Reboot")])
+                    custom_buttons=[_("_Exit installer")])
                 sys.exit(0)
             elif floppyRc == 1:
                 continue
@@ -428,9 +428,9 @@ def handleException(anaconda, (type, value, tb)):
             if scpRc == 0:
                 anaconda.intf.messageWindow(_("Dump Written"),
                     _("Your system's state has been successfully written to "
-                      "the remote host.  Your system will now be rebooted."),
+                      "the remote host.  The installer will now exit."),
                     type="custom", custom_icon="info",
-                    custom_buttons=[_("_Reboot")])
+                    custom_buttons=[_("_Exit installer")])
                 sys.exit(0)
             elif scpRc == 1:
                 continue
diff --git a/fsset.py b/fsset.py
index 3432e9e81..0c63a7180 100644
--- a/fsset.py
+++ b/fsset.py
@@ -1429,7 +1429,7 @@ MAILADDR root
                                          "initialize swap on device %s.  This "
                                          "problem is serious, and the install "
                                          "cannot continue.\n\n"
-                                         "Press <Enter> to reboot your system.")
+                                         "Press <Enter> to exit the installer.")
                                        % (entry.device.getDevice(),))
                 sys.exit(0)
 
@@ -1454,7 +1454,7 @@ MAILADDR root
                 
     def turnOnSwap (self, chroot, upgrading=False):
         def swapErrorDialog (msg, format_button_text, entry):
-            buttons = [_("Skip"), format_button_text, _("Reboot")]
+            buttons = [_("Skip"), format_button_text, _("_Exit installer")]
             ret = self.messageWindow(_("Error"), msg, type="custom",
                                      custom_buttons=buttons,
                                      custom_icon="warning")
@@ -1507,8 +1507,7 @@ MAILADDR root
                         msg = msg + _("\n\nChoose Skip if you want the "
                               "installer to ignore this partition during "
                               "the upgrade.  Choose Format to reformat "
-                              "the partition as swap space.  Choose Reboot "
-                              "to restart the system.")
+                              "the partition as swap space.")
 
                         swapErrorDialog(msg, _("Format"), entry)
                     else:
@@ -1523,8 +1522,8 @@ MAILADDR root
                                                  "upgrade partition does not "
                                                  "reference a valid swap "
                                                  "partition.\n\n"
-                                                 "Press OK to reboot your "
-                                                 "system.")
+                                                 "Press OK to exit the "
+                                                 "installer.")
                                                % (entry.device.getDevice(), msg))
                         else:
                             self.messageWindow(_("Error"),
@@ -1533,8 +1532,8 @@ MAILADDR root
                                                  "This most likely means this "
                                                  "swap partition has not been "
                                                  "initialized.\n\n"
-                                                 "Press OK to reboot your "
-                                                 "system.")
+                                                 "Press OK to exit the "
+                                                 "installer.")
                                                % (entry.device.getDevice(), msg))
                     sys.exit(0)
 
@@ -1586,7 +1585,7 @@ MAILADDR root
 					     "device /dev/%s. We do "
 					     "not recommend you use this device."
 					     "\n\n"
-					     "Press <Enter> to reboot your system") %
+					     "Press <Enter> to exit the installer.") %
 					   (entry.device.getDevice(),))
 		    sys.exit(0)
 		
@@ -1597,7 +1596,7 @@ MAILADDR root
                                          "bad blocks on %s.  This problem is "
                                          "serious, and the install cannot "
                                          "continue.\n\n"
-                                         "Press <Enter> to reboot your system.")
+                                         "Press <Enter> to exit the installer.")
                                        % (entry.device.getDevice(),))
                 sys.exit(0)
 
@@ -1637,7 +1636,7 @@ MAILADDR root
                                          "format %s.  This problem is "
                                          "serious, and the install cannot "
                                          "continue.\n\n"
-                                         "Press <Enter> to reboot your system.")
+                                         "Press <Enter> to exit the installer.")
                                        % (entry.device.getDevice(),))
                 sys.exit(0)
 
@@ -1687,7 +1686,7 @@ MAILADDR root
                                          "migrate %s.  This problem is "
                                          "serious, and the install cannot "
                                          "continue.\n\n"
-                                         "Press <Enter> to reboot your system.")
+                                         "Press <Enter> to exit the installer.")
                                        % (entry.device.getDevice(),))
                 sys.exit(0)
 
@@ -1715,16 +1714,16 @@ MAILADDR root
                                              "this path is not a directory. "
                                              "This is a fatal error and the "
                                              "install cannot continue.\n\n"
-                                             "Press <Enter> to reboot your "
-                                             "system.") % (entry.mountpoint,))
+                                             "Press <Enter> to exit the "
+                                             "installer.") % (entry.mountpoint,))
                     else:
                         self.messageWindow(_("Invalid mount point"),
                                            _("An error occurred when trying "
                                              "to create %s: %s.  This is "
                                              "a fatal error and the install "
                                              "cannot continue.\n\n"
-                                             "Press <Enter> to reboot your "
-                                             "system.") % (entry.mountpoint,
+                                             "Press <Enter> to exit the "
+                                             "installer.") % (entry.mountpoint,
                                                            msg))
                 sys.exit(0)
             except SystemError, (num, msg):
@@ -1740,7 +1739,7 @@ MAILADDR root
                                                  (entry.device.getDevice(),
                                                   entry.mountpoint),
                                                  type="custom", custom_icon="warning",
-                                                 custom_buttons=[_("_Reboot"),
+                                                 custom_buttons=[_("_Exit installer"),
                                                                 _("_Continue")])
 
                         if ret == 0:
@@ -1754,14 +1753,14 @@ MAILADDR root
                                        "Devices in /etc/fstab should be "
                                        "specified by label, not by device name."
                                        "\n\n"
-                                       "Press OK to reboot your system.") % (entry.device.getDevice(), entry.mountpoint, msg)
+                                       "Press OK to exit the installer.") % (entry.device.getDevice(), entry.mountpoint, msg)
                         else:
                             errStr = _("Error mounting device %s as %s: "
                                        "%s\n\n"
                                        "This most likely means this "
                                        "partition has not been formatted."
                                        "\n\n"
-                                       "Press OK to reboot your system.") % (entry.device.getDevice(), entry.mountpoint, msg)
+                                       "Press OK to exit the installer.") % (entry.device.getDevice(), entry.mountpoint, msg)
 
                         self.messageWindow(_("Error"), errStr)
 
@@ -1780,8 +1779,7 @@ MAILADDR root
                                    "This is most likely means that "
                                    "your fstab is incorrect."
                                    "\n\n"
-                                   "Press OK to reboot your "
-                                   "system."))
+                                   "Press OK to exit the installer."))
             sys.exit(0)
 
         rootlvm1 = 0
@@ -2439,14 +2437,14 @@ def readFstab (anaconda):
                                      "Please fix this problem and restart the "
                                      "installation process.") %(label,),
                                    type="custom", custom_icon="error",
-                                   custom_buttons=[_("_Reboot")])
+                                   custom_buttons=[_("_Exit installer")])
             except TypeError:
                 intf.messageWindow(_("Invalid Label"),
                                    _("An invalid label was found on device "
                                      "%s.  Please fix this problem and restart "
                                      "the installation process.") %(device,),
                                    type="custom", custom_icon="error",
-                                   custom_buttons=[_("_Reboot")])
+                                   custom_buttons=[_("_Exit installer")])
 
             sys.exit(0)
         else:
diff --git a/gui.py b/gui.py
index 14c06eef5..f464d71e9 100755
--- a/gui.py
+++ b/gui.py
@@ -962,7 +962,7 @@ class InstallInterface:
         return self.messageWindow(_("Error Parsing Kickstart Config"),
                                   s,
                                   type = "custom",
-                                  custom_buttons = [_("_Reboot")],
+                                  custom_buttons = [_("_Exit installer")],
                                   custom_icon = "error")
 
     def dumpWindow(self):
@@ -1111,12 +1111,12 @@ class InstallControlWindow:
                 if not win.getrc():
                     if flags.rootpath:
                         msg =  _("The installer will now exit...")
-                        buttons = [_("_Exit")]
+                        buttons = [_("_Exit installer")]
                     else:
                         msg =  _("Your system will now be rebooted...")
                         buttons = [_("_Reboot")]
 
-                    MessageWindow(_("Rebooting System"),
+                    MessageWindow(_("Exiting"),
                                   msg,
                                   type="custom",
                                   custom_icon="warning",
diff --git a/harddrive.py b/harddrive.py
index 2be5c9e85..0562afded 100644
--- a/harddrive.py
+++ b/harddrive.py
@@ -45,7 +45,7 @@ class HardDriveInstallMethod(ImageInstallMethod):
                  "file or perhaps a corrupt package.  Please verify your "
                  "installation images and that you have all the required "
                  "media.\n\n"
-                 "If you reboot, your system will be left in an inconsistent "
+                 "If you exit, your system will be left in an inconsistent "
                  "state that will likely require reinstallation.\n\n") % pkgname
 
     # mounts disc image cdNum under self.tree
@@ -73,12 +73,12 @@ class HardDriveInstallMethod(ImageInstallMethod):
                                             "image #%s, but cannot find it on "
                                             "the hard drive.\n\n"
                                             "Please copy this image to the "
-                                            "drive and click Retry. Click Reboot "
+                                            "drive and click Retry. Click Exit "
                                             " to abort the installation.")
                                             % (cdNum,), type="custom",
 	                                    custom_icon="warning",
-                                            custom_buttons=[_("_Reboot"),
-	                                                    _("Re_try")])
+                                            custom_buttons=[_("_Exit"),
+	                                                    _("_Retry")])
                 if ans == 0:
                     sys.exit(0)
                 elif ans == 1:
@@ -119,11 +119,11 @@ class HardDriveInstallMethod(ImageInstallMethod):
                                  "device %s.  This may happen if your ISO "
                                  "images are located on an advanced storage "
                                  "device like LVM or RAID, or if there was a "
-                                 "problem mounting a partition.  Click reboot "
+                                 "problem mounting a partition.  Click exit "
                                  "to abort the installation.")
                                % (self.device,), type="custom",
                                custom_icon="error",
-                               custom_buttons=[_("_Reboot")])
+                               custom_buttons=[_("_Exit")])
             sys.exit(0)
 
 
diff --git a/image.py b/image.py
index c626d6080..4b0af7a7b 100644
--- a/image.py
+++ b/image.py
@@ -87,7 +87,7 @@ def presentRequiredMediaMessage(anaconda):
                                           "%s\nPlease "
                                           "have these ready before proceeding with "
                                           "the installation.  If you need to abort "
-                                          "the installation and reboot please "
+                                          "the installation and exit please "
                                           "select \"Reboot\".") % (reqcdstr,),
                                           type="custom", custom_icon="warning",
                                           custom_buttons=[_("_Reboot"), _("_Back"), _("_Continue")])
@@ -147,7 +147,7 @@ class CdromInstallMethod(ImageInstallMethod):
                  "file or perhaps a corrupt package.  Please verify your "
                  "installation images and that you have all the required "
                  "media.\n\n"
-                 "If you reboot, your system will be left in an inconsistent "
+                 "If you exit, your system will be left in an inconsistent "
                  "state that will likely require reinstallation.\n\n") % pkgname
 
     def systemUnmounted(self):
@@ -369,7 +369,7 @@ class NfsInstallMethod(ImageInstallMethod):
         return _("The file %s cannot be opened.  This is due to a missing "
                  "file or perhaps a corrupt package.  Please verify your "
                  "installation tree contains all required packages.\n\n"
-                 "If you reboot, your system will be left in an inconsistent "
+                 "If you exit, your system will be left in an inconsistent "
                  "state that will likely require reinstallation.\n\n") % pkgname
 
     def __init__(self, method, rootPath, intf):
@@ -444,12 +444,12 @@ def findIsoImages(path, messageWindow):
 	       "a multiple of 2048 bytes.  This may mean "
 	       "it was corrupted on transfer to this computer."
 	       "\n\n"
-               "It is recommended that you reboot and abort your "
+               "It is recommended that you exit and abort your "
                "installation, but you can choose to continue if "
                "you think this is in error.") % (file,),
                                            type="custom",
                                            custom_icon="warning",
-                                           custom_buttons= [_("_Reboot"),
+                                           custom_buttons= [_("_Exit installer"),
                                                             _("_Continue")])
                         if rc == 0:
 			    sys.exit(0)
@@ -484,7 +484,7 @@ class NfsIsoInstallMethod(NfsInstallMethod):
                  "file or perhaps a corrupt package.  Please verify your "
                  "installation images and that you have all the required "
                  "media.\n\n"
-                 "If you reboot, your system will be left in an inconsistent "
+                 "If you exit, your system will be left in an inconsistent "
                  "state that will likely require reinstallation.\n\n") % pkgname
 
     def umountImage(self):
@@ -519,12 +519,12 @@ class NfsIsoInstallMethod(NfsInstallMethod):
 	                                    "the server.\n\n"
 	                                    "Please copy this image to the "
 	                                    "remote server's share path and "
-	                                    "click Retry. Click Reboot to "
+	                                    "click Retry. Click Exit to "
 	                                    "abort the installation.")
 	                                    % (cdNum,), type="custom",
 	                                    custom_icon="warning",
-	                                    custom_buttons=[_("_Reboot"),
-	                                                    _("Re_try")])
+	                                    custom_buttons=[_("_Exit"),
+	                                                    _("_Retry")])
 	        if ans == 0:
 	            sys.exit(0)
 	        elif ans == 1:
diff --git a/livecd.py b/livecd.py
index 410856a96..781f4634d 100644
--- a/livecd.py
+++ b/livecd.py
@@ -352,8 +352,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
                                          "not large enough for this live "
                                          "image."), type = "custom",
                                         custom_icon = "error",
-                                        custom_buttons=[_("Back"),
-                                                        _("Exit installer")])
+                                        custom_buttons=[_("_Back"),
+                                                        _("_Exit installer")])
             if rc == 0:
                 return DISPATCH_BACK
             else:
diff --git a/packages.py b/packages.py
index 1aff189b5..07884f642 100644
--- a/packages.py
+++ b/packages.py
@@ -337,7 +337,7 @@ def betaNagScreen(anaconda):
             else:
                 msg =  _("Your system will now be rebooted...")
                 buttons = [_("_Back"), _("_Reboot")]
-	    rc = anaconda.intf.messageWindow( _("Rebooting System"),
+	    rc = anaconda.intf.messageWindow( _("Warning! This is pre-release software!"),
                                      msg,
                                      type="custom", custom_icon="warning",
                                      custom_buttons=buttons)
diff --git a/upgrade.py b/upgrade.py
index 64583014a..5fa0467c9 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -56,7 +56,7 @@ def queryUpgradeContinue(anaconda):
                          "\n\n") + 
                        _("Would you like to continue with the upgrade?"),
                          type="custom", custom_icon=["error","error"],
-                         custom_buttons=[_("Reboot"), _("Yes")])
+                         custom_buttons=[_("_Exit installer"), _("_Continue")])
     if rc == 0:
         sys.exit(0)
     return DISPATCH_FORWARD
diff --git a/urlinstall.py b/urlinstall.py
index 9f44afbea..2c06fc13d 100644
--- a/urlinstall.py
+++ b/urlinstall.py
@@ -77,7 +77,7 @@ class UrlInstallMethod(InstallMethod):
                  "file or perhaps a corrupt package.  Please verify your "
                  "mirror contains all required packages, and try using a "
                  "different one.\n\n"
-                 "If you reboot, your system will be left in an inconsistent "
+                 "If you exit, your system will be left in an inconsistent "
                  "state that will likely require reinstallation.\n\n") % pkgname
 
     def systemUnmounted(self):
diff --git a/yuminstall.py b/yuminstall.py
index f071bb39d..29db6af08 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1046,9 +1046,9 @@ class YumBackend(AnacondaBackend):
                                               "of free space for installation, but "
                                               "you do not have enough available.  "
                                               "You can change your selections or "
-                                              "reboot." % (self.totalSize / 1024)),
+                                              "exit the installer." % (self.totalSize / 1024)),
                                             type="custom", custom_icon="error",
-                                            custom_buttons=[_("_Back"), _("Re_boot")])
+                                            custom_buttons=[_("_Back"), _("_Exit installer")])
 
                     if rc == 1:
                         sys.exit(1)