Merge with mainline

[wget] / src / wget.h

diff --git a/src/wget.h b/src/wget.h
index ee27b8f103d74cd22a17b56e04b7608ec0d18d1a..2cfa7aa84de539a031d33ca1877a83715cf8dd05 100644 (file)
--- a/src/wget.h
+++ b/src/wget.h
@@ -1,11 +1,12 @@
 /* Miscellaneous declarations.
-   Copyright (C) 1996-2005 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
@@ -14,8 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
@@ -56,6 +56,7 @@ so, delete this exception statement from your version.  */
 # endif /* not HAVE_LIBINTL_H */
 #else  /* not HAVE_NLS */
 # define _(string) (string)
+# define ngettext(sing, plur, num)  ((num) == 1 ? (sing) : (plur))
 #endif /* not HAVE_NLS */
 
 /* A pseudo function call that serves as a marker for the automated