Imported Debian version 4.7.25v4.7.25

27 files changed, 1505 insertions, 604 deletions

diff --git a/as_del_list b/as_del_list
index 8cf4425..9d9ecde 100644
--- a/as_del_list
+++ b/as_del_list
@@ -3,6 +3,7 @@
 306	371	whois.nic.mil
 379	508	whois.nic.mil
 1101	1200	ripe
+1267	1275	ripe
 1877	1901	ripe
 2043	2043	ripe
 2047	2047	ripe
@@ -27,7 +28,7 @@
 9840	9871	whois.nic.or.kr
 9943	9982	whois.nic.or.kr
 9990	10021	whois.nic.ad.jp
-9261	10067	apnic
+9216	10067	apnic
 10034	10073	whois.nic.or.kr
 10154	10198	whois.nic.or.kr
 10074	10239	apnic
@@ -59,6 +60,7 @@
 37888	38911	apnic
 38912	39935	ripe
 40960	45055	ripe
+45056	46079	apnic
 
 # catch all: everything else comes from ARIN
 1	40959	arin
diff --git a/config.h b/config.h
index 02b46fb..11be44e 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /* Program version */
 /* not for the inetutils version */
-#define VERSION "4.7.24"
+#define VERSION "4.7.25"
 
 /* Configurable features */
 
diff --git a/data.h b/data.h
index 3d194be..50ebecc 100644
--- a/data.h
+++ b/data.h
@@ -30,7 +30,6 @@ const char *hide_strings[] = {
     "NOTICE AND TERMS OF USE: You", "",				/* NetSol */
     "TERMS OF USE: You are not", "",				/* crsnic */
     "NOTICE: Access to .ORG WHOIS", "",
-    "NOTICE: Access to .INFO WHOIS", "",
     "NOTICE: Access to the .aero", "",
     "This Registry database contains ONLY .EDU", "type: help",	/* edu */
     "% .eu Whois Server", "% of the database",
@@ -57,9 +56,14 @@ const char *hide_strings[] = {
     "; This data is provided by domaindiscount24.com", "",
     "%% BookMyName Whois", "%% this policy",
     "The .coop registry WHOIS", "VERIFICATION, NOR DO",
-    "Tralliance, Inc., the Registry", "",			/* travel */
+    "Tralliance, Inc., the Registry", "",			/* .travel */
     "NOTICE: Access to the domains information", "",		/* CORE */
     "%% puntCAT Whois Server", "%% any time.",
+    "Access to INFO WHOIS information is provided", "",		/* Afilias */
+    "Access to CCTLD WHOIS information is provided", "",	/* Afilias */
+    "DotAsia WHOIS LEGAL STATEMENT", "integrity of the database.",
+    "mTLD WHOIS LEGAL STATEMENT", "integrity of the database."	/* .mobi */
+    "Access to RegistryPro's Whois", "All rights",		/* .pro */
     NULL, NULL
 };
 
diff --git a/debian/changelog b/debian/changelog
index 5722cb2..7d09fa4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+whois (4.7.25) unstable; urgency=low
+
+  * mkpasswd: added support for the SHA-256 and SHA-512 methods from
+    glibc 2.7.
+  * mkpasswd: added support for FreeBSD-style Blowfish and NT-Hash methods.
+  * mkpasswd: added support for variable-rounds methods (OpenBSD-style
+    Blowfish and SHA-256/SHA-512).
+  * mkpasswd: renamed -H/--hash to -m/--method.
+  * mkpasswd: finished support for libxcrypt (not enabled by default).
+  * Added NONE entries for the rest of .uk SLD. (Closes: #471963)
+  * Added the .bd, .gh, .lc, .sc, .ma, .me, .om and .rs TLD servers.
+  * Updated the .aero, .bb and .bz TLD servers. (Closes: #448683)
+  * Added another RIPE ERX ASN block. (Closes: #452328)
+  * Added a new ASN allocation.
+  * Added Basque and Czech translations.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 23 Mar 2008 19:18:34 +0100
+
 whois (4.7.24) unstable; urgency=medium
 
   * Added new ASN allocations.
diff --git a/debian/control b/debian/control
index 9af2bf8..662f8e7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: whois
 Section: net
 Priority: standard
 Maintainer: Marco d'Itri <md@linux.it>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
 Build-Depends: debhelper (>= 4), gettext, libidn11-dev
 
 Package: whois
diff --git a/debian/copyright b/debian/copyright
index 26e87a1..7c92366 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Marco d'Itri <md@linux.it> on
 Sun Oct  3 19:46:30 CEST 1999.
 
-It was written by Marco d'Itri.
+Copyright 1999-2008 by Marco d'Itri <md@linux.it>.
 
-Copyright: GPL (please see /usr/share/common-licenses/GPL-2).
+License: GPL (please see /usr/share/common-licenses/GPL-2).
 
diff --git a/make_tld_serv.pl b/make_tld_serv.pl
index ffe804e..6d72e63 100755
--- a/make_tld_serv.pl
+++ b/make_tld_serv.pl
@@ -14,6 +14,7 @@ while (<>) {
 	$b = "\\x03" if $b eq 'NONE';
 	$b = "\\x04" if $b eq 'CRSNIC';
 	$b = "\\x07" if $b eq 'PIR';
+	$b = "\\x08" if $b eq 'AFILIAS';
 	$b = "\\x09" if $b eq 'NICCC';
 	print "    \"$a\",\t\"$b\",\n";
 }
diff --git a/mkpasswd.1 b/mkpasswd.1
index dbfc161..2882f72 100644
--- a/mkpasswd.1
+++ b/mkpasswd.1
@@ -1,4 +1,4 @@
-.TH MKPASSWD 1 "11 October 2002" "Marco d'Itri" "Debian GNU/Linux"
+.TH MKPASSWD 1 "21 March 2008" "Marco d'Itri" "Debian GNU/Linux"
 .SH NAME
 mkpasswd \- Overfeatured front end to crypt(3)
 .SH SYNOPSIS
@@ -16,9 +16,14 @@ libc function using the given salt.
 .B -S, --salt=STRING
 Use the \fISTRING\fP as salt. It must not contain prefixes such as \fI$1$\fP.
 .TP
-.B -H, --hash=TYPE
-Compute the password using the \fITYPE\fP algorithm.
-If \fITYPE\fP is \fIhelp\fP available algorithms are printed.
+.B -R, --rounds=NUMBER
+Use \fINUMBER\fP rounds. This argument is ignored if the method choosen
+does not support variable rounds. For the OpenBSD Blowfish method this is
+the logarithm of the number of rounds.
+.TP
+.B -m, --method=TYPE
+Compute the password using the \fITYPE\fP method.
+If \fITYPE\fP is \fIhelp\fP then the available methods are printed.
 .TP
 .B -P, --password-fd=NUM
 Read the password from file descriptor \fINUM\fP instead of using
@@ -40,6 +45,7 @@ This programs suffers of a bad case of featuritis.
 .IR getpass(3)
 .SH AUTHOR
 .B mkpasswd
-and this man page were written by Marco d'Itri <md@linux.it>
-and are licensed under the terms of the GNU GPL.
+and this man page were written by Marco d'Itri <\fImd@linux.it\fP>
+and are licensed under the terms of the GNU General Public License,
+version 2 or higher.
 
diff --git a/mkpasswd.c b/mkpasswd.c
index 28ce2bf..f27979f 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -28,14 +28,22 @@
 #include <string.h>
 #include <time.h>
 #include <sys/types.h>
+#ifdef HAVE_XCRYPT
+#include <xcrypt.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#endif
 
 #ifdef HAVE_GETOPT_LONG
 static struct option longopts[] = {
+    {"method",		optional_argument,	NULL, 'm'},
+    /* for backward compatibility with versions < 4.7.25 (< 20080321): */
     {"hash",		optional_argument,	NULL, 'H'},
     {"help",		no_argument,		NULL, 'h'},
     {"password-fd",	required_argument,	NULL, 'P'},
     {"stdin",		no_argument,		NULL, 's'},
     {"salt",		required_argument,	NULL, 'S'},
+    {"rounds",		required_argument,	NULL, 'R'},
     {"version",		no_argument,		NULL, 'V'},
     {NULL,		0,			NULL, 0  }
 };
@@ -44,40 +52,61 @@ static struct option longopts[] = {
 static char valid_salts[] = "abcdefghijklmnopqrstuvwxyz"
 "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
 
-struct salt_prefix {
+struct crypt_method {
     const char *algo;	/* short name used by the command line option */
     const char *prefix;	/* salt prefix */
     unsigned int len;	/* salt lenght */
-    const char *desc;	/* long description for the algorithms list */
+    unsigned int rounds;/* supports a variable number of rounds */
+    const char *desc;	/* long description for the methods list */
 };
 
-struct salt_prefix salt_prefixes[] = {
-    { "des",		"",	2, N_("\tstandard 56 bit DES-based crypt(3)") },
-    { "md5",		"$1$",	8, "\tMD5" },
-/* untested! is the salt correctly generated? */
-#if defined OpenBSD || defined FreeBSD
-    { "blf",		"$2$", 16, "\tBlowfish" },
+struct crypt_method methods[] = {
+    { "des",		"",	2,  0,
+	N_("standard 56 bit DES-based crypt(3)") },
+    { "md5",		"$1$",	8,  0, "MD5" },
+#if defined FreeBSD
+    { "bf",		"$2$",  22, 0, "Blowfish (FreeBSD)" },
+#endif
+#if defined OpenBSD || defined HAVE_XCRYPT
+    { "bf",		"$2a$", 22, 1, "Blowfish" },
+#endif
+#if defined FreeBSD
+    { "nt",		"$3$",   0, 0, "NT-Hash" },
+#endif
+#if defined __GLIBC__ && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 7
+    /* http://people.redhat.com/drepper/SHA-crypt.txt */
+    { "sha-256",	"$5$",	16, 1, "SHA-256" },
+    { "sha-512",	"$6$",	16, 1, "SHA-512" },
 #endif
-/* untested too, and does not even compile */
+    /* http://www.crypticide.com/dropsafe/article/1389 */
+/* proper support is hard since solaris >= 9 supports pluggable methods
+#if defined __SVR4 && defined __sun
+    { "sunmd5",		"$md5$", ?, 1, "SunMD5" },
+*/
 #if defined HAVE_XCRYPT
-    { "blf",		"$2a$", 16, "\tBlowfish" },
-    { "sha",		"{SHA}", , "\tSHA-1" },
+    { "sha",		"{SHA}", 0, 0, "SHA-1" },
 #endif
-    { NULL,		NULL,	0, NULL }
+    { NULL,		NULL,	 0, 0, NULL }
 };
 
 void generate_salt(char *buf, const unsigned int len);
+void *gather_entropy(int len);
 void display_help(void);
 void display_version(void);
-void display_algorithms(void);
+void display_methods(void);
+void *xmalloc(size_t);
 
 int main(int argc, char *argv[])
 {
-    int ch;
+    int ch, i;
     int password_fd = -1;
-    unsigned int i, salt_len = 0;
+    unsigned int salt_len = 0;
+    unsigned int rounds_support = 0;
     const char *salt_prefix = NULL;
+    char *salt_arg = NULL;
+    unsigned int rounds = 0;
     char *salt = NULL;
+    char rounds_str[30];
     char *password = NULL;
 
 #ifdef ENABLE_NLS
@@ -86,21 +115,23 @@ int main(int argc, char *argv[])
     textdomain(NLS_CAT_NAME);
 #endif
 
-    while ((ch = GETOPT_LONGISH(argc, argv, "hH:P:sS:V", longopts, 0)) > 0) {
+    while ((ch = GETOPT_LONGISH(argc, argv, "hH:m:P:R:sSV", longopts, 0)) > 0) {
 	switch (ch) {
+	case 'm':
 	case 'H':
 	    if (!optarg || strcasecmp("help", optarg) == 0) {
-		display_algorithms();
+		display_methods();
 		exit(0);
 	    }
-	    for (i = 0; salt_prefixes[i].algo != NULL; i++)
-		if (strcasecmp(salt_prefixes[i].algo, optarg) == 0) {
-		    salt_prefix = salt_prefixes[i].prefix;
-		    salt_len = salt_prefixes[i].len;
+	    for (i = 0; methods[i].algo != NULL; i++)
+		if (strcasecmp(methods[i].algo, optarg) == 0) {
+		    salt_prefix = methods[i].prefix;
+		    salt_len = methods[i].len;
+		    rounds_support = methods[i].rounds;
 		    break;
 		}
 	    if (!salt_prefix) {
-		fprintf(stderr, _("Invalid hash type '%s'.\n"), optarg);
+		fprintf(stderr, _("Invalid method '%s'.\n"), optarg);
 		exit(1);
 	    }
 	    break;
@@ -114,11 +145,21 @@ int main(int argc, char *argv[])
 		}
 	    }
 	    break;
+	case 'R':
+	    {
+		char *p;
+		rounds = strtol(optarg, &p, 10);
+		if (p == NULL || *p != '\0' || rounds < 0) {
+		    fprintf(stderr, _("Invalid number '%s'.\n"), optarg);
+		    exit(1);
+		}
+	    }
+	    break;
 	case 's':
 	    password_fd = 0;
 	    break;
 	case 'S':
-	    salt = optarg;
+	    salt_arg = optarg;
 	    break;
 	case 'V':
 	    display_version();
@@ -135,9 +176,9 @@ int main(int argc, char *argv[])
     argc -= optind;
     argv += optind;
 
-    if (argc == 2 && !salt) {
+    if (argc == 2 && !salt_arg) {
 	password = argv[0];
-	salt = argv[1];
+	salt_arg = argv[1];
     } else if (argc == 1) {
 	password = argv[0];
     } else if (argc == 0) {
@@ -147,36 +188,60 @@ int main(int argc, char *argv[])
     }
 
     /* default: DES password */
-    if (!salt_len) {
-	salt_len = salt_prefixes[0].len;
-	salt_prefix = salt_prefixes[0].prefix;
+    if (!salt_prefix) {
+	salt_len = methods[0].len;
+	salt_prefix = methods[0].prefix;
     }
 
-    if (salt) {
-	unsigned int c = strlen(salt);
+    if (strcmp(salt_prefix, "$2a$") == 0) {	/* OpenBSD Blowfish  */
+	if (rounds <= 4)
+	    rounds = 4;
+	/* actually for 2a it is the logarithm of the number of rounds */
+	snprintf(rounds_str, sizeof(rounds_str), "%02u$", rounds);
+    } else if (rounds_support && rounds)
+	snprintf(rounds_str, sizeof(rounds_str), "rounds=%u$", rounds);
+    else
+	rounds_str[0] = '\0';
+
+    if (salt_arg) {
+	unsigned int c = strlen(salt_arg);
+	/* XXX: should support methods which support variable-length salts */
 	if (c != salt_len) {
 	    fprintf(stderr,
 		    _("Wrong salt length: %d byte(s) when %d expected.\n"),
 		    c, salt_len);
 	    exit(1);
 	}
-	while (c-- > 0)
-	    if (strchr(valid_salts, salt[c]) == NULL) {
-		fprintf(stderr, _("Illegal salt character '%c'.\n"), salt[c]);
+	while (c-- > 0) {
+	    if (strchr(valid_salts, salt_arg[c]) == NULL) {
+		fprintf(stderr, _("Illegal salt character '%c'.\n"),
+			salt_arg[c]);
 		exit(1);
 	    }
+	}
+
+	salt = xmalloc(strlen(salt_prefix) + strlen(rounds_str)
+		+ strlen(salt_arg) + 1);
+	*salt = '\0';
+	strcat(salt, salt_prefix);
+	strcat(salt, rounds_str);
+	strcat(salt, salt_arg);
     } else {
 #ifdef HAVE_XCRYPT
-	char *entropy = gather_entropy(4096);
-	salt = crypt_gensalt(salt_prefix, 0, entropy, 4096);
+	void *entropy = gather_entropy(64);
+	salt = crypt_gensalt(salt_prefix, rounds, entropy, 64);
 	if (!salt) {
-		perror("crypt");
+		fprintf(stderr, "crypt_gensalt failed.\n");
 		exit(2);
 	}
 	free(entropy);
 #else
-	salt = malloc(salt_len + 1);
-	generate_salt(salt, salt_len);
+	salt = xmalloc(strlen(salt_prefix) + strlen(rounds_str)
+		+ salt_len + 1);
+	*salt = '\0';
+	strcat(salt, salt_prefix);
+	strcat(salt, rounds_str);
+	generate_salt(salt + strlen(salt), salt_len);
 #endif
     }
 
@@ -187,7 +252,7 @@ int main(int argc, char *argv[])
 
 	    if (isatty(password_fd))
 		fprintf(stderr, _("Password: "));
-	    password = malloc(128);
+	    password = xmalloc(128);
 	    fp = fdopen(password_fd, "r");
 	    if (!fp) {
 		perror("fdopen");
@@ -222,22 +287,50 @@ int main(int argc, char *argv[])
     }
 
     {
-	char *pw, *result;
-	pw = malloc(strlen(salt_prefix) + strlen(salt) + 1);
-	*pw = '\0';
-	strcat(pw, salt_prefix);
-	strcat(pw, salt);
-	result = crypt(password, pw);
-	if (!result) {
-		perror("crypt");
-		exit(2);
+	char *result;
+	result = crypt(password, salt);
+	if (!result || strcmp(result, "*0") == 0) {
+	    fprintf(stderr, "crypt failed.\n");
+	    exit(2);
+	}
+	if (strncmp(result, salt_prefix, strlen(salt_prefix)) != 0) {
+	    fprintf(stderr, _("Method not supported by crypt(3).\n"));
+	    exit(2);
 	}
 	printf("%s\n", result);
     }
+
     exit(0);
 }
 
-#ifndef HAVE_XCRYPT
+#ifdef HAVE_XCRYPT
+
+#ifndef RANDOM_DEVICE
+#define RANDOM_DEVICE "/dev/urandom"
+#endif
+
+void* gather_entropy(int count)
+{
+    char *buf;
+    int fd;
+
+    buf = xmalloc(count);
+    fd = open(RANDOM_DEVICE, O_RDONLY);
+    if (fd < 0) {
+	perror("open");
+	exit(2);
+    }
+    if (read(fd, buf, count) != count) {
+	perror("open");
+	exit(2);
+    }
+    close(fd);
+
+    return buf;
+}
+
+#else
+
 void generate_salt(char *buf, const unsigned int len)
 {
     unsigned int i;
@@ -247,15 +340,29 @@ void generate_salt(char *buf, const unsigned int len)
 	buf[i] = valid_salts[rand() % (sizeof valid_salts - 1)];
     buf[i] = '\0';
 }
+
 #endif
 
+void *xmalloc(size_t n)
+{
+    void *retval;
+
+    if (!(retval = malloc(n))) {
+	fprintf(stderr, "malloc failed\n");
+	exit(2);
+    }
+
+    return retval;
+}
+
 void display_help(void)
 {
     fprintf(stderr, _("Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 	    "Crypts the PASSWORD using crypt(3).\n\n"));
     fprintf(stderr, _(
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -264,7 +371,7 @@ void display_help(void)
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"), "<md+whois@linux.it>");
 }
@@ -272,16 +379,17 @@ void display_help(void)
 void display_version(void)
 {
     printf("GNU mkpasswd %s\n\n", VERSION);
-    puts("Copyright (C) 2001-2004 Marco d'Itri\n"
+    puts("Copyright (C) 2001-2008 Marco d'Itri\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 }
 
-void display_algorithms(void)
+void display_methods(void)
 {
     int i;
 
-    printf(_("Available algorithms:\n"));
-    for (i = 0; salt_prefixes[i].algo != NULL; i++)
-	printf("%s%s\n", salt_prefixes[i].algo, salt_prefixes[i].desc);
+    printf(_("Available methods:\n"));
+    for (i = 0; methods[i].algo != NULL; i++)
+	printf("%s\t%s\n", methods[i].algo, methods[i].desc);
 }
+
diff --git a/po/Makefile b/po/Makefile
index 48fd5df..b3b89bd 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -3,7 +3,7 @@ INSTALLNLSDIR=$(BASEDIR)/usr/share/locale
 
 PACKAGE = whois
 
-CATALOGS = de.mo el.mo es.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo
+CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo
 
 POTFILES=../whois.c ../mkpasswd.c
 
diff --git a/po/cs.po b/po/cs.po
new file mode 100644
index 0000000..b0c2b22
--- /dev/null
+++ b/po/cs.po
@@ -0,0 +1,297 @@
+# Czech translation for whois
+# Petr Pisar <petr.pisar@atlas.cz>, 2008
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: whois 4.7.24\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
+"PO-Revision-Date: 2008-01-29 00:38+0100\n"
+"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
+"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../whois.c:117
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"Verze %s.\n"
+"\n"
+"Chyby programu hlaste na %s (anglicky), chyby překladu na\n"
+"<translation-team-cs@lists.sourceforge.net> (česky).\n"
+
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Používám server %s.\n"
+
+#: ../whois.c:209
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr ""
+"Tato TLD nemá žádný whoisový server, ale k whoisové databázi se lze dostat na"
+
+#: ../whois.c:217
+msgid "This TLD has no whois server."
+msgstr "Tato TLD nemá žádný whoisový server."
+
+#: ../whois.c:220
+msgid "No whois server is known for this kind of object."
+msgstr "Pro tento druh objektu není znám žádný whoisový server."
+
+#: ../whois.c:223
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr ""
+"Neznémé číslo AS nebo neznámá IP síť.\n"
+"Prosím, pořiďte si novou verzi tohoto programu."
+
+#. XXX should fail if p = 0.0.0.0
+#: ../whois.c:253
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Dotazuji se na IPv4 konec %s příslušející 6to4 IPv6 adrese.\n"
+"\n"
+
+#: ../whois.c:260
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Dotazuji se na IPv4 konec %s příslušející Teredo IPv6 adrese.\n"
+"\n"
+
+#: ../whois.c:274
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"Znění dotazu: „%s“\n"
+"\n"
+
+#: ../whois.c:284
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"Nalezen odkaz na %s.\n"
+"\n"
+
+#: ../whois.c:327 ../whois.c:330
+#, c-format
+msgid "Cannot parse this line: %s"
+msgstr "Tento řádek nemohu rozebrat: %s"
+
+#: ../whois.c:483
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "Varování: RIPE příznak použit s tradičním serverem."
+
+#: ../whois.c:621 ../whois.c:754
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"Katastrofální chyba: text prohlášení byl pozměněn.\n"
+"Prosím, pořiďte si novou verzi tohoto programu.\n"
+
+#: ../whois.c:795
+#, c-format
+msgid "Host %s not found."
+msgstr "Jméno počítače %s nenalezeno."
+
+#: ../whois.c:805
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/TCP: neznámá služba"
+
+#: ../whois.c:824
+msgid "Timeout."
+msgstr "Čas vypršel."
+
+#: ../whois.c:830
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "Přerušeno signálem %d…"
+
+#: ../whois.c:1000
+#, c-format
+msgid ""
+"Usage: whois [OPTION]... OBJECT...\n"
+"\n"
+"-l                     one level less specific lookup [RPSL only]\n"
+"-L                     find all Less specific matches\n"
+"-m                     find first level more specific matches\n"
+"-M                     find all More specific matches\n"
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match [RPSL only]\n"
+"-d                     return DNS reverse delegation objects too [RPSL "
+"only]\n"
+"-i ATTR[,ATTR]...      do an inverse lookup for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned [RPSL only]\n"
+"-r                     turn off recursive lookups for contact information\n"
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     search all databases\n"
+"-s SOURCE[,SOURCE]...  search the database from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+"-t TYPE                request template for object of TYPE ('all' for a "
+"list)\n"
+"-v TYPE                request verbose template for object of TYPE\n"
+"-q [version|sources|types]  query specified server info [RPSL only]\n"
+"-F                     fast raw output (implies -r)\n"
+"-h HOST                connect to server HOST\n"
+"-p PORT                connect to PORT\n"
+"-H                     hide legal disclaimers\n"
+"      --verbose        explain what is being done\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+msgstr ""
+"Použití: whois [VOLBA]… OBJEKT…\n"
+"\n"
+"-l                     o jednu úroveň širší dotaz [jen RPSL]\n"
+"-L                     nalezne všechny širší shody\n"
+"-m                     nalezne nejbližší širší shody\n"
+"-M                     nalezne všechny užší shody\n"
+"-c                     nalezne nejužší shodu obsahující atribut mnt-irt\n"
+"-x                     přesná shoda [jen RPSL]\n"
+"-d                     vrací též objekty delegace reverzního DNS [jen RPSL]\n"
+"-i ATR[,ATR]…          provede inverzní dotaz k daným ATRIBUTŮM\n"
+"-T TYP[,TYP]…          zajímá se jen o objekty daného TYPU\n"
+"-K                     vrátí pouze primární klíče [jen RPSL]\n"
+"-r                     vypne rekurzivní dohledávání kontaktů\n"
+"-R                     vynutí zobrazení místní kopie doménového objektu,\n"
+"                       i když obsahuje odkaz\n"
+"-a                     prohledá všechny databáze\n"
+"-s ZDROJ[,ZDROJ]…      prohledá databázi ze ZDROJE\n"
+"-g ZDROJ:PRVNÍ-POSLEDNÍ\n"
+"                       nalezne aktualizace ze ZDROJE se sériovým číslem\n"
+"                       mezi PRVNÍM a POSLEDNÍM\n"
+"-t TYP                 požaduje šablonu pro objekt druhu TYP („all“ pro "
+"seznam)\n"
+"-v TYP                 požaduje podrobnou šablonu pro objekt druhu TYP\n"
+"-q [verze|zdroje|typy]\n"
+"                       dotáže se na zadané informace o serveru [jen RPSL]\n"
+"-F                     rychlý neopracovaný výstup (implikuje -r)\n"
+"-h STROJ               připojí se na server STROJ\n"
+"-p PORT                připojí se na PORT\n"
+"-H                     skryje právní prohlášení\n"
+"      --verbose        vysvětlí, co se právě provádí\n"
+"      --help           zobrazí tuto nápovědu a skončí\n"
+"      --version        vypíše informace o verzi a skončí\n"
+
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
+msgstr "\tstandardní crypt(3) založený na 56bitové šifře DES"
+
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "Neplatné číslo „%s“.\n"
+
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "Neplatné číslo „%s“.\n"
+
+#: ../mkpasswd.c:171
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Pro podrobnosti zkuste příkaz „%s --help“.\n"
+
+#: ../mkpasswd.c:211
+#, c-format
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
+msgstr "Chybná délka soli: %d bajty(ů), zatímco očekáváno %d.\n"
+
+#: ../mkpasswd.c:217
+#, c-format
+msgid "Illegal salt character '%c'.\n"
+msgstr "Neplatný znak v soli „%c“.\n"
+
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
+#, c-format
+msgid "Password: "
+msgstr "Heslo: "
+
+#: ../mkpasswd.c:275
+#, c-format
+msgid "Illegal password character '0x%hhx'.\n"
+msgstr "Zakázaný znak v hesle „0x%hhx“.\n"
+
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
+#, c-format
+msgid ""
+"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Crypts the PASSWORD using crypt(3).\n"
+"\n"
+msgstr ""
+"Použití: mkpasswd [VOLBY]… [HESLO [SŮL]]\n"
+"Zašifruje HESLO pomocí funkce crypt(3).\n"
+"\n"
+
+#: ../mkpasswd.c:363
+#, fuzzy, c-format
+msgid ""
+"      -m, --method=TYPE     select method TYPE\n"
+"      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
+"      -P, --password-fd=NUM read the password from file descriptor NUM\n"
+"                            instead of /dev/tty\n"
+"      -s, --stdin           like --password-fd=0\n"
+"      -h, --help            display this help and exit\n"
+"      -V, --version         output version information and exit\n"
+"\n"
+"If PASSWORD is missing then it is asked interactively.\n"
+"If no SALT is specified, a random one is generated.\n"
+"If TYPE is 'help', available methods are printed.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"      -H, --hash=DRUH       vybere DRUH hashe\n"
+"      -S, --salt=SŮL        použije zadanou SŮL\n"
+"      -P, --password-fd=Č   přečte heslo z deskriptoru souboru Č\n"
+"                            místo z /dev/tty\n"
+"      -s, --stdin           jako --password-fd=0\n"
+"      -h, --help            zobrazí tuto nápovědu a skončí\n"
+"      -V, --version         vypíše informace o verzi a skončí\n"
+"\n"
+"Chybí-li HESLO, bude na něj požádáno interaktivně.\n"
+"Nebude-li zadána SŮL, vygeneruje se náhodná.\n"
+"Bude-li DRUH „help“, vypíšou se dostupné algoritmy.\n"
+"\n"
+"Chyby programu hlaste na %s (anglicky), chyby překladu na\n"
+"<translation-team-cs@lists.sourceforge.net> (česky).\n"
+
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
+msgstr "Dostupné algoritmy:\n"
+
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "Neplatný druh hashe „%s“.\n"
diff --git a/po/de.po b/po/de.po
index e95f8dd..26e749c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,13 +1,13 @@
 # Abgeleitet von whois.pot.
 # Copyright (C) 2001 Simon Richter <Simon.Richter@in.tum.de>
 # Copyright (C) 2004 Adrian Bunk <bunk@fs.tum.de>
-# 
-# 
+#
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.6.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 2004-06-15 00:08+0100\n"
 "Last-Translator: Adrian Bunk <bunk@fs.tum.de>\n"
 "Language-Team: \n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -26,42 +26,31 @@ msgstr ""
 "\n"
 "Senden Sie Bugreports an %s.\n"
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Benutze Server %s.\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr "Diese TLD hat keinen whois-Server, aber eine whois-Datenbank unter"
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr "Diese TLD hat keinen whois-Server."
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr "Hierf�r ist kein Whois-Server bekannt."
 
-#: ../whois.c:220
+#: ../whois.c:223
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr ""
 "Unbekannte AS- oder IP-Netzwerk-Nummer. Bitte upgraden Sie dieses Programm."
 
-#: ../whois.c:224
-msgid "Connecting to whois.crsnic.net."
-msgstr "Verbinde mit whois.crsnic.net."
-
-#: ../whois.c:230
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Verbinde mit whois.publicinterestregistry.net."
-
-#: ../whois.c:236
-msgid "Connecting to whois.nic.cc."
-msgstr "Verbinde mit whois.nic.cc."
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -72,7 +61,18 @@ msgstr ""
 "Frage nach dem IPv4 Endpunkt %s einer 6to4 IPv6-Adresse.\n"
 "\n"
 
-#: ../whois.c:258
+#: ../whois.c:260
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Frage nach dem IPv4 Endpunkt %s einer 6to4 IPv6-Adresse.\n"
+"\n"
+
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -81,7 +81,7 @@ msgstr ""
 "Suche nach: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:284
 #, c-format
 msgid ""
 "\n"
@@ -94,17 +94,17 @@ msgstr ""
 "Verweis auf %s gefunden.\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Kann diese Zeile nicht parsen: %s"
 
-#: ../whois.c:451
+#: ../whois.c:483
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Warnung: RIPE-Flags wurden mit einem \"traditionellen\" Server verwendet."
 
-#: ../whois.c:586
+#: ../whois.c:621 ../whois.c:754
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,26 +112,26 @@ msgstr ""
 "Schwerer Fehler: Haftungsausschlusstext wurde geaendert.\n"
 "Bitte upgraden sie dieses Programm.\n"
 
-#: ../whois.c:713
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s nicht gefunden."
 
-#: ../whois.c:723
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: unbekannter Dienst"
 
-#: ../whois.c:742
+#: ../whois.c:824
 msgid "Timeout."
 msgstr "Timeout."
 
-#: ../whois.c:748
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Erhielt Signal %d, unterbrochen..."
 
-#: ../whois.c:860
+#: ../whois.c:1000
 #, fuzzy, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -197,46 +197,52 @@ msgstr ""
 "      --help           zeige diese Hilfe\n"
 "      --version        zeige Version\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\tStandard 56 Bit DES-basiertes crypt(3)"
 
-#: ../mkpasswd.c:103
-#, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "Falscher Hash-Typ '%s'.\n"
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "Falsche Nummer '%s'.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Falsche Nummer '%s'.\n"
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Versuchen Sie '%s --help' f�r mehr Informationen.\n"
 
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "Falsche Salt-L�nge: %d Byte(s), aber%d wurden erwartet.\n"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Illegaler Salt-Buchstabe '%c'.\n"
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr "Passwort:"
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "Illegaler Passwort-Buchstabe '0x%hhx'.\n"
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -247,11 +253,12 @@ msgstr ""
 "Verschluesselt das PASWORT mit crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:257
+#: ../mkpasswd.c:363
 #, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -260,16 +267,19 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../mkpasswd.c:284
-#, c-format
-msgid "Available algorithms:\n"
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
 msgstr "Verf�gbare Algorithmen:\n"
 
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "Falscher Hash-Typ '%s'.\n"
+
 #~ msgid "Using default server %s.\n"
 #~ msgstr "Benutze voreingestellten Server %s.\n"
 
diff --git a/po/el.po b/po/el.po
index 4edeee4..da76cac 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.6.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 2003-12-10 08:51+0200\n"
 "Last-Translator: Velonis Petros <velonis@freemail.gr>\n"
 "Language-Team: Greek <velonis@freemail.gr>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -25,46 +25,35 @@ msgstr ""
 "\n"
 "Αναφέρατε σφάλματα στο %s.\n"
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την "
 "βάση whois στο"
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois."
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr ""
 "Κανένας εξυπηρετητής whois δεν είναι γνωστός για αυτού του είδους το "
 "αντικείμενο."
 
-#: ../whois.c:220
+#: ../whois.c:223
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr ""
 "Άγνωστος αριθμός AS ή IP δικτύου. Παρακαλώ αναβαθμίστε αυτό το πρόγραμμα."
 
-#: ../whois.c:224
-msgid "Connecting to whois.crsnic.net."
-msgstr "Γίνεται σύνδεση στο whois.crsnic.net."
-
-#: ../whois.c:230
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Γίνεται σύνδεση στο whois.publicinterestregistry.net."
-
-#: ../whois.c:236
-msgid "Connecting to whois.nic.cc."
-msgstr "Γίνεται σύνδεση στο whois.nic.cc."
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -75,7 +64,18 @@ msgstr ""
 "Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
 "\n"
 
-#: ../whois.c:258
+#: ../whois.c:260
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
+"\n"
+
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -84,7 +84,7 @@ msgstr ""
 "Αλφαριθμητικό ερώτησης: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:284
 #, c-format
 msgid ""
 "\n"
@@ -97,18 +97,18 @@ msgstr ""
 "Βρέθηκε αναφορά στο %s.\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Αδύνατη η ανάλυση αυτής της γραμμής: %s"
 
-#: ../whois.c:451
+#: ../whois.c:483
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Προειδοποίηση: Η σημαίες του RIPE χρησιμοποιούνται σε έναν παραδοσιακό "
 "εξυπηρετητή."
 
-#: ../whois.c:586
+#: ../whois.c:621 ../whois.c:754
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -116,26 +116,26 @@ msgstr ""
 "Καταστροφικό σφάλμα: το κείμενο της αποποίησης ευθυνών έχει τροποποιηθεί.\n"
 "Παρακαλώ αναβαθμίστε το πρόγραμμα.\n"
 
-#: ../whois.c:713
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "Το σύστημα %s δε βρέθηκε."
 
-#: ../whois.c:723
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: άγνωστη υπηρεσία"
 
-#: ../whois.c:742
+#: ../whois.c:824
 msgid "Timeout."
 msgstr "Διάλειμμα."
 
-#: ../whois.c:748
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Διακοπή από το σήμα %d..."
 
-#: ../whois.c:860
+#: ../whois.c:1000
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -209,46 +209,52 @@ msgstr ""
 "     --help             εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "     --version        εμφάνιση της έκδοσης και έξοδος\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\tκαθεριερωμένη 56 bit με βάση το DES crypt(3)"
 
-#: ../mkpasswd.c:103
-#, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "Άκυρος τύπος hash '%s'.\n"
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "Μη αποδεκτό νούμερο '%s'.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Μη αποδεκτό νούμερο '%s'.\n"
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Προσπάθησε '%s --help' για περισσότερες πληροφορίες.\n"
 
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "Εσφαλμένο μήκος salt : %d byte(s) όταν αναμένεται %d .\n"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Μη αποδεκτός χαρακτήρας salt  '%c'.\n"
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr "Συνθηματικό: "
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "Μη αποδεκτός χαρακτήρας συνθηματικού '0x%hhx'.\n"
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -259,11 +265,12 @@ msgstr ""
 "Κρυπτογραφεί το ΣΥΝΘΗΜΑΤΙΚΟ χρησιμοποιώντας το crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:257
-#, c-format
+#: ../mkpasswd.c:363
+#, fuzzy, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -272,7 +279,7 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
@@ -291,8 +298,10 @@ msgstr ""
 "\n"
 "Αναφέρατε σφάλματα στο %s.\n"
 
-#: ../mkpasswd.c:284
-#, c-format
-msgid "Available algorithms:\n"
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
 msgstr "Διαθέσιμοι αλγόριθμοι:\n"
 
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "Άκυρος τύπος hash '%s'.\n"
diff --git a/po/es.po b/po/es.po
index 462a6ad..f9e2e4e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.5.29\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 2002-08-24 16:22+0200\n"
 "Last-Translator: Francisco Monteagudo <francisco@monteagudo.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -25,46 +25,33 @@ msgstr ""
 "\n"
 "Informar de bugs a %s.\n"
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Usando el servidor %s.\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Este TLD no dispone de servidor whois, pero puede acceder a la informacion "
 "de whois en"
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr "No existe servidor whois para este TLD."
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr ""
 
-#: ../whois.c:220
+#: ../whois.c:223
 #, fuzzy
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Numero AS desconocido. Por favor, actualice este programa."
 
-#: ../whois.c:224
-msgid "Connecting to whois.crsnic.net."
-msgstr "Conectando a whois.crsnic.net."
-
-#: ../whois.c:230
-#, fuzzy
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Conectando a whois.crsnic.net."
-
-#: ../whois.c:236
-#, fuzzy
-msgid "Connecting to whois.nic.cc."
-msgstr "Conectando a whois.crsnic.net."
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -72,7 +59,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../whois.c:258
+#: ../whois.c:260
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -81,7 +76,7 @@ msgstr ""
 "Consulta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:284
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -93,18 +88,18 @@ msgstr ""
 "Se ha encontrado en crsnic una referencia a %s.\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "No puedo procesar esta linea: %s"
 
-#: ../whois.c:451
+#: ../whois.c:483
 #, fuzzy
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Atencion: Los flags RIPE son ignorados por los servidores tradicionales."
 
-#: ../whois.c:586
+#: ../whois.c:621 ../whois.c:754
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,26 +107,26 @@ msgstr ""
 "Error catastrofico: el texto de las condiciones de uso ha sido cambiado.\n"
 "Actualize este programa.\n"
 
-#: ../whois.c:713
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s no encontrado."
 
-#: ../whois.c:723
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servicio desconocido"
 
-#: ../whois.c:742
+#: ../whois.c:824
 msgid "Timeout."
 msgstr ""
 
-#: ../whois.c:748
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrumpido por la se�al %d..."
 
-#: ../whois.c:860
+#: ../whois.c:1000
 #, fuzzy, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -199,46 +194,52 @@ msgstr ""
 "      --help       muestra esta pantalla de ayuda y finaliza\n"
 "      --version    muestra la version del programa y finaliza\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\tcrypt(3) basado en DES de 56 bits"
 
-#: ../mkpasswd.c:103
-#, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "La funcion de hash '%s' no es valida.\n"
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "El numero '%s' no es valido.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "El numero '%s' no es valido.\n"
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "%s --help para mas informacion.\n"
 
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "Tama�o de semilla incorrecto: %d bytes en lugar de %d.\n"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "El caracter '%c' ilegal en la semilla.\n"
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr "Clave: "
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "El caracter '0x%hhx' es ilegal en la clave.\n"
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -249,11 +250,12 @@ msgstr ""
 "Encripta CLAVE utilizando crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:257
+#: ../mkpasswd.c:363
 #, fuzzy, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -262,7 +264,7 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
@@ -280,11 +282,14 @@ msgstr ""
 "\n"
 "Informar de bugs a: %s.\n"
 
-#: ../mkpasswd.c:284
-#, c-format
-msgid "Available algorithms:\n"
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
 msgstr "Algoritmos disponibles:\n"
 
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "La funcion de hash '%s' no es valida.\n"
+
 #~ msgid "Using default server %s.\n"
 #~ msgstr "Usando el servidor predefinido %s.\n"
 
diff --git a/po/eu.po b/po/eu.po
new file mode 100644
index 0000000..8c1c4c5
--- /dev/null
+++ b/po/eu.po
@@ -0,0 +1,330 @@
+# translation of whois to Euskara
+# Aitor Iba�ez <aitiba@gmail.com>,2007
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Aitor Iba�ez <aitiba@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: whois 4.5.29\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
+"PO-Revision-Date: 2002-08-24 16:22+0200\n"
+"Last-Translator: Aitor Ibaez <aitiba@gmail.com>\n"
+"Language-Team: Euskara <Librezale@librezale.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../whois.c:117
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"%s bertsioa.\n"
+"\n"
+"Bug berri baten jakinarazpena: %s.\n"
+
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
+#, c-format
+msgid "Using server %s.\n"
+msgstr "%s zerbitzaria erabiltzen.\n"
+
+#: ../whois.c:209
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr ""
+"TLD honek ez du whois zerbitzaririk, baina whois databasera sarbidea "
+"daukazu..."
+
+#: ../whois.c:217
+msgid "This TLD has no whois server."
+msgstr "TLD honek ez du whois zerbitzaririk."
+
+#: ../whois.c:220
+msgid "No whois server is known for this kind of object."
+msgstr "Objetu mota horrentzako, ez da whois zerbitzaririk ezagutzen."
+
+#: ../whois.c:223
+#, fuzzy
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "AS zenbaki edo IP sarea ezezaguna. Mesedez, programa eguneratu."
+
+#. XXX should fail if p = 0.0.0.0
+#: ../whois.c:253
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
+"\n"
+
+#: ../whois.c:260
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
+"\n"
+
+#: ../whois.c:274
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"Kontsulta: \"%s\"\n"
+"\n"
+
+#: ../whois.c:284
+#, fuzzy, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"$s-ra erreferentzia aurkituta.\n"
+"\n"
+
+#: ../whois.c:327 ../whois.c:330
+#, c-format
+msgid "Cannot parse this line: %s"
+msgstr "Lerro hau, %s , ezin da prozesatu."
+
+#: ../whois.c:483
+#, fuzzy
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "Oharra: RIPE flags-ak ohiko zerbitzariengatik ezikusiak izaten dira."
+
+#: ../whois.c:621 ../whois.c:754
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"Hondamen arriskua: erabilpen balditzen textua aldatu egin da.\n"
+"Programa eguneratu.\n"
+
+#: ../whois.c:795
+#, c-format
+msgid "Host %s not found."
+msgstr "%s Host-a ez da aurkitu."
+
+#: ../whois.c:805
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp: zerbitzu ezezaguna"
+
+#: ../whois.c:824
+msgid "Timeout."
+msgstr "Denbora muga."
+
+#: ../whois.c:830
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "%d seinalearengatik etena..."
+
+#: ../whois.c:1000
+#, fuzzy, c-format
+msgid ""
+"Usage: whois [OPTION]... OBJECT...\n"
+"\n"
+"-l                     one level less specific lookup [RPSL only]\n"
+"-L                     find all Less specific matches\n"
+"-m                     find first level more specific matches\n"
+"-M                     find all More specific matches\n"
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match [RPSL only]\n"
+"-d                     return DNS reverse delegation objects too [RPSL "
+"only]\n"
+"-i ATTR[,ATTR]...      do an inverse lookup for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned [RPSL only]\n"
+"-r                     turn off recursive lookups for contact information\n"
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     search all databases\n"
+"-s SOURCE[,SOURCE]...  search the database from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+"-t TYPE                request template for object of TYPE ('all' for a "
+"list)\n"
+"-v TYPE                request verbose template for object of TYPE\n"
+"-q [version|sources|types]  query specified server info [RPSL only]\n"
+"-F                     fast raw output (implies -r)\n"
+"-h HOST                connect to server HOST\n"
+"-p PORT                connect to PORT\n"
+"-H                     hide legal disclaimers\n"
+"      --verbose        explain what is being done\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+msgstr ""
+"Erabilpena: whois [AUKERAK]... OBJETUA...\n"
+"\n"
+"-a                 data base guztietan bilatzen du\n"
+"-F                 modo azkarra (-r inplikatzen du)\n"
+"-g SOURCE:HASIERA-BUKAERA  H eta B tarteko serietan,SOURCE-ren agerraldiak "
+"bilatzen ditu\n"
+"-h HOST            HOST zerbitzarira konektatzen da\n"
+"-H                 abisu-legala ezkutatzen du\n"
+"-i ATTR[,ATTR]...  adierazitako ATTRibute-arentzat alderantzizko bilaketa "
+"egin du\n"
+"-x                 bilaketa zehatza [RPSL bakarrik]\n"
+"-l                 adierazitako [RPSL] bilaketarentzat, maila bat jeisten "
+"du\n"
+"-L                 mapeketa gutxien espezifikoenak bilatzen ditu\n"
+"-M                 mapeketa espezifikoenak bilatzen ditu\n"
+"-m                 lehen maila espezifikoena bilatzen du\n"
+"-r                 alderantzizko bilaketa ezgaitzen du\n"
+"-p PORTUA          PORTUA konektatzen du\n"
+"-R                 Objektu zehatzaren kopia lokala eraskuten "
+"du,                    erreferentzia bat eduki ere\n"
+"-S                 zerbitzariari adierazten dio pekulariedade sintaktikoak \t"
+"\t    ez erabiltzea \n"
+"-s SOURCE[,SOURCE]...  SOURCE data basea bilatzen du\n"
+"-T TIPO[,TIPO]...  TIPO objektu motak bakarrik bilatzen ditu\n"
+"-t TIPO        TIPO objektu mota batentzako, txantiloiak                "
+"lortzen ditu ('all' lista batentzako)\n"
+"-v TIPO            TIPO objektu baten txantiloi zehatza lortzen du\n"
+"-q [bertsioa|sources]  zerbitzariaren informazioa kontsultatzen "
+"du                        [RPSL bakarrik]\n"
+"-d                 alderantizko DNSaren ordezkaritza itzultzen du "
+"[RPSL                    bakarrik]\n"
+"-K                 oinarrizko-gakoak bakarrik [RPSL bakarrik]\n"
+"      --verbose    egiten ari dena bakarrik, eraskusten du\n"
+"      --help       laguntza pantaila hau erakusten du eta amaitzen du\n"
+"      --version    programaren bertsioa erakusten du eta amaitzen du\n"
+
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
+msgstr "56 bits-etako DESan oinarritutako \tcrypt(3)-a"
+
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "'%s' zenbakia ez da baliozkoa.\n"
+
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "'%s' zenbakia ez da baliozkoa.\n"
+
+#: ../mkpasswd.c:171
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "%s --help informazio gehiagorako.\n"
+
+#: ../mkpasswd.c:211
+#, c-format
+msgid "Wrong salt length: %d byte(s) when %d expected.\n"
+msgstr "Hazi tamain desegokia:%d byte %d-en ordez.\n"
+
+#: ../mkpasswd.c:217
+#, c-format
+msgid "Illegal salt character '%c'.\n"
+msgstr "'%c' karakterea, hazian, ilegala da.\n"
+
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
+#, c-format
+msgid "Password: "
+msgstr "Pasahitza: "
+
+#: ../mkpasswd.c:275
+#, c-format
+msgid "Illegal password character '0x%hhx'.\n"
+msgstr "'0x%hhx' password karakterea ilegala da.\n"
+
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
+#, c-format
+msgid ""
+"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Crypts the PASSWORD using crypt(3).\n"
+"\n"
+msgstr ""
+"Erabilpena: mkpasswd [AUKERAK]... [PASAHITZA [HAZIA]]\n"
+"PASAHITZA crypt(3) erabiliz enkriptatu.\n"
+"\n"
+
+#: ../mkpasswd.c:363
+#, fuzzy, c-format
+msgid ""
+"      -m, --method=TYPE     select method TYPE\n"
+"      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
+"      -P, --password-fd=NUM read the password from file descriptor NUM\n"
+"                            instead of /dev/tty\n"
+"      -s, --stdin           like --password-fd=0\n"
+"      -h, --help            display this help and exit\n"
+"      -V, --version         output version information and exit\n"
+"\n"
+"If PASSWORD is missing then it is asked interactively.\n"
+"If no SALT is specified, a random one is generated.\n"
+"If TYPE is 'help', available methods are printed.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"      -H, --hash=MOTA       Hash MOTA funtzioa aukeratu\n"
+"      -S, --salt=HAZI    HAZI egokia erabili\n"
+"      -P, --password-fd=NUM   /dev/tty-ak irakurri ordez, NUM deskriptore-"
+"gakoa irakurtzen du\n"
+"      -s, --stdin           /dev/tty-ak irakurri ordez, stdin-gakoa "
+"irakurtzen du\n"
+"      -h, --help           laguntza pantaila erakusten du\n"
+"      -v, --version        programaren bertsioa erakusten du\n"
+"\n"
+"GAKOA zehazten ez bada, modu interaktiboan eskatuko da.\n"
+"HAZIa zehazten ez bada, aleatorioki bat sortuko da.\n"
+"MOTA zehazten ez bada, erabilgarri dauden algoritmoak inprimituko dira.\n"
+"\n"
+"Bug berri baten jakinarazpena: %s.\n"
+
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
+msgstr "Algoritmo erabilgarriak:\n"
+
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "'%s' hash funtzioa ez da baliozkoa.\n"
+
+#~ msgid "Using default server %s.\n"
+#~ msgstr "Aurredefinitutako %s zerbitzaria erabiltzen.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Found referral to %s.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "crsnic-en %s-ri, erreferentzi bat aurkitu zaio.\n"
+#~ "\n"
+
+#~ msgid "Detected referral to %s on %s.\n"
+#~ msgstr "%s-en %s-ri erreferentzia detektatua.\n"
+
+#~ msgid ""
+#~ "I don't know where this IP has been delegated.\n"
+#~ "I'll try ARIN and hope for the best..."
+#~ msgstr ""
+#~ "Ez dakit zeineri delegatua izan zaion IP helbidea hori.\n"
+#~ "ARIN-ekin porbatuko dut, zorte gehiagoren bila..."
+
+#~ msgid "I guess it's a netblock name but I don't know where to look it up."
+#~ msgstr "netblock-en izen bat dirudi, baina ez dakit, non bilatu dezakedan."
+
+#~ msgid "I guess it's a domain but I don't know where to look it up."
+#~ msgstr "Domeinu izen bat dirudi, baina ez dakit, non bilatu dezakedan."
diff --git a/po/fr.po b/po/fr.po
index 98ff6a9..51a255b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.6.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 2005-02-22 20:06+0100\n"
 "Last-Translator: Mohammed Adn�ne Trojette <adn+deb@diwi.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -25,43 +25,32 @@ msgstr ""
 "\n"
 "Veuillez rapporter les bogues � %s.\n"
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Le serveur %s est s�lectionn�.\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Ce TLD n'a pas de serveur whois, mais vous pouvez acc�der � la base de "
 "donn�es �"
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr "Ce TLD n'a pas de serveur whois."
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr "Aucun serveur whois n'est connu pour ce type d'objet."
 
-#: ../whois.c:220
+#: ../whois.c:223
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Num�ro d'AS ou r�seau IP inconnu. Veuillez mettre � jour ce programme."
 
-#: ../whois.c:224
-msgid "Connecting to whois.crsnic.net."
-msgstr "Connexion � whois.crsnic.net."
-
-#: ../whois.c:230
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Connexion � whois.publicinterestregistry.net."
-
-#: ../whois.c:236
-msgid "Connecting to whois.nic.cc."
-msgstr "Connexion � whois.nic.cc."
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -72,7 +61,18 @@ msgstr ""
 "Requ�te faite pour l'extr�mit� IPv4 %s d'une adresse IPv6 6to4.\n"
 "\n"
 
-#: ../whois.c:258
+#: ../whois.c:260
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Requ�te faite pour l'extr�mit� IPv4 %s d'une adresse IPv6 6to4.\n"
+"\n"
+
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -81,7 +81,7 @@ msgstr ""
 "Requ�te: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:284
 #, c-format
 msgid ""
 "\n"
@@ -94,17 +94,17 @@ msgstr ""
 "Renvoi trouv� vers %s.\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Impossible d'interpr�ter la ligne: %s"
 
-#: ../whois.c:451
+#: ../whois.c:483
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Avertissement: des options RIPE ont �t� utilis�es avec un serveur classique."
 
-#: ../whois.c:586
+#: ../whois.c:621 ../whois.c:754
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,26 +112,26 @@ msgstr ""
 "Erreur catastrophique: le texte de d�ni de responsabilit� a chang�.\n"
 "Veuillez mettre � jour ce programme.\n"
 
-#: ../whois.c:713
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "L'h�te %s est introuvable."
 
-#: ../whois.c:723
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: service inconnu"
 
-#: ../whois.c:742
+#: ../whois.c:824
 msgid "Timeout."
 msgstr "Temps limite d�pass�."
 
-#: ../whois.c:748
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interruption par le signal %d..."
 
-#: ../whois.c:860
+#: ../whois.c:1000
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -208,47 +208,53 @@ msgstr ""
 "      --help           afficher cette page d'aide et sortir\n"
 "      --version        afficher les informations de version et sortir\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\tfonction crypt(3) standard, chiffrement DES � 56 bits"
 
-#: ../mkpasswd.c:103
-#, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "Le type de hachage '%s' est invalide.\n"
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "Le nombre '%s' est invalide.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Le nombre '%s' est invalide.\n"
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Veuillez taper '%s --help' pour plus d'informations.\n"
 
 # : ../mkpasswd.c:152
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "Mauvaise taille d'al�a: %d octet(s) au lieu de %d.\n"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Le caract�re '%c' est invalide dans l'al�a.\n"
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr "Mot de passe: "
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "Le caract�re '0x%hhx' est invalide dans le mot de passe.\n"
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -259,11 +265,12 @@ msgstr ""
 "Chiffre le MOT DE PASSE � l'aide de la fonction crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:257
-#, c-format
+#: ../mkpasswd.c:363
+#, fuzzy, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -272,7 +279,7 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
@@ -291,8 +298,10 @@ msgstr ""
 "\n"
 "Veuillez rapporter les bogues � %s.\n"
 
-#: ../mkpasswd.c:284
-#, c-format
-msgid "Available algorithms:\n"
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
 msgstr "Algorithmes disponibles:\n"
 
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "Le type de hachage '%s' est invalide.\n"
diff --git a/po/it.po b/po/it.po
index 95d7394..1188152 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.7.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 2006-07-15 19:18+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -24,43 +24,32 @@ msgstr ""
 "\n"
 "Segnalare i bug a %s.\n"
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Uso il server %s.\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Questo TLD non ha un server whois, ma si pu� accedere al database tramite"
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr "Per questo TLD non esiste un server whois."
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr "Non � noto alcun server whois per questo tipo di oggetto."
 
-#: ../whois.c:220
+#: ../whois.c:223
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr ""
 "Numero dell'AS o della rete IP sconosciuto. Per favore aggiorna il programma."
 
-#: ../whois.c:224
-msgid "Connecting to whois.crsnic.net."
-msgstr "Mi sto connettendo a whois.crsnic.net."
-
-#: ../whois.c:230
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Mi sto connettendo a whois.publicinterestregistry.net."
-
-#: ../whois.c:236
-msgid "Connecting to whois.nic.cc."
-msgstr "Mi sto connettendo a whois.nic.cc."
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -71,7 +60,18 @@ msgstr ""
 "Cerco l'endpoint IPv4 %s di un indirizzo IPv6 6to4.\n"
 "\n"
 
-#: ../whois.c:258
+#: ../whois.c:260
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 Teredo.\n"
+"\n"
+
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -80,7 +80,7 @@ msgstr ""
 "Richiesta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:284
 #, c-format
 msgid ""
 "\n"
@@ -93,16 +93,16 @@ msgstr ""
 "Trovato un riferimento a %s.\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Impossibile interpretare questa riga: %s"
 
-#: ../whois.c:451
+#: ../whois.c:483
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale."
 
-#: ../whois.c:586
+#: ../whois.c:621 ../whois.c:754
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -110,26 +110,26 @@ msgstr ""
 "Errore catastrofico: il testo di avvertenze � cambiato.\n"
 "Aggiorna questo programma.\n"
 
-#: ../whois.c:713
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s non trovato."
 
-#: ../whois.c:723
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servizio sconosciuto"
 
-#: ../whois.c:742
+#: ../whois.c:824
 msgid "Timeout."
 msgstr "Tempo scaduto."
 
-#: ../whois.c:748
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrotto dal segnale %d..."
 
-#: ../whois.c:860
+#: ../whois.c:1000
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -198,46 +198,51 @@ msgstr ""
 "      --help       mostra questo aiuto ed esce\n"
 "      --version    stampa le informazioni sulla versione ed esce\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
-msgstr "\tcrypt(3) standard a 56 bit basata su DES"
+#: ../mkpasswd.c:65
+msgid "standard 56 bit DES-based crypt(3)"
+msgstr "crypt(3) standard a 56 bit basata su DES"
 
-#: ../mkpasswd.c:103
+#: ../mkpasswd.c:134
 #, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "Il tipo di hash '%s' non � valido.\n"
+msgid "Invalid method '%s'.\n"
+msgstr "Il metodo '%s' non � valido.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Il numero '%s' non � valido.\n"
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Per maggior informazioni prova '%s --help'.\n"
 
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "Lunghezza del sale sbagliata: %d byte invece di %d.\n"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Il carattere '%c' non � valido in un sale.\n"
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr "Password: "
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "Il carattere '0x%hhx' non � valido in una password.\n"
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr "Metodo non gestito da crypt(3).\n"
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -248,11 +253,12 @@ msgstr ""
 "Cifra la PASSWORD usando crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:257
+#: ../mkpasswd.c:363
 #, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -261,12 +267,13 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -H, --hash=TIPO       seleziona il TIPO di hash\n"
+"      -m, --metodo=TIPO     seleziona il TIPO di metodo\n"
 "      -S, --salt=SALE       usa il SALE specificato\n"
+"      -R, --rounds=NUMBER   usa il NUMERO indicato di iterazioni\n"
 "      -P, --password-fd=NUM legge la password dal file descriptor NUM\n"
 "                            invece che da /dev/tty\n"
 "      -s, --stdin           come --password-fd=0\n"
@@ -279,8 +286,7 @@ msgstr ""
 "\n"
 "Segnalare i bug a %s.\n"
 
-#: ../mkpasswd.c:284
+#: ../mkpasswd.c:391
 #, c-format
-msgid "Available algorithms:\n"
-msgstr "Algoritmi disponibili:\n"
-
+msgid "Available methods:\n"
+msgstr "Metodi disponibili:\n"
diff --git a/po/ja.po b/po/ja.po
index ecc9a27..ba9a6fb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.7.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 2005-04-26 00:20+0900\n"
 "Last-Translator: Satoru SATOH <ss@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -26,43 +26,32 @@ msgstr ""
 "\n"
 "バグ報告は %s へ.\n"
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "サーバー %s を使用\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "この TLD には whois サーバーがありませんが、次のサーバーで whois データベース"
 "にアクセスできます"
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr "この TLD には whois サーバーがありません"
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr "この種のオブジェクトに対する既知の whois サーバーはありません"
 
-#: ../whois.c:220
+#: ../whois.c:223
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "不明な AS 番号または IP ネットワーク. アップグレードして下さい"
 
-#: ../whois.c:224
-msgid "Connecting to whois.crsnic.net."
-msgstr "whois.crsnic.net に接続中"
-
-#: ../whois.c:230
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "whois.publicinterestregistry.net に接続中"
-
-#: ../whois.c:236
-msgid "Connecting to whois.nic.cc."
-msgstr "whois.nic.cc に接続中"
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -73,7 +62,18 @@ msgstr ""
 "6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
 "\n"
 
-#: ../whois.c:258
+#: ../whois.c:260
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
+"\n"
+
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
 "問い合わせ文字列: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:284
 #, c-format
 msgid ""
 "\n"
@@ -95,16 +95,16 @@ msgstr ""
 "%s への照会をみつけました\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "この行を解析できません: %s"
 
-#: ../whois.c:451
+#: ../whois.c:483
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "警告: 旧来のサーバーについて RIPE フラグが使用されています"
 
-#: ../whois.c:586
+#: ../whois.c:621 ../whois.c:754
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,26 +112,26 @@ msgstr ""
 "破滅的なエラー: 免責条項テキストが変更されました\n"
 "このプログラムをアップグレードして下さい\n"
 
-#: ../whois.c:713
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "ホスト %s はみつかりませんでした"
 
-#: ../whois.c:723
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: 不明なサービス"
 
-#: ../whois.c:742
+#: ../whois.c:824
 msgid "Timeout."
 msgstr "時間切れ"
 
-#: ../whois.c:748
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "シグナル %d が割込み..."
 
-#: ../whois.c:860
+#: ../whois.c:1000
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -197,46 +197,52 @@ msgstr ""
 "      --help           このヘルプを表示して終了\n"
 "      --version        バージョン情報を表示して終了\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\t標準 56 ビット DES ベース暗号(3)"
 
-#: ../mkpasswd.c:103
-#, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "不正なハッシュタイプ '%s'\n"
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "不正な数字 '%s'\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "不正な数字 '%s'\n"
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "さらなる詳細については '%s --help' を実行\n"
 
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "間違ったソルト長: %d バイト(s) (%d を期待)\n"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "不正なソルト文字 '%c'\n"
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "不正なパスワード文字 '0x%hhx'\n"
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -247,11 +253,12 @@ msgstr ""
 "PASSWORD を crypt(3) で暗号化\n"
 "\n"
 
-#: ../mkpasswd.c:257
-#, c-format
+#: ../mkpasswd.c:363
+#, fuzzy, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -260,7 +267,7 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
@@ -278,7 +285,10 @@ msgstr ""
 "\n"
 "バグ報告は %s へ.\n"
 
-#: ../mkpasswd.c:284
-#, c-format
-msgid "Available algorithms:\n"
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
 msgstr "利用可能なアルゴリズム:\n"
+
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "不正なハッシュタイプ '%s'\n"
diff --git a/po/no.po b/po/no.po
index a2aac1f..41ea13b 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.4.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 1999-12-18 14:00:00\n"
 "Last-Translator: Egil Kvaleberg <egil@kvaleberg.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -23,45 +23,31 @@ msgid ""
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Bruker tjener %s.\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr ""
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr ""
 
-#: ../whois.c:220
+#: ../whois.c:223
 #, fuzzy
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
 
-#: ../whois.c:224
-#, fuzzy
-msgid "Connecting to whois.crsnic.net."
-msgstr "Kobler opp mot whois.internic.net."
-
-#: ../whois.c:230
-#, fuzzy
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Kobler opp mot whois.internic.net."
-
-#: ../whois.c:236
-#, fuzzy
-msgid "Connecting to whois.nic.cc."
-msgstr "Kobler opp mot whois.internic.net."
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -69,7 +55,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../whois.c:258
+#: ../whois.c:260
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -78,7 +72,7 @@ msgstr ""
 "Foresp�rsel: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:284
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -90,17 +84,17 @@ msgstr ""
 "Fant InterNIC-referanse til %s.\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:451
+#: ../whois.c:483
 #, fuzzy
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
 
-#: ../whois.c:586
+#: ../whois.c:621 ../whois.c:754
 #, fuzzy
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
@@ -109,26 +103,26 @@ msgstr ""
 "Alvorlig feil: INTERNIC har endret standardtekst.\n"
 "Vennligst oppdater programmet.\n"
 
-#: ../whois.c:713
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "Finner ikke verten %s."
 
-#: ../whois.c:723
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: ukjent port"
 
-#: ../whois.c:742
+#: ../whois.c:824
 msgid "Timeout."
 msgstr ""
 
-#: ../whois.c:748
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Avbrudt av signal %d..."
 
-#: ../whois.c:860
+#: ../whois.c:1000
 #, fuzzy, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -187,46 +181,51 @@ msgstr ""
 "\n"
 "Versjon %s. Rapporter feil til %s.\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
+#: ../mkpasswd.c:65
+msgid "standard 56 bit DES-based crypt(3)"
 msgstr ""
 
-#: ../mkpasswd.c:103
+#: ../mkpasswd.c:134
 #, c-format
-msgid "Invalid hash type '%s'.\n"
+msgid "Invalid method '%s'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr ""
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr ""
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr ""
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -234,11 +233,12 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../mkpasswd.c:257
+#: ../mkpasswd.c:363
 #, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -247,14 +247,14 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../mkpasswd.c:284
+#: ../mkpasswd.c:391
 #, c-format
-msgid "Available algorithms:\n"
+msgid "Available methods:\n"
 msgstr ""
 
 #~ msgid "Using default server %s.\n"
diff --git a/po/pl.po b/po/pl.po
index 6629400..97a17a8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.7.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-07 14:31+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 2007-04-07 14:32+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -26,7 +26,8 @@ msgstr ""
 "\n"
 "B��dy prosz� zg�asza� na adres %s.\n"
 
-#: ../whois.c:167 ../whois.c:266
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "U�ycie serwera %s.\n"
@@ -48,20 +49,8 @@ msgstr "Dla tego rodzaju obiektu nie jest znany �aden serwer whois."
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Nieznany numer AS lub sie� IP. Prosz� uaktualni� ten program."
 
-#: ../whois.c:227
-msgid "Connecting to whois.crsnic.net."
-msgstr "��czenie z whois.crsnic.net."
-
-#: ../whois.c:233
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "��czenie z whois.publicinterestregistry.net."
-
-#: ../whois.c:239
-msgid "Connecting to whois.nic.cc."
-msgstr "��czenie z whois.nic.cc."
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:246
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -72,7 +61,7 @@ msgstr ""
 "Pytanie o zako�czenie IPv4 %s adresu IPv6 typu 6to4.\n"
 "\n"
 
-#: ../whois.c:253
+#: ../whois.c:260
 #, c-format
 msgid ""
 "\n"
@@ -83,7 +72,7 @@ msgstr ""
 "Pytanie o zako�czenie IPv4 %s adresu IPv6 Teredo.\n"
 "\n"
 
-#: ../whois.c:267
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -92,7 +81,7 @@ msgstr ""
 "Zapytanie: \"%s\"\n"
 "\n"
 
-#: ../whois.c:277
+#: ../whois.c:284
 #, c-format
 msgid ""
 "\n"
@@ -105,16 +94,16 @@ msgstr ""
 "Znaleziono odniesienie do %s.\n"
 "\n"
 
-#: ../whois.c:320 ../whois.c:323
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Nie mo�na przeanalizowa� tej linii: %s"
 
-#: ../whois.c:460
+#: ../whois.c:483
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Uwaga: u�yto flag RIPE ze starszym serwerem."
 
-#: ../whois.c:598
+#: ../whois.c:621 ../whois.c:754
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -122,26 +111,26 @@ msgstr ""
 "Katastrofa! Tekst o�wiadczenia zosta� zmieniony.\n"
 "Prosz� uaktualni� ten program.\n"
 
-#: ../whois.c:725
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "Serwer %s nie zosta� znaleziony."
 
-#: ../whois.c:735
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: us�uga nieznana"
 
-#: ../whois.c:754
+#: ../whois.c:824
 msgid "Timeout."
 msgstr "Up�yn�� limit czasu."
 
-#: ../whois.c:760
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Przerwano sygna�em %d..."
 
-#: ../whois.c:888
+#: ../whois.c:1000
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -215,47 +204,53 @@ msgstr ""
 "      --version        wy�wietlenie informacji o wersji i zako�czenie "
 "dzia�ania\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\tstandardowa 56-bitowa, oparta o DES funkcja crypt(3)"
 
-#: ../mkpasswd.c:103
-#, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "Nieprawid�owy rodzaj skr�tu '%s'.\n"
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "Nieprawid�owa liczba '%s'.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Nieprawid�owa liczba '%s'.\n"
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "'%s --help' poda wi�cej informacji.\n"
 
 # : ../mkpasswd.c:152
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "B��dna d�ugo�� zarodka: %d bajt�w kiedy oczekiwano %d.\n"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "B��dny znak zarodka '%c'.\n"
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr "Has�o: "
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "B��dny znak w ha�le '0x%hhx'.\n"
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -266,11 +261,12 @@ msgstr ""
 "Koduje HAS�O przy u�yciu funkcji crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:257
-#, c-format
+#: ../mkpasswd.c:363
+#, fuzzy, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -279,7 +275,7 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
@@ -298,7 +294,10 @@ msgstr ""
 "\n"
 "B��dy prosz� zg�asza� na adres %s.\n"
 
-#: ../mkpasswd.c:284
-#, c-format
-msgid "Available algorithms:\n"
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
 msgstr "Dost�pne algorytmy:\n"
+
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "Nieprawid�owy rodzaj skr�tu '%s'.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 814e248..7bd015f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,12 +2,12 @@
 # Copyright (C) 2006 THE whois'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the whois package.
 # Anderson Goulart <globalx@gmail.com>, 2006.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.7.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 2006-04-26 21:03-0300\n"
 "Last-Translator: Anderson Goulart <globalx@gmail.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -26,43 +26,32 @@ msgstr ""
 "\n"
 "Reporte bugs para %s \n"
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Utilizando servidor %s.\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Este TLD n�o tem servidor whois, mas voc� pode acessar a base de dados do "
 "whois em"
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr "N�o existe servidor whois para este TLD."
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr "Nenhum servidor whois � conhecido para este tipo de objeto."
 
-#: ../whois.c:220
+#: ../whois.c:223
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "N�mero AS ou rede IP desconhecidos. Por favor, atualize este programa."
 
-#: ../whois.c:224
-msgid "Connecting to whois.crsnic.net."
-msgstr "Conectando em whois.crsnic.net."
-
-#: ../whois.c:230
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Conectando em whois.publicinterestregistry.net."
-
-#: ../whois.c:236
-msgid "Connecting to whois.nic.cc."
-msgstr "Conectando em whois.nic.cc."
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -73,7 +62,18 @@ msgstr ""
 "Procurando pela extremidade IPv4 %s de um endere�o IPv6. 6to4.\n"
 "\n"
 
-#: ../whois.c:258
+#: ../whois.c:260
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Procurando pela extremidade IPv4 %s de um endere�o IPv6. 6to4.\n"
+"\n"
+
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
 "Consulta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:284
 #, c-format
 msgid ""
 "\n"
@@ -95,16 +95,16 @@ msgstr ""
 "Uma refer�ncia para�%s encontrada.\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "N�o p�de processar esta linha: %s"
 
-#: ../whois.c:451
+#: ../whois.c:483
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Aviso: RIPE flags utilizados com um servidor tradicional."
 
-#: ../whois.c:586
+#: ../whois.c:621 ../whois.c:754
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,26 +112,26 @@ msgstr ""
 "Erro catastr�fico: o texto das condi��es de uso foi alterado.\n"
 "Por favor, atualize este programa. \n"
 
-#: ../whois.c:713
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s n�o encontrado."
 
-#: ../whois.c:723
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servi�o desconhecido"
 
-#: ../whois.c:742
+#: ../whois.c:824
 msgid "Timeout."
 msgstr "Tempo esgotado."
 
-#: ../whois.c:748
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrompido pelo sinal %d..."
 
-#: ../whois.c:860
+#: ../whois.c:1000
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -202,47 +202,53 @@ msgstr ""
 "      --help           exibe essa ajuda e sai\n"
 "      --version        exibe informa��es sobre a vers�o e sai\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\tstandard 56 bit DES-based crypt(3)"
 
-#: ../mkpasswd.c:103
-#, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "Hash-type inv�lido '%s'.\n"
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "N�mero inv�lido '%s'.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "N�mero inv�lido '%s'.\n"
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Tente '%s --help para maiores informa��es.\n"
 
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr ""
 "Tamanho do salt incorreto: %d byte(s) enquanto %d era(m) esperado(s).\n"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Caractere salt ilegal '%c'.\n"
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr "Senha: "
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "Caractere de senha ilegal '0x%hhx'.\n"
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -253,11 +259,12 @@ msgstr ""
 "Encripta a PASSWORD utilizando crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:257
-#, c-format
+#: ../mkpasswd.c:363
+#, fuzzy, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -266,7 +273,7 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
@@ -284,7 +291,10 @@ msgstr ""
 "\n"
 "Reporte bugs para %s.\n"
 
-#: ../mkpasswd.c:284
-#, c-format
-msgid "Available algorithms:\n"
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
 msgstr "Algoritmos dispon�veis: \n"
+
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "Hash-type inv�lido '%s'.\n"
diff --git a/po/ru.po b/po/ru.po
index 26b6993..443e2a6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-15 19:18+0200\n"
+"POT-Creation-Date: 2008-03-23 22:06+0100\n"
 "PO-Revision-Date: 2005-11-29 15:15+0200\n"
 "Last-Translator: Andy Shevchenko <andy@smile.org.ua>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: ../whois.c:114
+#: ../whois.c:117
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -27,42 +27,31 @@ msgstr ""
 "\n"
 "Замечания отправляйте на %s.\n"
 
-#: ../whois.c:164 ../whois.c:257
+#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
+#: ../whois.c:273
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Используется сервер %s.\n"
 
-#: ../whois.c:206
+#: ../whois.c:209
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Этот ДВУ не имеет whois-сервера, но можно получить доступ к базе whois на"
 
-#: ../whois.c:214
+#: ../whois.c:217
 msgid "This TLD has no whois server."
 msgstr "Этот ДВУ не имеет whois-сервера."
 
-#: ../whois.c:217
+#: ../whois.c:220
 msgid "No whois server is known for this kind of object."
 msgstr "Нет whois-сервера для объектов данного вида."
 
-#: ../whois.c:220
+#: ../whois.c:223
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Неизвестный номер AS или IP-сети. Пожалуйста, обновите программу."
 
-#: ../whois.c:224
-msgid "Connecting to whois.crsnic.net."
-msgstr "Соединение с whois.crsnic.net."
-
-#: ../whois.c:230
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Соединение с whois.publicinterestregistry.net."
-
-#: ../whois.c:236
-msgid "Connecting to whois.nic.cc."
-msgstr "Соединение с whois.nic.cc."
-
 #. XXX should fail if p = 0.0.0.0
-#: ../whois.c:243
+#: ../whois.c:253
 #, c-format
 msgid ""
 "\n"
@@ -73,7 +62,18 @@ msgstr ""
 "Запрашивается конечная IPv4-точка %s для IPv6-адреса 6-в-4.\n"
 "\n"
 
-#: ../whois.c:258
+#: ../whois.c:260
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Запрашивается конечная IPv4-точка %s для IPv6-адреса 6-в-4.\n"
+"\n"
+
+#: ../whois.c:274
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
 "Строка запроса: \"%s\"\n"
 "\n"
 
-#: ../whois.c:268
+#: ../whois.c:284
 #, c-format
 msgid ""
 "\n"
@@ -95,16 +95,16 @@ msgstr ""
 "Найдено перенаправление на %s.\n"
 "\n"
 
-#: ../whois.c:311 ../whois.c:314
+#: ../whois.c:327 ../whois.c:330
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Невозможно разобрать строку: %s"
 
-#: ../whois.c:451
+#: ../whois.c:483
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Предупреждение: флаги RIPE используются с традиционным сервером."
 
-#: ../whois.c:586
+#: ../whois.c:621 ../whois.c:754
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,26 +112,26 @@ msgstr ""
 "Катастрофическая ошибка: текст отказа был изменён.\n"
 "Пожалуйста, обновите программу.\n"
 
-#: ../whois.c:713
+#: ../whois.c:795
 #, c-format
 msgid "Host %s not found."
 msgstr "Узел %s не найден."
 
-#: ../whois.c:723
+#: ../whois.c:805
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: неизвестный сервис"
 
-#: ../whois.c:742
+#: ../whois.c:824
 msgid "Timeout."
 msgstr "Задержка."
 
-#: ../whois.c:748
+#: ../whois.c:830
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Прервано по сигналу %d..."
 
-#: ../whois.c:860
+#: ../whois.c:1000
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
@@ -202,46 +202,52 @@ msgstr ""
 "      --help           отобразить эту помощь и выйти\n"
 "      --version        вывести информацию о версии и выйти\n"
 
-#: ../mkpasswd.c:55
-msgid "\tstandard 56 bit DES-based crypt(3)"
+#: ../mkpasswd.c:65
+#, fuzzy
+msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\tстандартный 56 битный, базирующийся на DES, алгоритм crypt(3)"
 
-#: ../mkpasswd.c:103
-#, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "Неверный тип хэша '%s'.\n"
+#: ../mkpasswd.c:134
+#, fuzzy, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "Неверный номер '%s'.\n"
 
-#: ../mkpasswd.c:112
+#: ../mkpasswd.c:143 ../mkpasswd.c:153
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Неверный номер '%s'.\n"
 
-#: ../mkpasswd.c:130
+#: ../mkpasswd.c:171
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Выполните '%s --help' для дополнительной информации.\n"
 
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:211
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
 msgstr "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:217
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Неверный salt-символ '%c'.\n"
 
-#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#: ../mkpasswd.c:254 ../mkpasswd.c:281
 #, c-format
 msgid "Password: "
 msgstr "Пароль: "
 
-#: ../mkpasswd.c:210
+#: ../mkpasswd.c:275
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
 msgstr "Неверный символ пароля '0x%hhx'.\n"
 
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:297
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr ""
+
+#: ../mkpasswd.c:360
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -252,11 +258,12 @@ msgstr ""
 "Кодирует ПАРОЛЬ, используя алгоритм crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:257
-#, c-format
+#: ../mkpasswd.c:363
+#, fuzzy, c-format
 msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
+"      -m, --method=TYPE     select method TYPE\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+"      -R, --rounds=NUMBER   use the specified NUMBER of rounds\n"
 "      -P, --password-fd=NUM read the password from file descriptor NUM\n"
 "                            instead of /dev/tty\n"
 "      -s, --stdin           like --password-fd=0\n"
@@ -265,7 +272,7 @@ msgid ""
 "\n"
 "If PASSWORD is missing then it is asked interactively.\n"
 "If no SALT is specified, a random one is generated.\n"
-"If TYPE is 'help', available algorithms are printed.\n"
+"If TYPE is 'help', available methods are printed.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
@@ -284,7 +291,10 @@ msgstr ""
 "\n"
 "Замечания отправляйте на %s.\n"
 
-#: ../mkpasswd.c:284
-#, c-format
-msgid "Available algorithms:\n"
+#: ../mkpasswd.c:391
+#, fuzzy, c-format
+msgid "Available methods:\n"
 msgstr "Доступные алгоритмы:\n"
+
+#~ msgid "Invalid hash type '%s'.\n"
+#~ msgstr "Неверный тип хэша '%s'.\n"
diff --git a/tld_serv_list b/tld_serv_list
index 774e76f..affe999 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -37,10 +37,10 @@
 .int	whois.iana.org
 .mil	NONE
 
-e164.arpa whois.ripe.net
+.e164.arpa whois.ripe.net
 .arpa	whois.iana.org
 
-.aero	whois.information.aero
+.aero	WEB http://www.nic.aero/
 .asia	whois.nic.asia
 .biz	whois.nic.biz
 .cat	whois.cat
@@ -52,6 +52,7 @@ e164.arpa whois.ripe.net
 .name	whois.nic.name
 .pro	whois.registrypro.pro
 .travel	whois.nic.travel
+.tel	whois.nic.tel
 
 .ac	whois.nic.ac
 .ad	NONE		# www.nic.ad
@@ -68,12 +69,12 @@ e164.arpa whois.ripe.net
 .as	whois.nic.as
 .at	whois.nic.at
 .au	whois.ausregistry.net.au
-.ax	NONE		# www.ax
 .aw	NONE		# www.setarnet.aw
+.ax	NONE		# www.ax
 .az	WEB http://www.nic.az/AzCheck.htm
 .ba	WEB http://www.nic.ba/stream/whois/
-.bb	WEB http://domains.org.bb/regsearch/
-.bd	NONE		# http://www.bttb.net/home/main/internet/dot-bd-faq.htm
+.bb	WEB http://www.barbadosdomains.net/search_domain.php
+.bd	WEB http://www.bttb.net.bd/bd_search.php
 .be	whois.dns.be
 .bf	NONE		# NIC? http://www.onatel.bf/
 .bg	whois.register.bg
@@ -87,9 +88,9 @@ e164.arpa whois.ripe.net
 .bs	WEB http://www.nic.bs/cgi-bin/search.pl
 .bt	WEB http://www.nic.bt/
 .bv	NONE		# http://www.norid.no/domenenavnbaser/bv-sj.html
-#.bw			# NIC? btc.bw www.info.bw/resource/local/index.shtml
 .by	WEB http://www.tld.by/indexeng.html
-.bz	whois.belizenic.bz
+.bw	NONE		# NIC? btc.bw www.info.bw/resource/local/index.shtml
+.bz	AFILIAS
 .co.ca	whois.co.ca
 .ca	whois.cira.ca
 .cc	NICCC
@@ -123,7 +124,7 @@ e164.arpa whois.ripe.net
 #.eh
 .er	NONE		# http://www.afridns.org/er/tld_er.txt
 .es	WEB https://www.nic.es/
-#.et	NONE	# http://www.telecom.net.et/EthioInternet/domainname.html
+.et	NONE	# http://www.telecom.net.et/EthioInternet/domainname.html
 .eu	whois.eu
 .fi	whois.ficora.fi
 .fj	whois.usp.ac.fj
@@ -138,13 +139,13 @@ e164.arpa whois.ripe.net
 .ge	WEB http://whois.sanet.ge/
 .gf	whois.nplus.gf
 .gg	whois.channelisles.net
-.gh	NONE		# http://www.ghana.com.gh/domain.htm
+.gh	WEB http://www.nic.gh/customer/search_c.htm
 .gi	WEB http://whois.gibnet.gi/
 .gl	NONE		# www.nic.gl
 .gm	whois.ripe.net	# www.nic.gm
 .gn	NONE		# http://www.psg.com/dns/gn/
 .gp	whois.nic.gp
-#.gq			# NO NIC http://www.getesa.gq/
+.gq	NONE		# NO NIC http://www.getesa.gq/
 .gr	WEB https://grweb.ics.forth.gr/Whois?lang=en
 .gs	whois.nic.gs
 .gt	WEB http://www.gt/whois.htm
@@ -163,20 +164,20 @@ e164.arpa whois.ripe.net
 .im	WEB http://www.nic.im/public/whois.mth
 .in	whois.registry.in
 .io	whois.nic.io
-#.iq			# NIC?
+.iq	NONE		# NIC?
 .ir	whois.nic.ir
 .is	whois.isnet.is
 .it	whois.nic.it
 .je	whois.channelisles.net
-#.jm			# NIC? uwimona.edu.jm http://nic.jm
+.jm	NONE		# NIC? uwimona.edu.jm http://nic.jm
 .jo	WEB http://www.nis.jo/dns/
 .jp	whois.jprs.jp
 .ke	whois.kenic.or.ke
 .kg	whois.domain.kg
 .kh	NONE		# http://www.mptc.gov.kh/ http://www.nic.net.kh/
 .ki	WEB http://www.ki/dns/
-.km	NONE		# NO NIC
-#.kn			# NO NIC (UPR)
+.km	NONE		# www.domaine.km
+.kn	NONE		# www.dot.kn
 .kp	whois.kcce.kp
 .kr	whois.nic.or.kr
 .kw	WEB http://www.kw/
@@ -184,7 +185,7 @@ e164.arpa whois.ripe.net
 .kz	whois.nic.kz
 .la	whois.nic.la
 .lb	WEB http://www.aub.edu.lb/lbdr/search.html
-.lc	NONE		# NO NIC? UPR (was http://www.isisworld.lc/domains/)
+.lc	WEB http://www.nic.lc/whois.htm
 .li	whois.nic.li
 .lk	whois.nic.lk
 .lr	NONE		# http://www.psg.com/dns/lr/
@@ -193,14 +194,14 @@ e164.arpa whois.ripe.net
 .lu	whois.dns.lu
 .lv	whois.nic.lv
 .ly	WEB http://www.lydomains.com/
-#.ma			# NIC? http://www.anrt.net.ma/nic/
+.ma	whois.iam.net.ma # www.nic.ma
 .mc	whois.ripe.net
 .md	WEB http://www.dns.md/whois.html
-#.me
+.me	WEB http://whois.nic.me/
 .mg	NONE		# www.nic.mg
 .mh	NONE		# www.nic.net.mh
-#.mk			# NIC? http://www.mpt.com.mk
-#.ml			# NIC? www.sotelma.ml
+.mk	NONE		# NIC? http://www.mpt.com.mk
+.ml	NONE		# NIC? www.sotelma.ml
 .mm	whois.nic.mm
 .mn	whois.nic.mn
 .mo	WEB http://www.monic.net.mo/
@@ -210,14 +211,14 @@ e164.arpa whois.ripe.net
 .ms	whois.adamsnames.tc
 .mt	WEB http://www.nic.org.mt/dir/home.html
 .mu	WEB http://www.nic.mu/whois.jsp
-#.mv			# NIC? www.dhiraagu.com.mv
+.mv	NONE		# NIC? www.dhiraagu.com.mv
 .mw	WEB http://www.registrar.mw/
 .mx	whois.nic.mx
 .my	whois.mynic.net.my
-#.mz			# NIC? www.uem.mz
+.mz	NONE		# NIC? www.uem.mz
 .na	whois.na-nic.com.na
 .nc	whois.cctld.nc
-#.ne			# NIC? http://www.intnet.ne
+.ne	NONE		# NIC? http://www.intnet.ne
 .nf	whois.nic.nf
 .ng	NONE		# http://psg.com/dns/ng/
 .ni	WEB http://www.nic.ni/consulta.htm
@@ -227,10 +228,10 @@ e164.arpa whois.ripe.net
 .nr	WEB http://www.cenpac.net.nr/dns/whois.html
 .nu	whois.nic.nu
 .nz	whois.srs.net.nz
-#.om	NONE		# NIC? http://www.gto.net.om http://www.omantel.net.om/
+.om	WEB http://www.omnic.om/onlineUser/WHOISLookup.jsp
 .pa	WEB http://www.nic.pa/
 .pe	whois.nic.pe
-#.pf			# NIC? mana.pf
+.pf	NONE		# http://www.opt.pf/home/
 .pg	NONE	# http://www.npi.gov.pg/DNS/DNS-Application-form.htm
 .ph	WEB http://whois.domains.ph/
 .pk	WEB http://www.pknic.net.pk/
@@ -246,13 +247,13 @@ e164.arpa whois.ripe.net
 .qa	NONE		# http://www.qatar.net.qa/services/virtual.htm
 .re	whois.nic.fr
 .ro	whois.rotld.ro
-#.rs
+.rs	WEB http://www.nic.rs/RsReg/?lang=en
 .edu.ru	whois.informika.ru
 .ru	whois.ripn.net
 .rw	WEB http://www.nic.rw/cgi-bin/whoisrw.pl
 .sa	saudinic.net.sa
 .sb	whois.nic.net.sb
-.sc	NONE		# www.nic.sc
+.sc	AFILIAS		# www.nic.sc
 .sd	NONE		# http://sudanic.isoc.sd/
 .se	whois.nic-se.se
 .sg	whois.nic.net.sg
@@ -268,7 +269,7 @@ e164.arpa whois.ripe.net
 .st	whois.nic.st
 .su	whois.ripn.net
 .sv	WEB http://www.uca.edu.sv/dns/	# http://www.svnet.org.sv/
-#.sy			# NIC? www.ste.gov.sy
+.sy	NONE		# NIC? www.ste.gov.sy
 .sz	NONE		# http://www.sispa.org.sz/
 .tc	whois.adamsnames.tc
 .td	WEB http://www.nic.td/
@@ -289,8 +290,17 @@ e164.arpa whois.ripe.net
 .tz	NONE		# http://www.psg.com/dns/tz/
 .ua	whois.net.ua
 .ug	www.registry.co.ug	# this is a whois server too
-.gov.uk	whois.ja.net
 .ac.uk	whois.ja.net
+.bl.uk	NONE
+.british-library.uk NONE
+.gov.uk	whois.ja.net
+.icnet.uk NONE
+.jet.uk	NONE
+.mod.uk	NONE
+.nhs.uk	NONE
+.nls.uk	NONE
+.parliament.uk NONE
+.police.uk NONE
 .uk	whois.nic.uk
 .um	NONE		# www.nic.um
 .fed.us	whois.nic.gov
@@ -307,7 +317,7 @@ e164.arpa whois.ripe.net
 .vu	WEB http://www.vunic.vu/whois.html
 .wf	whois.nic.wf
 .ws	whois.samoanic.ws
-#.ye			# NIC? www.y.net.ye
+.ye	NONE		# NIC? www.y.net.ye
 .yt	whois.nic.yt
 .yu	NONE		# www.nic.yu
 .ac.za	whois.ac.za
diff --git a/whois.1 b/whois.1
index f05eeb6..0b4a790 100644
--- a/whois.1
+++ b/whois.1
@@ -113,4 +113,6 @@ Kessens of QWest for the 6bone server.
 .SH "AUTHOR"
 .B Whois
 and this man page were written by Marco d'Itri <\fImd@linux.it\fP>
-and are licensed under the terms of the GNU General Public License.
+and are licensed under the terms of the GNU General Public License,
+version 2 or higher.
+
diff --git a/whois.c b/whois.c
index 235f179..5396538 100644
--- a/whois.c
+++ b/whois.c
@@ -1,4 +1,4 @@
-/* Copyright 1999-2007 by Marco d'Itri <md@linux.it>.
+/* Copyright 1999-2008 by Marco d'Itri <md@linux.it>.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -224,19 +224,26 @@ const char *handle_query(const char *hserver, const char *hport,
 	    return NULL;
 	case 4:
 	    if (verb)
-		puts(_("Connecting to whois.crsnic.net."));
+		printf(_("Using server %s.\n"), "whois.crsnic.net");
 	    sockfd = openconn("whois.crsnic.net", NULL);
 	    server = query_crsnic(sockfd, qstring);
 	    break;
 	case 7:
 	    if (verb)
-		puts(_("Connecting to whois.publicinterestregistry.net."));
+		printf(_("Using server %s.\n"),
+			"whois.publicinterestregistry.net");
 	    sockfd = openconn("whois.publicinterestregistry.net", NULL);
 	    server = query_pir(sockfd, qstring);
 	    break;
+	case 8:
+	    if (verb)
+		printf(_("Using server %s.\n"), "whois.afilias-grs.info");
+	    sockfd = openconn("whois.afilias-grs.info", NULL);
+	    server = query_afilias(sockfd, qstring);
+	    break;
 	case 9:
 	    if (verb)
-		puts(_("Connecting to whois.nic.cc."));
+		printf(_("Using server %s.\n"), "whois.nic.cc");
 	    sockfd = openconn("whois.nic.cc", NULL);
 	    server = query_crsnic(sockfd, qstring);
 	    break;
@@ -703,6 +710,53 @@ const char *query_pir(const int sock, const char *query)
     return ret;
 }
 
+const char *query_afilias(const int sock, const char *query)
+{
+    char *temp, buf[2000], *p, *ret = NULL;
+    FILE *fi;
+    int hide = hide_discl;
+    int state = 0;
+
+    temp = malloc(strlen(query) + 2 + 1);
+    strcpy(temp, query);
+    strcat(temp, "\r\n");
+
+    fi = fdopen(sock, "r");
+    if (write(sock, temp, strlen(temp)) < 0)
+	err_sys("write");
+
+    while (fgets(buf, sizeof(buf), fi)) {
+	if (state == 0 && strneq(buf, "Domain Name:", 12))
+	    state = 1;
+	if (state == 1 && strneq(buf, "Whois Server:", 13)) {
+	    char *p, *q;
+
+	    for (p = buf; *p != ':'; p++);	/* skip until colon */
+	    for (p++; *p == ' '; p++);		/* skip colon and spaces */
+	    ret = malloc(strlen(p) + 1);
+	    for (q = ret; *p != '\n' && *p != '\r' && *p != ' '; *q++ = *p++)
+		; /*copy data*/
+	    *q = '\0';
+	}
+
+	if (hide_line(&hide, buf))
+	    continue;
+
+	for (p = buf; *p && *p != '\r' && *p != '\n'; p++);
+	*p = '\0';
+	fprintf(stdout, "%s\n", buf);
+    }
+    if (ferror(fi))
+	err_sys("fgets");
+    fclose(fi);
+
+    if (hide > HIDE_UNSTARTED)
+	err_quit(_("Catastrophic error: disclaimer text has been changed.\n"
+		   "Please upgrade this program.\n"));
+
+    return ret;
+}
+
 int openconn(const char *server, const char *port)
 {
     int fd = -1;
diff --git a/whois.h b/whois.h
index 64b1cec..ef83ad7 100644
--- a/whois.h
+++ b/whois.h
@@ -18,6 +18,7 @@ int hide_line(int *hiding, const char *const line);
 const char *do_query(const int, const char *);
 const char *query_crsnic(const int, const char *);
 const char *query_pir(const int, const char *);
+const char *query_afilias(const int, const char *);
 int openconn(const char *, const char *);
 void usage(void);
 void alarm_handler(int);
diff --git a/whois.spec b/whois.spec
index 4f55f8f..d8673d4 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
 Summary: Enhanced WHOIS client
 Name: whois
-Version: 4.7.24
+Version: 4.7.25
 Release: 1
 License: GPL
 Vendor: Marco d'Itri <md@linux.it>