summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco d'Itri <md@linux.it>2010-01-28 00:55:22 +0100
committerMarco d'Itri <md@linux.it>2013-03-30 02:31:39 +0100
commit9627a203ceda5b23fbdd0abd26268a9b6d34be22 (patch)
treecf023049b1b4752ed9f5fb7c70e3717af67568ee
parent15c8d523f76befe5128f2147c98730fd03b44dab (diff)
downloadwhois-9627a203ceda5b23fbdd0abd26268a9b6d34be22.tar.gz
Imported Debian version 5.0.1v5.0.1
-rw-r--r--README13
-rw-r--r--config.h2
-rw-r--r--debian/changelog10
-rw-r--r--debian/control4
-rw-r--r--ip_del_list2
-rw-r--r--mkpasswd.15
-rw-r--r--mkpasswd.c6
-rw-r--r--po/Makefile2
-rw-r--r--po/cs.po73
-rw-r--r--po/de.po64
-rw-r--r--po/el.po64
-rw-r--r--po/es.po334
-rw-r--r--po/eu.po64
-rw-r--r--po/fi.po93
-rw-r--r--po/fr.po65
-rw-r--r--po/it.po67
-rw-r--r--po/ja.po64
-rw-r--r--po/no.po64
-rw-r--r--po/pl.po71
-rw-r--r--po/pt_BR.po64
-rw-r--r--po/ru.po169
-rw-r--r--[-rwxr-xr-x]po/zh_CN.po113
-rw-r--r--tld_serv_list8
-rw-r--r--whois.spec2
24 files changed, 732 insertions, 691 deletions
diff --git a/README b/README
index 05858f7..c3ce957 100644
--- a/README
+++ b/README
@@ -1,6 +1,10 @@
Why another whois client? Because the RIPE client is a mess of hacks and
#ifdefs and more complex programs lack features or are bloated.
+This client is intelligent and can automatically select the appropriate
+whois server for most queries.
+
+
Notes about the data files:
- domain names MUST be lowercase and MUST begin with "." or "-".
- first match wins (for both domains and netblocks)
@@ -12,20 +16,15 @@ not correctly handled by the program.
Please also try to compile after defining HAVE_GETADDRINFO and send me
working #defines for your flavour of UNIX.
-The home of the program is http://www.linux.it/~md/software/
+The home of the program is
+http://ftp.debian.org/debian/pool/main/w/whois/ .
Other information sources:
- RIPE-187 and RIPE-189 (from ftp://ftp.ripe.net/ripe/docs/ or
http://www.ripe.net/docs/)
-- the www.geektools.org CGI proxy
-- home of the 6bone client: http://www.ip.qwest.net/~david/software/
-- http://www.apnic.net/db/RIRs.html and
- http://www.apnic.net/maps/tld-list.html
- http://www.uninett.no/navn/domreg.html
-- http://www.iahc.org/dns-refs/registry.html
- http://www.iana.org/root-whois/xx.htm
-- http://www.afrinic.net/
- http://www.aftld.org/
Marco d'Itri
diff --git a/config.h b/config.h
index 7d7f415..a0a361d 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
/* Program version */
-#define VERSION "5.0.0"
+#define VERSION "5.0.1"
/* Configurable features */
diff --git a/debian/changelog b/debian/changelog
index c19264e..d19a97c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+whois (5.0.1) unstable; urgency=medium
+
+ * Added new IPv4 allocations.
+ * Removed the .dj TLD server.
+ * Added support to mkpasswd for a "-5" convenience command line parameter.
+ * Updated one or more translations. (Closes: #562706)
+ * Removed the broken links from the README. (Closes: #566950)
+
+ -- Marco d'Itri <md@linux.it> Thu, 28 Jan 2010 00:55:22 +0100
+
whois (5.0.0) unstable; urgency=low
* Added optional support for automatically transcoding the output of
diff --git a/debian/control b/debian/control
index 7854ec2..18fb103 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: whois
Section: net
Priority: standard
Maintainer: Marco d'Itri <md@linux.it>
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Build-Depends: debhelper (>= 5), gettext, libidn11-dev
Package: whois
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: an intelligent whois client
This is a new whois (RFC 3912) client rewritten from scratch.
It is inspired from and compatible with the usual BSD and RIPE whois(1)
diff --git a/ip_del_list b/ip_del_list
index 731e67f..43ef667 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -6,8 +6,10 @@
#
# http://www.iana.org/assignments/ipv4-address-space
#
+1.0.0.0/8 apnic
2.0.0.0/8 ripe
24.132.0.0/14 ripe
+27.0.0.0/8 apnic
41.0.0.0/8 afrinic
43.0.0.0/8 v6nic
46.0.0.0/8 ripe
diff --git a/mkpasswd.1 b/mkpasswd.1
index 1de7f19..db7db47 100644
--- a/mkpasswd.1
+++ b/mkpasswd.1
@@ -17,7 +17,7 @@ libc function using the given salt.
Use the \fISTRING\fP as salt. It must not contain prefixes such as \fI$1$\fP.
.TP
.B -R, --rounds=NUMBER
-Use \fINUMBER\fP rounds. This argument is ignored if the method choosen
+Use \fINUMBER\fP rounds. This argument is ignored if the method chosen
does not support variable rounds. For the OpenBSD Blowfish method this is
the logarithm of the number of rounds.
.TP
@@ -25,6 +25,9 @@ the logarithm of the number of rounds.
Compute the password using the \fITYPE\fP method.
If \fITYPE\fP is \fIhelp\fP then the available methods are printed.
.TP
+.B -5
+Like \fI--method=md5\fP.
+.TP
.B -P, --password-fd=NUM
Read the password from file descriptor \fINUM\fP instead of using
\fIgetpass(3)\fP.
diff --git a/mkpasswd.c b/mkpasswd.c
index 8b64e49..176d980 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -138,9 +138,12 @@ int main(int argc, char *argv[])
/* prepend options from environment */
argv = merge_args(getenv("MKPASSWD_OPTIONS"), argv, &argc);
- while ((ch = GETOPT_LONGISH(argc, argv, "hH:m:P:R:sS:V", longopts, 0))
+ while ((ch = GETOPT_LONGISH(argc, argv, "hH:m:5P:R:sS:V", longopts, 0))
> 0) {
switch (ch) {
+ case '5':
+ optarg = (char *) "md5";
+ /* fall through */
case 'm':
case 'H':
if (!optarg || strcaseeq("help", optarg)) {
@@ -418,6 +421,7 @@ void display_help(void)
"Crypts the PASSWORD using crypt(3).\n\n"));
fprintf(stderr, _(
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
diff --git a/po/Makefile b/po/Makefile
index 1b20119..dc65b9f 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -6,7 +6,7 @@ INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/locale
PACKAGE = whois
-CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo zh_CN.po
+CATALOGS = cs.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo no.mo pl.mo pt_BR.mo ru.mo zh_CN.mo
POTFILES=../whois.c ../mkpasswd.c
diff --git a/po/cs.po b/po/cs.po
index d583029..5894660 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -3,10 +3,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.7.35\n"
+"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
-"PO-Revision-Date: 2009-08-10 09:08+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"PO-Revision-Date: 2010-01-27 16:11+0100\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -26,32 +26,31 @@ msgstr ""
"Chyby programu hlaste na %s (anglicky), chyby překladu na\n"
"<translation-team-cs@lists.sourceforge.net> (česky).\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Používám server %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Tato TLD nemá žádný whoisový server, ale k whoisové databázi se lze dostat na"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "Tato TLD nemá žádný whoisový server."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "Pro tento druh objektu není znám žádný whoisový server."
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Neznémé číslo AS nebo neznámá IP síť.\n"
"Prosím, pořiďte si novou verzi tohoto programu."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -62,7 +61,7 @@ msgstr ""
"Dotazuji se na IPv4 konec %s příslušející 6to4 IPv6 adrese.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -73,7 +72,7 @@ msgstr ""
"Dotazuji se na IPv4 konec %s příslušející Teredo IPv6 adrese.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +81,7 @@ msgstr ""
"Znění dotazu: „%s“\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -95,16 +94,16 @@ msgstr ""
"Nalezen odkaz na %s.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Tento řádek nemohu rozebrat: %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Varování: RIPE příznak použit s tradičním serverem."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +111,26 @@ msgstr ""
"Katastrofální chyba: text prohlášení byl pozměněn.\n"
"Prosím, pořiďte si novou verzi tohoto programu.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "Jméno počítače %s nenalezeno."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/TCP: neznámá služba"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Čas vypršel."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Přerušeno signálem %d…"
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -204,22 +203,22 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "standardní crypt(3) založený na 56bitové šifře DES"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Neplatná metoda „%s“.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Neplatné číslo „%s“.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Pro podrobnosti zkuste příkaz „%s --help“.\n"
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -227,7 +226,7 @@ msgstr[0] "Chybná délka soli: %d bajt, zatímco očekáváno %d.\n"
msgstr[1] "Chybná délka soli: %d bajty, zatímco očekáváno %d.\n"
msgstr[2] "Chybná délka soli: %d bajtů, zatímco očekáváno %d.\n"
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
@@ -235,27 +234,27 @@ msgstr[0] "Chybná délka soli: %d bajt, zatímco očekáváno %d <= n <= %d.\n"
msgstr[1] "Chybná délka soli: %d bajty, zatímco očekáváno %d <= n <= %d.\n"
msgstr[2] "Chybná délka soli: %d bajtů, zatímco očekáváno %d <= n <= %d.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Neplatný znak v soli „%c“.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Heslo: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Zakázaný znak v hesle „0x%hhx“.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Metoda není podporována funkcí crypt(3).\n"
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -266,10 +265,11 @@ msgstr ""
"Zašifruje HESLO pomocí funkce crypt(3).\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -284,7 +284,8 @@ msgid ""
"\n"
"Report bugs to %s.\n"
msgstr ""
-" -H, --hash=DRUH vybere DRUH hashe\n"
+" -m, --method=DRUH vybere DRUH metody\n"
+" -5 stejné jako --method=md5\n"
" -S, --salt=SŮL použije zadanou SŮL\n"
" -R, --rounds=POČET použije zadaný POČET kol\n"
" -P, --password-fd=Č přečte heslo z deskriptoru souboru Č\n"
@@ -295,12 +296,12 @@ msgstr ""
"\n"
"Chybí-li HESLO, bude o něj požádáno interaktivně.\n"
"Nebude-li zadána SŮL, vygeneruje se náhodná.\n"
-"Bude-li DRUH „help“, vypíšou se dostupné algoritmy.\n"
+"Bude-li DRUH „help“, vypíšou se dostupné metody.\n"
"\n"
"Chyby programu hlaste na %s (anglicky), chyby překladu na\n"
"<translation-team-cs@lists.sourceforge.net> (česky).\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, c-format
msgid "Available methods:\n"
msgstr "Dostupné metody:\n"
diff --git a/po/de.po b/po/de.po
index d948e3f..90cf33c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
"PO-Revision-Date: 2004-06-15 00:08+0100\n"
"Last-Translator: Adrian Bunk <bunk@fs.tum.de>\n"
"Language-Team: \n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -27,30 +27,29 @@ msgstr ""
"\n"
"Senden Sie Bugreports an %s.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Benutze Server %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr "Diese TLD hat keinen whois-Server, aber eine whois-Datenbank unter"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "Diese TLD hat keinen whois-Server."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "Hierfr ist kein Whois-Server bekannt."
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Unbekannte AS- oder IP-Netzwerk-Nummer. Bitte upgraden Sie dieses Programm."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -61,7 +60,7 @@ msgstr ""
"Frage nach dem IPv4 Endpunkt %s einer 6to4 IPv6-Adresse.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, fuzzy, c-format
msgid ""
"\n"
@@ -72,7 +71,7 @@ msgstr ""
"Frage nach dem IPv4 Endpunkt %s einer 6to4 IPv6-Adresse.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +80,7 @@ msgstr ""
"Suche nach: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -94,17 +93,17 @@ msgstr ""
"Verweis auf %s gefunden.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Kann diese Zeile nicht parsen: %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Warnung: RIPE-Flags wurden mit einem \"traditionellen\" Server verwendet."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +111,26 @@ msgstr ""
"Schwerer Fehler: Haftungsausschlusstext wurde geaendert.\n"
"Bitte upgraden sie dieses Programm.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "Host %s nicht gefunden."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: unbekannter Dienst"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Timeout."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Erhielt Signal %d, unterbrochen..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -202,56 +201,56 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "\tStandard 56 Bit DES-basiertes crypt(3)"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, fuzzy, c-format
msgid "Invalid method '%s'.\n"
msgstr "Falsche Nummer '%s'.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Falsche Nummer '%s'.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Versuchen Sie '%s --help' fr mehr Informationen.\n"
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, fuzzy, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
msgstr[0] "Falsche Salt-Lnge: %d Byte(s), aber%d wurden erwartet.\n"
msgstr[1] "Falsche Salt-Lnge: %d Byte(s), aber%d wurden erwartet.\n"
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, fuzzy, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
msgstr[0] "Falsche Salt-Lnge: %d Byte(s), aber%d wurden erwartet.\n"
msgstr[1] "Falsche Salt-Lnge: %d Byte(s), aber%d wurden erwartet.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Illegaler Salt-Buchstabe '%c'.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Passwort:"
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Illegaler Passwort-Buchstabe '0x%hhx'.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -262,10 +261,11 @@ msgstr ""
"Verschluesselt das PASSWORT mit crypt(3).\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -281,7 +281,7 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Verfgbare Algorithmen:\n"
diff --git a/po/el.po b/po/el.po
index c39f8d8..f91a22f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
"PO-Revision-Date: 2003-12-10 08:51+0200\n"
"Last-Translator: Velonis Petros <velonis@freemail.gr>\n"
"Language-Team: Greek <velonis@freemail.gr>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -26,34 +26,33 @@ msgstr ""
"\n"
"Αναφέρατε σφάλματα στο %s.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την "
"βάση whois στο"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr ""
"Κανένας εξυπηρετητής whois δεν είναι γνωστός για αυτού του είδους το "
"αντικείμενο."
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Άγνωστος αριθμός AS ή IP δικτύου. Παρακαλώ αναβαθμίστε αυτό το πρόγραμμα."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -64,7 +63,7 @@ msgstr ""
"Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, fuzzy, c-format
msgid ""
"\n"
@@ -75,7 +74,7 @@ msgstr ""
"Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -84,7 +83,7 @@ msgstr ""
"Αλφαριθμητικό ερώτησης: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -97,18 +96,18 @@ msgstr ""
"Βρέθηκε αναφορά στο %s.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Αδύνατη η ανάλυση αυτής της γραμμής: %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Προειδοποίηση: Η σημαίες του RIPE χρησιμοποιούνται σε έναν παραδοσιακό "
"εξυπηρετητή."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -116,26 +115,26 @@ msgstr ""
"Καταστροφικό σφάλμα: το κείμενο της αποποίησης ευθυνών έχει τροποποιηθεί.\n"
"Παρακαλώ αναβαθμίστε το πρόγραμμα.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "Το σύστημα %s δε βρέθηκε."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: άγνωστη υπηρεσία"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Διάλειμμα."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Διακοπή από το σήμα %d..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -214,56 +213,56 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "\tκαθεριερωμένη 56 bit με βάση το DES crypt(3)"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, fuzzy, c-format
msgid "Invalid method '%s'.\n"
msgstr "Μη αποδεκτό νούμερο '%s'.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Μη αποδεκτό νούμερο '%s'.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Προσπάθησε '%s --help' για περισσότερες πληροφορίες.\n"
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, fuzzy, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
msgstr[0] "Εσφαλμένο μήκος salt : %d byte(s) όταν αναμένεται %d .\n"
msgstr[1] "Εσφαλμένο μήκος salt : %d byte(s) όταν αναμένεται %d .\n"
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, fuzzy, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
msgstr[0] "Εσφαλμένο μήκος salt : %d byte(s) όταν αναμένεται %d .\n"
msgstr[1] "Εσφαλμένο μήκος salt : %d byte(s) όταν αναμένεται %d .\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Μη αποδεκτός χαρακτήρας salt '%c'.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Συνθηματικό: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Μη αποδεκτός χαρακτήρας συνθηματικού '0x%hhx'.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -274,10 +273,11 @@ msgstr ""
"Κρυπτογραφεί το ΣΥΝΘΗΜΑΤΙΚΟ χρησιμοποιώντας το crypt(3).\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -307,7 +307,7 @@ msgstr ""
"\n"
"Αναφέρατε σφάλματα στο %s.\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Διαθέσιμοι αλγόριθμοι:\n"
diff --git a/po/es.po b/po/es.po
index 6481790..c475b9a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,83 +1,114 @@
-# Spanish translation for whois.pot.
-# Copyright (C) 2001 Francisco Monteagudo
-# Francisco Monteagudo <francisco@monteagudo.net>, 2001.
+# whois po-debconf translation to Spanish
+# Copyright (C) 2001, 2010 Software in the Public Interest
+# This file is distributed under the same license as the whois whois.
+#
+# Changes:
+# - Initial translation
+# Francisco Monteagudo <francisco@monteagudo.net>, 2001
+#
+# - Updates
+# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2010
+#
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+# info -n '(gettext)PO Files'
+# info -n '(gettext)Header Entry'
+#
+# Equipo de traducción al español, por favor lean antes de traducir
+# los siguientes documentos:
+#
+# - El proyecto de traducción de Debian al español
+# http://www.debian.org/intl/spanish/
+# especialmente las notas y normas de traducción en
+# http://www.debian.org/intl/spanish/notas
+#
+# - La guía de traducción de po's de debconf:
+# /usr/share/doc/po-debconf/README-trans
+# o http://www.debian.org/intl/l10n/po-debconf/README-trans
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.5.29\n"
+"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+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"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"PO-Revision-Date: 2010-01-29 09:16+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
"\n"
"Report bugs to %s.\n"
msgstr ""
-"Version %s.\n"
+"Versión %s.\n"
"\n"
-"Informar de bugs a %s.\n"
+"Informar de fallos a %s.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190
+#: ../whois.c:243
+#: ../whois.c:249
+#: ../whois.c:256
+#: ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Usando el servidor %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
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"
+msgstr "Este TLD no dispone de servidor whois, pero puede acceder a la base de datos de whois en"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
-msgstr "No existe servidor whois para este TLD."
+msgstr "Este TLD no dispone de servidor whois."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
-msgstr ""
+msgstr "No se conoce ningún servidor de whois para esta clase de objeto."
-#: ../whois.c:220
-#, fuzzy
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Numero AS desconocido. Por favor, actualice este programa."
+msgstr "Numero AS o red IP desconocida. Por favor, actualice este programa."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
"\n"
msgstr ""
+"\n"
+"Consultando el punto final IPv4 de %s de una dirección IPv6 6a4.\n"
+"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
"\n"
msgstr ""
+"\n"
+"Consultando el punto final IPv4 de %s de una dirección IPv6 Teredo.\n"
+"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
"\n"
msgstr ""
-"Consulta: \"%s\"\n"
+"Cadena de la consulta: «%s»\n"
"\n"
-#: ../whois.c:279
-#, fuzzy, c-format
+#: ../whois.c:297
+#, c-format
msgid ""
"\n"
"\n"
@@ -85,49 +116,50 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Se ha encontrado en crsnic una referencia a %s.\n"
+"\n"
+"Se ha encontrado una referencia a %s.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339
+#: ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
-msgstr "No puedo procesar esta linea: %s"
+msgstr "No se pudo procesar esta linea: %s"
-#: ../whois.c:480
-#, fuzzy
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
-msgstr ""
-"Atencion: Los flags RIPE son ignorados por los servidores tradicionales."
+msgstr "Atención: Se han usado opciones de RIPE con un servidor tradicional."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657
+#: ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
msgstr ""
-"Error catastrofico: el texto de las condiciones de uso ha sido cambiado.\n"
-"Actualize este programa.\n"
+"Error catastrófico: el texto de las condiciones de uso ha sido cambiado.\n"
+"Por favor, actualice este programa.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
-msgstr "Host %s no encontrado."
+msgstr "El servidor %s no se ha encontrado."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servicio desconocido"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
-msgstr ""
+msgstr "Se ha agotado el tiempo de espera."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
-msgstr "Interrumpido por la seal %d..."
+msgstr "Interrumpido por la señal %d..."
-#: ../whois.c:1100
-#, fuzzy, c-format
+#: ../whois.c:1175
+#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -135,11 +167,9 @@ 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"
@@ -149,8 +179,7 @@ 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"
@@ -163,106 +192,115 @@ msgid ""
msgstr ""
"Uso: whois [OPCIONES]... OBJETO...\n"
"\n"
-"-a busca en todas las bases de datos\n"
-"-F modo rapido (implica -r)\n"
-"-g SOURCE:FIRST-LAST localiza las ocurrencias de SOURCE en la serie F a L\n"
-"-h HOST se conecta al servidor HOST\n"
-"-H oculta el aviso legal\n"
-"-i ATTR[,ATTR]... efectua una busqueda inversa para el ATTRibuto "
-"specificado\n"
-"-x busqueda exacta [solo RPSL]\n"
-"-l desciende en un nivel la especifidad de la busqueda "
-"[RPSL]\n"
-"-L busca las correspondencias menos especificas\n"
-"-M busca las correspondencias mas especificas\n"
-"-m busca el primer nivel mas especifico\n"
-"-r desactiva la busqueda recursiva\n"
-"-p PUERTO conecta al PUERTO\n"
-"-R muestra la copia local del objeto especificado incluso\n"
-" si contiene una referencia\n"
-"-S indica al servidor que no use peculiarides sintacticas\n"
-"-s SOURCE[,SOURCE]... busca la base de datos de SOURCE\n"
-"-T TIPO[,TIPO]... busca unicamente objetos del tipo TIPO\n"
-"-t TIPO obtiene la plantilla para un objeto de TIPO ('all' para una "
-"lista)\n"
-"-v TIPO obtiene la plantilla detallada de un objeto TIPO\n"
-"-q [version|sources] consulta informacion sobre el servidor [solo RPSL]\n"
-"-d devuelve tambien la delegacion inversa del DNS [solo "
-"RPSL]\n"
-"-K solo devuelve claves primarias [solo RPSL]\n"
-"-V --verbose muestra lo que se esta haciendo\n"
-" --help muestra esta pantalla de ayuda y finaliza\n"
-" --version muestra la version del programa y finaliza\n"
+"-l se realiza una búsqueda un nivel menos específica\n"
+" [sólo RPSL]\n"
+"-L busca las correspondencias menos especificas\n"
+"-m busca las correspondencias del primer nivel más\n"
+" específico\n"
+"-M busca las correspondencias más especificas\n"
+"-c busca la correspondencia más pequeña que contenga\n"
+" un atributo mnt-irt\n"
+"-x busca la correspondencia exacta [sólo RPSL]\n"
+"-d también devuelve la delegacion inversa del DNS\n"
+" [solo RPSL]\n"
+"-i ATRIB[,ATRIB]... realiza una búsqueda inversa para el atributo\n"
+" (ATRIB) indicado\n"
+"-T TIPO[,TIPO]... sólo busca los objetos del tipo (TIPO) indicado\n"
+"-K sólo se devuelven las claves primarias\n"
+" [sólo RPSL]\n"
+"-r desactiva las búsquedas recursivas de la \n"
+" información de contacto\n"
+"-R muestra la copia local del objeto del dominio\n"
+" incluso si contiene una referencia\n"
+"-a busca en todas las bases de datos\n"
+"-s ORIGEN[,ORIGEN]... busca en la base de datos desde ORIGEN\n"
+"-g ORIGEN:PRIMERO-ÚLTIMO busca las actualizaciones desde ORIGEN en la\n"
+" serie PRIMERO a ÚLTIMO\n"
+"-t TIPO pide la plantilla de un objeto del tipo (TIPO)\n"
+" indicado («all» para una lista)\n"
+"-v TIPO pide una plantilla detallada de un objeto del\n"
+" tipo (TIPO) indicado\n"
+"-q [versión|origenes|tipos] consulta la información con el servidor\n"
+" indicado [sólo RPSL]\n"
+"-F salida en bruto rápida (implica -r)\n"
+"-h SERVIDOR conecta con el servidor (SERVIDOR) indicado\n"
+"-p PUERTO conecta con el puerto (PUERTO) indicado\n"
+"-H oculta los avisos legales\n"
+" --verbose muestra lo qué está haciendo\n"
+" --help muestra este mensaje de ayuda y finaliza\n"
+" --version muestra la información de la versión y finaliza\n"
#: ../mkpasswd.c:80
-#, fuzzy
msgid "standard 56 bit DES-based crypt(3)"
-msgstr "\tcrypt(3) basado en DES de 56 bits"
+msgstr "crypt(3) basado en DES de 56 bits"
-#: ../mkpasswd.c:159
-#, fuzzy, c-format
+#: ../mkpasswd.c:162
+#, c-format
msgid "Invalid method '%s'.\n"
-msgstr "El numero '%s' no es valido.\n"
+msgstr "Método «%s» inválido.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171
+#: ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
-msgstr "El numero '%s' no es valido.\n"
+msgstr "El numero «%s» no es valido.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
-msgstr "%s --help para mas informacion.\n"
+msgstr "Pruebe «%s --help» para más información.\n"
-#: ../mkpasswd.c:237
-#, fuzzy, c-format
+#: ../mkpasswd.c:240
+#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
-msgstr[0] "Tamao de semilla incorrecto: %d bytes en lugar de %d.\n"
-msgstr[1] "Tamao de semilla incorrecto: %d bytes en lugar de %d.\n"
+msgstr[0] "Longitud del «salt» incorrecta: %d byte en lugar de %d.\n"
+msgstr[1] "Longitud del «salt» incorrecta: %d bytes en lugar de %d.\n"
-#: ../mkpasswd.c:242
-#, fuzzy, c-format
+#: ../mkpasswd.c:245
+#, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
-msgstr[0] "Tamao de semilla incorrecto: %d bytes en lugar de %d.\n"
-msgstr[1] "Tamao de semilla incorrecto: %d bytes en lugar de %d.\n"
+msgstr[0] "Longitud del «salt» incorrecta: %d byte cuando se esperaba %d <= n <= %d.\n"
+msgstr[1] "Longitud del «salt» incorrecta: %d bytes cuando se esperaba %d <= n <= %d.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
-msgstr "El caracter '%c' ilegal en la semilla.\n"
+msgstr "El carácter «%c» no es válido en el «salt».\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299
+#: ../mkpasswd.c:326
#, c-format
msgid "Password: "
-msgstr "Clave: "
+msgstr "Contraseña: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
-msgstr "El caracter '0x%hhx' es ilegal en la clave.\n"
+msgstr "El carácter «0x%hhx» no es válido en la contraseña.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
-msgstr ""
+msgstr "crypt(3) no puede usar el método.\n"
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
"Crypts the PASSWORD using crypt(3).\n"
"\n"
msgstr ""
-"Utilizacion: mkpasswd [OPCIONES]... [CLAVE [SEMILLA]]\n"
-"Encripta CLAVE utilizando crypt(3).\n"
+"Uso: mkpasswd [OPCIONES]... [CONTRASEÑA [SALT]]\n"
+"Cifra CONTRASEÑA utilizando crypt(3).\n"
"\n"
-#: ../mkpasswd.c:420
-#, fuzzy, c-format
+#: ../mkpasswd.c:423
+#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -277,54 +315,24 @@ msgid ""
"\n"
"Report bugs to %s.\n"
msgstr ""
-" -H, --hash=TIPO selecciona la funcion hash TIPO\n"
-" -S, --salt=SEMILLA utiliza la SEMILLA indicada\n"
-" -P, --password-fd=NUM Lee la clave del descriptor NUM en vez de /dev/"
-"tty\n"
-" -s, --stdin lee la clave de stdin en vez de /dev/tty\n"
-" -h, --help muestra este mensaje de ayuda\n"
-" -v, --version muestra la version del programa\n"
+" -m, --method=TIPO selecciona el TIPO de método\n"
+" -5 igual que --method=md5\n"
+" -S, --salt=SALT usa el SALT indicado\n"
+" -R, --rounds=NÚMERO usa el NÚMERO indicado de rondas\n"
+" -P, --password-fd=NUM lee la contraseña del descriptor de archivo NUM\n"
+" en lugar de «/dev/tty»\n"
+" -s, --stdin igual que --password-fd=0\n"
+" -h, --help muestra este mensaje de ayuda y finaliza\n"
+" -V, --version muestra la información de la versión y finaliza\n"
"\n"
-"Si la CLAVE no es especificada, se pedira una de forma interactiva.\n"
-"Si no se especifica la SEMILLA, se generara una aleatoriamente.\n"
-"Si no especifica TIPO, se imprimiran los algoritmos disponibles.\n"
+"Si no se indica la CONTRASEÑA, se pedirá una de forma interactiva.\n"
+"Si no se indica el SALT, se generará uno de forma aleatoria.\n"
+"Si el TIPO es «help», se mostrarán los métodos disponibles.\n"
"\n"
-"Informar de bugs a: %s.\n"
+"Informar de fallos a %s.\n"
-#: ../mkpasswd.c:448
-#, fuzzy, c-format
+#: ../mkpasswd.c:452
+#, c-format
msgid "Available methods:\n"
-msgstr "Algoritmos disponibles:\n"
-
-#~ msgid "Invalid hash type '%s'.\n"
-#~ msgstr "La funcion de hash '%s' no es valida.\n"
-
-#~ msgid "Using default server %s.\n"
-#~ msgstr "Usando el servidor predefinido %s.\n"
-
-#, 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..."
-#~ msgstr ""
-#~ "Ignoro a quien a sido delegada esta direccion IP.\n"
-#~ "Voy a probar con ARIN a ver si hay suerte..."
-
-#~ msgid "I guess it's a netblock name but I don't know where to look it up."
-#~ msgstr ""
-#~ "Aparentemente, es el nombre de un netblock, pero ignoro donde buscarlo."
-
-#~ msgid "I guess it's a domain but I don't know where to look it up."
-#~ msgstr "Aparentemente, es un nombre de dominio, pero ignoro donde buscarlo."
+msgstr "Métodos disponibles:\n"
+
diff --git a/po/eu.po b/po/eu.po
index b33c219..59d74dc 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.5.29\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
"PO-Revision-Date: 2002-08-24 16:22+0200\n"
"Last-Translator: Aitor Ibaez <aitiba@gmail.com>\n"
"Language-Team: Euskara <Librezale@librezale.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -26,32 +26,31 @@ msgstr ""
"\n"
"Bug berri baten jakinarazpena: %s.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "%s zerbitzaria erabiltzen.\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"TLD honek ez du whois zerbitzaririk, baina whois databasera sarbidea "
"daukazu..."
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "TLD honek ez du whois zerbitzaririk."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "Objetu mota horrentzako, ez da whois zerbitzaririk ezagutzen."
-#: ../whois.c:220
+#: ../whois.c:239
#, fuzzy
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "AS zenbaki edo IP sarea ezezaguna. Mesedez, programa eguneratu."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -62,7 +61,7 @@ msgstr ""
"Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, fuzzy, c-format
msgid ""
"\n"
@@ -73,7 +72,7 @@ msgstr ""
"Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +81,7 @@ msgstr ""
"Kontsulta: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, fuzzy, c-format
msgid ""
"\n"
@@ -94,17 +93,17 @@ msgstr ""
"$s-ra erreferentzia aurkituta.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Lerro hau, %s , ezin da prozesatu."
-#: ../whois.c:480
+#: ../whois.c:506
#, fuzzy
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Oharra: RIPE flags-ak ohiko zerbitzariengatik ezikusiak izaten dira."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +111,26 @@ msgstr ""
"Hondamen arriskua: erabilpen balditzen textua aldatu egin da.\n"
"Programa eguneratu.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "%s Host-a ez da aurkitu."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: zerbitzu ezezaguna"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Denbora muga."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "%d seinalearengatik etena..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -207,56 +206,56 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "56 bits-etako DESan oinarritutako \tcrypt(3)-a"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, fuzzy, c-format
msgid "Invalid method '%s'.\n"
msgstr "'%s' zenbakia ez da baliozkoa.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "'%s' zenbakia ez da baliozkoa.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "%s --help informazio gehiagorako.\n"
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, fuzzy, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
msgstr[0] "Hazi tamain desegokia:%d byte %d-en ordez.\n"
msgstr[1] "Hazi tamain desegokia:%d byte %d-en ordez.\n"
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, fuzzy, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
msgstr[0] "Hazi tamain desegokia:%d byte %d-en ordez.\n"
msgstr[1] "Hazi tamain desegokia:%d byte %d-en ordez.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "'%c' karakterea, hazian, ilegala da.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Pasahitza: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "'0x%hhx' password karakterea ilegala da.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -267,10 +266,11 @@ msgstr ""
"PASAHITZA crypt(3) erabiliz enkriptatu.\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -300,7 +300,7 @@ msgstr ""
"\n"
"Bug berri baten jakinarazpena: %s.\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Algoritmo erabilgarriak:\n"
diff --git a/po/fi.po b/po/fi.po
index 6f4c079..8824192 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -4,10 +4,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.7.34\n"
+"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
-"PO-Revision-Date: 2009-08-12 14:55+0100\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"PO-Revision-Date: 2010-01-27 15:31+0100\n"
"Last-Translator: Sami Kerola <kerolasa@iki.fi>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@@ -15,7 +15,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -26,30 +26,32 @@ msgstr ""
"\n"
"Lähetä bugiraportit osoitteeseen %s.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190
+#: ../whois.c:243
+#: ../whois.c:249
+#: ../whois.c:256
+#: ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Käytetään palvelinta %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
-msgstr ""
-"Tälla TLD:llä ei ole whois palvelinta, tiedot ovat nakyvissä osoitteessa"
+msgstr "Tälla TLD:llä ei ole whois palvelinta, tiedot ovat nakyvissä osoitteessa"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "Tälla TLD:llä ei ole whois palvelinta."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "Mikään whois palvelu ei tiedä kysyttyä tietoa."
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Tuntematon AS-numero tai IP-verkko. Päivitä tämä ohjelma."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -60,7 +62,7 @@ msgstr ""
"Kysytään IPv4 ulostulona %s IPv6:n IPv4 avaruudesta.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -71,7 +73,7 @@ msgstr ""
"Kysytään IPv4 ulostulona %s Teredo IPv6 tunneliosoitetta.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -80,7 +82,7 @@ msgstr ""
"Kysely: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -93,16 +95,18 @@ msgstr ""
"Löytyi viittaus %s.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339
+#: ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Ohjelma ei kykene tulkitsemaan riviä: %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Varoitus: käytät RIPE valitsimia perinteiseen palvelimeen."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657
+#: ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -110,26 +114,26 @@ msgstr ""
"Katastrofaalinen virhe: lisenssiteksti on muuttunut.\n"
"Päivita ohjelma.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "Palvelinta %s ei löydy."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: tuntematon palvelu"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Aikakatkaisu."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Ohjelma keskeytyi signaaliin %d..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -138,11 +142,9 @@ 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"
@@ -152,8 +154,7 @@ 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"
@@ -183,8 +184,7 @@ msgstr ""
"-s SOURCE[,SOURCE]... etsi tietokannoista SOURCE\n"
"-g SOURCE:FIRST-LAST löytö päivittää lähteen SOURCE järjestysnumeron\n"
" FIRST:stä LAST:iin\n"
-"-t TYPE pyydä mallinne TYPE objektille ('all' näyttää "
-"tyyppilistan)\n"
+"-t TYPE pyydä mallinne TYPE objektille ('all' näyttää tyyppilistan)\n"
"-v TYPE monisanainen mallinne TYPE objektille\n"
"-q [version|sources|types] erityinen palvelintieto [ainostaan RPSL]\n"
"-F nopea tuloste (sisältää -r valitsimen)\n"
@@ -199,56 +199,58 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "Standardi 56 bittinen DES-salaus ks crypt(3)"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Väärä metodi '%s'.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171
+#: ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Väärä numero '%s'.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Käytä valitsinta '%s --help' lisätietojen saamiseen.\n"
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
msgstr[0] "Väärä suolan pituus: %d tavu, kun %d odotettiin.\n"
msgstr[1] "Väärä suolan pituus: %d tavu, kun %d odotettiin.\n"
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
msgstr[0] "Väärä suolan pituus: %d tavua, kun %d <= n <= %d odotettiin.\n"
msgstr[1] "Väärä suolan pituus: %d tavua, kun %d <= n <= %d odotettiin.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Suolassa laiton merkki '%c'.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299
+#: ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Salasana: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Laiton merkki salasanassa '0x%hhx'.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Toiminto ei ole tuettu crypt(3) funktiossa.\n"
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -259,10 +261,11 @@ msgstr ""
"Salaa salasanan crypt(3) funktiolla.\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -278,6 +281,7 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
" -m, --method=TYPE valitse toiminto TYPE\n"
+" -5 sama kuin --method=md5\n"
" -S, --salt=SUOLA suolan valinta\n"
" -R, --rounds=NUMERO pyöristä numeroon\n"
" -P, --password-fd=NUM lue salasana avoimesta tiedostosta NUM\n"
@@ -292,7 +296,8 @@ msgstr ""
"\n"
"Lähetä bugiraportit osoitteeseen %s.\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, c-format
msgid "Available methods:\n"
msgstr "Käytettävissä olevat toiminnot:\n"
+
diff --git a/po/fr.po b/po/fr.po
index 6446a18..714f3a3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
"PO-Revision-Date: 2009-04-30 21:51+0200\n"
"Last-Translator: Simon Paillard <simon.paillard@resel.enst-bretagne.fr>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -28,31 +28,30 @@ msgstr ""
"\n"
"Veuillez signaler les bogues à %s.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Le serveur %s est sélectionné.\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Ce TLD n'a pas de serveur whois, mais vous pouvez accéder à la base de "
"données à"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "Ce TLD n'a pas de serveur whois."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "Aucun serveur whois n'est connu pour ce type d'objet."
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Numéro d'AS ou réseau IP inconnu. Veuillez mettre à jour ce programme."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -63,7 +62,7 @@ msgstr ""
"Requête faite pour l'extrémité IPv4 %s d'une adresse IPv6 6to4.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -74,7 +73,7 @@ msgstr ""
"Requête faite pour l'extrémité IPv4 %s d'une adresse IPv6 Teredo.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -83,7 +82,7 @@ msgstr ""
"Requête : \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -96,17 +95,17 @@ msgstr ""
"Renvoi trouvé vers %s.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Impossible d'interpréter la ligne : %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Avertissement : des options RIPE ont été utilisées avec un serveur classique."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -114,26 +113,26 @@ msgstr ""
"Erreur catastrophique : le texte de déni de responsabilité a changé.\n"
"Veuillez mettre à jour ce programme.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "L'hôte %s est introuvable."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp : service inconnu"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Temps limite dépassé."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interruption par le signal %d..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -215,23 +214,23 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "fonction crypt(3) standard, chiffrement DES à 56 bits"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "La méthode '%s' est invalide.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Le nombre « %s » est invalide.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, 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:237
+#: ../mkpasswd.c:240
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -239,34 +238,34 @@ msgstr[0] "Mauvaise taille d'aléa : %d octet au lieu de %d.\n"
msgstr[1] "Mauvaise taille d'aléa : %d octets au lieu de %d.\n"
# : ../mkpasswd.c:152
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
msgstr[0] "Mauvaise taille d'aléa : %d octet, non comprise entre %d et %d.\n"
msgstr[1] "Mauvaise taille d'aléa : %d octets, non comprise entre %d et %d.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Le caractère « %c » est invalide dans l'aléa.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Mot de passe : "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Le caractère « 0x%hhx » est invalide dans le mot de passe.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Méthode non prise en charge par crypt(3).\n"
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -277,10 +276,11 @@ msgstr ""
"Chiffre le MOT DE PASSE à l'aide de la fonction crypt(3).\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -296,6 +296,7 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
" -m, --method=TYPE sélectionner ce TYPE de méthode\n"
+" -s équivalent à --method=md5\n"
" -S, --salt=ALÉA utiliser cette ALÉA\n"
" -R, --rounds=NOMBRE utiliser le NOMBRE de passages indiqué\n"
" -P, --password-fd=NUM lire le mot de passe depuis le descripteur de\n"
@@ -311,7 +312,7 @@ msgstr ""
"\n"
"Veuillez signaler les bogues à %s.\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, c-format
msgid "Available methods:\n"
msgstr "Méthodes disponibles :\n"
diff --git a/po/it.po b/po/it.po
index 4c2c29d..50e8d00 100644
--- a/po/it.po
+++ b/po/it.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.7.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
"PO-Revision-Date: 2009-04-12 06:04+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -25,31 +25,30 @@ msgstr ""
"\n"
"Segnalare i bug a %s.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Uso il server %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Questo TLD non ha un server whois, ma si pu accedere al database tramite"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "Per questo TLD non esiste un server whois."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "Non noto alcun server whois per questo tipo di oggetto."
-#: ../whois.c:220
+#: ../whois.c:239
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."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -60,7 +59,7 @@ msgstr ""
"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 6to4.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -71,7 +70,7 @@ msgstr ""
"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 Teredo.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -80,7 +79,7 @@ msgstr ""
"Richiesta: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -93,16 +92,16 @@ msgstr ""
"Trovato un riferimento a %s.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Impossibile interpretare questa riga: %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -110,26 +109,26 @@ msgstr ""
"Errore catastrofico: il testo di avvertenze cambiato.\n"
"Aggiorna questo programma.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "Host %s non trovato."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servizio sconosciuto"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Tempo scaduto."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrotto dal segnale %d..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -202,56 +201,56 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "crypt(3) standard a 56 bit basata su DES"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Il metodo '%s' non valido.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Il numero '%s' non valido.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Per maggior informazioni prova '%s --help'.\n"
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
msgstr[0] "Lunghezza del sale sbagliata: %d byte invece di %d.\n"
msgstr[1] "Lunghezza del sale sbagliata: %d byte invece di %d.\n"
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
msgstr[0] "Lunghezza del sale sbagliata: %d byte invece di %d <= n <= %d.\n"
msgstr[1] "Lunghezza del sale sbagliata: %d byte invece di %d <= n <= %d.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Il carattere '%c' non valido in un sale.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Password: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Il carattere '0x%hhx' non valido in una password.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Metodo non gestito da crypt(3).\n"
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -262,10 +261,11 @@ msgstr ""
"Cifra la PASSWORD usando crypt(3).\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -280,7 +280,8 @@ msgid ""
"\n"
"Report bugs to %s.\n"
msgstr ""
-" -m, --metodo=TIPO seleziona il TIPO di metodo\n"
+" -m, --method=TIPO seleziona il TIPO di metodo\n"
+" -5 come --method=md5\n"
" -S, --salt=SALE usa il SALE specificato\n"
" -R, --rounds=NUMBER usa il NUMERO indicato di iterazioni\n"
" -P, --password-fd=NUM legge la password dal file descriptor NUM\n"
@@ -295,7 +296,7 @@ msgstr ""
"\n"
"Segnalare i bug a %s.\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, c-format
msgid "Available methods:\n"
msgstr "Metodi disponibili:\n"
diff --git a/po/ja.po b/po/ja.po
index 496018a..906d44e 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: 2009-08-10 14:04+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
"PO-Revision-Date: 2005-04-26 00:20+0900\n"
"Last-Translator: Satoru SATOH <ss@gnome.gr.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -27,31 +27,30 @@ msgstr ""
"\n"
"バグ報告は %s へ.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "サーバー %s を使用\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"この TLD には whois サーバーがありませんが、次のサーバーで whois データベース"
"にアクセスできます"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "この TLD には whois サーバーがありません"
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "この種のオブジェクトに対する既知の whois サーバーはありません"
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "不明な AS 番号または IP ネットワーク. アップグレードして下さい"
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -62,7 +61,7 @@ msgstr ""
"6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, fuzzy, c-format
msgid ""
"\n"
@@ -73,7 +72,7 @@ msgstr ""
"6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +81,7 @@ msgstr ""
"問い合わせ文字列: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -95,16 +94,16 @@ msgstr ""
"%s への照会をみつけました\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "この行を解析できません: %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr "警告: 旧来のサーバーについて RIPE フラグが使用されています"
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +111,26 @@ msgstr ""
"破滅的なエラー: 免責条項テキストが変更されました\n"
"このプログラムをアップグレードして下さい\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "ホスト %s はみつかりませんでした"
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: 不明なサービス"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "時間切れ"
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "シグナル %d が割込み..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -202,56 +201,56 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "\t標準 56 ビット DES ベース暗号(3)"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, fuzzy, c-format
msgid "Invalid method '%s'.\n"
msgstr "不正な数字 '%s'\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "不正な数字 '%s'\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "さらなる詳細については '%s --help' を実行\n"
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, fuzzy, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
msgstr[0] "間違ったソルト長: %d バイト(s) (%d を期待)\n"
msgstr[1] "間違ったソルト長: %d バイト(s) (%d を期待)\n"
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, fuzzy, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
msgstr[0] "間違ったソルト長: %d バイト(s) (%d を期待)\n"
msgstr[1] "間違ったソルト長: %d バイト(s) (%d を期待)\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "不正なソルト文字 '%c'\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "パスワード: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "不正なパスワード文字 '0x%hhx'\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -262,10 +261,11 @@ msgstr ""
"PASSWORD を crypt(3) で暗号化\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -294,7 +294,7 @@ msgstr ""
"\n"
"バグ報告は %s へ.\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "利用可能なアルゴリズム:\n"
diff --git a/po/no.po b/po/no.po
index dbb945f..cee8401 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.4.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
"PO-Revision-Date: 1999-12-18 14:00:00\n"
"Last-Translator: Egil Kvaleberg <egil@kvaleberg.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
@@ -14,7 +14,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -22,30 +22,29 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Bruker tjener %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr ""
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr ""
-#: ../whois.c:220
+#: ../whois.c:239
#, fuzzy
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -53,7 +52,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:251
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -61,7 +60,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -70,7 +69,7 @@ msgstr ""
"Foresprsel: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, fuzzy, c-format
msgid ""
"\n"
@@ -82,17 +81,17 @@ msgstr ""
"Fant InterNIC-referanse til %s.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr ""
-#: ../whois.c:480
+#: ../whois.c:506
#, fuzzy
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
#, fuzzy
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
@@ -101,26 +100,26 @@ msgstr ""
"Alvorlig feil: INTERNIC har endret standardtekst.\n"
"Vennligst oppdater programmet.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "Finner ikke verten %s."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: ukjent port"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr ""
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Avbrudt av signal %d..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -183,56 +182,56 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr ""
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, c-format
msgid "Invalid method '%s'.\n"
msgstr ""
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr ""
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr ""
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
msgstr[0] ""
msgstr[1] ""
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
msgstr[0] ""
msgstr[1] ""
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr ""
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr ""
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr ""
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -240,10 +239,11 @@ msgid ""
"\n"
msgstr ""
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -259,7 +259,7 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, c-format
msgid "Available methods:\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 44f06b2..c9d4b6c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,14 +1,14 @@
# Polish translation for whois.
# Micha 'CeFeK' Nazarewicz <cefek@career.pl>, 1999
# Przemysaw Knycz <djrzulf@pld.org.pl>, 2003
-# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2009
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2010
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.7.35\n"
+"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
-"PO-Revision-Date: 2009-08-10 17:02+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"PO-Revision-Date: 2010-01-27 17:25+0100\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
@@ -17,7 +17,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -28,30 +28,29 @@ msgstr ""
"\n"
"Bdy prosz zgasza na adres %s.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Uycie serwera %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
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:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "Ta gwna domena nie ma serwera whois."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "Dla tego rodzaju obiektu nie jest znany aden serwer whois."
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Nieznany numer AS lub sie IP. Prosz uaktualni ten program."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -62,7 +61,7 @@ msgstr ""
"Pytanie o zakoczenie IPv4 %s adresu IPv6 typu 6to4.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -73,7 +72,7 @@ msgstr ""
"Pytanie o zakoczenie IPv4 %s adresu IPv6 Teredo.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +81,7 @@ msgstr ""
"Zapytanie: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -95,16 +94,16 @@ msgstr ""
"Znaleziono odniesienie do %s.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Nie mona przeanalizowa tej linii: %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Uwaga: uyto flag RIPE ze starszym serwerem."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +111,26 @@ msgstr ""
"Katastrofa! Tekst owiadczenia zosta zmieniony.\n"
"Prosz uaktualni ten program.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "Serwer %s nie zosta znaleziony."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: usuga nieznana"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Upyn limit czasu."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Przerwano sygnaem %d..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -209,23 +208,23 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "standardowa 56-bitowa, oparta o DES funkcja crypt(3)"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Nieprawidowa metoda '%s'.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Nieprawidowa liczba '%s'.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "'%s --help' poda wicej informacji.\n"
# : ../mkpasswd.c:152
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -234,7 +233,7 @@ msgstr[1] "Bdna dugo zarodka: %d bajty kiedy oczekiwano %d.\n"
msgstr[2] "Bdna dugo zarodka: %d bajtw kiedy oczekiwano %d.\n"
# : ../mkpasswd.c:152
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
@@ -242,27 +241,27 @@ msgstr[0] "Bdna dugo zarodka: %d bajt kiedy oczekiwano %d <= n <= %d.\n"
msgstr[1] "Bdna dugo zarodka: %d bajty kiedy oczekiwano %d <= n <= %d.\n"
msgstr[2] "Bdna dugo zarodka: %d bajtw kiedy oczekiwano %d <= n <= %d.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Bdny znak zarodka '%c'.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Haso: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Bdny znak w hale '0x%hhx'.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Metoda nie obsugiwana przez crypt(3).\n"
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -273,10 +272,11 @@ msgstr ""
"Koduje HASO przy uyciu funkcji crypt(3).\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -292,6 +292,7 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
" -m, --method=TYP wybr metody TYP\n"
+" -5 to samo, co --method=md5\n"
" -S, --salt=ZARODEK uycie podanego ZARODKA\n"
" -R, --rounds=LICZBA uycie podanej LICZBY cykli\n"
" -P, --password-fd=NUM odczyt hasa z deskryptora pliku NUM zamiast\n"
@@ -307,7 +308,7 @@ msgstr ""
"\n"
"Bdy prosz zgasza na adres %s.\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, c-format
msgid "Available methods:\n"
msgstr "Dostpne metody:\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7d6c5e9..44c35f2 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.7.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
"PO-Revision-Date: 2006-04-26 21:03-0300\n"
"Last-Translator: Anderson Goulart <globalx@gmail.com>\n"
"Language-Team: Portuguese/Brazil\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -27,31 +27,30 @@ msgstr ""
"\n"
"Reporte bugs para %s \n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Utilizando servidor %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
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
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "No existe servidor whois para este TLD."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "Nenhum servidor whois conhecido para este tipo de objeto."
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Nmero AS ou rede IP desconhecidos. Por favor, atualize este programa."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -62,7 +61,7 @@ msgstr ""
"Procurando pela extremidade IPv4 %s de um endereo IPv6. 6to4.\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, fuzzy, c-format
msgid ""
"\n"
@@ -73,7 +72,7 @@ msgstr ""
"Procurando pela extremidade IPv4 %s de um endereo IPv6. 6to4.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +81,7 @@ msgstr ""
"Consulta: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -95,16 +94,16 @@ msgstr ""
"Uma referncia para%s encontrada.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "No pde processar esta linha: %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Aviso: RIPE flags utilizados com um servidor tradicional."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +111,26 @@ msgstr ""
"Erro catastrfico: o texto das condies de uso foi alterado.\n"
"Por favor, atualize este programa. \n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "Host %s no encontrado."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servio desconhecido"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Tempo esgotado."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrompido pelo sinal %d..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -207,29 +206,29 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "\tstandard 56 bit DES-based crypt(3)"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, fuzzy, c-format
msgid "Invalid method '%s'.\n"
msgstr "Nmero invlido '%s'.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Nmero invlido '%s'.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Tente '%s --help para maiores informaes.\n"
-#: ../mkpasswd.c:237
+#: ../mkpasswd.c:240
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
msgstr[0] "Tamanho do salt incorreto: %d byte enquanto %d eram esperados.\n"
msgstr[1] "Tamanho do salt incorreto: %d bytes enquanto %d eram esperados.\n"
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:245
#, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
@@ -238,27 +237,27 @@ msgstr[0] ""
msgstr[1] ""
"Tamanho do salt incorreto: %d bytes enquanto %d <= n <= %d eram esperados.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Caractere salt ilegal '%c'.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Senha: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Caractere de senha ilegal '0x%hhx'.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -269,10 +268,11 @@ msgstr ""
"Encripta a PASSWORD utilizando crypt(3).\n"
"\n"
-#: ../mkpasswd.c:420
+#: ../mkpasswd.c:423
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -301,7 +301,7 @@ msgstr ""
"\n"
"Reporte bugs para %s.\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Algoritmos disponveis: \n"
diff --git a/po/ru.po b/po/ru.po
index 09014e7..876b8af 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,24 +1,24 @@
# translation of ru.po to Russian
# Copyright (C) Marco d'Itri
# This file is distributed under the same license as the whois package.
-# Andy Shevchenko <andy@smile.org.ua>, 2005.
#
+# Andy Shevchenko <andy@smile.org.ua>, 2005.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: ru\n"
+"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-10 14:04+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"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"PO-Revision-Date: 2010-01-27 20:31+0300\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -27,32 +27,30 @@ msgid ""
msgstr ""
"Версия %s.\n"
"\n"
-"Замечания отправляйте на %s.\n"
+"Сообщения об ошибках отправляйте на %s.\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "Используется сервер %s.\n"
-#: ../whois.c:209
+#: ../whois.c:228
msgid "This TLD has no whois server, but you can access the whois database at"
-msgstr ""
-"Этот ДВУ не имеет whois-сервера, но можно получить доступ к базе whois на"
+msgstr "Данный TLD не имеет whois-сервера, но можно получить доступ к базе whois на"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
-msgstr "Этот ДВУ не имеет whois-сервера."
+msgstr "Данный TLD не имеет whois-сервера."
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "Нет whois-сервера для объектов данного вида."
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Неизвестный номер AS или IP-сети. Пожалуйста, обновите программу."
+msgstr "Неизвестный номер AS или IP-сеть. Пожалуйста, обновите программу."
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -63,18 +61,18 @@ msgstr ""
"Запрашивается конечная IPv4-точка %s для IPv6-адреса 6-в-4.\n"
"\n"
-#: ../whois.c:251
-#, fuzzy, c-format
+#: ../whois.c:268
+#, c-format
msgid ""
"\n"
"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
"\n"
msgstr ""
"\n"
-"Запрашивается конечная IPv4-точка %s для IPv6-адреса 6-в-4.\n"
+"Запрашивается конечная IPv4-точка %s для IPv6-адреса Teredo.\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -83,7 +81,7 @@ msgstr ""
"Строка запроса: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -96,43 +94,43 @@ msgstr ""
"Найдено перенаправление на %s.\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Невозможно разобрать строку: %s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Предупреждение: флаги RIPE используются с традиционным сервером."
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
msgstr ""
-"Катастрофическая ошибка: текст отказа был изменён.\n"
+"Катастрофическая ошибка: текст правовой оговорки был изменён.\n"
"Пожалуйста, обновите программу.\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "Узел %s не найден."
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: неизвестный сервис"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "Задержка."
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Прервано по сигналу %d..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -167,7 +165,7 @@ msgid ""
" --help display this help and exit\n"
" --version output version information and exit\n"
msgstr ""
-"Использование: whois [ОПЦИЯ]... ОБЪЕКТ...\n"
+"Использование: whois [ПАРАМЕТР]... ОБЪЕКТ...\n"
"\n"
"-l одноуровневый минимальный поиск [только RPSL]\n"
"-L найти всё при минимуме указанных совпадений\n"
@@ -198,80 +196,82 @@ msgstr ""
"-F быстрый сырой вывод (включает также -r)\n"
"-h УЗЕЛ присоединиться к УЗЛУ\n"
"-p ПОРТ присоединиться к ПОРТУ\n"
-"-H скрыть легальные отказы\n"
+"-H скрыть правовые оговорки\n"
" --verbose разъяснять, что происходит\n"
-" --help отобразить эту помощь и выйти\n"
-" --version вывести информацию о версии и выйти\n"
+" --help показать эту справку и закончить работу\n"
+" --version показать информацию о версии и закончить работу\n"
#: ../mkpasswd.c:80
-#, fuzzy
msgid "standard 56 bit DES-based crypt(3)"
-msgstr "\tстандартный 56 битный, базирующийся на DES, алгоритм crypt(3)"
+msgstr "стандартный 56-битный, базирующийся на DES, crypt(3)"
-#: ../mkpasswd.c:159
-#, fuzzy, c-format
+#: ../mkpasswd.c:162
+#, c-format
msgid "Invalid method '%s'.\n"
-msgstr "Неверный номер '%s'.\n"
+msgstr "Неверный метод '%s'.\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Неверный номер '%s'.\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
-msgstr "Выполните '%s --help' для дополнительной информации.\n"
+msgstr "Доп. информацию можно получить, запустив '%s --help'.\n"
-#: ../mkpasswd.c:237
-#, fuzzy, c-format
+#: ../mkpasswd.c:240
+#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
-msgstr[0] "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
-msgstr[1] "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
+msgstr[0] "Неверная длина соли: %d байт при ожидаемой %d.\n"
+msgstr[1] "Неверная длина соли: %d байта при ожидаемой %d.\n"
+msgstr[2] "Неверная длина соли: %d байт при ожидаемой %d.\n"
-#: ../mkpasswd.c:242
-#, fuzzy, c-format
+#: ../mkpasswd.c:245
+#, c-format
msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
-msgstr[0] "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
-msgstr[1] "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
+msgstr[0] "Неверная длина соли: %d байт при ожидаемой %d <= n <= %d.\n"
+msgstr[1] "Неверная длина соли: %d байта при ожидаемой %d <= n <= %d.\n"
+msgstr[2] "Неверная длина соли: %d байт при ожидаемой %d <= n <= %d.\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
-msgstr "Неверный salt-символ '%c'.\n"
+msgstr "Недопустимый для соли символ '%c'.\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "Пароль: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
-msgstr "Неверный символ пароля '0x%hhx'.\n"
+msgstr "Недопустимый для пароля символ '0x%hhx'.\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
-msgstr ""
+msgstr "Данный метод не поддерживается crypt(3).\n"
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
"Crypts the PASSWORD using crypt(3).\n"
"\n"
msgstr ""
-"Использование: mkpasswd [ОПЦИИ]... [ПАРОЛЬ [SALT]]\n"
-"Кодирует ПАРОЛЬ, используя алгоритм crypt(3).\n"
+"Использование: mkpasswd [ПАРАМЕТРЫ]... [ПАРОЛЬ [СОЛЬ]]\n"
+"Шифрует ПАРОЛЬ, используя crypt(3).\n"
"\n"
-#: ../mkpasswd.c:420
-#, fuzzy, c-format
+#: ../mkpasswd.c:423
+#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -286,25 +286,24 @@ msgid ""
"\n"
"Report bugs to %s.\n"
msgstr ""
-" -H, --hash=ТИП выбрать ТИП хэша\n"
-" -S, --salt=SALT использовать указанный SALT\n"
-" -P, --password-fd=НОМЕР прочитать пароль из дескриптора файла с "
-"номером НОМЕР\n"
-" вместо /dev/tty\n"
-" -s, --stdin аналогично --password-fd=0\n"
-" -h, --help отобразить эту помощь и выйти\n"
-" -V, --version вывести информацию о версии и выйти\n"
+" -m, --method=ТИП использовать метод ТИП\n"
+" -5 аналогично --method=md5\n"
+" -S, --salt=СОЛЬ использовать указанную СОЛЬ\n"
+" -R, --rounds=ЧИСЛО использовать указанное ЧИСЛО округлений\n"
+" -P, --password-fd=НОМЕР прочитать пароль из дескриптора файла\n"
+" с НОМЕРом вместо /dev/tty\n"
+" -s, --stdin аналогично --password-fd=0\n"
+" -h, --help показать эту справку и закончить работу\n"
+" -V, --version показать версию и закончить работу\n"
"\n"
-"Если ПАРОЛЬ опущен, он будет затребован интерактивно.\n"
-"Если не указан SALT, он будет создан псевдослучайно.\n"
-"Если ТИП будет 'help', то будут распечатаны доступные алгоритмы.\n"
+"Если ПАРОЛЬ не задан, то он будет затребован интерактивно.\n"
+"Если не указана СОЛЬ, то будет сгенерировано произвольное значение.\n"
+"Если значение ТИП равно 'help', то будет показан список доступных методов.\n"
"\n"
-"Замечания отправляйте на %s.\n"
+"Сообщения об ошибках отправляйте на %s.\n"
-#: ../mkpasswd.c:448
-#, fuzzy, c-format
+#: ../mkpasswd.c:452
+#, c-format
msgid "Available methods:\n"
-msgstr "Доступные алгоритмы:\n"
+msgstr "Доступные методы:\n"
-#~ msgid "Invalid hash type '%s'.\n"
-#~ msgstr "Неверный тип хэша '%s'.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 168c7cd..1983954 100755..100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,10 +6,10 @@
msgid ""
msgstr ""
"Project-Id-Version: whois\n"
-"Report-Msgid-Bugs-To: Feng Liu <maximliu@gmail.com>\n"
-"POT-Creation-Date: 2009-10-18 10:45+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-01-27 13:38+0100\n"
"PO-Revision-Date: 2009-10-24 03:59+0000\n"
-"Last-Translator: Feng Liu(Maxim)\n"
+"Last-Translator: Feng Liu (Maxim) <maximliu@googlemail.com>\n"
"Language-Team: Chinese (China) <zh_CN@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +17,7 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-11-10 02:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: ../whois.c:120
+#: ../whois.c:136
#, c-format
msgid ""
"Version %s.\n"
@@ -28,30 +28,28 @@ msgstr ""
"\n"
"将 bugs 提交到 %s。\n"
-#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
+#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
#, c-format
msgid "Using server %s.\n"
msgstr "使用服务器 %s。\n"
-#: ../whois.c:209
-msgid ""
-"This TLD has no whois server, but you can access the whois database at"
+#: ../whois.c:228
+msgid "This TLD has no whois server, but you can access the whois database at"
msgstr "此顶级域名没有 whois 服务器,但您可在这里访问 whois 数据库:"
-#: ../whois.c:214
+#: ../whois.c:233
msgid "This TLD has no whois server."
msgstr "此顶级域名没有对应的 whois 服务器。"
-#: ../whois.c:217
+#: ../whois.c:236
msgid "No whois server is known for this kind of object."
msgstr "无针对此类对象的 whois 服务器。"
-#: ../whois.c:220
+#: ../whois.c:239
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "未知的 AS 号码或 IP 地址。请升级此程序。"
-#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:244
+#: ../whois.c:262
#, c-format
msgid ""
"\n"
@@ -62,7 +60,7 @@ msgstr ""
"查询和一个6to4 IPv6 地址相对应的 IPv4 终端 %s。\n"
"\n"
-#: ../whois.c:251
+#: ../whois.c:268
#, c-format
msgid ""
"\n"
@@ -73,7 +71,7 @@ msgstr ""
"查询一个Teredo IPv6 地址相对应的 IPv4 终端 %s。\n"
"\n"
-#: ../whois.c:269
+#: ../whois.c:287
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +80,7 @@ msgstr ""
"查询字符串: \"%s\"\n"
"\n"
-#: ../whois.c:279
+#: ../whois.c:297
#, c-format
msgid ""
"\n"
@@ -95,16 +93,16 @@ msgstr ""
"发现一个到 %s 的引用。\n"
"\n"
-#: ../whois.c:322 ../whois.c:325
+#: ../whois.c:339 ../whois.c:342
#, c-format
msgid "Cannot parse this line: %s"
msgstr "不能分析该行:%s"
-#: ../whois.c:480
+#: ../whois.c:506
msgid "Warning: RIPE flags used with a traditional server."
msgstr "警告: 对传统服务器使用了 RIPE 标志。"
-#: ../whois.c:618 ../whois.c:753
+#: ../whois.c:657 ../whois.c:806
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +110,26 @@ msgstr ""
"严重错误: 声明(disclaimer)文本已经被改变。\n"
"请升级此程序。\n"
-#: ../whois.c:805
+#: ../whois.c:858
#, c-format
msgid "Host %s not found."
msgstr "没有找到主机 %s。"
-#: ../whois.c:815
+#: ../whois.c:868
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: 未知服务"
-#: ../whois.c:890
+#: ../whois.c:943
msgid "Timeout."
msgstr "超时。"
-#: ../whois.c:896
+#: ../whois.c:949
#, c-format
msgid "Interrupted by signal %d..."
msgstr "被信号 %d 中断..."
-#: ../whois.c:1100
+#: ../whois.c:1175
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -184,8 +182,10 @@ msgstr ""
"-a 搜寻所有数据库\n"
"-s SOURCE[,SOURCE]... 从指定 SOURCE 中搜寻数据库\n"
"-g SOURCE:FIRST-LAST 从 SOURCE 中查找更新,按照从开始到结束的序列\n"
-"-t TYPE 为指定类型(TYPE)对象请求模板(template) ('all'为一个列表)\n"
-"-v TYPE 为指定类型(TYPE)对象请求冗余信息模板(verbose template) \n"
+"-t TYPE 为指定类型(TYPE)对象请求模板(template) ('all'为一个列"
+"表)\n"
+"-v TYPE 为指定类型(TYPE)对象请求冗余信息模板(verbose "
+"template) \n"
"-q [version|sources|types] 查询特定的服务器信息[仅 RPSL]\n"
"-F 快速输出原始数据(raw) (隐含 -r)\n"
"-h HOST 连接到指定 HOST 服务器\n"
@@ -199,52 +199,58 @@ msgstr ""
msgid "standard 56 bit DES-based crypt(3)"
msgstr "以标准56位DES为基础的 crypt(3)"
-#: ../mkpasswd.c:159
+#: ../mkpasswd.c:162
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "无效方式 '%s'。\n"
-#: ../mkpasswd.c:168 ../mkpasswd.c:178
+#: ../mkpasswd.c:171 ../mkpasswd.c:181
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "无效的数字 '%s'。\n"
-#: ../mkpasswd.c:196
+#: ../mkpasswd.c:199
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "尝试用 '%s --help' 获取更多的信息。\n"
-#: ../mkpasswd.c:237
-#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "错误的 salt 长度: 当前为 %d 字节,预期长度为 %d 字节。\n"
+#: ../mkpasswd.c:240
+#, fuzzy, c-format
+msgid "Wrong salt length: %d byte when %d expected.\n"
+msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
+msgstr[0] "错误的 salt 长度: 当前为 %d 字节,预期长度为 %d 字节。\n"
+msgstr[1] "错误的 salt 长度: 当前为 %d 字节,预期长度为 %d 字节。\n"
-#: ../mkpasswd.c:241
-#, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "错误的 salt 长度: 当前为 %d 字节,预期长度范围为 %d <= n <= %d 字节。\n"
+#: ../mkpasswd.c:245
+#, fuzzy, c-format
+msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
+msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
+msgstr[0] ""
+"错误的 salt 长度: 当前为 %d 字节,预期长度范围为 %d <= n <= %d 字节。\n"
+msgstr[1] ""
+"错误的 salt 长度: 当前为 %d 字节,预期长度范围为 %d <= n <= %d 字节。\n"
-#: ../mkpasswd.c:251
+#: ../mkpasswd.c:254
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "非法的 salt 字符 '%c'。\n"
-#: ../mkpasswd.c:296 ../mkpasswd.c:323
+#: ../mkpasswd.c:299 ../mkpasswd.c:326
#, c-format
msgid "Password: "
msgstr "密码: "
-#: ../mkpasswd.c:317
+#: ../mkpasswd.c:320
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "非法的密码字符 '0x%hhx'。\n"
-#: ../mkpasswd.c:339
+#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "不被 crypt(3) 支持的方法。\n"
-#: ../mkpasswd.c:417
+#: ../mkpasswd.c:420
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -255,10 +261,11 @@ msgstr ""
"用 crypt(3) 加密 PASSWORD。\n"
"\n"
-#: ../mkpasswd.c:420
-#, c-format
+#: ../mkpasswd.c:423
+#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
+" -5 like --method=md5\n"
" -S, --salt=SALT use the specified SALT\n"
" -R, --rounds=NUMBER use the specified NUMBER of rounds\n"
" -P, --password-fd=NUM read the password from file descriptor NUM\n"
@@ -273,14 +280,14 @@ msgid ""
"\n"
"Report bugs to %s.\n"
msgstr ""
-" -m, --method=TYPE 选择使用 TYPE 的方法\n"
-" -S, --salt=SALT 使用指定 SALT\n"
-" -R, --rounds=NUMBER 使用指定的循环次数\n"
-" -P, --password-fd=NUM 从文件描述符 NUM 中读取密码来\n"
-" 替代从 /dev/tty 中获取密码\n"
-" -s, --stdin 同 --password-fd=0\n"
-" -h, --help 显示帮助信息并退出\n"
-" -V, --version 输出版本信息并退出\n"
+" -m, --method=TYPE \t选择使用 TYPE 的方法\n"
+" -S, --salt=SALT \t\t使用指定 SALT\n"
+" -R, --rounds=NUMBER \t使用指定的循环次数\n"
+" -P, --password-fd=NUM \t从文件描述符 NUM 中读取密码来\n"
+"\t\t\t\t替代从 /dev/tty 中获取密码\n"
+" -s, --stdin \t\t同 --password-fd=0\n"
+" -h, --help \t\t显示帮助信息并退出\n"
+" -V, --version \t\t输出版本信息并退出\n"
"\n"
"如果密码不存在,将会要求输入密码。\n"
"如果未指定,将会随机生成一个SALT。\n"
@@ -288,7 +295,7 @@ msgstr ""
"\n"
"请将BUGS提交给 %s。\n"
-#: ../mkpasswd.c:448
+#: ../mkpasswd.c:452
#, c-format
msgid "Available methods:\n"
msgstr "可用方式:\n"
diff --git a/tld_serv_list b/tld_serv_list
index 5cc6e80..b423c7b 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -113,7 +113,7 @@
.cy WEB http://www.nic.cy/nslookup/online_database.php
.cz whois.nic.cz
.de whois.denic.de
-.dj whois.domain.dj
+.dj NONE
.dk whois.dk-hostmaster.dk
.dm whois.nic.dm
.do WEB http://www.nic.do/whois-h.php3
@@ -202,7 +202,7 @@
.mh NONE # www.nic.net.mh
.mk WEB http://dns.marnet.net.mk/registar.php
.ml NONE # NIC? www.sotelma.ml
-.mm NONE # NO NIC
+.mm NONE # www.nic.mm
.mn AFILIAS
.mo WEB http://www.monic.net.mo/
.mp NONE # get.mp
@@ -242,7 +242,7 @@
.pr whois.nic.pr
.ps WEB http://www.nic.ps/whois/whois.html
.pt whois.dns.pt
-.pw NONE # NO NIC
+.pw NONE # http://www.pwregistry.pw/
.py WEB http://www.nic.py/consultas.html
.qa NONE # http://www.qtel.com.qa/InternetFeatures.do
.re whois.nic.fr
@@ -272,7 +272,7 @@
.sy NONE # NIC? www.ste.gov.sy
.sz NONE # http://www.sispa.org.sz/
.tc whois.adamsnames.tc
-.td NONE # NIC? http://www.sotel.td/ was http://www.nic.td/
+.td NONE # NIC? http://www.sotel.td/ was http://www.nic.td/ . http://www.tit.td/ ?
.tf whois.nic.tf
.tg WEB http://www.nic.tg/
.th whois.thnic.net
diff --git a/whois.spec b/whois.spec
index 0179366..cc991df 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
Summary: Enhanced WHOIS client
Name: whois
-Version: 5.0.0
+Version: 5.0.1
Release: 1
License: GPL
Vendor: Marco d'Itri <md@linux.it>