From 0de341e4a7c34bbf3260f20a24734e1855e41298 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Thu, 28 Feb 2013 09:20:44 -0500
Subject: A bunch more "install" -> "installation" changes.

---
 pyanaconda/install.py                 | 2 +-
 pyanaconda/packaging/livepayload.py   | 2 +-
 pyanaconda/packaging/yumpayload.py    | 2 +-
 pyanaconda/ui/gui/spokes/custom.glade | 2 +-
 pyanaconda/ui/gui/spokes/source.py    | 2 +-
 pyanaconda/ui/tui/spokes/askvnc.py    | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pyanaconda/install.py b/pyanaconda/install.py
index 091f72e20..08b396686 100644
--- a/pyanaconda/install.py
+++ b/pyanaconda/install.py
@@ -83,7 +83,7 @@ def doConfiguration(storage, payload, ksdata, instClass):
         ksdata.addons.execute(storage, ksdata, instClass, u)
         ksdata.configured_spokes.execute(storage, ksdata, instClass, u)
         
-    with progress_report(_("Running post install scripts")):
+    with progress_report(_("Running post-installation scripts")):
         runPostScripts(ksdata.scripts)
 
     # Write the kickstart file to the installed system (or, copy the input
diff --git a/pyanaconda/packaging/livepayload.py b/pyanaconda/packaging/livepayload.py
index 73fc3326a..b7c565ca6 100644
--- a/pyanaconda/packaging/livepayload.py
+++ b/pyanaconda/packaging/livepayload.py
@@ -127,7 +127,7 @@ class LiveImagePayload(ImagePayload):
 
     def postInstall(self):
         """ Perform post-installation tasks. """
-        progress.send_message(_("Performing post-install setup tasks"))
+        progress.send_message(_("Performing post-installation setup tasks"))
         blivet.util.umount(INSTALL_TREE)
 
         super(LiveImagePayload, self).postInstall()
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py
index 30c5a5be5..95494206a 100644
--- a/pyanaconda/packaging/yumpayload.py
+++ b/pyanaconda/packaging/yumpayload.py
@@ -1624,7 +1624,7 @@ class RPMCallback(object):
             # take a very long time.  So when it closes the last package, just
             # display the message.
             if self.completed_actions == self.total_actions:
-                progress.send_message(_("Performing post-install setup tasks"))
+                progress.send_message(_("Performing post-installation setup tasks"))
         elif event == rpm.RPMCALLBACK_UNINST_START:
             # update status that we're cleaning up %key
             #progress.set_text(_("Cleaning up %s" % key))
diff --git a/pyanaconda/ui/gui/spokes/custom.glade b/pyanaconda/ui/gui/spokes/custom.glade
index 6319a50ba..4cd8db654 100644
--- a/pyanaconda/ui/gui/spokes/custom.glade
+++ b/pyanaconda/ui/gui/spokes/custom.glade
@@ -486,7 +486,7 @@ use.  Try something else?</property>
                           <object class="GtkLabel" id="whenCreateLabel">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">When you create mount points for your %s %s install, you'll be able to view their details here.</property>
+                            <property name="label" translatable="yes">When you create mount points for your %s %s installation, you'll be able to view their details here.</property>
                             <property name="wrap">True</property>
                           </object>
                         </child>
diff --git a/pyanaconda/ui/gui/spokes/source.py b/pyanaconda/ui/gui/spokes/source.py
index a6223f464..4b3d90d78 100644
--- a/pyanaconda/ui/gui/spokes/source.py
+++ b/pyanaconda/ui/gui/spokes/source.py
@@ -566,7 +566,7 @@ class SourceSpoke(NormalSpoke):
             log.error("PayloadError: %s" % (e,))
             self._error = True
             communication.send_message(self.__class__.__name__,
-                                       _("Failed to set up install source"))
+                                       _("Failed to set up installation source"))
             if not self.data.method.proxy:
                 gtk_call_once(self.set_warning, _("Failed to set up installation source; check the repo url"))
             else:
diff --git a/pyanaconda/ui/tui/spokes/askvnc.py b/pyanaconda/ui/tui/spokes/askvnc.py
index c27dd04f2..fc437f9eb 100644
--- a/pyanaconda/ui/tui/spokes/askvnc.py
+++ b/pyanaconda/ui/tui/spokes/askvnc.py
@@ -45,8 +45,8 @@ class AskVNCSpoke(NormalTUISpoke):
                               "start VNC to connect to "
                               "this computer from another "
                               "computer and perform a "
-                              "graphical install or continue "
-                              "with a text mode install?")
+                              "graphical installation or continue "
+                              "with a text mode installation?")
 
         self._choices = (USEVNC, USETEXT)
         self._usevnc = False
-- 
cgit