Edit user-visible dialogs for style.

We have lots of strings that we display to users which are unclear or
contain poor usage and grammar.  That's bad.

17 files changed, 46 insertions, 46 deletions

diff --git a/backend.py b/backend.py
index 729966ae1..41698afd7 100644
--- a/backend.py
+++ b/backend.py
@@ -165,7 +165,7 @@ class AnacondaBackend:
 
         try:
             win = anaconda.intf.waitWindow(_("Copying File"),
-                    _("Transferring install image to hard drive..."))
+                    _("Transferring install image to hard drive"))
             shutil.copyfile(installimg, self._loopbackFile)
             win.pop()
         except Exception, e:
@@ -176,8 +176,8 @@ class AnacondaBackend:
 
             if isinstance(e, IOError) and e.errno == 5:
                 msg = _("An error occurred transferring the install image "
-                        "to your hard drive.  This is probably due to "
-                        "bad media.")
+                        "to your hard drive.  This is often cause by "
+                        "damaged or low quality media.")
             else:
                 msg = _("An error occurred transferring the install image "
                         "to your hard drive. You are probably out of disk "
diff --git a/bootloader.py b/bootloader.py
index eb28e0a67..45cd773e3 100644
--- a/bootloader.py
+++ b/bootloader.py
@@ -140,7 +140,7 @@ def writeBootloader(anaconda):
 
     # We don't need to let the user know if we're just doing the bootloader.
     if not justConfigFile:
-        w = anaconda.intf.waitWindow(_("Bootloader"), _("Installing bootloader..."))
+        w = anaconda.intf.waitWindow(_("Bootloader"), _("Installing bootloader."))
 
     kernelList = []
     otherList = []
diff --git a/cmdline.py b/cmdline.py
index d1bd4028f..0f209c786 100644
--- a/cmdline.py
+++ b/cmdline.py
@@ -60,7 +60,7 @@ class ProgressWindow:
     def __init__(self, title, text, total, updpct = 0.05, pulse = False):
         self.total = total
         print(text)
-        print(_("In progress...   "))
+        print(_("In progress"))
 
 class InstallInterface:
     def __init__(self):
diff --git a/gui.py b/gui.py
index 12472f1dd..b09b52ed5 100755
--- a/gui.py
+++ b/gui.py
@@ -1409,10 +1409,10 @@ class InstallControlWindow:
                                                     _("_Retry")])
                 if not win.getrc():
                     if flags.rootpath:
-                        msg =  _("The installer will now exit...")
+                        msg =  _("The installer will now exit.")
                         buttons = [_("_Exit installer")]
                     else:
-                        msg =  _("Your system will now be rebooted...")
+                        msg =  _("Your system will now be rebooted.")
                         buttons = [_("_Reboot")]
 
                     MessageWindow(_("Exiting"),
diff --git a/iw/netconfig_dialog.py b/iw/netconfig_dialog.py
index 52894de56..29afc0ea4 100644
--- a/iw/netconfig_dialog.py
+++ b/iw/netconfig_dialog.py
@@ -233,9 +233,9 @@ class NetworkConfigurator:
         if self.xml.get_widget("dhcpCheckbutton").get_active():
             netdev.set(('BOOTPROTO', 'dhcp'))
             self.window.hide()
-            w = gui.WaitWindow(_("Dynamic IP"),
-                               _("Sending request for IP information "
-                                 "for %s...") % (netdev.get('DEVICE'),))
+            w = gui.WaitWindow(_("Dynamic IP Address"),
+                               _("Sending request for IP address information "
+                                 "for %s") % (netdev.get('DEVICE'),))
             haveNet = self.network.bringUp()
             w.pop()
         else:
diff --git a/kickstart.py b/kickstart.py
index bf61333be..ca20068de 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -1239,8 +1239,8 @@ def runPostScripts(anaconda):
 
     log.info("Running kickstart %%post script(s)")
     if anaconda.intf is not None:
-        w = anaconda.intf.waitWindow(_("Running..."),
-                            _("Running post-install scripts"))
+        w = anaconda.intf.waitWindow(_("Post-Installation"),
+                            _("Running post-installation scripts"))
         
     map (lambda s: s.run(anaconda.rootPath, flags.serial, anaconda.intf), postScripts)
 
@@ -1256,8 +1256,8 @@ def runPreScripts(anaconda, scripts):
 
     log.info("Running kickstart %%pre script(s)")
     if anaconda.intf is not None:
-        w = anaconda.intf.waitWindow(_("Running..."),
-                            _("Running pre-install scripts"))
+        w = anaconda.intf.waitWindow(_("Pre-Installation"),
+                            _("Running pre-installation scripts"))
     
     map (lambda s: s.run("/", flags.serial, anaconda.intf), preScripts)
 
diff --git a/livecd.py b/livecd.py
index 900eb8c61..bb3abc793 100644
--- a/livecd.py
+++ b/livecd.py
@@ -220,8 +220,8 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
     def _doFilesystemMangling(self, anaconda):
         # FIXME: this whole method is a big fucking mess
         log.info("doing post-install fs mangling")
-        wait = anaconda.intf.waitWindow(_("Doing post-installation"),
-                                        _("Performing post-installation filesystem changes.  This may take several minutes..."))
+        wait = anaconda.intf.waitWindow(_("Post-Installation"),
+                                        _("Performing post-installation filesystem changes.  This may take several minutes."))
 
         # resize rootfs first, since it is 100% full due to genMinInstDelta
         self._resizeRootfs(anaconda, wait)
diff --git a/loader/driverdisk.c b/loader/driverdisk.c
index 4edd2a94c..3458ee8f5 100644
--- a/loader/driverdisk.c
+++ b/loader/driverdisk.c
@@ -136,7 +136,7 @@ static int loadDriverDisk(struct loaderData_s *loaderData, char *mntpt) {
 
     if (!FL_CMDLINE(flags)) {
         startNewt();
-        winStatus(40, 3, _("Loading"), _("Reading driver disk..."));
+        winStatus(40, 3, _("Loading"), _("Reading driver disk"));
     }
 
     sprintf(dest, "/tmp/DD-%d", disknum);
diff --git a/loader/loader.c b/loader/loader.c
index 650cd9b52..8d92ed461 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -523,7 +523,7 @@ void loadUpdates(struct loaderData_s *loaderData) {
                 break;
             } else {
                 /* Copy everything to /tmp/updates so we can unmount the disk  */
-                winStatus(40, 3, _("Updates"), _("Reading anaconda updates..."));
+                winStatus(40, 3, _("Updates"), _("Reading anaconda updates"));
                 if (!copyDirectory("/tmp/update-disk", "/tmp/updates", copyWarnFn,
                                    copyErrorFn)) {
                     dir = 1;
@@ -1255,7 +1255,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData,
 
             logMessage(INFO, "Detected stage 2 image on CD (url: %s)", url);
             winStatus(50, 3, _("Media Detected"),
-                      _("Local installation media detected..."), 0);
+                      _("Found local installation media"), 0);
             sleep(3);
             newtPopWindow();
 
@@ -2225,9 +2225,9 @@ int main(int argc, char ** argv) {
         char *fmt;
 
         if (FL_RESCUE(flags)) {
-            fmt = _("Running anaconda %s, the %s rescue mode - please wait...\n");
+            fmt = _("Running anaconda %s, the %s rescue mode - please wait.\n");
         } else {
-            fmt = _("Running anaconda %s, the %s system installer - please wait...\n");
+            fmt = _("Running anaconda %s, the %s system installer - please wait.\n");
         }
         printf(fmt, VERSION, getProductName());
 
diff --git a/loader/mediacheck.c b/loader/mediacheck.c
index e042dc439..6e966477f 100644
--- a/loader/mediacheck.c
+++ b/loader/mediacheck.c
@@ -49,9 +49,9 @@ int doMediaCheck(char *file, char *descr) {
     }
 
     if (descr)
-	snprintf(tmpstr, sizeof(tmpstr), _("Checking \"%s\"..."), descr);
+	snprintf(tmpstr, sizeof(tmpstr), _("Checking \"%s\"."), descr);
     else
-	snprintf(tmpstr, sizeof(tmpstr), _("Checking media now..."));
+	snprintf(tmpstr, sizeof(tmpstr), _("Checking media."));
 
     dlen = strlen(tmpstr);
     if (dlen > 65)
diff --git a/loader/net.c b/loader/net.c
index 2da2384f1..486c1607c 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -1900,7 +1900,7 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) {
                     }
 
                     winStatus(idrc, 3, NULL,
-                              _("Flashing %s port lights for %d seconds..."),
+                              _("Flashing %s port lights for %d seconds."),
                               devices[deviceNum], secs);
 
                     if (identifyNIC(devices[deviceNum], secs)) {
@@ -2068,11 +2068,11 @@ int get_connection(iface_t *iface) {
 
     /* display status */
     if (FL_CMDLINE(flags)) {
-        printf(_("Waiting for NetworkManager to configure %s...\n"),
+        printf(_("Waiting for NetworkManager to configure %s.\n"),
                iface->device);
     } else {
         winStatus(55, 3, NULL,
-                  _("Waiting for NetworkManager to configure %s...\n"),
+                  _("Waiting for NetworkManager to configure %s.\n"),
                   iface->device, 0);
     }
 
diff --git a/loader/telnetd.c b/loader/telnetd.c
index 17935bf72..cdf7e162e 100644
--- a/loader/telnetd.c
+++ b/loader/telnetd.c
@@ -86,7 +86,7 @@ int beTelnet(void) {
     bind(sock, (struct sockaddr *) &address, sizeof(address));
     listen(sock, 5);
 
-    winStatus(45, 3, _("Telnet"), _("Waiting for telnet connection..."));
+    winStatus(45, 3, _("Telnet"), _("Waiting for telnet connection."));
 
     if ((conn = accept(sock, (struct sockaddr *) &address, &addrLength)) < 0) {
         newtWinMessage(_("Error"), _("OK"), "accept failed: %s",
@@ -125,7 +125,7 @@ int beTelnet(void) {
     if (child) {
 #ifndef DEBUG_TELNET
         startNewt();
-        winStatus(45, 3, _("Telnet"), _("Running anaconda via telnet..."));
+        winStatus(45, 3, _("Telnet"), _("Running anaconda via telnet."));
 #endif
 
         fds[0].events = POLLIN;
diff --git a/loader/windows.c b/loader/windows.c
index 0c429f83d..3d5713655 100644
--- a/loader/windows.c
+++ b/loader/windows.c
@@ -63,7 +63,7 @@ void winStatus(int width, int height, char * title, char * text, ...) {
 
 void scsiWindow(const char * driver) {
     winStatus(40, 3, _("Loading SCSI driver"),
-        _("Loading %s driver..."), driver);
+        _("Loading %s driver"), driver);
 }
 
 void progressCallback(void *pbdata, long long pos, long long total) {
diff --git a/storage/__init__.py b/storage/__init__.py
index 934b5ecd2..8d4636778 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -269,7 +269,7 @@ class Storage(object):
                 self.__luksDevs[device.format.uuid] = device.format._LUKS__passphrase
 
         w = self.anaconda.intf.waitWindow(_("Finding Devices"),
-                                          _("Finding storage devices..."))
+                                          _("Finding storage devices"))
         self.iscsi.startup(self.anaconda.intf)
         self.fcoe.startup(self.anaconda.intf)
         self.zfcp.startup()
diff --git a/storage/formats/fs.py b/storage/formats/fs.py
index 0c08764a5..e7e3bcf2c 100644
--- a/storage/formats/fs.py
+++ b/storage/formats/fs.py
@@ -341,7 +341,7 @@ class FS(DeviceFormat):
         w = None
         if intf:
             w = intf.progressWindow(_("Formatting"),
-                                    _("Creating filesystem on %s...")
+                                    _("Creating filesystem on %s")
                                     % (self.device,),
                                     100, pulse = True)
 
@@ -438,7 +438,7 @@ class FS(DeviceFormat):
         w = None
         if intf:
             w = intf.progressWindow(_("Resizing"),
-                                    _("Resizing filesystem on %s...")
+                                    _("Resizing filesystem on %s")
                                     % (self.device,),
                                     100, pulse = True)
 
@@ -482,7 +482,7 @@ class FS(DeviceFormat):
         w = None
         if intf:
             w = intf.progressWindow(_("Checking"),
-                                    _("Checking filesystem on %s...")
+                                    _("Checking filesystem on %s")
                                     % (self.device),
                                     100, pulse = True)
 
diff --git a/textw/netconfig_text.py b/textw/netconfig_text.py
index bc1251fde..8475f0018 100644
--- a/textw/netconfig_text.py
+++ b/textw/netconfig_text.py
@@ -262,7 +262,7 @@ class NetworkConfiguratorText:
                         self._handleIPError(_("Nameserver"), msg)
                         continue
 
-            w = self.anaconda.intf.waitWindow(_("Configuring Network Interfaces"), _("Waiting for NetworkManager..."))
+            w = self.anaconda.intf.waitWindow(_("Configuring Network Interfaces"), _("Waiting for NetworkManager"))
             result = self.anaconda.id.network.bringUp()
             w.pop()
             if result:
diff --git a/yuminstall.py b/yuminstall.py
index 31ed4ea3e..372ef162a 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -126,8 +126,8 @@ class AnacondaCallback:
             # step 6 is the bulk of the ts processing time
             if amount == 6:
                 self.progressWindow = \
-                    self.progressWindowClass (_("Processing"), 
-                                              _("Preparing transaction from installation source..."),
+                    self.progressWindowClass (_("Preparing to install"), 
+                                              _("Preparing transaction from installation source"),
                                               total)
                 self.incr = total / 10
 
@@ -216,7 +216,7 @@ class AnacondaCallback:
                       rpm.RPMCALLBACK_UNINST_STOP):
             if self.initWindow is None:
                 self.initWindow = self.pulseWindow(_("Finishing upgrade"),
-                                                   _("Finishing upgrade process.  This may take a little while..."),
+                                                   _("Finishing upgrade process.  This may take a little while."),
                                                    0, pulse=True)
             else:
                 self.initWindow.pulse()
@@ -726,7 +726,7 @@ class AnacondaYum(YumSorter):
 
         delay = 0.25*(2**(obj.tries-1))
         if delay > 1:
-            w = self.anaconda.intf.waitWindow(_("Retrying"), _("Retrying download..."))
+            w = self.anaconda.intf.waitWindow(_("Retrying"), _("Retrying download."))
             time.sleep(delay)
             w.pop()
         else:
@@ -1109,9 +1109,9 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
 
         for repo in repos:
             if repo.name is None:
-                txt = _("Retrieving installation information...")
+                txt = _("Retrieving installation information.")
             else:
-                txt = _("Retrieving installation information for %s...")%(repo.name)
+                txt = _("Retrieving installation information for %s.")%(repo.name)
 
             waitwin = anaconda.intf.waitWindow(_("Installation Progress"), txt)
 
@@ -1566,10 +1566,10 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
 
         if anaconda.id.getUpgrade():
             w = anaconda.intf.waitWindow(_("Post Upgrade"),
-                                    _("Performing post upgrade configuration..."))
+                                    _("Performing post-upgrade configuration"))
         else:
-            w = anaconda.intf.waitWindow(_("Post Install"),
-                                    _("Performing post install configuration..."))
+            w = anaconda.intf.waitWindow(_("Post Installation"),
+                                    _("Performing post-installation configuration"))
 
         if not iutil.isS390():
             if len(self.ayum.tsInfo.matchNaevr(name='rhgb')) > 0:
@@ -1795,8 +1795,8 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
 
 class DownloadHeaderProgress:
     def __init__(self, intf, ayum=None):
-        window = intf.progressWindow(_("Install Starting"),
-                                     _("Starting install process.  This may take several minutes..."),
+        window = intf.progressWindow(_("Installation Starting"),
+                                     _("Starting installation process"),
                                      1.0, 0.01)
         self.window = window
         self.ayum = ayum
@@ -1835,7 +1835,7 @@ class DownloadHeaderProgress:
 class YumDepSolveProgress:
     def __init__(self, intf, ayum = None):
         window = intf.progressWindow(_("Dependency Check"),
-                                     _("Checking dependencies in packages selected for installation..."),
+                                     _("Checking dependencies in packages selected for installation"),
                                      1.0, 0.01)
         self.window = window