summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile16
-rw-r--r--as_del_list1
-rw-r--r--config.h3
-rw-r--r--data.h1
-rw-r--r--debian/changelog40
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules8
-rw-r--r--ip_del_list7
-rw-r--r--mkpasswd.c56
-rw-r--r--po/Makefile2
-rw-r--r--po/cs.po68
-rw-r--r--po/da.po301
-rw-r--r--po/de.po76
-rw-r--r--po/el.po68
-rw-r--r--po/es.po96
-rw-r--r--po/eu.po66
-rw-r--r--po/fi.po86
-rw-r--r--po/fr.po70
-rw-r--r--po/it.po77
-rw-r--r--po/ja.po68
-rw-r--r--po/no.po63
-rw-r--r--po/pl.po68
-rw-r--r--po/pt_BR.po68
-rw-r--r--po/ru.po73
-rw-r--r--po/zh_CN.po82
-rw-r--r--servers_charset.h35
-rw-r--r--servers_charset_list6
-rw-r--r--tld_serv_list67
-rw-r--r--whois.112
-rw-r--r--whois.c40
-rw-r--r--whois.h2
-rw-r--r--whois.spec2
32 files changed, 979 insertions, 653 deletions
diff --git a/Makefile b/Makefile
index 44f09dd..8ac844d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
prefix = /usr
-CFLAGS = -g -O2
+CFLAGS ?= -g -O2
PERL = perl
INSTALL = install
@@ -44,17 +44,23 @@ endif
ifdef HAVE_XCRYPT
mkpasswd_LDADD += -lxcrypt
-DEFS += -DHAVE_XCRYPT
+DEFS += -DHAVE_XCRYPT -DHAVE_LINUX_CRYPT_GENSALT
else
+ifdef HAVE_LINUX_CRYPT_GENSALT
+# owl and openSUSE have crypt_gensalt(3) in the libc's libcrypt
+DEFS += -DHAVE_LINUX_CRYPT_GENSALT
+endif
mkpasswd_LDADD += -lcrypt
endif
+CPPFLAGS += $(DEFS) $(INCLUDES)
+
##############################################################################
all: Makefile.depend whois mkpasswd #pos
##############################################################################
%.o: %.c
- $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) -c $<
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $<
whois: $(whois_OBJECTS)
$(CC) $(LDFLAGS) -o $@ $^ $(whois_LDADD) $(LIBS)
@@ -104,7 +110,7 @@ distclean: clean
clean:
rm -f Makefile.depend as_del.h ip_del.h ip6_del.h tld_serv.h \
- *.o whois mkpasswd
+ servers_charset.h *.o whois mkpasswd
rm -f po/*.mo
pos:
@@ -112,6 +118,6 @@ pos:
depend: Makefile.depend
Makefile.depend:
- $(CC) $(DEFS) $(INCLUDES) $(CFLAGS) -MM -MG *.c > $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) -MM -MG *.c > $@
-include Makefile.depend
diff --git a/as_del_list b/as_del_list
index a20d1a7..70683f6 100644
--- a/as_del_list
+++ b/as_del_list
@@ -66,6 +66,7 @@
52224 53247 lacnic
55296 56319 apnic
56320 58367 ripe
+58368 59391 apnic
# catch all: everything else comes from ARIN
1 55295 arin
diff --git a/config.h b/config.h
index f357096..68270da 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
/* Program version */
-#define VERSION "5.0.11"
+#define VERSION "5.0.12"
/* Configurable features */
@@ -54,6 +54,7 @@
/* Unknown versions of Solaris */
#if defined __SVR4 && defined __sun
# define HAVE_SHA_CRYPT
+# define HAVE_SOLARIS_CRYPT_GENSALT
#endif
/* FIXME: which systems lack this? */
diff --git a/data.h b/data.h
index 89984fa..1eebc03 100644
--- a/data.h
+++ b/data.h
@@ -67,6 +67,7 @@ const char *hide_strings[] = {
"mTLD WHOIS LEGAL STATEMENT", "integrity of the database.", /* .mobi */
"Access to RegistryPro's Whois", "All rights", /* .pro */
"Telnic, Ltd., the Registry Operator", "(b) harass any person;", /* .tel */
+ "Access to the .XXX WHOIS", "", /* .xxx */
NULL, NULL
};
diff --git a/debian/changelog b/debian/changelog
index 9d17ef9..00d040e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+whois (5.0.12) unstable; urgency=low
+
+ * Recursion disabled when the query string contains spaces, because
+ probably the query format will not be compatible with the referral
+ server (e.g. whois to rwhois or ARIN to RIPE).
+ * Add the "+" flag by default to queries to whois.arin.net if the
+ argument looks like an IP address. Also add the "a" and "n" flags.
+ No thanks to ARIN for breaking every whois client.
+ * Added the .cv, .lk, .mq, .sy, .so, .biz.ua, .co.ua, .pp.ua, .qa,
+ .xn--3e0b707e (.한국, Korea), .xn--45brj9c (.ভারত, India, Bengali),
+ .xn--90a3ac (.СРБ, Serbia), .xn--clchc0ea0b2g2a9gcd (.சிங்கப்பூர்,
+ Singapore, Tamil), .xn--fpcrj9c3d (.భారత్, India, Telugu), .xn--fzc2c9e2c
+ (.ලංකා, Sri Lanka, Sinhala), .xn--gecrj9c (.ભારત, India, Gujarati),
+ .xn--h2brj9c (.भारत, India, Hindi), .xn--lgbbat1ad8j (.الجزائر, Algeria),
+ .xn--mgbayh7gpa (.الاردن, Jordan), .xn--mgbbh1a71e (.بھارت, India, Urdu),
+ .xn--mgbc0a9azcg (.المغرب, Morocco), .xn--ogbpf8fl (.سورية, Syria),
+ .xn--s9brj9c (.ਭਾਰਤ, India, Punjabi), .xn--xkc2al3hye2a (.இலங்கை, Sri
+ Lanka, Tamil), .xn--wgbl6a (.قطر, Qatar), .xn--xkc2dl3a5ee0h
+ (.இந்தியா, India, Tamil), .xn--yfro4i67o (.新加坡, Singapore, Chinese) and
+ .xxx TLD servers. (Closes: #642424),
+ * Added the .priv.at pseudo-SLD server.
+ * Updated the .co, .gf, .gp, .kr, .li, .rs, .ru, .su, .sv, .ua and
+ .xn--p1ai TLD servers. (Closes: #590425, #634830, #627478)
+ * Added a new ASN allocation.
+ * Fixed a typo and -t syntax in whois(1). (Closes: #614973, #632588)
+ * Made whois return an error in some cases, code contributed by
+ David Souther.
+ * Split HAVE_LINUX_CRYPT_GENSALT from HAVE_XCRYPT to support SuSE,
+ which has it builtin in the libc. Added untested support for Solaris'
+ crypt_gensalt(3). This and the following changes have been contributed
+ by Ludwig Nussel of SuSE.
+ * mkpasswd: stop rejecting non-ASCII characters.
+ * mkpasswd: added support for the 2y algorithm, which fixes CVE-2011-2483.
+ * mkpasswd: raised the number of rounds for 2a/2y from 4 to 5, which is
+ the current default.
+ * mkpasswd: removed support for 2 and {SHA}, which actually are not
+ supported by FreeBSD and libxcrypt.
+
+ -- Marco d'Itri <md@linux.it> Mon, 10 Oct 2011 02:04:32 +0200
+
whois (5.0.11) unstable; urgency=medium
* Added the remaining IPv4 allocations.
diff --git a/debian/control b/debian/control
index f938941..0109f48 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: whois
Section: net
Priority: standard
Maintainer: Marco d'Itri <md@linux.it>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
Build-Depends: debhelper (>= 5), gettext, libidn11-dev
Package: whois
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: an intelligent whois client
+Description: 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)
programs.
diff --git a/debian/rules b/debian/rules
index e1d38d6..9111f55 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,9 @@
#!/usr/bin/make -f
SHELL+= -e
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+
#export DH_VERBOSE=1
D := $(shell pwd)/debian/whois
@@ -45,7 +48,10 @@ binary: binary-arch
binary-indep:
+build-arch: build
+build-indep: build
+
checkroot:
test root = "`whoami`"
-.PHONY: binary binary-arch binary-indep build clean checkroot
+.PHONY: binary binary-arch binary-indep build build-arch build-indep clean checkroot
diff --git a/ip_del_list b/ip_del_list
index 6630dd9..646c134 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -81,7 +81,8 @@
151.64.0.0/11 ripe
151.96.0.0/14 ripe
151.100.0.0/16 ripe
-#153.0.0.0/8 apnic
+153.128.0.0/9 whois.nic.ad.jp
+153.0.0.0/8 apnic
154.0.0.0/8 afrinic
155.232.0.0/13 afrinic
155.240.0.0/16 afrinic
@@ -98,7 +99,7 @@
163.195.0.0/16 afrinic
163.196.0.0/14 afrinic
163.200.0.0/14 afrinic
-#163.0.0.0/8 apnic
+163.0.0.0/8 apnic
164.0.0.0/11 ripe
164.32.0.0/13 ripe
164.40.0.0/16 ripe
@@ -111,7 +112,7 @@
169.208.0.0/12 apnic
171.16.0.0/12 ripe
171.32.0.0/15 ripe
-#171.0.0.0/8 apnic
+171.0.0.0/8 apnic
175.192.0.0/10 whois.nic.or.kr
175.0.0.0/8 apnic
176.0.0.0/8 ripe
diff --git a/mkpasswd.c b/mkpasswd.c
index 176d980..1b8ba34 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -36,6 +36,10 @@
#include <xcrypt.h>
#include <sys/stat.h>
#endif
+#ifdef HAVE_LINUX_CRYPT_GENSALT
+#define _OW_SOURCE
+#include <crypt.h>
+#endif
#ifdef HAVE_GETTIMEOFDAY
#include <sys/time.h>
#endif
@@ -79,12 +83,14 @@ static const struct crypt_method methods[] = {
{ "des", "", 2, 2, 0,
N_("standard 56 bit DES-based crypt(3)") },
{ "md5", "$1$", 8, 8, 0, "MD5" },
-#if defined FreeBSD
- { "bf", "$2$", 22, 22, 0, "Blowfish (FreeBSD)" },
-#endif
-#if defined OpenBSD || (defined __SVR4 && defined __sun) || defined HAVE_XCRYPT
+#if defined OpenBSD || defined FreeBSD || (defined __SVR4 && defined __sun)
{ "bf", "$2a$", 22, 22, 1, "Blowfish" },
#endif
+#if defined HAVE_LINUX_CRYPT_GENSALT
+ { "bf", "$2a$", 22, 22, 1, "Blowfish, system-specific on 8-bit chars" },
+ /* algorithm 2y fixes CVE-2011-2483 */
+ { "bfy", "$2y$", 22, 22, 1, "Blowfish, correct handling of 8-bit chars" },
+#endif
#if defined FreeBSD
{ "nt", "$3$", 0, 0, 0, "NT-Hash" },
#endif
@@ -103,9 +109,6 @@ static const struct crypt_method methods[] = {
#if defined __SVR4 && defined __sun
{ "sunmd5", "$md5$", 8, 8, 1, "SunMD5" },
#endif
-#if defined HAVE_XCRYPT
- { "sha", "{SHA}", 0, 0, 0, "SHA-1" },
-#endif
{ NULL, NULL, 0, 0, 0, NULL }
};
@@ -222,10 +225,11 @@ int main(int argc, char *argv[])
salt_prefix = methods[0].prefix;
}
- if (streq(salt_prefix, "$2a$")) { /* OpenBSD Blowfish */
- if (rounds <= 4)
- rounds = 4;
- /* actually for 2a it is the logarithm of the number of rounds */
+ if (streq(salt_prefix, "$2a$") || streq(salt_prefix, "$2y$")) {
+ /* OpenBSD Blowfish and derivatives */
+ if (rounds <= 5)
+ rounds = 5;
+ /* actually for 2a/2y it is the logarithm of the number of rounds */
snprintf(rounds_str, sizeof(rounds_str), "%02u$", rounds);
} else if (rounds_support && rounds)
snprintf(rounds_str, sizeof(rounds_str), "rounds=%u$", rounds);
@@ -264,7 +268,12 @@ int main(int argc, char *argv[])
strcat(salt, rounds_str);
strcat(salt, salt_arg);
} else {
-#ifdef HAVE_XCRYPT
+#ifdef HAVE_SOLARIS_CRYPT_GENSALT
+#error "This code path is untested on Solaris. Please send a patch."
+ salt = crypt_gensalt(salt_prefix, NULL);
+ if (!salt)
+ perror(stderr, "crypt_gensalt");
+#elif defined HAVE_LINUX_CRYPT_GENSALT
void *entropy = get_random_bytes(64);
salt = crypt_gensalt(salt_prefix, rounds, entropy, 64);
@@ -293,7 +302,7 @@ int main(int argc, char *argv[])
if (password) {
} else if (password_fd != -1) {
FILE *fp;
- unsigned char *p;
+ char *p;
if (isatty(password_fd))
fprintf(stderr, _("Password: "));
@@ -308,20 +317,9 @@ int main(int argc, char *argv[])
exit(2);
}
- p = (unsigned char *)password;
- while (*p) {
- if (*p == '\n' || *p == '\r') {
- *p = '\0';
- break;
- }
- /* which characters are valid? */
- if (*p > 0x7f) {
- fprintf(stderr,
- _("Illegal password character '0x%hhx'.\n"), *p);
- exit(1);
- }
- p++;
- }
+ p = strpbrk(password, "\n\r");
+ if (p)
+ *p = '\0';
} else {
password = getpass(_("Password: "));
if (!password) {
@@ -338,7 +336,9 @@ int main(int argc, char *argv[])
fprintf(stderr, "crypt failed.\n");
exit(2);
}
- if (!strneq(result, salt_prefix, strlen(salt_prefix))) {
+ /* yes, using strlen(salt_prefix) on salt. It's not
+ * documented whether crypt_gensalt may change the prefix */
+ if (!strneq(result, salt, strlen(salt_prefix))) {
fprintf(stderr, _("Method not supported by crypt(3).\n"));
exit(2);
}
diff --git a/po/Makefile b/po/Makefile
index dc65b9f..9b73bf9 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.mo
+CATALOGS = cs.mo da.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 5894660..f8dfa8d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5,16 +5,17 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\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"
+"Language: cs\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -26,31 +27,31 @@ msgstr ""
"Chyby programu hlaste na %s (anglicky), chyby překladu na\n"
"<translation-team-cs@lists.sourceforge.net> (česky).\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Používám server %s.\n"
-#: ../whois.c:228
+#: ../whois.c:237
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:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "Tato TLD nemá žádný whoisový server."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "Pro tento druh objektu není znám žádný whoisový server."
-#: ../whois.c:239
+#: ../whois.c:248
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."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -61,7 +62,7 @@ msgstr ""
"Dotazuji se na IPv4 konec %s příslušející 6to4 IPv6 adrese.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -72,7 +73,7 @@ msgstr ""
"Dotazuji se na IPv4 konec %s příslušející Teredo IPv6 adrese.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +82,7 @@ msgstr ""
"Znění dotazu: „%s“\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -94,16 +95,16 @@ msgstr ""
"Nalezen odkaz na %s.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Tento řádek nemohu rozebrat: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Varování: RIPE příznak použit s tradičním serverem."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,27 +112,27 @@ 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:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "Jméno počítače %s nenalezeno."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/TCP: neznámá služba"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Čas vypršel."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Přerušeno signálem %d…"
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -153,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\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"
@@ -199,26 +199,26 @@ msgstr ""
" --help zobrazí tuto nápovědu a skončí\n"
" --version vypíše informace o verzi a skončí\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr "standardní crypt(3) založený na 56bitové šifře DES"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Neplatná metoda „%s“.\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Neplatné číslo „%s“.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Pro podrobnosti zkuste příkaz „%s --help“.\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -226,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:245
+#: ../mkpasswd.c:249
#, 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"
@@ -234,21 +234,16 @@ 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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Neplatný znak v soli „%c“.\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Heslo: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "Zakázaný znak v hesle „0x%hhx“.\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -306,6 +301,9 @@ msgstr ""
msgid "Available methods:\n"
msgstr "Dostupné metody:\n"
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Zakázaný znak v hesle „0x%hhx“.\n"
+
#~ msgid "Invalid hash type '%s'.\n"
#~ msgstr "Neplatný druh hashe „%s“.\n"
diff --git a/po/da.po b/po/da.po
new file mode 100644
index 0000000..620d76b
--- /dev/null
+++ b/po/da.po
@@ -0,0 +1,301 @@
+# Translation of whois to Danish.
+# Copyright (C) 2001 Simon Richter <Simon.Richter@in.tum.de>, 2004 Adrian
+# Bunk <bunk@fs.tum.de>, 2010 Chris Leick <c.leick@vollbio.de>.
+# This file is distributed under the same license as the whois package.
+# Joe Hansen <joedalton2@yahoo.dk>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: whois 5.0.11\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\n"
+"PO-Revision-Date: 2011-03-20 17:30+01:00\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: ../whois.c:145
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"Version %s.\n"
+"\n"
+"Rapporter fejl til %s (på engelsk).\n"
+
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Bruger server %s.\n"
+
+#: ../whois.c:237
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr "Denne TLD har ingen whois-server, men du kan tilgå whois-databasen på"
+
+#: ../whois.c:242
+msgid "This TLD has no whois server."
+msgstr "Denne TLD har ingen whois-server."
+
+#: ../whois.c:245
+msgid "No whois server is known for this kind of object."
+msgstr "Ingen whois-server er kendt for denne type af objekt."
+
+#: ../whois.c:248
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "Ukendt AS- eller IP-netværksnummer. Opgrader venligst dette program."
+
+#: ../whois.c:271
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Forespørger efter IPv4-slutpunktet %s for en 6to4 IPv6-adresse.\n"
+"\n"
+
+#: ../whois.c:277
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Forespørger efter IPv4-slutpunktet %s for en Teredo IPv6-adresse.\n"
+"\n"
+
+#: ../whois.c:296
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"Forespørgelsesstreng: »%s«\n"
+"\n"
+
+#: ../whois.c:306
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"Fandt en henvisning til %s.\n"
+"\n"
+
+#: ../whois.c:348 ../whois.c:351
+#, c-format
+msgid "Cannot parse this line: %s"
+msgstr "Kan ikke fortolke denne linje: %s"
+
+#: ../whois.c:520
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "Advarsel: RIPE-flag brugt med en traditionel server."
+
+#: ../whois.c:674 ../whois.c:823
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"Katastrofal fejl: Teksten for ansvarsfraskrivelse er blevet ændret.\n"
+"Opgrader venligst dette program.\n"
+
+#: ../whois.c:875
+#, c-format
+msgid "Host %s not found."
+msgstr "Vært %s er ikke fundet."
+
+#: ../whois.c:885
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp: Ukendt tjeneste"
+
+#: ../whois.c:960
+msgid "Timeout."
+msgstr "Tidsudløb."
+
+#: ../whois.c:966
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "Afbrudt af signal %d..."
+
+#: ../whois.c:1223
+#, fuzzy, c-format
+msgid ""
+"Usage: whois [OPTION]... OBJECT...\n"
+"\n"
+"-l one level less specific lookup [RPSL only]\n"
+"-L find all Less specific matches\n"
+"-m find first level more specific matches\n"
+"-M find all More specific matches\n"
+"-c find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x exact match [RPSL only]\n"
+"-d return DNS reverse delegation objects too [RPSL "
+"only]\n"
+"-i ATTR[,ATTR]... do an inverse lookup for specified ATTRibutes\n"
+"-T TYPE[,TYPE]... only look for objects of TYPE\n"
+"-K only primary keys are returned [RPSL only]\n"
+"-r turn off recursive lookups for contact information\n"
+"-R force to show local copy of the domain object even\n"
+" if it contains referral\n"
+"-a search all databases\n"
+"-s SOURCE[,SOURCE]... search the database from SOURCE\n"
+"-g SOURCE:FIRST-LAST find updates from SOURCE from serial FIRST to LAST\n"
+"-t TYPE request template for object of TYPE\n"
+"-v TYPE request verbose template for object of TYPE\n"
+"-q [version|sources|types] query specified server info [RPSL only]\n"
+"-F fast raw output (implies -r)\n"
+"-h HOST connect to server HOST\n"
+"-p PORT connect to PORT\n"
+"-H hide legal disclaimers\n"
+" --verbose explain what is being done\n"
+" --help display this help and exit\n"
+" --version output version information and exit\n"
+msgstr ""
+"Brug: whois [TILVALG]... OBJEKT...\n"
+"\n"
+"-l et niveau mindre specifik opslag [kun RPSL]\n"
+"-L find alle mindre specifikke resultater\n"
+"-m find første niveau mere specifikke resultater\n"
+"-M find alle mere specifikke resultater\n"
+"-c find det mindste resultat der indeholder attributten\n"
+"\t\t\tmnt-irt\n"
+"-x præcis match [kun RPSL]\n"
+"-d returner også DNS-omvendte delegationsobjekter\n"
+" [kun RPSL]\n"
+"-i ATTR[,ATTR]... foretag et omvendt opslag for angivne ATTRibutter\n"
+"-T TYPE[,TYPE]... kig kun efter objekter i form af TYPE\n"
+"-K kun primære nøgler returneres [kun RPSL]\n"
+"-r deaktiver omvendte opslag for kontaktinformation\n"
+"-R fremtving visning af lokal kopi af domæneobjektet "
+"selv\n"
+" hvis det indeholder henvisning\n"
+"-a søg i alle databaser\n"
+"-s KILDE[,KILDE]... søg databasen fra KILDE\n"
+"-g KILDE:FØRST-SIDST find opdateringer fra KILDE fra seriel FØRST til "
+"SIDST\n"
+"-t TYPE anmod om skabelon for objekttypen TYPE (»all« for en\n"
+" liste)\n"
+"-v TYPE anmod om uddybende skabelon for objekttypen TYPE\n"
+"-q [version|kilder|typer] forespørg angivet serverinfo [kun RPSL]\n"
+"-F hurtig råuddata (-r underforstås)\n"
+"-h VÆRT forbind til server VÆRT\n"
+"-p PORT forbind til PORT\n"
+"-H skjul juridisk ansvarsfraskrivelse\n"
+" --verbose forklar hvad der sker\n"
+" --help vis denne hjælpetekst og afslut\n"
+" --version vis versionsinformation og afslut\n"
+
+#: ../mkpasswd.c:84
+msgid "standard 56 bit DES-based crypt(3)"
+msgstr "standard 56-Bit DES-baseret Crypt(3)"
+
+#: ../mkpasswd.c:165
+#, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "Ugyldig metode »%s«\n"
+
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "Ugyldigt tal »%s«.\n"
+
+#: ../mkpasswd.c:202
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Prøv »%s --help« for yderligere information.\n"
+
+#: ../mkpasswd.c:244
+#, 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] "Forkert salt-længde: %d byte men %d var forventet.\n"
+msgstr[1] "Forkert salt-længde: %d byte men %d var forventet.\n"
+
+#: ../mkpasswd.c:249
+#, 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] "Forkert salt-længde: %d byte men %d <= n <= %d var forventet.\n"
+msgstr[1] "Forkert salt-længde: %d byte men %d <= n <= %d var forventet.\n"
+
+#: ../mkpasswd.c:258
+#, c-format
+msgid "Illegal salt character '%c'.\n"
+msgstr "Ugyldigt salt-tegn »%c«.\n"
+
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
+#, c-format
+msgid "Password: "
+msgstr "Adgangskode: "
+
+#: ../mkpasswd.c:342
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr "Metoden er ikke understøttet af crypt(3).\n"
+
+#: ../mkpasswd.c:420
+#, c-format
+msgid ""
+"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Crypts the PASSWORD using crypt(3).\n"
+"\n"
+msgstr ""
+"Brug: mkpasswd [TILVALG] ... [ADGANGSKODE] [SALT]]\n"
+"Krypterer ADGANGSKODEN med crypt(3).\n"
+"\n"
+
+#: ../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"
+" instead of /dev/tty\n"
+" -s, --stdin like --password-fd=0\n"
+" -h, --help display this help and exit\n"
+" -V, --version output version information and exit\n"
+"\n"
+"If PASSWORD is missing then it is asked interactively.\n"
+"If no SALT is specified, a random one is generated.\n"
+"If TYPE is 'help', available methods are printed.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+" -m, --method=TYPE vælg metoden TYPE\n"
+" -5 som --method=md5\n"
+" -S, --salt=SALT brug den angivne SALT\n"
+" -R, --rounds=ANTAL brug det angivne ANTAL af runder\n"
+" -P, --password-fd=NUM læs adgangskoden fra filbeskriveren NUM\n"
+" i steden for /dev/tty\n"
+" -s, --stdin som --password-fd=0\n"
+" -h, --help vis denne hjælpetekst og afslut\n"
+" -V, --version vis versionsinformation og afslut\n"
+"\n"
+"Hvis ADGANGSKODE mangler, så spørges der efter den interaktivt.\n"
+"Hvis ingen SALT er angivet, så oprettes en vilkårlig.\n"
+"Hvis TYPE er »help«, så udskrives tilgængelige metoder.\n"
+"\n"
+"Rapporter fejl til %s (på engelsk).\n"
+
+#: ../mkpasswd.c:452
+#, c-format
+msgid "Available methods:\n"
+msgstr "Tilgængelige metoder:\n"
+
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Ugyldigt adgangskodetegn »0x%hhx«.\n"
diff --git a/po/de.po b/po/de.po
index e8a4a39..144fc4e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,17 +6,18 @@
msgid ""
msgstr ""
"Project-Id-Version: whois 5.0.1\n"
-"Report-Msgid-Bugs-To: Marco d'Itri <md@linux.it>\n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\n"
"PO-Revision-Date: 2010-02-28 11:16+GMT\n"
"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
+"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -27,32 +28,32 @@ msgstr ""
"\n"
"Berichten Sie Fehler auf Englisch an %s.\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Server %s wird benutzt.\n"
-#: ../whois.c:228
+#: ../whois.c:237
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Diese TLD hat keinen Whois-Server, kann aber auf eine Whois-Datenbank "
"zugreifen unter"
-#: ../whois.c:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "Diese TLD hat keinen Whois-Server."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "Für diese Art des Objekts ist kein Whois-Server bekannt."
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Unbekannte AS- oder IP-Netzwerk-Nummer. Bitte führen Sie ein Upgrade dieses "
"Programms durch."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -63,7 +64,7 @@ msgstr ""
"Abfrage des IPv4-Endpunkts %s einer 6to4 IPv6-Adresse.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -74,7 +75,7 @@ msgstr ""
"Abfrage des IPv4-Endpunkts %s einer Teredo-IPv6-Adresse.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -83,7 +84,7 @@ msgstr ""
"Abfragezeichenkette: »%s«\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -96,17 +97,17 @@ msgstr ""
"Verweis auf %s gefunden.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Diese Zeile kann nicht ausgewertet werden: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Warnung: RIPE-Flags wurden mit einem »traditionellen« Server verwendet."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -114,27 +115,27 @@ msgstr ""
"Katastrophaler Fehler: Haftungsausschlusstext wurde geändert.\n"
"Bitte führen Sie ein Upgrade dieses Programms durch.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "Host %s nicht gefunden."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: unbekannter Dienst"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Zeitüberschreitung"
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Durch Signal %d unterbrochen ..."
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -156,8 +157,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\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"
@@ -189,12 +189,14 @@ msgstr ""
" einen Verweis enthält\n"
"-a alle Datenbanken durchsuchen\n"
"-s QUELLE[,QUELLE]... in der Datenbank aus der QUELLE suchen\n"
-"-g QUELLE:BEGINN-ENDE finde Aktualisierungen der QUELLE von BEGINN bis ENDE\n"
+"-g QUELLE:BEGINN-ENDE finde Aktualisierungen der QUELLE von BEGINN bis "
+"ENDE\n"
"-t TYP Schablone für Typ TYP anfordern (»all« für eine \n"
" Liste)\n"
"-v TYP detaillierte Schablone für Objekt des TYPs anfordern\n"
"-q [version|sources|types]\n"
-" nach angegebener Server-Information fragen [nur RPSL]\n"
+" nach angegebener Server-Information fragen [nur "
+"RPSL]\n"
"-F »schnelle« Rohdatenausgabe (impliziert -r)\n"
"-h HOST zum Server HOST verbinden\n"
"-p PORT zu PORT verbinden\n"
@@ -203,54 +205,49 @@ msgstr ""
" --help diese Hilfe zeigen und beenden\n"
" --version Version ausgeben und beenden\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr "Standard 56-Bit DES-basiertes Crypt(3)"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Ungültige Methode »%s«\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Falsche Nummer »%s«.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Versuchen Sie »%s --help«, um weitere Informationen zu erhalten.\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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-Länge: %d Byte, aber %d wurden erwartet.\n"
msgstr[1] "Falsche Salt-Länge: %d Bytes, aber %d wurden erwartet.\n"
-#: ../mkpasswd.c:245
+#: ../mkpasswd.c:249
#, 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-Länge: %d Byte, aber %d <= n <= %d wurden erwartet.\n"
msgstr[1] "Falsche Salt-Länge: %d Bytes, aber %d <= n <= %d wurden erwartet.\n"
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Illegales Salt-Zeichen »%c«.\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Passwort: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "Illegaler Passwortzeichen »0x%hhx«.\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -306,3 +303,6 @@ msgstr ""
#, c-format
msgid "Available methods:\n"
msgstr "Verfügbare Methoden:\n"
+
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Illegaler Passwortzeichen »0x%hhx«.\n"
diff --git a/po/el.po b/po/el.po
index f91a22f..e104cd5 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,16 +6,17 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\n"
"PO-Revision-Date: 2003-12-10 08:51+0200\n"
"Last-Translator: Velonis Petros <velonis@freemail.gr>\n"
"Language-Team: Greek <velonis@freemail.gr>\n"
+"Language: el\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -26,33 +27,33 @@ msgstr ""
"\n"
"Αναφέρατε σφάλματα στο %s.\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
-#: ../whois.c:228
+#: ../whois.c:237
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την "
"βάση whois στο"
-#: ../whois.c:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr ""
"Κανένας εξυπηρετητής whois δεν είναι γνωστός για αυτού του είδους το "
"αντικείμενο."
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Άγνωστος αριθμός AS ή IP δικτύου. Παρακαλώ αναβαθμίστε αυτό το πρόγραμμα."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -63,7 +64,7 @@ msgstr ""
"Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, fuzzy, c-format
msgid ""
"\n"
@@ -74,7 +75,7 @@ msgstr ""
"Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -83,7 +84,7 @@ msgstr ""
"Αλφαριθμητικό ερώτησης: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -96,18 +97,18 @@ msgstr ""
"Βρέθηκε αναφορά στο %s.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Αδύνατη η ανάλυση αυτής της γραμμής: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Προειδοποίηση: Η σημαίες του RIPE χρησιμοποιούνται σε έναν παραδοσιακό "
"εξυπηρετητή."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -115,27 +116,27 @@ msgstr ""
"Καταστροφικό σφάλμα: το κείμενο της αποποίησης ευθυνών έχει τροποποιηθεί.\n"
"Παρακαλώ αναβαθμίστε το πρόγραμμα.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "Το σύστημα %s δε βρέθηκε."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: άγνωστη υπηρεσία"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Διάλειμμα."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Διακοπή από το σήμα %d..."
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -157,8 +158,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\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"
@@ -208,55 +208,50 @@ msgstr ""
" --help εμφάνιση αυτής της βοήθειας και έξοδος\n"
" --version εμφάνιση της έκδοσης και έξοδος\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
#, fuzzy
msgid "standard 56 bit DES-based crypt(3)"
msgstr "\tκαθεριερωμένη 56 bit με βάση το DES crypt(3)"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, fuzzy, c-format
msgid "Invalid method '%s'.\n"
msgstr "Μη αποδεκτό νούμερο '%s'.\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Μη αποδεκτό νούμερο '%s'.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Προσπάθησε '%s --help' για περισσότερες πληροφορίες.\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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:245
+#: ../mkpasswd.c:249
#, 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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Μη αποδεκτός χαρακτήρας salt '%c'.\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Συνθηματικό: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "Μη αποδεκτός χαρακτήρας συνθηματικού '0x%hhx'.\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -312,5 +307,8 @@ msgstr ""
msgid "Available methods:\n"
msgstr "Διαθέσιμοι αλγόριθμοι:\n"
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Μη αποδεκτός χαρακτήρας συνθηματικού '0x%hhx'.\n"
+
#~ msgid "Invalid hash type '%s'.\n"
#~ msgstr "Άκυρος τύπος hash '%s'.\n"
diff --git a/po/es.po b/po/es.po
index c475b9a..01530ab 100644
--- a/po/es.po
+++ b/po/es.po
@@ -31,16 +31,17 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\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"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -51,32 +52,30 @@ msgstr ""
"\n"
"Informar de fallos a %s.\n"
-#: ../whois.c:190
-#: ../whois.c:243
-#: ../whois.c:249
-#: ../whois.c:256
-#: ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Usando el servidor %s.\n"
-#: ../whois.c:228
+#: ../whois.c:237
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 base de datos de whois en"
+msgstr ""
+"Este TLD no dispone de servidor whois, pero puede acceder a la base de datos "
+"de whois en"
-#: ../whois.c:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "Este TLD no dispone de servidor whois."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "No se conoce ningún servidor de whois para esta clase de objeto."
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Numero AS o red IP desconocida. Por favor, actualice este programa."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -87,7 +86,7 @@ msgstr ""
"Consultando el punto final IPv4 de %s de una dirección IPv6 6a4.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -98,7 +97,7 @@ msgstr ""
"Consultando el punto final IPv4 de %s de una dirección IPv6 Teredo.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -107,7 +106,7 @@ msgstr ""
"Cadena de la consulta: «%s»\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -120,18 +119,16 @@ msgstr ""
"Se ha encontrado una referencia a %s.\n"
"\n"
-#: ../whois.c:339
-#: ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "No se pudo procesar esta linea: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Atención: Se han usado opciones de RIPE con un servidor tradicional."
-#: ../whois.c:657
-#: ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -139,27 +136,27 @@ msgstr ""
"Error catastrófico: el texto de las condiciones de uso ha sido cambiado.\n"
"Por favor, actualice este programa.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "El servidor %s no se ha encontrado."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servicio desconocido"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Se ha agotado el tiempo de espera."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrumpido por la señal %d..."
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -167,9 +164,11 @@ msgid ""
"-L find all Less specific matches\n"
"-m find first level more specific matches\n"
"-M find all More specific matches\n"
-"-c find the smallest match containing a mnt-irt attribute\n"
+"-c find the smallest match containing a mnt-irt "
+"attribute\n"
"-x exact match [RPSL only]\n"
-"-d return DNS reverse delegation objects too [RPSL only]\n"
+"-d return DNS reverse delegation objects too [RPSL "
+"only]\n"
"-i ATTR[,ATTR]... do an inverse lookup for specified ATTRibutes\n"
"-T TYPE[,TYPE]... only look for objects of TYPE\n"
"-K only primary keys are returned [RPSL only]\n"
@@ -179,7 +178,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\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"
@@ -192,13 +191,15 @@ msgid ""
msgstr ""
"Uso: whois [OPCIONES]... OBJETO...\n"
"\n"
-"-l se realiza una búsqueda un nivel menos específica\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"
+"-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"
@@ -230,56 +231,51 @@ msgstr ""
" --help muestra este mensaje de ayuda y finaliza\n"
" --version muestra la información de la versión y finaliza\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr "crypt(3) basado en DES de 56 bits"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Método «%s» inválido.\n"
-#: ../mkpasswd.c:171
-#: ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "El numero «%s» no es valido.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Pruebe «%s --help» para más información.\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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] "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:245
+#: ../mkpasswd.c:249
#, 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] "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"
+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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "El carácter «%c» no es válido en el «salt».\n"
-#: ../mkpasswd.c:299
-#: ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Contraseña: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "El carácter «0x%hhx» no es válido en la contraseña.\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -336,3 +332,5 @@ msgstr ""
msgid "Available methods:\n"
msgstr "Métodos disponibles:\n"
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "El carácter «0x%hhx» no es válido en la contraseña.\n"
diff --git a/po/eu.po b/po/eu.po
index 59d74dc..2375a6b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,15 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.5.29\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\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"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -26,31 +27,31 @@ msgstr ""
"\n"
"Bug berri baten jakinarazpena: %s.\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "%s zerbitzaria erabiltzen.\n"
-#: ../whois.c:228
+#: ../whois.c:237
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:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "TLD honek ez du whois zerbitzaririk."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "Objetu mota horrentzako, ez da whois zerbitzaririk ezagutzen."
-#: ../whois.c:239
+#: ../whois.c:248
#, fuzzy
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "AS zenbaki edo IP sarea ezezaguna. Mesedez, programa eguneratu."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -61,7 +62,7 @@ msgstr ""
"Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, fuzzy, c-format
msgid ""
"\n"
@@ -72,7 +73,7 @@ msgstr ""
"Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +82,7 @@ msgstr ""
"Kontsulta: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, fuzzy, c-format
msgid ""
"\n"
@@ -93,17 +94,17 @@ msgstr ""
"$s-ra erreferentzia aurkituta.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Lerro hau, %s , ezin da prozesatu."
-#: ../whois.c:506
+#: ../whois.c:520
#, fuzzy
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Oharra: RIPE flags-ak ohiko zerbitzariengatik ezikusiak izaten dira."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,26 +112,26 @@ msgstr ""
"Hondamen arriskua: erabilpen balditzen textua aldatu egin da.\n"
"Programa eguneratu.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "%s Host-a ez da aurkitu."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: zerbitzu ezezaguna"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Denbora muga."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "%d seinalearengatik etena..."
-#: ../whois.c:1175
+#: ../whois.c:1223
#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -153,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\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"
@@ -201,55 +201,50 @@ msgstr ""
" --help laguntza pantaila hau erakusten du eta amaitzen du\n"
" --version programaren bertsioa erakusten du eta amaitzen du\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
#, fuzzy
msgid "standard 56 bit DES-based crypt(3)"
msgstr "56 bits-etako DESan oinarritutako \tcrypt(3)-a"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, fuzzy, c-format
msgid "Invalid method '%s'.\n"
msgstr "'%s' zenbakia ez da baliozkoa.\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "'%s' zenbakia ez da baliozkoa.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "%s --help informazio gehiagorako.\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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:245
+#: ../mkpasswd.c:249
#, 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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "'%c' karakterea, hazian, ilegala da.\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Pasahitza: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "'0x%hhx' password karakterea ilegala da.\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -305,6 +300,9 @@ msgstr ""
msgid "Available methods:\n"
msgstr "Algoritmo erabilgarriak:\n"
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "'0x%hhx' password karakterea ilegala da.\n"
+
#~ msgid "Invalid hash type '%s'.\n"
#~ msgstr "'%s' hash funtzioa ez da baliozkoa.\n"
diff --git a/po/fi.po b/po/fi.po
index 8824192..656c616 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,16 +6,17 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\n"
"PO-Revision-Date: 2010-01-27 15:31+0100\n"
"Last-Translator: Sami Kerola <kerolasa@iki.fi>\n"
"Language-Team: \n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -26,32 +27,29 @@ msgstr ""
"\n"
"Lähetä bugiraportit osoitteeseen %s.\n"
-#: ../whois.c:190
-#: ../whois.c:243
-#: ../whois.c:249
-#: ../whois.c:256
-#: ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Käytetään palvelinta %s.\n"
-#: ../whois.c:228
+#: ../whois.c:237
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:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "Tälla TLD:llä ei ole whois palvelinta."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "Mikään whois palvelu ei tiedä kysyttyä tietoa."
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Tuntematon AS-numero tai IP-verkko. Päivitä tämä ohjelma."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -62,7 +60,7 @@ msgstr ""
"Kysytään IPv4 ulostulona %s IPv6:n IPv4 avaruudesta.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -73,7 +71,7 @@ msgstr ""
"Kysytään IPv4 ulostulona %s Teredo IPv6 tunneliosoitetta.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +80,7 @@ msgstr ""
"Kysely: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -95,18 +93,16 @@ msgstr ""
"Löytyi viittaus %s.\n"
"\n"
-#: ../whois.c:339
-#: ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Ohjelma ei kykene tulkitsemaan riviä: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Varoitus: käytät RIPE valitsimia perinteiseen palvelimeen."
-#: ../whois.c:657
-#: ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -114,27 +110,27 @@ msgstr ""
"Katastrofaalinen virhe: lisenssiteksti on muuttunut.\n"
"Päivita ohjelma.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "Palvelinta %s ei löydy."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: tuntematon palvelu"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Aikakatkaisu."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Ohjelma keskeytyi signaaliin %d..."
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -142,9 +138,11 @@ msgid ""
"-L find all Less specific matches\n"
"-m find first level more specific matches\n"
"-M find all More specific matches\n"
-"-c find the smallest match containing a mnt-irt attribute\n"
+"-c find the smallest match containing a mnt-irt "
+"attribute\n"
"-x exact match [RPSL only]\n"
-"-d return DNS reverse delegation objects too [RPSL only]\n"
+"-d return DNS reverse delegation objects too [RPSL "
+"only]\n"
"-i ATTR[,ATTR]... do an inverse lookup for specified ATTRibutes\n"
"-T TYPE[,TYPE]... only look for objects of TYPE\n"
"-K only primary keys are returned [RPSL only]\n"
@@ -154,7 +152,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\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"
@@ -184,7 +182,8 @@ 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"
@@ -195,56 +194,49 @@ msgstr ""
" --help tulosta tämä ruutu\n"
" --version tulosta versio\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr "Standardi 56 bittinen DES-salaus ks crypt(3)"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Väärä metodi '%s'.\n"
-#: ../mkpasswd.c:171
-#: ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Väärä numero '%s'.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Käytä valitsinta '%s --help' lisätietojen saamiseen.\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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:245
+#: ../mkpasswd.c:249
#, 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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Suolassa laiton merkki '%c'.\n"
-#: ../mkpasswd.c:299
-#: ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Salasana: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "Laiton merkki salasanassa '0x%hhx'.\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -301,3 +293,5 @@ msgstr ""
msgid "Available methods:\n"
msgstr "Käytettävissä olevat toiminnot:\n"
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Laiton merkki salasanassa '0x%hhx'.\n"
diff --git a/po/fr.po b/po/fr.po
index 714f3a3..4bdfe6b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,16 +8,17 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\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"
+"Language: fr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n>1;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -28,30 +29,30 @@ msgstr ""
"\n"
"Veuillez signaler les bogues à %s.\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Le serveur %s est sélectionné.\n"
-#: ../whois.c:228
+#: ../whois.c:237
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:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "Ce TLD n'a pas de serveur whois."
-#: ../whois.c:236
+#: ../whois.c:245
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:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Numéro d'AS ou réseau IP inconnu. Veuillez mettre à jour ce programme."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -62,7 +63,7 @@ msgstr ""
"Requête faite pour l'extrémité IPv4 %s d'une adresse IPv6 6to4.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -73,7 +74,7 @@ msgstr ""
"Requête faite pour l'extrémité IPv4 %s d'une adresse IPv6 Teredo.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +83,7 @@ msgstr ""
"Requête : \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -95,17 +96,17 @@ msgstr ""
"Renvoi trouvé vers %s.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Impossible d'interpréter la ligne : %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Avertissement : des options RIPE ont été utilisées avec un serveur classique."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -113,26 +114,26 @@ msgstr ""
"Erreur catastrophique : le texte de déni de responsabilité a changé.\n"
"Veuillez mettre à jour ce programme.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "L'hôte %s est introuvable."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp : service inconnu"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Temps limite dépassé."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interruption par le signal %d..."
-#: ../whois.c:1175
+#: ../whois.c:1223
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -155,8 +156,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\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"
@@ -194,9 +194,7 @@ msgstr ""
"-s SOURCE[,SOURCE]... rechercher dans la base de la SOURCE\n"
"-g SOURCE:PREM-DERN trouver les mises à jour de la SOURCE ayant des\n"
" numéros de série compris entre PREM et DERN\n"
-"-t TYPE demander la syntaxe pour les objets de ce TYPE "
-"(« all »\n"
-" donne une liste)\n"
+"-t TYPE demander la syntaxe pour les objets de ce TYPE\n"
"-v TYPE demander la syntaxe détaillée pour les objets de ce\n"
" TYPE\n"
"-q [version|sources|types] demander les informations spécifiées au serveur\n"
@@ -210,27 +208,27 @@ msgstr ""
" --help afficher cette page d'aide et sortir\n"
" --version afficher les informations de version et sortir\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr "fonction crypt(3) standard, chiffrement DES à 56 bits"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "La méthode '%s' est invalide.\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Le nombre « %s » est invalide.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, 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:240
+#: ../mkpasswd.c:244
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -238,28 +236,23 @@ 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:245
+#: ../mkpasswd.c:249
#, 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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Le caractère « %c » est invalide dans l'aléa.\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Mot de passe : "
-#: ../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:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -316,3 +309,6 @@ msgstr ""
#, c-format
msgid "Available methods:\n"
msgstr "Méthodes disponibles :\n"
+
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Le caractère « 0x%hhx » est invalide dans le mot de passe.\n"
diff --git a/po/it.po b/po/it.po
index 50e8d00..13038e6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,20 +1,21 @@
# Traduzione di whois.pot.
-# Copyright (C) 1999-2009 Marco d'Itri
+# Copyright (C) 1999-2011 Marco d'Itri
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.7.14\n"
+"Project-Id-Version: whois 5.0.12\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
-"PO-Revision-Date: 2009-04-12 06:04+0200\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\n"
+"PO-Revision-Date: 2011-10-10 03:12+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -25,30 +26,30 @@ msgstr ""
"\n"
"Segnalare i bug a %s.\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Uso il server %s.\n"
-#: ../whois.c:228
+#: ../whois.c:237
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:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
-msgstr "Per questo TLD non esiste un server whois."
+msgstr "Non esiste un server whois per questo TLD."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "Non noto alcun server whois per questo tipo di oggetto."
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Numero dell'AS o della rete IP sconosciuto. Per favore aggiorna il programma."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -59,7 +60,7 @@ msgstr ""
"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 6to4.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -70,7 +71,7 @@ msgstr ""
"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 Teredo.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -79,7 +80,7 @@ msgstr ""
"Richiesta: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -92,16 +93,16 @@ msgstr ""
"Trovato un riferimento a %s.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Impossibile interpretare questa riga: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -109,26 +110,26 @@ msgstr ""
"Errore catastrofico: il testo di avvertenze cambiato.\n"
"Aggiorna questo programma.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "Host %s non trovato."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servizio sconosciuto"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Tempo scaduto."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrotto dal segnale %d..."
-#: ../whois.c:1175
+#: ../whois.c:1223
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -151,8 +152,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\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"
@@ -184,8 +184,7 @@ msgstr ""
"-a cerca in tutti i database\n"
"-s SOURCE[,SOURCE]... cerca il database da SOURCE\n"
"-g SOURCE:FIRST-LAST trova gli aggiornamenti di SOURCE dal seriale F a L\n"
-"-t TIPO chiede il template per un oggetto del TIPO ('all' per una "
-"lista)\n"
+"-t TIPO chiede il template per un oggetto del TIPO\n"
"-v TIPO chiede il template prolisso per un oggetto del TIPO\n"
"-q [version|sources|types] chiede al server le informazioni indicate "
"[RPSL]\n"
@@ -197,54 +196,49 @@ msgstr ""
" --help mostra questo aiuto ed esce\n"
" --version stampa le informazioni sulla versione ed esce\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr "crypt(3) standard a 56 bit basata su DES"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Il metodo '%s' non valido.\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Il numero '%s' non valido.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Per maggior informazioni prova '%s --help'.\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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:245
+#: ../mkpasswd.c:249
#, 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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Il carattere '%c' non valido in un sale.\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Password: "
-#: ../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:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -300,3 +294,6 @@ msgstr ""
#, c-format
msgid "Available methods:\n"
msgstr "Metodi disponibili:\n"
+
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Il carattere '0x%hhx' non valido in una password.\n"
diff --git a/po/ja.po b/po/ja.po
index 906d44e..6ca0ed9 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,16 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.7.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\n"
"PO-Revision-Date: 2005-04-26 00:20+0900\n"
"Last-Translator: Satoru SATOH <ss@gnome.gr.jp>\n"
"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
+"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -27,30 +28,30 @@ msgstr ""
"\n"
"バグ報告は %s へ.\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "サーバー %s を使用\n"
-#: ../whois.c:228
+#: ../whois.c:237
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"この TLD には whois サーバーがありませんが、次のサーバーで whois データベース"
"にアクセスできます"
-#: ../whois.c:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "この TLD には whois サーバーがありません"
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "この種のオブジェクトに対する既知の whois サーバーはありません"
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "不明な AS 番号または IP ネットワーク. アップグレードして下さい"
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -61,7 +62,7 @@ msgstr ""
"6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, fuzzy, c-format
msgid ""
"\n"
@@ -72,7 +73,7 @@ msgstr ""
"6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +82,7 @@ msgstr ""
"問い合わせ文字列: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -94,16 +95,16 @@ msgstr ""
"%s への照会をみつけました\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "この行を解析できません: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr "警告: 旧来のサーバーについて RIPE フラグが使用されています"
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,27 +112,27 @@ msgstr ""
"破滅的なエラー: 免責条項テキストが変更されました\n"
"このプログラムをアップグレードして下さい\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "ホスト %s はみつかりませんでした"
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: 不明なサービス"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "時間切れ"
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "シグナル %d が割込み..."
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -153,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\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"
@@ -196,55 +196,50 @@ msgstr ""
" --help このヘルプを表示して終了\n"
" --version バージョン情報を表示して終了\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
#, fuzzy
msgid "standard 56 bit DES-based crypt(3)"
msgstr "\t標準 56 ビット DES ベース暗号(3)"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, fuzzy, c-format
msgid "Invalid method '%s'.\n"
msgstr "不正な数字 '%s'\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "不正な数字 '%s'\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "さらなる詳細については '%s --help' を実行\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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:245
+#: ../mkpasswd.c:249
#, 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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "不正なソルト文字 '%c'\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "パスワード: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "不正なパスワード文字 '0x%hhx'\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -299,5 +294,8 @@ msgstr ""
msgid "Available methods:\n"
msgstr "利用可能なアルゴリズム:\n"
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "不正なパスワード文字 '0x%hhx'\n"
+
#~ msgid "Invalid hash type '%s'.\n"
#~ msgstr "不正なハッシュタイプ '%s'\n"
diff --git a/po/no.po b/po/no.po
index cee8401..04fdd81 100644
--- a/po/no.po
+++ b/po/no.po
@@ -5,16 +5,17 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.4.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\n"
"PO-Revision-Date: 1999-12-18 14:00:00\n"
"Last-Translator: Egil Kvaleberg <egil@kvaleberg.no>\n"
"Language-Team: Norwegian <no@li.org>\n"
+"Language: no\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -22,29 +23,29 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Bruker tjener %s.\n"
-#: ../whois.c:228
+#: ../whois.c:237
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
-#: ../whois.c:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr ""
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr ""
-#: ../whois.c:239
+#: ../whois.c:248
#, fuzzy
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -52,7 +53,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -60,7 +61,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -69,7 +70,7 @@ msgstr ""
"Foresprsel: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, fuzzy, c-format
msgid ""
"\n"
@@ -81,17 +82,17 @@ msgstr ""
"Fant InterNIC-referanse til %s.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr ""
-#: ../whois.c:506
+#: ../whois.c:520
#, fuzzy
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
#, fuzzy
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
@@ -100,26 +101,26 @@ msgstr ""
"Alvorlig feil: INTERNIC har endret standardtekst.\n"
"Vennligst oppdater programmet.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "Finner ikke verten %s."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: ukjent port"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr ""
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Avbrudt av signal %d..."
-#: ../whois.c:1175
+#: ../whois.c:1223
#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -142,8 +143,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\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"
@@ -178,54 +178,49 @@ msgstr ""
"\n"
"Versjon %s. Rapporter feil til %s.\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr ""
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr ""
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr ""
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr ""
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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:245
+#: ../mkpasswd.c:249
#, 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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr ""
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr ""
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr ""
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
diff --git a/po/pl.po b/po/pl.po
index c9d4b6c..5cf496c 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,17 +7,18 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\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"
+"Language: pl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-2\n"
"Content-Transfer-Encoding: 8bit\n"
"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:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -28,29 +29,29 @@ msgstr ""
"\n"
"Bdy prosz zgasza na adres %s.\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Uycie serwera %s.\n"
-#: ../whois.c:228
+#: ../whois.c:237
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:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "Ta gwna domena nie ma serwera whois."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "Dla tego rodzaju obiektu nie jest znany aden serwer whois."
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Nieznany numer AS lub sie IP. Prosz uaktualni ten program."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -61,7 +62,7 @@ msgstr ""
"Pytanie o zakoczenie IPv4 %s adresu IPv6 typu 6to4.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -72,7 +73,7 @@ msgstr ""
"Pytanie o zakoczenie IPv4 %s adresu IPv6 Teredo.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +82,7 @@ msgstr ""
"Zapytanie: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -94,16 +95,16 @@ msgstr ""
"Znaleziono odniesienie do %s.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Nie mona przeanalizowa tej linii: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Uwaga: uyto flag RIPE ze starszym serwerem."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,27 +112,27 @@ msgstr ""
"Katastrofa! Tekst owiadczenia zosta zmieniony.\n"
"Prosz uaktualni ten program.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "Serwer %s nie zosta znaleziony."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: usuga nieznana"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Upyn limit czasu."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Przerwano sygnaem %d..."
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -153,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\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"
@@ -204,27 +204,27 @@ msgstr ""
" --version wywietlenie informacji o wersji i zakoczenie "
"dziaania\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr "standardowa 56-bitowa, oparta o DES funkcja crypt(3)"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Nieprawidowa metoda '%s'.\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Nieprawidowa liczba '%s'.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "'%s --help' poda wicej informacji.\n"
# : ../mkpasswd.c:152
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -233,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:245
+#: ../mkpasswd.c:249
#, 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"
@@ -241,21 +241,16 @@ 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:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Bdny znak zarodka '%c'.\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Haso: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "Bdny znak w hale '0x%hhx'.\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -312,3 +307,6 @@ msgstr ""
#, c-format
msgid "Available methods:\n"
msgstr "Dostpne metody:\n"
+
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Bdny znak w hale '0x%hhx'.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 44c35f2..b34933b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,16 +7,17 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.7.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\n"
"PO-Revision-Date: 2006-04-26 21:03-0300\n"
"Last-Translator: Anderson Goulart <globalx@gmail.com>\n"
"Language-Team: Portuguese/Brazil\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -27,30 +28,30 @@ msgstr ""
"\n"
"Reporte bugs para %s \n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Utilizando servidor %s.\n"
-#: ../whois.c:228
+#: ../whois.c:237
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:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "No existe servidor whois para este TLD."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "Nenhum servidor whois conhecido para este tipo de objeto."
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Nmero AS ou rede IP desconhecidos. Por favor, atualize este programa."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -61,7 +62,7 @@ msgstr ""
"Procurando pela extremidade IPv4 %s de um endereo IPv6. 6to4.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, fuzzy, c-format
msgid ""
"\n"
@@ -72,7 +73,7 @@ msgstr ""
"Procurando pela extremidade IPv4 %s de um endereo IPv6. 6to4.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +82,7 @@ msgstr ""
"Consulta: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -94,16 +95,16 @@ msgstr ""
"Uma referncia para%s encontrada.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "No pde processar esta linha: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Aviso: RIPE flags utilizados com um servidor tradicional."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,27 +112,27 @@ msgstr ""
"Erro catastrfico: o texto das condies de uso foi alterado.\n"
"Por favor, atualize este programa. \n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "Host %s no encontrado."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servio desconhecido"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Tempo esgotado."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrompido pelo sinal %d..."
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -153,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\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"
@@ -201,34 +201,34 @@ msgstr ""
" --help exibe essa ajuda e sai\n"
" --version exibe informaes sobre a verso e sai\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
#, fuzzy
msgid "standard 56 bit DES-based crypt(3)"
msgstr "\tstandard 56 bit DES-based crypt(3)"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, fuzzy, c-format
msgid "Invalid method '%s'.\n"
msgstr "Nmero invlido '%s'.\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Nmero invlido '%s'.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Tente '%s --help para maiores informaes.\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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:245
+#: ../mkpasswd.c:249
#, 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"
@@ -237,21 +237,16 @@ msgstr[0] ""
msgstr[1] ""
"Tamanho do salt incorreto: %d bytes enquanto %d <= n <= %d eram esperados.\n"
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Caractere salt ilegal '%c'.\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Senha: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "Caractere de senha ilegal '0x%hhx'.\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -306,5 +301,8 @@ msgstr ""
msgid "Available methods:\n"
msgstr "Algoritmos disponveis: \n"
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Caractere de senha ilegal '0x%hhx'.\n"
+
#~ msgid "Invalid hash type '%s'.\n"
#~ msgstr "Hash-type invlido '%s'.\n"
diff --git a/po/ru.po b/po/ru.po
index 876b8af..5738d5e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,17 +8,19 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\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"
+"Language: ru\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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"
+"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:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -29,28 +31,29 @@ msgstr ""
"\n"
"Сообщения об ошибках отправляйте на %s.\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "Используется сервер %s.\n"
-#: ../whois.c:228
+#: ../whois.c:237
msgid "This TLD has no whois server, but you can access the whois database at"
-msgstr "Данный TLD не имеет whois-сервера, но можно получить доступ к базе whois на"
+msgstr ""
+"Данный TLD не имеет whois-сервера, но можно получить доступ к базе whois на"
-#: ../whois.c:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "Данный TLD не имеет whois-сервера."
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "Нет whois-сервера для объектов данного вида."
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Неизвестный номер AS или IP-сеть. Пожалуйста, обновите программу."
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -61,7 +64,7 @@ msgstr ""
"Запрашивается конечная IPv4-точка %s для IPv6-адреса 6-в-4.\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -72,7 +75,7 @@ msgstr ""
"Запрашивается конечная IPv4-точка %s для IPv6-адреса Teredo.\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +84,7 @@ msgstr ""
"Строка запроса: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -94,16 +97,16 @@ msgstr ""
"Найдено перенаправление на %s.\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Невозможно разобрать строку: %s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Предупреждение: флаги RIPE используются с традиционным сервером."
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,27 +114,27 @@ msgstr ""
"Катастрофическая ошибка: текст правовой оговорки был изменён.\n"
"Пожалуйста, обновите программу.\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "Узел %s не найден."
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: неизвестный сервис"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "Задержка."
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Прервано по сигналу %d..."
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -153,8 +156,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\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"
@@ -201,26 +203,26 @@ msgstr ""
" --help показать эту справку и закончить работу\n"
" --version показать информацию о версии и закончить работу\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr "стандартный 56-битный, базирующийся на DES, crypt(3)"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "Неверный метод '%s'.\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "Неверный номер '%s'.\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "Доп. информацию можно получить, запустив '%s --help'.\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, c-format
msgid "Wrong salt length: %d byte when %d expected.\n"
msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -228,7 +230,7 @@ msgstr[0] "Неверная длина соли: %d байт при ожидае
msgstr[1] "Неверная длина соли: %d байта при ожидаемой %d.\n"
msgstr[2] "Неверная длина соли: %d байт при ожидаемой %d.\n"
-#: ../mkpasswd.c:245
+#: ../mkpasswd.c:249
#, 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"
@@ -236,21 +238,16 @@ msgstr[0] "Неверная длина соли: %d байт при ожидае
msgstr[1] "Неверная длина соли: %d байта при ожидаемой %d <= n <= %d.\n"
msgstr[2] "Неверная длина соли: %d байт при ожидаемой %d <= n <= %d.\n"
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Недопустимый для соли символ '%c'.\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "Пароль: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "Недопустимый для пароля символ '0x%hhx'.\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -307,3 +304,5 @@ msgstr ""
msgid "Available methods:\n"
msgstr "Доступные методы:\n"
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "Недопустимый для пароля символ '0x%hhx'.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1983954..41f731b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,17 +7,18 @@ msgid ""
msgstr ""
"Project-Id-Version: whois\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 13:38+0100\n"
+"POT-Creation-Date: 2011-10-09 23:58+0200\n"
"PO-Revision-Date: 2009-10-24 03:59+0000\n"
"Last-Translator: Feng Liu (Maxim) <maximliu@googlemail.com>\n"
"Language-Team: Chinese (China) <zh_CN@li.org>\n"
+"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Launchpad-Export-Date: 2009-11-10 02:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: ../whois.c:136
+#: ../whois.c:145
#, c-format
msgid ""
"Version %s.\n"
@@ -28,28 +29,28 @@ msgstr ""
"\n"
"将 bugs 提交到 %s。\n"
-#: ../whois.c:190 ../whois.c:243 ../whois.c:249 ../whois.c:256 ../whois.c:286
+#: ../whois.c:199 ../whois.c:252 ../whois.c:258 ../whois.c:265 ../whois.c:295
#, c-format
msgid "Using server %s.\n"
msgstr "使用服务器 %s。\n"
-#: ../whois.c:228
+#: ../whois.c:237
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr "此顶级域名没有 whois 服务器,但您可在这里访问 whois 数据库:"
-#: ../whois.c:233
+#: ../whois.c:242
msgid "This TLD has no whois server."
msgstr "此顶级域名没有对应的 whois 服务器。"
-#: ../whois.c:236
+#: ../whois.c:245
msgid "No whois server is known for this kind of object."
msgstr "无针对此类对象的 whois 服务器。"
-#: ../whois.c:239
+#: ../whois.c:248
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "未知的 AS 号码或 IP 地址。请升级此程序。"
-#: ../whois.c:262
+#: ../whois.c:271
#, c-format
msgid ""
"\n"
@@ -60,7 +61,7 @@ msgstr ""
"查询和一个6to4 IPv6 地址相对应的 IPv4 终端 %s。\n"
"\n"
-#: ../whois.c:268
+#: ../whois.c:277
#, c-format
msgid ""
"\n"
@@ -71,7 +72,7 @@ msgstr ""
"查询一个Teredo IPv6 地址相对应的 IPv4 终端 %s。\n"
"\n"
-#: ../whois.c:287
+#: ../whois.c:296
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -80,7 +81,7 @@ msgstr ""
"查询字符串: \"%s\"\n"
"\n"
-#: ../whois.c:297
+#: ../whois.c:306
#, c-format
msgid ""
"\n"
@@ -93,16 +94,16 @@ msgstr ""
"发现一个到 %s 的引用。\n"
"\n"
-#: ../whois.c:339 ../whois.c:342
+#: ../whois.c:348 ../whois.c:351
#, c-format
msgid "Cannot parse this line: %s"
msgstr "不能分析该行:%s"
-#: ../whois.c:506
+#: ../whois.c:520
msgid "Warning: RIPE flags used with a traditional server."
msgstr "警告: 对传统服务器使用了 RIPE 标志。"
-#: ../whois.c:657 ../whois.c:806
+#: ../whois.c:674 ../whois.c:823
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -110,27 +111,27 @@ msgstr ""
"严重错误: 声明(disclaimer)文本已经被改变。\n"
"请升级此程序。\n"
-#: ../whois.c:858
+#: ../whois.c:875
#, c-format
msgid "Host %s not found."
msgstr "没有找到主机 %s。"
-#: ../whois.c:868
+#: ../whois.c:885
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: 未知服务"
-#: ../whois.c:943
+#: ../whois.c:960
msgid "Timeout."
msgstr "超时。"
-#: ../whois.c:949
+#: ../whois.c:966
#, c-format
msgid "Interrupted by signal %d..."
msgstr "被信号 %d 中断..."
-#: ../whois.c:1175
-#, c-format
+#: ../whois.c:1223
+#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
"\n"
@@ -152,8 +153,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\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"
@@ -195,56 +195,53 @@ msgstr ""
" --help 显示这个帮助并退出\n"
" --version 输出版本信息并退出\n"
-#: ../mkpasswd.c:80
+#: ../mkpasswd.c:84
msgid "standard 56 bit DES-based crypt(3)"
msgstr "以标准56位DES为基础的 crypt(3)"
-#: ../mkpasswd.c:162
+#: ../mkpasswd.c:165
#, c-format
msgid "Invalid method '%s'.\n"
msgstr "无效方式 '%s'。\n"
-#: ../mkpasswd.c:171 ../mkpasswd.c:181
+#: ../mkpasswd.c:174 ../mkpasswd.c:184
#, c-format
msgid "Invalid number '%s'.\n"
msgstr "无效的数字 '%s'。\n"
-#: ../mkpasswd.c:199
+#: ../mkpasswd.c:202
#, c-format
msgid "Try '%s --help' for more information.\n"
msgstr "尝试用 '%s --help' 获取更多的信息。\n"
-#: ../mkpasswd.c:240
+#: ../mkpasswd.c:244
#, 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"
+msgstr[0] "错误的随机字符(salt) 长度: 当前为 %d 字节,预期长度为 %d 字节。\n"
+msgstr[1] "错误的随机字符(salt) 长度: 当前为 %d 字节,预期长度为 %d 字节。\n"
-#: ../mkpasswd.c:245
+#: ../mkpasswd.c:249
#, 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"
+"错误的随机字符(salt) 长度: 当前为 %d 字节,预期长度范围为 %d <= n <= %d 字"
+"节。\n"
msgstr[1] ""
-"错误的 salt 长度: 当前为 %d 字节,预期长度范围为 %d <= n <= %d 字节。\n"
+"错误的随机字符(salt) 长度: 当前为 %d 字节,预期长度范围为 %d <= n <= %d 字"
+"节。\n"
-#: ../mkpasswd.c:254
+#: ../mkpasswd.c:258
#, c-format
msgid "Illegal salt character '%c'.\n"
-msgstr "非法的 salt 字符 '%c'。\n"
+msgstr "非法的随机数字符 '%c'。\n"
-#: ../mkpasswd.c:299 ../mkpasswd.c:326
+#: ../mkpasswd.c:308 ../mkpasswd.c:324
#, c-format
msgid "Password: "
msgstr "密码: "
-#: ../mkpasswd.c:320
-#, c-format
-msgid "Illegal password character '0x%hhx'.\n"
-msgstr "非法的密码字符 '0x%hhx'。\n"
-
#: ../mkpasswd.c:342
#, c-format
msgid "Method not supported by crypt(3).\n"
@@ -281,7 +278,7 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
" -m, --method=TYPE \t选择使用 TYPE 的方法\n"
-" -S, --salt=SALT \t\t使用指定 SALT\n"
+" -S, --salt=SALT \t\t使用指定随机字符\n"
" -R, --rounds=NUMBER \t使用指定的循环次数\n"
" -P, --password-fd=NUM \t从文件描述符 NUM 中读取密码来\n"
"\t\t\t\t替代从 /dev/tty 中获取密码\n"
@@ -299,3 +296,6 @@ msgstr ""
#, c-format
msgid "Available methods:\n"
msgstr "可用方式:\n"
+
+#~ msgid "Illegal password character '0x%hhx'.\n"
+#~ msgstr "非法的密码字符 '0x%hhx'。\n"
diff --git a/servers_charset.h b/servers_charset.h
deleted file mode 100644
index c434013..0000000
--- a/servers_charset.h
+++ /dev/null
@@ -1,35 +0,0 @@
- { "whois.corenic.net", "utf-8", "-C UTF-8" },
- { "whois.cat", "utf-8", "-C UTF-8" },
- { "whois.museum", "utf-8", "-C UTF-8" },
- { "whois.nic.br", "iso-8859-1", NULL },
- { "whois.cira.ca", "iso-8859-1", NULL },
- { "whois.nic.ch", "utf-8", NULL },
- { "whois.nic.cl", "iso-8859-1", NULL },
- { "whois.cnnic.cn", "utf-8", NULL },
- { "cwhois.cnnic.cn", "utf-8", NULL },
- { "whois.nic.cz", "utf-8", NULL },
- { "whois.denic.de", "utf-8", NULL },
- { "whois.enum.denic.de", "utf-8", NULL },
- { "whois.dk-hostmaster.dk", "utf-8", "--charset=utf-8" },
- { "whois.eenet.ee", "iso-8859-1", NULL },
- { "whois.eu", "utf-8", NULL },
- { "whois.ficora.fi", "iso-8859-1", NULL },
- { "whois.nic.fr", "iso-8859-1", NULL },
- { "whois.hkirc.hk", "utf-8", NULL },
- { "whois.nic.hu", "iso-8859-1", NULL },
- { "whois.isnic.is", "iso-8859-1", NULL },
- { "whois.jprs.jp", "iso-2022-jp", NULL },
- { "whois.nic.ad.jp", "iso-2022-jp", NULL },
- { "whois.nic.or.kr", "euc-kr", NULL },
- { "whois.nic.li", "utf-8", NULL },
- { "whois.domreg.lt", "utf-8", NULL },
- { "whois.dns.lu", "iso-8859-1", NULL },
- { "whois.nic.mu", "utf-8", NULL },
- { "whois.norid.no", "iso-8859-1", NULL },
- { "whois.nic.nu", "utf-8", NULL },
- { "whois.dns.pt", "iso-8859-1", NULL },
- { "whois.nic-se.se", "utf-8", NULL },
- { "whois.nic.tr", "utf-8", NULL },
- { "whois.twnic.net.tw", "utf-8", NULL },
- { "whois.net.ua", "koi8-u", NULL },
- { "whois.nic.org.uy", "utf-8", NULL },
diff --git a/servers_charset_list b/servers_charset_list
index 68d0600..f89f13c 100644
--- a/servers_charset_list
+++ b/servers_charset_list
@@ -23,6 +23,7 @@ whois.isnic.is iso-8859-1
whois.jprs.jp iso-2022-jp
whois.nic.ad.jp iso-2022-jp
whois.nic.or.kr euc-kr
+whois.kr euc-kr
whois.nic.li utf-8
whois.domreg.lt utf-8
whois.dns.lu iso-8859-1
@@ -30,9 +31,12 @@ whois.nic.mu utf-8
whois.norid.no iso-8859-1
whois.nic.nu utf-8
whois.dns.pt iso-8859-1
+whois.rnids.rs utf-8
whois.nic-se.se utf-8
+whois.tld.sy utf-8
whois.nic.tr utf-8
whois.twnic.net.tw utf-8
-whois.net.ua koi8-u
+whois.pp.ua utf-8
+whois.ua koi8-u
whois.nic.org.uy utf-8
diff --git a/tld_serv_list b/tld_serv_list
index f496914..5c7139e 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -7,6 +7,7 @@
.eu.com whois.centralnic.net
.gb.com whois.centralnic.net
.gb.net whois.centralnic.net
+.gr.com whois.centralnic.net
.hu.com whois.centralnic.net
.no.com whois.centralnic.net
.qc.com whois.centralnic.net
@@ -53,6 +54,7 @@
.pro whois.registrypro.pro
.tel whois.nic.tel
.travel whois.nic.travel
+.xxx whois.nic.xxx
.ac whois.nic.ac
.ad NONE # www.nic.ad
@@ -110,12 +112,12 @@
.co whois.nic.co
.cr WEB http://www.nic.cr/niccr_publico/showRegistroDominiosScreen.do
.cu WEB http://www.nic.cu/
-.cv NONE # www.dns.cv?
+.cv WEB http://www.dns.cv/
.cx whois.nic.cx
.cy WEB http://www.nic.cy/nslookup/online_database.php
.cz whois.nic.cz
.de whois.denic.de
-.dj WEB http://www.nic.dj/whois.php # BROKEN 2010-05-06
+.dj WEB http://www.nic.dj/whois.php
.dk whois.dk-hostmaster.dk
.dm whois.nic.dm
.do WEB http://www.nic.do/whois-h.php3
@@ -138,14 +140,14 @@
.gb NONE
.gd whois.adamsnames.tc
.ge WEB http://www.registration.ge/
-.gf WEB http://www.nic.gf/?id=whois
+.gf WEB https://www.dom-enic.com/whois.html
.gg whois.gg
.gh WEB http://www.nic.gh/customer/search_c.htm
.gi AFILIAS
.gl whois.nic.gl
.gm WEB http://www.nic.gm/htmlpages/whois.htm
.gn NONE # http://www.psg.com/dns/gn/
-.gp whois.nic.gp
+.gp WEB https://www.dom-enic.com/whois.html
.gq NONE # NO NIC http://www.getesa.gq/
.gr WEB https://grweb.ics.forth.gr/whois_en.jsp
.gs whois.nic.gs
@@ -180,15 +182,15 @@
.km NONE # www.domaine.km
.kn WEB http://www.nic.kn/
.kp whois.kcce.kp
-.kr whois.nic.or.kr
+.kr whois.kr
.kw WEB http://www.kw/
.ky WEB http://kynseweb.messagesecure.com/kywebadmin/ # http://www.icta.ky/
.kz whois.nic.kz
.la whois.nic.la
.lb WEB http://www.aub.edu.lb/lbdr/
.lc AFILIAS
-.li whois.nic.li
-.lk NONE
+.li whois.nic.ch
+.lk whois.nic.lk
.lr NONE # http://www.psg.com/dns/lr/
.ls WEB http://www.co.ls/co.asp
.lt whois.domreg.lt
@@ -206,9 +208,9 @@
.ml NONE # NIC? www.sotelma.ml
.mm NONE # www.nic.mm
.mn AFILIAS
-.mo WEB http://www.monic.net.mo/
+.mo WEB http://www.monic.net.mo/ # whois.monic.mo is restricted
.mp NONE # get.mp
-.mq NONE # whois.nic.mq
+.mq WEB https://www.dom-enic.com/whois.html
.mr NONE # www.nic.mr
.ms whois.nic.ms
.mt WEB https://www.nic.org.mt/dotmt/ # whois.nic.org.mt is restricted
@@ -246,12 +248,12 @@
.pt whois.dns.pt
.pw NONE # http://www.pwregistry.pw/
.py WEB http://www.nic.py/consultas.html
-.qa NONE # http://www.qtel.com.qa/InternetFeatures.do
+.qa whois.registry.qa
.re whois.nic.fr
.ro whois.rotld.ro
-.rs WEB http://www.nic.rs/en/whois
+.rs whois.rnids.rs
.edu.ru whois.informika.ru
-.ru whois.ripn.net
+.ru whois.tcinet.ru
.rw WEB http://www.nic.rw/cgi-bin/whois.pl
.sa whois.nic.net.sa
.sb whois.coccaregistry.net
@@ -266,12 +268,12 @@
.sl whois.nic.sl
.sm whois.ripe.net
.sn whois.nic.sn
-.so NONE # www.nic.so (CHECK LATER, recently delegated)
+.so whois.nic.so
.sr NONE # www.register.sr
.st whois.nic.st
-.su whois.ripn.net
-.sv WEB http://www.uca.edu.sv/dns/ # http://www.svnet.org.sv/
-.sy NONE # NIC? www.ste.gov.sy
+.su whois.tcinet.ru
+.sv WEB http://www.svnet.org.sv/
+.sy whois.tld.sy
.sz NONE # http://www.sispa.org.sz/
.tc whois.adamsnames.tc
.td NONE # NIC? http://www.sotel.td/ was http://www.nic.td/ . http://www.tit.td/ ?
@@ -290,7 +292,10 @@
.tv VERISIGN whois.nic.tv
.tw whois.twnic.net.tw
.tz whois.tznic.or.tz
-.ua whois.net.ua
+.biz.ua whois.biz.ua
+.co.ua whois.co.ua
+.pp.ua whois.pp.ua
+.ua whois.ua
.ug www.registry.co.ug # this is a whois server too
.ac.uk whois.ja.net
.bl.uk NONE
@@ -330,20 +335,37 @@
.zm NONE # http://www.zamnet.zm/ser-isp/dnr.htm
.zw NONE # http://www.zispa.co.zw/
+# AW means that I had to guess the whois server name, but I was not able
+# to find any registered subdomains to verify it.
+.xn--3e0b707e whois.kr # Korea, Republic of
+.xn--45brj9c whois.registry.in # India, Bengali AW
+.xn--90a3ac whois.rnids.rs # Serbia AW
+.xn--clchc0ea0b2g2a9gcd whois.nic.net.sg # Singapore, Tamil
.xn--fiqs8s cwhois.cnnic.cn # China, Simplified Chinese
.xn--fiqz9s cwhois.cnnic.cn # China, Traditional Chinese
-.xn--fzc2c9e2c NONE # Sri Lanka, Sinhala
+.xn--fpcrj9c3d whois.registry.in # India, Telugu AW
+.xn--fzc2c9e2c whois.nic.lk # Sri Lanka, Sinhala
+.xn--gecrj9c whois.registry.in # India, Gujarati AW
+.xn--h2brj9c whois.registry.in # India, Hindi AW
.xn--j6w193g whois.hkirc.hk # Hong Kong
.xn--kprw13d whois.twnic.net.tw # Taiwan, Simplified Chinese
.xn--kpry57d whois.twnic.net.tw # Taiwan, Traditional Chinese
+.xn--lgbbat1ad8j whois.nic.dz # Algeria
.xn--mgbaam7a8h whois.aeda.net.ae # United Arab Emirates
-.xn--mgbayh7gpa NONE # Jordan
+.xn--mgbayh7gpa WEB http://idn.jo/whois_a.aspx # Jordan
+.xn--mgbbh1a71e whois.registry.in # India, Urdu AW
+.xn--mgbc0a9azcg whois.iam.net.ma # Morocco AW
.xn--mgberp4a5d4ar whois.nic.net.sa # Saudi Arabia
.xn--o3cw4h whois.thnic.co.th # Thailand
-.xn--p1ai whois.ripn.net # Russian Federation
+.xn--ogbpf8fl whois.tld.sy # Syria
+.xn--p1ai whois.tcinet.ru # Russian Federation
.xn--pgbs0dh NONE # Tunisia
+.xn--s9brj9c whois.registry.in # India, Punjabi AW
.xn--wgbh1c whois.dotmasr.eg # Egypt
-.xn--xkc2al3hye2a NONE # Sri Lanka, Tamil
+.xn--wgbl6a whois.registry.qa # Qatar
+.xn--xkc2al3hye2a whois.nic.lk # Sri Lanka, Tamil
+.xn--xkc2dl3a5ee0h whois.registry.in # India, Tamil AW
+.xn--yfro4i67o whois.nic.net.sg # Singapore, Chinese
.xn--ygbi2ammx whois.pnina.ps # Palestinian Territory
-dom whois.networksolutions.com
@@ -377,10 +399,9 @@
-nicat whois.nic.at
-nicir whois.nic.ir
-norid whois.norid.no
--ripn whois.ripn.net
-rotld whois.rotld.ro
-sgnic whois.nic.net.sg
-tel whois.nic.tel
--uanic whois.com.ua
+-uanic whois.ua
-uynic www.rau.edu.uy
-sixxs whois.sixxs.net
diff --git a/whois.1 b/whois.1
index 5607789..ec5f86b 100644
--- a/whois.1
+++ b/whois.1
@@ -13,11 +13,15 @@ whois \- client for the whois directory service
.I object
.B whois
-[\~\fI\-t\fP\~]
-[\~\fI\-v\fP\~]
-.I template
+.B -t
+.I TYPE
+
+.B whois
+.B -v
+.I TYPE
+
.B whois
-[\~\fI\-q\fP\~]
+.B -q
.I keyword
.PP
.SH "DESCRIPTION"
diff --git a/whois.c b/whois.c
index 35576d9..b4c4274 100644
--- a/whois.c
+++ b/whois.c
@@ -90,6 +90,7 @@ int main(int argc, char *argv[])
int ch, nopar = 0, fstringlen = 64;
const char *server = NULL, *port = NULL;
char *qstring, *fstring;
+ int ret;
#ifdef ENABLE_NLS
setlocale(LC_ALL, "");
@@ -203,9 +204,9 @@ int main(int argc, char *argv[])
if (!server)
server = guess_server(qstring);
- handle_query(server, port, qstring, fstring);
+ ret = handle_query(server, port, qstring, fstring);
- exit(0);
+ exit(ret);
}
/*
@@ -213,7 +214,7 @@ int main(int argc, char *argv[])
* from guess_server or an encoded command/message from guess_server.
* This function has multiple memory leaks.
*/
-void handle_query(const char *hserver, const char *hport,
+int handle_query(const char *hserver, const char *hport,
const char *query, const char *flags)
{
const char *server = NULL, *port = NULL;
@@ -237,16 +238,16 @@ void handle_query(const char *hserver, const char *hport,
puts(_("This TLD has no whois server, but you can access the "
"whois database at"));
puts(server + 1);
- return;
+ return 1;
case 3:
puts(_("This TLD has no whois server."));
- return;
+ return 1;
case 5:
puts(_("No whois server is known for this kind of object."));
- return;
+ return 1;
case 6:
puts(_("Unknown AS number or IP network. Please upgrade this program."));
- return;
+ return 1;
case 4:
if (verb)
printf(_("Using server %s.\n"), server + 1);
@@ -288,7 +289,7 @@ void handle_query(const char *hserver, const char *hport,
}
if (!server)
- return;
+ return 1;
query_string = queryformat(server, flags, query);
if (verb) {
@@ -302,12 +303,12 @@ void handle_query(const char *hserver, const char *hport,
free(query_string);
/* recursion is fun */
- if (server) {
+ if (server && !strchr(query, ' ')) {
printf(_("\n\nFound a referral to %s.\n\n"), server);
handle_query(server, NULL, query, flags);
}
- return;
+ return 0;
}
#ifdef CONFIG_FILE
@@ -560,11 +561,16 @@ char *queryformat(const char *server, const char *flags, const char *query)
strcat(buf, query + 2);
}
else if (!isripe && streq(server, "whois.arin.net") &&
- strncaseeq(query, "AS", 2) && isasciidigit(query[2]))
- strcat(buf, query + 2); /* strip the "AS" prefix */
- else if (!isripe && streq(server, "whois.arin.net") &&
- (p = strrchr(query, '/')))
- strncat(buf, query, p - query); /* strip the mask length */
+ !strrchr(query, ' ')) {
+ if (strncaseeq(query, "AS", 2) && isasciidigit(query[2])) {
+ strcat(buf, "a ");
+ strcat(buf, query + 2);
+ } else if (myinet_aton(query) || strchr(query, ':')) {
+ strcat(buf, "n + ");
+ strcat(buf, query);
+ } else
+ strcat(buf, query);
+ }
else
strcat(buf, query);
@@ -1006,7 +1012,9 @@ int domcmp(const char *dom, const char *tld)
char *normalize_domain(const char *dom)
{
char *p, *ret;
+#ifdef HAVE_LIBIDN
char *domain_start = NULL;
+#endif
ret = strdup(dom);
/* eat trailing dots and blanks */
@@ -1237,7 +1245,7 @@ void usage(void)
"-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\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"
diff --git a/whois.h b/whois.h
index e274138..ac753a0 100644
--- a/whois.h
+++ b/whois.h
@@ -34,7 +34,7 @@ char *normalize_domain(const char *);
char *convert_6to4(const char *);
char *convert_teredo(const char *);
char *convert_inaddr(const char *);
-void handle_query(const char *server, const char *port,
+int handle_query(const char *server, const char *port,
const char *qstring, const char *fstring);
void split_server_port(const char *const input, const char **server,
const char **port);
diff --git a/whois.spec b/whois.spec
index 98cbe2d..09892e3 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
Summary: Enhanced WHOIS client
Name: whois
-Version: 5.0.11
+Version: 5.0.12
Release: 1
License: GPL
Vendor: Marco d'Itri <md@linux.it>