Lots of small grammar and wording changes.

Just auditing the world for clarity, don't mind me.

9 files changed, 48 insertions, 46 deletions

diff --git a/anaconda b/anaconda
index f545aaed4..aef0c9547 100755
--- a/anaconda
+++ b/anaconda
@@ -802,7 +802,7 @@ if __name__ == "__main__":
     #
     # if no X server, we have to use text mode
     if not (flags.test or flags.rootpath or x_already_set) and (not iutil.isS390() and not os.access("/usr/bin/Xorg", os.X_OK)):
-         stdoutLog.warning(_("Graphical installation not available. "
+         stdoutLog.warning(_("Graphical installation is not available. "
                              "Starting text mode."))
          time.sleep(2)
          opts.display_mode = 't'
@@ -810,7 +810,7 @@ if __name__ == "__main__":
     if opts.isHeadless: # s390/iSeries checks
         if opts.display_mode == 'g' and not (os.environ.has_key('DISPLAY') or
                                              flags.usevnc):
-            stdoutLog.warning(_("DISPLAY variable not set. Starting text mode!"))
+            stdoutLog.warning(_("DISPLAY variable not set. Starting text mode."))
             opts.display_mode = 't'
             graphical_failed = 1
             time.sleep(2)
diff --git a/bootloader.py b/bootloader.py
index 45cd773e3..ef6af21c1 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -51,7 +51,7 @@ def isEfiSystemPartition(part):
 def bootloaderSetupChoices(anaconda):
     if anaconda.dir == DISPATCH_BACK:
         rc = anaconda.intf.messageWindow(_("Warning"),
-                _("Your filesystems have already been activated.  You "
+                _("Filesystems have already been activated.  You "
                   "cannot go back past this point.\n\nWould you like to "
                   "continue with the installation?"),
                 type="custom", custom_icon=["error","error"],
@@ -208,14 +208,14 @@ def writeBootloader(anaconda):
         if rc and anaconda.intf:
             anaconda.intf.messageWindow(_("Warning"),
                                _("There was an error installing the bootloader.  "
-                                 "Your system may not be bootable."))
+                                 "The system may not be bootable."))
     except booty.BootyNoKernelWarning:
 	if not justConfigFile:
 	    w.pop()
         if anaconda.intf:
             anaconda.intf.messageWindow(_("Warning"),
-                               _("No kernel packages were installed on your "
-                                 "system.  Your boot loader configuration "
+                               _("No kernel packages were installed on the "
+                                 "system.  Bootloader configuration "
                                  "will not be changed."))
 
     dosync()
diff --git a/cmdline.py b/cmdline.py
index 0f209c786..1ddde1801 100644
--- a/cmdline.py
+++ b/cmdline.py
@@ -83,8 +83,8 @@ class InstallInterface:
         return ProgressWindow(title, text, total, updpct, pulse)
 
     def kickstartErrorWindow(self, text):
-        s = _("The following error was found while parsing your "
-              "kickstart configuration:\n\n%s") %(text,)
+        s = _("The following error was found while parsing the "
+              "kickstart configuration file:\n\n%s") %(text,)
         print(s)
 
         while 1:
@@ -95,7 +95,7 @@ class InstallInterface:
         if type == "ok":
             print(text)
         else:
-            print(_("Can't have a question in command line mode!"))
+            print(_("Command line mode requires all choices to be specified in a kickstart configuration file."))
             print(title)
             print(text)
             print(type, custom_buttons)
diff --git a/exception.py b/exception.py
index d2e76b113..dffb7cb59 100644
--- a/exception.py
+++ b/exception.py
@@ -409,7 +409,7 @@ def saveToBugzilla(anaconda, exn, dest):
 
     if not filer.supportsFiling() or not filer.bugUrl:
         anaconda.intf.messageWindow(_("Bug Filing Not Supported"),
-                                    _("Your distribution does not provide a "
+                                    _("This distribution does not provide a "
                                       "supported bug filing system, so you "
                                       "cannot save your exception this way."))
         return False
@@ -417,7 +417,8 @@ def saveToBugzilla(anaconda, exn, dest):
     if dest[0].strip() == "" or dest[1].strip() == "" or dest[2].strip() == "":
         anaconda.intf.messageWindow(_("Invalid Bug Information"),
                                     _("Please provide a valid username, "
-                                      "password, and short bug description."))
+                                      "password, and a short description of "
+                                      "the bug."))
         return False
 
     hash = exn.hash()
@@ -467,10 +468,10 @@ def saveToBugzilla(anaconda, exn, dest):
         # Tell the user we created a new bug for them and that they should
         # go add a descriptive comment.
         anaconda.intf.messageWindow(_("Bug Created"),
-            _("A new bug has been created with your traceback attached. "
+            _("A new bug has been created with the traceback attached. "
               "Please add additional information such as what you were doing "
-              "when you encountered the bug, screenshots, and whatever else "
-              "is appropriate to the following bug:\n\n%s/%s") % (bugzillaUrl, bug.id()),
+              "when you encountered the bug, screenshots, and any other "
+              "relevant information to the following bug:\n\n%s/%s") % (bugzillaUrl, bug.id()),
             type="custom", custom_icon="info",
             custom_buttons=[_("_Exit installer")])
         sys.exit(0)
@@ -484,10 +485,10 @@ def saveToBugzilla(anaconda, exn, dest):
         # Tell the user which bug they've been CC'd on and that they should
         # go add a descriptive comment.
         anaconda.intf.messageWindow(_("Bug Updated"),
-            _("A bug with your information already exists.  Your account has "
-              "been added to the CC list and your traceback added as a "
-              "comment.  Please add additional descriptive information to the "
-              "following bug:\n\n%s/%s") % (bugzillaUrl, bug.id()),
+            _("A bug with this profile has already been filed.  Your account "
+              "has been added to the CC list and your traceback added as a "
+              "comment.  Please review the following bug, and add additional "
+              "information if necessary:\n\n%s/%s") % (bugzillaUrl, bug.id()),
             type="custom", custom_icon="info",
             custom_buttons=[_("_Exit installer")])
         sys.exit(0)
@@ -509,7 +510,7 @@ def runSaveDialog(anaconda, exn):
 
                 if cpSucceeded:
                     anaconda.intf.messageWindow(_("Dump Written"),
-                        _("Your system's state has been successfully written to "
+                        _("System state has been successfully written to "
                           "the disk. The installer will now exit."),
                         type="custom", custom_icon="info",
                         custom_buttons=[_("_Exit installer")])
@@ -524,7 +525,7 @@ def runSaveDialog(anaconda, exn):
                 try:
                     shutil.copyfile(exn.tbFile, "%s/InstallError.txt" %(dest,))
                     anaconda.intf.messageWindow(_("Dump Written"),
-                        _("Your system's state has been successfully written to "
+                        _("System state has been successfully written to "
                           "the disk. The installer will now exit."),
                         type="custom", custom_icon="info",
                         custom_buttons=[_("_Exit installer")])
@@ -549,15 +550,15 @@ def runSaveDialog(anaconda, exn):
 
                 if scpSucceeded:
                     anaconda.intf.messageWindow(_("Dump Written"),
-                        _("Your system's state has been successfully written to "
+                        _("System state has been successfully transferred to "
                           "the remote host.  The installer will now exit."),
                         type="custom", custom_icon="info",
                         custom_buttons=[_("_Exit installer")])
                     sys.exit(0)
                 else:
                     anaconda.intf.messageWindow(_("Dump Not Written"),
-                        _("There was a problem writing the system state to the "
-                          "remote host."))
+                        _("There was a problem transferring the system state "
+                          "to the remote host."))
                     continue
             else:
                 if not hasActiveNetDev():
diff --git a/gui.py b/gui.py
index b09b52ed5..671bb580a 100755
--- a/gui.py
+++ b/gui.py
@@ -103,8 +103,8 @@ def copyScreenshots():
             os.mkdir(destDir, 0750)
         except:
             window = MessageWindow("Error Saving Screenshot", 
-                                   _("An error occurred copying the "
-                                   "screenshots over."), type="warning")
+                                   _("An error occurred saving screenshots "
+                                     "to disk."), type="warning")
             return
 
     # copy all png's over
@@ -115,7 +115,7 @@ def copyScreenshots():
             shutil.copyfile(screenshotDir + '/' + f, destDir + '/' + fname)
 
     window = MessageWindow(_("Screenshots Copied"), 
-                           _("The screenshots have been saved into the "
+                           _("The screenshots have been saved in the "
                              "directory:\n\n"
                              "\t/root/anaconda-screenshots/\n\n"
                              "You can access these when you reboot and "
@@ -628,8 +628,8 @@ class luksPassphraseWindow:
         else:
             self.initialPassphrase = ""
 
-        txt = _("Choose a passphrase for your encrypted devices. "
-                "You will be prompted for the passphrase during system "
+        txt = _("Choose a passphrase for the encrypted devices. "
+                "You will be prompted for this passphrase during system "
                 "boot.")
         luksxml.get_widget("mainLabel").set_text(txt)
 
@@ -1277,8 +1277,8 @@ class InstallInterface:
         gtk.gdk.beep()
 
     def kickstartErrorWindow(self, text):
-        s = _("The following error was found while parsing your "
-              "kickstart configuration:\n\n%s") %(text,)
+        s = _("The following error was found while parsing the "
+              "kickstart configuration file:\n\n%s") %(text,)
         return self.messageWindow(_("Error Parsing Kickstart Config"),
                                   s,
                                   type = "custom",
@@ -1412,7 +1412,7 @@ class InstallControlWindow:
                         msg =  _("The installer will now exit.")
                         buttons = [_("_Exit installer")]
                     else:
-                        msg =  _("Your system will now be rebooted.")
+                        msg =  _("The system will now reboot.")
                         buttons = [_("_Reboot")]
 
                     MessageWindow(_("Exiting"),
@@ -1485,7 +1485,7 @@ class InstallControlWindow:
     def _doExitConfirm (self, win = None, *args):
         # FIXME: translate the string
         win = MessageWindow(_("Exit installer"),
-                            _("Are you sure you wish to exit the installation?"),
+                            _("Are you sure you wish to exit the installer?"),
                             type="custom", custom_icon="question",
                             custom_buttons = [_("Cancel"), _("_Exit installer")],
                             parent = win)
diff --git a/kickstart.py b/kickstart.py
index ca20068de..e2c1a081d 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -96,7 +96,7 @@ class AnacondaKSScript(Script):
                     msg = _("There was an error running the kickstart "
                             "script at line %s.  You may examine the "
                             "output in %s.  This is a fatal error and "
-                            "your install will be aborted.  Press the "
+                            "installation will be aborted.  Press the "
                             "OK button to exit the installer.") % (self.lineno, messages)
 
                     if self.logfile is not None and os.path.isfile(messages):
@@ -1178,8 +1178,8 @@ def earlyCommandPass(anaconda, file):
     try:
         ksparser.readKickstart(file)
     except KickstartError, e:
-        print _("The following error was found while parsing your "
-                "kickstart configuration:\n\n%s") % e
+        print _("The following error was found while parsing the"
+                "kickstart configuration file:\n\n%s") % e
         sys.exit(1)
 
     # And return the handler object so we can get information out of it.
@@ -1294,7 +1294,7 @@ def selectPackages(anaconda):
                                   "package '%s' should be installed.  "
                                   "This package does not exist. "
                                   "Would you like to continue or "
-                                  "abort your installation?") %(pkg,),
+                                  "abort this installation?") %(pkg,),
                                 type="custom",
                                 custom_buttons=[_("_Abort"),
                                                 _("_Ignore All"),
@@ -1332,7 +1332,7 @@ def selectPackages(anaconda):
                                           "group '%s' should be installed. "
                                           "This group does not exist. "
                                           "Would you like to continue or "
-                                          "abort your installation?")
+                                          "abort this installation?")
                                         %(grp.name,),
                                         type="custom",
                                         custom_buttons=[_("_Abort"),
@@ -1434,7 +1434,8 @@ def setSteps(anaconda):
                 errors.append(msg)
 
         if len(errors) > 0:
-            anaconda.intf.kickstartErrorWindow(_("Your kickstart file is missing "
-                "required information that anaconda cannot prompt for.  Please "
-                "add the following sections and try again:\n%s") % ", ".join(errors))
+            anaconda.intf.kickstartErrorWindow(_("The kickstart configuration "
+                "file is missing required information that anaconda cannot "
+                "prompt for.  Please add the following sections and try "
+                "again:\n%s") % ", ".join(errors))
             sys.exit(0)
diff --git a/storage/partitioning.py b/storage/partitioning.py
index 7c6b1a7f0..f1f1c283a 100644
--- a/storage/partitioning.py
+++ b/storage/partitioning.py
@@ -253,7 +253,7 @@ def doAutoPartition(anaconda):
         #
         if anaconda.isKickstart:
             anaconda.intf.messageWindow(_("Unrecoverable Error"),
-                               _("Your system will now be rebooted."))
+                               _("The system will now reboot."))
             sys.exit(0)
         anaconda.id.storage.reset()
         return DISPATCH_BACK
diff --git a/text.py b/text.py
index 624993ad0..fada4e273 100644
--- a/text.py
+++ b/text.py
@@ -325,8 +325,8 @@ class LuksPassphraseWindow:
         self.passphrase = passphrase
         self.minLength = 8
         self.preexist = preexist
-        self.txt = _("Choose a passphrase for your encrypted devices. You "
-                     "will be prompted for the passphrase during system boot.")
+        self.txt = _("Choose a passphrase for the encrypted devices. You "
+                     "will be prompted for this passphrase during system boot.")
         self.rc = None
 
     def run(self):
@@ -564,8 +564,8 @@ class InstallInterface:
         
 
     def kickstartErrorWindow(self, text):
-        s = _("The following error was found while parsing your "
-              "kickstart configuration:\n\n%s") %(text,)
+        s = _("The following error was found while parsing the "
+              "kickstart configuration file:\n\n%s") %(text,)
         self.messageWindow(_("Error Parsing Kickstart Config"),
                            s,
                            type = "custom",
diff --git a/yuminstall.py b/yuminstall.py
index 372ef162a..035c4b16f 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -126,7 +126,7 @@ class AnacondaCallback:
             # step 6 is the bulk of the ts processing time
             if amount == 6:
                 self.progressWindow = \
-                    self.progressWindowClass (_("Preparing to install"), 
+                    self.progressWindowClass (_("Preparing to install"),
                                               _("Preparing transaction from installation source"),
                                               total)
                 self.incr = total / 10