summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco d'Itri <md@linux.it>2006-07-15 19:22:42 +0200
committerMarco d'Itri <md@linux.it>2013-03-30 02:31:34 +0100
commit6077928ad947f17e29dabae38a2edb24f0e319bd (patch)
tree687408916abf8a1e0d7a90ba4663c956e2b900c4
parent27fd0b5493d63d5b26d189275e7c5029f16f92f3 (diff)
downloadwhois-6077928ad947f17e29dabae38a2edb24f0e319bd.tar.gz
Imported Debian version 4.7.14v4.7.14
-rw-r--r--as_del_list3
-rw-r--r--config.h2
-rw-r--r--debian/changelog13
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules11
-rw-r--r--ip6_del_list2
-rw-r--r--ip_del_list1
-rw-r--r--po/Makefile2
-rw-r--r--po/de.po162
-rw-r--r--po/el.po185
-rw-r--r--po/es.po144
-rw-r--r--po/fr.po139
-rw-r--r--po/it.po136
-rw-r--r--po/ja.po71
-rw-r--r--po/no.po144
-rw-r--r--po/pl.po62
-rw-r--r--po/pt_BR.po290
-rw-r--r--po/ru.po70
-rw-r--r--tld_serv_list4
-rw-r--r--whois.c53
-rw-r--r--whois.spec2
21 files changed, 914 insertions, 584 deletions
diff --git a/as_del_list b/as_del_list
index 288e43e..91d5db9 100644
--- a/as_del_list
+++ b/as_del_list
@@ -58,7 +58,8 @@
36864 37887 afrinic
37888 38911 apnic
38912 39935 ripe
+40960 41983 ripe
# catch all: everything else comes from ARIN
-1 39935 arin
+1 40959 arin
diff --git a/config.h b/config.h
index 5984fe0..99a5ea7 100644
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
/* Program version */
/* not for the inetutils version */
-#define VERSION "4.7.13"
+#define VERSION "4.7.14"
/* Configurable features */
diff --git a/debian/changelog b/debian/changelog
index a672105..f4725b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+whois (4.7.14) unstable; urgency=medium
+
+ * Added the .coop, .mobi TLD and e164.arpa servers.
+ * Added new ASN allocations. (Closes: #377953)
+ * Added support for resolution of IDN server hostnames using AI_IDN.
+ * Fixed the parsing of IPv6 server addresses on the command line.
+ * Use the official "nicname" service name instead of "whois".
+ * Added whois.pot to the source package.
+ * Fixed a typo in the german translation. (Closes: #363550)
+ * Do not FTBFS on binNMUs. (Closes: #360741)
+
+ -- Marco d'Itri <md@linux.it> Sat, 15 Jul 2006 19:22:42 +0200
+
whois (4.7.13) unstable; urgency=medium
* Added the .cat, .jobs, and .travel TLD servers.
diff --git a/debian/control b/debian/control
index 4bf4327..9af2bf8 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.6.2.1
+Standards-Version: 3.7.2
Build-Depends: debhelper (>= 4), gettext, libidn11-dev
Package: whois
diff --git a/debian/rules b/debian/rules
index 3a17e7f..4da7def 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,19 +5,20 @@ SHELL+= -e
D := $(shell pwd)/debian/whois
-VERSION := $(shell dpkg-parsechangelog | sed -n '/^Version/s/.* //p')
+VERSION := $(shell dpkg-parsechangelog | sed -n 's/\+.*$$//; /^Version/s/.* //p')
build:
dh_testdir
- make whois mkpasswd \
+ $(MAKE) whois mkpasswd \
OPTS="-O2 -g -DCONFIG_FILE=\\\"/etc/whois.conf\\\"" \
HAVE_LIBIDN=1
+ cd po && $(MAKE) whois.pot
touch $@
clean:
dh_testdir
-rm -f build
- -make distclean
+ -$(MAKE) distclean
dh_clean
binary-arch: checkroot build
@@ -29,7 +30,7 @@ binary-arch: checkroot build
dh_installdirs usr/bin
install whois mkpasswd $D/usr/bin/
- cd po && make install BASEDIR=$D
+ cd po && $(MAKE) install BASEDIR=$D
dh_installman whois.1 mkpasswd.1
dh_installdocs README
dh_installchangelogs
@@ -43,6 +44,8 @@ binary-arch: checkroot build
binary: binary-arch
+binary-indep:
+
checkroot:
test root = "`whoami`"
diff --git a/ip6_del_list b/ip6_del_list
index 6435ddd..c9dad99 100644
--- a/ip6_del_list
+++ b/ip6_del_list
@@ -16,7 +16,7 @@
# contains 2001:3C00::/22, reserved for RIPE but not allocated
2001:2000::/19 ripe
2001:4000::/23 ripe
-2001:4200::/23 arin
+2001:4200::/23 afrinic
2001:4400::/23 apnic
2001:4600::/23 ripe
2001:4800::/23 arin
diff --git a/ip_del_list b/ip_del_list
index 17c5c89..3e96bf4 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -182,6 +182,7 @@
218.36.0.0/14 whois.nic.or.kr
218.40.0.0/13 whois.nic.ad.jp
218.48.0.0/13 whois.nic.or.kr
+219.96.0.0/11 whois.nic.ad.jp
218.144.0.0/12 whois.nic.or.kr
218.160.0.0/12 twnic
218.216.0.0/13 whois.nic.ad.jp
diff --git a/po/Makefile b/po/Makefile
index dd3f6ac..48fd5df 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 ru.mo
+CATALOGS = de.mo el.mo es.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/de.po b/po/de.po
index 6dbf640..e95f8dd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.16\n"
-"POT-Creation-Date: 2003-12-01 18:31+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-15 19:18+0200\n"
"PO-Revision-Date: 2004-06-15 00:08+0100\n"
"Last-Translator: Adrian Bunk <bunk@fs.tum.de>\n"
"Language-Team: \n"
@@ -14,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../whois.c:108
+#: ../whois.c:114
#, c-format
msgid ""
"Version %s.\n"
@@ -25,104 +26,85 @@ msgstr ""
"\n"
"Senden Sie Bugreports an %s.\n"
-#: ../whois.c:151
-#: ../whois.c:240
+#: ../whois.c:164 ../whois.c:257
#, c-format
msgid "Using server %s.\n"
msgstr "Benutze Server %s.\n"
-#: ../whois.c:173
-#, c-format
-msgid "Using default server %s.\n"
-msgstr "Benutze voreingestellten Server %s.\n"
-
-#: ../whois.c:176
+#: ../whois.c:206
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:182
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Diese TLD hat keinen whois-Server."
-#: ../whois.c:186
-msgid "Connecting to whois.crsnic.net."
-msgstr "Verbinde mit whois.crsnic.net."
+#: ../whois.c:217
+msgid "No whois server is known for this kind of object."
+msgstr "Hierfr ist kein Whois-Server bekannt."
-#: ../whois.c:192
-#: ../whois.c:203
-#, c-format
-msgid ""
-"\n"
-"Found a referral to %s.\n"
-"\n"
+#: ../whois.c:220
+msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
-"\n"
-"Verweis auf %s gefunden.\n"
-"\n"
+"Unbekannte AS- oder IP-Netzwerk-Nummer. Bitte upgraden Sie dieses Programm."
-#: ../whois.c:197
-msgid "Connecting to whois.nic.cc."
-msgstr "Verbinde mit whois.nic.cc."
+#: ../whois.c:224
+msgid "Connecting to whois.crsnic.net."
+msgstr "Verbinde mit whois.crsnic.net."
-#: ../whois.c:208
+#: ../whois.c:230
msgid "Connecting to whois.publicinterestregistry.net."
msgstr "Verbinde mit whois.publicinterestregistry.net."
-#: ../whois.c:214
+#: ../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
#, c-format
msgid ""
"\n"
-"Found referral to %s.\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
"\n"
msgstr ""
"\n"
-"Verweis auf %s gefunden.\n"
+"Frage nach dem IPv4 Endpunkt %s einer 6to4 IPv6-Adresse.\n"
"\n"
-#: ../whois.c:218
-msgid "No whois server is known for this kind of object."
-msgstr "Hierfr ist kein Whois-Server bekannt."
-
-#: ../whois.c:221
-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:228
+#: ../whois.c:258
#, c-format
msgid ""
-"\n"
-"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"Query string: \"%s\"\n"
"\n"
msgstr ""
-"\n"
-"Frage nach dem IPv4 Endpunkt %s einer 6to3 IPv6-Adresse.\n"
+"Suche nach: \"%s\"\n"
"\n"
-#: ../whois.c:249
+#: ../whois.c:268
#, c-format
msgid ""
-"Query string: \"%s\"\n"
+"\n"
+"\n"
+"Found a referral to %s.\n"
"\n"
msgstr ""
-"Suche nach: \"%s\"\n"
+"\n"
+"\n"
+"Verweis auf %s gefunden.\n"
"\n"
-#: ../whois.c:302
-#: ../whois.c:305
+#: ../whois.c:311 ../whois.c:314
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Kann diese Zeile nicht parsen: %s"
-#: ../whois.c:446
+#: ../whois.c:451
msgid "Warning: RIPE flags used with a traditional server."
-msgstr "Warnung: RIPE-Flags wurden mit einem \"traditionellen\" Server verwendet."
-
-#: ../whois.c:503
-#, c-format
-msgid "Detected referral to %s on %s.\n"
-msgstr "Verweis auf %s gefunden bei %s.\n"
+msgstr ""
+"Warnung: RIPE-Flags wurden mit einem \"traditionellen\" Server verwendet."
-#: ../whois.c:520
+#: ../whois.c:586
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -130,27 +112,27 @@ msgstr ""
"Schwerer Fehler: Haftungsausschlusstext wurde geaendert.\n"
"Bitte upgraden sie dieses Programm.\n"
-#: ../whois.c:639
+#: ../whois.c:713
#, c-format
msgid "Host %s not found."
msgstr "Host %s nicht gefunden."
-#: ../whois.c:649
+#: ../whois.c:723
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: unbekannter Dienst"
-#: ../whois.c:661
+#: ../whois.c:742
msgid "Timeout."
msgstr "Timeout."
-#: ../whois.c:667
+#: ../whois.c:748
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Erhielt Signal %d, unterbrochen..."
-#: ../whois.c:728
-#, fuzzy
+#: ../whois.c:860
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -158,9 +140,11 @@ msgid ""
"-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"
+"-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"
+"-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"
@@ -170,7 +154,8 @@ msgid ""
"-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"
+"-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"
@@ -203,7 +188,8 @@ msgstr ""
"-s QUELLE[,QUELLE]... suche in der Datenbank von QUELLE\n"
"-T TYP[,TYP]... suche nur nach Objekten vom Typ TYP\n"
"-t TYP fordere Formular fr Typ TYP an (\"all\" fr eine \n"
-" Liste)-v TYP fordere ausfhrliches Formular fr Typ TYP an\n"
+" Liste)-v TYP fordere ausfhrliches "
+"Formular fr Typ TYP an\n"
"-q [version|quellen] frage nach angegebener Server-Information [nur RPSL]\n"
"-d zeige auch DNS-Rckbertragungsobjekte [nur RPSL]\n"
"-K zeige nur Primrschlssel [nur RPSL]\n"
@@ -215,52 +201,53 @@ msgstr ""
msgid "\tstandard 56 bit DES-based crypt(3)"
msgstr "\tStandard 56 Bit DES-basiertes crypt(3)"
-#: ../mkpasswd.c:96
+#: ../mkpasswd.c:103
#, c-format
msgid "Invalid hash type '%s'.\n"
msgstr "Falscher Hash-Typ '%s'.\n"
-#: ../mkpasswd.c:105
+#: ../mkpasswd.c:112
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Falsche Nummer '%s'.\n"
-#: ../mkpasswd.c:123
+#: ../mkpasswd.c:130
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Versuchen Sie '%s --help' fr mehr Informationen.\n"
-#: ../mkpasswd.c:152
+#: ../mkpasswd.c:159
#, c-format
msgid "Wrong salt length: %d byte(s) when %d expected.\n"
msgstr "Falsche Salt-Lnge: %d Byte(s), aber%d wurden erwartet.\n"
-#: ../mkpasswd.c:158
+#: ../mkpasswd.c:165
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Illegaler Salt-Buchstabe '%c'.\n"
-#: ../mkpasswd.c:172
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#, c-format
msgid "Password: "
msgstr "Passwort:"
-#: ../mkpasswd.c:193
+#: ../mkpasswd.c:210
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Illegaler Passwort-Buchstabe '0x%hhx'.\n"
-#: ../mkpasswd.c:230
+#: ../mkpasswd.c:254
+#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
"Crypts the PASSWORD using crypt(3).\n"
"\n"
msgstr ""
-"Aufruf: mkpasswd [OPTIONEN] ... {PASSWORT] [SALT]]\n"
+"Aufruf: mkpasswd [OPTIONEN] ... [PASSWORT] [SALT]]\n"
"Verschluesselt das PASWORT mit crypt(3).\n"
"\n"
-#: ../mkpasswd.c:233
+#: ../mkpasswd.c:257
#, c-format
msgid ""
" -H, --hash=TYPE select hash TYPE\n"
@@ -273,12 +260,27 @@ 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 missing available algorithms are printed.\n"
+"If TYPE is 'help', available algorithms are printed.\n"
"\n"
"Report bugs to %s.\n"
msgstr ""
-#: ../mkpasswd.c:260
+#: ../mkpasswd.c:284
+#, c-format
msgid "Available algorithms:\n"
msgstr "Verfgbare Algorithmen:\n"
+#~ msgid "Using default server %s.\n"
+#~ msgstr "Benutze voreingestellten Server %s.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Found referral to %s.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Verweis auf %s gefunden.\n"
+#~ "\n"
+
+#~ msgid "Detected referral to %s on %s.\n"
+#~ msgstr "Verweis auf %s gefunden bei %s.\n"
diff --git a/po/el.po b/po/el.po
index 7f776a8..4edeee4 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,8 @@
msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.9\n"
-"POT-Creation-Date: 2003-12-01 18:31+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-15 19:18+0200\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"
@@ -13,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../whois.c:108
+#: ../whois.c:114
#, c-format
msgid ""
"Version %s.\n"
@@ -24,104 +25,90 @@ msgstr ""
"\n"
"Αναφέρατε σφάλματα στο %s.\n"
-#: ../whois.c:151
-#: ../whois.c:240
+#: ../whois.c:164 ../whois.c:257
#, c-format
msgid "Using server %s.\n"
msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
-#: ../whois.c:173
-#, c-format
-msgid "Using default server %s.\n"
-msgstr "Χρήση εξ' ορισμού εξυπηρετητή %s.\n"
-
-#: ../whois.c:176
+#: ../whois.c:206
msgid "This TLD has no whois server, but you can access the whois database at"
-msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την βάση whois στο"
+msgstr ""
+"Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την "
+"βάση whois στο"
-#: ../whois.c:182
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois."
-#: ../whois.c:186
-msgid "Connecting to whois.crsnic.net."
-msgstr "Γίνεται σύνδεση στο whois.crsnic.net."
+#: ../whois.c:217
+msgid "No whois server is known for this kind of object."
+msgstr ""
+"Κανένας εξυπηρετητής whois δεν είναι γνωστός για αυτού του είδους το "
+"αντικείμενο."
-#: ../whois.c:192
-#: ../whois.c:203
-#, c-format
-msgid ""
-"\n"
-"Found a referral to %s.\n"
-"\n"
+#: ../whois.c:220
+msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
-"\n"
-"Βρέθηκε αναφορά στο %s.\n"
-"\n"
+"Άγνωστος αριθμός AS ή IP δικτύου. Παρακαλώ αναβαθμίστε αυτό το πρόγραμμα."
-#: ../whois.c:197
-msgid "Connecting to whois.nic.cc."
-msgstr "Γίνεται σύνδεση στο whois.nic.cc."
+#: ../whois.c:224
+msgid "Connecting to whois.crsnic.net."
+msgstr "Γίνεται σύνδεση στο whois.crsnic.net."
-#: ../whois.c:208
+#: ../whois.c:230
msgid "Connecting to whois.publicinterestregistry.net."
msgstr "Γίνεται σύνδεση στο whois.publicinterestregistry.net."
-#: ../whois.c:214
+#: ../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
#, c-format
msgid ""
"\n"
-"Found referral to %s.\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
"\n"
msgstr ""
"\n"
-"Βρέθηκε αναφορά στο %s.\n"
+"Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
"\n"
-#: ../whois.c:218
-msgid "No whois server is known for this kind of object."
-msgstr "Κανένας εξυπηρετητής whois δεν είναι γνωστός για αυτού του είδους το αντικείμενο."
-
-#: ../whois.c:221
-msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Άγνωστος αριθμός AS ή IP δικτύου. Παρακαλώ αναβαθμίστε αυτό το πρόγραμμα."
-
-#: ../whois.c:228
+#: ../whois.c:258
#, c-format
msgid ""
-"\n"
-"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"Query string: \"%s\"\n"
"\n"
msgstr ""
-"\n"
-"Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
+"Αλφαριθμητικό ερώτησης: \"%s\"\n"
"\n"
-#: ../whois.c:249
+#: ../whois.c:268
#, c-format
msgid ""
-"Query string: \"%s\"\n"
+"\n"
+"\n"
+"Found a referral to %s.\n"
"\n"
msgstr ""
-"Αλφαριθμητικό ερώτησης: \"%s\"\n"
+"\n"
+"\n"
+"Βρέθηκε αναφορά στο %s.\n"
"\n"
-#: ../whois.c:302
-#: ../whois.c:305
+#: ../whois.c:311 ../whois.c:314
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Αδύνατη η ανάλυση αυτής της γραμμής: %s"
-#: ../whois.c:446
+#: ../whois.c:451
msgid "Warning: RIPE flags used with a traditional server."
-msgstr "Προειδοποίηση: Η σημαίες του RIPE χρησιμοποιούνται σε έναν παραδοσιακό εξυπηρετητή."
-
-#: ../whois.c:503
-#, c-format
-msgid "Detected referral to %s on %s.\n"
-msgstr "Ανιχνεύθηκε αναφορά του %s στο %s.\n"
+msgstr ""
+"Προειδοποίηση: Η σημαίες του RIPE χρησιμοποιούνται σε έναν παραδοσιακό "
+"εξυπηρετητή."
-#: ../whois.c:520
+#: ../whois.c:586
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -129,26 +116,27 @@ msgstr ""
"Καταστροφικό σφάλμα: το κείμενο της αποποίησης ευθυνών έχει τροποποιηθεί.\n"
"Παρακαλώ αναβαθμίστε το πρόγραμμα.\n"
-#: ../whois.c:639
+#: ../whois.c:713
#, c-format
msgid "Host %s not found."
msgstr "Το σύστημα %s δε βρέθηκε."
-#: ../whois.c:649
+#: ../whois.c:723
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: άγνωστη υπηρεσία"
-#: ../whois.c:661
+#: ../whois.c:742
msgid "Timeout."
msgstr "Διάλειμμα."
-#: ../whois.c:667
+#: ../whois.c:748
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Διακοπή από το σήμα %d..."
-#: ../whois.c:728
+#: ../whois.c:860
+#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -156,9 +144,11 @@ msgid ""
"-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"
+"-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"
+"-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"
@@ -168,7 +158,8 @@ msgid ""
"-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"
+"-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"
@@ -181,24 +172,35 @@ msgid ""
msgstr ""
"Χρήση: whois [ΕΠΙΛΟΓΕΣ]... ΑΝΤΙΚΕΙΜΕΝΟ...\n"
"\n"
-"-l ένα επίπεδο λιγότερο συγκεκριμένη αναζήτηση [μόνο RPSL]\n"
+"-l ένα επίπεδο λιγότερο συγκεκριμένη αναζήτηση [μόνο "
+"RPSL]\n"
"-L εύρεση όλων των Λιγότερο συγκεκριμένων ταιριασμάτων\n"
-"-m εύρεση όλων των πρώτου επιπέδου περισσότερο συγκεκριμένων ταιριασμάτων\n"
+"-m εύρεση όλων των πρώτου επιπέδου περισσότερο "
+"συγκεκριμένων ταιριασμάτων\n"
"-M εύρεση όλων των Περισσότερο συγκεκριμένων ταιριασμάτων\n"
-"-c εύρεση του μικρότερου ταιριάσματος που να περιέχει μια ένα χαρακτηριστικό mnt-irt \n"
+"-c εύρεση του μικρότερου ταιριάσματος που να περιέχει "
+"μια ένα χαρακτηριστικό mnt-irt \n"
"-x ακριβές ταίριασμα [μόνο RPSL]\n"
-"-d επιστροφή και των αντίστροφων αντικειμένων DNS [μόνο RPSL]\n"
-"-i ΧΑΡΑΚ[,ΧΑΡΑΚ]... να γίνει μια αντίστροφη αναζήτηση για τα καθορισμένα ΧΑΡΑΚτηριστικά\n"
+"-d επιστροφή και των αντίστροφων αντικειμένων DNS [μόνο "
+"RPSL]\n"
+"-i ΧΑΡΑΚ[,ΧΑΡΑΚ]... να γίνει μια αντίστροφη αναζήτηση για τα καθορισμένα "
+"ΧΑΡΑΚτηριστικά\n"
"-T ΕΙΔΟΣ[,ΕΊΔΟΣ]... αναζήτηση μόνο αντικειμένου του ΕΙΔΟΥΣ\n"
"-K επιστροφή μόνο των πρωταρχικών κλειδιών [μόνο RPSL]\n"
-"-r απενεργοποίηση των αναδρομικών αναζητήσεων για πληροφορίες επικοινωνίας\n"
-"-R επιβολή εμφάνισης τοπικού αντιγράφου του αντικειμένου επιθήματος ακόμα και αν περιέχει αναφορές\n"
+"-r απενεργοποίηση των αναδρομικών αναζητήσεων για "
+"πληροφορίες επικοινωνίας\n"
+"-R επιβολή εμφάνισης τοπικού αντιγράφου του αντικειμένου "
+"επιθήματος ακόμα και αν περιέχει αναφορές\n"
"-a αναζήτηση σε όλες τις βάσεις δεδομένων\n"
"-s ΠΗΓΗ[,ΠΗΓΉ]... αναζήτηση της βάσης δεδομένων από την ΠΗΓΗ\n"
-"-g ΠΗΓΗ:ΠΡΩΤΟ:ΤΕΛΕΥΤΑΙΟ εμφάνιση αναβαθμίσεων από την ΠΗΓΗ από το σειριακό ΠΡΏΤΟ ως ΤΕΛΕΥΤΑΙΟ\n"
-"-t ΕΙΔΟΣ αναζήτηση προτύπου για το αντικείμενο του ΕΊΔΟΥΣ ('all' για εμφάνιση λίστας)\n"
-"-v ΕΙΔΟΣ αναζήτηση περιφραστικού προτύπου για το αντικείμενο του ΕΙΔΟΥΣ\n"
-"-q [έκδοση|πηγές|τύποι] συγκεκριμένο ερώτημα πληροφοριών εξυπηρετητή [μόνο RPSL]\n"
+"-g ΠΗΓΗ:ΠΡΩΤΟ:ΤΕΛΕΥΤΑΙΟ εμφάνιση αναβαθμίσεων από την ΠΗΓΗ από το σειριακό "
+"ΠΡΏΤΟ ως ΤΕΛΕΥΤΑΙΟ\n"
+"-t ΕΙΔΟΣ αναζήτηση προτύπου για το αντικείμενο του ΕΊΔΟΥΣ "
+"('all' για εμφάνιση λίστας)\n"
+"-v ΕΙΔΟΣ αναζήτηση περιφραστικού προτύπου για το αντικείμενο "
+"του ΕΙΔΟΥΣ\n"
+"-q [έκδοση|πηγές|τύποι] συγκεκριμένο ερώτημα πληροφοριών εξυπηρετητή [μόνο "
+"RPSL]\n"
"-F γρήγορη ακατέργαστη έξοδος (υπονοεί -r)\n"
"-h ΣΥΣΤΗΜΑ σύνδεση στον εξυπηρετητή ΣΎΣΤΗΜΑ\n"
"-p ΘΥΡΑ σύνδεση στη ΘΥΡΑ\n"
@@ -211,42 +213,43 @@ msgstr ""
msgid "\tstandard 56 bit DES-based crypt(3)"
msgstr "\tκαθεριερωμένη 56 bit με βάση το DES crypt(3)"
-#: ../mkpasswd.c:96
+#: ../mkpasswd.c:103
#, c-format
msgid "Invalid hash type '%s'.\n"
msgstr "Άκυρος τύπος hash '%s'.\n"
-#: ../mkpasswd.c:105
+#: ../mkpasswd.c:112
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Μη αποδεκτό νούμερο '%s'.\n"
-#: ../mkpasswd.c:123
+#: ../mkpasswd.c:130
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Προσπάθησε '%s --help' για περισσότερες πληροφορίες.\n"
-#: ../mkpasswd.c:152
+#: ../mkpasswd.c:159
#, c-format
msgid "Wrong salt length: %d byte(s) when %d expected.\n"
msgstr "Εσφαλμένο μήκος salt : %d byte(s) όταν αναμένεται %d .\n"
-#: ../mkpasswd.c:158
+#: ../mkpasswd.c:165
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Μη αποδεκτός χαρακτήρας salt '%c'.\n"
-#: ../mkpasswd.c:172
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#, c-format
msgid "Password: "
msgstr "Συνθηματικό: "
-#: ../mkpasswd.c:193
+#: ../mkpasswd.c:210
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Μη αποδεκτός χαρακτήρας συνθηματικού '0x%hhx'.\n"
-#: ../mkpasswd.c:230
+#: ../mkpasswd.c:254
+#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
"Crypts the PASSWORD using crypt(3).\n"
@@ -256,7 +259,7 @@ msgstr ""
"Κρυπτογραφεί το ΣΥΝΘΗΜΑΤΙΚΟ χρησιμοποιώντας το crypt(3).\n"
"\n"
-#: ../mkpasswd.c:233
+#: ../mkpasswd.c:257
#, c-format
msgid ""
" -H, --hash=TYPE select hash TYPE\n"
@@ -269,13 +272,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 missing available algorithms are printed.\n"
+"If TYPE is 'help', available algorithms are printed.\n"
"\n"
"Report bugs to %s.\n"
msgstr ""
" -H, --hash=ΤΥΠΟΣ επιλογή hash ΤΥΠΟΣ\n"
" -S, --salt=SALT χρήση του συγκεκριμένου SALT\n"
-" -P, --password-fd=NUM ανάγνωση του συνθηματικού από αρχείο περιγραφής NUM\n"
+" -P, --password-fd=NUM ανάγνωση του συνθηματικού από αρχείο περιγραφής "
+"NUM\n"
" αντί από το /dev/tty\n"
" -s, --stdin σαν το --password-fd=0\n"
" -h, --help εμφάνιση αυτής της βοήθειας και έξοδος\n"
@@ -287,7 +291,8 @@ msgstr ""
"\n"
"Αναφέρατε σφάλματα στο %s.\n"
-#: ../mkpasswd.c:260
+#: ../mkpasswd.c:284
+#, c-format
msgid "Available algorithms:\n"
msgstr "Διαθέσιμοι αλγόριθμοι:\n"
diff --git a/po/es.po b/po/es.po
index bc83dde..462a6ad 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: 2003-12-01 18:31+0100\n"
+"POT-Creation-Date: 2006-07-15 19:18+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"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../whois.c:108
+#: ../whois.c:114
#, c-format
msgid ""
"Version %s.\n"
@@ -25,72 +25,46 @@ msgstr ""
"\n"
"Informar de bugs a %s.\n"
-#: ../whois.c:151 ../whois.c:240
+#: ../whois.c:164 ../whois.c:257
#, c-format
msgid "Using server %s.\n"
msgstr "Usando el servidor %s.\n"
-#: ../whois.c:173
-#, c-format
-msgid "Using default server %s.\n"
-msgstr "Usando el servidor predefinido %s.\n"
-
-#: ../whois.c:176
+#: ../whois.c:206
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:182
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "No existe servidor whois para este TLD."
-#: ../whois.c:186
-msgid "Connecting to whois.crsnic.net."
-msgstr "Conectando a whois.crsnic.net."
-
-#: ../whois.c:192 ../whois.c:203
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Found a referral to %s.\n"
-"\n"
+#: ../whois.c:217
+msgid "No whois server is known for this kind of object."
msgstr ""
-"\n"
-"Se ha encontrado en crsnic una referencia a %s.\n"
-"\n"
-#: ../whois.c:197
+#: ../whois.c:220
#, fuzzy
-msgid "Connecting to whois.nic.cc."
+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:208
+#: ../whois.c:230
#, fuzzy
msgid "Connecting to whois.publicinterestregistry.net."
msgstr "Conectando a whois.crsnic.net."
-#: ../whois.c:214
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Found referral to %s.\n"
-"\n"
-msgstr ""
-"\n"
-"Se ha encontrado en crsnic una referencia a %s.\n"
-"\n"
-
-#: ../whois.c:218
-msgid "No whois server is known for this kind of object."
-msgstr ""
-
-#: ../whois.c:221
+#: ../whois.c:236
#, fuzzy
-msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Numero AS desconocido. Por favor, actualice este programa."
+msgid "Connecting to whois.nic.cc."
+msgstr "Conectando a whois.crsnic.net."
-#: ../whois.c:228
+#. XXX should fail if p = 0.0.0.0
+#: ../whois.c:243
#, c-format
msgid ""
"\n"
@@ -98,7 +72,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:249
+#: ../whois.c:258
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -107,23 +81,30 @@ msgstr ""
"Consulta: \"%s\"\n"
"\n"
-#: ../whois.c:302 ../whois.c:305
+#: ../whois.c:268
+#, fuzzy, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"Se ha encontrado en crsnic una referencia a %s.\n"
+"\n"
+
+#: ../whois.c:311 ../whois.c:314
#, c-format
msgid "Cannot parse this line: %s"
msgstr "No puedo procesar esta linea: %s"
-#: ../whois.c:446
+#: ../whois.c:451
#, fuzzy
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Atencion: Los flags RIPE son ignorados por los servidores tradicionales."
-#: ../whois.c:503
-#, c-format
-msgid "Detected referral to %s on %s.\n"
-msgstr "Detectada una referencia a %s en %s.\n"
-
-#: ../whois.c:520
+#: ../whois.c:586
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -131,27 +112,27 @@ msgstr ""
"Error catastrofico: el texto de las condiciones de uso ha sido cambiado.\n"
"Actualize este programa.\n"
-#: ../whois.c:639
+#: ../whois.c:713
#, c-format
msgid "Host %s not found."
msgstr "Host %s no encontrado."
-#: ../whois.c:649
+#: ../whois.c:723
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servicio desconocido"
-#: ../whois.c:661
+#: ../whois.c:742
msgid "Timeout."
msgstr ""
-#: ../whois.c:667
+#: ../whois.c:748
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrumpido por la seal %d..."
-#: ../whois.c:728
-#, fuzzy
+#: ../whois.c:860
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -222,41 +203,43 @@ msgstr ""
msgid "\tstandard 56 bit DES-based crypt(3)"
msgstr "\tcrypt(3) basado en DES de 56 bits"
-#: ../mkpasswd.c:96
+#: ../mkpasswd.c:103
#, c-format
msgid "Invalid hash type '%s'.\n"
msgstr "La funcion de hash '%s' no es valida.\n"
-#: ../mkpasswd.c:105
+#: ../mkpasswd.c:112
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "El numero '%s' no es valido.\n"
-#: ../mkpasswd.c:123
+#: ../mkpasswd.c:130
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "%s --help para mas informacion.\n"
-#: ../mkpasswd.c:152
+#: ../mkpasswd.c:159
#, c-format
msgid "Wrong salt length: %d byte(s) when %d expected.\n"
msgstr "Tamao de semilla incorrecto: %d bytes en lugar de %d.\n"
-#: ../mkpasswd.c:158
+#: ../mkpasswd.c:165
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "El caracter '%c' ilegal en la semilla.\n"
-#: ../mkpasswd.c:172 ../mkpasswd.c:199
+#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#, c-format
msgid "Password: "
msgstr "Clave: "
-#: ../mkpasswd.c:193
+#: ../mkpasswd.c:210
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "El caracter '0x%hhx' es ilegal en la clave.\n"
-#: ../mkpasswd.c:230
+#: ../mkpasswd.c:254
+#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
"Crypts the PASSWORD using crypt(3).\n"
@@ -266,8 +249,8 @@ msgstr ""
"Encripta CLAVE utilizando crypt(3).\n"
"\n"
-#: ../mkpasswd.c:233
-#, c-format
+#: ../mkpasswd.c:257
+#, fuzzy, c-format
msgid ""
" -H, --hash=TYPE select hash TYPE\n"
" -S, --salt=SALT use the specified SALT\n"
@@ -279,7 +262,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 missing available algorithms are printed.\n"
+"If TYPE is 'help', available algorithms are printed.\n"
"\n"
"Report bugs to %s.\n"
msgstr ""
@@ -297,10 +280,27 @@ msgstr ""
"\n"
"Informar de bugs a: %s.\n"
-#: ../mkpasswd.c:260
+#: ../mkpasswd.c:284
+#, c-format
msgid "Available algorithms:\n"
msgstr "Algoritmos disponibles:\n"
+#~ msgid "Using default server %s.\n"
+#~ msgstr "Usando el servidor predefinido %s.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Found referral to %s.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Se ha encontrado en crsnic una referencia a %s.\n"
+#~ "\n"
+
+#~ msgid "Detected referral to %s on %s.\n"
+#~ msgstr "Detectada una referencia a %s en %s.\n"
+
#~ msgid ""
#~ "I don't know where this IP has been delegated.\n"
#~ "I'll try ARIN and hope for the best..."
diff --git a/po/fr.po b/po/fr.po
index dd9d409..98ff6a9 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: 2003-12-01 18:31+0100\n"
+"POT-Creation-Date: 2006-07-15 19:18+0200\n"
"PO-Revision-Date: 2005-02-22 20:06+0100\n"
"Last-Translator: Mohammed Adnne 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:108
+#: ../whois.c:114
#, c-format
msgid ""
"Version %s.\n"
@@ -25,131 +25,114 @@ msgstr ""
"\n"
"Veuillez rapporter les bogues %s.\n"
-#: ../whois.c:151 ../whois.c:240
+#: ../whois.c:164 ../whois.c:257
#, c-format
msgid "Using server %s.\n"
msgstr "Le serveur %s est slectionn.\n"
-#: ../whois.c:173
-#, c-format
-msgid "Using default server %s.\n"
-msgstr "Le serveur par dfaut %s est slectionn.\n"
-
-#: ../whois.c:176
+#: ../whois.c:206
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 accder la base de "
"donnes "
-#: ../whois.c:182
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Ce TLD n'a pas de serveur whois."
-#: ../whois.c:186
+#: ../whois.c:217
+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
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "Numro d'AS ou rseau IP inconnu. Veuillez mettre jour ce programme."
+
+#: ../whois.c:224
msgid "Connecting to whois.crsnic.net."
msgstr "Connexion whois.crsnic.net."
-#: ../whois.c:192 ../whois.c:203
-#, c-format
-msgid ""
-"\n"
-"Found a referral to %s.\n"
-"\n"
-msgstr ""
-"\n"
-"Renvoi trouv vers %s.\n"
-"\n"
+#: ../whois.c:230
+msgid "Connecting to whois.publicinterestregistry.net."
+msgstr "Connexion whois.publicinterestregistry.net."
-#: ../whois.c:197
+#: ../whois.c:236
msgid "Connecting to whois.nic.cc."
msgstr "Connexion whois.nic.cc."
-#: ../whois.c:208
-msgid "Connecting to whois.publicinterestregistry.net."
-msgstr "Connexion whois.publicinterestregistry.net."
-
-#: ../whois.c:214
+#. XXX should fail if p = 0.0.0.0
+#: ../whois.c:243
#, c-format
msgid ""
"\n"
-"Found referral to %s.\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
"\n"
msgstr ""
"\n"
-"Renvoi trouv vers %s.\n"
+"Requte faite pour l'extrmit IPv4 %s d'une adresse IPv6 6to4.\n"
"\n"
-#: ../whois.c:218
-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:221
-msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Numro d'AS ou rseau IP inconnu. Veuillez mettre jour ce programme."
-
-#: ../whois.c:228
+#: ../whois.c:258
#, c-format
msgid ""
-"\n"
-"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"Query string: \"%s\"\n"
"\n"
msgstr ""
-"\n"
-"Requte faite pour l'extrmit IPv4 %s d'une adresse IPv6 6to4.\n"
+"Requte: \"%s\"\n"
"\n"
-#: ../whois.c:249
+#: ../whois.c:268
#, c-format
msgid ""
-"Query string: \"%s\"\n"
+"\n"
+"\n"
+"Found a referral to %s.\n"
"\n"
msgstr ""
-"Requte: \"%s\"\n"
+"\n"
+"\n"
+"Renvoi trouv vers %s.\n"
"\n"
-#: ../whois.c:302 ../whois.c:305
+#: ../whois.c:311 ../whois.c:314
#, c-format
msgid "Cannot parse this line: %s"
-msgstr "Impossible d'interprter la ligne: %s"
+msgstr "Impossible d'interprter la ligne: %s"
-#: ../whois.c:446
+#: ../whois.c:451
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
-"Avertissement: des options RIPE ont t utilises avec un serveur classique."
+"Avertissement: des options RIPE ont t utilises avec un serveur classique."
-#: ../whois.c:503
-#, c-format
-msgid "Detected referral to %s on %s.\n"
-msgstr "Renvoi trouv vers %s depuis %s.\n"
-
-#: ../whois.c:520
+#: ../whois.c:586
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
msgstr ""
-"Erreur catastrophique: le texte de dni de responsabilit a chang.\n"
+"Erreur catastrophique: le texte de dni de responsabilit a chang.\n"
"Veuillez mettre jour ce programme.\n"
-#: ../whois.c:639
+#: ../whois.c:713
#, c-format
msgid "Host %s not found."
msgstr "L'hte %s est introuvable."
-#: ../whois.c:649
+#: ../whois.c:723
#, c-format
msgid "%s/tcp: unknown service"
-msgstr "%s/tcp: service inconnu"
+msgstr "%s/tcp: service inconnu"
-#: ../whois.c:661
+#: ../whois.c:742
msgid "Timeout."
msgstr "Temps limite dpass."
-#: ../whois.c:667
+#: ../whois.c:748
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interruption par le signal %d..."
-#: ../whois.c:728
+#: ../whois.c:860
+#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -229,42 +212,44 @@ msgstr ""
msgid "\tstandard 56 bit DES-based crypt(3)"
msgstr "\tfonction crypt(3) standard, chiffrement DES 56 bits"
-#: ../mkpasswd.c:96
+#: ../mkpasswd.c:103
#, c-format
msgid "Invalid hash type '%s'.\n"
msgstr "Le type de hachage '%s' est invalide.\n"
-#: ../mkpasswd.c:105
+#: ../mkpasswd.c:112
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Le nombre '%s' est invalide.\n"
-#: ../mkpasswd.c:123
+#: ../mkpasswd.c:130
#, 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:152
+#: ../mkpasswd.c:159
#, c-format
msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "Mauvaise taille d'ala: %d octet(s) au lieu de %d.\n"
+msgstr "Mauvaise taille d'ala: %d octet(s) au lieu de %d.\n"
-#: ../mkpasswd.c:158
+#: ../mkpasswd.c:165
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Le caractre '%c' est invalide dans l'ala.\n"
-#: ../mkpasswd.c:172 ../mkpasswd.c:199
+#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#, c-format
msgid "Password: "
-msgstr "Mot de passe: "
+msgstr "Mot de passe: "
-#: ../mkpasswd.c:193
+#: ../mkpasswd.c:210
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Le caractre '0x%hhx' est invalide dans le mot de passe.\n"
-#: ../mkpasswd.c:230
+#: ../mkpasswd.c:254
+#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
"Crypts the PASSWORD using crypt(3).\n"
@@ -274,7 +259,7 @@ msgstr ""
"Chiffre le MOT DE PASSE l'aide de la fonction crypt(3).\n"
"\n"
-#: ../mkpasswd.c:233
+#: ../mkpasswd.c:257
#, c-format
msgid ""
" -H, --hash=TYPE select hash TYPE\n"
@@ -287,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 missing available algorithms are printed.\n"
+"If TYPE is 'help', available algorithms are printed.\n"
"\n"
"Report bugs to %s.\n"
msgstr ""
@@ -306,6 +291,8 @@ msgstr ""
"\n"
"Veuillez rapporter les bogues %s.\n"
-#: ../mkpasswd.c:260
+#: ../mkpasswd.c:284
+#, c-format
msgid "Available algorithms:\n"
-msgstr "Algorithmes disponibles:\n"
+msgstr "Algorithmes disponibles:\n"
+
diff --git a/po/it.po b/po/it.po
index fd37c0d..95d7394 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,20 +1,19 @@
# Traduzione di whois.pot.
-# Copyright (C) 1999-2000 Marco d'Itri
-# Marco d'Itri <md@linux.it>, 2000.
+# Copyright (C) 1999-2006 Marco d'Itri
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.6.21\n"
+"Project-Id-Version: whois 4.7.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-12-01 18:31+0100\n"
-"PO-Revision-Date: 2004-08-25 12:41+0200\n"
+"POT-Creation-Date: 2006-07-15 19:18+0200\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"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../whois.c:108
+#: ../whois.c:114
#, c-format
msgid ""
"Version %s.\n"
@@ -25,103 +24,85 @@ msgstr ""
"\n"
"Segnalare i bug a %s.\n"
-#: ../whois.c:151 ../whois.c:240
+#: ../whois.c:164 ../whois.c:257
#, c-format
msgid "Using server %s.\n"
msgstr "Uso il server %s.\n"
-#: ../whois.c:173
-#, c-format
-msgid "Using default server %s.\n"
-msgstr "Uso il server predefinito %s.\n"
-
-#: ../whois.c:176
+#: ../whois.c:206
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:182
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Per questo TLD non esiste un server whois."
-#: ../whois.c:186
-msgid "Connecting to whois.crsnic.net."
-msgstr "Mi sto connettendo a whois.crsnic.net."
+#: ../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:192 ../whois.c:203
-#, c-format
-msgid ""
-"\n"
-"Found a referral to %s.\n"
-"\n"
+#: ../whois.c:220
+msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
-"\n"
-"Trovato un riferimento a %s.\n"
-"\n"
+"Numero dell'AS o della rete IP sconosciuto. Per favore aggiorna il programma."
-#: ../whois.c:197
-msgid "Connecting to whois.nic.cc."
-msgstr "Mi sto connettendo a whois.nic.cc."
+#: ../whois.c:224
+msgid "Connecting to whois.crsnic.net."
+msgstr "Mi sto connettendo a whois.crsnic.net."
-#: ../whois.c:208
+#: ../whois.c:230
msgid "Connecting to whois.publicinterestregistry.net."
msgstr "Mi sto connettendo a whois.publicinterestregistry.net."
-#: ../whois.c:214
+#: ../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
#, c-format
msgid ""
"\n"
-"Found referral to %s.\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
"\n"
msgstr ""
"\n"
-"Trovato un riferimento a %s.\n"
+"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 6to4.\n"
"\n"
-#: ../whois.c:218
-msgid "No whois server is known for this kind of object."
-msgstr "Non noto alcun server whois per questo tipo di oggetto."
-
-#: ../whois.c:221
-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:228
+#: ../whois.c:258
#, c-format
msgid ""
-"\n"
-"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"Query string: \"%s\"\n"
"\n"
msgstr ""
-"\n"
-"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 6to4.\n"
+"Richiesta: \"%s\"\n"
"\n"
-#: ../whois.c:249
+#: ../whois.c:268
#, c-format
msgid ""
-"Query string: \"%s\"\n"
+"\n"
+"\n"
+"Found a referral to %s.\n"
"\n"
msgstr ""
-"Richiesta: \"%s\"\n"
+"\n"
+"\n"
+"Trovato un riferimento a %s.\n"
"\n"
-#: ../whois.c:302 ../whois.c:305
+#: ../whois.c:311 ../whois.c:314
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Impossibile interpretare questa riga: %s"
-#: ../whois.c:446
+#: ../whois.c:451
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale."
-#: ../whois.c:503
-#, c-format
-msgid "Detected referral to %s on %s.\n"
-msgstr "Trovato un riferimento a %s su %s.\n"
-
-#: ../whois.c:520
+#: ../whois.c:586
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -129,26 +110,27 @@ msgstr ""
"Errore catastrofico: il testo di avvertenze cambiato.\n"
"Aggiorna questo programma.\n"
-#: ../whois.c:639
+#: ../whois.c:713
#, c-format
msgid "Host %s not found."
msgstr "Host %s non trovato."
-#: ../whois.c:649
+#: ../whois.c:723
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servizio sconosciuto"
-#: ../whois.c:661
+#: ../whois.c:742
msgid "Timeout."
msgstr "Tempo scaduto."
-#: ../whois.c:667
+#: ../whois.c:748
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrotto dal segnale %d..."
-#: ../whois.c:728
+#: ../whois.c:860
+#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -220,41 +202,43 @@ msgstr ""
msgid "\tstandard 56 bit DES-based crypt(3)"
msgstr "\tcrypt(3) standard a 56 bit basata su DES"
-#: ../mkpasswd.c:96
+#: ../mkpasswd.c:103
#, c-format
msgid "Invalid hash type '%s'.\n"
msgstr "Il tipo di hash '%s' non valido.\n"
-#: ../mkpasswd.c:105
+#: ../mkpasswd.c:112
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Il numero '%s' non valido.\n"
-#: ../mkpasswd.c:123
+#: ../mkpasswd.c:130
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Per maggior informazioni prova '%s --help'.\n"
-#: ../mkpasswd.c:152
+#: ../mkpasswd.c:159
#, 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
+#: ../mkpasswd.c:165
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Il carattere '%c' non valido in un sale.\n"
-#: ../mkpasswd.c:172 ../mkpasswd.c:199
+#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#, c-format
msgid "Password: "
msgstr "Password: "
-#: ../mkpasswd.c:193
+#: ../mkpasswd.c:210
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Il carattere '0x%hhx' non valido in una password.\n"
-#: ../mkpasswd.c:230
+#: ../mkpasswd.c:254
+#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
"Crypts the PASSWORD using crypt(3).\n"
@@ -264,7 +248,7 @@ msgstr ""
"Cifra la PASSWORD usando crypt(3).\n"
"\n"
-#: ../mkpasswd.c:233
+#: ../mkpasswd.c:257
#, c-format
msgid ""
" -H, --hash=TYPE select hash TYPE\n"
@@ -277,7 +261,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 missing available algorithms are printed.\n"
+"If TYPE is 'help', available algorithms are printed.\n"
"\n"
"Report bugs to %s.\n"
msgstr ""
@@ -289,12 +273,14 @@ msgstr ""
" -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 la PASSWORD non specificata viene chiesta interattivamente.\n"
"Se il SALE non specificato ne viene generato uno casuale.\n"
"Se il TIPO 'help' viene stampata la lista degli algoritmi disponibili.\n"
"\n"
"Segnalare i bug a %s.\n"
-#: ../mkpasswd.c:260
+#: ../mkpasswd.c:284
+#, c-format
msgid "Available algorithms:\n"
msgstr "Algoritmi disponibili:\n"
+
diff --git a/po/ja.po b/po/ja.po
index 24f972b..ecc9a27 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: 2005-04-23 09:49+0900\n"
+"POT-Creation-Date: 2006-07-15 19:18+0200\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:107
+#: ../whois.c:114
#, c-format
msgid ""
"Version %s.\n"
@@ -26,43 +26,43 @@ msgstr ""
"\n"
"バグ報告は %s へ.\n"
-#: ../whois.c:157 ../whois.c:250
+#: ../whois.c:164 ../whois.c:257
#, c-format
msgid "Using server %s.\n"
msgstr "サーバー %s を使用\n"
-#: ../whois.c:200
+#: ../whois.c:206
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
-"この TLD には whois サーバーがありませんが、次のサーバーで whois "
-"データベースにアクセスできます"
+"この TLD には whois サーバーがありませんが、次のサーバーで whois データベース"
+"にアクセスできます"
-#: ../whois.c:208
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "この TLD には whois サーバーがありません"
-#: ../whois.c:211
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "この種のオブジェクトに対する既知の whois サーバーはありません"
-#: ../whois.c:214
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "不明な AS 番号または IP ネットワーク. アップグレードして下さい"
-#: ../whois.c:218
+#: ../whois.c:224
msgid "Connecting to whois.crsnic.net."
msgstr "whois.crsnic.net に接続中"
-#: ../whois.c:224
+#: ../whois.c:230
msgid "Connecting to whois.publicinterestregistry.net."
msgstr "whois.publicinterestregistry.net に接続中"
-#: ../whois.c:230
+#: ../whois.c:236
msgid "Connecting to whois.nic.cc."
msgstr "whois.nic.cc に接続中"
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:237
+#: ../whois.c:243
#, c-format
msgid ""
"\n"
@@ -73,7 +73,7 @@ msgstr ""
"6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:258
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
"問い合わせ文字列: \"%s\"\n"
"\n"
-#: ../whois.c:261
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -95,44 +95,43 @@ msgstr ""
"%s への照会をみつけました\n"
"\n"
-#: ../whois.c:304 ../whois.c:307
+#: ../whois.c:311 ../whois.c:314
#, c-format
msgid "Cannot parse this line: %s"
msgstr "この行を解析できません: %s"
-#: ../whois.c:444
+#: ../whois.c:451
msgid "Warning: RIPE flags used with a traditional server."
msgstr "警告: 旧来のサーバーについて RIPE フラグが使用されています"
-#: ../whois.c:572
+#: ../whois.c:586
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
msgstr ""
-""
"破滅的なエラー: 免責条項テキストが変更されました\n"
"このプログラムをアップグレードして下さい\n"
-#: ../whois.c:698
+#: ../whois.c:713
#, c-format
msgid "Host %s not found."
msgstr "ホスト %s はみつかりませんでした"
-#: ../whois.c:708
+#: ../whois.c:723
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: 不明なサービス"
-#: ../whois.c:727
+#: ../whois.c:742
msgid "Timeout."
msgstr "時間切れ"
-#: ../whois.c:733
+#: ../whois.c:748
#, c-format
msgid "Interrupted by signal %d..."
msgstr "シグナル %d が割込み..."
-#: ../whois.c:820
+#: ../whois.c:860
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -186,7 +185,8 @@ msgstr ""
"-a すべてのデータベースを検索\n"
"-s SOURCE[,SOURCE]... SOURCE からデータベースを検索\n"
"-g SOURCE:FIRST-LAST SOURCE (シリアル FIRST から LAST まで)から更新を検索\n"
-"-t TYPE TYPE オブジェクトについてテンプレートを要求 (リストは 'all')\n"
+"-t TYPE TYPE オブジェクトについてテンプレートを要求 (リストは "
+"'all')\n"
"-v TYPE TYPE オブジェクトについて冗長なテンプレートを要求\n"
"-q [version|sources|types] 指定サーバー情報を問い合わせ [RPSL のみ]\n"
"-F 高速直接(ロー)出力 (-r を暗示)\n"
@@ -197,47 +197,46 @@ msgstr ""
" --help このヘルプを表示して終了\n"
" --version バージョン情報を表示して終了\n"
-
#: ../mkpasswd.c:55
msgid "\tstandard 56 bit DES-based crypt(3)"
msgstr "\t標準 56 ビット DES ベース暗号(3)"
-#: ../mkpasswd.c:97
+#: ../mkpasswd.c:103
#, c-format
msgid "Invalid hash type '%s'.\n"
msgstr "不正なハッシュタイプ '%s'\n"
-#: ../mkpasswd.c:106
+#: ../mkpasswd.c:112
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "不正な数字 '%s'\n"
-#: ../mkpasswd.c:124
+#: ../mkpasswd.c:130
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "さらなる詳細については '%s --help' を実行\n"
-#: ../mkpasswd.c:153
+#: ../mkpasswd.c:159
#, c-format
msgid "Wrong salt length: %d byte(s) when %d expected.\n"
msgstr "間違ったソルト長: %d バイト(s) (%d を期待)\n"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:165
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "不正なソルト文字 '%c'\n"
-#: ../mkpasswd.c:173 ../mkpasswd.c:200
+#: ../mkpasswd.c:189 ../mkpasswd.c:216
#, c-format
msgid "Password: "
msgstr "パスワード: "
-#: ../mkpasswd.c:194
+#: ../mkpasswd.c:210
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "不正なパスワード文字 '0x%hhx'\n"
-#: ../mkpasswd.c:231
+#: ../mkpasswd.c:254
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -248,7 +247,7 @@ msgstr ""
"PASSWORD を crypt(3) で暗号化\n"
"\n"
-#: ../mkpasswd.c:234
+#: ../mkpasswd.c:257
#, c-format
msgid ""
" -H, --hash=TYPE select hash TYPE\n"
@@ -279,7 +278,7 @@ msgstr ""
"\n"
"バグ報告は %s へ.\n"
-#: ../mkpasswd.c:261
+#: ../mkpasswd.c:284
#, c-format
msgid "Available algorithms:\n"
msgstr "利用可能なアルゴリズム:\n"
diff --git a/po/no.po b/po/no.po
index 8c53855..a2aac1f 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: 2003-12-01 18:31+0100\n"
+"POT-Creation-Date: 2006-07-15 19:18+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"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../whois.c:108
+#: ../whois.c:114
#, c-format
msgid ""
"Version %s.\n"
@@ -23,71 +23,45 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
-#: ../whois.c:151 ../whois.c:240
+#: ../whois.c:164 ../whois.c:257
#, c-format
msgid "Using server %s.\n"
msgstr "Bruker tjener %s.\n"
-#: ../whois.c:173
-#, c-format
-msgid "Using default server %s.\n"
-msgstr "Bruker standardtjener %s.\n"
-
-#: ../whois.c:176
+#: ../whois.c:206
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
-#: ../whois.c:182
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr ""
-#: ../whois.c:186
-#, fuzzy
-msgid "Connecting to whois.crsnic.net."
-msgstr "Kobler opp mot whois.internic.net."
-
-#: ../whois.c:192 ../whois.c:203
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Found a referral to %s.\n"
-"\n"
+#: ../whois.c:217
+msgid "No whois server is known for this kind of object."
msgstr ""
-"\n"
-"Fant InterNIC-referanse til %s.\n"
-"\n"
-#: ../whois.c:197
+#: ../whois.c:220
#, fuzzy
-msgid "Connecting to whois.nic.cc."
+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:208
+#: ../whois.c:230
#, fuzzy
msgid "Connecting to whois.publicinterestregistry.net."
msgstr "Kobler opp mot whois.internic.net."
-#: ../whois.c:214
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Found referral to %s.\n"
-"\n"
-msgstr ""
-"\n"
-"Fant InterNIC-referanse til %s.\n"
-"\n"
-
-#: ../whois.c:218
-msgid "No whois server is known for this kind of object."
-msgstr ""
-
-#: ../whois.c:221
+#: ../whois.c:236
#, fuzzy
-msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
+msgid "Connecting to whois.nic.cc."
+msgstr "Kobler opp mot whois.internic.net."
-#: ../whois.c:228
+#. XXX should fail if p = 0.0.0.0
+#: ../whois.c:243
#, c-format
msgid ""
"\n"
@@ -95,7 +69,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:249
+#: ../whois.c:258
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -104,22 +78,29 @@ msgstr ""
"Foresprsel: \"%s\"\n"
"\n"
-#: ../whois.c:302 ../whois.c:305
+#: ../whois.c:268
+#, fuzzy, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"Fant InterNIC-referanse til %s.\n"
+"\n"
+
+#: ../whois.c:311 ../whois.c:314
#, c-format
msgid "Cannot parse this line: %s"
msgstr ""
-#: ../whois.c:446
+#: ../whois.c:451
#, fuzzy
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
-#: ../whois.c:503
-#, c-format
-msgid "Detected referral to %s on %s.\n"
-msgstr "Referanse til %s vedrrende %s.\n"
-
-#: ../whois.c:520
+#: ../whois.c:586
#, fuzzy
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
@@ -128,27 +109,27 @@ msgstr ""
"Alvorlig feil: INTERNIC har endret standardtekst.\n"
"Vennligst oppdater programmet.\n"
-#: ../whois.c:639
+#: ../whois.c:713
#, c-format
msgid "Host %s not found."
msgstr "Finner ikke verten %s."
-#: ../whois.c:649
+#: ../whois.c:723
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: ukjent port"
-#: ../whois.c:661
+#: ../whois.c:742
msgid "Timeout."
msgstr ""
-#: ../whois.c:667
+#: ../whois.c:748
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Avbrudt av signal %d..."
-#: ../whois.c:728
-#, fuzzy
+#: ../whois.c:860
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -210,48 +191,50 @@ msgstr ""
msgid "\tstandard 56 bit DES-based crypt(3)"
msgstr ""
-#: ../mkpasswd.c:96
+#: ../mkpasswd.c:103
#, c-format
msgid "Invalid hash type '%s'.\n"
msgstr ""
-#: ../mkpasswd.c:105
+#: ../mkpasswd.c:112
#, c-format
msgid "Invalid number '%s'.\n"
msgstr ""
-#: ../mkpasswd.c:123
+#: ../mkpasswd.c:130
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr ""
-#: ../mkpasswd.c:152
+#: ../mkpasswd.c:159
#, c-format
msgid "Wrong salt length: %d byte(s) when %d expected.\n"
msgstr ""
-#: ../mkpasswd.c:158
+#: ../mkpasswd.c:165
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr ""
-#: ../mkpasswd.c:172 ../mkpasswd.c:199
+#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#, c-format
msgid "Password: "
msgstr ""
-#: ../mkpasswd.c:193
+#: ../mkpasswd.c:210
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr ""
-#: ../mkpasswd.c:230
+#: ../mkpasswd.c:254
+#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
"Crypts the PASSWORD using crypt(3).\n"
"\n"
msgstr ""
-#: ../mkpasswd.c:233
+#: ../mkpasswd.c:257
#, c-format
msgid ""
" -H, --hash=TYPE select hash TYPE\n"
@@ -264,15 +247,32 @@ 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 missing available algorithms are printed.\n"
+"If TYPE is 'help', available algorithms are printed.\n"
"\n"
"Report bugs to %s.\n"
msgstr ""
-#: ../mkpasswd.c:260
+#: ../mkpasswd.c:284
+#, c-format
msgid "Available algorithms:\n"
msgstr ""
+#~ msgid "Using default server %s.\n"
+#~ msgstr "Bruker standardtjener %s.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Found referral to %s.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fant InterNIC-referanse til %s.\n"
+#~ "\n"
+
+#~ msgid "Detected referral to %s on %s.\n"
+#~ msgstr "Referanse til %s vedrrende %s.\n"
+
#~ msgid ""
#~ "I don't know where this IP has been delegated.\n"
#~ "I'll try ARIN and hope for the best..."
diff --git a/po/pl.po b/po/pl.po
index 199aebd..df1de8c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.24\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-11-28 15:03+0100\n"
+"POT-Creation-Date: 2006-07-15 19:18+0200\n"
"PO-Revision-Date: 2004-11-28 15:09+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../whois.c:107
+#: ../whois.c:114
#, c-format
msgid ""
"Version %s.\n"
@@ -26,42 +26,42 @@ msgstr ""
"\n"
"Bdy prosz zgasza na adres %s.\n"
-#: ../whois.c:157 ../whois.c:250
+#: ../whois.c:164 ../whois.c:257
#, c-format
msgid "Using server %s.\n"
msgstr "Uycie serwera %s.\n"
-#: ../whois.c:200
+#: ../whois.c:206
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Ta gwna domena nie ma serwera whois, ale mona uy bazy danych whois pod"
-#: ../whois.c:208
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Ta gwna domena nie ma serwera whois."
-#: ../whois.c:211
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Dla tego rodzaju obiektu nie jest znany aden serwer whois."
-#: ../whois.c:214
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Nieznany numer AS lub sie IP. Prosz uaktualni ten program."
-#: ../whois.c:218
+#: ../whois.c:224
msgid "Connecting to whois.crsnic.net."
msgstr "czenie z whois.crsnic.net."
-#: ../whois.c:224
+#: ../whois.c:230
msgid "Connecting to whois.publicinterestregistry.net."
msgstr "czenie z whois.publicinterestregistry.net."
-#: ../whois.c:230
+#: ../whois.c:236
msgid "Connecting to whois.nic.cc."
msgstr "czenie z whois.nic.cc."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:237
+#: ../whois.c:243
#, c-format
msgid ""
"\n"
@@ -72,7 +72,7 @@ msgstr ""
"Pytanie o zakoczenie IPv4 %s adresu IPv6 typu 6to4.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:258
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +81,7 @@ msgstr ""
"Zapytanie: \"%s\"\n"
"\n"
-#: ../whois.c:261
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -94,16 +94,16 @@ msgstr ""
"Znaleziono odniesienie do %s.\n"
"\n"
-#: ../whois.c:304 ../whois.c:307
+#: ../whois.c:311 ../whois.c:314
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Nie mona przeanalizowa tej linii: %s"
-#: ../whois.c:454
+#: ../whois.c:451
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Uwaga: uyto flag RIPE ze starszym serwerem."
-#: ../whois.c:578
+#: ../whois.c:586
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,26 +111,26 @@ msgstr ""
"Katastrofa! Tekst owiadczenia zosta zmieniony.\n"
"Prosz uaktualni ten program.\n"
-#: ../whois.c:704
+#: ../whois.c:713
#, c-format
msgid "Host %s not found."
msgstr "Serwer %s nie zosta znaleziony."
-#: ../whois.c:714
+#: ../whois.c:723
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: usuga nieznana"
-#: ../whois.c:733
+#: ../whois.c:742
msgid "Timeout."
msgstr "Upyn limit czasu."
-#: ../whois.c:739
+#: ../whois.c:748
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Przerwano sygnaem %d..."
-#: ../whois.c:826
+#: ../whois.c:860
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -208,43 +208,43 @@ msgstr ""
msgid "\tstandard 56 bit DES-based crypt(3)"
msgstr "\tstandardowa 56-bitowa, oparta o DES funkcja crypt(3)"
-#: ../mkpasswd.c:97
+#: ../mkpasswd.c:103
#, c-format
msgid "Invalid hash type '%s'.\n"
msgstr "Nieprawidowy rodzaj skrtu '%s'.\n"
-#: ../mkpasswd.c:106
+#: ../mkpasswd.c:112
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Nieprawidowa liczba '%s'.\n"
-#: ../mkpasswd.c:124
+#: ../mkpasswd.c:130
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "'%s --help' poda wicej informacji.\n"
# : ../mkpasswd.c:152
-#: ../mkpasswd.c:153
+#: ../mkpasswd.c:159
#, c-format
msgid "Wrong salt length: %d byte(s) when %d expected.\n"
msgstr "Bdna dugo zarodka: %d bajtw kiedy oczekiwano %d.\n"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:165
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Bdny znak zarodka '%c'.\n"
-#: ../mkpasswd.c:173 ../mkpasswd.c:200
+#: ../mkpasswd.c:189 ../mkpasswd.c:216
#, c-format
msgid "Password: "
msgstr "Haso: "
-#: ../mkpasswd.c:194
+#: ../mkpasswd.c:210
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Bdny znak w hale '0x%hhx'.\n"
-#: ../mkpasswd.c:231
+#: ../mkpasswd.c:254
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -255,7 +255,7 @@ msgstr ""
"Koduje HASO przy uyciu funkcji crypt(3).\n"
"\n"
-#: ../mkpasswd.c:234
+#: ../mkpasswd.c:257
#, c-format
msgid ""
" -H, --hash=TYPE select hash TYPE\n"
@@ -287,7 +287,7 @@ msgstr ""
"\n"
"Bdy prosz zgasza na adres %s.\n"
-#: ../mkpasswd.c:261
+#: ../mkpasswd.c:284
#, c-format
msgid "Available algorithms:\n"
msgstr "Dostpne algorytmy:\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
new file mode 100644
index 0000000..814e248
--- /dev/null
+++ b/po/pt_BR.po
@@ -0,0 +1,290 @@
+# Portuguese/Brazil translation of whois.
+# 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"
+"PO-Revision-Date: 2006-04-26 21:03-0300\n"
+"Last-Translator: Anderson Goulart <globalx@gmail.com>\n"
+"Language-Team: Portuguese/Brazil\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../whois.c:114
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"Verso %s \n"
+"\n"
+"Reporte bugs para %s \n"
+
+#: ../whois.c:164 ../whois.c:257
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Utilizando servidor %s.\n"
+
+#: ../whois.c:206
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr ""
+"Este TLD no tem servidor whois, mas voc pode acessar a base de dados do "
+"whois em"
+
+#: ../whois.c:214
+msgid "This TLD has no whois server."
+msgstr "No existe servidor whois para este TLD."
+
+#: ../whois.c:217
+msgid "No whois server is known for this kind of object."
+msgstr "Nenhum servidor whois conhecido para este tipo de objeto."
+
+#: ../whois.c:220
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "Nmero 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
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Procurando pela extremidade IPv4 %s de um endereo IPv6. 6to4.\n"
+"\n"
+
+#: ../whois.c:258
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"Consulta: \"%s\"\n"
+"\n"
+
+#: ../whois.c:268
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"Uma referncia para%s encontrada.\n"
+"\n"
+
+#: ../whois.c:311 ../whois.c:314
+#, c-format
+msgid "Cannot parse this line: %s"
+msgstr "No pde processar esta linha: %s"
+
+#: ../whois.c:451
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "Aviso: RIPE flags utilizados com um servidor tradicional."
+
+#: ../whois.c:586
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"Erro catastrfico: o texto das condies de uso foi alterado.\n"
+"Por favor, atualize este programa. \n"
+
+#: ../whois.c:713
+#, c-format
+msgid "Host %s not found."
+msgstr "Host %s no encontrado."
+
+#: ../whois.c:723
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp: servio desconhecido"
+
+#: ../whois.c:742
+msgid "Timeout."
+msgstr "Tempo esgotado."
+
+#: ../whois.c:748
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "Interrompido pelo sinal %d..."
+
+#: ../whois.c:860
+#, 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 ""
+"Uso: whois [OPES]... OBJETO...\n"
+"\n"
+"-l descende em um nvel a especificidade da busca "
+"[RPSL]\n"
+"-L busca as correspondncias menos especficas\n"
+"-m busca o primeiro nvel mais especfico\n"
+"-M busca as correspondncias mais especficas\n"
+"-c busca a correspondncia menos especfica que contm o "
+"atributo mnt-irt\n"
+"-x busca exata [RPSL]\n"
+"-d retorna tambm objetos de delegao de DNS reverso "
+"[RPSL]\n"
+"-i ATTR[,ATTR]... efetua uma busca inversa para os ATTRibutos "
+"especificados\n"
+"-T TIPO[,TIPO]... busca somente por objetos do TIPO\n"
+"-K somente chaves primrias so retornadas [RPSL]\n"
+"-r desabilita buscas recursivas para informaes de "
+"contatos\n"
+"-R mostra a cpia local do objeto especificado incluso\n"
+" se contm uma referncia\n"
+"-a busca em todas as bases de dados\n"
+"-s SOURCE[,SOURCE]... busca na base de dados de SOURCE\n"
+"-g SOURCE:FIRST-LAST encontra atualizaes de SOURCE da srie FIRST at "
+"LAST\n"
+"-t TIPO obtm o modelo para objeto de TIPO ('all' para uma "
+"lista)\n"
+"-v TIPO obtm o modelo detalhado para objeto de TIPO\n"
+"-q [version|sources|types] consulta informaes sobre o servidor [RPSL]\n"
+"-F modo rpido (implica -r)\n"
+"-h HOST conecta no servidor HOST\n"
+"-p PORTA conecta na PORTA\n"
+"-H esconde o aviso legal\n"
+" --verbose mostra o que est acontecendo\n"
+" --help exibe essa ajuda e sai\n"
+" --version exibe informaes sobre a verso e sai\n"
+
+#: ../mkpasswd.c:55
+msgid "\tstandard 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 invlido '%s'.\n"
+
+#: ../mkpasswd.c:112
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "Nmero invlido '%s'.\n"
+
+#: ../mkpasswd.c:130
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Tente '%s --help para maiores informaes.\n"
+
+#: ../mkpasswd.c:159
+#, 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
+#, c-format
+msgid "Illegal salt character '%c'.\n"
+msgstr "Caractere salt ilegal '%c'.\n"
+
+#: ../mkpasswd.c:189 ../mkpasswd.c:216
+#, c-format
+msgid "Password: "
+msgstr "Senha: "
+
+#: ../mkpasswd.c:210
+#, c-format
+msgid "Illegal password character '0x%hhx'.\n"
+msgstr "Caractere de senha ilegal '0x%hhx'.\n"
+
+#: ../mkpasswd.c:254
+#, c-format
+msgid ""
+"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Crypts the PASSWORD using crypt(3).\n"
+"\n"
+msgstr ""
+"Uso: mkpasswd [OPES]... [PASSWORD [SALT]]\n"
+"Encripta a PASSWORD utilizando crypt(3).\n"
+"\n"
+
+#: ../mkpasswd.c:257
+#, 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 'help', available algorithms are printed.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+" -H, --hash=TYPE seleciona o hash TYPE\n"
+" -S, --salt=SALT usa o SALT especfico\n"
+" -P, --password-fd=NUM l a senha do descritor de arquivo NUM\n"
+" ao invs do /dev/tty\n"
+" -s, --stdin como em --password-fd=0\n"
+" -h, --help exibe essa ajuda e sai\n"
+" -V, --version exibe informaes sobre a verso e sai\n"
+"\n"
+"Se PASSWORD estiver faltando, ento este ser requisitado interativamente.\n"
+"Se nenhum SALT for especificado, um randmico gerado.\n"
+"Se TYPE igual a 'help', os algoritmos disponveis so exibidos.\n"
+"\n"
+"Reporte bugs para %s.\n"
+
+#: ../mkpasswd.c:284
+#, c-format
+msgid "Available algorithms:\n"
+msgstr "Algoritmos disponveis: \n"
diff --git a/po/ru.po b/po/ru.po
index 402da69..26b6993 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: 2005-11-29 14:05+0200\n"
+"POT-Creation-Date: 2006-07-15 19:18+0200\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:107
+#: ../whois.c:114
#, c-format
msgid ""
"Version %s.\n"
@@ -27,41 +27,42 @@ msgstr ""
"\n"
"Замечания отправляйте на %s.\n"
-#: ../whois.c:157 ../whois.c:250
+#: ../whois.c:164 ../whois.c:257
#, c-format
msgid "Using server %s.\n"
msgstr "Используется сервер %s.\n"
-#: ../whois.c:200
+#: ../whois.c:206
msgid "This TLD has no whois server, but you can access the whois database at"
-msgstr "Этот ДВУ не имеет whois-сервера, но можно получить доступ к базе whois на"
+msgstr ""
+"Этот ДВУ не имеет whois-сервера, но можно получить доступ к базе whois на"
-#: ../whois.c:208
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Этот ДВУ не имеет whois-сервера."
-#: ../whois.c:211
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Нет whois-сервера для объектов данного вида."
-#: ../whois.c:214
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Неизвестный номер AS или IP-сети. Пожалуйста, обновите программу."
-#: ../whois.c:218
+#: ../whois.c:224
msgid "Connecting to whois.crsnic.net."
msgstr "Соединение с whois.crsnic.net."
-#: ../whois.c:224
+#: ../whois.c:230
msgid "Connecting to whois.publicinterestregistry.net."
msgstr "Соединение с whois.publicinterestregistry.net."
-#: ../whois.c:230
+#: ../whois.c:236
msgid "Connecting to whois.nic.cc."
msgstr "Соединение с whois.nic.cc."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:237
+#: ../whois.c:243
#, c-format
msgid ""
"\n"
@@ -72,7 +73,7 @@ msgstr ""
"Запрашивается конечная IPv4-точка %s для IPv6-адреса 6-в-4.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:258
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +82,7 @@ msgstr ""
"Строка запроса: \"%s\"\n"
"\n"
-#: ../whois.c:261
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -94,16 +95,16 @@ msgstr ""
"Найдено перенаправление на %s.\n"
"\n"
-#: ../whois.c:304 ../whois.c:307
+#: ../whois.c:311 ../whois.c:314
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Невозможно разобрать строку: %s"
-#: ../whois.c:444
+#: ../whois.c:451
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Предупреждение: флаги RIPE используются с традиционным сервером."
-#: ../whois.c:572
+#: ../whois.c:586
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,26 +112,26 @@ msgstr ""
"Катастрофическая ошибка: текст отказа был изменён.\n"
"Пожалуйста, обновите программу.\n"
-#: ../whois.c:698
+#: ../whois.c:713
#, c-format
msgid "Host %s not found."
msgstr "Узел %s не найден."
-#: ../whois.c:708
+#: ../whois.c:723
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: неизвестный сервис"
-#: ../whois.c:727
+#: ../whois.c:742
msgid "Timeout."
msgstr "Задержка."
-#: ../whois.c:733
+#: ../whois.c:748
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Прервано по сигналу %d..."
-#: ../whois.c:820
+#: ../whois.c:860
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -169,23 +170,30 @@ msgstr ""
"\n"
"-l одноуровневый минимальный поиск [только RPSL]\n"
"-L найти всё при минимуме указанных совпадений\n"
-"-m найти первый уровень при максимуме указанных совпадений\n"
+"-m найти первый уровень при максимуме указанных "
+"совпадений\n"
"-M найти всё при максимуме указанных совпадений\n"
-"-c найти наименьшее совпадение, содержащее атрибут mnt-irt\n"
+"-c найти наименьшее совпадение, содержащее атрибут mnt-"
+"irt\n"
"-x точное совпадение [только RPSL]\n"
-"-d возвращать также реверсные делегированные объекты DNS [только RPSL]\n"
+"-d возвращать также реверсные делегированные объекты DNS "
+"[только RPSL]\n"
"-i АТР[,АТР]... выполнить инверсный поиск для указанных АТРибутов\n"
"-T ТИП[,ТИП]... поиск только объектов с типом ТИП\n"
"-K возвращать только основные ключи [только RPSL]\n"
"-r выключить рекурсивный просмотр контактной информации\n"
-"-R всегда показывать локальную копию объекта домена даже\n"
+"-R всегда показывать локальную копию объекта домена "
+"даже\n"
" если она содержит перенаправление\n"
"-a искать во всех базах\n"
"-s ИСТОЧНИК[,ИСТОЧНИК]... искать в базе ИСТОЧНИКА\n"
-"-g ИСТОЧНИК:ПЕРВЫЙ-ПОСЛЕДНИЙ найти обновления ИСТОЧНИКА от ПЕРВОГО до ПОСЛЕДНЕГО\n"
-"-t ТИП запросить шаблон для объекта с типом ТИП ('all' для списка)\n"
+"-g ИСТОЧНИК:ПЕРВЫЙ-ПОСЛЕДНИЙ найти обновления ИСТОЧНИКА от ПЕРВОГО до "
+"ПОСЛЕДНЕГО\n"
+"-t ТИП запросить шаблон для объекта с типом ТИП ('all' для "
+"списка)\n"
"-v ТИП запросить расширенный шаблон для объекта с типом ТИП\n"
-"-q [version|sources|types] запросить указанную информацию о сервере [только RPSL]\n"
+"-q [version|sources|types] запросить указанную информацию о сервере [только "
+"RPSL]\n"
"-F быстрый сырой вывод (включает также -r)\n"
"-h УЗЕЛ присоединиться к УЗЛУ\n"
"-p ПОРТ присоединиться к ПОРТУ\n"
@@ -263,7 +271,8 @@ msgid ""
msgstr ""
" -H, --hash=ТИП выбрать ТИП хэша\n"
" -S, --salt=SALT использовать указанный SALT\n"
-" -P, --password-fd=НОМЕР прочитать пароль из дескриптора файла с номером НОМЕР\n"
+" -P, --password-fd=НОМЕР прочитать пароль из дескриптора файла с "
+"номером НОМЕР\n"
" вместо /dev/tty\n"
" -s, --stdin аналогично --password-fd=0\n"
" -h, --help отобразить эту помощь и выйти\n"
@@ -279,4 +288,3 @@ msgstr ""
#, c-format
msgid "Available algorithms:\n"
msgstr "Доступные алгоритмы:\n"
-
diff --git a/tld_serv_list b/tld_serv_list
index 378d148..76a7367 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -30,13 +30,14 @@
.int whois.iana.org
.mil whois.nic.mil
.aero whois.information.aero
+e164.arpa whois.ripe.net
.arpa whois.iana.org
.biz whois.nic.biz
.cat whois.cat
.coop whois.nic.coop
.info whois.afilias.info
.jobs whois.jobs
-.mobi NONE
+.mobi WEB http://pc.mtld.mobi/whois/
.museum whois.museum
.name whois.nic.name
.pro whois.registrypro.pro
@@ -321,6 +322,7 @@
-ti whois.telstra.net
-tw whois.twnic.net
-6bone whois.6bone.net
+-coop whois.nic.coop
-cknic whois.nic.ck
-idnic whois.idnic.net.id
-itnic whois.nic.it
diff --git a/whois.c b/whois.c
index d69d1cd..73c1485 100644
--- a/whois.c
+++ b/whois.c
@@ -5,6 +5,9 @@
* published by the Free Software Foundation.
*/
+/* for AI_IDN */
+#define _GNU_SOURCE
+
/* System library */
#include <stdio.h>
#include <stdlib.h>
@@ -29,6 +32,10 @@
#include <idna.h>
#endif
+#ifndef AI_IDN
+#define AI_IDN 0
+#endif
+
/* Application-specific */
#include "data.h"
#include "whois.h"
@@ -165,7 +172,6 @@ int main(int argc, char *argv[])
free(qstring);
qstring = tmp;
server = whichwhois(qstring);
-
}
handle_query(server, port, qstring, fstring);
@@ -180,7 +186,7 @@ int main(int argc, char *argv[])
const char *handle_query(const char *hserver, const char *hport,
const char *qstring, const char *fstring)
{
- const char *server, *port = NULL;
+ const char *server = NULL, *port = NULL;
char *p;
if (hport) {
@@ -236,6 +242,7 @@ const char *handle_query(const char *hserver, const char *hport,
/* XXX should fail if p = 0.0.0.0 */
printf(_("\nQuerying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n\n"), p);
server = whichwhois(p);
+ /* XXX should fail if server[0] < ' ' */
qstring = p; /* XXX leak */
break;
default:
@@ -686,9 +693,10 @@ int openconn(const char *server, const char *port)
memset(&hints, 0, sizeof(struct addrinfo));
hints.ai_family = AF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
+ hints.ai_flags = AI_IDN;
- if ((err = getaddrinfo(server, port ? port : "whois", &hints, &res)) != 0)
- err_quit("getaddrinfo: %s", gai_strerror(err));
+ if ((err = getaddrinfo(server, port ? port : "nicname", &hints, &res)) != 0)
+ err_quit("getaddrinfo(%s): %s", server, gai_strerror(err));
for (ai = res; ai; ai = ai->ai_next) {
if ((fd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol)) < 0)
continue; /* ignore */
@@ -780,14 +788,39 @@ char *normalize_domain(const char *dom)
/* server and port have to be freed by the caller */
void split_server_port(const char *const input,
const char **server, const char **port) {
- char *q, *p;
+ char *p;
- *server = q = strdup(input);
+ if (*input == '[' && (p = strchr(input, ']'))) { /* IPv6 */
+ char *s;
+ int len = p - input - 1;
+
+ *server = s = malloc(len + 1);
+ memcpy(s, input + 1, len);
+ *(s + len) = '\0';
+
+ p = strchr(p, ':');
+ if (p && *(p + 1) != '\0')
+ *port = strdup(p + 1); /* IPv6 + port */
+ } else if ((p = strchr(input, ':')) && /* IPv6, no port */
+ strchr(p, ':')) { /* and no brackets */
+ *server = strdup(input);
+ } else if ((p = strchr(input, ':'))) { /* IPv4 + port */
+ char *s;
+ int len = p - input;
+
+ *server = s = malloc(len + 1);
+ memcpy(s, input, len);
+ *(s + len) = '\0';
+
+ if (*(p + 1) != '\0')
+ *port = strdup(p + 1);
+ } else { /* IPv4, no port */
+ *server = strdup(input);
+ }
- for (p = q; *p && *p != ':'; *q++ = tolower(*p++));
- if (*p == ':')
- *port = strdup(p + 1);
- *p = '\0';
+ /* change the server name to lower case */
+ for (p = (char *) *server; *p && *p != '\0'; p++)
+ *p = tolower(*p);
}
char *convert_6to4(const char *s)
diff --git a/whois.spec b/whois.spec
index c9e53b1..81d7ced 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
Summary: Enhanced WHOIS client
Name: whois
-Version: 4.7.13
+Version: 4.7.14
Release: 1
License: GPL
Vendor: Marco d'Itri <md@linux.it>