From 0c951cfba63a967f6b67d9b112bd26fb42a1abe0 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 10 Jul 2009 14:43:00 -0400
Subject: 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.
---
 loader/driverdisk.c | 2 +-
 loader/loader.c     | 8 ++++----
 loader/mediacheck.c | 4 ++--
 loader/net.c        | 6 +++---
 loader/telnetd.c    | 4 ++--
 loader/windows.c    | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'loader')

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) {
-- 
cgit