Index: loader2/net.c
===================================================================
RCS file: /usr/local/CVS/anaconda/loader2/net.c,v
retrieving revision 1.119.4.23
diff -u -p -r1.119.4.23 net.c
--- loader2/net.c	18 Sep 2007 19:28:55 -0000	1.119.4.23
+++ loader2/net.c	19 Oct 2007 03:20:09 -0000
@@ -56,9 +56,9 @@ extern uint64_t flags;
 char *netServerPrompt = \
     N_("Please enter the following information:\n"
        "\n"
-       "    o the name or IP number of your %s server\n" 
+       "    o the name or IP address of your %s server\n" 
        "    o the directory on that server containing\n" 
-       "      %s for your architecture\n");
+       "      the installation files\n");
 
 /**
  * Callback function for the CIDR entry boxes on the manual TCP/IP
Index: loader2/nfsinstall.c
===================================================================
RCS file: /usr/local/CVS/anaconda/loader2/nfsinstall.c,v
retrieving revision 1.45.4.3
diff -u -p -r1.45.4.3 nfsinstall.c
--- loader2/nfsinstall.c	3 Oct 2007 19:11:58 -0000	1.45.4.3
+++ loader2/nfsinstall.c	19 Oct 2007 03:20:09 -0000
@@ -44,17 +44,17 @@ int nfsGetSetup(char ** hostptr, char **
     char * newDir = *dirptr ? strdup(*dirptr) : NULL;
     int rc;
 
-    entries[0].text = _("NFS server name:");
+    entries[0].text = _("Server name:");
     entries[0].value = (const char **) &newServer;
     entries[0].flags = NEWT_FLAG_SCROLL;
-    entries[1].text = sdupprintf(_("%s directory:"), getProductName());
+    entries[1].text = sdupprintf(_("Directory:"));
     entries[1].value = (const char **) &newDir;
     entries[1].flags = NEWT_FLAG_SCROLL;
     entries[2].text = NULL;
     entries[2].value = NULL;
-    buf = sdupprintf(_(netServerPrompt), _("NFS"), getProductName());
+    buf = sdupprintf(_(netServerPrompt), _("NFS"));
     rc = newtWinEntries(_("NFS Setup"), buf, 60, 5, 15,
-                        24, entries, _("OK"), _("Back"), NULL);
+                        45, entries, _("OK"), _("Back"), NULL);
     free(buf);
 
     if (rc == 2) {
Index: loader2/urls.c
===================================================================
RCS file: /usr/local/CVS/anaconda/loader2/urls.c,v
retrieving revision 1.28.4.3
diff -u -p -r1.28.4.3 urls.c
--- loader2/urls.c	6 Aug 2007 21:08:16 -0000	1.28.4.3
+++ loader2/urls.c	19 Oct 2007 03:20:09 -0000
@@ -280,15 +280,15 @@ int urlMainSetupPanel(struct iurlinfo * 
         *doSecondarySetup = ' ';
 
     buttons = newtButtonBar(_("OK"), &okay, _("Back"), &cancel, NULL);
-    
+
     switch (protocol) {
     case URL_METHOD_FTP:
-        buf = sdupprintf(_(netServerPrompt), _("FTP"), getProductName());
+        buf = sdupprintf(_(netServerPrompt), _("FTP"));
         reflowedText = newtReflowText(buf, 47, 5, 5, &width, &height);
         free(buf);
         break;
     case URL_METHOD_HTTP:
-        buf = sdupprintf(_(netServerPrompt), _("Web"), getProductName());
+        buf = sdupprintf(_(netServerPrompt), _("HTTP"));
         reflowedText = newtReflowText(buf, 47, 5, 5, &width, &height);
         free(buf);
         break;
@@ -297,21 +297,17 @@ int urlMainSetupPanel(struct iurlinfo * 
     newtTextboxSetText(text, reflowedText);
     free(reflowedText);
 
-    siteEntry = newtEntry(22, 8, site, 24, (const char **) &site, 
+    siteEntry = newtEntry(22, 8, site, 45, (const char **) &site, 
                           NEWT_ENTRY_SCROLL);
-    dirEntry = newtEntry(22, 9, dir, 24, (const char **) &dir, 
+    dirEntry = newtEntry(22, 9, dir, 45, (const char **) &dir, 
                          NEWT_ENTRY_SCROLL);
 
     entryGrid = newtCreateGrid(2, 2);
     newtGridSetField(entryGrid, 0, 0, NEWT_GRID_COMPONENT,
-                     newtLabel(-1, -1, (protocol == URL_METHOD_FTP) ?
-                                        _("FTP site name:") :
-                                        _("Web site name:")),
+                     newtLabel(-1, -1, _("Server name:")),
                      0, 0, 1, 0, NEWT_ANCHOR_LEFT, 0);
     newtGridSetField(entryGrid, 0, 1, NEWT_GRID_COMPONENT,
-                     newtLabel(-1, -1, 
-                               sdupprintf(_("%s directory:"), 
-                                          getProductName())),
+                     newtLabel(-1, -1, sdupprintf(_("Directory:"))),
                      0, 0, 1, 0, NEWT_ANCHOR_LEFT, 0);
     newtGridSetField(entryGrid, 1, 0, NEWT_GRID_COMPONENT, siteEntry,
                      0, 0, 0, 0, 0, 0);
@@ -330,7 +326,7 @@ int urlMainSetupPanel(struct iurlinfo * 
         newtGridSetField(grid, 0, 2, NEWT_GRID_COMPONENT, cb,
                          0, 0, 0, 1, NEWT_ANCHOR_LEFT, 0);
     }
-        
+
     newtGridSetField(grid, 0, 3, NEWT_GRID_SUBGRID, buttons,
                      0, 0, 0, 0, 0, NEWT_GRID_FLAG_GROWX);