X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fmain.c;h=a70ecc03aeff74fad69d3ad2939ce3933ffc4274;hp=5898a1989058995a619b3d244037f853c4f4684d;hb=d6065c927eb23cd674b00ccf88b171c70f1962d0;hpb=d5e283b1a75c5f8249300b465b4e7b55130bec49

diff --git a/src/main.c b/src/main.c
index 5898a198..a70ecc03 100644
--- a/src/main.c
+++ b/src/main.c
@@ -63,8 +63,6 @@ as that of the covered work.  */
 #include "vms.h"
 #endif /* __VMS */
 
-#include "version.h"
-
 #ifndef PATH_SEPARATOR
 # define PATH_SEPARATOR '/'
 #endif
@@ -251,7 +249,7 @@ static struct cmdline_option option_data[] =
     { "referer", 0, OPT_VALUE, "referer", -1 },
     { "reject", 'R', OPT_VALUE, "reject", -1 },
     { "relative", 'L', OPT_BOOLEAN, "relativeonly", -1 },
-    { "remote-encoding", 0, OPT_VALUE, "remoteencoding", -1},
+    { "remote-encoding", 0, OPT_VALUE, "remoteencoding", -1 },
     { "remove-listing", 0, OPT_BOOLEAN, "removelisting", -1 },
     { "restrict-file-names", 0, OPT_BOOLEAN, "restrictfilenames", -1 },
     { "retr-symlinks", 0, OPT_BOOLEAN, "retrsymlinks", -1 },
@@ -434,7 +432,8 @@ Logging and input file:\n"),
     N_("\
   -F,  --force-html          treat input file as HTML.\n"),
     N_("\
-  -B,  --base=URL            prepends URL to relative links in -F -i file.\n"),
+  -B,  --base=URL            resolves HTML input-file links (-i -F)\n\
+                             relative to URL,\n"),
     "\n",
 
     N_("\
@@ -681,7 +680,7 @@ Recursive accept/reject:\n"),
   size_t i;
 
   printf (_("GNU Wget %s, a non-interactive network retriever.\n"),
-          VERSION_STRING);
+          version_string);
   print_usage ();
 
   for (i = 0; i < countof (help); i++)
@@ -780,12 +779,11 @@ print_version (void)
   char *env_wgetrc, *user_wgetrc;
   int i;
 
-  printf (_("GNU Wget %s\n\n"), version_string);
 #ifdef __VMS
-  printf ("GNU Wget %s built on VMS %s %s.\n\n",
-   VERSION_STRING, vms_arch(), vms_vers());
+  printf (_("GNU Wget %s built on VMS %s %s.\n\n"),
+   version_string, vms_arch(), vms_vers());
 #else /* def __VMS */
-  printf ("GNU Wget %s built on %s.\n\n", version_string, OS_TYPE);
+  printf (_("GNU Wget %s built on %s.\n\n"), version_string, OS_TYPE);
 #endif /* def __VMS */
   /* compiled_features is a char*[]. We limit the characters per
      line to MAX_CHARS_PER_LINE and prefix each line with a constant
@@ -808,17 +806,17 @@ print_version (void)
   env_wgetrc = wgetrc_env_file_name ();
   if (env_wgetrc && *env_wgetrc) 
     {
-      printf ("    %s (env)\n", env_wgetrc);
+      printf (_("    %s (env)\n"), env_wgetrc);
       xfree (env_wgetrc);
     }
   user_wgetrc = wgetrc_user_file_name ();
   if (user_wgetrc) 
     {
-      printf ("    %s (user)\n", user_wgetrc);
+      printf (_("    %s (user)\n"), user_wgetrc);
       xfree (user_wgetrc);
     }
 #ifdef SYSTEM_WGETRC
-  printf ("    %s (system)\n", SYSTEM_WGETRC);
+  printf (_("    %s (system)\n"), SYSTEM_WGETRC);
 #endif
 
   format_and_print_line (locale_title,
@@ -837,7 +835,7 @@ print_version (void)
   /* TRANSLATORS: When available, an actual copyright character
      (cirle-c) should be used in preference to "(C)". */
   fputs (_("\
-Copyright (C) 2008 Free Software Foundation, Inc.\n"), stdout);
+Copyright (C) 2009 Free Software Foundation, Inc.\n"), stdout);
   fputs (_("\
 License GPLv3+: GNU GPL version 3 or later\n\
 <http://www.gnu.org/licenses/gpl.html>.\n\
@@ -1153,7 +1151,7 @@ for details.\n\n"));
   log_init (opt.lfilename, append_to_log);
 
   DEBUGP (("DEBUG output created by Wget %s on %s.\n\n",
-           VERSION_STRING, OS_TYPE));
+           version_string, OS_TYPE));
 
   /* Open the output filename if necessary.  */