summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.h2
-rw-r--r--debian/changelog13
-rw-r--r--debian/control2
-rw-r--r--ip_del_list3
-rwxr-xr-xmake_tld_serv.pl15
-rw-r--r--mkpasswd.c26
-rw-r--r--po/cs.po74
-rw-r--r--po/de.po66
-rw-r--r--po/el.po66
-rw-r--r--po/es.po66
-rw-r--r--po/eu.po69
-rw-r--r--po/fi.po168
-rw-r--r--po/fr.po75
-rw-r--r--po/it.po66
-rw-r--r--po/ja.po66
-rw-r--r--po/no.po66
-rw-r--r--po/pl.po75
-rw-r--r--po/pt_BR.po74
-rw-r--r--po/ru.po71
-rw-r--r--tld_serv_list47
-rw-r--r--utils.h1
-rw-r--r--whois.c13
-rw-r--r--whois.spec2
23 files changed, 600 insertions, 526 deletions
diff --git a/config.h b/config.h
index a49408c..8a260e1 100644
--- a/config.h
+++ b/config.h
@@ -1,5 +1,5 @@
/* Program version */
-#define VERSION "4.7.34"
+#define VERSION "4.7.35"
/* Configurable features */
diff --git a/debian/changelog b/debian/changelog
index 1f87a51..ea39d20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+whois (4.7.35) unstable; urgency=medium
+
+ * Added new IPv4 allocations.
+ * Updated the .ae, .jobs, .ms, .ph and .tv TLD servers. (Closes: #539567)
+ * Added the .ls, .mg, .mk, .tz and .uy TLD servers.
+ * Removed the .td TLD server.
+ * mkpasswd: generate random-length hashes when supported.
+ * mkpasswd: use ngettext to support translation of plural forms.
+ (Patch courtesy of Petr Pisar.)
+ * Updated some translations.
+
+ -- Marco d'Itri <md@linux.it> Wed, 12 Aug 2009 15:31:20 +0200
+
whois (4.7.34) unstable; urgency=medium
* Added new IPv4 allocations.
diff --git a/debian/control b/debian/control
index a00621b..6cff9ee 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: whois
Section: net
Priority: standard
Maintainer: Marco d'Itri <md@linux.it>
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Build-Depends: debhelper (>= 5), gettext, libidn11-dev
Package: whois
diff --git a/ip_del_list b/ip_del_list
index 501cade..ccdc23e 100644
--- a/ip_del_list
+++ b/ip_del_list
@@ -89,9 +89,10 @@
169.208.0.0/12 apnic
171.16.0.0/12 ripe
171.32.0.0/15 ripe
+175.0.0.0/8 apnic
178.0.0.0/8 ripe
180.0.0.0/8 lacnic
-183.0.0.0/8 lacnic
+182.0.0.0/7 lacnic
# 175 -> 185 reserved
186.0.0.0/7 lacnic
188.0.0.0/8 ripe # transferred from ARIN to to RIPE
diff --git a/make_tld_serv.pl b/make_tld_serv.pl
index b9ad913..968494b 100755
--- a/make_tld_serv.pl
+++ b/make_tld_serv.pl
@@ -1,22 +1,23 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
+use warnings;
use strict;
while (<>) {
chomp;
- s/^\s*(.*)\s*$/$1/;
- s/\s*#.*$//;
+ s/#.*$//;
+ s/^\s+//; s/\s+$//;
next if /^$/;
+
die "format error: $_" unless
(my ($a, $b) = /^([\w\d\.-]+)\s+([\w\d\.:-]+|[A-Z]+\s+.*)$/);
+
$b =~ s/^W(?:EB)?\s+/\\x01/;
- $b =~ s/^M(?:SG)?\s+/\\x02/;
+ $b =~ s/^VERISIGN\s+/\\x04/;
$b = "\\x03" if $b eq 'NONE';
- $b = "\\x04" if $b eq 'CRSNIC';
$b = "\\x07" if $b eq 'PIR';
$b = "\\x08" if $b eq 'AFILIAS';
- $b = "\\x09" if $b eq 'NICCC';
$b = "\\x0C" if $b eq 'ARPA';
- print " \"$a\",\t\"$b\",\n";
+ print qq( "$a",\t"$b",\n);
}
diff --git a/mkpasswd.c b/mkpasswd.c
index ce5bbdc..8b64e49 100644
--- a/mkpasswd.c
+++ b/mkpasswd.c
@@ -233,12 +233,16 @@ int main(int argc, char *argv[])
unsigned int c = strlen(salt_arg);
if (c < salt_minlen || c > salt_maxlen) {
if (salt_minlen == salt_maxlen)
- fprintf(stderr,
- _("Wrong salt length: %d byte(s) when %d expected.\n"),
+ fprintf(stderr, ngettext(
+ "Wrong salt length: %d byte when %d expected.\n",
+ "Wrong salt length: %d bytes when %d expected.\n", c),
c, salt_maxlen);
else
- fprintf(stderr,
- _("Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"),
+ fprintf(stderr, ngettext(
+ "Wrong salt length: %d byte when %d <= n <= %d"
+ " expected.\n",
+ "Wrong salt length: %d bytes when %d <= n <= %d"
+ " expected.\n", c),
c, salt_minlen, salt_maxlen);
exit(1);
}
@@ -267,13 +271,19 @@ int main(int argc, char *argv[])
}
free(entropy);
#else
+ unsigned int salt_len = salt_maxlen;
+
+ if (salt_minlen != salt_maxlen) { /* salt length can vary */
+ srand(time(NULL) + getpid());
+ salt_len = rand() % (salt_maxlen - salt_minlen + 1) + salt_minlen;
+ }
+
salt = NOFAIL(malloc(strlen(salt_prefix) + strlen(rounds_str)
- + salt_maxlen + 1));
+ + salt_len + 1));
*salt = '\0';
strcat(salt, salt_prefix);
strcat(salt, rounds_str);
- /* XXX the salt length should be random when it can vary */
- generate_salt(salt + strlen(salt), salt_maxlen);
+ generate_salt(salt + strlen(salt), salt_len);
#endif
}
@@ -433,7 +443,7 @@ void display_version(void)
void display_methods(void)
{
- int i;
+ unsigned int i;
printf(_("Available methods:\n"));
for (i = 0; methods[i].method != NULL; i++)
diff --git a/po/cs.po b/po/cs.po
index 7ee5867..d583029 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,17 +1,18 @@
# Czech translation for whois
-# Petr Pisar <petr.pisar@atlas.cz>, 2008
+# Petr Pisar <petr.pisar@atlas.cz>, 2008, 2009
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.7.26\n"
+"Project-Id-Version: whois 4.7.35\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
-"PO-Revision-Date: 2008-07-01 09:40+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"PO-Revision-Date: 2009-08-10 09:08+0200\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#: ../whois.c:120
#, c-format
@@ -25,8 +26,7 @@ msgstr ""
"Chyby programu hlaste na %s (anglicky), chyby překladu na\n"
"<translation-team-cs@lists.sourceforge.net> (česky).\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "Používám server %s.\n"
@@ -36,22 +36,22 @@ msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Tato TLD nemá žádný whoisový server, ale k whoisové databázi se lze dostat na"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Tato TLD nemá žádný whoisový server."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Pro tento druh objektu není znám žádný whoisový server."
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Neznémé číslo AS nebo neznámá IP síť.\n"
"Prosím, pořiďte si novou verzi tohoto programu."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -62,7 +62,7 @@ msgstr ""
"Dotazuji se na IPv4 konec %s příslušející 6to4 IPv6 adrese.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, c-format
msgid ""
"\n"
@@ -73,7 +73,7 @@ msgstr ""
"Dotazuji se na IPv4 konec %s příslušející Teredo IPv6 adrese.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
"Znění dotazu: „%s“\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -95,16 +95,16 @@ msgstr ""
"Nalezen odkaz na %s.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Tento řádek nemohu rozebrat: %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Varování: RIPE příznak použit s tradičním serverem."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +112,26 @@ msgstr ""
"Katastrofální chyba: text prohlášení byl pozměněn.\n"
"Prosím, pořiďte si novou verzi tohoto programu.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "Jméno počítače %s nenalezeno."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/TCP: neznámá služba"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Čas vypršel."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Přerušeno signálem %d…"
-#: ../whois.c:1109
+#: ../whois.c:1100
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -221,35 +221,41 @@ msgstr "Pro podrobnosti zkuste příkaz „%s --help“.\n"
#: ../mkpasswd.c:237
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "Chybná délka soli: %d bajty(ů), zatímco očekáváno %d.\n"
+msgid "Wrong salt length: %d byte when %d expected.\n"
+msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
+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:241
-#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "Chybná délka soli: %d bajty(ů), zatímco očekáváno %d.\n"
+#: ../mkpasswd.c:242
+#, 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] "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:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Neplatný znak v soli „%c“.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Heslo: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Zakázaný znak v hesle „0x%hhx“.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Metoda není podporována funkcí crypt(3).\n"
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -260,7 +266,7 @@ msgstr ""
"Zašifruje HESLO pomocí funkce crypt(3).\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -294,7 +300,7 @@ msgstr ""
"Chyby programu hlaste na %s (anglicky), chyby překladu na\n"
"<translation-team-cs@lists.sourceforge.net> (česky).\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, c-format
msgid "Available methods:\n"
msgstr "Dostupné metody:\n"
diff --git a/po/de.po b/po/de.po
index ef84f04..d948e3f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,13 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.16\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+0200\n"
"PO-Revision-Date: 2004-06-15 00:08+0100\n"
"Last-Translator: Adrian Bunk <bunk@fs.tum.de>\n"
"Language-Team: \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:120
#, c-format
@@ -26,8 +27,7 @@ msgstr ""
"\n"
"Senden Sie Bugreports an %s.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "Benutze Server %s.\n"
@@ -36,21 +36,21 @@ msgstr "Benutze Server %s.\n"
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr "Diese TLD hat keinen whois-Server, aber eine whois-Datenbank unter"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Diese TLD hat keinen whois-Server."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Hierf�r ist kein Whois-Server bekannt."
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Unbekannte AS- oder IP-Netzwerk-Nummer. Bitte upgraden Sie dieses Programm."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -61,7 +61,7 @@ msgstr ""
"Frage nach dem IPv4 Endpunkt %s einer 6to4 IPv6-Adresse.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, fuzzy, c-format
msgid ""
"\n"
@@ -72,7 +72,7 @@ msgstr ""
"Frage nach dem IPv4 Endpunkt %s einer 6to4 IPv6-Adresse.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +81,7 @@ msgstr ""
"Suche nach: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -94,17 +94,17 @@ msgstr ""
"Verweis auf %s gefunden.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Kann diese Zeile nicht parsen: %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Warnung: RIPE-Flags wurden mit einem \"traditionellen\" Server verwendet."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +112,26 @@ msgstr ""
"Schwerer Fehler: Haftungsausschlusstext wurde geaendert.\n"
"Bitte upgraden sie dieses Programm.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "Host %s nicht gefunden."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: unbekannter Dienst"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Timeout."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Erhielt Signal %d, unterbrochen..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -218,36 +218,40 @@ msgid "Try '%s --help' for more information.\n"
msgstr "Versuchen Sie '%s --help' f�r mehr Informationen.\n"
#: ../mkpasswd.c:237
-#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "Falsche Salt-L�nge: %d Byte(s), aber%d wurden erwartet.\n"
+#, fuzzy, c-format
+msgid "Wrong salt length: %d byte when %d expected.\n"
+msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
+msgstr[0] "Falsche Salt-L�nge: %d Byte(s), aber%d wurden erwartet.\n"
+msgstr[1] "Falsche Salt-L�nge: %d Byte(s), aber%d wurden erwartet.\n"
-#: ../mkpasswd.c:241
+#: ../mkpasswd.c:242
#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "Falsche Salt-L�nge: %d Byte(s), aber%d wurden erwartet.\n"
+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(s), aber%d wurden erwartet.\n"
+msgstr[1] "Falsche Salt-L�nge: %d Byte(s), aber%d wurden erwartet.\n"
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Illegaler Salt-Buchstabe '%c'.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Passwort:"
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Illegaler Passwort-Buchstabe '0x%hhx'.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -258,7 +262,7 @@ msgstr ""
"Verschluesselt das PASSWORT mit crypt(3).\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -277,7 +281,7 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Verf�gbare Algorithmen:\n"
diff --git a/po/el.po b/po/el.po
index 604d323..c39f8d8 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,13 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.9\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+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"
"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:120
#, c-format
@@ -25,8 +26,7 @@ msgstr ""
"\n"
"Αναφέρατε σφάλματα στο %s.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
@@ -37,23 +37,23 @@ msgstr ""
"Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την "
"βάση whois στο"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr ""
"Κανένας εξυπηρετητής whois δεν είναι γνωστός για αυτού του είδους το "
"αντικείμενο."
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Άγνωστος αριθμός AS ή IP δικτύου. Παρακαλώ αναβαθμίστε αυτό το πρόγραμμα."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -64,7 +64,7 @@ msgstr ""
"Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, fuzzy, c-format
msgid ""
"\n"
@@ -75,7 +75,7 @@ msgstr ""
"Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -84,7 +84,7 @@ msgstr ""
"Αλφαριθμητικό ερώτησης: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -97,18 +97,18 @@ msgstr ""
"Βρέθηκε αναφορά στο %s.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Αδύνατη η ανάλυση αυτής της γραμμής: %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Προειδοποίηση: Η σημαίες του RIPE χρησιμοποιούνται σε έναν παραδοσιακό "
"εξυπηρετητή."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -116,26 +116,26 @@ msgstr ""
"Καταστροφικό σφάλμα: το κείμενο της αποποίησης ευθυνών έχει τροποποιηθεί.\n"
"Παρακαλώ αναβαθμίστε το πρόγραμμα.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "Το σύστημα %s δε βρέθηκε."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: άγνωστη υπηρεσία"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Διάλειμμα."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Διακοπή από το σήμα %d..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -230,36 +230,40 @@ msgid "Try '%s --help' for more information.\n"
msgstr "Προσπάθησε '%s --help' για περισσότερες πληροφορίες.\n"
#: ../mkpasswd.c:237
-#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "Εσφαλμένο μήκος salt : %d byte(s) όταν αναμένεται %d .\n"
+#, 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:241
+#: ../mkpasswd.c:242
#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "Εσφαλμένο μήκος salt : %d byte(s) όταν αναμένεται %d .\n"
+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:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Μη αποδεκτός χαρακτήρας salt '%c'.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Συνθηματικό: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Μη αποδεκτός χαρακτήρας συνθηματικού '0x%hhx'.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -270,7 +274,7 @@ msgstr ""
"Κρυπτογραφεί το ΣΥΝΘΗΜΑΤΙΚΟ χρησιμοποιώντας το crypt(3).\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -303,7 +307,7 @@ msgstr ""
"\n"
"Αναφέρατε σφάλματα στο %s.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Διαθέσιμοι αλγόριθμοι:\n"
diff --git a/po/es.po b/po/es.po
index e0651f4..6481790 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,13 +6,14 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.5.29\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+0200\n"
"PO-Revision-Date: 2002-08-24 16:22+0200\n"
"Last-Translator: Francisco Monteagudo <francisco@monteagudo.net>\n"
"Language-Team: Spanish <es@li.org>\n"
"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:120
#, c-format
@@ -25,8 +26,7 @@ msgstr ""
"\n"
"Informar de bugs a %s.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "Usando el servidor %s.\n"
@@ -37,21 +37,21 @@ msgstr ""
"Este TLD no dispone de servidor whois, pero puede acceder a la informacion "
"de whois en"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "No existe servidor whois para este TLD."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr ""
-#: ../whois.c:223
+#: ../whois.c:220
#, fuzzy
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Numero AS desconocido. Por favor, actualice este programa."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -59,7 +59,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:260
+#: ../whois.c:251
#, c-format
msgid ""
"\n"
@@ -67,7 +67,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -76,7 +76,7 @@ msgstr ""
"Consulta: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, fuzzy, c-format
msgid ""
"\n"
@@ -88,18 +88,18 @@ msgstr ""
"Se ha encontrado en crsnic una referencia a %s.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "No puedo procesar esta linea: %s"
-#: ../whois.c:489
+#: ../whois.c:480
#, fuzzy
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Atencion: Los flags RIPE son ignorados por los servidores tradicionales."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -107,26 +107,26 @@ msgstr ""
"Error catastrofico: el texto de las condiciones de uso ha sido cambiado.\n"
"Actualize este programa.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "Host %s no encontrado."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servicio desconocido"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr ""
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrumpido por la se�al %d..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -215,36 +215,40 @@ msgid "Try '%s --help' for more information.\n"
msgstr "%s --help para mas informacion.\n"
#: ../mkpasswd.c:237
-#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "Tama�o de semilla incorrecto: %d bytes en lugar de %d.\n"
+#, 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] "Tama�o de semilla incorrecto: %d bytes en lugar de %d.\n"
+msgstr[1] "Tama�o de semilla incorrecto: %d bytes en lugar de %d.\n"
-#: ../mkpasswd.c:241
+#: ../mkpasswd.c:242
#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "Tama�o de semilla incorrecto: %d bytes en lugar de %d.\n"
+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] "Tama�o de semilla incorrecto: %d bytes en lugar de %d.\n"
+msgstr[1] "Tama�o de semilla incorrecto: %d bytes en lugar de %d.\n"
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "El caracter '%c' ilegal en la semilla.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Clave: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "El caracter '0x%hhx' es ilegal en la clave.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -255,7 +259,7 @@ msgstr ""
"Encripta CLAVE utilizando crypt(3).\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -287,7 +291,7 @@ msgstr ""
"\n"
"Informar de bugs a: %s.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Algoritmos disponibles:\n"
diff --git a/po/eu.po b/po/eu.po
index bba3a8a..b33c219 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,13 +1,13 @@
# translation of whois to Euskara
# Aitor Iba�ez <aitiba@gmail.com>,2007
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) 2009 Marco d'Itri
+# This file is distributed under the same license as the whois package.
# Aitor Iba�ez <aitiba@gmail.com>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: whois 4.5.29\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+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"
@@ -26,8 +26,7 @@ msgstr ""
"\n"
"Bug berri baten jakinarazpena: %s.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "%s zerbitzaria erabiltzen.\n"
@@ -38,21 +37,21 @@ msgstr ""
"TLD honek ez du whois zerbitzaririk, baina whois databasera sarbidea "
"daukazu..."
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "TLD honek ez du whois zerbitzaririk."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Objetu mota horrentzako, ez da whois zerbitzaririk ezagutzen."
-#: ../whois.c:223
+#: ../whois.c:220
#, fuzzy
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "AS zenbaki edo IP sarea ezezaguna. Mesedez, programa eguneratu."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -63,7 +62,7 @@ msgstr ""
"Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, fuzzy, c-format
msgid ""
"\n"
@@ -74,7 +73,7 @@ msgstr ""
"Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -83,7 +82,7 @@ msgstr ""
"Kontsulta: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, fuzzy, c-format
msgid ""
"\n"
@@ -95,17 +94,17 @@ msgstr ""
"$s-ra erreferentzia aurkituta.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Lerro hau, %s , ezin da prozesatu."
-#: ../whois.c:489
+#: ../whois.c:480
#, fuzzy
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Oharra: RIPE flags-ak ohiko zerbitzariengatik ezikusiak izaten dira."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -113,26 +112,26 @@ msgstr ""
"Hondamen arriskua: erabilpen balditzen textua aldatu egin da.\n"
"Programa eguneratu.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "%s Host-a ez da aurkitu."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: zerbitzu ezezaguna"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Denbora muga."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "%d seinalearengatik etena..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -224,36 +223,40 @@ msgid "Try '%s --help' for more information.\n"
msgstr "%s --help informazio gehiagorako.\n"
#: ../mkpasswd.c:237
-#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "Hazi tamain desegokia:%d byte %d-en ordez.\n"
+#, 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:241
+#: ../mkpasswd.c:242
#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "Hazi tamain desegokia:%d byte %d-en ordez.\n"
+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:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "'%c' karakterea, hazian, ilegala da.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Pasahitza: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "'0x%hhx' password karakterea ilegala da.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -264,7 +267,7 @@ msgstr ""
"PASAHITZA crypt(3) erabiliz enkriptatu.\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -297,7 +300,7 @@ msgstr ""
"\n"
"Bug berri baten jakinarazpena: %s.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Algoritmo erabilgarriak:\n"
diff --git a/po/fi.po b/po/fi.po
index 51bc064..6f4c079 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,18 +1,19 @@
# Finnish translation for whois.
-# Copyright (C) 2008 Sami Kerola <kerolasa@iki.fi>
+# Copyright (C) 2008- Sami Kerola <kerolasa@iki.fi>
#
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.7.28\n"
+"Project-Id-Version: whois 4.7.34\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
-"PO-Revision-Date: 2008-09-28 19:28+0100\n"
+"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"PO-Revision-Date: 2009-08-12 14:55+0100\n"
"Last-Translator: Sami Kerola <kerolasa@iki.fi>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: ../whois.c:120
#, c-format
@@ -23,33 +24,32 @@ msgid ""
msgstr ""
"Versio %s.\n"
"\n"
-"L�het� bugiraportit osoitteeseen %s.\n"
+"Lähetä bugiraportit osoitteeseen %s.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
-msgstr "K�ytet��n palvelinta %s.\n"
+msgstr "Käytetään palvelinta %s.\n"
#: ../whois.c:209
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"
+"Tälla TLD:llä ei ole whois palvelinta, tiedot ovat nakyvissä osoitteessa"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
-msgstr "T�lla TLD:ll� ei ole whois palvelinta."
+msgstr "Tälla TLD:llä ei ole whois palvelinta."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
-msgstr "Kysytty ei vastaa minkaan whois palvelun tiet�miin tietoihin."
+msgstr "Mikään whois palvelu ei tiedä kysyttyä tietoa."
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Tuntematon AS-numero tai IP-verkko. P�ivit� t�m� ohjelma."
+msgstr "Tuntematon AS-numero tai IP-verkko. Päivitä tämä ohjelma."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -57,10 +57,10 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Kysyt��n IPv4 ulostulona %s IPv6:n IPv4 avaruudesta.\n"
+"Kysytään IPv4 ulostulona %s IPv6:n IPv4 avaruudesta.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, c-format
msgid ""
"\n"
@@ -68,10 +68,10 @@ msgid ""
"\n"
msgstr ""
"\n"
-"Kysyt��n IPv4 ulostulona %s Teredo IPv6 tunneliosoitetta.\n"
+"Kysytään IPv4 ulostulona %s Teredo IPv6 tunneliosoitetta.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -80,7 +80,7 @@ msgstr ""
"Kysely: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -90,46 +90,46 @@ msgid ""
msgstr ""
"\n"
"\n"
-"L�ytyi viittaus %s.\n"
+"Löytyi viittaus %s.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
-msgstr "Ohjelma ei kykene tulkitsemaan rivi�: %s"
+msgstr "Ohjelma ei kykene tulkitsemaan riviä: %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
-msgstr "Varoitus: k�yt�t RIPE valitsimia traditionaaliseen palvelimeen."
+msgstr "Varoitus: käytät RIPE valitsimia perinteiseen palvelimeen."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
msgstr ""
"Katastrofaalinen virhe: lisenssiteksti on muuttunut.\n"
-"P�ivita ohjelma.\n"
+"Päivita ohjelma.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
-msgstr "Palvelinta %s ei l�ydy."
+msgstr "Palvelinta %s ei löydy."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
-msgstr "%s/tcp: tuntematon versio"
+msgstr "%s/tcp: tuntematon palvelu"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Aikakatkaisu."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Ohjelma keskeytyi signaaliin %d..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -164,98 +164,102 @@ msgid ""
" --help display this help and exit\n"
" --version output version information and exit\n"
msgstr ""
-"K�ytt�: whois [OPTIO]... OBJEKTI...\n"
+"Käyttö: whois [OPTIO]... OBJEKTI...\n"
"\n"
-"-l tasoa ep�tarkempi osuma [ainoastaan RPSL]\n"
-"-L etsi kaikki ep�tarkemmat osumat\n"
-"-m etsi yht� tasoa tarkemmat osumat\n"
+"-l tasoa epätarkempi osuma [ainoastaan RPSL]\n"
+"-L etsi kaikki epätarkemmat osumat\n"
+"-m etsi yhtä tasoa tarkemmat osumat\n"
"-M etsi kaikki tarkemmat osumat\n"
-"-c etsi v�h�isin, joka vastaa mnt-irt attribuuttia\n"
-"-x t�ydellinen osuma [ainoastaan RPSL]\n"
-"-d palauta ainoastaan k��nteisdomainit [ainoastan RPSL]\n"
-"-i ATTR[,ATTR]... k��nteiskysely ATTRibuutin perusteella\n"
-"-T TYPE[,TYPE]... etsi ainoastaan m��ritetyn tyyppisi� objekteja\n"
+"-c etsi vähäisin, joka vastaa mnt-irt attribuuttia\n"
+"-x täydellinen osuma [ainoastaan RPSL]\n"
+"-d palauta ainoastaan käänteisdomainit [ainoastan RPSL]\n"
+"-i ATTR[,ATTR]... käänteiskysely ATTRibuutin perusteella\n"
+"-T TYPE[,TYPE]... etsi ainoastaan määritetyn tyyppisiä objekteja\n"
"-K palauta ainoastan hakuavaimet [ainoastan RPSL]\n"
-"-r �l� k�yt� rekursiivista kontaktietohakua\n"
-"-R pakota k�ytt�m��n paikallista kopiota domain\n"
-" objektista, vaikka se sis�lt�isi viitteit�\n"
+"-r älä käytä rekursiivista kontaktietohakua\n"
+"-R pakota käyttämään paikallista kopiota domain\n"
+" objektista, vaikka se sisältäisi viitteitä\n"
"-a etsi kaikista tietokannoista\n"
"-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�� "
+"-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"
"-v TYPE monisanainen mallinne TYPE objektille\n"
"-q [version|sources|types] erityinen palvelintieto [ainostaan RPSL]\n"
-"-F nopea tuloste (sis�lt�� -r valitsimen)\n"
+"-F nopea tuloste (sisältää -r valitsimen)\n"
"-h HOST kysy palvelimelta HOST\n"
-"-p PORT k�yt� TCP-porttia PORT\n"
-"-H �l� tulosta k�ytt�ehtoja\n"
-" --verbose selit�� mit� tapahtuu\n"
-" --help tulosta t�m� ruutu\n"
+"-p PORT käytä TCP-porttia PORT\n"
+"-H älä tulosta käyttöehtoja\n"
+" --verbose näytä mitä tapahtuu\n"
+" --help tulosta tämä ruutu\n"
" --version tulosta versio\n"
#: ../mkpasswd.c:80
msgid "standard 56 bit DES-based crypt(3)"
-msgstr "\tStandardi DES-salaus ks crypt(3)"
+msgstr "Standardi 56 bittinen DES-salaus ks crypt(3)"
#: ../mkpasswd.c:159
#, c-format
msgid "Invalid method '%s'.\n"
-msgstr "V��r� metodi '%s'.\n"
+msgstr "Väärä metodi '%s'.\n"
#: ../mkpasswd.c:168 ../mkpasswd.c:178
#, c-format
msgid "Invalid number '%s'.\n"
-msgstr "V��r� numero '%s'.\n"
+msgstr "Väärä numero '%s'.\n"
#: ../mkpasswd.c:196
#, c-format
msgid "Try '%s --help' for more information.\n"
-msgstr "K�yt� valitsinta '%s --help' lis�tietojen saamiseen.\n"
+msgstr "Käytä valitsinta '%s --help' lisätietojen saamiseen.\n"
#: ../mkpasswd.c:237
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "V��r� suolan pituus: %d tavu(a), kun %d tavua odotettiin.\n"
+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:241
-#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "V��r� suolan pituus: %d tavu(a), kun %d tavua odotettiin.\n"
+#: ../mkpasswd.c:242
+#, 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:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Suolassa laiton merkki '%c'.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
-msgstr "Salasana:"
+msgstr "Salasana: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Laiton merkki salasanassa '0x%hhx'.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Toiminto ei ole tuettu crypt(3) funktiossa.\n"
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
"Crypts the PASSWORD using crypt(3).\n"
"\n"
msgstr ""
-"K�ytt�: mkpasswd [OPTIO] ... [SALASANA] [SUOLA]]\n"
+"Käyttö: mkpasswd [OPTIO] ... [SALASANA] [SUOLA]]\n"
"Salaa salasanan crypt(3) funktiolla.\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -275,20 +279,20 @@ msgid ""
msgstr ""
" -m, --method=TYPE valitse toiminto TYPE\n"
" -S, --salt=SUOLA suolan valinta\n"
-" -R, --rounds=NUMERO py�rist� numeroon\n"
+" -R, --rounds=NUMERO pyöristä numeroon\n"
" -P, --password-fd=NUM lue salasana avoimesta tiedostosta NUM\n"
-" �l�k� terminaalista /dev/tty\n"
+" äläkä terminaalista /dev/tty\n"
" -s, --stdin sama kuin --password-fd=0\n"
-" -h, --help tulosta t�m� ruutu\n"
+" -h, --help tulosta tämä ruutu\n"
" -V, --version tulosta versio\n"
"\n"
-"Ellei salasanaa m��ritet� se kysyt��n.\n"
-"Ellei suolaa m��ritet� k�ytet��n satunnaista.\n"
+"Ellei salasanaa määritetä se kysytään.\n"
+"Ellei suolaa määritetä käytetään satunnaista.\n"
"Jos tyyppi on 'help', tulostetaan toiminnot.\n"
"\n"
-"L�het� bugiraportit osoitteeseen %s.\n"
+"Lähetä bugiraportit osoitteeseen %s.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, c-format
msgid "Available methods:\n"
-msgstr "K�ytett�viss� olevat toiminnot:\n"
+msgstr "Käytettävissä olevat toiminnot:\n"
diff --git a/po/fr.po b/po/fr.po
index f9056c3..6446a18 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,4 +1,3 @@
-#
# Translation of whois to French
# Copyright not yet (C) 2003-2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
# This file is distributed under the same license as the whois package.
@@ -9,13 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.6.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+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"
"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:120
#, c-format
@@ -28,8 +28,7 @@ msgstr ""
"\n"
"Veuillez signaler les bogues à %s.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "Le serveur %s est sélectionné.\n"
@@ -40,20 +39,20 @@ msgstr ""
"Ce TLD n'a pas de serveur whois, mais vous pouvez accéder à la base de "
"données à"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Ce TLD n'a pas de serveur whois."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Aucun serveur whois n'est connu pour ce type d'objet."
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Numéro d'AS ou réseau IP inconnu. Veuillez mettre à jour ce programme."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -64,7 +63,7 @@ msgstr ""
"Requête faite pour l'extrémité IPv4 %s d'une adresse IPv6 6to4.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, c-format
msgid ""
"\n"
@@ -75,7 +74,7 @@ msgstr ""
"Requête faite pour l'extrémité IPv4 %s d'une adresse IPv6 Teredo.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -84,7 +83,7 @@ msgstr ""
"Requête : \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -97,17 +96,17 @@ msgstr ""
"Renvoi trouvé vers %s.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Impossible d'interpréter la ligne : %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
msgstr ""
"Avertissement : des options RIPE ont été utilisées avec un serveur classique."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -115,26 +114,26 @@ msgstr ""
"Erreur catastrophique : le texte de déni de responsabilité a changé.\n"
"Veuillez mettre à jour ce programme.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "L'hôte %s est introuvable."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp : service inconnu"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Temps limite dépassé."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interruption par le signal %d..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -187,7 +186,8 @@ msgstr ""
"-T TYPE[,TYPE]... chercher seulement les objets de ce TYPE\n"
"-K seules les clés primaires sont renvoyées [RPSL\n"
" seulement]\n"
-"-r désactiver la recherche récursive des informations de\n"
+"-r désactiver la recherche récursive des informations "
+"de\n"
" contact\n"
"-R forcer l'affichage de la copie locale de l'objet de\n"
" domaine, même s'il contient un renvoi\n"
@@ -195,7 +195,8 @@ 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"
+"-t TYPE demander la syntaxe pour les objets de ce TYPE "
+"(« all »\n"
" donne une liste)\n"
"-v TYPE demander la syntaxe détaillée pour les objets de ce\n"
" TYPE\n"
@@ -232,36 +233,40 @@ msgstr "Veuillez taper « %s --help » pour plus d'informations.\n"
# : ../mkpasswd.c:152
#: ../mkpasswd.c:237
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "Mauvaise taille d'aléa : %d octet(s) au lieu de %d.\n"
+msgid "Wrong salt length: %d byte when %d expected.\n"
+msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
+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:241
+#: ../mkpasswd.c:242
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "Mauvaise taille d'aléa : %d octet(s), non comprise entre %d et %d.\n"
+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:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Le caractère « %c » est invalide dans l'aléa.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Mot de passe : "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, 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:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Méthode non prise en charge par crypt(3).\n"
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -272,7 +277,7 @@ msgstr ""
"Chiffre le MOT DE PASSE à l'aide de la fonction crypt(3).\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -293,8 +298,8 @@ msgstr ""
" -m, --method=TYPE sélectionner ce TYPE de méthode\n"
" -S, --salt=ALÉA utiliser cette ALÉA\n"
" -R, --rounds=NOMBRE utiliser le NOMBRE de passages indiqué\n"
-" -P, --password-fd=NUM lire le mot de passe depuis le descripteur de\n "
-" fichier NUM\n"
+" -P, --password-fd=NUM lire le mot de passe depuis le descripteur de\n"
+" fichier NUM\n"
" au lieu de /dev/tty\n"
" -s, --stdin équivalent à --password-fd=0\n"
" -h, --help afficher cette page d'aide et sortir\n"
@@ -306,7 +311,7 @@ msgstr ""
"\n"
"Veuillez signaler les bogues à %s.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, c-format
msgid "Available methods:\n"
msgstr "Méthodes disponibles :\n"
diff --git a/po/it.po b/po/it.po
index d3b5f70..4c2c29d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,17 +1,18 @@
# Traduzione di whois.pot.
-# Copyright (C) 1999-2006 Marco d'Itri
+# Copyright (C) 1999-2009 Marco d'Itri
#
msgid ""
msgstr ""
"Project-Id-Version: whois 4.7.14\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+0200\n"
"PO-Revision-Date: 2009-04-12 06:04+0200\n"
"Last-Translator: Marco d'Itri <md@linux.it>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"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:120
#, c-format
@@ -24,8 +25,7 @@ msgstr ""
"\n"
"Segnalare i bug a %s.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "Uso il server %s.\n"
@@ -35,21 +35,21 @@ 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:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Per questo TLD non esiste un server whois."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Non � noto alcun server whois per questo tipo di oggetto."
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr ""
"Numero dell'AS o della rete IP sconosciuto. Per favore aggiorna il programma."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -60,7 +60,7 @@ msgstr ""
"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 6to4.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, c-format
msgid ""
"\n"
@@ -71,7 +71,7 @@ msgstr ""
"Cerco l'endpoint IPv4 %s di un indirizzo IPv6 Teredo.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -80,7 +80,7 @@ msgstr ""
"Richiesta: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -93,16 +93,16 @@ msgstr ""
"Trovato un riferimento a %s.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Impossibile interpretare questa riga: %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -110,26 +110,26 @@ msgstr ""
"Errore catastrofico: il testo di avvertenze � cambiato.\n"
"Aggiorna questo programma.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "Host %s non trovato."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servizio sconosciuto"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Tempo scaduto."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrotto dal segnale %d..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -219,35 +219,39 @@ msgstr "Per maggior informazioni prova '%s --help'.\n"
#: ../mkpasswd.c:237
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "Lunghezza del sale sbagliata: %d byte invece di %d.\n"
+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:241
+#: ../mkpasswd.c:242
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "Lunghezza del sale sbagliata: %d byte invece di %d <= n <= %d.\n"
+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:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Il carattere '%c' non � valido in un sale.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Password: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Il carattere '0x%hhx' non � valido in una password.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Metodo non gestito da crypt(3).\n"
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -258,7 +262,7 @@ msgstr ""
"Cifra la PASSWORD usando crypt(3).\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -291,7 +295,7 @@ msgstr ""
"\n"
"Segnalare i bug a %s.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, c-format
msgid "Available methods:\n"
msgstr "Metodi disponibili:\n"
diff --git a/po/ja.po b/po/ja.po
index c6a520a..496018a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,13 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.7.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+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"
"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:120
#, c-format
@@ -26,8 +27,7 @@ msgstr ""
"\n"
"バグ報告は %s へ.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "サーバー %s を使用\n"
@@ -38,20 +38,20 @@ msgstr ""
"この TLD には whois サーバーがありませんが、次のサーバーで whois データベース"
"にアクセスできます"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "この TLD には whois サーバーがありません"
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "この種のオブジェクトに対する既知の whois サーバーはありません"
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "不明な AS 番号または IP ネットワーク. アップグレードして下さい"
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -62,7 +62,7 @@ msgstr ""
"6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, fuzzy, c-format
msgid ""
"\n"
@@ -73,7 +73,7 @@ msgstr ""
"6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
"問い合わせ文字列: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -95,16 +95,16 @@ msgstr ""
"%s への照会をみつけました\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "この行を解析できません: %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
msgstr "警告: 旧来のサーバーについて RIPE フラグが使用されています"
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +112,26 @@ msgstr ""
"破滅的なエラー: 免責条項テキストが変更されました\n"
"このプログラムをアップグレードして下さい\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "ホスト %s はみつかりませんでした"
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: 不明なサービス"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "時間切れ"
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "シグナル %d が割込み..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -218,36 +218,40 @@ msgid "Try '%s --help' for more information.\n"
msgstr "さらなる詳細については '%s --help' を実行\n"
#: ../mkpasswd.c:237
-#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "間違ったソルト長: %d バイト(s) (%d を期待)\n"
+#, 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:241
+#: ../mkpasswd.c:242
#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "間違ったソルト長: %d バイト(s) (%d を期待)\n"
+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:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "不正なソルト文字 '%c'\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "パスワード: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "不正なパスワード文字 '0x%hhx'\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -258,7 +262,7 @@ msgstr ""
"PASSWORD を crypt(3) で暗号化\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -290,7 +294,7 @@ msgstr ""
"\n"
"バグ報告は %s へ.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "利用可能なアルゴリズム:\n"
diff --git a/po/no.po b/po/no.po
index 4ae1860..dbb945f 100644
--- a/po/no.po
+++ b/po/no.po
@@ -1,19 +1,18 @@
# Oversatt fra whois.pot.
# Egil Kvaleberg <egil@kvaleberg.no>, 1999.
#
-# BUG: xxx
-#
msgid ""
msgstr ""
"Project-Id-Version: whois 4.4.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+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"
"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:120
#, c-format
@@ -23,8 +22,7 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "Bruker tjener %s.\n"
@@ -33,21 +31,21 @@ msgstr "Bruker tjener %s.\n"
msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr ""
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr ""
-#: ../whois.c:223
+#: ../whois.c:220
#, fuzzy
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -55,7 +53,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:260
+#: ../whois.c:251
#, c-format
msgid ""
"\n"
@@ -63,7 +61,7 @@ msgid ""
"\n"
msgstr ""
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -72,7 +70,7 @@ msgstr ""
"Foresp�rsel: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, fuzzy, c-format
msgid ""
"\n"
@@ -84,17 +82,17 @@ msgstr ""
"Fant InterNIC-referanse til %s.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr ""
-#: ../whois.c:489
+#: ../whois.c:480
#, fuzzy
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
#, fuzzy
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
@@ -103,26 +101,26 @@ msgstr ""
"Alvorlig feil: INTERNIC har endret standardtekst.\n"
"Vennligst oppdater programmet.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "Finner ikke verten %s."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: ukjent port"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr ""
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Avbrudt av signal %d..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, fuzzy, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -202,35 +200,39 @@ msgstr ""
#: ../mkpasswd.c:237
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr ""
+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:241
+#: ../mkpasswd.c:242
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr ""
+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:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr ""
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr ""
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr ""
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -238,7 +240,7 @@ msgid ""
"\n"
msgstr ""
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -257,7 +259,7 @@ msgid ""
"Report bugs to %s.\n"
msgstr ""
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, c-format
msgid "Available methods:\n"
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index ab53804..44f06b2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,19 +1,21 @@
# Polish translation for whois.
# Micha� 'CeFeK' Nazarewicz <cefek@career.pl>, 1999
# Przemys�aw Knycz <djrzulf@pld.org.pl>, 2003
-# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2008
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2009
#
msgid ""
msgstr ""
-"Project-Id-Version: whois 4.7.26\n"
+"Project-Id-Version: whois 4.7.35\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
-"PO-Revision-Date: 2008-05-18 19:40+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+0200\n"
+"PO-Revision-Date: 2009-08-10 17:02+0200\n"
"Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
"Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"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:120
#, c-format
@@ -26,8 +28,7 @@ msgstr ""
"\n"
"B��dy prosz� zg�asza� na adres %s.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "U�ycie serwera %s.\n"
@@ -37,20 +38,20 @@ msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Ta g��wna domena nie ma serwera whois, ale mo�na u�y� bazy danych whois pod"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Ta g��wna domena nie ma serwera whois."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Dla tego rodzaju obiektu nie jest znany �aden serwer whois."
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Nieznany numer AS lub sie� IP. Prosz� uaktualni� ten program."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -61,7 +62,7 @@ msgstr ""
"Pytanie o zako�czenie IPv4 %s adresu IPv6 typu 6to4.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, c-format
msgid ""
"\n"
@@ -72,7 +73,7 @@ msgstr ""
"Pytanie o zako�czenie IPv4 %s adresu IPv6 Teredo.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -81,7 +82,7 @@ msgstr ""
"Zapytanie: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -94,16 +95,16 @@ msgstr ""
"Znaleziono odniesienie do %s.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Nie mo�na przeanalizowa� tej linii: %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Uwaga: u�yto flag RIPE ze starszym serwerem."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -111,26 +112,26 @@ msgstr ""
"Katastrofa! Tekst o�wiadczenia zosta� zmieniony.\n"
"Prosz� uaktualni� ten program.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "Serwer %s nie zosta� znaleziony."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: us�uga nieznana"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Up�yn�� limit czasu."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Przerwano sygna�em %d..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -226,36 +227,42 @@ msgstr "'%s --help' poda wi�cej informacji.\n"
# : ../mkpasswd.c:152
#: ../mkpasswd.c:237
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "B��dna d�ugo�� zarodka: %d bajt�w kiedy oczekiwano %d.\n"
+msgid "Wrong salt length: %d byte when %d expected.\n"
+msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
+msgstr[0] "B��dna d�ugo�� zarodka: %d bajt kiedy oczekiwano %d.\n"
+msgstr[1] "B��dna d�ugo�� zarodka: %d bajty kiedy oczekiwano %d.\n"
+msgstr[2] "B��dna d�ugo�� zarodka: %d bajt�w kiedy oczekiwano %d.\n"
# : ../mkpasswd.c:152
-#: ../mkpasswd.c:241
-#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "B��dna d�ugo�� zarodka: %d bajt�w kiedy oczekiwano %d.\n"
+#: ../mkpasswd.c:242
+#, 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] "B��dna d�ugo�� zarodka: %d bajt kiedy oczekiwano %d <= n <= %d.\n"
+msgstr[1] "B��dna d�ugo�� zarodka: %d bajty kiedy oczekiwano %d <= n <= %d.\n"
+msgstr[2] "B��dna d�ugo�� zarodka: %d bajt�w kiedy oczekiwano %d <= n <= %d.\n"
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "B��dny znak zarodka '%c'.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Has�o: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "B��dny znak w ha�le '0x%hhx'.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr "Metoda nie obs�ugiwana przez crypt(3).\n"
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -266,7 +273,7 @@ msgstr ""
"Koduje HAS�O przy u�yciu funkcji crypt(3).\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -300,7 +307,7 @@ msgstr ""
"\n"
"B��dy prosz� zg�asza� na adres %s.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, c-format
msgid "Available methods:\n"
msgstr "Dost�pne metody:\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3024bfb..7d6c5e9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,5 @@
# Portuguese/Brazil translation of whois.
-# Copyright (C) 2006 THE whois'S COPYRIGHT HOLDER
+# Copyright (C) 2006 Marco d'Itri
# This file is distributed under the same license as the whois package.
# Anderson Goulart <globalx@gmail.com>, 2006.
#
@@ -7,13 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: whois 4.7.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+0200\n"
"PO-Revision-Date: 2006-04-26 21:03-0300\n"
"Last-Translator: Anderson Goulart <globalx@gmail.com>\n"
"Language-Team: Portuguese/Brazil\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
#: ../whois.c:120
#, c-format
@@ -26,8 +27,7 @@ msgstr ""
"\n"
"Reporte bugs para %s \n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "Utilizando servidor %s.\n"
@@ -38,20 +38,20 @@ msgstr ""
"Este TLD n�o tem servidor whois, mas voc� pode acessar a base de dados do "
"whois em"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "N�o existe servidor whois para este TLD."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Nenhum servidor whois � conhecido para este tipo de objeto."
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "N�mero AS ou rede IP desconhecidos. Por favor, atualize este programa."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -62,7 +62,7 @@ msgstr ""
"Procurando pela extremidade IPv4 %s de um endere�o IPv6. 6to4.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, fuzzy, c-format
msgid ""
"\n"
@@ -73,7 +73,7 @@ msgstr ""
"Procurando pela extremidade IPv4 %s de um endere�o IPv6. 6to4.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
"Consulta: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -95,16 +95,16 @@ msgstr ""
"Uma refer�ncia para�%s encontrada.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "N�o p�de processar esta linha: %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Aviso: RIPE flags utilizados com um servidor tradicional."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +112,26 @@ msgstr ""
"Erro catastr�fico: o texto das condi��es de uso foi alterado.\n"
"Por favor, atualize este programa. \n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "Host %s n�o encontrado."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: servi�o desconhecido"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Tempo esgotado."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Interrompido pelo sinal %d..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -224,37 +224,41 @@ msgstr "Tente '%s --help para maiores informa��es.\n"
#: ../mkpasswd.c:237
#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr ""
-"Tamanho do salt incorreto: %d byte(s) enquanto %d era(m) esperado(s).\n"
+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:241
-#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr ""
-"Tamanho do salt incorreto: %d byte(s) enquanto %d era(m) esperado(s).\n"
-
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:242
+#, 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] ""
+"Tamanho do salt incorreto: %d byte enquanto %d <= n <= %d eram esperados.\n"
+msgstr[1] ""
+"Tamanho do salt incorreto: %d bytes enquanto %d <= n <= %d eram esperados.\n"
+
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Caractere salt ilegal '%c'.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Senha: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Caractere de senha ilegal '0x%hhx'.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -265,7 +269,7 @@ msgstr ""
"Encripta a PASSWORD utilizando crypt(3).\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -297,7 +301,7 @@ msgstr ""
"\n"
"Reporte bugs para %s.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Algoritmos dispon�veis: \n"
diff --git a/po/ru.po b/po/ru.po
index 62a1023..09014e7 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,13 +1,13 @@
# translation of ru.po to Russian
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# Copyright (C) Marco d'Itri
+# This file is distributed under the same license as the whois package.
# Andy Shevchenko <andy@smile.org.ua>, 2005.
#
msgid ""
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-12 06:00+0200\n"
+"POT-Creation-Date: 2009-08-10 14:04+0200\n"
"PO-Revision-Date: 2005-11-29 15:15+0200\n"
"Last-Translator: Andy Shevchenko <andy@smile.org.ua>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -15,6 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
#: ../whois.c:120
#, c-format
@@ -27,8 +29,7 @@ msgstr ""
"\n"
"Замечания отправляйте на %s.\n"
-#: ../whois.c:167 ../whois.c:227 ../whois.c:233 ../whois.c:240 ../whois.c:246
-#: ../whois.c:277
+#: ../whois.c:167 ../whois.c:224 ../whois.c:230 ../whois.c:237 ../whois.c:268
#, c-format
msgid "Using server %s.\n"
msgstr "Используется сервер %s.\n"
@@ -38,20 +39,20 @@ msgid "This TLD has no whois server, but you can access the whois database at"
msgstr ""
"Этот ДВУ не имеет whois-сервера, но можно получить доступ к базе whois на"
-#: ../whois.c:217
+#: ../whois.c:214
msgid "This TLD has no whois server."
msgstr "Этот ДВУ не имеет whois-сервера."
-#: ../whois.c:220
+#: ../whois.c:217
msgid "No whois server is known for this kind of object."
msgstr "Нет whois-сервера для объектов данного вида."
-#: ../whois.c:223
+#: ../whois.c:220
msgid "Unknown AS number or IP network. Please upgrade this program."
msgstr "Неизвестный номер AS или IP-сети. Пожалуйста, обновите программу."
#. XXX should fail if p = 0.0.0.0
-#: ../whois.c:253
+#: ../whois.c:244
#, c-format
msgid ""
"\n"
@@ -62,7 +63,7 @@ msgstr ""
"Запрашивается конечная IPv4-точка %s для IPv6-адреса 6-в-4.\n"
"\n"
-#: ../whois.c:260
+#: ../whois.c:251
#, fuzzy, c-format
msgid ""
"\n"
@@ -73,7 +74,7 @@ msgstr ""
"Запрашивается конечная IPv4-точка %s для IPv6-адреса 6-в-4.\n"
"\n"
-#: ../whois.c:278
+#: ../whois.c:269
#, c-format
msgid ""
"Query string: \"%s\"\n"
@@ -82,7 +83,7 @@ msgstr ""
"Строка запроса: \"%s\"\n"
"\n"
-#: ../whois.c:288
+#: ../whois.c:279
#, c-format
msgid ""
"\n"
@@ -95,16 +96,16 @@ msgstr ""
"Найдено перенаправление на %s.\n"
"\n"
-#: ../whois.c:331 ../whois.c:334
+#: ../whois.c:322 ../whois.c:325
#, c-format
msgid "Cannot parse this line: %s"
msgstr "Невозможно разобрать строку: %s"
-#: ../whois.c:489
+#: ../whois.c:480
msgid "Warning: RIPE flags used with a traditional server."
msgstr "Предупреждение: флаги RIPE используются с традиционным сервером."
-#: ../whois.c:627 ../whois.c:762
+#: ../whois.c:618 ../whois.c:753
msgid ""
"Catastrophic error: disclaimer text has been changed.\n"
"Please upgrade this program.\n"
@@ -112,26 +113,26 @@ msgstr ""
"Катастрофическая ошибка: текст отказа был изменён.\n"
"Пожалуйста, обновите программу.\n"
-#: ../whois.c:814
+#: ../whois.c:805
#, c-format
msgid "Host %s not found."
msgstr "Узел %s не найден."
-#: ../whois.c:824
+#: ../whois.c:815
#, c-format
msgid "%s/tcp: unknown service"
msgstr "%s/tcp: неизвестный сервис"
-#: ../whois.c:899
+#: ../whois.c:890
msgid "Timeout."
msgstr "Задержка."
-#: ../whois.c:905
+#: ../whois.c:896
#, c-format
msgid "Interrupted by signal %d..."
msgstr "Прервано по сигналу %d..."
-#: ../whois.c:1109
+#: ../whois.c:1100
#, c-format
msgid ""
"Usage: whois [OPTION]... OBJECT...\n"
@@ -223,36 +224,40 @@ msgid "Try '%s --help' for more information.\n"
msgstr "Выполните '%s --help' для дополнительной информации.\n"
#: ../mkpasswd.c:237
-#, c-format
-msgid "Wrong salt length: %d byte(s) when %d expected.\n"
-msgstr "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
+#, fuzzy, c-format
+msgid "Wrong salt length: %d byte when %d expected.\n"
+msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
+msgstr[0] "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
+msgstr[1] "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
-#: ../mkpasswd.c:241
+#: ../mkpasswd.c:242
#, fuzzy, c-format
-msgid "Wrong salt length: %d byte(s) when %d <= n <= %d expected.\n"
-msgstr "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
+msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
+msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
+msgstr[0] "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
+msgstr[1] "Испорченная длина salt: %d байт(а) при ожидаемой %d.\n"
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:251
#, c-format
msgid "Illegal salt character '%c'.\n"
msgstr "Неверный salt-символ '%c'.\n"
-#: ../mkpasswd.c:286 ../mkpasswd.c:313
+#: ../mkpasswd.c:296 ../mkpasswd.c:323
#, c-format
msgid "Password: "
msgstr "Пароль: "
-#: ../mkpasswd.c:307
+#: ../mkpasswd.c:317
#, c-format
msgid "Illegal password character '0x%hhx'.\n"
msgstr "Неверный символ пароля '0x%hhx'.\n"
-#: ../mkpasswd.c:329
+#: ../mkpasswd.c:339
#, c-format
msgid "Method not supported by crypt(3).\n"
msgstr ""
-#: ../mkpasswd.c:411
+#: ../mkpasswd.c:417
#, c-format
msgid ""
"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -263,7 +268,7 @@ msgstr ""
"Кодирует ПАРОЛЬ, используя алгоритм crypt(3).\n"
"\n"
-#: ../mkpasswd.c:414
+#: ../mkpasswd.c:420
#, fuzzy, c-format
msgid ""
" -m, --method=TYPE select method TYPE\n"
@@ -296,7 +301,7 @@ msgstr ""
"\n"
"Замечания отправляйте на %s.\n"
-#: ../mkpasswd.c:442
+#: ../mkpasswd.c:448
#, fuzzy, c-format
msgid "Available methods:\n"
msgstr "Доступные алгоритмы:\n"
diff --git a/tld_serv_list b/tld_serv_list
index 93d3c28..2bb461c 100644
--- a/tld_serv_list
+++ b/tld_serv_list
@@ -21,10 +21,10 @@
.jpn.com whois.centralnic.net
.web.com whois.centralnic.net
-.com CRSNIC
+.com VERISIGN whois.crsnic.net
.za.net whois.za.net
-.net CRSNIC
+.net VERISIGN whois.crsnic.net
.eu.org whois.eu.org
.za.org whois.za.org
@@ -45,7 +45,7 @@
.cat whois.cat
.coop whois.nic.coop
.info whois.afilias.info
-.jobs jobswhois.verisign-grs.com
+.jobs VERISIGN jobswhois.verisign-grs.com
.mobi whois.dotmobiregistry.net
.museum whois.museum
.name whois.nic.name
@@ -55,11 +55,11 @@
.ac whois.nic.ac
.ad NONE # www.nic.ad
-.ae whois.uaenic.ae
+.ae whois.aeda.net.ae
.af whois.nic.af
.ag whois.nic.ag
.ai whois.ai
-.al NONE # http://www.ert.gov.al/ert_alb/domain.html
+.al NONE # http://www.ert.gov.al/ert_eng/domain.html
.am whois.nic.am
.an NONE # http://www.una.an/an_domreg/
.ao NONE # www.dns.ao
@@ -92,7 +92,7 @@
.bz AFILIAS
.co.ca whois.co.ca
.ca whois.cira.ca
-.cc NICCC
+.cc VERISIGN whois.nic.cc
.cd whois.nic.cd
.cf NONE # was: WEB http://www.nic.cf/whois.php3
.cg WEB http://www.nic.cg/cgi-bin/whois.pl
@@ -100,7 +100,7 @@
.ci www.nic.ci
.ck whois.nic.ck
.cl whois.nic.cl
-.cm NONE # http://info.intelcam.cm http://www.camnet.cm/
+.cm NONE # NIC? http://info.intelcam.cm http://www.camnet.cm/
.edu.cn whois.edu.cn
.cn whois.cnnic.net.cn
.uk.co whois.uk.co
@@ -119,7 +119,7 @@
.dz WEB https://www.nic.dz/
.ec WEB http://www.nic.ec/whois/eng/whois.asp
.ee whois.eenet.ee
-.eg NONE # www.egregistry.eg
+.eg NONE # http://lookup.egregistry.eg/
#.eh
.er NONE # http://www.afridns.org/er/tld_er.txt
.es WEB https://www.nic.es/
@@ -187,7 +187,7 @@
.li whois.nic.li
.lk whois.nic.lk
.lr NONE # http://www.psg.com/dns/lr/
-.ls NONE # http://www.co.ls/
+.ls WEB http://www.co.ls/data/leo2.asp
.lt whois.domreg.lt
.lu whois.dns.lu
.lv whois.nic.lv
@@ -196,9 +196,9 @@
.mc whois.ripe.net
.md WEB http://www.dns.md/wh1.php # whois.nic.md is restricted
.me whois.meregistry.net # afilias
-.mg NONE # www.nic.mg
+.mg whois.nic.mg
.mh NONE # www.nic.net.mh
-.mk NONE # http://dns.marnet.net.mk/
+.mk WEB http://dns.marnet.net.mk/registar.php
.ml NONE # NIC? www.sotelma.ml
.mm whois.nic.mm
.mn AFILIAS
@@ -206,7 +206,7 @@
.mp NONE # get.mp
.mq whois.nic.mq
.mr NONE # www.nic.mr
-.ms whois.adamsnames.tc
+.ms whois.nic.ms
.mt WEB https://www.nic.org.mt/dotmt/ # whois.nic.org.mt is restricted
.mu whois.nic.mu
.mv NONE # NIC? www.dhiraagu.com.mv
@@ -231,7 +231,7 @@
.pe whois.nic.pe
.pf NONE # http://www.opt.pf/home/
.pg NONE # http://www.npi.gov.pg/DNS/DNS-Application-form.htm
-.ph WEB http://whois.domains.ph/
+.ph WEB http://www.dot.ph/
.pk WEB http://www.pknic.net.pk/
.co.pl whois.co.pl # "unofficial" SLD
.pl whois.dns.pl
@@ -242,7 +242,7 @@
.pt whois.dns.pt
.pw whois.nic.pw
.py WEB http://www.nic.py/consultas.html
-.qa NONE # http://www.qatar.net.qa/services/virtual.htm
+.qa NONE # http://www.qtel.com.qa/InternetFeatures.do
.re whois.nic.fr
.ro whois.rotld.ro
.rs WEB http://www.nic.rs/en/whois
@@ -252,7 +252,7 @@
.sa saudinic.net.sa
.sb whois.nic.net.sb
.sc AFILIAS # www.nic.sc
-.sd NONE # http://sudanic.isoc.sd/
+.sd NONE # http://isoc.sd/ (CHECK LATER)
.se whois.nic-se.se
.sg whois.nic.net.sg
.sh whois.nic.sh
@@ -262,7 +262,7 @@
.sl whois.nic.sl
.sm whois.ripe.net
.sn whois.nic.sn
-.so NONE # www.nic.so - no country, no NIC
+.so NONE # www.nic.so (CHECK LATER, recently delegated)
.sr whois.register.sr
.st whois.nic.st
.su whois.ripn.net
@@ -270,7 +270,7 @@
.sy NONE # NIC? www.ste.gov.sy
.sz NONE # http://www.sispa.org.sz/
.tc whois.adamsnames.tc
-.td WEB http://www.nic.td/ # broken 20081209
+.td NONE # NIC? http://www.sotel.td/ was http://www.nic.td/
.tf whois.nic.tf
.tg WEB http://www.nic.tg/
.th whois.thnic.net
@@ -283,9 +283,10 @@
.tp whois.nic.tp
.tr whois.metu.edu.tr
.tt WEB http://www.nic.tt/cgi-bin/search.pl
-.tv whois.nic.tv
+#.tv whois.nic.tv
+.tv VERISIGN whois.nic.tv
.tw whois.twnic.net
-.tz NONE # http://www.psg.com/dns/tz/
+.tz WEB http://whois.tznic.or.tz/
.ua whois.net.ua
.ug www.registry.co.ug # this is a whois server too
.ac.uk whois.ja.net
@@ -303,7 +304,7 @@
.fed.us whois.nic.gov
.us whois.nic.us
.com.uy WEB https://nic.anteldata.com.uy/dns/
-.uy www.rau.edu.uy # this is a whois server too
+.uy whois.nic.org.uy
.uz whois.cctld.uz
.va whois.ripe.net
.vc AFILIAS
@@ -314,14 +315,14 @@
.vu WEB http://www.vunic.vu/whois.html
.wf whois.nic.wf
.ws whois.samoanic.ws
-.ye NONE # http://www.y.net.ye/services/domain_name.htm
+.ye NONE # NIC? www.nominet.org.ye http://www.y.net.ye/services/domain_name.htm
.yt whois.nic.yt
-.yu NONE # www.nic.yu
+.yu NONE # www.nic.yu - phase out date: 30 September 2009
.ac.za whois.ac.za
.co.za whois.coza.net.za
.gov.za whois.gov.za
#.net.za whois.net.za
-.org.za WEB http://www.org.za/ # rwhois.org.za:4321
+.org.za WEB http://www.org.za/ # rwhois.org.za:4321 is restricted
.za NONE # http://www.internet.org.za/slds.html many more SLD...
.zm NONE # http://www.zamnet.zm/ser-isp/dnr.htm
.zw NONE # http://www.zispa.co.zw/
diff --git a/utils.h b/utils.h
index f2153fe..0f226ae 100644
--- a/utils.h
+++ b/utils.h
@@ -42,6 +42,7 @@
#else
# define _(a) (a)
# define N_(a) (a)
+# define ngettext(a, b, c) ((c==1) ? (a) : (b))
#endif
diff --git a/whois.c b/whois.c
index ed8f483..e020c0d 100644
--- a/whois.c
+++ b/whois.c
@@ -210,9 +210,6 @@ const char *handle_query(const char *hserver, const char *hport,
"whois database at"));
puts(server + 1);
return NULL;
- case 2:
- puts(server + 1);
- return NULL;
case 3:
puts(_("This TLD has no whois server."));
return NULL;
@@ -224,8 +221,8 @@ const char *handle_query(const char *hserver, const char *hport,
return NULL;
case 4:
if (verb)
- printf(_("Using server %s.\n"), "whois.crsnic.net");
- sockfd = openconn("whois.crsnic.net", NULL);
+ printf(_("Using server %s.\n"), server + 1);
+ sockfd = openconn(server + 1, NULL);
server = query_crsnic(sockfd, qstring);
break;
case 7:
@@ -241,12 +238,6 @@ const char *handle_query(const char *hserver, const char *hport,
sockfd = openconn("whois.afilias-grs.info", NULL);
server = query_afilias(sockfd, qstring);
break;
- case 9:
- if (verb)
- printf(_("Using server %s.\n"), "whois.nic.cc");
- sockfd = openconn("whois.nic.cc", NULL);
- server = query_crsnic(sockfd, qstring);
- break;
case 0x0A:
p = convert_6to4(qstring);
/* XXX should fail if p = 0.0.0.0 */
diff --git a/whois.spec b/whois.spec
index d274dd8..379d22a 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,6 +1,6 @@
Summary: Enhanced WHOIS client
Name: whois
-Version: 4.7.34
+Version: 4.7.35
Release: 1
License: GPL
Vendor: Marco d'Itri <md@linux.it>