Index: localdir.cc
===================================================================
RCS file: /cvs/cygwin-apps/setup/localdir.cc,v
retrieving revision 2.25
diff -w -u -p -w -u -p -r2.25 localdir.cc
--- localdir.cc	20 Aug 2008 13:17:41 -0000	2.25
+++ localdir.cc	11 May 2009 15:07:48 -0000
@@ -113,6 +113,16 @@ check_if_enable_next (HWND h)
 static void
 load_dialog (HWND h)
 {
+  char descText[1000];
+  if (source != IDC_SOURCE_CWD)
+    {
+      LoadString (hinstance, IDS_LOCAL_DIR_DOWNLOAD, descText, sizeof (descText));
+    }
+  else
+    {
+      LoadString (hinstance, IDS_LOCAL_DIR_INSTALL, descText, sizeof (descText));
+    }
+  eset (h, IDC_LOCAL_DIR_DESC, descText);
   eset (h, IDC_LOCAL_DIR, local_dir);
   check_if_enable_next (h);
 }
Index: res.rc
===================================================================
RCS file: /cvs/cygwin-apps/setup/res.rc,v
retrieving revision 2.78
diff -w -u -p -w -u -p -r2.78 res.rc
--- res.rc	11 May 2009 11:02:11 -0000	2.78
+++ res.rc	11 May 2009 15:07:49 -0000
@@ -71,10 +71,7 @@ FONT 8, "MS Shell Dlg"
 BEGIN
     LTEXT           "Select Local Package Directory",IDC_STATIC_HEADER_TITLE,
                     7,0,258,8,NOT WS_GROUP
-    LTEXT           "Select a directory where you want Setup to store the "
-                    "installation files it downloads.  The directory will be "
-                    "created if it does not already exist.",IDC_STATIC,
-                    21,9,248,16,NOT WS_GROUP
+    LTEXT           "",IDC_LOCAL_DIR_DESC,21,9,248,16,NOT WS_GROUP
     ICON            IDI_CYGWIN,IDC_HEADICON,290,0,21,20
     CONTROL         "",IDC_HEADSEPARATOR,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
                     317,1
@@ -491,4 +488,9 @@ BEGIN
     IDS_SIG_INVALID    "Mirror Error:  Setup.ini signature %s from %s failed to verify.\nPossible corrupt mirror?  Setup.ini rejected."
     IDS_CRYPTO_ERROR   "Internal Error:  gcrypt library error %d %s"
     IDS_SEARCH_TOOLTIP "Search for this string in package names."
+    IDS_LOCAL_DIR_DOWNLOAD "Select a directory where you want Setup to store "
+       "the installation files it downloads.  The directory will be "
+       "created if it does not already exist."
+    IDS_LOCAL_DIR_INSTALL "Select a directory where Setup should look for "
+       "downloaded installation files."
 END
Index: resource.h
===================================================================
RCS file: /cvs/cygwin-apps/setup/resource.h,v
retrieving revision 2.38
diff -w -u -p -w -u -p -r2.38 resource.h
--- resource.h	11 May 2009 11:02:11 -0000	2.38
+++ resource.h	11 May 2009 15:07:49 -0000
@@ -34,6 +34,8 @@
 #define IDS_SIG_INVALID                   131
 #define IDS_CRYPTO_ERROR                  132
 #define IDS_SEARCH_TOOLTIP                133
+#define IDS_LOCAL_DIR_DOWNLOAD            134
+#define IDS_LOCAL_DIR_INSTALL             135
 
 // Dialogs
 
@@ -165,3 +167,4 @@
 #define IDC_CHOOSE_SEARCH_EDIT            585
 #define IDC_CHOOSE_SEARCH_LABEL           586
 #define IDC_CHOOSE_CLEAR_SEARCH           587
+#define IDC_LOCAL_DIR_DESC                588