Imported Debian version 4.6.4v4.6.4

15 files changed, 304 insertions, 479 deletions

diff --git a/as_del_list b/as_del_list
index 25ce5ea..9a564ab 100644
--- a/as_del_list
+++ b/as_del_list
@@ -4,13 +4,16 @@
 2043	2043	ripe
 2047	2047	ripe
 2057	2136	ripe
+2387	2488	ripe
+2497	2528	whois.nic.ad.jp
 2585	2614	ripe
 2773	2822	ripe
 2830	2879	ripe
 3154	3353	ripe
 4608	4863	apnic
+5120	5376	whois.nic.mil
 5377	5631	ripe
-5800	5927	whois.nic.mil
+5800	6055	whois.nic.mil
 6656	6911	ripe
 7467	7722	apnic
 8192	9215	ripe
@@ -27,17 +30,28 @@
 10074	10239	apnic
 12288	13311	ripe
 15360	16383	ripe
+17503	17534	whois.nic.ad.jp
 17567	17616	whois.nic.or.kr
+17673	17704	whois.nic.ad.jp
 17832	17880	whois.nic.or.kr
 17408	18431	apnic
+17930	17961	whois.nic.ad.jp
+18067	18098	whois.nic.ad.jp
+18121	18152	whois.nic.ad.jp
+18259	18290	whois.nic.ad.jp
+18259	18290	whois.nic.ad.jp
 20480	21503	ripe
 23552	24575	apnic
+23612	23643	whois.nic.ad.jp
 24576	25599	ripe
+26592	26623	lacnic
 27648	28671	lacnic
 28672	29695	ripe
+#29696	30719	arin
 
 # catch all: everything else comes from ARIN
-0	28671	arin
+0	30719	arin
 
 # EOL marker
 0	0	.
+
diff --git a/data.h b/data.h
index 3df43fc..93ce44d 100644
--- a/data.h
+++ b/data.h
@@ -43,9 +43,10 @@ const char *hide_strings[] = {
     "NOTICE AND TERMS OF USE: You", "VeriSign reserves",	/* VERISIGN */
     "NOTICE: Access to .ORG WHOIS", "time. By submitting",	/* org */
     "NOTICE: Access to .INFO WHOIS", "time. By submitting",	/* info */
+    "This Registry database contains ONLY .EDU", "type: help",	/* edu */
     "The data in Register", "By submitting",		    /* REGISTER.COM */
     "The Data in the Tucows", "RECORD DOES NOT",		/* OPENSRS */
-    " The data contained in Dotster", "Please limit your",	/* DOTSTER */
+    " The data contained in the WHOIS", "Please limit your",	/* DOTSTER */
     "This whois service currently only", "top-level domains.",
     "Signature Domains' Whois Service", "agree to abide by the above",
     "Access to ASNIC", "by this policy.",			/* as */
@@ -56,10 +57,11 @@ const char *hide_strings[] = {
     "Access to America Online", "time. By accessing",		/* AOL */
     "% Access and use restricted", "% http://www.icann",	/* GANDI */
     "NeuStar, Inc., the Registry", "rules.  For details",	/* us */
-    "The data in this whois", "Version 6.3",			/* enom */
+    "The data in this whois", "using our Whois information",	/* enom */
     "By submitting a WHOIS query,", "LACK OF A DOMAIN",		/* directNIC */
     "The Data in OnlineNIC", "\tBy starting this query",	/* OnlineNIC */
     "The data in Bulkregister.com", "you agree to abide", /* bulkregister */
+    "The Data in Alldomains.com's", "By submitting this query,",/*alldomains*/
     NULL, NULL
 };
 
@@ -67,9 +69,12 @@ const char *nic_handles[] = {
     "net-",	"whois.arin.net",
     "netblk-",	"whois.arin.net",
     "lim-",	"whois.ripe.net",
+#if 0
+    // commented until somebody will explain the query format for these
     "coco-",	"whois.corenic.net",
     "coho-",	"whois.corenic.net",
     "core-",	"whois.corenic.net",
+#endif
     "denic-",	"whois.denic.de",
     /* RPSL objects */
     "as-",	"whois.ripe.net",
diff --git a/debian/changelog b/debian/changelog
index d2b9e98..aea65dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+whois (4.6.4) unstable; urgency=medium
+
+  * Added may new ASN blocks from MILNET, LACNIC and JP-NIC.
+  * Fixed a bug which broke ASN queries to whois.nic.mil.
+  * Added .arpa TLD.
+  * Update .aero, .int, .la TLD. (Closes: #187007)
+  * Updated Polish translation, courtesy of Jakub Bogusz.
+  * Removed CORE NIC handles until the query format will be documented.
+  * Added support for nic.cc referrals (patch from Kevin Stone).
+
+ -- Marco d'Itri <md@linux.it>  Mon,  5 May 2003 18:14:46 +0200
+
 whois (4.6.3) unstable; urgency=low
 
   * Added support for .org referrals. (Closes: #182192, #179539)
diff --git a/debian/control b/debian/control
index a6945b9..4673c4d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Depends: ${shlibs:Depends}
 Replaces: bsdmainutils (<= 4.5.1), bsdutils (<< 3.0-0)
 Description: The GNU whois client
  This is a new whois (RFC 954) client rewritten from scratch.
- It is derived from and compatible with the usual BSD and RIPE whois(1)
+ It is inspired from and compatible with the usual BSD and RIPE whois(1)
  programs.
  It is intelligent and can automatically select the appropriate whois
  server for most queries.
diff --git a/ip_del_list b/ip_del_list
index 269d69c..c19cd23 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -12,11 +12,11 @@
 61.112.0.0/12	whois.nic.ad.jp
 61.192.0.0/12	whois.nic.ad.jp		# => 61.207.255.255
 61.208.0.0/13	whois.nic.ad.jp		# => 61.215.255.255
-61.0.0.0/8	apnic
+60.0.0.0/7	apnic
 62.0.0.0/8	ripe
 80.0.0.0/7	ripe
 82.0.0.0/8	ripe
-96.0.0.0/3	UNALLOCATED
+96.0.0.0/3	UNALLOCATED		# 96 -> 127 reserved
 0.0.0.0/1	arin	# all other A classes are managed by ARIN
 133.0.0.0/8	whois.nic.ad.jp
 139.20.0.0/14	ripe
@@ -57,6 +57,7 @@
 169.208.0.0/12	apnic
 171.16.0.0/12	ripe
 171.32.0.0/15	ripe
+# 173 -> 190 reserved
 188.0.0.0/8	ripe # transferred from ARIN to to RIPE
 ## All other B class addresses are supposed to be allocated by ARIN
 ## We know that many of them are not, but they can't all be listed here
@@ -81,8 +82,7 @@
 200.18.0.0/15	whois.nic.br
 200.20.0.0/16	whois.nic.br
 200.128.0.0/9	whois.nic.br
-200.0.0.0/8	lacnic
-#201.0.0.0/8	reserved
+200.0.0.0/7	lacnic
 202.11.0.0/16	whois.nic.ad.jp
 202.13.0.0/16	whois.nic.ad.jp
 202.15.0.0/16	whois.nic.ad.jp
@@ -163,5 +163,6 @@
 220.72.0.0/13	whois.nic.or.kr
 220.80.0.0/14	whois.nic.or.kr
 220.84.0.0/15	whois.nic.or.kr
+223.0.0.0/8	UNALLOCATED	# returned from APNIC to IANA
 220.0.0.0/6	apnic
 # that's all... here starts the multicast space
diff --git a/make_tld_serv.pl b/make_tld_serv.pl
index dfe51c8..ffe804e 100755
--- a/make_tld_serv.pl
+++ b/make_tld_serv.pl
@@ -9,11 +9,12 @@ while (<>) {
 	next if /^$/;
 	die "format error: $_" unless
 		(my ($a, $b) = /^([\w\d\.-]+)\s+([\w\d\.:-]+|[A-Z]+\s+.*)$/);
-	$b =~ s/^W(?:EB)?\s+/\\001/;
-	$b =~ s/^M(?:SG)?\s+/\\002/;
-	$b = "\\003" if $b eq 'NONE';
-	$b = "\\004" if $b eq 'CRSNIC';
-	$b = "\\007" if $b eq 'PIR';
+	$b =~ s/^W(?:EB)?\s+/\\x01/;
+	$b =~ s/^M(?:SG)?\s+/\\x02/;
+	$b = "\\x03" if $b eq 'NONE';
+	$b = "\\x04" if $b eq 'CRSNIC';
+	$b = "\\x07" if $b eq 'PIR';
+	$b = "\\x09" if $b eq 'NICCC';
 	print "    \"$a\",\t\"$b\",\n";
 }
 
diff --git a/po/de.po b/po/de.po
index c35d93e..1115df5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.4.13\n"
-"POT-Creation-Date: 2003-03-16 15:37+0100\n"
+"POT-Creation-Date: 2003-05-05 18:21+0200\n"
 "PO-Revision-Date: 2001-07-04 15:15+01:00\n"
 "Last-Translator: Simon Richter <Simon.Richter@in.tum.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "\n"
 "Senden sie Bugreports an %s.\n"
 
-#: ../whois.c:151 ../whois.c:213
+#: ../whois.c:151 ../whois.c:224
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Benutze Server %s.\n"
@@ -47,7 +47,7 @@ msgstr "Diese TLD hat keinen whois-Server."
 msgid "Connecting to whois.crsnic.net."
 msgstr "Verbinde zu whois.internic.net."
 
-#: ../whois.c:191
+#: ../whois.c:191 ../whois.c:202
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -60,10 +60,15 @@ msgstr ""
 
 #: ../whois.c:196
 #, fuzzy
+msgid "Connecting to whois.nic.cc."
+msgstr "Verbinde zu whois.internic.net."
+
+#: ../whois.c:207
+#, fuzzy
 msgid "Connecting to whois.publicinterestregistry.net."
 msgstr "Verbinde zu whois.internic.net."
 
-#: ../whois.c:202
+#: ../whois.c:213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -74,16 +79,16 @@ msgstr ""
 "InterNIC verweist auf %s.\n"
 "\n"
 
-#: ../whois.c:206
+#: ../whois.c:217
 msgid "No whois server is known for this kind of object."
 msgstr ""
 
-#: ../whois.c:209
+#: ../whois.c:220
 #, fuzzy
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Unbekannte AS-Nummer. Bitte upgraden Sie dieses Programm."
 
-#: ../whois.c:222
+#: ../whois.c:233
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -92,22 +97,22 @@ msgstr ""
 "Suche nach: \"%s\"\n"
 "\n"
 
-#: ../whois.c:275 ../whois.c:278
+#: ../whois.c:286 ../whois.c:289
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:417
+#: ../whois.c:428
 #, fuzzy
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Warnung: RIPE-Flags wurden ignoriert (\"traditioneller\" Server)."
 
-#: ../whois.c:477
+#: ../whois.c:489
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Verweis auf %s gefunden bei %s.\n"
 
-#: ../whois.c:494
+#: ../whois.c:506
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -115,26 +120,26 @@ msgstr ""
 "Schwerer Fehler: Haftungsausschlusstext wurde geaendert.\n"
 "Bitte upgraden sie dieses Programm.\n"
 
-#: ../whois.c:611
+#: ../whois.c:624
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s nicht gefunden."
 
-#: ../whois.c:621
+#: ../whois.c:634
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: unbekannter Dienst"
 
-#: ../whois.c:633
+#: ../whois.c:646
 msgid "Timeout."
 msgstr ""
 
-#: ../whois.c:639
+#: ../whois.c:652
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Erhielt Signal %d, unterbrochen..."
 
-#: ../whois.c:688
+#: ../whois.c:701
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
diff --git a/po/el.po b/po/el.po
index f47c6d5..78bc2bc 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.5.3\n"
-"POT-Creation-Date: 2003-03-16 15:37+0100\n"
+"POT-Creation-Date: 2003-05-05 18:21+0200\n"
 "PO-Revision-Date: 2001-02-23 16:07:57+0900\n"
 "Last-Translator: Simos Xenitellis <simos@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -24,7 +24,7 @@ msgstr ""
 "\n"
 "ÁíáöÝńáôĺ óöÜëěáôá óôď %s.\n"
 
-#: ../whois.c:151 ../whois.c:213
+#: ../whois.c:151 ../whois.c:224
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Ăßíĺôáé ÷ńŢóç ôďő ĺîőđçńĺôçôŢ %s.\n"
@@ -49,7 +49,7 @@ msgstr "Áőôü ôď TLD äĺí Ý÷ĺé ĺîőđçńĺôçôŢ whois."
 msgid "Connecting to whois.crsnic.net."
 msgstr "Ăßíĺôáé óýíäĺóç óôď whois.internic.net."
 
-#: ../whois.c:191
+#: ../whois.c:191 ../whois.c:202
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -62,10 +62,15 @@ msgstr ""
 
 #: ../whois.c:196
 #, fuzzy
+msgid "Connecting to whois.nic.cc."
+msgstr "Ăßíĺôáé óýíäĺóç óôď whois.internic.net."
+
+#: ../whois.c:207
+#, fuzzy
 msgid "Connecting to whois.publicinterestregistry.net."
 msgstr "Ăßíĺôáé óýíäĺóç óôď whois.internic.net."
 
-#: ../whois.c:202
+#: ../whois.c:213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -76,16 +81,16 @@ msgstr ""
 "ÂńÝčçęĺ áíáöďńÜ áđü ôď InterNIC óôď %s.\n"
 "\n"
 
-#: ../whois.c:206
+#: ../whois.c:217
 msgid "No whois server is known for this kind of object."
 msgstr ""
 
-#: ../whois.c:209
+#: ../whois.c:220
 #, fuzzy
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "śăíůóôďň áńéčěüň AS. Đáńáęáëţ ĺíçěĺńţóôĺ áőôü ôď đńüăńáěěá."
 
-#: ../whois.c:222
+#: ../whois.c:233
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -94,23 +99,23 @@ msgstr ""
 "Áëöáńéčěçôéęü ĺńţôçóçň: \"%s\"\n"
 "\n"
 
-#: ../whois.c:275 ../whois.c:278
+#: ../whois.c:286 ../whois.c:289
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:417
+#: ../whois.c:428
 #, fuzzy
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Đńďĺéäďđďßçóç: Ç óçěáßĺň ôďő RIPE áăíďďýíôáé óĺ Ýíáí đáńáäďóéáęü ĺîőđçńĺôçôŢ."
 
-#: ../whois.c:477
+#: ../whois.c:489
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Áíé÷íĺýčçęĺ áíáöďńÜ ôďő %s óôď %s.\n"
 
-#: ../whois.c:494
+#: ../whois.c:506
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -118,26 +123,26 @@ msgstr ""
 "Ęáôáóôńďöéęü óöÜëěá: ôď ęĺßěĺíď ôçň áđďđďßçóçň ĺőčőíţí Ý÷ĺé ôńďđďđďéçčĺß.\n"
 "Đáńáęáëţ áíáâáčěßóôĺ ôď đńüăńáěěá.\n"
 
-#: ../whois.c:611
+#: ../whois.c:624
 #, c-format
 msgid "Host %s not found."
 msgstr "Ôď óýóôçěá %s äĺ âńÝčçęĺ."
 
-#: ../whois.c:621
+#: ../whois.c:634
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: Üăíůóôç őđçńĺóßá"
 
-#: ../whois.c:633
+#: ../whois.c:646
 msgid "Timeout."
 msgstr ""
 
-#: ../whois.c:639
+#: ../whois.c:652
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "ÄéáęďđŢ áđü ôď óŢěá %d..."
 
-#: ../whois.c:688
+#: ../whois.c:701
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
diff --git a/po/es.po b/po/es.po
index 7ede00e..da0e6d8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.5.29\n"
-"POT-Creation-Date: 2003-03-16 15:37+0100\n"
+"POT-Creation-Date: 2003-05-05 18:21+0200\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"
@@ -24,7 +24,7 @@ msgstr ""
 "\n"
 "Informar de bugs a %s.\n"
 
-#: ../whois.c:151 ../whois.c:213
+#: ../whois.c:151 ../whois.c:224
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Usando el servidor %s.\n"
@@ -48,7 +48,7 @@ msgstr "No existe servidor whois para este TLD."
 msgid "Connecting to whois.crsnic.net."
 msgstr "Conectando a whois.crsnic.net."
 
-#: ../whois.c:191
+#: ../whois.c:191 ../whois.c:202
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -61,10 +61,15 @@ msgstr ""
 
 #: ../whois.c:196
 #, fuzzy
+msgid "Connecting to whois.nic.cc."
+msgstr "Conectando a whois.crsnic.net."
+
+#: ../whois.c:207
+#, fuzzy
 msgid "Connecting to whois.publicinterestregistry.net."
 msgstr "Conectando a whois.crsnic.net."
 
-#: ../whois.c:202
+#: ../whois.c:213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -75,16 +80,16 @@ msgstr ""
 "Se ha encontrado en crsnic una referencia a %s.\n"
 "\n"
 
-#: ../whois.c:206
+#: ../whois.c:217
 msgid "No whois server is known for this kind of object."
 msgstr ""
 
-#: ../whois.c:209
+#: ../whois.c:220
 #, fuzzy
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Numero AS desconocido. Por favor, actualice este programa."
 
-#: ../whois.c:222
+#: ../whois.c:233
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -93,23 +98,23 @@ msgstr ""
 "Consulta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:275 ../whois.c:278
+#: ../whois.c:286 ../whois.c:289
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "No puedo procesar esta linea: %s"
 
-#: ../whois.c:417
+#: ../whois.c:428
 #, fuzzy
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Atencion: Los flags RIPE son ignorados por los servidores tradicionales."
 
-#: ../whois.c:477
+#: ../whois.c:489
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Detectada una referencia a %s en %s.\n"
 
-#: ../whois.c:494
+#: ../whois.c:506
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -117,26 +122,26 @@ msgstr ""
 "Error catastrofico: el texto de las condiciones de uso ha sido cambiado.\n"
 "Actualize este programa.\n"
 
-#: ../whois.c:611
+#: ../whois.c:624
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s no encontrado."
 
-#: ../whois.c:621
+#: ../whois.c:634
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servicio desconocido"
 
-#: ../whois.c:633
+#: ../whois.c:646
 msgid "Timeout."
 msgstr ""
 
-#: ../whois.c:639
+#: ../whois.c:652
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrumpido por la seńal %d..."
 
-#: ../whois.c:688
+#: ../whois.c:701
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
diff --git a/po/it.po b/po/it.po
index e4ec9a2..c9e00d1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.4.13\n"
-"POT-Creation-Date: 2003-03-16 15:37+0100\n"
-"PO-Revision-Date: 2003-03-16 15:38+0100\n"
+"POT-Creation-Date: 2003-05-05 18:21+0200\n"
+"PO-Revision-Date: 2003-05-05 18:21+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <it@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr ""
 "\n"
 "Segnalare i bug a %s.\n"
 
-#: ../whois.c:151 ../whois.c:213
+#: ../whois.c:151 ../whois.c:224
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Uso il server %s.\n"
@@ -47,7 +47,7 @@ msgstr "Per questo TLD non esiste un server whois."
 msgid "Connecting to whois.crsnic.net."
 msgstr "Mi sto connettendo a whois.crsnic.net."
 
-#: ../whois.c:191
+#: ../whois.c:191 ../whois.c:202
 #, c-format
 msgid ""
 "\n"
@@ -59,19 +59,34 @@ msgstr ""
 "\n"
 
 #: ../whois.c:196
+msgid "Connecting to whois.nic.cc."
+msgstr "Mi sto connettendo a whois.nic.cc."
+
+#: ../whois.c:207
 msgid "Connecting to whois.publicinterestregistry.net."
 msgstr "Mi sto connettendo a whois.publicinterestregistry.net."
 
-#: ../whois.c:206
+#: ../whois.c:213
+#, c-format
+msgid ""
+"\n"
+"Found referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"Trovato un riferimento a %s.\n"
+"\n"
+
+#: ../whois.c:217
 msgid "No whois server is known for this kind of object."
 msgstr "Non č noto alcun server whois per questo tipo di oggetto."
 
-#: ../whois.c:209
+#: ../whois.c:220
 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:222
+#: ../whois.c:233
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -80,21 +95,21 @@ msgstr ""
 "Richiesta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:275 ../whois.c:278
+#: ../whois.c:286 ../whois.c:289
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Impossibile interpretare questa riga: %s"
 
-#: ../whois.c:417
+#: ../whois.c:428
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale."
 
-#: ../whois.c:477
+#: ../whois.c:489
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Trovato un riferimento a %s su %s.\n"
 
-#: ../whois.c:494
+#: ../whois.c:506
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -102,26 +117,26 @@ msgstr ""
 "Errore catastrofico: il testo di avvertenze č cambiato.\n"
 "Aggiorna questo programma.\n"
 
-#: ../whois.c:611
+#: ../whois.c:624
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s non trovato."
 
-#: ../whois.c:621
+#: ../whois.c:634
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servizio sconosciuto"
 
-#: ../whois.c:633
+#: ../whois.c:646
 msgid "Timeout."
 msgstr "Tempo scaduto."
 
-#: ../whois.c:639
+#: ../whois.c:652
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrotto dal segnale %d..."
 
-#: ../whois.c:688
+#: ../whois.c:701
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
diff --git a/po/it.po~ b/po/it.po~
deleted file mode 100644
index cd11447..0000000
--- a/po/it.po~
+++ /dev/null
@@ -1,285 +0,0 @@
-# Traduzione di whois.pot.
-# Copyright (C) 1999-2000 Marco d'Itri
-# Marco d'Itri <md@linux.it>, 2000.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: whois 4.4.13\n"
-"POT-Creation-Date: 2003-03-16 15:37+0100\n"
-"PO-Revision-Date: 2003-03-16 15:36+0100\n"
-"Last-Translator: Marco d'Itri <md@linux.it>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../whois.c:108
-#, c-format
-msgid ""
-"Version %s.\n"
-"\n"
-"Report bugs to %s.\n"
-msgstr ""
-"Versione %s.\n"
-"\n"
-"Segnalare i bug a %s.\n"
-
-#: ../whois.c:151 ../whois.c:213
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Uso il server %s.\n"
-
-#: ../whois.c:172
-#, c-format
-msgid "Using default server %s.\n"
-msgstr "Uso il server predefinito %s.\n"
-
-#: ../whois.c:175
-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:181
-msgid "This TLD has no whois server."
-msgstr "Per questo TLD non esiste un server whois."
-
-#: ../whois.c:185
-msgid "Connecting to whois.crsnic.net."
-msgstr "Mi sto connettendo a whois.crsnic.net."
-
-#: ../whois.c:191
-#, c-format
-msgid ""
-"\n"
-"Found a referral to %s.\n"
-"\n"
-msgstr ""
-"\n"
-"Trovato un riferimento a %s.\n"
-"\n"
-
-#: ../whois.c:196
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Mi sto connettendo a whois.publicinterestregistry.net."
-
-#: ../whois.c:202
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Found referral to %s.\n"
-"\n"
-msgstr ""
-"\n"
-"Trovato un riferimento a %s.\n"
-"\n"
-
-#: ../whois.c:206
-msgid "No whois server is known for this kind of object."
-msgstr "Non č noto alcun server whois per questo tipo di oggetto."
-
-#: ../whois.c:209
-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:222
-#, c-format
-msgid ""
-"Query string: \"%s\"\n"
-"\n"
-msgstr ""
-"Richiesta: \"%s\"\n"
-"\n"
-
-#: ../whois.c:275 ../whois.c:278
-#, c-format
-msgid "Cannot parse this line: %s"
-msgstr "Impossibile interpretare questa riga: %s"
-
-#: ../whois.c:417
-msgid "Warning: RIPE flags used with a traditional server."
-msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale."
-
-#: ../whois.c:477
-#, c-format
-msgid "Detected referral to %s on %s.\n"
-msgstr "Trovato un riferimento a %s su %s.\n"
-
-#: ../whois.c:494
-msgid ""
-"Catastrophic error: disclaimer text has been changed.\n"
-"Please upgrade this program.\n"
-msgstr ""
-"Errore catastrofico: il testo di avvertenze č cambiato.\n"
-"Aggiorna questo programma.\n"
-
-#: ../whois.c:611
-#, c-format
-msgid "Host %s not found."
-msgstr "Host %s non trovato."
-
-#: ../whois.c:621
-#, c-format
-msgid "%s/tcp: unknown service"
-msgstr "%s/tcp: servizio sconosciuto"
-
-#: ../whois.c:633
-msgid "Timeout."
-msgstr "Tempo scaduto."
-
-#: ../whois.c:639
-#, c-format
-msgid "Interrupted by signal %d..."
-msgstr "Interrotto dal segnale %d..."
-
-#: ../whois.c:688
-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 ""
-"Uso: whois [OPZIONE]... OGGETTO...\n"
-"\n"
-"-l                 trova le corrispondenze un livello meno specifiche "
-"[RPSL]\n"
-"-L                 trova le corrispondenze meno specifiche\n"
-"-m                 trova le corrispondenze di primo livello piů specifiche\n"
-"-M                 trova le corrispondenze piů specifiche\n"
-"-c                 trova le corrispondenze piů specifica contenente un\n"
-"                   attributo mnt-irt [solo RPSL]\n"
-"-x                 trova solo la corrispondenza esatta [solo RPSL]\n"
-"-d                 restituisce anche gli oggetti della delega del DNS "
-"[RPSL]\n"
-"-i ATTR[,ATTR]...  fa una ricerca inversa per l'ATTRibuto specificato\n"
-"-T TIPO[,TIPO]...  cerca solo oggetti del TIPO\n"
-"-K                     restituisce solo le chiavi primarie [solo RPSL]\n"
-"-r                 disabilita le ricerche ricorsive\n"
-"-R                 mostra la copia locale dell'oggetto domain anche se\n"
-"                   contiene un riferimento\n"
-"-a                 cerca in tutti i database\n"
-"-s SOURCE[,SOURCE]...  cerca il database da SOURCE\n"
-"-g SOURCE:FIRST-LAST  trova gli aggiornamenti di SOURCE dal seriale F a L\n"
-"-t TIPO        chiede il template per un oggetto del TIPO ('all' per una "
-"lista)\n"
-"-v TIPO            chiede il template prolisso per un oggetto del TIPO\n"
-"-q [version|sources|types]  chiede al server le informazioni indicate "
-"[RPSL]\n"
-"-F                 output grezzo veloce (implica -r)\n"
-"-h HOST            si connette al server HOST\n"
-"-p PORTA           si connette alla PORTA\n"
-"-H                 nasconde le avvertenze legali\n"
-"      --verbose    spiega cosa sta facendo\n"
-"      --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:96
-#, c-format
-msgid "Invalid hash type '%s'.\n"
-msgstr "Il tipo di hash '%s' non č valido.\n"
-
-#: ../mkpasswd.c:105
-#, c-format
-msgid "Invalid number '%s'.\n"
-msgstr "Il numero '%s' non č valido.\n"
-
-#: ../mkpasswd.c:123
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Per maggior informazioni prova '%s --help'.\n"
-
-#: ../mkpasswd.c:152
-#, 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:158
-#, c-format
-msgid "Illegal salt character '%c'.\n"
-msgstr "Il carattere '%c' non č valido in un sale.\n"
-
-#: ../mkpasswd.c:172 ../mkpasswd.c:199
-msgid "Password: "
-msgstr "Password: "
-
-#: ../mkpasswd.c:193
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "Il carattere '0x%hhx' non č valido in una password.\n"
-
-#: ../mkpasswd.c:230
-msgid ""
-"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
-"Crypts the PASSWORD using crypt(3).\n"
-"\n"
-msgstr ""
-"Uso: mkpasswd [OPZIONI]... [PASSWORD [SALE]]\n"
-"Cifra la PASSWORD usando crypt(3).\n"
-"\n"
-
-#: ../mkpasswd.c:233
-#, c-format
-msgid ""
-"      -H, --hash=TYPE       select hash TYPE\n"
-"      -S, --salt=SALT       use the specified SALT\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 missing available algorithms are printed.\n"
-"\n"
-"Report bugs to %s.\n"
-msgstr ""
-"      -H, --hash=TIPO       seleziona il TIPO di hash\n"
-"      -S, --salt=SALE       usa il SALE specificato\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"
-"      -h, --help            mostra questo aiuto ed esce\n"
-"      -v, --version         mostra le informazioni sulla versione ed esce\n"
-"\n"
-"Se la PASSWORD non č specificata allora viene chiesta interattivamente.\n"
-"Se il SALE non č specificato ne viene generato uno casuale.\n"
-"Se il TIPO non č specificato viene stampata la lista degli algoritmi\n"
-"disponibili.\n"
-"\n"
-"Segnalare i bug a %s.\n"
-
-#: ../mkpasswd.c:260
-msgid "Available algorithms:\n"
-msgstr "Algoritmi disponibili:\n"
diff --git a/po/no.po b/po/no.po
index 717849d..e33496e 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.4.5\n"
-"POT-Creation-Date: 2003-03-16 15:37+0100\n"
+"POT-Creation-Date: 2003-05-05 18:21+0200\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"
@@ -22,7 +22,7 @@ msgid ""
 "Report bugs to %s.\n"
 msgstr ""
 
-#: ../whois.c:151 ../whois.c:213
+#: ../whois.c:151 ../whois.c:224
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Bruker tjener %s.\n"
@@ -45,7 +45,7 @@ msgstr ""
 msgid "Connecting to whois.crsnic.net."
 msgstr "Kobler opp mot whois.internic.net."
 
-#: ../whois.c:191
+#: ../whois.c:191 ../whois.c:202
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -58,10 +58,15 @@ msgstr ""
 
 #: ../whois.c:196
 #, fuzzy
+msgid "Connecting to whois.nic.cc."
+msgstr "Kobler opp mot whois.internic.net."
+
+#: ../whois.c:207
+#, fuzzy
 msgid "Connecting to whois.publicinterestregistry.net."
 msgstr "Kobler opp mot whois.internic.net."
 
-#: ../whois.c:202
+#: ../whois.c:213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -72,16 +77,16 @@ msgstr ""
 "Fant InterNIC-referanse til %s.\n"
 "\n"
 
-#: ../whois.c:206
+#: ../whois.c:217
 msgid "No whois server is known for this kind of object."
 msgstr ""
 
-#: ../whois.c:209
+#: ../whois.c:220
 #, fuzzy
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
 
-#: ../whois.c:222
+#: ../whois.c:233
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -90,22 +95,22 @@ msgstr ""
 "Forespřrsel: \"%s\"\n"
 "\n"
 
-#: ../whois.c:275 ../whois.c:278
+#: ../whois.c:286 ../whois.c:289
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr ""
 
-#: ../whois.c:417
+#: ../whois.c:428
 #, fuzzy
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
 
-#: ../whois.c:477
+#: ../whois.c:489
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Referanse til %s vedrřrende %s.\n"
 
-#: ../whois.c:494
+#: ../whois.c:506
 #, fuzzy
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
@@ -114,26 +119,26 @@ msgstr ""
 "Alvorlig feil: INTERNIC har endret standardtekst.\n"
 "Vennligst oppdater programmet.\n"
 
-#: ../whois.c:611
+#: ../whois.c:624
 #, c-format
 msgid "Host %s not found."
 msgstr "Finner ikke verten %s."
 
-#: ../whois.c:621
+#: ../whois.c:634
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: ukjent port"
 
-#: ../whois.c:633
+#: ../whois.c:646
 msgid "Timeout."
 msgstr ""
 
-#: ../whois.c:639
+#: ../whois.c:652
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Avbrudt av signal %d..."
 
-#: ../whois.c:688
+#: ../whois.c:701
 #, fuzzy
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
diff --git a/po/pl.po b/po/pl.po
index 9d89160..9e87efb 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,15 +1,17 @@
 # cokolwi3k. whois.pot.
-# Michał 'CeFeK' Nazarewicz
+# Michał 'CeFeK' Nazarewicz <cefek@career.pl>, 1999
+# Przemysław Knycz <djrzulf@pld.org.pl>, 2003
+# Jakub Bogusz <qboosh@pld.org.pl>, 2003
 #
 # BUG: xxx
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 4.4.5\n"
-"POT-Creation-Date: 2003-03-16 15:37+0100\n"
-"PO-Revision-Date: 1999-12-18 14:00:00\n"
-"Last-Translator: Michał 'CeFeK' Nazarewicz <cefek@career.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
+"Project-Id-Version: whois 4.6.3\n"
+"POT-Creation-Date: 2003-05-05 18:21+0200\n"
+"PO-Revision-Date: 2003-04-18 22:14+0200\n"
+"Last-Translator: Jakub Bogusz <qboosh@pld.org.pl>\n"
+"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,68 +23,73 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
+"Wersja %s.\n"
+"\n"
+"Błędy proszę zgłaszać na adres %s.\n"
 
-#: ../whois.c:151 ../whois.c:213
+#: ../whois.c:151 ../whois.c:224
 #, c-format
 msgid "Using server %s.\n"
-msgstr "Używam serwera %s.\n"
+msgstr "Użycie serwera %s.\n"
 
 #: ../whois.c:172
 #, c-format
 msgid "Using default server %s.\n"
-msgstr "Uzywam domyślnego serwera %s.\n"
+msgstr "Użycie domyślnego serwera %s.\n"
 
 #: ../whois.c:175
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
+"Ta główna domena nie ma serwera whois, ale można użyć bazy danych whois pod"
 
 #: ../whois.c:181
-#, fuzzy
 msgid "This TLD has no whois server."
-msgstr "Nie ma serwera whois dla tej domeny."
+msgstr "Ta główna domena nie ma serwera whois."
 
 #: ../whois.c:185
-#, fuzzy
 msgid "Connecting to whois.crsnic.net."
-msgstr "Łączenie z hostem whois.internic.net."
+msgstr "Łączenie z whois.crsnic.net."
 
-#: ../whois.c:191
-#, fuzzy, c-format
+#: ../whois.c:191 ../whois.c:202
+#, c-format
 msgid ""
 "\n"
 "Found a referral to %s.\n"
 "\n"
 msgstr ""
 "\n"
-"Znaleziono odniesienie z InterNIC do %s.\n"
+"Znaleziono odniesienie do %s.\n"
 "\n"
 
 #: ../whois.c:196
 #, fuzzy
+msgid "Connecting to whois.nic.cc."
+msgstr "Łączenie z whois.crsnic.net."
+
+#: ../whois.c:207
 msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Łączenie z hostem whois.internic.net."
+msgstr "Łączenie z whois.publicinterestregistry.net."
 
-#: ../whois.c:202
-#, fuzzy, c-format
+#: ../whois.c:213
+#, c-format
 msgid ""
 "\n"
 "Found referral to %s.\n"
 "\n"
 msgstr ""
 "\n"
-"Znaleziono odniesienie z InterNIC do %s.\n"
+"Znaleziono odniesienie do %s.\n"
 "\n"
 
-#: ../whois.c:206
+#: ../whois.c:217
 msgid "No whois server is known for this kind of object."
-msgstr ""
+msgstr "Dla tego rodzaju obiektu nie jest znany żaden serwer whois."
 
-#: ../whois.c:209
-#, fuzzy
+#: ../whois.c:220
 msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Nieznany numer AS. Zainstaluj nowszą wersję programu."
+msgstr "Nieznany numer AS lub sieć IP. Proszę uaktualnić ten program."
 
-#: ../whois.c:222
+#: ../whois.c:233
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -91,50 +98,48 @@ msgstr ""
 "Zapytanie: \"%s\"\n"
 "\n"
 
-#: ../whois.c:275 ../whois.c:278
+#: ../whois.c:286 ../whois.c:289
 #, c-format
 msgid "Cannot parse this line: %s"
-msgstr ""
+msgstr "Nie można przeanalizować tej linii: %s"
 
-#: ../whois.c:417
-#, fuzzy
+#: ../whois.c:428
 msgid "Warning: RIPE flags used with a traditional server."
-msgstr "Uwaga: flagi RIPE są ignorowane dla starszych serwerów."
+msgstr "Uwaga: użyto flag RIPE ze starszym serwerem."
 
-#: ../whois.c:477
+#: ../whois.c:489
 #, c-format
 msgid "Detected referral to %s on %s.\n"
 msgstr "Wykryto odniesienie do %s na %s.\n"
 
-#: ../whois.c:494
+#: ../whois.c:506
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
 msgstr ""
-"Katastrofa! Tekst disclaimera został zmieniony.\n"
-"Ściągnij nowszą wersję programu.\n"
+"Katastrofa! Tekst oświadczenia został zmieniony.\n"
+"Proszę uaktualnić ten program.\n"
 
-#: ../whois.c:611
+#: ../whois.c:624
 #, c-format
 msgid "Host %s not found."
 msgstr "Serwer %s nie został znaleziony."
 
-#: ../whois.c:621
+#: ../whois.c:634
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: usługa nieznana"
 
-#: ../whois.c:633
+#: ../whois.c:646
 msgid "Timeout."
-msgstr ""
+msgstr "Upłynął limit czasu."
 
-#: ../whois.c:639
+#: ../whois.c:652
 #, c-format
 msgid "Interrupted by signal %d..."
-msgstr "Przerwanie na sygnał %d..."
+msgstr "Przerwano sygnałem %d..."
 
-#: ../whois.c:688
-#, fuzzy
+#: ../whois.c:701
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
@@ -168,64 +173,83 @@ msgid ""
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 msgstr ""
-"Użycie: whois [OPCJA]... OBIEKT...\n"
-"\n"
-"-a                     przeszukuje wszystkie bazy danych\n"
-"-F                     szybki wydruk raw (wymusza użycie -r)\n"
-"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
-"-h HOST                łączy z serwerem HOST\n"
-"-i ATTR[,ATTR]...      wykonuje odwrotne szukanie ATTRybutów\n"
-"-r                     wyłącza przeszukiwanie rekursywne\n"
-"-p PORT                łączy z portem PORT\n"
-"-R                     force to show local copy of the domain object even\n"
-"                       if it contains referral\n"
-"-S                     tell server to leave out syntactic sugar\n"
-"-s SOURCE[,SOURCE]...  przeszukuje baze danych ze ŹRÓDŁA\n"
-"-T TYPE[,TYPE]...      szuka tylko obiektów TYPE\n"
-"-t TYPE                requests template for object of TYPE ('all' for a\t\t"
-"\tlist)\n"
-"-v TYPE                requests verbose template for object of TYPE\n"
-"-V                     wyjaśnia, co się dzieje\n"
+"Składnia: whois [OPCJA]... OBIEKT...\n"
 "\n"
-"Wersja %s. Informacje o błędach kieruj do %s. Tłumaczenie: cefek.\n"
+"-l                     zapytanie o jeden poziom mniej szczegółowe [tylko "
+"RPSL]\n"
+"-L                     wyszukanie wszystkich mniej szczegółowych dopasowań\n"
+"-m                     wyszukanie pierwszego bardziej szczegółowego "
+"dopasowania\n"
+"-M                     wyszukanie wszystkich bardziej szczegółowych "
+"dopasowań\n"
+"-c                     wyszukanie najmniejszego dopasowania z atrybutem mnt-"
+"irt\n"
+"-x                     dokładne dopasowanie [tylko RPSL]\n"
+"-d                     także obiekty odwrotnej delegacji DNS [tylko RPSL]\n"
+"-i ATR[,ATR]...        wykonanie odwrotnego wyszukiwania ATRybutów\n"
+"-T TYP[,TYP]...        szukanie tylko obiektów TYP\n"
+"-K                     zwrócenie tylko podstawowych kluczy [tylko RPSL]\n"
+"-r                     bez rekursywnego poszukiwania informacji "
+"kontaktowych\n"
+"-R                     wymuszenie pokazania lokalnej kopii obiektu domeny "
+"nawet\n"
+"                       jeśli zawiera odwołanie\n"
+"-a                     przeszukanie wszystkich baz danych\n"
+"-s ŹRÓDŁO[,ŹRÓDŁO]...  przeszukanie bazy danych ze ŹRÓDŁA\n"
+"-g ŹRÓDŁO:PIERW.-OST.  szukanie uaktualnień ze ŹRÓDŁA od numeru PIERW. do "
+"OST.\n"
+"-t TYP                 żądanie szablonu dla obiektu TYP ('all' podaje "
+"listę)\n"
+"-v TYP                 żądanie szczegółowego szablonu dla obiektu TYP\n"
+"-q [version|sources|types]  zapytanie serwera o podane informacje [tylko "
+"RPSL]\n"
+"-F                     szybki, surowy wydruk (włącza -r)\n"
+"-h HOST                łączenie z serwerem HOST\n"
+"-p PORT                łączenie z portem PORT\n"
+"-H                     ukrycie oświadczenia prawnego\n"
+"      --verbose        wyjaśnianie co się dzieje\n"
+"      --help           wyświetlenie tego opisu i zakończenie działania\n"
+"      --version        wyświetlenie informacji o wersji i zakończenie "
+"działania\n"
 
 #: ../mkpasswd.c:55
 msgid "\tstandard 56 bit DES-based crypt(3)"
-msgstr ""
+msgstr "\tstandardowa 56-bitowa, oparta o DES funkcja crypt(3)"
 
 #: ../mkpasswd.c:96
 #, c-format
 msgid "Invalid hash type '%s'.\n"
-msgstr ""
+msgstr "Nieprawidłowy rodzaj skrótu '%s'.\n"
 
 #: ../mkpasswd.c:105
 #, c-format
 msgid "Invalid number '%s'.\n"
-msgstr ""
+msgstr "Nieprawidłowa liczba '%s'.\n"
 
 #: ../mkpasswd.c:123
 #, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr ""
+msgstr "'%s --help' poda więcej informacji.\n"
 
+# : ../mkpasswd.c:152
 #: ../mkpasswd.c:152
 #, c-format
 msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr ""
+msgstr "Błędna długość zarodka: %d bajtów kiedy oczekiwano %d.\n"
 
 #: ../mkpasswd.c:158
 #, c-format
 msgid "Illegal salt character '%c'.\n"
-msgstr ""
+msgstr "Błędny znak zarodka '%c'.\n"
 
 #: ../mkpasswd.c:172 ../mkpasswd.c:199
 msgid "Password: "
-msgstr ""
+msgstr "Hasło: "
 
 #: ../mkpasswd.c:193
 #, c-format
 msgid "Illegal password character '0x%hhx'.\n"
-msgstr ""
+msgstr "Błędny znak w haśle '0x%hhx'.\n"
 
 #: ../mkpasswd.c:230
 msgid ""
@@ -233,6 +257,9 @@ msgid ""
 "Crypts the PASSWORD using crypt(3).\n"
 "\n"
 msgstr ""
+"Składnia: mkpasswd [OPCJE]... [HASŁO [ZARODEK]]\n"
+"Koduje HASŁO przy użyciu funkcji crypt(3).\n"
+"\n"
 
 #: ../mkpasswd.c:233
 #, c-format
@@ -251,20 +278,21 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
+"      -H, --hash=TYP        wybór skrótu TYP\n"
+"      -S, --salt=ZARODEK    użycie podanego ZARODKA\n"
+"      -P, --password-fd=NUM odczyt hasła z deskryptora pliku NUM zamiast\n"
+"                            z /dev/tty\n"
+"      -s, --stdin           to samo co --password-fd=0\n"
+"      -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+"      -V, --version         wyświetlenie informacji o wersji i zakończenie "
+"działania\n"
+"\n"
+"Jeśli nie podano HASŁA, pobierane jest interaktywnie.\n"
+"Jeśli nie podano ZARODKA, generowany jest losowy.\n"
+"Jeśli nie podano TYPU, wypisywane są dostępne algorytmy.\n"
+"\n"
+"Błędy proszę zgłaszać na adres %s.\n"
 
 #: ../mkpasswd.c:260
 msgid "Available algorithms:\n"
-msgstr ""
-
-#~ msgid ""
-#~ "I don't know where this IP has been delegated.\n"
-#~ "I'll try ARIN and hope for the best..."
-#~ msgstr ""
-#~ "Nie można ustalić, do kogo ten adres IP został oddelegowany.\n"
-#~ "Spróbuję ARIN i mam nadzieję, że się uda..."
-
-#~ msgid "I guess it's a netblock name but I don't know where to look it up."
-#~ msgstr "To nazwa bloku sieciowego, ale nie wiem, pod jaką nazwą szukać."
-
-#~ msgid "I guess it's a domain but I don't know where to look it up."
-#~ msgstr "To nazwa domeny, ale nie wiem, gdzie jej szukać."
+msgstr "Dostępne algorytmy:\n"
diff --git a/tld_serv_list b/tld_serv_list
index 24ea4b6..beddc7f 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -26,9 +26,10 @@
 .org	PIR
 .edu	whois.educause.net
 .gov	whois.nic.gov
-.int	whois.icann.org
+.int	whois.iana.org
 .mil	whois.nic.mil
-.aero	WEB http://www.nic.aero/whois.php
+.aero	whois.information.aero
+.arpa	whois.iana.org
 .biz	whois.nic.biz
 .coop	whois.nic.coop
 .info	whois.afilias.info
@@ -79,7 +80,7 @@
 .by	WEB http://www.tld.by/indexeng.html
 .bz	whois.belizenic.bz
 .ca	whois.cira.ca
-.cc	whois.nic.cc
+.cc	NICCC
 .cd	whois.nic.cd
 .cf	WEB http://www.nic.cf/whois.php3
 .cg	WEB http://www.nic.cg/cgi-bin/whoiscg.pl
@@ -150,7 +151,7 @@
 .im	WEB http://www.nic.im/exist.html
 .in	whois.ncst.ernet.in
 .io	WEB http://www.io.io/whois.html
-#.iq			# NIC?
+#.iq			# see http://nic-iq.nic-naa.net/
 .ir	whois.nic.ir
 .is	whois.isnet.is
 .it	whois.nic.it
@@ -169,7 +170,7 @@
 .kw	WEB http://www.domainname.net.kw
 .ky	WEB http://146.115.157.215/whoisfrontend.asp
 .kz	whois.domain.kz
-.la	whois.nic.la
+#.la	# was whois.nic.la. See lacnic.net too
 .lb	WEB http://www.aub.edu.lb/lbdr/search.html
 .lc	NONE		# http://www.isisworld.lc/domains/
 .li	whois.nic.li
diff --git a/whois.c b/whois.c
index c17f184..3289c98 100644
--- a/whois.c
+++ b/whois.c
@@ -191,6 +191,17 @@ int main(int argc, char *argv[])
 		printf(_("\nFound a referral to %s.\n\n"), server);
 		alarm(60);
 		break;
+	    case 9:
+		if (verb)
+		    puts(_("Connecting to whois.nic.cc."));
+		sockfd = openconn("whois.nic.cc", NULL);
+		server = query_crsnic(sockfd, qstring);
+		close(sockfd);
+		if (!server)
+		    exit(0);
+		printf(_("\nFound a referral to %s.\n\n"), server);
+		alarm(60);
+		break;
 	    case 7:
 		if (verb)
 		    puts(_("Connecting to whois.publicinterestregistry.net."));
@@ -318,19 +329,19 @@ const char *whichwhois(const char *s)
 	    for (i = 0; ip6_assign[i].serv; i++)
 		if (v6net == ip6_assign[i].net)
 		    return ip6_assign[i].serv;
-	    return "\006";			/* unknown allocation */
+	    return "\x06";			/* unknown allocation */
 	} else if (strncasecmp(s, "3ffe:", 5) == 0)
 	    return "whois.6bone.net";
 	/* RPSL hierarchical object like AS8627:fltr-TRANSIT-OUT */
 	else if (strncasecmp(s, "as", 2) == 0 && isasciidigit(s[2]))
 	    return whereas(atoi(s + 2));
 	else
-	    return "\005";
+	    return "\x05";
     }
 
     /* email address */
     if (strchr(s, '@'))
-	return "\005";
+	return "\x05";
 
     /* no dot and no hyphen means it's a NSI NIC handle or ASN (?) */
     if (!strpbrk(s, ".-")) {
@@ -345,7 +356,7 @@ const char *whichwhois(const char *s)
 	if (*s == '!')	/* NSI NIC handle */
 	    return "whois.networksolutions.com";
 	else
-	    return "\005";	/* probably a unknown kind of nic handle */
+	    return "\x05";	/* probably a unknown kind of nic handle */
     }
 
     /* smells like an IP? */
@@ -353,7 +364,7 @@ const char *whichwhois(const char *s)
 	for (i = 0; ip_assign[i].serv; i++)
 	    if ((ip & ip_assign[i].mask) == ip_assign[i].net)
 		return ip_assign[i].serv;
-	return "\005";			/* not in the unicast IPv4 space */
+	return "\x05";			/* not in the unicast IPv4 space */
     }
 
     /* check the TLDs list */
@@ -371,9 +382,9 @@ const char *whichwhois(const char *s)
 	return "";
     }
 
-    /* has dot and maybe a hypen and it's not in tld_serv[], WTF is it? */
+    /* has dot and maybe a hyphen and it's not in tld_serv[], WTF is it? */
     /* either a TLD or a NIC handle we don't know about yet */
-    return "\005";
+    return "\x05";
 }
 
 const char *whereas(const unsigned short asn)
@@ -383,7 +394,7 @@ const char *whereas(const unsigned short asn)
     for (i = 0; as_assign[i].serv; i++)
 	if (asn >= as_assign[i].first && asn <= as_assign[i].last)
 	    return as_assign[i].serv;
-    return "\006";
+    return "\x06";
 }
 
 char *queryformat(const char *server, const char *flags, const char *query)
@@ -420,9 +431,10 @@ char *queryformat(const char *server, const char *flags, const char *query)
     if (!isripe && strcmp(server, "whois.nic.mil") == 0 &&
 	    strncasecmp(query, "AS", 2) == 0 && isasciidigit(query[2]))
 	sprintf(buf, "AS %s", query + 2);	/* fix query for DDN */
-    if (!isripe && strcmp(server, "whois.arin.net") == 0 &&
+    else if (!isripe && (strcmp(server, "whois.arin.net") == 0 ||
+	    strcmp(server, "whois.nic.ad.jp")) &&
 	    strncasecmp(query, "AS", 2) == 0 && isasciidigit(query[2]))
-	sprintf(buf, "A %s", query + 2);	/* always ask for a ASN */
+	sprintf(buf, "AS %s", query + 2);	/* always ask for a ASN */
     else if (!isripe && strcmp(server, "whois.corenic.net") == 0)
 	sprintf(buf, "--machine %s", query);	/* machine readable output */
     else if (!isripe && strcmp(server, "whois.nic.ad.jp") == 0) {
@@ -520,7 +532,8 @@ const char *query_crsnic(const int sock, const char *query)
 	    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'; *q++ = *p++); /*copy data*/
+	    for (q = ret; *p != '\n' && *p != '\r' && *p != ' '; *q++ = *p++)
+		; /*copy data*/
 	    *q = '\0';
 	    state = 2;
 	}