Update tld_serv_list with .com.uy URL

correct URL for .com.uy extension:
https://nic.com.uy/consulta-whois

.github/workflows/release.yml

@@ -0,0 +1,18 @@
+name: Publish a Github release
+
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - "v*.*"
+
+jobs:
+  release:
+    runs-on: debian-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Release
+        uses: softprops/action-gh-release@v1
+

.gitignore

@@ -13,7 +13,7 @@ whois
 po/whois.pot
 po/*.mo
 
-build
+debian/debhelper-build-stamp
 debian/files
 debian/whois.debhelper.log
 debian/whois.substvars

COPYING

@@ -2,7 +2,7 @@
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    with this program; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -329,8 +328,8 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
+  <signature of Moe Ghoul>, 1 April 1989
+  Moe Ghoul, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may

Makefile

@@ -1,9 +1,15 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 prefix = /usr
 
+ifdef DESTDIR
+BASEDIR := $(DESTDIR)
+endif
+
 CFLAGS ?= -g -O2
 
-PERL = perl
-INSTALL = install
+PKG_CONFIG ?= pkg-config
+PERL ?= perl
+INSTALL ?= install
 
 whois_OBJECTS := whois.o utils.o
 mkpasswd_OBJECTS := mkpasswd.o utils.o
@@ -32,14 +38,17 @@ ifdef LOCALEDIR
 DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\"
 endif
 
-ifdef HAVE_LIBIDN2
-whois_LDADD += -lidn2
-DEFS += -DHAVE_LIBIDN2
-else
+# libidn support has been autodetected since 5.2.18
 ifdef HAVE_LIBIDN
-whois_LDADD += -lidn
-DEFS += -DHAVE_LIBIDN
+$(error Please fix your build system to stop defining HAVE_LIBIDN!)
 endif
+
+ifeq ($(shell $(PKG_CONFIG) --exists 'libidn2 >= 2.0.3' || echo NO),)
+whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn2)
+DEFS += -DHAVE_LIBIDN2 $(shell $(PKG_CONFIG) --cflags libidn2)
+else ifeq ($(shell $(PKG_CONFIG) --exists 'libidn' || echo NO),)
+whois_LDADD += $(shell $(PKG_CONFIG) --libs libidn)
+DEFS += -DHAVE_LIBIDN $(shell $(PKG_CONFIG) --cflags libidn)
 endif
 
 ifdef HAVE_ICONV
@@ -47,19 +56,24 @@ whois_OBJECTS += simple_recode.o
 DEFS += -DHAVE_ICONV
 endif
 
-ifdef HAVE_XCRYPT
+ifeq ($(shell $(PKG_CONFIG) --exists 'libxcrypt >= 4.1' || echo NO),)
+DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT $(shell $(PKG_CONFIG) --cflags libcrypt)
+mkpasswd_LDADD += $(shell $(PKG_CONFIG) --libs libcrypt)
+else ifdef HAVE_XCRYPT
+DEFS += -DHAVE_XCRYPT_H -DHAVE_LINUX_CRYPT_GENSALT
 mkpasswd_LDADD += -lxcrypt
-DEFS += -DHAVE_XCRYPT -DHAVE_LINUX_CRYPT_GENSALT
+else ifdef HAVE_LIBOWCRYPT
+# owl and openSUSE have crypt_gensalt(3) in libowcrypt
+DEFS += -DHAVE_CRYPT_H -DHAVE_LINUX_CRYPT_GENSALT -D_OW_SOURCE
+mkpasswd_LDADD += -lcrypt -lowcrypt
 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)
 
+BASHCOMPDIR ?= $(shell $(PKG_CONFIG) --variable=completionsdir bash-completion 2>/dev/null || echo /etc/bash_completion.d)
+
 ##############################################################################
 all: Makefile.depend whois mkpasswd pos
 
@@ -80,9 +94,6 @@ version.h: debian/changelog make_version_h.pl
 as_del.h: as_del_list make_as_del.pl
 	$(PERL) make_as_del.pl < $< > $@
 
-as32_del.h: as32_del_list make_as32_del.pl
-	$(PERL) make_as32_del.pl < $< > $@
-
 ip_del.h: ip_del_list make_ip_del.pl
 	$(PERL) make_ip_del.pl < $< > $@
 
@@ -103,19 +114,14 @@ servers_charset.h: servers_charset_list make_servers_charset.pl
 
 ##############################################################################
 afl:
-	$(MAKE) whois \
-		CC=afl-gcc AFL_HARDEN=1 \
-		HAVE_LIBIDN=1 HAVE_ICONV=1 DEFS=-DAFL_MODE=1
-
-afl2:
-	$(MAKE) whois \
-		HAVE_LIBIDN=1 HAVE_ICONV=1 DEFS=-DAFL_MODE=1
+	-rm -f Makefile.depend
+	DEFS=-DAFL_MODE=1 AFL_HARDEN=1 $(MAKE) whois CC=afl-gcc HAVE_ICONV=1
 
 afl-run:
 	nice afl-fuzz -i ../afl_in -o ../afl_out -- ./whois
 
 ##############################################################################
-install: install-whois install-mkpasswd install-pos
+install: install-whois install-mkpasswd install-pos install-bashcomp
 
 install-whois: whois
 	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
@@ -134,12 +140,18 @@ install-mkpasswd: mkpasswd
 install-pos:
 	cd po && $(MAKE) install
 
+install-bashcomp:
+	$(INSTALL) -d $(BASEDIR)$(BASHCOMPDIR)
+	$(INSTALL) -m 0644 mkpasswd.bash $(BASEDIR)$(BASHCOMPDIR)/mkpasswd
+	$(INSTALL) -m 0644 whois.bash $(BASEDIR)$(BASHCOMPDIR)/whois
+
 distclean: clean
-	rm -f po/whois.pot
+	rm -f version.h po/whois.pot
 
 clean:
-	rm -f Makefile.depend as_del.h as32_del.h ip_del.h ip6_del.h \
-		new_gtlds.h tld_serv.h servers_charset.h *.o whois mkpasswd
+	rm -f Makefile.depend as_del.h ip_del.h ip6_del.h \
+		nic_handles.h new_gtlds.h tld_serv.h servers_charset.h \
+		*.o whois mkpasswd
 	rm -f po/*.mo
 
 pos:

README

@@ -13,14 +13,13 @@ program, which can be used to encrypt a password with crypt(3).
 
 
 The canonical distribution point for releases of the program is
-http://ftp.debian.org/debian/pool/main/w/whois/ .
+https://ftp.debian.org/debian/pool/main/w/whois/ .
 
 
 Useful information sources:
-- http://www.ripe.net/ripe/docs/current-ripe-documents/ripe-database-documents
-- http://www.iana.org/domains/root/db/
-- http://www.icann.org/en/resources/idn/fast-track/string-evaluation-completion
-- http://www.aftld.org/
+- https://www.ripe.net/ripe/docs/current-ripe-documents/ripe-database-documents
+- https://www.iana.org/domains/root/db/
+- https://www.icann.org/en/resources/idn/fast-track/string-evaluation-completion
+- https://www.aftld.org/
 
 Marco d'Itri <md@linux.it>
-

as32_del_list

@@ -1,19 +0,0 @@
-# http://www.iana.org/assignments/as-numbers
-
-# actually I listed here also the unallocated space reserved for each RIR
-
-131077	131086	whois.nic.ad.jp
-131092	131101	whois.nic.or.kr
-131152	131161	whois.nic.ad.jp
-131791	131890	whois.nic.or.kr
-131893	131992	whois.nic.ad.jp
-
-2.0	2.65535	apnic
-3.0	3.65535	ripe
-4.0	4.65535	lacnic
-5.0	5.65535	afrinic
-6.0	6.65535	arin
-
-# private ASN block
-4200000000	4294967294	ripe
-

as_del_list

@@ -1,4 +1,4 @@
-# http://www.iana.org/assignments/as-numbers
+# https://www.iana.org/assignments/as-numbers
 
 248	251	ripe
 306	371	whois.nic.mil
@@ -95,3 +95,19 @@
 # documentation and private ASN block
 64496	65534	ripe
 
+131077	131086	whois.nic.ad.jp
+131092	131101	whois.nic.or.kr
+131152	131161	whois.nic.ad.jp
+131791	131890	whois.nic.or.kr
+131893	131992	whois.nic.ad.jp
+
+# actually I listed here also the unallocated space reserved for each RIR
+2.0	2.65535	apnic
+3.0	3.65535	ripe
+4.0	4.65535	lacnic
+5.0	5.65535	afrinic
+6.0	6.65535	arin
+
+# private ASN block
+4200000000	4294967294	ripe
+

config.h

@@ -1,4 +1,5 @@
 /* Configurable features */
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 
 /* Always hide legal disclaimers */
 #undef ALWAYS_HIDE_DISCL
@@ -13,11 +14,11 @@
 
 
 /* autoconf in cpp macros */
-#if defined __NetBSD__ || __OpenBSD__
+#if defined __NetBSD__ || defined __OpenBSD__
 # include <sys/param.h>
 #endif
 
-#ifdef linux
+#if defined __GLIBC__ && !defined __UCLIBC__
 # define ENABLE_NLS
 #endif
 
@@ -25,12 +26,17 @@
 /* which versions? */
 # define HAVE_GETOPT_LONG
 # define HAVE_GETADDRINFO
+# define HAVE_READPASSPHRASE
 # define ENABLE_NLS
 # ifndef LOCALEDIR
 #  define LOCALEDIR "/usr/local/share/locale"
 # endif
 #endif
 
+#if defined OpenBSD
+# define HAVE_READPASSPHRASE
+#endif
+
 /* needs unistd.h */
 #if defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 200112L
 # define HAVE_GETADDRINFO
@@ -40,6 +46,14 @@
 #if defined __APPLE__ && defined __MACH__
 # define HAVE_GETOPT_LONG
 # define HAVE_GETADDRINFO
+# define HAVE_READPASSPHRASE
+# define HAVE_BSDICRYPT
+#endif
+
+#if defined __midipix__
+# define HAVE_GETOPT_LONG
+# define HAVE_GETADDRINFO
+# define HAVE_SHA_CRYPT
 #endif
 
 #if defined __GLIBC__
@@ -52,25 +66,34 @@
 # endif
 #endif
 
+#if defined OpenBSD && OpenBSD < 201405
+# define HAVE_BCRYPT_OBSOLETE
+#elif defined OpenBSD || defined __FreeBSD__ || (defined __SVR4 && defined __sun) || defined _OW_SOURCE
+# define HAVE_BCRYPT
+#endif
+
+#if defined OpenBSD || defined __FreeBSD__ || defined __NetBSD__
+# define HAVE_BSDICRYPT
+#endif
+
 /* Unknown versions of Solaris */
 #if defined __SVR4 && defined __sun
+# define HAVE_GETOPT_LONG
 # define HAVE_SHA_CRYPT
+# define HAVE_CRYPT_H
 # define HAVE_SOLARIS_CRYPT_GENSALT
+# define CRYPT_GENSALT_IMPLEMENTS_DEFAULT_PREFIX
 #endif
 
 /* FIXME: which systems lack this? */
 #define HAVE_GETTIMEOFDAY
-/* FIXME: disabled because it does not parse addresses with a netmask length.
- * The code using it needs to be either fixed or removed.
-#define HAVE_INET_PTON
-*/
 
 /*
  * Please send patches to correctly ignore old releases which lack a RNG
  * and add more systems which have one.
  */
 #ifdef RANDOM_DEVICE
-#elif defined __GLIBC__ \
+#elif defined linux \
 	|| defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ \
 	/* AIX >= 5.2? */ \
 	|| defined _AIX52 \
@@ -91,7 +114,18 @@
     (defined OpenBSD && OpenBSD >= 200805) || \
     (defined __APPLE__ && defined __MACH__ && MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
 # define HAVE_ARC4RANDOM_BUF
-# undef RANDOM_DEVICE
+#endif
+
+/* or else getentropy(2) on Linux */
+#if defined __GLIBC__ && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 25 || defined __midipix__
+# define HAVE_GETENTROPY
+#endif
+
+/* some versions of crypt(3) set errno on error */
+#if defined __GLIBC__ || (defined __SVR4 && defined __sun) || defined OpenBSD || AIX
+# define CRYPT_SETS_ERRNO 1
+#else
+# define CRYPT_SETS_ERRNO 0
 #endif
 
 #ifdef ENABLE_NLS

data.h

@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /*
  * RIPE-like servers.
  * All of them do not understand -V2.0Md with the exception of RA and RIPN.
@@ -9,18 +11,29 @@ const char *ripe_servers[] = {
     "whois.apnic.net",
     "whois.afrinic.net",
     "rr.arin.net",		/* does not accept the old syntax */
-    "whois.connect.com.au",	/* 3.0.0b1 */
-    "whois.nic.fr",
-    "whois.restena.lu",
     "rr.level3.net",		/* 3.0.0a13 */
+    "rr.ntt.net",
+    "whois.tcinet.ru",
     "whois.ripn.net",
-    "whois.arnes.si",
+    "whois.register.si",
     "whois.nic.ir",
-    "whois.ra.net",
-    "whois.bgpmon.net",
     NULL
 };
 
+struct server_referral_handler {
+    const char *name;
+    void (*handler)(char **referral_server, const char *buf);
+};
+
+const struct server_referral_handler server_referral_handlers[] = {
+    { "whois.apnic.net",		find_referral_server_apnic },
+    { "whois.arin.net",			find_referral_server_arin },
+    { "whois.iana.org",			find_referral_server_iana },
+    { "\x04",				find_referral_server_verisign },
+    { "\x08",				find_referral_server_recursive },
+    { NULL, NULL }
+};
+
 const char *hide_strings[] = {
     "The data in Networksolutions.com's WHOIS database", NULL,
     /* Some registrars like .wang copied the first paragraph of this
@@ -28,15 +41,14 @@ const char *hide_strings[] = {
     "TERMS OF USE: You are not authorized", NULL,	/* crsnic */
     "The data in Register.com's WHOIS database", NULL,
     "The Data in the Tucows Registrar WHOIS database", NULL,
-    "The data in NameSecure.com's WHOIS database", NULL,
-    "The Data in Gabia's WHOIS database", NULL,
+    "TERMS OF USE: The Data in Gabia' WHOIS", NULL,
     "The data contained in GoDaddy.com", NULL,
     "Personal data access and use are governed by French", NULL, /* GANDI */
     "The data in this whois database is provided to you", NULL,	/* enom */
-    "; Please register your domains at; http://www.", NULL, /* key-systems.net */
+    "Please register your domains at; http://www.", NULL, /* key-systems.net */
     "%% NOTICE: Access to this information is provided", NULL, /* bookmyname.com */
-    "% NOTICE: Access to the domains information", NULL, /* CORE */
-    "The Data in MarkMonitor.com's", NULL, /* MarkMonitor */
+    "NOTICE: Access to the domain name's information", NULL, /* CORE */
+    "The data in MarkMonitor’s WHOIS", NULL,		/* MarkMonitor */
     "Corporation Service Company(c) (CSC)  The Trusted Partner", "Register your domain name at", /* CSC */
     "The data in Networksolutions.com's", NULL,		/* Networksolutions */
     "# Welcome to the OVH WHOIS Server", "", /* ovh */
@@ -45,27 +57,19 @@ const char *hide_strings[] = {
     "The data in the FastDomain Inc. WHOIS database", NULL,
 
     /* gTLDs */
-    "Access to .AERO WHOIS information", "",
-    "DotAsia WHOIS LEGAL STATEMENT", "integrity of the database.",
-    "The .coop registry WHOIS", "VERIFICATION, NOR DO",
-    "%% puntCAT Whois Server", "%% any time.",
-    "This Registry database contains ONLY .EDU", "type: help",	/* edu */
+    "Access to WHOIS information is provided", NULL,
+    "This Registry database contains ONLY .EDU", "domain names.", /* edu */
     "Access to AFILIAS WHOIS information is provided", NULL,	/* .info */
-    "mTLD WHOIS LEGAL STATEMENT", "integrity of the database.",	/* .mobi */
     "Access to Public Interest Registry WHOIS information", NULL, /* .org */
-    "Access to .PRO REGISTRY WHOIS information", "",
-    "Telnic, Ltd., the Registry Operator for .TEL", NULL,
+    "Telnames Limited, the Registry Operator for", NULL,
     "Tralliance, Inc., the Registry Operator for .travel", NULL,
-    "Access to .XXX ICM REGISTRY WHOIS", NULL,			/* .xxx */
+    "The data in this record is provided by", NULL,	/* .xxx */
 
     /* new gTLDs */
-    "Terms of Use: Users accessing the Donuts WHOIS", NULL,
-    "Terms of Use: Users accessing the United TLD WHOIS", NULL,
+    "Terms of Use: Donuts Inc. provides", NULL,
     "Access to WHOIS information is provided", NULL,		/* Afilias */
-    "The  WHOIS information provided on this page", NULL, /* uniregistry.net */
-    "The whois information provided on this site", "",	/* mm-registry.com */
-    "; This data is provided by ", NULL,		/* ksregistry.net */
-    "This whois service is provided by CentralNic Ltd", "",
+    "TERMS OF USE: You  are  not  authorized", NULL, /* uniregistry.net */
+    "The Whois and RDAP services are provided by CentralNic", "",
     ".Club Domains, LLC, the Registry Operator", NULL,
     "% Except for agreed Internet operational purposes", NULL,	/* .berlin */
     "TERMS OF USE: The information in the Whois database", NULL, /* .wang */
@@ -76,11 +80,17 @@ const char *hide_strings[] = {
     "Access to CCTLD WHOIS information is provided", "",	/* Afilias */
     "This WHOIS information is provided", NULL,			/* as */
     "% The WHOIS service offered by DNS Belgium", "",		/* be */
-    "%   (c) 2015 NIC Costa Rica", "",				/* cr */
+    ".CO Internet, S.A.S., the Administrator", NULL,		/* co */
+    "%  *The information provided",
+	"% https://www.nic.cr/iniciar-sesion/?next=/mi-cuenta/",/* cr */
     "% The WHOIS service offered by EURid", "% of the database", /* eu */
-    "% WHOIS LEGAL STATEMENT AND TERMS & CONDITIONS", NULL,	/* sx */
-    "; The data in the WHOIS database of KSregistry GmbH", "",	/* vg */
+    "Access to .IN WHOIS information", NULL,			/* in */
+    "access to .in whois information", NULL,		/* in registar */
+    "% Use of CIRA's WHOIS service is governed by the Terms of Use in its Legal", NULL,	/* sx */
+    "Terms of Use: Access to WHOIS information", NULL,		/* vc */
+    "The Service is provided so that you may look", "We may discontinue",/*vu*/
     "NeuStar, Inc., the Registry Administrator for .US", NULL,
+    "; This data is provided ", NULL,			/* whois.1api.net */
 
     NULL, NULL
 };
@@ -125,8 +135,8 @@ const struct ip6_del ip6_assign[] = {
 };
 
 struct as_del {
-    const unsigned short first;
-    const unsigned short last;
+    const unsigned long first;
+    const unsigned long last;
     const char          *serv;
 };
 
@@ -135,17 +145,6 @@ const struct as_del as_assign[] = {
     { 0, 0, NULL }
 };
 
-struct as32_del {
-    const unsigned long first;
-    const unsigned long last;
-    const char         *serv;
-};
-
-const struct as32_del as32_assign[] = {
-#include "as32_del.h"
-    { 0, 0, NULL }
-};
-
 const char *new_gtlds[] = {
 #include "new_gtlds.h"
     NULL

debian/changelog

@@ -1,3 +1,428 @@
+whois (5.6.6) unstable; urgency=medium
+
+  * Added the .mc TLD server.
+  * Updated the .ps TLD server.
+  * Removed the .info, .mobi, .travel and .فلسطين (.xn--ygbi2ammx,
+    Palestinian Territory) TLD servers.
+  * Removed 3 new gTLDs which are no longer active.
+  * mkpasswd: added support the Chinese SM3-based hashing algorithms.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 16 Feb 2026 02:46:51 +0100
+
+whois (5.6.5) unstable; urgency=medium
+
+  * Updated the .co TLD server.
+  * Added some large KRNIC networks.
+  * Updated the second level .uk TLD servers.
+  * Removed the .pro TLD server.
+  * Removed 1 new gTLD which is no longer active.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 13 Oct 2025 03:37:20 +0200
+
+whois (5.6.4) unstable; urgency=medium
+
+  * Updated the .cm and .to TLD servers.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 02 Aug 2025 01:13:07 +0200
+
+whois (5.6.3) unstable; urgency=medium
+
+  * Added the .sr and .мон (.xn--l1acc, Mongolia) TLD servers.
+  * Use readpassphrase(3) on OpenBSD and FreeBSD.
+
+ -- Marco d'Itri <md@linux.it>  Thu, 17 Jul 2025 05:15:53 +0200
+
+whois (5.6.2) unstable; urgency=medium
+
+  * Updated the .post and .in (and related IDN TLDs) TLD servers.
+  * Removed 1 new gTLDs which is no longer active.
+  * Build-Depend on libcrypt-dev. (Closes: #1106977)
+
+ -- Marco d'Itri <md@linux.it>  Fri, 06 Jun 2025 18:22:04 +0200
+
+whois (5.6.1) unstable; urgency=medium
+
+  * Added the .pg TLD server.
+  * Updated the .gov, .mu, .中国 (.xn--fiqs8s) and .中國 (.xn--fiqz9s)
+    TLD servers.
+  * Removed the .jobs TLD server.
+  * Added the encodings for whois.afrinic.net and whois.apnic.net.
+  * Enabled the UTF-8 encoding for whois.ripe.net.
+  * Use the last ReferralServer returned by the ARIN server instead of
+    the first, because we want to follow the referral for the most
+    specific record returned.
+  * Make sure to avoid trivial referral loops.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 17 May 2025 01:30:06 +0200
+
+whois (5.6.0) unstable; urgency=medium
+
+  * Fixed the mangling of RADB queries with commands.
+  * Implemented the parsing of more variants of ARIN's ReferralServer
+    field.
+  * Implemented following the APNIC pseudo-referrals.
+  * Added the .ad and .za TLD servers.
+  * Updated the .ao, .bz, .gi, .gq, .gr, .gw, .lc, .md, .pn, .pr, .uy, .vc,
+    .info, .mobi, .ελ (.xn--qxam, Greece) and .გე (.xn--node, Georgia) TLD
+    servers.
+  * Added 2410::/12.
+  * Removed 7 new gTLDs which are no longer active.
+  * Cleaned up the markup of the man pages, courtesy of Bjarni Ingi
+    Gislason. (Closes: #1036826, #1094208)
+
+ -- Marco d'Itri <md@linux.it>  Mon, 05 May 2025 02:57:37 +0200
+
+whois (5.5.23) unstable; urgency=medium
+
+  * Updated the .sc, .新加坡 (.xn--yfro4i67o, Singapore) and .சிங்கப்பூர்
+    (.xn--clchc0ea0b2g2a9gcd, Singapore) TLD servers.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 04 May 2024 03:13:22 +0200
+
+whois (5.5.22) unstable; urgency=medium
+
+  * Fixed a segmentation fault with --no-recursion.
+  * Updated the .bm and .vi TLD servers.
+  * Removed 4 new gTLDs which are no longer active.
+
+ -- Marco d'Itri <md@linux.it>  Mon, 01 Apr 2024 20:14:41 +0200
+
+whois (5.5.21) unstable; urgency=medium
+
+  * Updated the .cv and .sd TLD servers.
+  * Remove 4 new gTLDs which are no longer active.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 24 Feb 2024 17:22:22 +0100
+
+whois (5.5.20) unstable; urgency=medium
+
+  * Added the .gn TLD server.
+  * Removed 6 new gTLDs which are no longer active.
+  * Enabled getopt_long(3) support on Solaris.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 10 Nov 2023 15:26:02 +0100
+
+whois (5.5.19) unstable; urgency=medium
+
+  * Fixed english support for Japanese queries to not add again the /e
+    argument if it had already been provided by the user. (Closes: #1050171)
+  * Added the .ye and .বাংলা (.xn--54b7fta0cc, Bangladesh) TLD servers.
+  * Updated the .ba, .bb, .dk, .es, .gt, .jo, .ml, .mo, .pa, .pn, .sv,
+    .uy, .ﺍﻻﺭﺪﻧ (.xn--mgbayh7gpa, Jordan) and .澳門 (.xn--mix891f, Macao)
+    TLD servers.
+  * Upgraded the TLD URLs to HTTPS whenever possible.
+  * Updated the charset for whois.jprs.jp.
+  * Removed 3 new gTLDs which are no longer active.
+  * Removed support for the obsolete as32 dot notation.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 08 Oct 2023 22:58:33 +0200
+
+whois (5.5.18) unstable; urgency=medium
+
+  [ Marco d'Itri ]
+  * Updated the .ga TLD server. (Closes: #1037288)
+  * Added new recovered IPv4 allocations.
+  * Removed the delegation of 43.0.0.0/8 to JPNIC.
+  * Removed 12 new gTLDs which are no longer active.
+  * Improved the man page source, courtesy of Bjarni Ingi Gislason.
+    (Closes: #1040613)
+
+  [ Robert Scheck ]
+  * Added the .edu.za SLD server.
+  * Updated the .alt.za SLD server.
+  * Added the -ru and -su NIC handles servers.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 22 Jul 2023 17:56:56 +0200
+
+whois (5.5.17) unstable; urgency=medium
+
+  [ Robert Scheck ]
+  * Added the .cd TLD server.
+  * Updated the -kg NIC handles server name.
+
+  [ Marco d'Itri ]
+  * Removed 2 new gTLDs which are no longer active.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 03 May 2023 14:24:37 +0200
+
+whois (5.5.16) unstable; urgency=medium
+
+  * Add bash completion support, courtesy of Ville Skyttä.
+  * Updated the .tr TLD server.
+  * Removed support for -metu NIC handles.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 28 Feb 2023 00:58:22 +0100
+
+whois (5.5.15) unstable; urgency=medium
+
+  * Updated the .bd, .nz and .tv TLD servers.
+  * Added the .llyw.cymru, .gov.scot and .gov.wales SLD servers.
+  * Updated the .ac.uk and .gov.uk SLD servers.
+  * Recursion has been enabled for whois.nic.tv.
+  * Updated the list of new gTLDs with four generic TLDs assigned in
+    October 2013 which were missing due to a bug.
+  * Removed 4 new gTLDs which are no longer active.
+  * Added the Georgian translation, contributed by Temuri Doghonadze.
+  * Updated the Finnish translation, contributed by Lauri Nurmi.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 28 Dec 2022 20:44:11 +0100
+
+whois (5.5.14) unstable; urgency=medium
+
+  * Added the .bf and .sd TLD servers.
+  * Removed the .gu TLD server.
+  * Updated the .dm, .fj, .mt and .pk TLD servers.
+  * Updated the charset for whois.nic.tr.
+  * Updated the list of new gTLDs.
+  * Removed whois.nic.fr from the list of RIPE-like servers, because it
+    is not one anymore. (Closes: #1021110)
+  * Renamed whois.arnes.si to whois.register.si in the list of RIPE-like
+    servers.
+  * Added the hiding string for whois.auda.org.au.
+  * Fixed uclibc builds, because uclibc does not have NLS support.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 16 Oct 2022 22:16:34 +0200
+
+whois (5.5.13) unstable; urgency=medium
+
+  * Added the .sd TLD server.
+  * Updated the list of new gTLDs.
+  * Added the Turkish translation, contributed by Oğuz Ersen.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 08 Apr 2022 01:08:55 +0200
+
+whois (5.5.12) unstable; urgency=medium
+
+  * Updated the .pro TLD server, which was totally broken.
+  * Fixed the detection of Japanese locales using $LC_MESSAGES.
+  * Implemented providing partial salt strings to mkpasswd.
+  * Removed 2 new gTLDs which are no longer active.
+  * Updated one or more translations. (Closes: #1003597)
+  * Enabled full hardening in debian/rules.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 23 Feb 2022 01:03:11 +0100
+
+whois (5.5.11) unstable; urgency=medium
+
+  * Implemented a --no-recursion command line option to disable recursion
+    from registrar to registry servers.
+  * Updated the .pro, .vu and .xxx TLD servers.
+  * Updated the list of new gTLDs.
+  * Removed 7 new gTLDs which are no longer active.
+  * Updated make_version_h.pl to support Ubuntu no-change uploads,
+    contributed by Matthias Klose. (Closes: #995873)
+
+ -- Marco d'Itri <md@linux.it>  Mon, 03 Jan 2022 18:18:36 +0100
+
+whois (5.5.10) unstable; urgency=medium
+
+  * Updated the .lb TLD server.
+  * Removed 5 new gTLDs which are no longer active.
+  * Updated the charset for whois.lacnic.net, whois.ax, whois.cira.ca
+    and whois.dns.pt.
+  * Fixed reporting an older version number when using --version.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 06 Jun 2021 19:54:13 +0200
+
+whois (5.5.9) unstable; urgency=medium
+
+  * Updated the .ga TLD server.
+  * Removed the .cd and cf TLD servers.
+  * Removed 72 new gTLDs which are no longer active.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 28 Mar 2021 00:38:20 +0100
+
+whois (5.5.8) unstable; urgency=medium
+
+  * Added the .xn--4dbrk0ce (.ישראל, Israel) TLD server.
+  * Updated the .ie and .az TLD servers.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 16 Feb 2021 01:53:57 +0100
+
+whois (5.5.7) unstable; urgency=medium
+
+  * Implemented support for CIDR queries to whois.arin.net.
+    The old behaviour caused the server to return no results, now when
+    querying for ip/length the server returns a result if there is an
+    exact match.
+  * Added the .ao, .bh, .mm, and .xn--pgbs0dh (.تونس, Tunisia) TLD servers.
+  * Added some .ru and .su SLD servers.
+  * Updated the .th and .xn--o3cw4h TLD servers.
+  * Updated the .cy, .jo, .lb, .np, .xn--mgbayh7gpa and .xn--qxam TLD URLs.
+  * Updated the charset for whois.ati.tn.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Sat, 03 Oct 2020 17:43:06 +0200
+
+whois (5.5.6) unstable; urgency=medium
+
+  * Depend on pkg-config, or else the package will be built without libidn
+    and libxcrypt. (Closes: #950140)
+  * Added the .xn--q7ce6a (.ລາວ, Lao) TLD server.
+  * Added the .xn--pgbs0dh (.البحرين, Bahrain) domain.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 16 Feb 2020 10:25:51 +0100
+
+whois (5.5.5) unstable; urgency=medium
+
+  * Fixed the hide string for .sx, which broke many others.
+  * Fixed cross-compilation. (Closes: #947971)
+
+ -- Marco d'Itri <md@linux.it>  Thu, 23 Jan 2020 09:55:48 +0100
+
+whois (5.5.4) unstable; urgency=medium
+
+  * Updated the .vu TLD server.
+  * Updated the list of new gTLDs.
+  * Added the charset for whois.ripe.net.
+  * Added support for the referrals in answers from whois.registry.in.
+  * Implemented support for passing raw $salts$.
+  * Fixed and updated many hiding string.
+  * Cleaned up the text and typesetting of the man pages. (Closes: #945622)
+
+ -- Marco d'Itri <md@linux.it>  Tue, 31 Dec 2019 03:04:15 +0100
+
+whois (5.5.3) unstable; urgency=medium
+
+  * Added the new 2630:0000::/12 IPv6 assignment to ARIN.
+  * Updated the .xxx TLD server.
+  * Updated the list of new gTLDs.
+  * Converted the Debian packaging to dh.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 17 Nov 2019 21:33:50 +0100
+
+whois (5.5.2) unstable; urgency=medium
+
+  * Added the .xn--qxa6a (.ευ, European Union, Greek) TLD server.
+  * Updated the .td TLD server.
+  * Updated one or more translations.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 02 Oct 2019 23:44:49 +0200
+
+whois (5.5.1) unstable; urgency=medium
+
+  * Updated the .ge TLD server.
+  * Updated one or more translations.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 18 Aug 2019 19:47:55 +0200
+
+whois (5.5.0) unstable; urgency=medium
+
+  * Implemented the -I option to query whois.iana.org and use its referrals.
+    (Closes: #774603)
+  * Updated one or more translations. (Closes: #931336, #931244)
+  * Automatically generate the version string sent to servers because I
+    kept forgetting to update it with new releases.
+  * Updated the .zm TLD server.
+  * Added new recovered IPv4 allocations.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 19 Jul 2019 11:31:42 +0200
+
+whois (5.4.3) unstable; urgency=medium
+
+  * Added the new 2a10:0000::/12 IPv6 assignment to RIPE.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 12 Jun 2019 15:03:56 +0200
+
+whois (5.4.2) unstable; urgency=medium
+
+  * Added the .ss and .xn--mgbah1a3hjkrd (موريتانيا, Mauritania) TLD
+    servers.
+  * Updated the .in TLD and related IDN TLDs servers.
+  * Updated the .fm TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Thu, 28 Mar 2019 00:48:28 +0100
+
+whois (5.4.1) unstable; urgency=medium
+
+  * Added the .mw TLD server.
+  * Updated one or more translations.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 27 Jan 2019 04:48:53 +0100
+
+whois (5.4.0) unstable; urgency=medium
+
+  * Added support for the new libxcrypt 4.x.
+    This allows mkpasswd to support many modern password hash methods.
+  * Renamed the hash types (i.e. the arguments to -H) to use the naming
+    convention established by John the Ripper.
+  * Made mkpasswd use entropy gathered by crypt_gensalt(3), when available.
+  * Fixed many portability bugs in mkpasswd.
+  * Added the .gp TLD server.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Fri, 26 Oct 2018 18:32:49 +0200
+
+whois (5.3.2) unstable; urgency=medium
+
+  * Added the .ge TLD server.
+  * Updated the charset for whois.nic.cl. (Closes: #900047)
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 15 Jul 2018 12:38:42 +0200
+
+whois (5.3.1) unstable; urgency=medium
+
+  * mkpasswd: support passwords of arbitrary length. (Closes: #899254)
+  * Added the .ls TLD server. (Closes: #896452)
+  * Added support for -bzh and -uanic NIC handles.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Tue, 22 May 2018 15:32:28 +0200
+
+whois (5.3.0) unstable; urgency=medium
+
+  * Implemented querying for ip6.arpa domains.
+  * Updated the .pr TLD servers.
+  * Updated the list of new gTLDs.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 21 Jan 2018 01:23:45 +0100
+
+whois (5.2.20) unstable; urgency=medium
+
+  * Added the .mr TLD server.
+  * Removed the .bs TLD server.
+  * Updated the .ai, .gh, .gr, .kw, .ls, .ph, .sb, .com.uy and .vn TLD
+    servers.
+
+ -- Marco d'Itri <md@linux.it>  Wed, 27 Dec 2017 03:15:27 +0100
+
+whois (5.2.19) unstable; urgency=medium
+
+  * Switched do libidn2.
+  * Adopted getentropy(2) for mkpasswd on recent Linux.
+  * Updated the .id and .museum TLD servers.
+  * Removed the .dj TLD server.
+
+ -- Marco d'Itri <md@linux.it>  Sun, 10 Dec 2017 17:16:58 +0100
+
+whois (5.2.18) unstable; urgency=medium
+
+  * Fixed an unitialised variable which used to break querying the
+    Verisign registry servers with parameters.
+  * Do not request domains only when querying the Verisign registry
+    servers for a hostname.
+  * Fixed the program return code for queries like
+    "nameserver name.example.com".
+
+ -- Marco d'Itri <md@linux.it>  Tue, 22 Aug 2017 16:45:02 +0200
+
+whois (5.2.17) unstable; urgency=high
+
+  * Fixed whois referrals for .com, .net, .jobs, .bz, .cc and .tv, broken
+    by an ICANN-mandated output change:
+    https://www.icann.org/resources/pages/rdds-labeling-policy-2017-02-01-en
+  * Added the .xn--2scrj9c (ಭಾರತ, India), .xn--3hcrj9c (ଭାରତ, India),
+    .xn--45br5cyl (ভাৰত, India), .xn--h2breg3eve (भारतम्, India),
+    .xn--h2brj9c8c (भारोत, India), .xn--mgbbh1a (ﺏﺍﺮﺗ, India),
+    .xn--mgbgu82a (ڀﺍﺮﺗ, India) and .xn--rvc1e0am3e (ഭാരതം, India)
+    TLD servers.
+  * Updated the list of new gTLDs.
+  * whois.1: fixed a typo. (Closes: #866742)
+
+ -- Marco d'Itri <md@linux.it>  Thu, 27 Jul 2017 17:08:47 +0200
+
 whois (5.2.16) unstable; urgency=medium
 
   * Fixed parsing of 6to4 addresses broken in 5.2.15.
@@ -267,7 +692,7 @@ whois (5.0.21) unstable; urgency=low
     (Closes: #699928)
   * Added the .xn--j1amh (.укр, Ukraine) TLD server.
   * Updated the .bi, .se and .vn TLD servers. (Closes: #697753)
-  * Removed whois.pandi.or.id from the list of servers which support the 
+  * Removed whois.pandi.or.id from the list of servers which support the
     RIPE extensions, since it does not anymore and queries are broken.
     (Closes: #704115)
   * Updated some disclaimer suppression strings.
@@ -280,7 +705,7 @@ whois (5.0.20) unstable; urgency=low
 
   * Updated the .by, .ng, .om, .sm, .tn, .ug and .vn TLD servers.
     (Closes: #689486)
-  * Added the .bw, .td, .xn--mgb9awbf (عمان., Oman), .xn--mgberp4a5d4ar 
+  * Added the .bw, .td, .xn--mgb9awbf (عمان., Oman), .xn--mgberp4a5d4ar
     (.السعودية, Saudi Arabia) and .xn--mgbx4cd0ab (ﻢﻠﻴﺴﻳﺍ., Malaysia)
     TLD servers.
   * Removed the .kp, .mc, .rw and .xn--mgba3a4f16a (ایران., Iran) TLD servers.
@@ -321,7 +746,7 @@ whois (5.0.16) unstable; urgency=medium
 
   * Added the .xn--80ao21a (.ҚАЗ, Kazakhstan) TLD server.
   * Updated the .ec and .ee TLD servers.
-  * Removed the .xn--mgbc0a9azcg (.المغرب, Morocco) and .xn--mgberp4a5d4ar 
+  * Removed the .xn--mgbc0a9azcg (.المغرب, Morocco) and .xn--mgberp4a5d4ar
     (.السعودية, Saudi Arabia) TLD servers.
   * Added a new ASN allocation.
   * Updated one or more translations.

debian/compat

@@ -1 +0,0 @@
-9

debian/control

@@ -2,10 +2,14 @@ Source: whois
 Section: net
 Priority: standard
 Maintainer: Marco d'Itri <md@linux.it>
-Standards-Version: 3.9.8
-Build-Depends: debhelper (>= 5), gettext, libidn11-dev
-Vcs-Git: git://github.com/rfc1036/whois.git
-Vcs-Browser: https://github.com/rfc1036/whois
+Standards-Version: 4.7.2.0
+Rules-Requires-Root: no
+Build-Depends: debhelper-compat (= 13), gettext, pkgconf,
+ bash-completion,
+ libcrypt-dev,
+ libidn2-dev,
+Vcs-Git: https://salsa.debian.org/md/whois.git
+Vcs-Browser: https://salsa.debian.org/md/whois
 
 Package: whois
 Architecture: any

debian/rules

@@ -1,54 +1,10 @@
 #!/usr/bin/make -f
-SHELL+= -e
 
--include /usr/share/dpkg/architecture.mk
-DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all future=+lfs
 
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-  export CC := $(DEB_HOST_GNU_TYPE)-gcc
-endif
+%:
+	dh $@
 
-DPKG_EXPORT_BUILDFLAGS = 1
--include /usr/share/dpkg/buildflags.mk
+override_dh_auto_build:
+	dh_auto_build -- CONFIG_FILE="/etc/whois.conf" HAVE_ICONV=1
 
-D := $(CURDIR)/debian/whois
-
-build:
-	dh_testdir
-	$(MAKE) CONFIG_FILE="/etc/whois.conf" HAVE_LIBIDN=1 HAVE_ICONV=1
-	touch $@
-
-clean:
-	dh_testdir
-	-rm -f build
-	$(MAKE) distclean
-	dh_clean
-
-binary-arch: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-
-	dh_installdirs usr/bin
-	$(MAKE) install BASEDIR=$D
-	dh_installman whois.1 mkpasswd.1
-	dh_installdocs README
-	dh_installchangelogs 
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_shlibdeps
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-arch
-
-binary-indep:
-
-build-arch: build
-build-indep: build
-
-.PHONY: binary binary-arch binary-indep build build-arch build-indep clean

debian/salsa-ci.yml

@@ -0,0 +1,6 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
+
+variables:
+  SALSA_CI_IGNORED_BRANCHES: '^next$'

debian/source/options

@@ -1 +0,0 @@
-compression=xz

debian/whois.docs

@@ -0,0 +1 @@
+README

debian/whois.manpages

@@ -0,0 +1,2 @@
+mkpasswd.1
+whois.1

ip6_del_list

@@ -1,4 +1,4 @@
-# http://www.iana.org/assignments/ipv6-unicast-address-assignments
+# https://www.iana.org/assignments/ipv6-unicast-address-assignments
 # The parser is very simple-minded and wants the two first components of
 # addresses. It does not deal with networks == 0 or > 24 bit.
 
@@ -35,13 +35,12 @@
 2003:0000::/18	ripe
 
 2400:0000::/20	whois.nic.or.kr
-2400:0000::/12	apnic
+2400:0000::/11	apnic
 2600:0000::/12	arin
 2610:0000::/23	arin
 2620:0000::/23	arin
+2630:0000::/12	arin
 2800:0000::/12	lacnic
-2A00:0000::/12	ripe
+2A00:0000::/11	ripe
 2C00:0000::/12	afrinic
 
-3FFE:0000::/16	6bone
-

ip_del_list

@@ -4,24 +4,26 @@
 # unless they are very big and contains multiple assignments to different
 # customers documented in the whois database.
 #
-# http://www.iana.org/assignments/ipv4-address-space
+# https://www.iana.org/assignments/ipv4-address-space
 #
 0.0.0.0/8	UNKNOWN
 1.0.0.0/8	apnic
 2.0.0.0/8	ripe
 5.0.0.0/8	ripe
+14.64.0.0/11	whois.nic.or.kr
 14.0.0.0/8	apnic
 24.132.0.0/14	ripe
+27.176.0.0/13	whois.nic.or.kr
 27.0.0.0/8	apnic
 31.0.0.0/8	ripe
 36.0.0.0/8	apnic
 37.0.0.0/8	ripe
 39.0.0.0/8	apnic
 41.0.0.0/8	afrinic
-42.0.0.0/8	apnic
-43.224.0.0/11	apnic
-43.0.0.0/8	whois.nic.ad.jp
+42.32.0.0/12	whois.nic.or.kr
+42.0.0.0/7	apnic
 46.0.0.0/8	ripe
+49.8.0.0/14	whois.nic.or.kr
 49.0.0.0/8	apnic
 51.0.0.0/8	ripe
 # whois -r -K -h whois.apnic.net -i admin-c IM76-AP

ip_del_recovered.h

@@ -1,25 +1,7 @@
-/* 43.224.0.0 - 43.231.255.255 */
-{ 736100352UL, 4294443008UL, "whois.apnic.net" },
-/* 43.236.0.0 - 43.243.255.255 */
-{ 736886784UL, 4294705152UL, "whois.apnic.net" },
-{ 737148928UL, 4294705152UL, "whois.apnic.net" },
-/* 43.245.0.0 - 43.252.255.255 */
-{ 737476608UL, 4294901760UL, "whois.apnic.net" },
-{ 737542144UL, 4294836224UL, "whois.apnic.net" },
-{ 737673216UL, 4294705152UL, "whois.apnic.net" },
-{ 737935360UL, 4294901760UL, "whois.apnic.net" },
-/* 43.254.0.0 - 43.255.255.255 */
-{ 738066432UL, 4294836224UL, "whois.apnic.net" },
-/* 45.2.0.0 - 45.3.255.255 */
-{ 755105792UL, 4294836224UL, "whois.arin.net" },
 /* 45.4.0.0 - 45.7.255.255 */
 { 755236864UL, 4294705152UL, "whois.lacnic.net" },
 /* 45.8.0.0 - 45.15.255.255 */
 { 755499008UL, 4294443008UL, "whois.ripe.net" },
-/* 45.16.0.0 - 45.31.255.255 */
-{ 756023296UL, 4293918720UL, "whois.arin.net" },
-/* 45.32.0.0 - 45.63.255.255 */
-{ 757071872UL, 4292870144UL, "whois.arin.net" },
 /* 45.64.0.0 - 45.65.15.255 */
 { 759234560UL, 4294963200UL, "whois.apnic.net" },
 { 759169024UL, 4294901760UL, "whois.apnic.net" },
@@ -34,8 +16,6 @@
 { 759300096UL, 4294836224UL, "whois.ripe.net" },
 /* 45.68.0.0 - 45.71.255.255 */
 { 759431168UL, 4294705152UL, "whois.lacnic.net" },
-/* 45.72.0.0 - 45.79.255.255 */
-{ 759693312UL, 4294443008UL, "whois.arin.net" },
 /* 45.80.0.0 - 45.95.255.255 */
 { 760217600UL, 4293918720UL, "whois.ripe.net" },
 /* 45.96.0.0 - 45.111.255.255 */
@@ -52,8 +32,6 @@
 { 769130496UL, 4294705152UL, "whois.afrinic.net" },
 { 769392640UL, 4294836224UL, "whois.afrinic.net" },
 { 769523712UL, 4294901760UL, "whois.afrinic.net" },
-/* 45.223.0.0 - 45.223.255.255 */
-{ 769589248UL, 4294901760UL, "whois.arin.net" },
 /* 45.224.0.0 - 45.239.255.255 */
 { 769654784UL, 4293918720UL, "whois.lacnic.net" },
 /* 45.240.0.0 - 45.247.255.255 */
@@ -64,8 +42,6 @@
 { 1123778560UL, 4294950912UL, "whois.afrinic.net" },
 /* 72.44.16.0 - 72.44.31.255 */
 { 1210847232UL, 4294963200UL, "whois.lacnic.net" },
-/* 74.91.48.0 - 74.91.63.255 */
-{ 1247490048UL, 4294963200UL, "whois.arin.net" },
 /* 128.201.0.0 - 128.201.255.255 */
 { 2160656384UL, 4294901760UL, "whois.lacnic.net" },
 /* 131.196.0.0 - 131.196.255.255 */
@@ -76,12 +52,8 @@
 { 2332360704UL, 4294901760UL, "whois.apnic.net" },
 /* 139.26.0.0 - 139.26.255.255 */
 { 2333736960UL, 4294901760UL, "whois.afrinic.net" },
-/* 139.28.0.0 - 139.28.255.255 */
-{ 2333868032UL, 4294901760UL, "whois.ripe.net" },
 /* 144.48.0.0 - 144.48.255.255 */
 { 2419064832UL, 4294901760UL, "whois.apnic.net" },
-/* 144.168.0.0 - 144.168.255.255 */
-{ 2426929152UL, 4294901760UL, "whois.arin.net" },
 /* 146.196.32.0 - 146.196.127.255 */
 { 2462326784UL, 4294959104UL, "whois.apnic.net" },
 { 2462334976UL, 4294950912UL, "whois.apnic.net" },
@@ -91,70 +63,150 @@
 { 2471362560UL, 4294901760UL, "whois.ripe.net" },
 /* 149.248.0.0 - 149.248.255.255 */
 { 2516058112UL, 4294901760UL, "whois.arin.net" },
-/* 150.107.0.0 - 150.107.255.255 */
-{ 2523594752UL, 4294901760UL, "whois.apnic.net" },
-/* 150.129.0.0 - 150.129.255.255 */
-{ 2525036544UL, 4294901760UL, "whois.apnic.net" },
-/* 150.242.0.0 - 150.242.255.255 */
-{ 2532442112UL, 4294901760UL, "whois.apnic.net" },
 /* 152.89.0.0 - 152.89.255.255 */
 { 2555969536UL, 4294901760UL, "whois.ripe.net" },
-/* 154.16.0.0 - 154.16.255.255 */
-{ 2584739840UL, 4294901760UL, "whois.afrinic.net" },
 /* 157.119.0.0 - 157.119.255.255 */
 { 2641821696UL, 4294901760UL, "whois.apnic.net" },
-/* 160.19.0.0 - 160.19.15.255 */
-{ 2685599744UL, 4294963200UL, "whois.arin.net" },
-/* 160.19.24.0 - 160.19.31.255 */
-{ 2685605888UL, 4294965248UL, "whois.arin.net" },
+/* 160.19.20.0 - 160.19.23.255 */
+{ 2685604864UL, 4294966272UL, "whois.apnic.net" },
+/* 160.19.36.0 - 160.19.39.255 */
+{ 2685608960UL, 4294966272UL, "whois.afrinic.net" },
+/* 160.19.44.0 - 160.19.47.255 */
+{ 2685611008UL, 4294966272UL, "whois.lacnic.net" },
 /* 160.19.48.0 - 160.19.55.255 */
 { 2685612032UL, 4294965248UL, "whois.apnic.net" },
+/* 160.19.60.0 - 160.19.63.255 */
+{ 2685615104UL, 4294966272UL, "whois.afrinic.net" },
+/* 160.19.64.0 - 160.19.67.255 */
+{ 2685616128UL, 4294966272UL, "whois.apnic.net" },
+/* 160.19.92.0 - 160.19.95.255 */
+{ 2685623296UL, 4294966272UL, "whois.ripe.net" },
 /* 160.19.96.0 - 160.19.103.255 */
 { 2685624320UL, 4294965248UL, "whois.afrinic.net" },
 /* 160.19.112.0 - 160.19.143.255 */
 { 2685628416UL, 4294963200UL, "whois.afrinic.net" },
 { 2685632512UL, 4294963200UL, "whois.afrinic.net" },
+/* 160.19.152.0 - 160.19.155.255 */
+{ 2685638656UL, 4294966272UL, "whois.afrinic.net" },
+/* 160.19.168.0 - 160.19.175.255 */
+{ 2685642752UL, 4294965248UL, "whois.lacnic.net" },
+/* 160.19.180.0 - 160.19.183.255 */
+{ 2685645824UL, 4294966272UL, "whois.ripe.net" },
+/* 160.19.188.0 - 160.19.191.255 */
+{ 2685647872UL, 4294966272UL, "whois.afrinic.net" },
 /* 160.19.192.0 - 160.19.199.255 */
 { 2685648896UL, 4294965248UL, "whois.afrinic.net" },
+/* 160.19.200.0 - 160.19.203.255 */
+{ 2685650944UL, 4294966272UL, "whois.lacnic.net" },
 /* 160.19.208.0 - 160.19.223.255 */
 { 2685652992UL, 4294963200UL, "whois.apnic.net" },
+/* 160.19.224.0 - 160.19.227.255 */
+{ 2685657088UL, 4294966272UL, "whois.apnic.net" },
 /* 160.19.232.0 - 160.19.239.255 */
 { 2685659136UL, 4294965248UL, "whois.afrinic.net" },
 /* 160.19.240.0 - 160.19.255.255 */
 { 2685661184UL, 4294963200UL, "whois.lacnic.net" },
 /* 160.20.0.0 - 160.20.15.255 */
 { 2685665280UL, 4294963200UL, "whois.apnic.net" },
+/* 160.20.20.0 - 160.20.23.255 */
+{ 2685670400UL, 4294966272UL, "whois.lacnic.net" },
 /* 160.20.24.0 - 160.20.31.255 */
 { 2685671424UL, 4294965248UL, "whois.afrinic.net" },
+/* 160.20.32.0 - 160.20.35.255 */
+{ 2685673472UL, 4294966272UL, "whois.lacnic.net" },
 /* 160.20.40.0 - 160.20.47.255 */
 { 2685675520UL, 4294965248UL, "whois.apnic.net" },
 /* 160.20.48.0 - 160.20.63.255 */
 { 2685677568UL, 4294963200UL, "whois.apnic.net" },
 /* 160.20.64.0 - 160.20.71.255 */
 { 2685681664UL, 4294965248UL, "whois.lacnic.net" },
+/* 160.20.72.0 - 160.20.75.255 */
+{ 2685683712UL, 4294966272UL, "whois.apnic.net" },
 /* 160.20.80.0 - 160.20.95.255 */
 { 2685685760UL, 4294963200UL, "whois.lacnic.net" },
 /* 160.20.96.0 - 160.20.103.255 */
 { 2685689856UL, 4294965248UL, "whois.ripe.net" },
+/* 160.20.108.0 - 160.20.111.255 */
+{ 2685692928UL, 4294966272UL, "whois.ripe.net" },
+/* 160.20.112.0 - 160.20.115.255 */
+{ 2685693952UL, 4294966272UL, "whois.afrinic.net" },
 /* 160.20.144.0 - 160.20.159.255 */
 { 2685702144UL, 4294963200UL, "whois.ripe.net" },
 /* 160.20.160.0 - 160.20.207.255 */
 { 2685706240UL, 4294959104UL, "whois.lacnic.net" },
 { 2685714432UL, 4294963200UL, "whois.lacnic.net" },
-/* 160.20.232.0 - 160.20.239.255 */
-{ 2685724672UL, 4294965248UL, "whois.arin.net" },
+/* 160.20.213.0 - 160.20.213.255 */
+{ 2685719808UL, 4294967040UL, "whois.afrinic.net" },
+/* 160.20.214.0 - 160.20.215.255 */
+{ 2685720064UL, 4294966784UL, "whois.ripe.net" },
+/* 160.20.217.0 - 160.20.217.255 */
+{ 2685720832UL, 4294967040UL, "whois.afrinic.net" },
+/* 160.20.218.0 - 160.20.219.255 */
+{ 2685721088UL, 4294966784UL, "whois.lacnic.net" },
+/* 160.20.221.0 - 160.20.221.255 */
+{ 2685721856UL, 4294967040UL, "whois.afrinic.net" },
+/* 160.20.222.0 - 160.20.223.255 */
+{ 2685722112UL, 4294966784UL, "whois.apnic.net" },
+/* 160.20.225.0 - 160.20.225.255 */
+{ 2685722880UL, 4294967040UL, "whois.lacnic.net" },
+/* 160.20.226.0 - 160.20.227.255 */
+{ 2685723136UL, 4294966784UL, "whois.afrinic.net" },
+/* 160.20.229.0 - 160.20.229.255 */
+{ 2685723904UL, 4294967040UL, "whois.ripe.net" },
+/* 160.20.242.0 - 160.20.243.255 */
+{ 2685727232UL, 4294966784UL, "whois.lacnic.net" },
+/* 160.20.246.0 - 160.20.247.255 */
+{ 2685728256UL, 4294966784UL, "whois.lacnic.net" },
+/* 160.20.248.0 - 160.20.249.255 */
+{ 2685728768UL, 4294966784UL, "whois.ripe.net" },
+/* 160.20.252.0 - 160.20.255.255 */
+{ 2685729792UL, 4294966272UL, "whois.afrinic.net" },
 /* 160.202.8.0 - 160.202.15.255 */
 { 2697594880UL, 4294965248UL, "whois.apnic.net" },
 /* 160.202.16.0 - 160.202.31.255 */
 { 2697596928UL, 4294963200UL, "whois.ripe.net" },
 /* 160.202.32.0 - 160.202.63.255 */
 { 2697601024UL, 4294959104UL, "whois.apnic.net" },
-/* 160.202.64.0 - 160.202.127.255 */
-{ 2697609216UL, 4294950912UL, "whois.arin.net" },
 /* 160.202.128.0 - 160.202.255.255 */
 { 2697625600UL, 4294934528UL, "whois.apnic.net" },
+/* 160.238.0.0 - 160.238.0.255 */
+{ 2699952128UL, 4294967040UL, "whois.apnic.net" },
+/* 160.238.11.0 - 160.238.11.255 */
+{ 2699954944UL, 4294967040UL, "whois.afrinic.net" },
+/* 160.238.12.0 - 160.238.19.255 */
+{ 2699955200UL, 4294966272UL, "whois.apnic.net" },
+{ 2699956224UL, 4294966272UL, "whois.apnic.net" },
+/* 160.238.21.0 - 160.238.21.255 */
+{ 2699957504UL, 4294967040UL, "whois.ripe.net" },
+/* 160.238.24.0 - 160.238.29.255 */
+{ 2699958272UL, 4294966272UL, "whois.lacnic.net" },
+{ 2699959296UL, 4294966784UL, "whois.lacnic.net" },
+/* 160.238.33.0 - 160.238.33.255 */
+{ 2699960576UL, 4294967040UL, "whois.apnic.net" },
+/* 160.238.34.0 - 160.238.35.255 */
+{ 2699960832UL, 4294966784UL, "whois.apnic.net" },
+/* 160.238.36.0 - 160.238.39.255 */
+{ 2699961344UL, 4294966272UL, "whois.ripe.net" },
+/* 160.238.48.0 - 160.238.49.255 */
+{ 2699964416UL, 4294966784UL, "whois.afrinic.net" },
+/* 160.238.50.0 - 160.238.50.255 */
+{ 2699964928UL, 4294967040UL, "whois.afrinic.net" },
+/* 160.238.52.0 - 160.238.55.255 */
+{ 2699965440UL, 4294966272UL, "whois.ripe.net" },
+/* 160.238.57.0 - 160.238.57.255 */
+{ 2699966720UL, 4294967040UL, "whois.afrinic.net" },
+/* 160.238.58.0 - 160.238.59.255 */
+{ 2699966976UL, 4294966784UL, "whois.apnic.net" },
+/* 160.238.60.0 - 160.238.61.255 */
+{ 2699967488UL, 4294966784UL, "whois.ripe.net" },
+/* 160.238.63.0 - 160.238.63.255 */
+{ 2699968256UL, 4294967040UL, "whois.lacnic.net" },
 /* 160.238.64.0 - 160.238.95.255 */
 { 2699968512UL, 4294959104UL, "whois.apnic.net" },
+/* 160.238.96.0 - 160.238.99.255 */
+{ 2699976704UL, 4294966272UL, "whois.ripe.net" },
+/* 160.238.101.0 - 160.238.101.255 */
+{ 2699977984UL, 4294967040UL, "whois.afrinic.net" },
 /* 160.238.104.0 - 160.238.111.255 */
 { 2699978752UL, 4294965248UL, "whois.lacnic.net" },
 /* 160.238.112.0 - 160.238.127.255 */
@@ -163,32 +215,82 @@
 { 2699984896UL, 4294934528UL, "whois.lacnic.net" },
 /* 161.123.0.0 - 161.123.255.255 */
 { 2709192704UL, 4294901760UL, "whois.afrinic.net" },
+/* 162.12.196.0 - 162.12.199.255 */
+{ 2718745600UL, 4294966272UL, "whois.lacnic.net" },
 /* 162.12.200.0 - 162.12.207.255 */
 { 2718746624UL, 4294965248UL, "whois.ripe.net" },
+/* 162.12.208.0 - 162.12.215.255 */
+{ 2718748672UL, 4294965248UL, "whois.apnic.net" },
 /* 162.12.240.0 - 162.12.247.255 */
 { 2718756864UL, 4294965248UL, "whois.apnic.net" },
-/* 163.47.4.0 - 163.47.18.255 */
-{ 2737767424UL, 4294966272UL, "whois.apnic.net" },
-{ 2737768448UL, 4294965248UL, "whois.apnic.net" },
-{ 2737770496UL, 4294966784UL, "whois.apnic.net" },
-{ 2737771008UL, 4294967040UL, "whois.apnic.net" },
-/* 163.47.20.0 - 163.47.21.255 */
-{ 2737771520UL, 4294966784UL, "whois.apnic.net" },
-/* 163.47.32.0 - 163.47.45.255 */
-{ 2737774592UL, 4294965248UL, "whois.apnic.net" },
-{ 2737776640UL, 4294966272UL, "whois.apnic.net" },
-{ 2737777664UL, 4294966784UL, "whois.apnic.net" },
-/* 163.47.47.0 - 163.47.255.255 */
-{ 2737778432UL, 4294967040UL, "whois.apnic.net" },
-{ 2737778688UL, 4294963200UL, "whois.apnic.net" },
-{ 2737782784UL, 4294950912UL, "whois.apnic.net" },
-{ 2737799168UL, 4294934528UL, "whois.apnic.net" },
-/* 163.53.0.0 - 163.53.255.255 */
-{ 2738159616UL, 4294901760UL, "whois.apnic.net" },
 /* 164.160.0.0 - 164.160.255.255 */
 { 2761949184UL, 4294901760UL, "whois.afrinic.net" },
 /* 164.163.0.0 - 164.163.255.255 */
 { 2762145792UL, 4294901760UL, "whois.lacnic.net" },
+/* 192.12.109.0 - 192.12.109.255 */
+{ 3222039808UL, 4294967040UL, "whois.apnic.net" },
+/* 192.12.110.0 - 192.12.111.255 */
+{ 3222040064UL, 4294966784UL, "whois.afrinic.net" },
+/* 192.12.112.0 - 192.12.115.255 */
+{ 3222040576UL, 4294966272UL, "whois.lacnic.net" },
+/* 192.12.116.0 - 192.12.117.255 */
+{ 3222041600UL, 4294966784UL, "whois.afrinic.net" },
+/* 192.12.118.0 - 192.12.118.255 */
+{ 3222042112UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.26.110.0 - 192.26.110.255 */
+{ 3222957568UL, 4294967040UL, "whois.apnic.net" },
+/* 192.42.65.0 - 192.42.65.255 */
+{ 3223994624UL, 4294967040UL, "whois.ripe.net" },
+/* 192.47.36.0 - 192.47.36.255 */
+{ 3224314880UL, 4294967040UL, "whois.afrinic.net" },
+/* 192.51.188.0 - 192.51.188.255 */
+{ 3224615936UL, 4294967040UL, "whois.apnic.net" },
+/* 192.51.240.0 - 192.51.240.255 */
+{ 3224629248UL, 4294967040UL, "whois.afrinic.net" },
+/* 192.54.244.0 - 192.54.244.255 */
+{ 3224826880UL, 4294967040UL, "whois.ripe.net" },
+/* 192.67.23.0 - 192.67.23.255 */
+{ 3225622272UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.68.185.0 - 192.68.185.255 */
+{ 3225729280UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.70.192.0 - 192.70.199.255 */
+{ 3225862144UL, 4294965248UL, "whois.ripe.net" },
+/* 192.70.200.0 - 192.70.201.255 */
+{ 3225864192UL, 4294966784UL, "whois.afrinic.net" },
+/* 192.75.4.0 - 192.75.4.255 */
+{ 3226141696UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.75.137.0 - 192.75.137.255 */
+{ 3226175744UL, 4294967040UL, "whois.apnic.net" },
+/* 192.75.236.0 - 192.75.236.255 */
+{ 3226201088UL, 4294967040UL, "whois.afrinic.net" },
+/* 192.83.207.0 - 192.83.207.255 */
+{ 3226717952UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.83.208.0 - 192.83.215.255 */
+{ 3226718208UL, 4294965248UL, "whois.afrinic.net" },
+/* 192.83.216.0 - 192.83.216.255 */
+{ 3226720256UL, 4294967040UL, "whois.ripe.net" },
+/* 192.91.200.0 - 192.91.200.255 */
+{ 3227240448UL, 4294967040UL, "whois.afrinic.net" },
+/* 192.91.254.0 - 192.91.254.255 */
+{ 3227254272UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.92.154.0 - 192.92.154.255 */
+{ 3227294208UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.94.78.0 - 192.94.78.255 */
+{ 3227405824UL, 4294967040UL, "whois.ripe.net" },
+/* 192.135.90.0 - 192.135.91.255 */
+{ 3230095872UL, 4294966784UL, "whois.apnic.net" },
+/* 192.135.95.0 - 192.135.95.255 */
+{ 3230097152UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.135.99.0 - 192.135.99.255 */
+{ 3230098176UL, 4294967040UL, "whois.apnic.net" },
+/* 192.135.100.0 - 192.135.100.255 */
+{ 3230098432UL, 4294967040UL, "whois.ripe.net" },
+/* 192.135.185.0 - 192.135.185.255 */
+{ 3230120192UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.140.1.0 - 192.140.1.255 */
+{ 3230400768UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.140.2.0 - 192.140.3.255 */
+{ 3230401024UL, 4294966784UL, "whois.ripe.net" },
 /* 192.140.8.0 - 192.140.15.255 */
 { 3230402560UL, 4294965248UL, "whois.lacnic.net" },
 /* 192.140.16.0 - 192.140.127.255 */
@@ -205,22 +307,64 @@
 { 3230662656UL, 4294950912UL, "whois.ripe.net" },
 /* 192.144.64.0 - 192.144.71.255 */
 { 3230679040UL, 4294965248UL, "whois.lacnic.net" },
+/* 192.144.72.0 - 192.144.73.255 */
+{ 3230681088UL, 4294966784UL, "whois.lacnic.net" },
+/* 192.144.75.0 - 192.144.75.255 */
+{ 3230681856UL, 4294967040UL, "whois.ripe.net" },
+/* 192.144.78.0 - 192.144.79.255 */
+{ 3230682624UL, 4294966784UL, "whois.apnic.net" },
 /* 192.144.80.0 - 192.144.95.255 */
 { 3230683136UL, 4294963200UL, "whois.apnic.net" },
 /* 192.144.96.0 - 192.144.127.255 */
 { 3230687232UL, 4294959104UL, "whois.lacnic.net" },
-/* 192.144.128.0 - 192.144.255.255 */
-{ 3230695424UL, 4294934528UL, "whois.arin.net" },
 /* 192.145.0.0 - 192.145.127.255 */
 { 3230728192UL, 4294934528UL, "whois.ripe.net" },
 /* 192.145.128.0 - 192.145.191.255 */
 { 3230760960UL, 4294950912UL, "whois.afrinic.net" },
 /* 192.145.192.0 - 192.145.223.255 */
 { 3230777344UL, 4294959104UL, "whois.lacnic.net" },
-/* 207.115.112.0 - 207.115.127.255 */
-{ 3480449024UL, 4294963200UL, "whois.arin.net" },
-/* 209.107.128.0 - 209.107.191.255 */
-{ 3513483264UL, 4294950912UL, "whois.arin.net" },
+/* 192.145.224.0 - 192.145.227.255 */
+{ 3230785536UL, 4294966272UL, "whois.ripe.net" },
+/* 192.145.228.0 - 192.145.229.255 */
+{ 3230786560UL, 4294966784UL, "whois.apnic.net" },
+/* 192.145.230.0 - 192.145.230.255 */
+{ 3230787072UL, 4294967040UL, "whois.afrinic.net" },
+/* 192.153.12.0 - 192.153.12.255 */
+{ 3231255552UL, 4294967040UL, "whois.lacnic.net" },
+/* 192.156.144.0 - 192.156.144.255 */
+{ 3231485952UL, 4294967040UL, "whois.apnic.net" },
+/* 192.156.220.0 - 192.156.220.255 */
+{ 3231505408UL, 4294967040UL, "whois.apnic.net" },
+/* 192.172.232.0 - 192.172.232.255 */
+{ 3232557056UL, 4294967040UL, "whois.ripe.net" },
+/* 192.188.82.0 - 192.188.83.255 */
+{ 3233567232UL, 4294966784UL, "whois.apnic.net" },
+/* 192.188.248.0 - 192.188.248.255 */
+{ 3233609728UL, 4294967040UL, "whois.ripe.net" },
+/* 192.197.113.0 - 192.197.113.255 */
+{ 3234164992UL, 4294967040UL, "whois.apnic.net" },
+/* 192.251.230.0 - 192.251.230.255 */
+{ 3237733888UL, 4294967040UL, "whois.ripe.net" },
+/* 198.97.38.0 - 198.97.38.255 */
+{ 3328255488UL, 4294967040UL, "whois.lacnic.net" },
+/* 199.21.172.0 - 199.21.175.255 */
+{ 3340086272UL, 4294966272UL, "whois.apnic.net" },
+/* 199.212.57.0 - 199.212.57.255 */
+{ 3352574208UL, 4294967040UL, "whois.apnic.net" },
+/* 204.8.204.0 - 204.8.207.255 */
+{ 3423128576UL, 4294966272UL, "whois.afrinic.net" },
+/* 204.11.0.0 - 204.11.3.255 */
+{ 3423272960UL, 4294966272UL, "whois.ripe.net" },
+/* 204.48.32.0 - 204.48.33.255 */
+{ 3425705984UL, 4294966784UL, "whois.ripe.net" },
+/* 204.52.191.0 - 204.52.191.255 */
+{ 3426008832UL, 4294967040UL, "whois.apnic.net" },
+/* 204.225.42.0 - 204.225.43.255 */
+{ 3437308416UL, 4294966784UL, "whois.lacnic.net" },
+/* 205.211.83.0 - 205.211.83.255 */
+{ 3453178624UL, 4294967040UL, "whois.ripe.net" },
+/* 208.85.156.0 - 208.85.159.255 */
+{ 3495271424UL, 4294966272UL, "whois.afrinic.net" },
 /* 216.98.208.0 - 216.98.223.255 */
 { 3630354432UL, 4294963200UL, "whois.lacnic.net" },
 /* 216.250.96.0 - 216.250.111.255 */

make_as32_del.pl

@@ -1,27 +0,0 @@
-#!/usr/bin/perl
-
-use warnings;
-use strict;
-
-while (<>) {
-	chomp;
-	s/#.*$//;
-	s/^\s+//; s/\s+$//;
-	next if /^$/;
-
-	my ($fh, $fl, $lh, $ll, $s, $f, $l);
-	if (($fh, $fl, $lh, $ll, $s) =
-			/^(\d+)\.(\d+)\s+(\d+)\.(\d+)\s+([\w\.-]+)$/) {
-		$f = ($fh << 16) + $fl;
-		$l = ($lh << 16) + $ll;
-
-		my $server = ($s =~ /\./) ? $s : "whois.$s.net";
-		print qq|{ ${f}u, ${l}u,\t"$server" },\t/* $fh.$fl $lh.$ll */\n|;
-	} elsif (($f, $l, $s) = /^(\d+)\s+(\d+)\s+([\w\.-]+)$/) {
-		my $server = ($s =~ /\./) ? $s : "whois.$s.net";
-		print qq|{ ${f}u, ${l}u,\t"$server" },\n|;
-	} else {
-		die "format error: $_";
-	}
-}
-

make_as_del.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
@@ -11,18 +12,22 @@ while (<>) {
 	s/^\s+//; s/\s+$//;
 	next if /^$/;
 
-	die "format error: $_" if not (/^([\d\.]+)\s+([\d\.]+)\s+([\w\.]+)$/);
-	my $f = $1; my $l = $2; my $s = $3;
+	my ($fh, $fl, $lh, $ll, $s, $f, $l);
+	my $comment = '';
+	if (($fh, $fl, $lh, $ll, $s) =
+			/^(\d+)\.(\d+)\s+(\d+)\.(\d+)\s+([\w\.-]+)$/) {
+		$f = ($fh << 16) + $fl;
+		$l = ($lh << 16) + $ll;
+		$comment = qq|\t/* $fh.$fl $lh.$ll */|;
+	} elsif (($f, $l, $s) = /^(\d+)\s+(\d+)\s+([\w\.-]+)$/) {
+	} else {
+		die "format error: $_";
+	}
 
 	die "constraint violated: $l < $last_l" if $l < $last_l;
 	$last_l = $l;
 
-	print "{ ${f}, ${l}, \"";
-	if ($s =~ /\./) {
-		print "$s";
-	} else {
-		print "whois.$s.net";
-	}
-	print qq(" },\n);
+	my $server = ($s =~ /\./) ? $s : "whois.$s.net";
+	print qq|{ ${f}u, ${l}u,\t"$server" },$comment\n|;
 }
 

make_ip_del.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;

make_ip_del_recovered.pl

@@ -6,10 +6,12 @@ use strict;
 use autodie;
 
 use Text::CSV;
+use Net::Patricia;
 use Net::CIDR;
 use Net::IP;
 
 my $csv = Text::CSV->new;
+my $pt = parse_ip_del('ip_del_list');
 
 open(my $in, '<', 'ipv4-recovered-address-space-2.csv');
 open(my $out, '>', 'ip_del_recovered.h');
@@ -17,18 +19,51 @@ open(my $out, '>', 'ip_del_recovered.h');
 while (my $row = $csv->getline($in)) {
 	next if $row->[0] eq 'Start address';
 	next if $row->[5] ne 'ALLOCATED';
+	my ($first_ip, $last_ip, undef, undef, $server) = @$row;
 
-	print $out '/* ' . $row->[0] . ' - ' . $row->[1] . " */\n";
 	my @networks =
+		grep {
+			my $server_recovered = $pt->match_string($_->ip);
+			$server_recovered and $server_recovered ne $server;
+		}
 		map { Net::IP->new($_) }
-		Net::CIDR::range2cidr($row->[0] . '-' . $row->[1]);
+		Net::CIDR::range2cidr($first_ip . '-' . $last_ip);
+	next if not @networks;
+
+	print $out "/* $first_ip - $last_ip */\n";
 	print $out sprintf(qq|{ %sUL, %sUL, "%s" },\n|,
 		$_->intip,
 		((~(0xffffffff >> $_->prefixlen)) & 0xffffffff),
-		$row->[4]
+		$server
 	) foreach @networks;
 }
 
 close($in);
 close($out);
+exit;
+
+sub parse_ip_del {
+	my ($file) = @_;
+
+	my $pt = new Net::Patricia;
+
+	open(my $in, '<', $file);
+	while (<$in>) {
+		# this code is copied from make_ip_del.pl
+		chomp;
+		s/#.*$//;
+		s/^\s+//; s/\s+$//;
+		next if /^$/;
+
+		die "format error: $_" if not /^([\d\.]+)\/(\d+)\s+([\w\.]+)$/;
+		my $network = "$1/$2";
+		my $server = $3;
+
+		$server = "whois.$server.net" if $server !~ /\./;
+
+		$pt->add_string($network, $server) or die;
+	}
+
+	return $pt;
+}
 

make_new_gtlds.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;

make_nic_handles.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;

make_servers_charset.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;

make_tld_serv.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
@@ -15,8 +16,11 @@ while (<>) {
 	$b =~ s/^W(?:EB)?\s+/\\x01/;
 	$b =~ s/^VERISIGN\s+/\\x04" "/;
 	$b = "\\x03" if $b eq 'NONE';
-	$b = "\\x08" if $b eq 'AFILIAS';
+	$b =~ s/^RECURSIVE\s+/\\x08" "/;
+	$b = "\\x08$b" if $b eq 'whois.flexireg.net';
+	$b = "\\x08$b" if $b eq 'whois.nixiregistry.in';
 	$b = "\\x0C" if $b eq 'ARPA';
+	$b = "\\x0D" if $b eq 'IP6';
 	print qq|    "$a",\t"$b",\n|;
 }
 

make_version_h.pl

@@ -1,4 +1,5 @@
 #!/usr/bin/perl
+# SPDX-License-Identifier: GPL-2.0-or-later
 
 use warnings;
 use strict;
@@ -13,12 +14,22 @@ close($fh);
 my ($ver) = $line =~ /^whois \s+ \( ( [^\)]+ ) \) \s+ \S+/x;
 die "Version number not found in $changelog!\n" if not $ver;
 
-$ver =~ s/ ( ~bpo\d+\+\d+ | \+b\d+ | ~deb\d+.* | ubuntu\d+ | \+dyson\d+ ) $//x;
+$ver =~ s/ (
+	  build\d+
+	| ubuntu\d+
+	| ~\S+
+	| \+\S+
+) $//x;
 
 # The version number must not deviate from this format or the -V option
 # to RIPE-like servers will break. If needed, update the previous regexp.
-die "Invalid version number in $changelog!\n"
+# This may not be true anymore in 2019.
+die "Invalid version number in $changelog: '$ver'!\n"
 	unless $ver =~ /^ \d+\.\d+ ( \.\d+ )? $/x;
 
+# This is the version number used in the help messages.
 print qq|#define VERSION "$ver"\n|;
 
+# This is the string sent to RIPE-like servers as the argument of -V.
+print qq|#define IDSTRING "Md$ver"\n|;
+

mkpasswd.1

@@ -1,58 +1,92 @@
-.TH MKPASSWD 1 "21 March 2008" "Marco d'Itri" "Debian GNU/Linux"
+.TH MKPASSWD 1 "2019-12-30" "Marco d'Itri" "Debian GNU/Linux"
 .SH NAME
 mkpasswd \- Overfeatured front end to crypt(3)
 .SH SYNOPSIS
 .B mkpasswd
-.BR PASSWORD
-.BR SALT
-.PP
+.I PASSWORD
+.RI [ SALT ]
 .SH DESCRIPTION
 .B mkpasswd
 encrypts the given password with the
-.BR crypt(3)
-libc function using the given salt.
+.BR crypt (3)
+libc function, using the given salt.
 .SH OPTIONS
 .TP
-.B -S, --salt=STRING
-Use the \fISTRING\fP as salt. It must not contain prefixes such as \fI$1$\fP.
+.BR \-S " STRING\fR, \fP" \-\-salt= \fISTRING\fP
+Use the
+.I STRING
+as salt.
+If it begins with
+.I $
+then it will be passed straight to
+.BR crypt (3)
+without any checks.
 .TP
-.B -R, --rounds=NUMBER
-Use \fINUMBER\fP rounds. This argument is ignored if the method chosen
-does not support variable rounds. For the OpenBSD Blowfish method this is
+.BR \-R " NUMBER\fR, \fP" \-\-rounds= \fINUMBER\fP
+Use
+.I NUMBER
+rounds.
+This argument is ignored if the method chosen
+does not support variable rounds.
+For the OpenBSD Blowfish method this is
 the logarithm of the number of rounds.
+The behavior is undefined if this option is used without
+.IR \-\-method .
 .TP
-.B -m, --method=TYPE
-Compute the password using the \fITYPE\fP method.
-If \fITYPE\fP is \fIhelp\fP then the available methods are printed.
+.BR \-m " TYPE\fR, \fP" \-\-method= \fITYPE\fP
+Compute the password using the
+.I TYPE
+method.
+If
+.I TYPE
+is
+.I help
+then the list of available methods is printed.
+If
+.I TYPE
+begins and end with
+.I $
+characters then the string is passed to
+.BR crypt_gensalt (3)
+as-is.
 .TP
-.B -5
-Like \fI--method=md5\fP.
+.B \-5
+Like
+.IR \-\-method=md5crypt .
 .TP
-.B -P, --password-fd=NUM
-Read the password from file descriptor \fINUM\fP instead of using
-\fIgetpass(3)\fP.
-If the file descriptor is not connected to a tty then no other message
+.BI \-P " NUM\fR, \fP" \-\-password-fd= NUM
+Read the password from file descriptor
+.I NUM
+instead of using
+.BR getpass (3).
+If the file descriptor is not connected to a tty then no other text
 than the hashed password is printed on stdout.
 .TP
-.B -s, --stdin
-Like \fI--password-fd=0\fP.
-.SH "ENVIRONMENT"
+.BR \-s ", " \-\-stdin
+Like
+.IR \-\-password-fd=0 .
+.SH ENVIRONMENT
 .IP "MKPASSWD_OPTIONS"
-A list of options which will be evalued before the ones specified on the
+A list of options which will be evaluated before the ones specified on the
 command line.
 .SH BUGS
-If the \fI--stdin\fP option is used, passwords containing some control
+If the
+.I \-\-stdin
+option is used then passwords containing some control
 characters may not be read correctly.
-.TP
-This programs suffers of a bad case of featuritis.
+.P
+This program suffers of a bad case of featuritis.
 .SH "SEE ALSO"
-.IR passwd(1),
-.IR passwd(5),
-.IR crypt(3),
-.IR getpass(3)
+.BR passwd (1),
+.BR passwd (5),
+.BR crypt (3),
+.BR crypt (5),
+.BR crypt_gensalt (3),
+.BR getpass (3).
 .SH AUTHOR
 .B mkpasswd
-and this man page were written by Marco d'Itri <\fImd@linux.it\fP>
+and this man page were written by Marco d'Itri
+.RI < md@linux.it >
 and are licensed under the terms of the GNU General Public License,
-version 2 or higher.
-
+version 2 or later.
+.\" SPDX-License-Identifier: GPL-2.0-or-later

mkpasswd.bash

@@ -0,0 +1,33 @@
+_mkpasswd() {
+
+	case $3 in
+	--help | --version | --salt | --rounds | --password-fd | -[hVSRP])
+		return 0
+		;;
+	--method | -m)
+		COMPREPLY=($(compgen -W '$(
+			LC_ALL=C "$1" --method=help 2>/dev/null |
+				while read -r method _; do
+					[[ $method == Available ]] ||
+						printf "%s\n" "$method"
+				done
+			)'))
+		return 0
+		;;
+	esac
+
+	if [[ $2 == -* ]]; then
+		COMPREPLY=($(compgen -W '
+			--method
+			-5
+			--salt
+			--rounds
+			--password-fd
+			--stdin
+			--help
+			--version
+		' -- "$2"))
+		return 0
+	fi
+
+} && complete -F _mkpasswd mkpasswd

mkpasswd.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2008  Marco d'Itri
+ * Copyright (C) Marco d'Itri <md@linux.it>.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -11,9 +11,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /* for crypt, snprintf and strcasecmp */
@@ -35,17 +36,19 @@
 #include <strings.h>
 #include <time.h>
 #include <sys/types.h>
-#ifdef HAVE_XCRYPT
+#ifdef HAVE_XCRYPT_H
 #include <xcrypt.h>
 #include <sys/stat.h>
 #endif
-#ifdef HAVE_LINUX_CRYPT_GENSALT
-#define _OW_SOURCE
+#ifdef HAVE_CRYPT_H
 #include <crypt.h>
 #endif
 #ifdef HAVE_GETTIMEOFDAY
 #include <sys/time.h>
 #endif
+#ifdef HAVE_READPASSPHRASE
+#include <readpassphrase.h>
+#endif
 
 /* Application-specific */
 #include "version.h"
@@ -82,33 +85,42 @@ struct crypt_method {
     const char *desc;		/* long description for the methods list */
 };
 
+/* XCRYPT_VERSION_NUM is defined in crypt.h from libxcrypt */
+#if defined XCRYPT_VERSION_NUM
+# define HAVE_SHA_CRYPT
+# define HAVE_BCRYPT
+# define HAVE_BSDICRYPT
+#endif
+
 static const struct crypt_method methods[] = {
     /* method		prefix	minlen,	maxlen	rounds description */
-    { "des",		"",	2,	2,	0,
-	N_("standard 56 bit DES-based crypt(3)") },
-    { "md5",		"$1$",	8,	8,	0, "MD5" },
-#if defined OpenBSD || defined FreeBSD || (defined __SVR4 && defined __sun)
-# if (defined OpenBSD && OpenBSD >= 201405)
+#ifdef CRYPT_GENSALT_IMPLEMENTS_DEFAULT_PREFIX
+    { "auto",		NULL,	0,	0,	0, NULL },
+#endif
+    /* compatibility aliases for mkpasswd versions < 5.4.0 */
+    { "des",		"",	2,	2,	0, NULL },
+    { "md5",		"$1$",	8,	8,	0, NULL },
+#if defined XCRYPT_VERSION_NUM
+    { "yescrypt",	"$y$",	0,	0,	1, "Yescrypt" },
+    { "scrypt",		"$7$",	0,	0,	1, "scrypt" },
+#endif
+#ifdef HAVE_BCRYPT_OBSOLETE
     /* http://marc.info/?l=openbsd-misc&m=139320023202696 */
-    { "bf",		"$2b$", 22,	22,	1, "Blowfish" },
-    { "bfa",		"$2a$", 22,	22,	1, "Blowfish (obsolete $2a$ version)" },
-# else
-    { "bf",		"$2a$", 22,	22,	1, "Blowfish" },
-# endif
+    { "bf",		"$2a$", 22,	22,	2, "bcrypt" },
 #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" },
+#ifdef HAVE_BCRYPT
+    { "bcrypt",		"$2b$", 22,	22,	2, "bcrypt" },
+    { "bcrypt_a",	"$2a$", 22,	22,	2, "bcrypt (obsolete $2a$ version)" },
 #endif
 #if defined HAVE_SHA_CRYPT
     /* http://people.redhat.com/drepper/SHA-crypt.txt */
-    { "sha-256",	"$5$",	8,	16,	1, "SHA-256" },
-    { "sha-512",	"$6$",	8,	16,	1, "SHA-512" },
+    { "sha512crypt",	"$6$",	8,	16,	1, "SHA-512" },
+    { "sha256crypt",	"$5$",	8,	16,	1, "SHA-256" },
+    /* compatibility aliases for mkpasswd versions < 5.4.0 */
+    { "sha-256",	"$5$",	8,	16,	1, NULL },
+    { "sha-512",	"$6$",	8,	16,	1, NULL },
 #endif
+#if (defined __SVR4 && defined __sun) || defined XCRYPT_VERSION_NUM
     /* http://www.crypticide.com/dropsafe/article/1389 */
     /*
      * Actually the maximum salt length is arbitrary, but Solaris by default
@@ -116,8 +128,24 @@ static const struct crypt_method methods[] = {
      * http://cvs.opensolaris.org/source/xref/onnv/onnv-gate/ \
      *   usr/src/lib/crypt_modules/sunmd5/sunmd5.c#crypt_gensalt_impl
      */
-#if defined __SVR4 && defined __sun
     { "sunmd5",		"$md5$", 8,	8,	1, "SunMD5" },
+#endif
+    { "md5crypt",	"$1$",	8,	8,	0, "MD5" },
+#ifdef HAVE_BSDICRYPT
+    { "bsdicrypt",		"_",	0,	0,	0,
+	N_("BSDI extended DES-based crypt(3)") },
+#endif
+    { "descrypt",	"",	2,	2,	0,
+	N_("standard 56 bit DES-based crypt(3)") },
+#if XCRYPT_VERSION_NUM >= ((4 << 16) | 5)
+    { "sm3crypt",	"$sm3$", 0,	0,	1, "ShangMi 3" },
+    { "sm3_yescrypt",	"$sm3y$", 0,	0,	1, "ShangMi 3 Yescrypt" },
+#endif
+#if XCRYPT_VERSION_NUM >= ((4 << 16) | 4)
+    { "gost_yescrypt",	"$gy$",	0,	0,	1, "GOST Yescrypt" },
+#endif
+#if defined FreeBSD || defined XCRYPT_VERSION_NUM
+    { "nt",		"$3$",  0,	0,	0, "NT-Hash" },
 #endif
     { NULL,		NULL,	0,	0,	0, NULL }
 };
@@ -127,6 +155,7 @@ void *get_random_bytes(const unsigned int len);
 void NORETURN display_help(int error);
 void display_version(void);
 void display_methods(void);
+char *read_line(FILE *fp);
 
 int main(int argc, char *argv[])
 {
@@ -155,7 +184,7 @@ int main(int argc, char *argv[])
 	    > 0) {
 	switch (ch) {
 	case '5':
-	    optarg = (char *) "md5";
+	    optarg = (char *) "md5crypt";
 	    /* fall through */
 	case 'm':
 	case 'H':
@@ -163,6 +192,17 @@ int main(int argc, char *argv[])
 		display_methods();
 		exit(0);
 	    }
+#if defined HAVE_LINUX_CRYPT_GENSALT || defined HAVE_SOLARIS_CRYPT_GENSALT
+	    if (optarg[0] == '$'
+		    && strlen(optarg) > 2
+		    && *(optarg + strlen(optarg) - 1) == '$') {
+		salt_prefix = NOFAIL(strdup(optarg));
+		salt_minlen = 0;
+		salt_maxlen = 0;
+		rounds_support = 0;
+		break;
+	    }
+#endif
 	    for (i = 0; methods[i].method != NULL; i++)
 		if (strcaseeq(methods[i].method, optarg)) {
 		    salt_prefix = methods[i].prefix;
@@ -229,25 +269,41 @@ int main(int argc, char *argv[])
 	display_help(EXIT_FAILURE);
     }
 
-    /* default: DES password */
+    /* default: DES password, or else whatever crypt_gensalt chooses */
     if (!salt_prefix) {
 	salt_minlen = methods[0].minlen;
 	salt_maxlen = methods[0].maxlen;
 	salt_prefix = methods[0].prefix;
+	rounds_support = methods[0].rounds;
     }
 
-    if (streq(salt_prefix, "$2a$") || streq(salt_prefix, "$2y$")) {
-	/* OpenBSD Blowfish and derivatives */
+    if (!salt_prefix) {
+	/* NULL means that crypt_gensalt will choose one later */
+	rounds_str[0] = '\0';
+    } else if (rounds_support == 2) {
+	/* bcrypt strings always contain the rounds number */
 	if (rounds <= 5)
 	    rounds = 5;
-	/* actually for 2a/2y it is the logarithm of the number of rounds */
+	/* actually 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);
     else
 	rounds_str[0] = '\0';
 
-    if (salt_arg) {
+    if (salt_arg && salt_arg[0] == '$')
+	/* the salt begins with the prefix which specifies the method */
+	salt = NOFAIL(strdup(salt_arg));
+    else if (salt_prefix && salt_arg && strchr(salt_arg, '$')) {
+	/* looks like a salt, but with no initial method prefix */
+	salt = NOFAIL(malloc(strlen(salt_prefix) + strlen(rounds_str)
+		+ strlen(salt_arg) + 1));
+	*salt = '\0';
+	strcat(salt, salt_prefix);
+	strcat(salt, rounds_str);
+	strcat(salt, salt_arg);
+    } else if (salt_arg && salt_arg[0] != '\0') {
+	/* just the salt string with no metadata */
 	unsigned int c = strlen(salt_arg);
 	if (c < salt_minlen || c > salt_maxlen) {
 	    if (salt_minlen == salt_maxlen)
@@ -272,6 +328,12 @@ int main(int argc, char *argv[])
 	    }
 	}
 
+	/*
+	 * Build the actual argument to crypt(3) by concatenating the
+	 * method prefix, the rounds metadata (if any) and the salt string.
+	 */
+	if (!salt_prefix)
+	    salt_prefix = "";
 	salt = NOFAIL(malloc(strlen(salt_prefix) + strlen(rounds_str)
 		+ strlen(salt_arg) + 1));
 	*salt = '\0';
@@ -279,21 +341,23 @@ int main(int argc, char *argv[])
 	strcat(salt, rounds_str);
 	strcat(salt, salt_arg);
     } else {
+	/* no salt was specified by the user, so generate one */
 #ifdef HAVE_SOLARIS_CRYPT_GENSALT
 	salt = crypt_gensalt(salt_prefix, NULL);
 	if (!salt) {
-		perror("crypt_gensalt");
-		exit(2);
+	    perror("crypt_gensalt");
+	    exit(2);
 	}
 #elif defined HAVE_LINUX_CRYPT_GENSALT
 	void *entropy = get_random_bytes(64);
 
 	salt = crypt_gensalt(salt_prefix, rounds, entropy, 64);
 	if (!salt) {
-		fprintf(stderr, "crypt_gensalt failed.\n");
-		exit(2);
+	    perror("crypt_gensalt");
+	    exit(2);
 	}
-	free(entropy);
+	if (entropy)
+	    free(entropy);
 #else
 	unsigned int salt_len = salt_maxlen;
 
@@ -314,30 +378,36 @@ int main(int argc, char *argv[])
     if (password) {
     } else if (password_fd != -1) {
 	FILE *fp;
-	char *p;
 
 	if (isatty(password_fd))
 	    fprintf(stderr, _("Password: "));
-	password = NOFAIL(malloc(128));
 	fp = fdopen(password_fd, "r");
 	if (!fp) {
 	    perror("fdopen");
 	    exit(2);
 	}
-	if (!fgets(password, 128, fp)) {
-	    perror("fgets");
+
+	password = read_line(fp);
+	if (!password) {
+	    perror("fgetc");
 	    exit(2);
 	}
-
-	p = strpbrk(password, "\n\r");
-	if (p)
-	    *p = '\0';
     } else {
+#ifdef HAVE_READPASSPHRASE
+	const size_t size = 128;
+
+	password = NOFAIL(malloc(size));
+	if (!readpassphrase(_("Password: "), password, size, 0)) {
+	    perror("readpassphrase");
+	    exit(2);
+	}
+#else
 	password = getpass(_("Password: "));
 	if (!password) {
 	    perror("getpass");
 	    exit(2);
 	}
+#endif
     }
 
     {
@@ -345,12 +415,13 @@ int main(int argc, char *argv[])
 	result = crypt(password, salt);
 	/* xcrypt returns "*0" on errors */
 	if (!result || result[0] == '*') {
-	    fprintf(stderr, "crypt failed.\n");
+	    if (CRYPT_SETS_ERRNO)
+		perror("crypt");
+	    else
+		fprintf(stderr, "crypt failed.\n");
 	    exit(2);
 	}
-	/* 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))) {
+	if (!strneq(result, salt, strlen(salt))) {
 	    fprintf(stderr, _("Method not supported by crypt(3).\n"));
 	    exit(2);
 	}
@@ -360,14 +431,40 @@ int main(int argc, char *argv[])
     exit(0);
 }
 
-#ifdef RANDOM_DEVICE
-void* get_random_bytes(const unsigned int count)
+#ifdef CRYPT_GENSALT_IMPLEMENTS_AUTO_ENTROPY
+
+/*
+ * If NULL is passed to the libxcrypt version of crypt_gensalt() instead of
+ * the buffer of random bytes then the function will obtain by itself the
+ * required randomness.
+ */
+inline void *get_random_bytes(const unsigned int count)
 {
-    char *buf;
+    (void)(count); /* suppress the "unused parameter" warning */
+    return NULL;
+}
+
+#elif defined HAVE_SOLARIS_CRYPT_GENSALT
+
+/*
+ * The Solaris version of crypt_gensalt() gathers the random data by itself.
+ */
+
+#elif defined RANDOM_DEVICE || defined HAVE_ARC4RANDOM_BUF || defined HAVE_GETENTROPY
+
+void *get_random_bytes(const unsigned int count)
+{
+    char *buf = NOFAIL(malloc(count));
+
+#if defined HAVE_ARC4RANDOM_BUF
+    arc4random_buf(buf, count);
+#elif defined HAVE_GETENTROPY
+    if (getentropy(buf, count) < 0)
+	perror("getentropy");
+#else
     int fd;
     ssize_t bytes_read;
 
-    buf = NOFAIL(malloc(count));
     fd = open(RANDOM_DEVICE, O_RDONLY);
     if (fd < 0) {
 	perror("open(" RANDOM_DEVICE ")");
@@ -383,24 +480,17 @@ void* get_random_bytes(const unsigned int count)
 	exit(2);
     }
     close(fd);
+#endif
 
     return buf;
 }
-#endif
-
-#if defined RANDOM_DEVICE || defined HAVE_ARC4RANDOM_BUF
 
 void generate_salt(char *const buf, const unsigned int len)
 {
     unsigned int i;
     unsigned char *entropy;
 
-#if defined HAVE_ARC4RANDOM_BUF
-    entropy = NOFAIL(malloc(len));
-    arc4random_buf(entropy, len);
-#else
     entropy = get_random_bytes(len);
-#endif
 
     for (i = 0; i < len; i++)
 	buf[i] = valid_salts[entropy[i] % (sizeof valid_salts - 1)];
@@ -408,7 +498,7 @@ void generate_salt(char *const buf, const unsigned int len)
     free(entropy);
 }
 
-#else /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF */
+#else /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF || HAVE_GETENTROPY */
 
 void generate_salt(char *const buf, const unsigned int len)
 {
@@ -436,21 +526,25 @@ void generate_salt(char *const buf, const unsigned int len)
     buf[i] = '\0';
 }
 
-#endif /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF */
+#endif /* RANDOM_DEVICE || HAVE_ARC4RANDOM_BUF || HAVE_GETENTROPY*/
 
 void NORETURN display_help(int error)
 {
     fprintf((EXIT_SUCCESS == error) ? stdout : stderr,
 	    _("Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 	    "Crypts the PASSWORD using crypt(3).\n\n"));
-    fprintf(stderr, _(
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+    ));
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "      -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"
+    ));
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -465,7 +559,7 @@ void NORETURN display_help(int error)
 void display_version(void)
 {
     printf("mkpasswd %s\n\n", VERSION);
-    puts("Copyright (C) 2001-2008 Marco d'Itri\n"
+    puts("Copyright (C) Marco d'Itri\n"
 "This is free software; see the source for copying conditions.  There is NO\n"
 "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
 }
@@ -476,6 +570,33 @@ void display_methods(void)
 
     printf(_("Available methods:\n"));
     for (i = 0; methods[i].method != NULL; i++)
-	printf("%s\t%s\n", methods[i].method, methods[i].desc);
+	if (methods[i].desc)
+	    printf("%-15s %s\n", methods[i].method, methods[i].desc);
+}
+
+char *read_line(FILE *fp) {
+    size_t size = 128;
+    int ch;
+    size_t pos = 0;
+    char *password;
+
+    password = NOFAIL(malloc(size));
+
+    while ((ch = fgetc(fp)) != EOF) {
+	if (ch == '\n' || ch == '\r')
+	    break;
+	password[pos++] = ch;
+	if (pos == size) {
+	    size += 128;
+	    password = NOFAIL(realloc(password, size));
+	}
+    }
+    password[pos] = '\0';
+
+    if (ferror(fp)) {
+	free(password);
+	return NULL;
+    }
+    return password;
 }
 

new_gtlds_list

@@ -6,7 +6,6 @@
 
 aaa
 aarp
-abarth
 abb
 abbott
 abbvie
@@ -19,25 +18,20 @@ accenture
 accountant
 accountants
 aco
-active
 actor
-adac
 ads
 adult
 aeg
 aetna
-afamilycompany
 afl
 africa
 agakhan
 agency
 aig
-aigo
 airbus
 airforce
 airtel
 akdn
-alfaromeo
 alibaba
 alipay
 allfinanz
@@ -45,6 +39,7 @@ allstate
 ally
 alsace
 alstom
+amazon
 americanexpress
 americanfamily
 amex
@@ -78,14 +73,12 @@ auspost
 author
 auto
 autos
-avianca
 aws
 axa
 azure
 baby
 baidu
 banamex
-bananarepublic
 band
 bank
 bar
@@ -106,7 +99,6 @@ bcn
 beats
 beauty
 beer
-bentley
 berlin
 best
 bestbuy
@@ -120,14 +112,12 @@ bingo
 bio
 black
 blackfriday
-blanco
 blockbuster
 blog
 bloomberg
 blue
 bms
 bmw
-bnl
 bnpparibas
 boats
 boehringer
@@ -137,7 +127,6 @@ bond
 boo
 book
 booking
-boots
 bosch
 bostik
 boston
@@ -150,8 +139,6 @@ broadway
 broker
 brother
 brussels
-budapest
-bugatti
 build
 builders
 business
@@ -166,7 +153,6 @@ calvinklein
 cam
 camera
 camp
-cancerresearch
 canon
 capetown
 capital
@@ -178,10 +164,8 @@ care
 career
 careers
 cars
-cartier
 casa
 case
-caseih
 cash
 casino
 catering
@@ -189,8 +173,6 @@ catholic
 cba
 cbn
 cbre
-cbs
-ceb
 center
 ceo
 cern
@@ -198,14 +180,13 @@ cfa
 cfd
 chanel
 channel
+charity
 chase
 chat
 cheap
 chintai
-chloe
 christmas
 chrome
-chrysler
 church
 cipriani
 circle
@@ -214,7 +195,6 @@ citadel
 citi
 citic
 city
-cityeats
 claims
 cleaning
 click
@@ -229,7 +209,6 @@ codes
 coffee
 college
 cologne
-comcast
 commbank
 community
 company
@@ -242,13 +221,13 @@ consulting
 contact
 contractors
 cooking
-cookingchannel
 cool
 corsica
 country
 coupon
 coupons
 courses
+cpa
 credit
 creditcard
 creditunion
@@ -257,11 +236,9 @@ crown
 crs
 cruise
 cruises
-csc
 cuisinella
 cymru
 cyou
-dabur
 dad
 dance
 data
@@ -298,19 +275,13 @@ diy
 dnp
 docs
 doctor
-dodge
 dog
-doha
 domains
-doosan
 dot
 download
 drive
 dtv
 dubai
-duck
-dunlop
-duns
 dupont
 durban
 dvag
@@ -326,19 +297,15 @@ energy
 engineer
 engineering
 enterprises
-epost
 epson
 equipment
 ericsson
 erni
 esq
 estate
-esurance
-etisalat
 eurovision
 eus
 events
-everbank
 exchange
 expert
 exposed
@@ -359,7 +326,6 @@ fedex
 feedback
 ferrari
 ferrero
-fiat
 fidelity
 fido
 film
@@ -378,11 +344,9 @@ flights
 flir
 florist
 flowers
-flsmidth
 fly
 foo
 food
-foodnetwork
 football
 ford
 forex
@@ -394,11 +358,9 @@ free
 fresenius
 frl
 frogans
-frontdoor
 frontier
 ftr
 fujitsu
-fujixerox
 fun
 fund
 furniture
@@ -412,6 +374,7 @@ game
 games
 gap
 garden
+gay
 gbiz
 gdn
 gea
@@ -423,7 +386,6 @@ gift
 gifts
 gives
 giving
-glade
 glass
 gle
 global
@@ -436,8 +398,6 @@ godaddy
 gold
 goldpoint
 golf
-goo
-goodhands
 goodyear
 goog
 google
@@ -448,8 +408,8 @@ graphics
 gratis
 green
 gripe
+grocery
 group
-guardian
 gucci
 guge
 guide
@@ -468,7 +428,6 @@ help
 helsinki
 here
 hermes
-hgtv
 hiphop
 hisamitsu
 hitachi
@@ -482,19 +441,16 @@ homegoods
 homes
 homesense
 honda
-honeywell
 horse
 hospital
 host
 hosting
 hot
-hoteles
 hotels
 hotmail
 house
 how
 hsbc
-htc
 hughes
 hyatt
 hyundai
@@ -504,12 +460,12 @@ ice
 icu
 ieee
 ifm
-iinet
 ikano
 imamat
 imdb
 immo
 immobilien
+inc
 industries
 infiniti
 ing
@@ -517,29 +473,23 @@ ink
 institute
 insurance
 insure
-intel
 international
 intuit
 investments
 ipiranga
 irish
-iselect
 ismaili
 ist
 istanbul
 itau
 itv
-iveco
-iwc
 jaguar
 java
 jcb
-jcp
 jeep
 jetzt
 jewelry
 jio
-jlc
 jll
 jmp
 jnj
@@ -553,12 +503,11 @@ juniper
 kaufen
 kddi
 kerryhotels
-kerrylogistics
 kerryproperties
 kfh
 kia
+kids
 kim
-kinder
 kindle
 kitchen
 kiwi
@@ -572,12 +521,8 @@ kred
 kuokgroup
 kyoto
 lacaixa
-ladbrokes
 lamborghini
 lamer
-lancaster
-lancia
-lancome
 land
 landrover
 lanxess
@@ -595,7 +540,6 @@ legal
 lego
 lexus
 lgbt
-liaison
 lidl
 life
 lifeinsurance
@@ -606,17 +550,15 @@ lilly
 limited
 limo
 lincoln
-linde
 link
-lipsy
 live
 living
-lixil
+llc
+llp
 loan
 loans
 locker
 locus
-loft
 lol
 london
 lotte
@@ -627,10 +569,8 @@ lplfinancial
 ltd
 ltda
 lundbeck
-lupin
 luxe
 luxury
-macys
 madrid
 maif
 maison
@@ -638,16 +578,14 @@ makeup
 man
 management
 mango
+map
 market
 marketing
 markets
 marriott
 marshalls
-maserati
 mattel
 mba
-mcd
-mcdonalds
 mckinsey
 med
 media
@@ -657,8 +595,7 @@ meme
 memorial
 men
 menu
-meo
-metlife
+merckmsd
 miami
 microsoft
 mini
@@ -669,7 +606,6 @@ mlb
 mls
 mma
 mobile
-mobily
 moda
 moe
 moi
@@ -677,8 +613,6 @@ mom
 monash
 money
 monster
-montblanc
-mopar
 mormon
 mortgage
 moscow
@@ -686,18 +620,12 @@ moto
 motorcycles
 mov
 movie
-movistar
 msd
 mtn
-mtpc
 mtr
-mutual
-mutuelle
+music
 nab
-nadex
 nagoya
-nationwide
-natura
 navy
 nba
 nec
@@ -706,7 +634,6 @@ netflix
 network
 neustar
 new
-newholland
 news
 next
 nextdirect
@@ -721,7 +648,6 @@ ninja
 nissan
 nissay
 nokia
-northwesternmutual
 norton
 now
 nowruz
@@ -732,52 +658,45 @@ ntt
 nyc
 obi
 observer
-off
 office
 okinawa
 olayan
 olayangroup
-oldnavy
 ollo
 omega
 one
 ong
 onl
 online
-onyourside
 ooo
 open
 oracle
 orange
 organic
-orientexpress
 origins
 osaka
 otsuka
 ott
 ovh
 page
-pamperedchef
 panasonic
-panerai
 paris
 pars
 partners
 parts
 party
-passagens
 pay
 pccw
 pet
 pfizer
 pharmacy
+phd
 philips
 phone
 photo
 photography
 photos
 physio
-piaget
 pics
 pictet
 pictures
@@ -797,7 +716,6 @@ pohl
 poker
 politie
 porn
-pramerica
 praxi
 press
 prime
@@ -816,17 +734,14 @@ pwc
 qpon
 quebec
 quest
-qvc
 racing
 radio
-raid
 read
 realestate
 realtor
 realty
 recipes
 red
-redstone
 redumbrella
 rehab
 reise
@@ -847,12 +762,9 @@ rexroth
 rich
 richardli
 ricoh
-rightathome
 ril
 rio
 rip
-rmit
-rocher
 rocks
 rodeo
 rogers
@@ -875,14 +787,12 @@ sandvik
 sandvikcoromant
 sanofi
 sap
-sapo
 sarl
 sas
 save
 saxo
 sbi
 sbs
-sca
 scb
 schaeffler
 schmidt
@@ -891,9 +801,8 @@ school
 schule
 schwarz
 science
-scjohnson
-scor
 scot
+search
 seat
 secure
 security
@@ -901,7 +810,6 @@ seek
 select
 sener
 services
-ses
 seven
 sew
 sex
@@ -909,7 +817,6 @@ sexy
 sfr
 shangrila
 sharp
-shaw
 shell
 shia
 shiksha
@@ -918,8 +825,6 @@ shop
 shopping
 shouji
 show
-showtime
-shriram
 silk
 sina
 singles
@@ -942,19 +847,16 @@ solutions
 song
 sony
 soy
+spa
 space
-spiegel
+sport
 spot
-spreadbetting
 srl
-srt
 stada
 staples
 star
-starhub
 statebank
 statefarm
-statoil
 stc
 stcgroup
 stockholm
@@ -972,10 +874,8 @@ surf
 surgery
 suzuki
 swatch
-swiftcover
 swiss
 sydney
-symantec
 systems
 tab
 taipei
@@ -992,8 +892,6 @@ tdk
 team
 tech
 technology
-telecity
-telefonica
 temasek
 tennis
 teva
@@ -1003,7 +901,6 @@ theatre
 tiaa
 tickets
 tienda
-tiffany
 tips
 tires
 tirol
@@ -1025,7 +922,6 @@ toys
 trade
 trading
 training
-travelchannel
 travelers
 travelersinsurance
 trust
@@ -1037,7 +933,6 @@ tushu
 tvs
 ubank
 ubs
-uconnect
 unicom
 university
 uno
@@ -1061,25 +956,20 @@ vip
 virgin
 visa
 vision
-vista
-vistaprint
 viva
 vivo
 vlaanderen
 vodka
-volkswagen
 volvo
 vote
 voting
 voto
 voyage
-vuelos
 wales
 walmart
 walter
 wang
 wanggou
-warman
 watch
 watches
 weather
@@ -1100,7 +990,6 @@ windows
 wine
 winners
 wme
-wolterskluwer
 woodside
 work
 works
@@ -1110,7 +999,6 @@ wtc
 wtf
 xbox
 xerox
-xfinity
 xihuan
 xin
 xn--11b4c3d
@@ -1119,7 +1007,6 @@ xn--1qqw23a
 xn--30rr7y
 xn--3bst00m
 xn--3ds443g
-xn--3oq18vl8pn36a
 xn--3pxu8k
 xn--42c2d9a
 xn--45q11c
@@ -1143,6 +1030,7 @@ xn--bck1b9a5dre4c
 xn--c1avg
 xn--c2br7g
 xn--cck2b3b
+xn--cckwcxetd
 xn--cg4bki
 xn--czr694b
 xn--czrs0t
@@ -1150,7 +1038,6 @@ xn--czru2d
 xn--d1acj3b
 xn--eckvdtc9d
 xn--efvy88h
-xn--estv75g
 xn--fct429k
 xn--fhbei
 xn--fiq228c5hs
@@ -1166,16 +1053,13 @@ xn--i1b6b1a6a2e
 xn--imr513n
 xn--io0a7i
 xn--j1aef
-xn--jlq61u9w7b
+xn--jlq480n2rg
 xn--jvr189m
 xn--kcrx77d1x4a
-xn--kpu716f
 xn--kput3i
 xn--mgba3a3ejt
 xn--mgba7c0bbn0a
-xn--mgbaakc7dvf
 xn--mgbab2bd
-xn--mgbb9fbpob
 xn--mgbca7dzdo
 xn--mgbi4ecexp
 xn--mgbt3dhd
@@ -1187,8 +1071,8 @@ xn--ngbrx
 xn--nqv7f
 xn--nqv7fs00ema
 xn--nyqy26a
+xn--otu796d
 xn--p1acf
-xn--pbt977c
 xn--pssy2u
 xn--q9jyb4c
 xn--qcka1pmc
@@ -1207,7 +1091,6 @@ xn--w4r85el8fhu5dnra
 xn--w4rs40l
 xn--xhq521b
 xn--zfr164b
-xperia
 xyz
 yachts
 yahoo
@@ -1223,6 +1106,5 @@ zappos
 zara
 zero
 zip
-zippo
 zone
 zuerich

nic_handles_list

@@ -5,14 +5,13 @@
 -afrinic whois.afrinic.net
 -ap	whois.apnic.net
 -cznic	whois.nic.cz
--dk	whois.dk-hostmaster.dk
+-dk	whois.punktum.dk
 -il	whois.isoc.org.il
 -is	whois.isnic.is
--kg	whois.domain.kg
+-kg	whois.kg
 -coop	whois.nic.coop
 -frnic	whois.nic.fr
 -lrms	whois.afilias.info
--metu	whois.nic.tr
 -nicat	whois.nic.at
 -nicci	whois.nic.ci
 -irnic	whois.nic.ir
@@ -20,3 +19,7 @@
 -tel	whois.nic.tel
 -adnic	whois.nic.org.uy
 -sixxs	whois.sixxs.net
+-uanic  whois.ua
+-bzh	whois.nic.bzh
+-ru	whois.tcinet.ru
+-su	whois.tcinet.ru

po/Makefile

@@ -1,12 +1,16 @@
 prefix = /usr
 
+ifdef DESTDIR
+BASEDIR := $(DESTDIR)
+endif
+
 INSTALL= install
 
 INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/locale
 
 PACKAGE = whois
 
-CATALOGS = cs.mo da.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo nb.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 ka.mo pl.mo pt_BR.mo ru.mo tr.mo zh_CN.mo
 
 POTFILES=../whois.c ../mkpasswd.c
 

po/cs.po

@@ -1,12 +1,12 @@
 # Czech translation for whois
-# Petr Pisar <petr.pisar@atlas.cz>, 2008, 2009, 2010, 2012, 2013.
+# Petr Pisar <petr.pisar@atlas.cz>, 2008, 2009, 2010, 2012, 2013, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 5.0.24\n"
+"Project-Id-Version: whois 5.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2013-04-10 20:06+0200\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
+"PO-Revision-Date: 2019-06-28 06:05+02:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
 "Language: cs\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ../whois.c:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -27,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:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Používám server %s.\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 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:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
 msgstr "Tato TLD nemá žádný whoisový server."
 
-#: ../whois.c:248
+#: ../whois.c:337
 msgid "No whois server is known for this kind of object."
 msgstr "Pro tento druh objektu není znám žádný whoisový server."
 
-#: ../whois.c:251
+#: ../whois.c:340
 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:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Používá se server %s.\n"
+
+#: ../whois.c:362
 #, 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:273
+#: ../whois.c:369
 #, 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:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
 "Znění dotazu: „%s“\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -95,16 +95,16 @@ msgstr ""
 "Nalezen odkaz na %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Tento řádek nemohu rozebrat: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Varování: RIPE příznak použit s tradičním serverem."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,119 +112,164 @@ 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:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "Jméno počítače %s nenalezeno."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/TCP: neznámá služba"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Čas vypršel."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Přerušeno signálem %d…"
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\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"
-"\n"
-"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
-"-l                     find the one level less specific match\n"
-"-L                     find all levels less specific matches\n"
-"-m                     find all one level more specific matches\n"
-"-M                     find all levels of more specific matches\n"
-"-c                     find the smallest match containing a mnt-irt "
-"attribute\n"
-"-x                     exact match\n"
-"-b                     return brief IP address ranges with abuse contact\n"
-"-B                     turn off object filtering (show email addresses)\n"
-"-G                     turn off grouping of associated objects\n"
-"-d                     return DNS reverse delegation objects too\n"
-"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
-"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
-"-K                     only primary keys are returned\n"
-"-r                     turn off recursive look-ups for contact information\n"
-"-R                     force to show local copy of the domain object even\n"
-"                       if it contains referral\n"
-"-a                     also search all the mirrored databases\n"
-"-s SOURCE[,SOURCE]...  search the database mirrored 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\n"
 msgstr ""
 "Použití: whois [PŘEPÍNAČ]… OBJEKT…\n"
 "\n"
 "-h STROJ, --host STROJ   připojí se na server STROJ\n"
 "-p PORT, --port PORT     připojí se na PORT\n"
+"-I                       dotáže se whois.iana.org a následuje tamní odkazy\n"
 "-H                       skryje právní prohlášení\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
+"      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+"\n"
+msgstr ""
 "      --verbose          vysvětlí, co se právě provádí\n"
 "      --help             zobrazí tuto nápovědu a skončí\n"
 "      --version          vypíše informace o verzi a skončí\n"
 "\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
+"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
+"-l                     find the one level less specific match\n"
+"-L                     find all levels less specific matches\n"
+"-m                     find all one level more specific matches\n"
+"-M                     find all levels of more specific matches\n"
+msgstr ""
 "Tyto přepínače jsou podporovány serverem whois.ripe.net a některými\n"
 "podobnými jemu:\n"
 "-l                       nalezne o jednu úroveň širší shodu\n"
 "-L                       nalezne všechny širší shody\n"
 "-m                       nalezne všechny nejbližší užší shody\n"
 "-M                       nalezne všechny užší shody\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
 "-c                       nalezne nejužší shodu obsahující atribut mnt-irt\n"
 "-x                       přesná shoda\n"
-"-b                       vrátí stručný rozsah IP adres s kontaktem na stížnosti\n"
-"-B                       vypne filtrování objektů (zobrazuje e-mailové adresy)\n"
+"-b                       vrátí stručný rozsah IP adres s kontaktem na "
+"stížnosti\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
+"-B                     turn off object filtering (show email addresses)\n"
+"-G                     turn off grouping of associated objects\n"
+"-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-B                       vypne filtrování objektů (zobrazuje e-mailové "
+"adresy)\n"
 "-G                       vypne seskupování přidružených objektů\n"
 "-d                       vrací též objekty delegace reverzního DNS\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
+"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned\n"
+"-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
 "-i ATR[,ATR]…            provede inverzní dotaz k zadaným ATRIBUTŮM\n"
 "-T TYP[,TYP]…            dotáže se jen na objekty zadaného TYPU\n"
 "-K                       vrátí pouze primární klíče\n"
 "-r                       vypne rekurzivní dohledávání kontaktů\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     also search all the mirrored databases\n"
+"-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
 "-R                       vynutí zobrazení místní kopie doménového objektu,\n"
 "                         i když obsahuje odkaz\n"
 "-a                       prohledá rovněž všechny zrcadlené databáze\n"
 "-s ZDROJ[,ZDROJ]…        prohledá databázi zrcadlenou ze ZDROJE\n"
 "-g ZDROJ:PRVNÍ-POSLEDNÍ  nalezne aktualizace ze ZDROJE se sériovým číslem\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
+"-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\n"
+msgstr ""
 "                         PRVNÍ až POSLEDNÍ\n"
 "-t TYP                   požaduje šablonu pro objekt druhu TYP\n"
 "-v TYP                   požaduje podrobnou šablonu pro objekt druhu TYP\n"
 "-q [version|sources|types]\n"
-"                         dotáže se na zadané informace o serveru („version“ –\n"
+"                         dotáže se na zadané informace o serveru („version“ "
+"–\n"
 "                         verze, „sources“ – zdroje, „types“ – typy)\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "rozšířený BSDI crypt(3) založený na šifře DES"
+
+#: ../mkpasswd.c:138
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "standardní crypt(3) založený na 56bitové šifře DES"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "Neplatná metoda „%s“.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Neplatné číslo „%s“.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pro podrobnosti zkuste příkaz „%s --help“.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, c-format
 msgid "Wrong salt length: %d byte when %d expected.\n"
 msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -232,7 +277,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:247
+#: ../mkpasswd.c:297
 #, 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"
@@ -240,22 +285,22 @@ 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:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Neplatný znak v soli „%c“.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Heslo: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr "Metoda není podporována funkcí crypt(3).\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -266,16 +311,33 @@ msgstr ""
 "Zašifruje HESLO pomocí funkce crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=DRUH     vybere DRUH metody\n"
+"      -5                    stejné jako --method=md5crypt\n"
+"      -S, --salt=SŮL        použije zadanou SŮL\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -R, --rounds=POČET    použije zadaný POČET kol\n"
+"      -P, --password-fd=Č   přečte heslo z deskriptoru souboru Č\n"
+"                            místo z /dev/tty\n"
+"      -s, --stdin           jako --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -285,13 +347,6 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -m, --method=DRUH     vybere DRUH metody\n"
-"      -5                    stejné jako --method=md5\n"
-"      -S, --salt=SŮL        použije zadanou SŮL\n"
-"      -R, --rounds=POČET    použije zadaný POČET kol\n"
-"      -P, --password-fd=Č   přečte heslo z deskriptoru souboru Č\n"
-"                            místo z /dev/tty\n"
-"      -s, --stdin           jako --password-fd=0\n"
 "      -h, --help            zobrazí tuto nápovědu a skončí\n"
 "      -V, --version         vypíše informace o verzi a skončí\n"
 "\n"
@@ -302,7 +357,7 @@ msgstr ""
 "Chyby programu hlaste na %s (anglicky), chyby překladu na\n"
 "<translation-team-cs@lists.sourceforge.net> (česky).\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, c-format
 msgid "Available methods:\n"
 msgstr "Dostupné metody:\n"

po/da.po

@@ -1,15 +1,15 @@
 # Translation of whois to Danish.
-# Copyright (C) 2001 Simon Richter <Simon.Richter@in.tum.de>, 2004 Adrian 
+# 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, 2013.
+# Joe Hansen <joedalton2@yahoo.dk>, 2011, 2013, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 5.0.24\n"
+"Project-Id-Version: whois 5.5.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2013-04-13 17:30+01:00\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
+"PO-Revision-Date: 2020-03-08 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"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../whois.c:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -29,28 +29,28 @@ msgstr ""
 "\n"
 "Rapporter fejl til %s (på engelsk).\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
+#: ../whois.c:329
+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:334
+msgid "This TLD has no whois server."
+msgstr "Denne TLD har ingen whois-server."
+
+#: ../whois.c:337
+msgid "No whois server is known for this kind of object."
+msgstr "Ingen whois-server er kendt for denne type af objekt."
+
+#: ../whois.c:340
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "Ukendt AS- eller IP-netværksnummer. Opgrader venligst dette program."
+
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Bruger server %s.\n"
 
-#: ../whois.c:240
-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:245
-msgid "This TLD has no whois server."
-msgstr "Denne TLD har ingen whois-server."
-
-#: ../whois.c:248
-msgid "No whois server is known for this kind of object."
-msgstr "Ingen whois-server er kendt for denne type af objekt."
-
-#: ../whois.c:251
-msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Ukendt AS- eller IP-netværksnummer. Opgrader venligst dette program."
-
-#: ../whois.c:267
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -61,7 +61,7 @@ msgstr ""
 "Forespørger efter IPv4-slutpunktet %s for en 6to4 IPv6-adresse.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, c-format
 msgid ""
 "\n"
@@ -72,7 +72,7 @@ msgstr ""
 "Forespørger efter IPv4-slutpunktet %s for en Teredo IPv6-adresse.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -81,7 +81,7 @@ msgstr ""
 "Forespørgelsesstreng: »%s«\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -94,16 +94,16 @@ msgstr ""
 "Fandt en henvisning til %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Kan ikke fortolke denne linje: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Advarsel: RIPE-flag brugt med en traditionel server."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -111,144 +111,191 @@ msgstr ""
 "Katastrofal fejl: Teksten for ansvarsfraskrivelse er blevet ændret.\n"
 "Opgrader venligst dette program.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "Vært %s er ikke fundet."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: Ukendt tjeneste"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Tidsudløb."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Afbrudt af signal %d ..."
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\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"
-"\n"
-"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
-"-l                     find the one level less specific match\n"
-"-L                     find all levels less specific matches\n"
-"-m                     find all one level more specific matches\n"
-"-M                     find all levels of more specific matches\n"
-"-c                     find the smallest match containing a mnt-irt "
-"attribute\n"
-"-x                     exact match\n"
-"-b                     return brief IP address ranges with abuse contact\n"
-"-B                     turn off object filtering (show email addresses)\n"
-"-G                     turn off grouping of associated objects\n"
-"-d                     return DNS reverse delegation objects too\n"
-"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
-"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
-"-K                     only primary keys are returned\n"
-"-r                     turn off recursive look-ups for contact information\n"
-"-R                     force to show local copy of the domain object even\n"
-"                       if it contains referral\n"
-"-a                     also search all the mirrored databases\n"
-"-s SOURCE[,SOURCE]...  search the database mirrored 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\n"
 msgstr ""
 "Brug: whois [TILVALG]... OBJEKT...\n"
 "\n"
 "-h VÆRT, --host VÆRT   forbind til server-VÆRT\n"
 "-p PORT, --port PORT   forbind til PORT\n"
+"-I                     forespørg whois.iana.org og følg henvisningen\n"
 "-H                     skjul juridisk ansvarsfraskrivelse\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
+"      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+"\n"
+msgstr ""
 "      --verbose        forklar hvad der sker\n"
 "      --help           vis denne hjælpetekst og afslut\n"
 "      --version        vis versionsinformation og afslut\n"
 "\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
+"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
+"-l                     find the one level less specific match\n"
+"-L                     find all levels less specific matches\n"
+"-m                     find all one level more specific matches\n"
+"-M                     find all levels of more specific matches\n"
+msgstr ""
+"Disse flag er understøttet af whois.ripe.net og nogle RIPE-lignende "
+"servere:\n"
 "-l                     et niveau mindre specifik opslag\n"
 "-L                     find alle mindre specifikke resultater\n"
 "-m                     find første niveau mere specifikke resultater\n"
 "-M                     find alle mere specifikke resultater\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
 "-c                     find det mindste resultat der indeholder attributten\n"
-"			mnt-irt\n"
+"                       mnt-irt\n"
 "-x                     præcis match\n"
-"-b                     returner korte IP-adresseintervaller med misbrugskontakt\n"
+"-b                     returner korte IP-adresseintervaller med "
+"misbrugskontakt\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
+"-B                     turn off object filtering (show email addresses)\n"
+"-G                     turn off grouping of associated objects\n"
+"-d                     return DNS reverse delegation objects too\n"
+msgstr ""
 "-B                     sluk for objektfiltrering (vis e-post-adresser)\n"
 "-G                     sluk for gruppering af associerede objekter\n"
 "-d                     returner også DNS-omvendte delegationsobjekter\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
+"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned\n"
+"-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
 "-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\n"
 "-r                     deaktiver omvendte opslag for kontaktinformation\n"
-"-R                     fremtving visning af lokal kopi af domæneobjektet selv\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     also search all the mirrored databases\n"
+"-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-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"
+"-g KILDE:FØRST-SIDST   find opdateringer fra KILDE fra seriel FØRST til "
+"SIDST\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
+"-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\n"
+msgstr ""
 "-t TYPE                anmod om skabelon for objekttypen TYPE\n"
 "-v TYPE                anmod om uddybende skabelon for objekttypen TYPE\n"
 "-q [version|kilder|typer]  forespørg angivet serverinfo\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "BSDI-udvidet DES-baseret Crypt(3)"
+
+#: ../mkpasswd.c:138
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "standard 56-bit DES-baseret Crypt(3)"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "Ugyldig metode »%s«\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Ugyldigt tal »%s«.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Prøv »%s --help« for yderligere information.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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:247
+#: ../mkpasswd.c:297
 #, 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:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Ugyldigt salt-tegn »%c«.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Adgangskode: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr "Metoden er ikke understøttet af crypt(3).\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -259,16 +306,33 @@ msgstr ""
 "Krypterer ADGANGSKODEN med crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TYPE     vælg metoden TYPE\n"
+"      -5                    som --method=md5crypt\n"
+"      -S, --salt=SALT       brug den angivne SALT\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -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"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -278,13 +342,6 @@ msgid ""
 "\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"
@@ -294,7 +351,7 @@ msgstr ""
 "\n"
 "Rapporter fejl til %s (på engelsk).\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, c-format
 msgid "Available methods:\n"
 msgstr "Tilgængelige metoder:\n"

po/de.po

@@ -1,15 +1,18 @@
 # Translation of whois to German
-# Copyright (C) 2001 Simon Richter <Simon.Richter@in.tum.de>, 2004 Adrian 
-# Bunk <bunk@fs.tum.de>, 2010, 2013 Chris Leick <c.leick@vollbio.de>.
+# Copyright (C) 2001 Simon Richter <Simon.Richter@in.tum.de>
+# Copyright (C) 2004 Adrian Bunk <bunk@fs.tum.de>
+# Copyright (C) 2010, 2013, 2019 Chris Leick <c.leick@vollbio.de>
+# Copyright (C) 2021 Helge Kreutzmann <debian@helgefjell.de>
+#
 # This file is distributed under the same license as the whois package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 5.0.24\n"
-"Report-Msgid-Bugs-To: whois@packages.debian.org\n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2013-04-27 21:32+0200\n"
-"Last-Translator: Chris Leick <c.leick@vollbio.de>\n"
+"Project-Id-Version: whois 5.5.11\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
+"PO-Revision-Date: 2022-01-12 12:11+0100\n"
+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -17,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../whois.c:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -28,32 +31,32 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler auf Englisch an %s.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Server %s wird benutzt.\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 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:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
 msgstr "Diese TLD hat keinen Whois-Server."
 
-#: ../whois.c:248
+#: ../whois.c:337
 msgid "No whois server is known for this kind of object."
 msgstr "Für diese Art von Objekten ist kein Whois-Server bekannt."
 
-#: ../whois.c:251
+#: ../whois.c:340
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr ""
 "Unbekannte AS-Nummer oder unbekanntes IP-Netzwerk. Bitte führen Sie ein "
 "Upgrade dieses Programms durch."
 
-#: ../whois.c:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Server %s wird benutzt.\n"
+
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -64,7 +67,7 @@ msgstr ""
 "Abfrage des IPv4-Endpunkts %s einer 6to4-IPv6-Adresse.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, c-format
 msgid ""
 "\n"
@@ -75,7 +78,7 @@ msgstr ""
 "Abfrage des IPv4-Endpunkts %s einer Teredo-IPv6-Adresse.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -84,7 +87,7 @@ msgstr ""
 "Abfragezeichenkette: »%s«\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -97,17 +100,17 @@ msgstr ""
 "Verweis auf %s gefunden.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Diese Zeile kann nicht ausgewertet werden: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Warnung: RIPE-Flags wurden mit einem »traditionellen« Server verwendet."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -115,174 +118,238 @@ msgstr ""
 "Katastrophaler Fehler: Haftungsausschlusstext wurde geändert.\n"
 "Bitte führen Sie ein Upgrade dieses Programms durch.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s nicht gefunden."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: unbekannter Dienst"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Zeitüberschreitung"
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Durch Signal %d unterbrochen …"
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\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"
-"\n"
-"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
-"-l                     find the one level less specific match\n"
-"-L                     find all levels less specific matches\n"
-"-m                     find all one level more specific matches\n"
-"-M                     find all levels of more specific matches\n"
-"-c                     find the smallest match containing a mnt-irt "
-"attribute\n"
-"-x                     exact match\n"
-"-b                     return brief IP address ranges with abuse contact\n"
-"-B                     turn off object filtering (show email addresses)\n"
-"-G                     turn off grouping of associated objects\n"
-"-d                     return DNS reverse delegation objects too\n"
-"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
-"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
-"-K                     only primary keys are returned\n"
-"-r                     turn off recursive look-ups for contact information\n"
-"-R                     force to show local copy of the domain object even\n"
-"                       if it contains referral\n"
-"-a                     also search all the mirrored databases\n"
-"-s SOURCE[,SOURCE]...  search the database mirrored 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\n"
 msgstr ""
 "Aufruf: whois [OPTION] … OBJEKT …\n"
 "\n"
 "-h HOST, --host HOST   verbindet sich mit Server HOST.\n"
 "-p PORT, --port PORT   verbindet sich mit PORT.\n"
+"-I                     fragt whois.iana.org ab und folgt dessen Verweis.\n"
 "-H                     versteckt Haftungsausschlussklauseln.\n"
+
+#: ../whois.c:1506
+#, c-format
+msgid ""
+"      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+"\n"
+msgstr ""
 "      --verbose        erklärt, was getan wird.\n"
+"      --no-recursion   deaktiviert Rekursion vom Register zu Registrar-Servern\n"
 "      --help           zeigt diese Hilfe und beendet sich.\n"
 "      --version        gibt Versionsinformationen aus und beendet sich.\n"
 "\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
+"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
+"-l                     find the one level less specific match\n"
+"-L                     find all levels less specific matches\n"
+"-m                     find all one level more specific matches\n"
+"-M                     find all levels of more specific matches\n"
+msgstr ""
 "Diese Schalter werden von whois.ripe.net und einigen RIPE ähnlichen Servern\n"
 "unterstützt:\n"
-"-l                     sucht den um eine Stufe weniger spezifischen Treffer.\n"
+"-l                     sucht den um eine Stufe weniger spezifischen "
+"Treffer.\n"
 "-L                     sucht alle Stufen weniger spezifischer Treffer.\n"
 "-m                     sucht alle um eine Stufe spezifischeren Treffer.\n"
 "-M                     sucht alle Stufen der spezifischeren Treffer.\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
 "-c                     sucht die kleinste Übereinstimmung eines\n"
 "                       »mnt-irt«-Attributs.\n"
 "-x                     exakte Übereinstimmung\n"
 "-b                     gibt einen kurzen IP-Adressbereich mit "
 "Beschwerdekontakt\n"
 "                       zurück.\n"
-"-B                     schaltet die Objektfilterung aus (zeigt "
-"E-Mail-Adressen)\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
+"-B                     turn off object filtering (show email addresses)\n"
+"-G                     turn off grouping of associated objects\n"
+"-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-B                     schaltet die Objektfilterung aus (zeigt E-Mail-"
+"Adressen)\n"
 "-G                     schaltet die Gruppierung verbundener Objekte aus.\n"
 "-d                     gibt auch DNS-Reverse-Delegation-Objekte zurück.\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
+"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned\n"
+"-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
 "-i ATTR[,ATTR] …       schlägt angegebene ATTRibute in umgekehrter Richtung\n"
 "                       nach.\n"
 "-T TYP[,TYP] …         beachtet nur Objekte dieses TYPs.\n"
 "-K                     gibt nur Primärschlüssel zurück.\n"
 "-r                     schaltet das rekursive Nachschlagen von\n"
 "                       Kontaktinformationen aus.\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     also search all the mirrored databases\n"
+"-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
 "-R                     erzwingt die Anzeige einer lokalen Kopie des\n"
-"                       Domain-Objekts, selbst wenn es einen Verweis enthält.\n"
+"                       Domain-Objekts, selbst wenn es einen Verweis "
+"enthält.\n"
 "-a                     durchsucht auch die gespiegelten Datenbanken.\n"
 "-s QUELLE[,QUELLE] …   durchsucht die von QUELLE gespiegelte Datenbank.\n"
 "-g QUELLE:ANFANG-ENDE  sucht Aktualisierungen der QUELLE aufeinanderfolgend "
 "von\n"
 "                       ANFANG bis ENDE\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
+"-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\n"
+msgstr ""
 "-t TYP                 fragt die Schablone des Objekts des TYPs ab.\n"
 "-v TYP                 fragt die Schablone des Objekts des TYPs ausführlich "
 "ab.\n"
 "-q [version|sources|types]  fragt die angegebene Server-Information ab.\n"
 
-#: ../mkpasswd.c:84
+# https://en.wikipedia.org/wiki/Crypt_%28C%29#BSDi_extended_DES-based_scheme
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "BSDi-erweitertes DES-basiertes Crypt(3)"
+
+#: ../mkpasswd.c:138
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "Standard-56-Bit-DES-basiertes Crypt(3)"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "Ungültige Methode »%s«\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Falsche Nummer »%s«.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Versuchen Sie »%s --help«, um weitere Informationen zu erhalten.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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 Byte, aber %d wurden erwartet.\n"
 
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:297
 #, 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 Byte, aber %d <= n <= %d wurden erwartet.\n"
 
-#: ../mkpasswd.c:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Illegales Salt-Zeichen »%c«.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr "Methode nicht von »crypt(3)« unterstützt.\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 "Crypts the PASSWORD using crypt(3).\n"
 "\n"
 msgstr ""
-"Aufruf: mkpasswd [OPTIONEN] ... [PASSWORT] [SALT]]\n"
+"Aufruf: mkpasswd [OPTIONEN]... [PASSWORT] [SALT]]\n"
 "Verschlüsselt das PASSWORT mit »crypt(3)«.\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TYP      wählt die Methode TYP aus.\n"
+"      -5                    wie --method=md5crypt\n"
+"      -S, --salt=SALT       benutzt angegebenes SALT.\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -R, --rounds=ANZAHL   benutzt angegebene ANZAHL von Runden.\n"
+"      -P, --password-fd=NUM liest das Passwort vom Dateideskriptor NUM "
+"anstatt\n"
+"                            von /dev/tty\n"
+"      -s, --stdin           wie --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -292,16 +359,9 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -m, --method=TYP      wählt die Methode TYP aus.\n"
-"      -5                    wie --method=md5\n"
-"      -S, --salt=SALT       benutzt angegebenes SALT.\n"
-"      -R, --rounds=ANZAHL   benutzt angegebene ANZAHL von Runden.\n"
-"      -P, --password-fd=NUM liest das Passwort vom Dateideskriptor NUM "
-"anstatt\n"
-"                            von /dev/tty\n"
-"      -s, --stdin           wie --password-fd=0\n"
 "      -h, --help            zeigt diese Hilfe an und beendet sich.\n"
-"      -V, --version         zeigt Versionsinformationen an und beendet sich.\n"
+"      -V, --version         zeigt Versionsinformationen an und beendet "
+"sich.\n"
 "\n"
 "Falls das PASSWORT fehlt, wird es interaktiv erfragt.\n"
 "Falls SALT nicht angegeben wurde, wird ein zufälliges erzeugt.\n"
@@ -309,7 +369,7 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler auf Englisch an %s.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, c-format
 msgid "Available methods:\n"
 msgstr "Verfügbare Methoden:\n"

po/el.po

@@ -6,17 +6,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.6.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
 "PO-Revision-Date: 2003-12-10 08:51+0200\n"
-"Last-Translator: Velonis Petros <velonis@freemail.gr>\n"
-"Language-Team: Greek <velonis@freemail.gr>\n"
+"Last-Translator: Velonis Petros\n"
+"Language-Team: \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:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -27,33 +27,33 @@ msgstr ""
 "\n"
 "Αναφέρατε σφάλματα στο %s.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Αυτό το TLD δεν έχει εξυπηρετητή whois, ωστόσο μπορείτε να προσπελάσετε την "
 "βάση whois στο"
 
-#: ../whois.c:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
 msgstr "Αυτό το TLD δεν έχει εξυπηρετητή whois."
 
-#: ../whois.c:248
+#: ../whois.c:337
 msgid "No whois server is known for this kind of object."
 msgstr ""
 "Κανένας εξυπηρετητής whois δεν είναι γνωστός για αυτού του είδους το "
 "αντικείμενο."
 
-#: ../whois.c:251
+#: ../whois.c:340
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr ""
 "Άγνωστος αριθμός AS ή IP δικτύου. Παρακαλώ αναβαθμίστε αυτό το πρόγραμμα."
 
-#: ../whois.c:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Γίνεται χρήση του εξυπηρετητή %s.\n"
+
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -75,7 +75,7 @@ msgstr ""
 "Άντληση πληροφοριών για το σημείο τέλους IPv4 %s μιας διεύθυνσης 6to4 IPv6.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -84,7 +84,7 @@ msgstr ""
 "Αλφαριθμητικό ερώτησης: \"%s\"\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -97,18 +97,18 @@ msgstr ""
 "Βρέθηκε αναφορά στο %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Αδύνατη η ανάλυση αυτής της γραμμής: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Προειδοποίηση: Η σημαίες του RIPE χρησιμοποιούνται σε έναν παραδοσιακό "
 "εξυπηρετητή."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -116,113 +116,193 @@ msgstr ""
 "Καταστροφικό σφάλμα: το κείμενο της αποποίησης ευθυνών έχει τροποποιηθεί.\n"
 "Παρακαλώ αναβαθμίστε το πρόγραμμα.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "Το σύστημα %s δε βρέθηκε."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: άγνωστη υπηρεσία"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Διάλειμμα."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Διακοπή από το σήμα %d..."
 
-#: ../whois.c:1189
-#, c-format
+#: ../whois.c:1499
+#, fuzzy, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
 "-H                     hide legal disclaimers\n"
+msgstr ""
+"Χρήση: whois [ΕΠΙΛΟΓΕΣ]... ΑΝΤΙΚΕΙΜΕΝΟ...\n"
+"\n"
+"-h ΣΥΣΤΗΜΑ   σύνδεση στον εξυπηρετητή ΣΎΣΤΗΜΑ\n"
+"-p ΘΥΡΑ            σύνδεση στη ΘΥΡΑ\n"
+"-H                       απόκρυψη του νομικού εγγράφου αποποίησης ευθύνης\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
 "      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 "\n"
+msgstr ""
+"     --verbose      εξήγηση του τί συμβαίνει\n"
+"     --help             εμφάνιση αυτής της βοήθειας και έξοδος\n"
+"     --version        εμφάνιση της έκδοσης και έξοδος\n"
+
+#: ../whois.c:1513
+#, fuzzy, c-format
+msgid ""
 "These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
 "-l                     find the one level less specific match\n"
 "-L                     find all levels less specific matches\n"
 "-m                     find all one level more specific matches\n"
 "-M                     find all levels of more specific matches\n"
+msgstr ""
+"-l                     ένα επίπεδο λιγότερο συγκεκριμένη αναζήτηση [μόνο "
+"RPSL]\n"
+"-L                     εύρεση όλων των Λιγότερο συγκεκριμένων ταιριασμάτων\n"
+"-m                     εύρεση όλων των πρώτου επιπέδου περισσότερο "
+"συγκεκριμένων ταιριασμάτων\n"
+"-M                     εύρεση όλων των Περισσότερο συγκεκριμένων "
+"ταιριασμάτων\n"
+
+#: ../whois.c:1520
+#, fuzzy, c-format
+msgid ""
 "-c                     find the smallest match containing a mnt-irt "
 "attribute\n"
 "-x                     exact match\n"
 "-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
+"-c                     εύρεση του μικρότερου ταιριάσματος που να περιέχει "
+"μια ένα χαρακτηριστικό mnt-irt \n"
+"-x                     ακριβές ταίριασμα\n"
+
+#: ../whois.c:1525
+#, fuzzy, c-format
+msgid ""
 "-B                     turn off object filtering (show email addresses)\n"
 "-G                     turn off grouping of associated objects\n"
 "-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-d                     επιστροφή και των αντίστροφων αντικειμένων DNS [μόνο "
+"RPSL]\n"
+
+#: ../whois.c:1530
+#, fuzzy, c-format
+msgid ""
 "-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
 "-T TYPE[,TYPE]...      only look for objects of TYPE\n"
 "-K                     only primary keys are returned\n"
 "-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-i ΧΑΡΑΚ[,ΧΑΡΑΚ]...    να γίνει μια αντίστροφη αναζήτηση για τα καθορισμένα "
+"ΧΑΡΑΚτηριστικά\n"
+"-T ΕΙΔΟΣ[,ΕΊΔΟΣ]...    αναζήτηση μόνο αντικειμένου του ΕΙΔΟΥΣ\n"
+"-K                     επιστροφή μόνο των πρωταρχικών κλειδιών [μόνο RPSL]\n"
+"-r                     απενεργοποίηση των αναδρομικών αναζητήσεων  για "
+"πληροφορίες επικοινωνίας\n"
+
+#: ../whois.c:1536
+#, fuzzy, c-format
+msgid ""
 "-R                     force to show local copy of the domain object even\n"
 "                       if it contains referral\n"
 "-a                     also search all the mirrored databases\n"
 "-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
 "-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     επιβολή εμφάνισης τοπικού αντιγράφου του αντικειμένου "
+"επιθήματος ακόμα και αν περιέχει αναφορές\n"
+"-a                     αναζήτηση σε όλες τις βάσεις δεδομένων\n"
+"-s ΠΗΓΗ[,ΠΗΓΉ]...      αναζήτηση της βάσης δεδομένων από την ΠΗΓΗ\n"
+"-g ΠΗΓΗ:ΠΡΩΤΟ:ΤΕΛΕΥΤΑΙΟ   εμφάνιση αναβαθμίσεων από την ΠΗΓΗ από το σειριακό "
+"ΠΡΏΤΟ ως ΤΕΛΕΥΤΑΙΟ\n"
+
+#: ../whois.c:1543
+#, fuzzy, c-format
+msgid ""
 "-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\n"
 msgstr ""
+"-t ΕΙΔΟΣ               αναζήτηση προτύπου για το αντικείμενο του ΕΊΔΟΥΣ "
+"('all' για εμφάνιση λίστας)\n"
+"-v ΕΙΔΟΣ               αναζήτηση περιφραστικού προτύπου για το αντικείμενο "
+"του ΕΙΔΟΥΣ\n"
+"-q [έκδοση|πηγές|τύποι]  συγκεκριμένο ερώτημα πληροφοριών εξυπηρετητή [μόνο "
+"RPSL]\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+#, fuzzy
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "\tκαθεριερωμένη 56 bit με βάση το DES crypt(3)"
+
+#: ../mkpasswd.c:138
 #, fuzzy
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\tκαθεριερωμένη 56 bit με βάση το DES crypt(3)"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, fuzzy, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "Μη αποδεκτό νούμερο '%s'.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Μη αποδεκτό νούμερο '%s'.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Προσπάθησε '%s --help' για περισσότερες πληροφορίες.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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:247
+#: ../mkpasswd.c:297
 #, 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:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Μη αποδεκτός χαρακτήρας salt  '%c'.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Συνθηματικό: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr ""
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -233,16 +313,30 @@ msgstr ""
 "Κρυπτογραφεί το ΣΥΝΘΗΜΑΤΙΚΟ χρησιμοποιώντας το crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, fuzzy, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr "      -S, --salt=SALT       χρήση του συγκεκριμένου SALT\n"
+
+#: ../mkpasswd.c:505
+#, fuzzy, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -P, --password-fd=NUM ανάγνωση του συνθηματικού από αρχείο περιγραφής "
+"NUM\n"
+"                            αντί από το /dev/tty\n"
+"      -s, --stdin           σαν το --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, fuzzy, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -252,12 +346,6 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -H, --hash=ΤΥΠΟΣ       επιλογή hash ΤΥΠΟΣ\n"
-"      -S, --salt=SALT       χρήση του συγκεκριμένου SALT\n"
-"      -P, --password-fd=NUM ανάγνωση του συνθηματικού από αρχείο περιγραφής "
-"NUM\n"
-"                            αντί από το /dev/tty\n"
-"      -s, --stdin           σαν το --password-fd=0\n"
 "      -h, --help            εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "      -V, --version         εμφάνιση πληροφοριών έκδοσης και έξοδος\n"
 "\n"
@@ -267,90 +355,11 @@ msgstr ""
 "\n"
 "Αναφέρατε σφάλματα στο %s.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, fuzzy, c-format
 msgid "Available methods:\n"
 msgstr "Διαθέσιμοι αλγόριθμοι:\n"
 
-#, fuzzy
-#~ 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 ""
-#~ "Χρήση: whois [ΕΠΙΛΟΓΕΣ]... ΑΝΤΙΚΕΙΜΕΝΟ...\n"
-#~ "\n"
-#~ "-l                     ένα επίπεδο λιγότερο συγκεκριμένη αναζήτηση [μόνο "
-#~ "RPSL]\n"
-#~ "-L                    εύρεση όλων των Λιγότερο συγκεκριμένων "
-#~ "ταιριασμάτων\n"
-#~ "-m                   εύρεση όλων των πρώτου επιπέδου περισσότερο "
-#~ "συγκεκριμένων ταιριασμάτων\n"
-#~ "-M                   εύρεση όλων των Περισσότερο συγκεκριμένων "
-#~ "ταιριασμάτων\n"
-#~ "-c                     εύρεση του μικρότερου ταιριάσματος που να περιέχει "
-#~ "μια ένα χαρακτηριστικό mnt-irt \n"
-#~ "-x                     ακριβές ταίριασμα [μόνο RPSL]\n"
-#~ "-d                     επιστροφή και των αντίστροφων αντικειμένων DNS "
-#~ "[μόνο RPSL]\n"
-#~ "-i ΧΑΡΑΚ[,ΧΑΡΑΚ]...    να γίνει μια αντίστροφη αναζήτηση για τα "
-#~ "καθορισμένα ΧΑΡΑΚτηριστικά\n"
-#~ "-T ΕΙΔΟΣ[,ΕΊΔΟΣ]...    αναζήτηση μόνο αντικειμένου του ΕΙΔΟΥΣ\n"
-#~ "-K                    επιστροφή μόνο των πρωταρχικών κλειδιών [μόνο "
-#~ "RPSL]\n"
-#~ "-r                     απενεργοποίηση των αναδρομικών αναζητήσεων  για "
-#~ "πληροφορίες επικοινωνίας\n"
-#~ "-R                    επιβολή εμφάνισης τοπικού αντιγράφου του "
-#~ "αντικειμένου επιθήματος ακόμα και αν περιέχει αναφορές\n"
-#~ "-a                     αναζήτηση σε όλες τις βάσεις δεδομένων\n"
-#~ "-s ΠΗΓΗ[,ΠΗΓΉ]...      αναζήτηση της βάσης δεδομένων από την ΠΗΓΗ\n"
-#~ "-g ΠΗΓΗ:ΠΡΩΤΟ:ΤΕΛΕΥΤΑΙΟ   εμφάνιση αναβαθμίσεων από την ΠΗΓΗ από το "
-#~ "σειριακό ΠΡΏΤΟ ως ΤΕΛΕΥΤΑΙΟ\n"
-#~ "-t ΕΙΔΟΣ                αναζήτηση προτύπου για το αντικείμενο του ΕΊΔΟΥΣ "
-#~ "('all' για εμφάνιση λίστας)\n"
-#~ "-v ΕΙΔΟΣ               αναζήτηση περιφραστικού προτύπου για το "
-#~ "αντικείμενο του ΕΙΔΟΥΣ\n"
-#~ "-q [έκδοση|πηγές|τύποι]  συγκεκριμένο ερώτημα πληροφοριών εξυπηρετητή "
-#~ "[μόνο RPSL]\n"
-#~ "-F                       γρήγορη ακατέργαστη έξοδος (υπονοεί -r)\n"
-#~ "-h ΣΥΣΤΗΜΑ   σύνδεση στον εξυπηρετητή ΣΎΣΤΗΜΑ\n"
-#~ "-p ΘΥΡΑ            σύνδεση στη ΘΥΡΑ\n"
-#~ "-H                       απόκρυψη του νομικού εγγράφου αποποίησης "
-#~ "ευθύνης\n"
-#~ "     --verbose      εξήγηση του τί συμβαίνει\n"
-#~ "     --help             εμφάνιση αυτής της βοήθειας και έξοδος\n"
-#~ "     --version        εμφάνιση της έκδοσης και έξοδος\n"
-
 #~ msgid "Illegal password character '0x%hhx'.\n"
 #~ msgstr "Μη αποδεκτός χαρακτήρας συνθηματικού '0x%hhx'.\n"
 

po/es.po

@@ -8,7 +8,7 @@
 #
 #   - Updates
 #       Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2010
-#       Matías A. Bellone <matiasbellone+debian@gmail.com>, 2014
+#       Matías A. Bellone <matiasbellone+debian@gmail.com>, 2014, 2019
 #
 # Traductores, si no conocen el formato PO, merece la pena leer la
 # documentación de gettext, especialmente las secciones dedicadas a este
@@ -20,20 +20,20 @@
 # los siguientes documentos:
 #
 #   - El proyecto de traducción de Debian al español
-#     http://www.debian.org/intl/spanish/
+#     https://www.debian.org/intl/spanish/
 #     especialmente las notas y normas de traducción en
-#     http://www.debian.org/intl/spanish/notas
+#     https://www.debian.org/intl/spanish/notas
 #
 #   - La guía de traducción de po's de debconf:
 #     /usr/share/doc/po-debconf/README-trans
-#     o http://www.debian.org/intl/l10n/po-debconf/README-trans
+#     o https://www.debian.org/intl/l10n/po-debconf/README-trans
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 5.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2014-07-11 20:40-0300\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
+"PO-Revision-Date: 2019-07-02 02:30-0300\n"
 "Last-Translator: Matías A. Bellone <matiasbellone+debian@gmail.com>\n"
 "Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "Language: es\n"
@@ -42,7 +42,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../whois.c:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -53,30 +53,30 @@ msgstr ""
 "\n"
 "Informar de fallos a %s.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Usando el servidor %s.\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 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"
 
-#: ../whois.c:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
 msgstr "Este TLD no dispone de servidor whois."
 
-#: ../whois.c:248
+#: ../whois.c:337
 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:251
+#: ../whois.c:340
 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:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Usando el servidor %s.\n"
+
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -87,7 +87,7 @@ msgstr ""
 "Consultando el punto final IPv4 de %s de una dirección IPv6 6a4.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, c-format
 msgid ""
 "\n"
@@ -98,7 +98,7 @@ msgstr ""
 "Consultando el punto final IPv4 de %s de una dirección IPv6 Teredo.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -107,7 +107,7 @@ msgstr ""
 "Cadena de la consulta: «%s»\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -120,16 +120,16 @@ msgstr ""
 "Se ha encontrado una referencia a %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "No se pudo procesar esta línea: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Atención: Se han usado opciones de RIPE con un servidor tradicional."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -137,126 +137,171 @@ msgstr ""
 "Error catastrófico: el texto de las condiciones de uso ha sido cambiado.\n"
 "Por favor, actualice este programa.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "No se ha encontrado el servidor %s."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servicio desconocido"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Se ha agotado el tiempo de espera."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrumpido por la señal %d..."
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\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"
-"\n"
-"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
-"-l                     find the one level less specific match\n"
-"-L                     find all levels less specific matches\n"
-"-m                     find all one level more specific matches\n"
-"-M                     find all levels of more specific matches\n"
-"-c                     find the smallest match containing a mnt-irt "
-"attribute\n"
-"-x                     exact match\n"
-"-b                     return brief IP address ranges with abuse contact\n"
-"-B                     turn off object filtering (show email addresses)\n"
-"-G                     turn off grouping of associated objects\n"
-"-d                     return DNS reverse delegation objects too\n"
-"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
-"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
-"-K                     only primary keys are returned\n"
-"-r                     turn off recursive look-ups for contact information\n"
-"-R                     force to show local copy of the domain object even\n"
-"                       if it contains referral\n"
-"-a                     also search all the mirrored databases\n"
-"-s SOURCE[,SOURCE]...  search the database mirrored 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\n"
 msgstr ""
 "Utilización: whois [OPCION]... OBJETO...\n"
 "\n"
 "-h EQUIPO, --host EQUIPO  conectar con el servidor EQUIPO\n"
 "-p PUERTO, --port PUERTO  conectar al PUERTO\n"
+"-I                     consultar whois.iana.org y seguir su redirección\n"
 "-H                     no mostrar avisos legales\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
+"      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+"\n"
+msgstr ""
 "      --verbose        mostrar lo que está haciendo\n"
 "      --help           mostrar este mensaje de ayuda y finalizar\n"
 "      --version        mostrar información de la versión y finalizar\n"
 "\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
+"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
+"-l                     find the one level less specific match\n"
+"-L                     find all levels less specific matches\n"
+"-m                     find all one level more specific matches\n"
+"-M                     find all levels of more specific matches\n"
+msgstr ""
 "Estas opciones son compatibles con whois.ripe.net y algunos servidores\n"
 "similares a RIPE:\n"
 "-l                     buscar la coincidencia un nivel menos específica\n"
 "-L                     buscar coincidencias de niveles menos específicos\n"
 "-m                     buscar coincidencias del primer nivel más específico\n"
 "-M                     buscar coincidencias de niveles más específicos\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
 "-c                     buscar la coincidencia más pequeña que contenga\n"
 "                       un atributo «mnt-irt»\n"
 "-x                     coincidencia exacta\n"
 "-b                     mostrar rangos IP breves y contacto en caso de abuso\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
+"-B                     turn off object filtering (show email addresses)\n"
+"-G                     turn off grouping of associated objects\n"
+"-d                     return DNS reverse delegation objects too\n"
+msgstr ""
 "-B                     no filtrar objetos (mostrar direcciones de correo)\n"
 "-G                     no agrupar objetos asociados\n"
 "-d                     mostrar objetos de delegación de DNS reverso también\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
+"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned\n"
+"-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
 "-i ATRIB[,ATRIB]...    búsqueda inversa del ATRIButo indicado\n"
 "-T TIPO[,TIPO]...      sólo buscar objetos del TIPO indicado\n"
 "-K                     mostrar sólo claves primarias\n"
 "-r                     no buscar información de contacto de forma recursiva\n"
-"-R                     mostrar la copia local del objeto del dominio incluso\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     also search all the mirrored databases\n"
+"-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     mostrar la copia local del objeto del dominio "
+"incluso\n"
 "                       si contiene una referencia\n"
-"-a                     buscar también en todas las réplicas de base de datos\n"
+"-a                     buscar también en todas las réplicas de base de "
+"datos\n"
 "-s ORIGEN[,ORIGEN]...  buscar en la base de datos replicada desde ORIGEN\n"
 "-g ORIGEN:PRIMERO-ÚLTIMO  buscar actualizaciones desde ORIGEN en la serie\n"
 "                          PRIMERO a ÚLTIMO\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
+"-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\n"
+msgstr ""
 "-t TIPO                solicitar plantilla para el objeto del TIPO indicado\n"
-"-v TIPO                solicitar plantilla detallada para el objeto del TIPO\n"
+"-v TIPO                solicitar plantilla detallada para el objeto del "
+"TIPO\n"
 "                        indicado\n"
 "-q [versión|orígenes|tipos]  consultar información con el servidor indicado\n"
 
-#: ../mkpasswd.c:84
-msgid "standard 56 bit DES-based crypt(3)"
-msgstr "crypt(3) basado en DES de 56 bits"
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "crypt(3) extendido BSDI basado en DES"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:138
+msgid "standard 56 bit DES-based crypt(3)"
+msgstr "crypt(3) estándar basado en DES de 56 bits"
+
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "Método «%s» inválido.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "El número «%s» no es válido.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Pruebe «%s --help» para más información.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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 de sal («salt») incorrecta: %d byte en lugar de %d.\n"
 msgstr[1] "Longitud de sal («salt») incorrecta: %d bytes en lugar de %d.\n"
 
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:297
 #, 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"
@@ -265,22 +310,22 @@ msgstr[0] ""
 msgstr[1] ""
 "Longitud del «salt» incorrecta: %d bytes cuando se esperaba %d <= n <= %d.\n"
 
-#: ../mkpasswd.c:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "El carácter «%c» no es válido en el «salt».\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Contraseña: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr "crypt(3) no admite este método.\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -291,16 +336,33 @@ msgstr ""
 "Cifra la CONTRASEÑA utilizando crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TIPO     selecciona el TIPO de método\n"
+"      -5                    igual que --method=md5crypt\n"
+"      -S, --salt=SALT       usa el SALT indicado\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -R, --rounds=NÚMERO   usa el NÚMERO indicado de rondas\n"
+"      -P, --password-fd=NUM lee la contraseña del descriptor de archivo NUM\n"
+"                            en lugar de «/dev/tty»\n"
+"      -s, --stdin           igual que --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -310,13 +372,6 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -m, --method=TIPO     selecciona el TIPO de método\n"
-"      -5                    igual que --method=md5\n"
-"      -S, --salt=SALT       usa el SALT indicado\n"
-"      -R, --rounds=NÚMERO   usa el NÚMERO indicado de rondas\n"
-"      -P, --password-fd=NUM lee la contraseña del descriptor de archivo NUM\n"
-"                            en lugar de «/dev/tty»\n"
-"      -s, --stdin           igual que --password-fd=0\n"
 "      -h, --help            muestra este mensaje de ayuda y finaliza\n"
 "      -V, --version         muestra la información de la versión y finaliza\n"
 "\n"
@@ -326,7 +381,7 @@ msgstr ""
 "\n"
 "Informar de fallos a %s.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, c-format
 msgid "Available methods:\n"
 msgstr "Métodos disponibles:\n"

po/eu.po

@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.5.29\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
 "PO-Revision-Date: 2002-08-24 16:22+0200\n"
 "Last-Translator: Aitor Ibaez <aitiba@gmail.com>\n"
-"Language-Team: Euskara <Librezale@librezale.org>\n"
+"Language-Team: \n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../whois.c:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -27,31 +27,31 @@ msgstr ""
 "\n"
 "Bug berri baten jakinarazpena: %s.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "%s zerbitzaria erabiltzen.\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 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:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
 msgstr "TLD honek ez du whois zerbitzaririk."
 
-#: ../whois.c:248
+#: ../whois.c:337
 msgid "No whois server is known for this kind of object."
 msgstr "Objetu mota horrentzako, ez da whois zerbitzaririk ezagutzen."
 
-#: ../whois.c:251
+#: ../whois.c:340
 #, fuzzy
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "AS zenbaki edo IP sarea ezezaguna. Mesedez, programa eguneratu."
 
-#: ../whois.c:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "%s zerbitzaria erabiltzen.\n"
+
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -62,7 +62,7 @@ msgstr ""
 "Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -73,7 +73,7 @@ msgstr ""
 "Kontsula 6to4 IPv6 helbidean dagoen %s IPv4 endpoint-entzat.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
 "Kontsulta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -94,17 +94,17 @@ msgstr ""
 "$s-ra erreferentzia aurkituta.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Lerro hau, %s , ezin da prozesatu."
 
-#: ../whois.c:516
+#: ../whois.c:650
 #, fuzzy
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Oharra: RIPE flags-ak ohiko zerbitzariengatik ezikusiak izaten dira."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,113 +112,183 @@ msgstr ""
 "Hondamen arriskua: erabilpen balditzen textua aldatu egin da.\n"
 "Programa eguneratu.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "%s Host-a ez da aurkitu."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: zerbitzu ezezaguna"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Denbora muga."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "%d seinalearengatik etena..."
 
-#: ../whois.c:1189
-#, c-format
+#: ../whois.c:1499
+#, fuzzy, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
 "-H                     hide legal disclaimers\n"
+msgstr ""
+"Erabilpena: whois [AUKERAK]... OBJETUA...\n"
+"\n"
+"-h HOST            HOST zerbitzarira konektatzen da\n"
+"-p PORTUA          PORTUA konektatzen du\n"
+"-H                 abisu-legala ezkutatzen du\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
 "      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 "\n"
+msgstr ""
+"      --verbose    egiten ari dena bakarrik, eraskusten du\n"
+"      --help       laguntza pantaila hau erakusten du eta amaitzen du\n"
+"      --version    programaren bertsioa erakusten du eta amaitzen du\n"
+
+#: ../whois.c:1513
+#, fuzzy, c-format
+msgid ""
 "These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
 "-l                     find the one level less specific match\n"
 "-L                     find all levels less specific matches\n"
 "-m                     find all one level more specific matches\n"
 "-M                     find all levels of more specific matches\n"
+msgstr ""
+"-l                 adierazitako [RPSL] bilaketarentzat, maila bat jeisten "
+"du\n"
+"-L                 mapeketa gutxien espezifikoenak bilatzen ditu\n"
+"-M                 mapeketa espezifikoenak bilatzen ditu\n"
+"-m                 lehen maila espezifikoena bilatzen du\n"
+
+#: ../whois.c:1520
+#, fuzzy, c-format
+msgid ""
 "-c                     find the smallest match containing a mnt-irt "
 "attribute\n"
 "-x                     exact match\n"
 "-b                     return brief IP address ranges with abuse contact\n"
+msgstr "-x                 bilaketa zehatza\n"
+
+#: ../whois.c:1525
+#, fuzzy, c-format
+msgid ""
 "-B                     turn off object filtering (show email addresses)\n"
 "-G                     turn off grouping of associated objects\n"
 "-d                     return DNS reverse delegation objects too\n"
+msgstr "-d                 alderantizko DNSaren ordezkaritza itzultzen du\n"
+
+#: ../whois.c:1530
+#, fuzzy, c-format
+msgid ""
 "-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
 "-T TYPE[,TYPE]...      only look for objects of TYPE\n"
 "-K                     only primary keys are returned\n"
 "-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-i ATTR[,ATTR]...  adierazitako ATTRibute-arentzat alderantzizko bilaketa "
+"egin du\n"
+"-T TIPO[,TIPO]...  TIPO objektu motak bakarrik bilatzen ditu\n"
+"-K                 oinarrizko-gakoak bakarrik\n"
+"-r                 alderantzizko bilaketa ezgaitzen du\n"
+
+#: ../whois.c:1536
+#, fuzzy, c-format
+msgid ""
 "-R                     force to show local copy of the domain object even\n"
 "                       if it contains referral\n"
 "-a                     also search all the mirrored databases\n"
 "-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
 "-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                 Objektu zehatzaren kopia lokala eraskuten du,\n"
+"                    erreferentzia bat eduki ere\n"
+"-a                 data base guztietan bilatzen du\n"
+"-s SOURCE[,SOURCE]...  SOURCE data basea bilatzen du\n"
+"-g SOURCE:HASIERA-BUKAERA  H eta B tarteko serietan,SOURCE-ren agerraldiak "
+"bilatzen ditu\n"
+
+#: ../whois.c:1543
+#, fuzzy, c-format
+msgid ""
 "-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\n"
 msgstr ""
+"-t TIPO        TIPO objektu mota batentzako, txantiloiak                "
+"lortzen ditu ('all' lista batentzako)\n"
+"-v TIPO            TIPO objektu baten txantiloi zehatza lortzen du\n"
+"-q [bertsioa|sources]  zerbitzariaren informazioa kontsultatzen du\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+#, fuzzy
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "56 bits-etako DESan oinarritutako \tcrypt(3)-a"
+
+#: ../mkpasswd.c:138
 #, fuzzy
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "56 bits-etako DESan oinarritutako \tcrypt(3)-a"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, fuzzy, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "'%s' zenbakia ez da baliozkoa.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "'%s' zenbakia ez da baliozkoa.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "%s --help informazio gehiagorako.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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:247
+#: ../mkpasswd.c:297
 #, 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:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "'%c' karakterea, hazian, ilegala da.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Pasahitza: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr ""
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -229,16 +299,32 @@ msgstr ""
 "PASAHITZA crypt(3) erabiliz enkriptatu.\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, fuzzy, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -H, --hash=MOTA       Hash MOTA funtzioa aukeratu\n"
+"      -S, --salt=HAZI       HAZI egokia erabili\n"
+
+#: ../mkpasswd.c:505
+#, fuzzy, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -P, --password-fd=NUM /dev/tty-ak irakurri ordez, NUM deskriptore-"
+"gakoa irakurtzen du\n"
+"      -s, --stdin           /dev/tty-ak irakurri ordez, stdin-gakoa "
+"irakurtzen du\n"
+
+#: ../mkpasswd.c:511
+#, fuzzy, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -248,14 +334,8 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -H, --hash=MOTA       Hash MOTA funtzioa aukeratu\n"
-"      -S, --salt=HAZI    HAZI egokia erabili\n"
-"      -P, --password-fd=NUM   /dev/tty-ak irakurri ordez, NUM deskriptore-"
-"gakoa irakurtzen du\n"
-"      -s, --stdin           /dev/tty-ak irakurri ordez, stdin-gakoa "
-"irakurtzen du\n"
-"      -h, --help           laguntza pantaila erakusten du\n"
-"      -v, --version        programaren bertsioa erakusten du\n"
+"      -h, --help            laguntza pantaila erakusten du\n"
+"      -v, --version         programaren bertsioa erakusten du\n"
 "\n"
 "GAKOA zehazten ez bada, modu interaktiboan eskatuko da.\n"
 "HAZIa zehazten ez bada, aleatorioki bat sortuko da.\n"
@@ -263,83 +343,11 @@ msgstr ""
 "\n"
 "Bug berri baten jakinarazpena: %s.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, fuzzy, c-format
 msgid "Available methods:\n"
 msgstr "Algoritmo erabilgarriak:\n"
 
-#, fuzzy
-#~ 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 ""
-#~ "Erabilpena: whois [AUKERAK]... OBJETUA...\n"
-#~ "\n"
-#~ "-a                 data base guztietan bilatzen du\n"
-#~ "-F                 modo azkarra (-r inplikatzen du)\n"
-#~ "-g SOURCE:HASIERA-BUKAERA  H eta B tarteko serietan,SOURCE-ren "
-#~ "agerraldiak bilatzen ditu\n"
-#~ "-h HOST            HOST zerbitzarira konektatzen da\n"
-#~ "-H                 abisu-legala ezkutatzen du\n"
-#~ "-i ATTR[,ATTR]...  adierazitako ATTRibute-arentzat alderantzizko bilaketa "
-#~ "egin du\n"
-#~ "-x                 bilaketa zehatza [RPSL bakarrik]\n"
-#~ "-l                 adierazitako [RPSL] bilaketarentzat, maila bat jeisten "
-#~ "du\n"
-#~ "-L                 mapeketa gutxien espezifikoenak bilatzen ditu\n"
-#~ "-M                 mapeketa espezifikoenak bilatzen ditu\n"
-#~ "-m                 lehen maila espezifikoena bilatzen du\n"
-#~ "-r                 alderantzizko bilaketa ezgaitzen du\n"
-#~ "-p PORTUA          PORTUA konektatzen du\n"
-#~ "-R                 Objektu zehatzaren kopia lokala eraskuten "
-#~ "du,                    erreferentzia bat eduki ere\n"
-#~ "-S                 zerbitzariari adierazten dio pekulariedade "
-#~ "sintaktikoak \t\t    ez erabiltzea \n"
-#~ "-s SOURCE[,SOURCE]...  SOURCE data basea bilatzen du\n"
-#~ "-T TIPO[,TIPO]...  TIPO objektu motak bakarrik bilatzen ditu\n"
-#~ "-t TIPO        TIPO objektu mota batentzako, txantiloiak                "
-#~ "lortzen ditu ('all' lista batentzako)\n"
-#~ "-v TIPO            TIPO objektu baten txantiloi zehatza lortzen du\n"
-#~ "-q [bertsioa|sources]  zerbitzariaren informazioa kontsultatzen "
-#~ "du                        [RPSL bakarrik]\n"
-#~ "-d                 alderantizko DNSaren ordezkaritza itzultzen du "
-#~ "[RPSL                    bakarrik]\n"
-#~ "-K                 oinarrizko-gakoak bakarrik [RPSL bakarrik]\n"
-#~ "      --verbose    egiten ari dena bakarrik, eraskusten du\n"
-#~ "      --help       laguntza pantaila hau erakusten du eta amaitzen du\n"
-#~ "      --version    programaren bertsioa erakusten du eta amaitzen du\n"
-
 #~ msgid "Illegal password character '0x%hhx'.\n"
 #~ msgstr "'0x%hhx' password karakterea ilegala da.\n"
 

po/fi.po

@@ -1,23 +1,24 @@
 # Finnish translation for whois.
 # Copyright (C) 2008- Sami Kerola <kerolasa@iki.fi>
+# Copyright (C) 2022 Lauri Nurmi <lanurmi@iki.fi>
 #
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 5.0.1\n"
+"Project-Id-Version: whois 5.5.14\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2014-06-09 15:27-0000\n"
-"Last-Translator: Sami Kerola <kerolasa@iki.fi>\n"
+"POT-Creation-Date: 2022-10-29 11:48+0300\n"
+"PO-Revision-Date: 2022-10-30 00:27+0300\n"
+"Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: \n"
 "Language: fi\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"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 3.2\n"
 
-#: ../whois.c:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -28,28 +29,30 @@ msgstr ""
 "\n"
 "Lähetä bugiraportit osoitteeseen %s.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
+#: ../whois.c:329
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr ""
+"Tällä TLD:llä ei ole whois-palvelinta, mutta voit käyttää whois-tietokantaa "
+"osoitteessa"
+
+#: ../whois.c:334
+msgid "This TLD has no whois server."
+msgstr "Tällä TLD:llä ei ole whois-palvelinta."
+
+#: ../whois.c:337
+msgid "No whois server is known for this kind of object."
+msgstr "Tällaiselle objektille ei ole tiedossa whois-palvelinta."
+
+#: ../whois.c:340
+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:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Käytetään palvelinta %s.\n"
 
-#: ../whois.c:240
-msgid "This TLD has no whois server, but you can access the whois database at"
-msgstr "Tälla TLD:llä ei ole whois palvelinta, voit hakea tiedot osoitteesta"
-
-#: ../whois.c:245
-msgid "This TLD has no whois server."
-msgstr "Tälla TLD:llä ei ole whois palvelinta."
-
-#: ../whois.c:248
-msgid "No whois server is known for this kind of object."
-msgstr "Mikään whois palvelu ei tiedä kysyttyä tietoa."
-
-#: ../whois.c:251
-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:267
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -57,10 +60,10 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Kysytään IPv4 ulostuloa %s IPv6:n IPv4 avaruudesta.\n"
+"Kysellään IPv4-päätetepistettä %s 6to4-IPv6-osoitteelle.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, c-format
 msgid ""
 "\n"
@@ -68,19 +71,19 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Kysytään IPv4 ulostuloa %s Teredo IPv6 tunneliosoitetta.\n"
+"Kysellään IPv4-päätetepistettä %s Teredo-IPv6-osoitteelle.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
 "\n"
 msgstr ""
-"Kysely: \"%s\"\n"
+"Kysely: ”%s”\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -93,182 +96,245 @@ msgstr ""
 "Löytyi viittaus %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
-msgstr "Ohjelma ei ymmärrä riviä: %s"
+msgstr "Tätä riviä ei voi jäsentää: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
-msgstr "Varoitus: käytät RIPE valitsimia perinteiseen palvelimeen."
+msgstr "Varoitus: RIPE-valitsimia käytetään perinteiseen palvelimeen."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 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"
+"Katastrofaalinen virhe: vastuuvapauslausekkeen teksti\n"
+"on muuttunut.\n"
+"Päivitä tämä ohjelma.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "Palvelinta %s ei löydy."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: tuntematon palvelu"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Aikakatkaisu."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Ohjelma keskeytyi signaaliin %d..."
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
 "-H                     hide legal disclaimers\n"
+msgstr ""
+"Käyttö: whois [VALITSIN]... OBJEKTI...\n"
+"\n"
+"-h PALV, --host PALV   ota yhteys PALVelimeen\n"
+"-p PORT, --port PORT   käytä PORTtia\n"
+"-I                     kysele whois.iana.org:ilta ja seuraa viittausta\n"
+"-H                     piilota vastuuvapauslausekkeet\n"
+
+#: ../whois.c:1506
+#, c-format
+msgid ""
 "      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar "
+"servers\n"
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 "\n"
+msgstr ""
+"      --verbose        kerro mitä on tekeillä\n"
+"      --no-recursion   älä käytä rekursiota rekisteristä\n"
+"                       verkkotunnusvälittäjän palvelimille\n"
+"      --help           näytä tämä ohje ja poistu\n"
+"      --version        näytä versiotiedot ja poistu\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
 "These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
 "-l                     find the one level less specific match\n"
 "-L                     find all levels less specific matches\n"
 "-m                     find all one level more specific matches\n"
 "-M                     find all levels of more specific matches\n"
+msgstr ""
+"Seuraavat liput toimivat whois.ripe.net- ja joillakin RIPEn\n"
+"kaltaisilla palvelimilla:\n"
+"-l                     etsi yhden tason vähemmän tarkka osuma\n"
+"-L                     etsi kaikkien tasojen vähemmän tarkat osumat\n"
+"-m                     etsi kaikki yhden tason tarkemmat osumat\n"
+"-M                     etsi kaikkien tasojen tarkemmat osumat\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
 "-c                     find the smallest match containing a mnt-irt "
 "attribute\n"
 "-x                     exact match\n"
 "-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
+"-c                     etsi vähin osuma, jolla on mnt-irt-attribuutti\n"
+"-x                     täysosuma\n"
+"-b                     palauta lyhyesti IP-osoiteavaruudet ja abuse-tieto\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
 "-B                     turn off object filtering (show email addresses)\n"
 "-G                     turn off grouping of associated objects\n"
 "-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-B                     poista objektisuodatus (näytä sähköpostiosoitteet)\n"
+"-G                     poista objektien ryhmittely\n"
+"-d                     palauta myös DNS-delegointiobjektit\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
 "-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
 "-T TYPE[,TYPE]...      only look for objects of TYPE\n"
 "-K                     only primary keys are returned\n"
 "-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-i ATTR[,ATTR]...      tee käänteishaku käyttäen ATTRibuutteja\n"
+"-T TYYP[,TYYP]...      hae ainoastaan tietyn TYYPpisiä objekteja\n"
+"-K                     vain pääavaimet palautetaan\n"
+"-r                     älä käytä rekursiivisia hakuja yhteystiedoille\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
 "-R                     force to show local copy of the domain object even\n"
 "                       if it contains referral\n"
 "-a                     also search all the mirrored databases\n"
 "-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
 "-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     pakota näyttämään paikallinen objekti vaikka se\n"
+"                       sisältäisi viitteen\n"
+"-a                     etsi myös kaikista peilatuista tietokannoista\n"
+"-s LÄHDE[,LÄHDE]...    käytä LÄHTEestä peilattua tietokantaa\n"
+"-g LÄHDE:ALKU-LOPPU    hae päivityksiä LÄHTEestä sarjasta ALKU-LOPPU\n"
+
+# version|sources|types ovat kirjaimellisesti sitä mitä käyttäjän kuuluu syöttää, niitä ei saa suomentaa.
+#: ../whois.c:1543
+#, c-format
+msgid ""
 "-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\n"
 msgstr ""
-"Käyttö: whois [VALITSIN]... OBJEKTI...\n"
-"\n"
-"-h PALVELIN, --host PALVELIN  ota yhteys PALVELIMEEN\n"
-"-p PORTTI, --port PORTTI      käytä PORTTIA\n"
-"-H                            piilota ilmoitukset\n"
-"      --verbose               näytä mitä on tekeillä\n"
-"      --help                  näytä tämä teksti\n"
-"      --version               näytä versio\n"
-"\n"
-"Seuraavat optiot ovat tuettuja whois.ripe.net palvelimella:\n"
-"-l                     etsi välittömiä tietueita\n"
-"-L                     etsi kaikkia vastaavia tietueita\n"
-"-m                     etsi kaikki samantasoiset tai erityisemmät tietueet\n"
-"-M                     etsi kaikkien tasojen erityiset tietueet\n"
-"-c                     etsi vähin osuma joka liittyy mnt-irt atribuuttiin\n"
-"-x                     täysosuma\n"
-"-b                     palauta lyhyt osoiteavaruus ja abuse-tietue\n"
-"-B                     poista objektifiltteröinti (näytä "
-"sähköpostiosoitteet)\n"
-"-G                     poista objektien ryhmittely\n"
-"-d                     näytä DNS delekointiobjektit\n"
-"-i ATTR[,ATTR]...      tee käänteishaku käyttäen ATTRbuutteja\n"
-"-T TYYP[,TYYP]...      hae ainoastaan tietyn TYYPisiä objekteja\n"
-"-K                     palauta ainoastaan pääavain\n"
-"-r                     älä käytä rekursiota kontaktitiedoille\n"
-"-R                     pakota näyttämään paikallinen objekti vaikka se\n"
-"                       sisältäisi viitteen\n"
-"-a                     etsi myös tietokantakopioista\n"
-"-s KOP[,KOP]...        käytä KOPioita\n"
-"-g KOP:EKA-VIKA        hae päivityksiä KOPioista sarjoista EKAsta VIKAaan.\n"
-"-t TYYPPI              hae mallinne objektille TYYPPI\n"
-"-v TYYPPI              hae pitkämallinne objektille TYYPPI\n"
-".q [versio|lähde|tyyppi]   hae erityisiä palvelin tietoja\n"
+"-t TYYPPI              hae malline TYYPPIä olevalle objektille\n"
+"-v TYYPPI              hae laaja malline TYYPPIä olevalle objektille\n"
+"-q [version|sources|types]   kysele annettua palvelintietoa\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "BSDI-laajennettu DES-salaus, crypt(3)"
+
+#: ../mkpasswd.c:138
 msgid "standard 56 bit DES-based crypt(3)"
-msgstr "Standardi 56-bittinen DES-salaus katso crypt(3)"
+msgstr "standardi 56-bittinen DES-salaus, crypt(3)"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
-msgstr "Kelvoton metodi '%s'.\n"
+msgstr "Kelvoton menetelmä ”%s”.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
-msgstr "Kelvoton numero '%s'.\n"
+msgstr "Kelvoton lukuarvo ”%s”.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "Käytä valitsinta '%s --help' lisätietojen saamiseen.\n"
+msgstr "Komento ”%s --help” antaa lisää tietoa.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:302
 #, 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 tavua, kun %d odotettiin.\n"
+msgstr[0] "Väärä suolan pituus: %d tavu, odotettiin %d.\n"
+msgstr[1] "Väärä suolan pituus: %d tavua, odotettiin %d.\n"
 
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:307
 #, 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 tavu, kun %d <= n <= %d odotettiin.\n"
-msgstr[1] "Väärä suolan pituus: %d tavua, kun %d <= n <= %d odotettiin.\n"
+msgstr[0] "Väärä suolan pituus: %d tavu, odotettiin %d <= n <= %d.\n"
+msgstr[1] "Väärä suolan pituus: %d tavua, odotettiin kun %d <= n <= %d.\n"
 
-#: ../mkpasswd.c:256
+#: ../mkpasswd.c:316
 #, c-format
 msgid "Illegal salt character '%c'.\n"
-msgstr "Laiton merkki suolassa '%c'.\n"
+msgstr "Kielletty suolamerkki ’%c’.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:372 ../mkpasswd.c:385
 #, c-format
 msgid "Password: "
 msgstr "Salasana: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:404
 #, c-format
 msgid "Method not supported by crypt(3).\n"
-msgstr "Functio crypt(3) ei tue toimintoa.\n"
+msgstr "crypt(3)-funktio ei tue menetelmää.\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:512
 #, 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"
-"Salaa SALASANA crypt(3) funktiolla.\n"
+"Käyttö: mkpasswd [VALITSIMET] ... [SALASANA] [SUOLA]]\n"
+"Salaa SALASANAn crypt(3)-funktiolla.\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:515
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TYYPPI   valitse menetelmä TYYPPI\n"
+"      -5                    sama kuin --method=md5crypt\n"
+"      -S, --salt=SUOLA      suolan valinta\n"
+
+#: ../mkpasswd.c:520
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -R, --rounds=MÄÄRÄ    käytä annettua kierrosMÄÄRÄä\n"
+"      -P, --password-fd=NUM lue salasana tiedostokahvasta NUM\n"
+"                            eikä terminaalista /dev/tty\n"
+"      -s, --stdin           sama kuin --password-fd=0\n"
+
+#: ../mkpasswd.c:526
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -278,23 +344,17 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -m, --method=TYPE     valitse toiminto TYPE\n"
-"      -5                    sama kuin --method=md5\n"
-"      -S, --salt=SUOLA      suolan valinta\n"
-"      -R, --rounds=NUMERO   pyöristä numeroon\n"
-"      -P, --password-fd=NUM lue salasana avoimesta tiedostosta NUM\n"
-"                            äläkä terminaalista /dev/tty\n"
-"      -s, --stdin           sama kuin --password-fd=0\n"
-"      -h, --help            tulosta tämä ruutu\n"
-"      -V, --version         tulosta versio\n"
+"      -h, --help            näytä tämä ohje ja poistu\n"
+"      -V, --version         tulosta versiotiedot ja poistu\n"
 "\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"
+"Jos SALASANA puuttuu, sitä kysytään vuorovaikutteisesti.\n"
+"Jos SUOLAa ei anneta, luodaan satunnainen.\n"
+"Jos TYYPPI on ”help”, käytettävissä olevat menetelmät\n"
+"tulostetaan.\n"
 "\n"
 "Lähetä bugiraportit osoitteeseen %s.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:549
 #, c-format
 msgid "Available methods:\n"
-msgstr "Käytettävissä olevat toiminnot:\n"
+msgstr "Käytettävissä olevat menetelmät:\n"

po/fr.po

@@ -1,16 +1,16 @@
 # Translation of whois to French
-# Copyright not yet (C) 2003-2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# Copyright © 2003-2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
 # This file is distributed under the same license as the whois package.
-# Copyright © 2003 William Steve Applegate <wsapplegate@est.un.goret.info>
 # -2003: William Steve Applegate <wsapplegate@est.un.goret.info>
 # -2008: Mohammed Adnène Trojette <adn+deb@diwi.org>
 # 2013: Steve Petruzzello <dlist@bluewin.ch>
+# 2019: Steve Petruzzello <dlist@bluewin.ch>
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 5.0.24\n"
+"Project-Id-Version: whois 5.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2013-04-18 17:47+0200\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
+"PO-Revision-Date: 2019-06-28 17:47+0200\n"
 "Last-Translator: Steve Petruzzello <dlist@bluewin.ch>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n>1;\n"
 
-#: ../whois.c:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -30,30 +30,30 @@ msgstr ""
 "\n"
 "Veuillez signaler les bogues à %s.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Le serveur %s est sélectionné.\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 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:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
 msgstr "Ce TLD n'a pas de serveur whois."
 
-#: ../whois.c:248
+#: ../whois.c:337
 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:251
+#: ../whois.c:340
 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:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Le serveur %s est sélectionné.\n"
+
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "Requête faite pour l'extrémité IPv4 %s d'une adresse IPv6 6to4.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, c-format
 msgid ""
 "\n"
@@ -75,7 +75,7 @@ msgstr ""
 "Requête faite pour l'extrémité IPv4 %s d'une adresse IPv6 Teredo.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -84,7 +84,7 @@ msgstr ""
 "Requête : \"%s\"\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -97,17 +97,17 @@ msgstr ""
 "Renvoi trouvé vers %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Impossible d'interpréter la ligne : %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr ""
 "Avertissement : des options RIPE ont été utilisées avec un serveur classique."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -115,117 +115,170 @@ msgstr ""
 "Erreur catastrophique : le texte d'avertissement a changé.\n"
 "Veuillez mettre à jour ce programme.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "L'hôte %s est introuvable."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp : service inconnu"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Temps limite dépassé."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interruption par le signal %d..."
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\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"
-"\n"
-"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
-"-l                     find the one level less specific match\n"
-"-L                     find all levels less specific matches\n"
-"-m                     find all one level more specific matches\n"
-"-M                     find all levels of more specific matches\n"
-"-c                     find the smallest match containing a mnt-irt "
-"attribute\n"
-"-x                     exact match\n"
-"-b                     return brief IP address ranges with abuse contact\n"
-"-B                     turn off object filtering (show email addresses)\n"
-"-G                     turn off grouping of associated objects\n"
-"-d                     return DNS reverse delegation objects too\n"
-"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
-"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
-"-K                     only primary keys are returned\n"
-"-r                     turn off recursive look-ups for contact information\n"
-"-R                     force to show local copy of the domain object even\n"
-"                       if it contains referral\n"
-"-a                     also search all the mirrored databases\n"
-"-s SOURCE[,SOURCE]...  search the database mirrored 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\n"
 msgstr ""
 "Usage: whois [OPTION]... OBJET...\n"
 "\n"
 "-h HÔTE, --host HÔTE   se connecter au serveur HÔTE\n"
 "-p PORT, --port PORT   se connecter sur le port PORT\n"
-"-H                     cacher les mentions légales\n"
+"-I                     interroger whois.iana.org et suivre son référent-"
+"H                     cacher les mentions légales\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
+"      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+"\n"
+msgstr ""
 "      --verbose        mode verbeux\n"
 "      --help           afficher cette aide et sortir\n"
 "      --version        afficher la version et sortir\n"
 "\n"
-"Ces drapeaux sont gérés par le serveur whois.ripe.net et quelques serveurs de type RIPE :\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
+"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
+"-l                     find the one level less specific match\n"
+"-L                     find all levels less specific matches\n"
+"-m                     find all one level more specific matches\n"
+"-M                     find all levels of more specific matches\n"
+msgstr ""
+"Ces drapeaux sont gérés par le serveur whois.ripe.net et quelques serveurs "
+"de type RIPE :\n"
 "-l                     réduire d'un niveau la spécificité de la recherche\n"
 "-L                     trouver toutes les occurrences moins spécifiques\n"
-"-m                     trouver les occurrences de premier niveau plus spécifiques\n"
+"-m                     trouver les occurrences de premier niveau plus "
+"spécifiques\n"
 "-M                     trouver toutes les occurrences plus spécifiques\n"
-"-c                     trouver l'occurrence la plus spécifique contenant un attribut mnt-irt\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
+"-c                     trouver l'occurrence la plus spécifique contenant un "
+"attribut mnt-irt\n"
 "-x                     occurrence exacte\n"
-"-b                     afficher la plage des adresses IP avec l'information d'abus\n"
-"-B                     désactiver le filtrage d'objet (montrer les adresses électroniques)\n"
+"-b                     afficher la plage des adresses IP avec l'information "
+"d'abus\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
+"-B                     turn off object filtering (show email addresses)\n"
+"-G                     turn off grouping of associated objects\n"
+"-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-B                     désactiver le filtrage d'objet (montrer les adresses "
+"électroniques)\n"
 "-G                     désactiver le groupement des objets associés\n"
 "-d                     afficher aussi les objets de délégation DNS inverse\n"
-"-i ATTR[,ATTR]...      effectuer une recherche inverse pour les ATTRibuts spécifiés\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
+"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned\n"
+"-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-i ATTR[,ATTR]...      effectuer une recherche inverse pour les ATTRibuts "
+"spécifiés\n"
 "-T TYPE[,TYPE]...      chercher seulement les objets de ce TYPE\n"
 "-K                     seules les clés primaires sont renvoyées\n"
-"-r                     désactiver la recherche récursive des informations de contact\n"
-"-R                     forcer l'affichage de la copie locale de l'objet de domaine même\n"
+"-r                     désactiver la recherche récursive des informations de "
+"contact\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     also search all the mirrored databases\n"
+"-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     forcer l'affichage de la copie locale de l'objet de "
+"domaine même\n"
 "                       s'il contient un renvoi\n"
-"-a                     rechercher aussi dans toutes les bases de données miroir\n"
+"-a                     rechercher aussi dans toutes les bases de données "
+"miroir\n"
 "-s SOURCE[,SOURCE]...  rechercher dans la base de données miroir de SOURCE\n"
-"-g SOURCE:PREM-DERN    trouver les mises à jour de la SOURCE ayant des numéros\n"
+"-g SOURCE:PREM-DERN    trouver les mises à jour de la SOURCE ayant des "
+"numéros\n"
 "                       de série entre PREM et DERN\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
+"-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\n"
+msgstr ""
 "-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 TYPE\n"
+"-v TYPE                demander la syntaxe détaillée pour les objets de ce "
+"TYPE\n"
 "-q [version|sources|types]  demander les informations spécifiées au serveur\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "chiffrement à base DES étendu par BSDI"
+
+#: ../mkpasswd.c:138
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "fonction crypt(3) standard, chiffrement DES à 56 bits"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "La méthode « %s » est invalide.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Le nombre « %s » est invalide.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, 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:242
+#: ../mkpasswd.c:292
 #, c-format
 msgid "Wrong salt length: %d byte when %d expected.\n"
 msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -233,29 +286,29 @@ 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:247
+#: ../mkpasswd.c:297
 #, 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:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Le caractère « %c » est invalide dans l'aléa.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Mot de passe : "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr "Méthode non prise en charge par crypt(3).\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -266,16 +319,34 @@ msgstr ""
 "Chiffre le MOT DE PASSE à l'aide de la fonction crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TYPE     sélectionner ce TYPE de méthode\n"
+"      -5                    équivalent à --method=md5crypt\n"
+"      -S, --salt=ALÉA       utiliser cet ALÉA\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -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"
+"                            au lieu de /dev/tty\n"
+"      -s, --stdin           équivalent à --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -285,14 +356,6 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -m, --method=TYPE     sélectionner ce TYPE de méthode\n"
-"      -5                    équivalent à --method=md5\n"
-"      -S, --salt=ALÉA       utiliser cet 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"
-"                            au lieu de /dev/tty\n"
-"      -s, --stdin           équivalent à --password-fd=0\n"
 "      -h, --help            afficher cette page d'aide et sortir\n"
 "      -V, --version         afficher les informations de version et sortir\n"
 "\n"
@@ -302,7 +365,7 @@ msgstr ""
 "\n"
 "Veuillez signaler les bogues à %s.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, c-format
 msgid "Available methods:\n"
 msgstr "Méthodes disponibles :\n"

po/it.po

@@ -1,12 +1,12 @@
 # Traduzione di whois.pot.
-# Copyright (C) 1999-2013 Marco d'Itri
+# Copyright (C) 1999-2021 Marco d'Itri
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: whois 5.0.24\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2013-04-10 04:19+0200\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
+"PO-Revision-Date: 2022-01-03 18:13+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../whois.c:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -26,30 +26,30 @@ msgstr ""
 "\n"
 "Segnalare i bug a %s.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Uso il server %s.\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 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:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
 msgstr "Non esiste un server whois per questo TLD."
 
-#: ../whois.c:248
+#: ../whois.c:337
 msgid "No whois server is known for this kind of object."
 msgstr "Non è noto alcun server whois per questo tipo di oggetto."
 
-#: ../whois.c:251
+#: ../whois.c:340
 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:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Uso il server %s.\n"
+
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -60,7 +60,7 @@ msgstr ""
 "Cerco l'endpoint IPv4 %s di un indirizzo IPv6 6to4.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, c-format
 msgid ""
 "\n"
@@ -71,7 +71,7 @@ msgstr ""
 "Cerco l'endpoint IPv4 %s di un indirizzo IPv6 Teredo.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -80,7 +80,7 @@ msgstr ""
 "Richiesta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -93,16 +93,16 @@ msgstr ""
 "Trovato un riferimento a %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Impossibile interpretare questa riga: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Attenzione: sono stati usati dei flag RIPE con un server tradizionale."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -110,145 +110,189 @@ msgstr ""
 "Errore catastrofico: il testo di avvertenze è cambiato.\n"
 "Aggiorna questo programma.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "Host %s non trovato."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: servizio sconosciuto"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Tempo scaduto."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrotto dal segnale %d..."
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\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"
-"\n"
-"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
-"-l                     find the one level less specific match\n"
-"-L                     find all levels less specific matches\n"
-"-m                     find all one level more specific matches\n"
-"-M                     find all levels of more specific matches\n"
-"-c                     find the smallest match containing a mnt-irt "
-"attribute\n"
-"-x                     exact match\n"
-"-b                     return brief IP address ranges with abuse contact\n"
-"-B                     turn off object filtering (show email addresses)\n"
-"-G                     turn off grouping of associated objects\n"
-"-d                     return DNS reverse delegation objects too\n"
-"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
-"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
-"-K                     only primary keys are returned\n"
-"-r                     turn off recursive look-ups for contact information\n"
-"-R                     force to show local copy of the domain object even\n"
-"                       if it contains referral\n"
-"-a                     also search all the mirrored databases\n"
-"-s SOURCE[,SOURCE]...  search the database mirrored 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\n"
 msgstr ""
 "Uso: whois [OPZIONE]... OGGETTO...\n"
 "\n"
 "-h HOST, --host HOST    si connette al server HOST\n"
 "-p PORTA, --port PORTA  si connette alla PORTA\n"
+"-I                 chiede a whois.iana.org e segue il rinvio\n"
 "-H                 nasconde le avvertenze legali\n"
+
+#: ../whois.c:1506
+#, c-format
+msgid ""
+"      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+"\n"
+msgstr ""
 "      --verbose    spiega cosa sta facendo\n"
+"      --no-recursion  disattiva la ricorsione dal registry al registrar\n"
 "      --help       mostra questo aiuto ed esce\n"
 "      --version    stampa le informazioni sulla versione ed esce\n"
 "\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
+"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
+"-l                     find the one level less specific match\n"
+"-L                     find all levels less specific matches\n"
+"-m                     find all one level more specific matches\n"
+"-M                     find all levels of more specific matches\n"
+msgstr ""
 "Le seguenti opzioni sono gestite da whois.ripe.net e alcuni server simili:\n"
 "-l                 trova la corrispondenza un livello meno specifica\n"
-"-L                 trova le corrispondenze meno specifiche a tutti i livelli\n"
+"-L                 trova le corrispondenze meno specifiche a tutti i "
+"livelli\n"
 "-m                 trova le corrispondenze di primo livello più specifiche\n"
 "-M                 trova le corrispondenze più specifiche a tutti i livelli\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
 "-c                 trova la corrispondenza più specifica contenente un\n"
 "                   attributo mnt-irt\n"
 "-x                 trova solo la corrispondenza esatta\n"
 "-b                 mostra solo la rete IP con il contatto per gli abusi\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
+"-B                     turn off object filtering (show email addresses)\n"
+"-G                     turn off grouping of associated objects\n"
+"-d                     return DNS reverse delegation objects too\n"
+msgstr ""
 "-B                 non filtra gli oggetti (mostra gli indirizzi di e-mail)\n"
-"-B                 non raggruppa gli oggetti associati\n"
+"-G                 non raggruppa gli oggetti collegati\n"
 "-d                 restituisce anche gli oggetti della delega del DNS\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
+"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned\n"
+"-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
 "-i ATTR[,ATTR]...  fa una ricerca inversa per l'ATTRibuto specificato\n"
 "-T TIPO[,TIPO]...  cerca solo oggetti del TIPO\n"
 "-K                 restituisce solo le chiavi primarie\n"
 "-r                 disabilita le ricerche ricorsive per i contatti\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     also search all the mirrored databases\n"
+"-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
 "-R                 mostra la copia locale dell'oggetto domain anche se\n"
 "                   contiene un riferimento\n"
 "-a                 cerca anche in tutti i database replicati\n"
 "-s SOURCE[,SOURCE]...  cerca il database replicato da SOURCE\n"
 "-g SOURCE:FIRST-LAST  trova gli aggiornamenti di SOURCE dal seriale F a L\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
+"-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\n"
+msgstr ""
 "-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\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "crypt(3) estesa di BSDI basata su DES"
+
+#: ../mkpasswd.c:138
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "crypt(3) standard a 56 bit basata su DES"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "Il metodo '%s' non è valido.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Il numero '%s' non è valido.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Per maggior informazioni prova '%s --help'.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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:247
+#: ../mkpasswd.c:297
 #, 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:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Il carattere '%c' non è valido in un sale.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Password: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr "Metodo non gestito da crypt(3).\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -259,16 +303,33 @@ msgstr ""
 "Cifra la PASSWORD usando crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TIPO     seleziona il TIPO di metodo\n"
+"      -5                    come --method=md5crypt\n"
+"      -S, --salt=SALE       usa il SALE specificato\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -R, --rounds=NUMBER   usa il NUMERO indicato di iterazioni\n"
+"      -P, --password-fd=NUM legge la password dal file descriptor NUM\n"
+"                            invece che da /dev/tty\n"
+"      -s, --stdin           come --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -278,13 +339,6 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -m, --method=TIPO     seleziona il TIPO di metodo\n"
-"      -5                    come --method=md5\n"
-"      -S, --salt=SALE       usa il SALE specificato\n"
-"      -R, --rounds=NUMBER   usa il NUMERO indicato di iterazioni\n"
-"      -P, --password-fd=NUM legge la password dal file descriptor NUM\n"
-"                            invece che da /dev/tty\n"
-"      -s, --stdin           come --password-fd=0\n"
 "      -h, --help            mostra questo aiuto ed esce\n"
 "      -v, --version         mostra le informazioni sulla versione ed esce\n"
 "\n"
@@ -294,7 +348,7 @@ msgstr ""
 "\n"
 "Segnalare i bug a %s.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, c-format
 msgid "Available methods:\n"
 msgstr "Metodi disponibili:\n"

po/ja.po

@@ -7,17 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois 4.7.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
 "PO-Revision-Date: 2005-04-26 00:20+0900\n"
-"Last-Translator: Satoru SATOH <ss@gnome.gr.jp>\n"
-"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
+"Last-Translator: Satoru SATOH\n"
+"Language-Team: Japanese\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:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -28,30 +28,30 @@ msgstr ""
 "\n"
 "バグ報告は %s へ.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "サーバー %s を使用\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "この TLD には whois サーバーがありませんが、次のサーバーで whois データベース"
 "にアクセスできます"
 
-#: ../whois.c:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
 msgstr "この TLD には whois サーバーがありません"
 
-#: ../whois.c:248
+#: ../whois.c:337
 msgid "No whois server is known for this kind of object."
 msgstr "この種のオブジェクトに対する既知の whois サーバーはありません"
 
-#: ../whois.c:251
+#: ../whois.c:340
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "不明な AS 番号または IP ネットワーク. アップグレードして下さい"
 
-#: ../whois.c:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "サーバー %s を使用\n"
+
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -62,7 +62,7 @@ msgstr ""
 "6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -73,7 +73,7 @@ msgstr ""
 "6to4 IPv6 アドレスの IPv4 終端 %s を問い合わせ中\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
 "問い合わせ文字列: \"%s\"\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -95,16 +95,16 @@ msgstr ""
 "%s への照会をみつけました\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "この行を解析できません: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "警告: 旧来のサーバーについて RIPE フラグが使用されています"
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,113 +112,175 @@ msgstr ""
 "破滅的なエラー: 免責条項テキストが変更されました\n"
 "このプログラムをアップグレードして下さい\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "ホスト %s はみつかりませんでした"
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: 不明なサービス"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "時間切れ"
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "シグナル %d が割込み..."
 
-#: ../whois.c:1189
-#, c-format
+#: ../whois.c:1499
+#, fuzzy, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
 "-H                     hide legal disclaimers\n"
+msgstr ""
+"-h HOST                サーバー HOST に接続\n"
+"-p PORT                PORT に接続\n"
+"-H                     法的責任棄却声明を表示しない\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
 "      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 "\n"
+msgstr ""
+"      --verbose        進捗について詳細に説明\n"
+"      --help           このヘルプを表示して終了\n"
+"      --version        バージョン情報を表示して終了\n"
+"\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
 "These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
 "-l                     find the one level less specific match\n"
 "-L                     find all levels less specific matches\n"
 "-m                     find all one level more specific matches\n"
 "-M                     find all levels of more specific matches\n"
+msgstr ""
+
+#: ../whois.c:1520
+#, fuzzy, c-format
+msgid ""
 "-c                     find the smallest match containing a mnt-irt "
 "attribute\n"
 "-x                     exact match\n"
 "-b                     return brief IP address ranges with abuse contact\n"
+msgstr "-x                     厳密にマッチ\n"
+
+#: ../whois.c:1525
+#, fuzzy, c-format
+msgid ""
 "-B                     turn off object filtering (show email addresses)\n"
 "-G                     turn off grouping of associated objects\n"
 "-d                     return DNS reverse delegation objects too\n"
+msgstr "-d                     DNS 逆向き移譲オブジェクトも返す\n"
+
+#: ../whois.c:1530
+#, fuzzy, c-format
+msgid ""
 "-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
 "-T TYPE[,TYPE]...      only look for objects of TYPE\n"
 "-K                     only primary keys are returned\n"
 "-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-i ATTR[,ATTR]...      指定属性 ATTR について逆引き\n"
+"-T TYPE[,TYPE]...      TYPE オブジェクトのみについて検索\n"
+"-K                     主キーのみ返す\n"
+"-r                     コンタクト情報について再帰検索しない\n"
+
+#: ../whois.c:1536
+#, fuzzy, c-format
+msgid ""
 "-R                     force to show local copy of the domain object even\n"
 "                       if it contains referral\n"
 "-a                     also search all the mirrored databases\n"
 "-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
 "-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     照会が含まれていても強制的にドメインオブジェクトの\n"
+"                       ローカルコピーを表示\n"
+"-a                     すべてのデータベースを検索\n"
+"-s SOURCE[,SOURCE]...  SOURCE からデータベースを検索\n"
+"-g SOURCE:FIRST-LAST   SOURCE (シリアル FIRST から LAST まで)から更新を検索\n"
+
+#: ../whois.c:1543
+#, fuzzy, c-format
+msgid ""
 "-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\n"
 msgstr ""
+"-t TYPE                TYPE オブジェクトについてテンプレートを要求 (リストは "
+"'all')\n"
+"-v TYPE                TYPE オブジェクトについて冗長なテンプレートを要求\n"
+"-q [version|sources|types]  指定サーバー情報を問い合わせ\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+#, fuzzy
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "\t標準 56 ビット DES ベース暗号(3)"
+
+#: ../mkpasswd.c:138
 #, fuzzy
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "\t標準 56 ビット DES ベース暗号(3)"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, fuzzy, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "不正な数字 '%s'\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "不正な数字 '%s'\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "さらなる詳細については '%s --help' を実行\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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:247
+#: ../mkpasswd.c:297
 #, 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:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "不正なソルト文字 '%c'\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "パスワード: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr ""
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -229,16 +291,31 @@ msgstr ""
 "PASSWORD を crypt(3) で暗号化\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, fuzzy, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -H, --hash=TYPE       ハッシュ TYPE を選択\n"
+"      -S, --salt=SALT       指定の SALT を選択\n"
+
+#: ../mkpasswd.c:505
+#, fuzzy, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -P, --password-fd=NUM /dev/tty の代わりにファイルディスクリプタ\n"
+"                            NUM からパスワードを読み込む\n"
+"      -s, --stdin           --password-fd=0 と同様\n"
+
+#: ../mkpasswd.c:511
+#, fuzzy, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -248,11 +325,6 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -H, --hash=TYPE       ハッシュ TYPE を選択\n"
-"      -S, --salt=SALT       指定の SALT を選択\n"
-"      -P, --password-fd=NUM /dev/tty の代わりにファイルディスクリプタ\n"
-"                            NUM からパスワードを読み込む\n"
-"      -s, --stdin           --password-fd=0 と同様\n"
 "      -h, --help            このヘルプを表示して終了\n"
 "      -V, --version         バージョン情報を出力して終了\n"
 "\n"
@@ -262,80 +334,11 @@ msgstr ""
 "\n"
 "バグ報告は %s へ.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, fuzzy, c-format
 msgid "Available methods:\n"
 msgstr "利用可能なアルゴリズム:\n"
 
-#, fuzzy
-#~ 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 ""
-#~ ": whois [OPTION]... OBJECT...\n"
-#~ "\n"
-#~ "-l                     one level less specific lookup [RPSL のみ]\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                     厳密にマッチ [RPSL のみ]\n"
-#~ "-d                     DNS 逆向き移譲オブジェクトも返す [RPSL のみ]\n"
-#~ "-i ATTR[,ATTR]...      指定属性 ATTR について逆引き\n"
-#~ "-T TYPE[,TYPE]...      TYPE オブジェクトのみについて検索\n"
-#~ "-K                     主キーのみ返す [RPSL のみ]\n"
-#~ "-r                     コンタクト情報について再帰検索しない\n"
-#~ "-R                     照会が含まれていても強制的にドメインオブジェクト"
-#~ "の\n"
-#~ "                       ローカルコピーを表示\n"
-#~ "-a                     すべてのデータベースを検索\n"
-#~ "-s SOURCE[,SOURCE]...  SOURCE からデータベースを検索\n"
-#~ "-g SOURCE:FIRST-LAST   SOURCE (シリアル FIRST から LAST まで)から更新を検"
-#~ "索\n"
-#~ "-t TYPE                TYPE オブジェクトについてテンプレートを要求 (リスト"
-#~ "は 'all')\n"
-#~ "-v TYPE                TYPE オブジェクトについて冗長なテンプレートを要求\n"
-#~ "-q [version|sources|types]  指定サーバー情報を問い合わせ [RPSL のみ]\n"
-#~ "-F                     高速直接(ロー)出力 (-r を暗示)\n"
-#~ "-h HOST                サーバー HOST に接続\n"
-#~ "-p PORT                PORT に接続\n"
-#~ "-H                     法的責任棄却声明を表示しない\n"
-#~ "      --verbose        進捗について詳細に説明\n"
-#~ "      --help           このヘルプを表示して終了\n"
-#~ "      --version        バージョン情報を表示して終了\n"
-
 #~ msgid "Illegal password character '0x%hhx'.\n"
 #~ msgstr "不正なパスワード文字 '0x%hhx'\n"
 

po/ka.po

@@ -0,0 +1,371 @@
+# Georgian translation for whois.
+# Copyright (C) 2022 whois authors
+# This file is distributed under the same license as the whois package.
+# Temuri Doghonadze <temuri.doghonadze@gmail.com>, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: whois\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-10-20 04:31+0200\n"
+"PO-Revision-Date: 2022-10-20 05:41+0200\n"
+"Last-Translator: Temuri Doghonadze <temuri.doghonadze@gmail.com>\n"
+"Language-Team: \n"
+"Language: ka\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"
+"X-Generator: Poedit 3.1.1\n"
+
+#: ../whois.c:240
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"ვერსია %s\n"
+"\n"
+"შეცდომები მიიწერეთ მისამართზე %s.\n"
+
+#: ../whois.c:329
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr ""
+"ამ TLD-ს whois სერვერი არ გააჩნია. მაგრამ whois-ის ბაზასთან წვდომა გაქვთ "
+"მისამართზე"
+
+#: ../whois.c:334
+msgid "This TLD has no whois server."
+msgstr "ამ TLD-ს whois სერვერი არ გააჩნია."
+
+#: ../whois.c:337
+msgid "No whois server is known for this kind of object."
+msgstr "ამ ტიპის ობიექტისთვის whois სერვერი ცნობილი არაა."
+
+#: ../whois.c:340
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "უცნობი AS რიცხვი ან IP ქსელი. განაახლეთ ეს პროგრამა."
+
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "ვიყენებ სერვერს: %s.\n"
+
+#: ../whois.c:362
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"6to4 IPv6 მისამართის IPv4 ბოლო წერტილის (%s) გამოთხოვა.\n"
+"\n"
+
+#: ../whois.c:369
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Teredo IPv6 მისამართის IPv4 ბოლო წერტილის (%s) გამოთხოვა.\n"
+"\n"
+
+#: ../whois.c:406
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"მოთხოვნის სტრიქონი: \"%s\"\n"
+"\n"
+
+#: ../whois.c:416
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"ნაპოვნია მიმართვა %s-ზე.\n"
+"\n"
+
+#: ../whois.c:458 ../whois.c:461
+#, c-format
+msgid "Cannot parse this line: %s"
+msgstr "ამ ხაზის დამუშავება შეუძლებელია: %s"
+
+#: ../whois.c:650
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "გაფრთხილება. RIPE-ის ალმები ტრადიციულ სერვერთან ერთად გამოიყენება."
+
+#: ../whois.c:823 ../whois.c:939
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"კატასტროფული შეცდომა: შეიცვალა პასუხისმგებლობების ტექსტი.\n"
+"საჭიროა ამ პროგრამის განახლება.\n"
+
+#: ../whois.c:1040
+#, c-format
+msgid "Host %s not found."
+msgstr "ჰოსტი %s ვერ ვიპოვე."
+
+#: ../whois.c:1050
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp: უცნობი სერვისი"
+
+#: ../whois.c:1125
+msgid "Timeout."
+msgstr "ლოდინის ვადა გავიდა."
+
+#: ../whois.c:1131
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "შეწყდა სიგნალით %d..."
+
+#: ../whois.c:1499
+#, c-format
+msgid ""
+"Usage: whois [OPTION]... OBJECT...\n"
+"\n"
+"-h HOST, --host HOST   connect to server HOST\n"
+"-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
+"-H                     hide legal disclaimers\n"
+msgstr ""
+"გამოყენება: whois [პარამეტრები]... ობიექტი...\n"
+"\n"
+"-h ჰოსტი, --host ჰოსტი   მითითებულ ჰოსტთან მიერთება\n"
+"-p პორტი, --port პორტი   მითითებულ პორტზე მიერთება\n"
+"-I                     whois.iana.org-ის მოთხოვნა და პასუხის მიყოლა\n"
+"-H                     იურიდიული ტექსტების დამალვა\n"
+
+#: ../whois.c:1506
+#, c-format
+msgid ""
+"      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar "
+"servers\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+"\n"
+msgstr ""
+"      --verbose        ქმედებების ახსნა მიმდინარე დროში\n"
+"      --no-recursion   რეკურსიის გამორთვა რეესტრის სერვერბს შორის\n"
+"      --help           ამ დახმარების ჩვენება და გასვლა\n"
+"      --version        ვერსიის ინფორმაციის გამოტანა და გასვლა\n"
+"\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
+"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
+"-l                     find the one level less specific match\n"
+"-L                     find all levels less specific matches\n"
+"-m                     find all one level more specific matches\n"
+"-M                     find all levels of more specific matches\n"
+msgstr ""
+"ეს ალმები მხარდაჭერილია whois.ripe.net-ის და ზოგიერთი RIPE-ის მსგავსი "
+"სერვერების მიერ:\n"
+"-l                     ერთდონიანი მინიმალური ძებნა\n"
+"-L                     ყველაფრის მოძებნა მინიმალური დამთხვევებით\n"
+"-m                     მაქსიმალური მითითებული დამთხვევების პირველი დონის "
+"მოძებნა\n"
+"-M                     ყველაფრის მოძებნა მაქსიმალური დამთხვევებით\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
+"-c                     mnt-irt ატრიბუტის შემცველი უმცირესი დამთხვევის "
+"მოძებნა\n"
+"-x                     ზუსტი დამთხვევა\n"
+"-b                     კანონდარღვევს კონტაქტთან ერთად IP მისამართების "
+"დიაპაზონების მოკლე სიის დაბრუნება\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
+"-B                     turn off object filtering (show email addresses)\n"
+"-G                     turn off grouping of associated objects\n"
+"-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-B                     ობიექტების ფილტრაციის გამორთვა (ელფოსტის "
+"მისამართების ჩვენება)\n"
+"-G                     ასოცირებული ობიექტების დაჯგუფების გამორთვა\n"
+"-d                     დაბრუნდება DNS სევერსის დელეგაციის ობექტებიც\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
+"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned\n"
+"-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-i ATTR[,ATTR]...      მითითებული ატრბუტების ინვერსიული ძებნა\n"
+"-T TYPE[,TYPE]...      მხოლოდ მითითებული ტიპის ობიექტების ძებნა\n"
+"-K                     მხოლოდ ძირითადი გასაღებები დაბრუნდება\n"
+"-r                     საკონტაქტო ინფორმაციის რეკურსიული ძებნის გამორთვა\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     also search all the mirrored databases\n"
+"-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     დომენის ობიექტის ლოკალური ასლის ჩვენება მაშინაც კი,\n"
+"                       როცა ის ბმებს შეიცავს\n"
+"-a                     ძებნა სარკულ ბაზებშიაც\n"
+"-s SOURCE[,SOURCE]...  მითითებული წყაროდან კოპირებულ ბაზაში ძებნა\n"
+"-g SOURCE:FIRST-LAST   განახლებების ძებნა წყაროდან სერიულად პირველიდან "
+"ჩანაწერიდან, ბოლომდე\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
+"-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\n"
+msgstr ""
+"-t TYPE                მითითებული ტიპის ობიექტისთვის  შაბლონს მოთხოვნა\n"
+"-v TYPE                მითითებული ტიპის ობიექტისთვის დამატებითი შაბლონის "
+"მოთხოვნა\n"
+"-q [version(ვერსია)|sources(წყაროები)|types(ტიპები)]  სერვერის მითითებული "
+"ინფორმაციის მოთხოვნა\n"
+
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "BSDI გაფართოებული DES-ზე ბაზირებული crypt(3)"
+
+#: ../mkpasswd.c:138
+msgid "standard 56 bit DES-based crypt(3)"
+msgstr "სტანდარტული 56 ბიტიანი DES-ზე ბაზირებული crypt(3)"
+
+#: ../mkpasswd.c:207
+#, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "არასწორი მეტოდი '%s'.\n"
+
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "არასწორი რიცხვი '%s'.\n"
+
+#: ../mkpasswd.c:246
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "მეტი ინფორმაციისთვის სცადეთ '%s --help'\n"
+
+#: ../mkpasswd.c:302
+#, 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 ბაიტი მაშინ, როცა მოსალოდნელი იყო %d ბაიტი.\n"
+msgstr[1] ""
+"მარილის არასწორი სიგრძე: %d ბაიტი მაშინ, როცა მოსალოდნელი იყო %d ბაიტი.\n"
+
+#: ../mkpasswd.c:307
+#, 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 ბაიტი მაშინ, როცა მოსალოდნელი იყო %d <= n <= %d "
+"ბაიტი.\n"
+msgstr[1] ""
+"მარილის არასწორი სიგრძე: %d ბაიტი მაშინ, როცა მოსალოდნელი იყო %d <= n <= %d "
+"ბაიტი.\n"
+
+#: ../mkpasswd.c:316
+#, c-format
+msgid "Illegal salt character '%c'.\n"
+msgstr "მარილიას დაუშვებელი სიმბოლო: '%c'.\n"
+
+#: ../mkpasswd.c:372 ../mkpasswd.c:385
+#, c-format
+msgid "Password: "
+msgstr "პაროლი: "
+
+#: ../mkpasswd.c:404
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr "მეთოდი crypt(3)-ის მიერ მხარდაუჭერელია.\n"
+
+#: ../mkpasswd.c:512
+#, c-format
+msgid ""
+"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Crypts the PASSWORD using crypt(3).\n"
+"\n"
+msgstr ""
+"გამოყენება: mkpasswd [პარამეტრები]... [პაროლი [მარილი]]\n"
+"მითითებული პაროლის crypt(3)-ით დაშიფვრა.\n"
+"\n"
+
+#: ../mkpasswd.c:515
+#, c-format
+msgid ""
+"      -m, --method=TYPE     select method TYPE\n"
+"      -5                    like --method=md5crypt\n"
+"      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=ტიპი     მითითებული ტიპის მეთოდის გამოყენება\n"
+"      -5                    იგივე, რაც --method=md5crypt\n"
+"      -S, --salt=მარილი       მითითებული მარილის გამოყენება\n"
+
+#: ../mkpasswd.c:520
+#, c-format
+msgid ""
+"      -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"
+msgstr ""
+"      -R, --rounds=რიცხვი   მითითებული რაოდენობის რაუნდების გამოყენება\n"
+"      -P, --password-fd=რცხვ პაროლების /dev/tty-ის მაგიერ მითითებული "
+"ფაილის\n"
+"                            დესკრიპტორიდან წაკითხვა\n"
+"      -s, --stdin           იგივე, რაც --password-fd=0\n"
+
+#: ../mkpasswd.c:526
+#, c-format
+msgid ""
+"      -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 ""
+"      -h, --help            ამ დახმარების გამოტანა და გასვლა\n"
+"      -V, --version         ვერსიის ინფორმაციის გამოტანა და გასვლა\n"
+"\n"
+"თუ პაროლი მითითებული არაა, მას ინტერაქტიურად გკითხავთ.\n"
+"თუ მარილი მითითებული არაა, ის შემთხვევითობის წესით დაგენერირდება.\n"
+" თუ ტიპი 'help'-ა, ეკრანზე იქნება ნაჩვენები ხელმისაწვდომი მეთოდები.\n"
+"\n"
+"შეცდომების შესახებ მიწერეთ: %s.\n"
+
+#: ../mkpasswd.c:549
+#, c-format
+msgid "Available methods:\n"
+msgstr "ხელმისაწვდომი მეთოდები:\n"

po/nb.po

@@ -1,330 +0,0 @@
-# Oversatt fra whois.pot.
-# Egil Kvaleberg <egil@kvaleberg.no>, 1999.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: whois 4.4.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+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: nb\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:148
-#, c-format
-msgid ""
-"Version %s.\n"
-"\n"
-"Report bugs to %s.\n"
-msgstr ""
-
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Bruker tjener %s.\n"
-
-#: ../whois.c:240
-msgid "This TLD has no whois server, but you can access the whois database at"
-msgstr ""
-
-#: ../whois.c:245
-msgid "This TLD has no whois server."
-msgstr ""
-
-#: ../whois.c:248
-msgid "No whois server is known for this kind of object."
-msgstr ""
-
-#: ../whois.c:251
-#, fuzzy
-msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Ukjent AS-nummer. Vennligst oppdater programmet."
-
-#: ../whois.c:267
-#, c-format
-msgid ""
-"\n"
-"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
-"\n"
-msgstr ""
-
-#: ../whois.c:273
-#, c-format
-msgid ""
-"\n"
-"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
-"\n"
-msgstr ""
-
-#: ../whois.c:292
-#, c-format
-msgid ""
-"Query string: \"%s\"\n"
-"\n"
-msgstr ""
-"Forespørsel: \"%s\"\n"
-"\n"
-
-#: ../whois.c:302
-#, fuzzy, c-format
-msgid ""
-"\n"
-"\n"
-"Found a referral to %s.\n"
-"\n"
-msgstr ""
-"\n"
-"Fant InterNIC-referanse til %s.\n"
-"\n"
-
-#: ../whois.c:344 ../whois.c:347
-#, c-format
-msgid "Cannot parse this line: %s"
-msgstr ""
-
-#: ../whois.c:516
-#, fuzzy
-msgid "Warning: RIPE flags used with a traditional server."
-msgstr "Merk: RIPE-flaggene ignoreres for en tradisjonell tjener."
-
-#: ../whois.c:675 ../whois.c:773
-#, fuzzy
-msgid ""
-"Catastrophic error: disclaimer text has been changed.\n"
-"Please upgrade this program.\n"
-msgstr ""
-"Alvorlig feil: INTERNIC har endret standardtekst.\n"
-"Vennligst oppdater programmet.\n"
-
-#: ../whois.c:828
-#, c-format
-msgid "Host %s not found."
-msgstr "Finner ikke verten %s."
-
-#: ../whois.c:838
-#, c-format
-msgid "%s/tcp: unknown service"
-msgstr "%s/tcp: ukjent port"
-
-#: ../whois.c:913
-msgid "Timeout."
-msgstr ""
-
-#: ../whois.c:919
-#, c-format
-msgid "Interrupted by signal %d..."
-msgstr "Avbrudt av signal %d..."
-
-#: ../whois.c:1189
-#, c-format
-msgid ""
-"Usage: whois [OPTION]... OBJECT...\n"
-"\n"
-"-h HOST, --host HOST   connect to server HOST\n"
-"-p PORT, --port 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"
-"\n"
-"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
-"-l                     find the one level less specific match\n"
-"-L                     find all levels less specific matches\n"
-"-m                     find all one level more specific matches\n"
-"-M                     find all levels of more specific matches\n"
-"-c                     find the smallest match containing a mnt-irt "
-"attribute\n"
-"-x                     exact match\n"
-"-b                     return brief IP address ranges with abuse contact\n"
-"-B                     turn off object filtering (show email addresses)\n"
-"-G                     turn off grouping of associated objects\n"
-"-d                     return DNS reverse delegation objects too\n"
-"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
-"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
-"-K                     only primary keys are returned\n"
-"-r                     turn off recursive look-ups for contact information\n"
-"-R                     force to show local copy of the domain object even\n"
-"                       if it contains referral\n"
-"-a                     also search all the mirrored databases\n"
-"-s SOURCE[,SOURCE]...  search the database mirrored 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\n"
-msgstr ""
-
-#: ../mkpasswd.c:84
-msgid "standard 56 bit DES-based crypt(3)"
-msgstr ""
-
-#: ../mkpasswd.c:165
-#, c-format
-msgid "Invalid method '%s'.\n"
-msgstr ""
-
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
-#, c-format
-msgid "Invalid number '%s'.\n"
-msgstr ""
-
-#: ../mkpasswd.c:201
-#, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr ""
-
-#: ../mkpasswd.c:242
-#, 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:247
-#, 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:256
-#, c-format
-msgid "Illegal salt character '%c'.\n"
-msgstr ""
-
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
-#, c-format
-msgid "Password: "
-msgstr ""
-
-#: ../mkpasswd.c:340
-#, c-format
-msgid "Method not supported by crypt(3).\n"
-msgstr ""
-
-#: ../mkpasswd.c:419
-#, c-format
-msgid ""
-"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
-"Crypts the PASSWORD using crypt(3).\n"
-"\n"
-msgstr ""
-
-#: ../mkpasswd.c:422
-#, 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 ""
-
-#: ../mkpasswd.c:452
-#, c-format
-msgid "Available methods:\n"
-msgstr ""
-
-#, fuzzy
-#~ 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 ""
-#~ "Bruk: whois [OPSJONER]... OBJEKTER...\n"
-#~ "\n"
-#~ "-a                     søk i alle databaser\n"
-#~ "-F                     full utskrift (impliserer -r)\n"
-#~ "-g KILDE:FØRSTE-SISTE  finn oppdateringer fra KILDE fra serie FØRSTE til "
-#~ "SISTE\n"
-#~ "-h VERT                koble til tjener VERT\n"
-#~ "-i ATTR[,ATTR]...      gjør reversoppslag for attributtene ATTR\n"
-#~ "-L                     finn alle mindre spesifike treff\n"
-#~ "-M                     finn alle mer spesifike treff\n"
-#~ "-m                     finn første nivå av mer spesifike treff\n"
-#~ "-r                     ikke foreta rekursive oppslag\n"
-#~ "-p PORT                koble til PORT\n"
-#~ "-R                     vis lokal kopi av objektet selv om det inneholder\n"
-#~ "                       en referanse\n"
-#~ "-S                     be tjeneren utelate syntaktisk \"sukker\"\n"
-#~ "-s KILDE[,KILDE]...    søk i databasen fra KILDE\n"
-#~ "-T TYPE[,TYPE]...      se bare på objekttype TYPE\n"
-#~ "-t TYPE                be om mal for objekttype TYPE ('all' gir en "
-#~ "liste)\n"
-#~ "-v TYPE                be om utførlig mal for objekttype TYPE\n"
-#~ "-V                     forklarer hva som skjer\n"
-#~ "\n"
-#~ "Versjon %s. Rapporter feil til %s.\n"
-
-#~ msgid "Using default server %s.\n"
-#~ msgstr "Bruker standardtjener %s.\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "Found referral to %s.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Fant InterNIC-referanse til %s.\n"
-#~ "\n"
-
-#~ msgid "Detected referral to %s on %s.\n"
-#~ msgstr "Referanse til %s vedrørende %s.\n"
-
-#~ msgid ""
-#~ "I don't know where this IP has been delegated.\n"
-#~ "I'll try ARIN and hope for the best..."
-#~ msgstr ""
-#~ "Vet ikke hvor denne IP-adressen har blitt delegert.\n"
-#~ "Prøver ARIN og håper det beste..."
-
-#~ msgid "I guess it's a netblock name but I don't know where to look it up."
-#~ msgstr "Gjetter at det er et netblock-navn, men vet ikke hvor det finnes."
-
-#~ msgid "I guess it's a domain but I don't know where to look it up."
-#~ msgstr "Gjetter at det er er domene, men vet ikke hvor det finnes."

po/pl.po

@@ -1,24 +1,24 @@
 # 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-2013
+# Michał 'CeFeK' Nazarewicz <cefek@career.pl>, 1999
+# Przemysław Knycz <djrzulf@pld.org.pl>, 2003
+# Jakub Bogusz <qboosh@pld-linux.org>, 2003-2023
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 5.0.24\n"
+"Project-Id-Version: whois 5.5.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2013-04-11 17:48+0200\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
+"PO-Revision-Date: 2023-10-05 21:30+0200\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-Type: text/plain; charset=UTF-8\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:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -27,31 +27,31 @@ msgid ""
 msgstr ""
 "Wersja %s.\n"
 "\n"
-"Błędy proszę zgłaszać na adres %s.\n"
+"Błędy proszę zgłaszać na adres %s.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Użycie serwera %s.\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 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"
+"Ta główna domena nie ma serwera whois, ale można użyć bazy danych whois pod"
 
-#: ../whois.c:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
-msgstr "Ta główna domena nie ma serwera whois."
+msgstr "Ta główna domena nie ma serwera whois."
 
-#: ../whois.c:248
+#: ../whois.c:337
 msgid "No whois server is known for this kind of object."
-msgstr "Dla tego rodzaju obiektu nie jest znany żaden serwer whois."
+msgstr "Dla tego rodzaju obiektu nie jest znany żaden serwer whois."
 
-#: ../whois.c:251
+#: ../whois.c:340
 msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Nieznany numer AS lub sieć IP. Proszę uaktualnić ten program."
+msgstr "Nieznany numer AS lub sieć IP. Proszę uaktualnić ten program."
 
-#: ../whois.c:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Użycie serwera %s.\n"
+
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -59,10 +59,10 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Pytanie o zakończenie IPv4 %s adresu IPv6 typu 6to4.\n"
+"Pytanie o zakończenie IPv4 %s adresu IPv6 typu 6to4.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, c-format
 msgid ""
 "\n"
@@ -70,10 +70,10 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Pytanie o zakończenie IPv4 %s adresu IPv6 Teredo.\n"
+"Pytanie o zakończenie IPv4 %s adresu IPv6 Teredo.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
 "Zapytanie: \"%s\"\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -95,185 +95,256 @@ msgstr ""
 "Znaleziono odniesienie do %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
-msgstr "Nie można przeanalizować tej linii: %s"
+msgstr "Nie można przeanalizować tej linii: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
-msgstr "Uwaga: użyto flag RIPE ze starszym serwerem."
+msgstr "Uwaga: użyto flag RIPE ze starszym serwerem."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
 msgstr ""
-"Katastrofa! Tekst oświadczenia został zmieniony.\n"
-"Proszę uaktualnić ten program.\n"
+"Katastrofa! Tekst oświadczenia został zmieniony.\n"
+"Proszę uaktualnić ten program.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
-msgstr "Serwer %s nie został znaleziony."
+msgstr "Serwer %s nie został znaleziony."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
-msgstr "%s/tcp: usługa nieznana"
+msgstr "%s/tcp: usługa nieznana"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
-msgstr "Upłynął limit czasu."
+msgstr "Upłynął limit czasu."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
-msgstr "Przerwano sygnałem %d..."
+msgstr "Przerwano sygnałem %d..."
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
 "-H                     hide legal disclaimers\n"
+msgstr ""
+"Składnia: whois [OPCJA]... OBIEKT...\n"
+"\n"
+"-h HOST, --host HOST   łączenie z serwerem HOST\n"
+"-p PORT, --port PORT   łączenie z portem PORT\n"
+"-I                     odpytanie whois.iana.org i podążanie za odwołaniami\n"
+"-H                     ukrycie oświadczeń prawnych\n"
+
+#: ../whois.c:1506
+#, c-format
+msgid ""
 "      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 "\n"
+msgstr ""
+"      --verbose        wyjaśnianie, co się dzieje\n"
+"      --no-recursion   wyłączenie rekurencji z serwerów rejestru do rejestratorów\n"
+"      --help           wyświetlenie tego opisu i zakończenie działania\n"
+"      --version        wyświetlenie informacji o wersji i zakończenie "
+"działania\n"
+"\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
 "These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
 "-l                     find the one level less specific match\n"
 "-L                     find all levels less specific matches\n"
 "-m                     find all one level more specific matches\n"
 "-M                     find all levels of more specific matches\n"
+msgstr ""
+"Następujące flagi są obsługiwane przez serwery whois.ripe.net i podobne:\n"
+"-l                     zapytanie o jeden poziom mniej szczegółowe\n"
+"-L                     wyszukanie wszystkich mniej szczegółowych dopasowań\n"
+"-m                     wyszukanie pierwszego bardziej szczegółowego "
+"dopasowania\n"
+"-M                     wyszukanie wszystkich bardziej szczegółowych "
+"dopasowań\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
 "-c                     find the smallest match containing a mnt-irt "
 "attribute\n"
 "-x                     exact match\n"
 "-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
+"-c                     wyszukanie najmniejszego dopasowania z atrybutem mnt-"
+"irt\n"
+"-x                     dokładne dopasowanie\n"
+"-b                     wypisanie zwięźle przedziałów adresów IP i kontaktu "
+"abuse\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
 "-B                     turn off object filtering (show email addresses)\n"
 "-G                     turn off grouping of associated objects\n"
 "-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-B                     bez filtrowania abiektów (wyświetlanie adresów e-"
+"mail)\n"
+"-G                     bez grupowania powiązanych obiektów\n"
+"-d                     także obiekty odwrotnej delegacji DNS\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
 "-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
 "-T TYPE[,TYPE]...      only look for objects of TYPE\n"
 "-K                     only primary keys are returned\n"
 "-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-T TYP[,TYP]...        szukanie tylko obiektów podanego TYPU\n"
+"-K                     zwrócenie tylko podstawowych kluczy\n"
+"-r                     bez rekursywnego poszukiwania informacji "
+"kontaktowych\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
 "-R                     force to show local copy of the domain object even\n"
 "                       if it contains referral\n"
 "-a                     also search all the mirrored databases\n"
 "-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
 "-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     wymuszenie pokazania lokalnej kopii obiektu domeny "
+"nawet\n"
+"                       jeśli zawiera odwołanie\n"
+"-a                     przeszukanie wszystkich baz danych z kopii "
+"lustrzanej\n"
+"-s ŹRÓDŁO[,ŹRÓDŁO]...  przeszukanie odbicia lustrzanego bazy danych ze "
+"ŹRÓDŁA\n"
+"-g ŹRÓDŁO:PIERW.-OST.  szukanie uaktualnień ze ŹRÓDŁA od numeru PIERW. do "
+"OST.\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
 "-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\n"
 msgstr ""
-"Składnia: whois [OPCJA]... OBIEKT...\n"
-"\n"
-"-h HOST, --host HOST   łączenie z serwerem HOST\n"
-"-p PORT, --port PORT   łączenie z portem PORT\n"
-"-H                     ukrycie oświadczeń prawnych\n"
-"      --verbose        wyjaśnianie, co się dzieje\n"
-"      --help           wyświetlenie tego opisu i zakończenie działania\n"
-"      --version        wyświetlenie informacji o wersji i zakończenie działania\n"
-"\n"
-"Następujące flagi są obsługiwane przez serwery whois.ripe.net i podobne:\n"
-"-l                     zapytanie o jeden poziom mniej szczegółowe\n"
-"-L                     wyszukanie wszystkich mniej szczegółowych dopasowań\n"
-"-m                     wyszukanie pierwszego bardziej szczegółowego dopasowania\n"
-"-M                     wyszukanie wszystkich bardziej szczegółowych dopasowań\n"
-"-c                     wyszukanie najmniejszego dopasowania z atrybutem mnt-irt\n"
-"-x                     dokładne dopasowanie\n"
-"-b                     wypisanie zwięźle przedziałów adresów IP i kontaktu abuse\n"
-"-B                     bez filtrowania abiektów (wyświetlanie adresów e-mail)\n"
-"-G                     bez grupowania powiązanych obiektów\n"
-"-d                     także obiekty odwrotnej delegacji DNS\n"
-"-i ATR[,ATR]...        wykonanie odwrotnego wyszukiwania ATRybutów\n"
-"-T TYP[,TYP]...        szukanie tylko obiektów podanego TYPU\n"
-"-K                     zwrócenie tylko podstawowych kluczy\n"
-"-r                     bez rekursywnego poszukiwania informacji kontaktowych\n"
-"-R                     wymuszenie pokazania lokalnej kopii obiektu domeny nawet\n"
-"                       jeśli zawiera odwołanie\n"
-"-a                     przeszukanie wszystkich baz danych z kopii lustrzanej\n"
-"-s ŹRÓDŁO[,ŹRÓDŁO]...  przeszukanie odbicia lustrzanego bazy danych ze ŹRÓDŁA\n"
-"-g ŹRÓDŁO:PIERW.-OST.  szukanie uaktualnień ze ŹRÓDŁA od numeru PIERW. do OST.\n"
-"-t TYP                 żądanie szablonu dla obiektu podanego TYPU\n"
-"-v TYP                 żądanie szczegółowego szablonu dla obiektu podanego TYPU\n"
+"-t TYP                 żądanie szablonu dla obiektu podanego TYPU\n"
+"-v TYP                 żądanie szczegółowego szablonu dla obiektu podanego "
+"TYPU\n"
 "-q [version|sources|types]  zapytanie serwera o podane informacje\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "oparta o DES rozszerzona funkcja crypt(3) BSDI"
+
+#: ../mkpasswd.c:138
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "standardowa 56-bitowa, oparta o DES funkcja crypt(3)"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
-msgstr "Nieprawidłowa metoda '%s'.\n"
+msgstr "Nieprawidłowa metoda '%s'.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
-msgstr "Nieprawidłowa liczba '%s'.\n"
+msgstr "Nieprawidłowa liczba '%s'.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "'%s --help' poda więcej informacji.\n"
+msgstr "'%s --help' poda więcej informacji.\n"
 
 # : ../mkpasswd.c:152
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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] "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"
+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:247
+#: ../mkpasswd.c:297
 #, 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"
+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:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
-msgstr "Błędny znak zarodka '%c'.\n"
+msgstr "Błędny znak zarodka '%c'.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
-msgstr "Hasło: "
+msgstr "Hasło: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
-msgstr "Metoda nie obsługiwana przez crypt(3).\n"
+msgstr "Metoda nie obsługiwana przez crypt(3).\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 "Crypts the PASSWORD using crypt(3).\n"
 "\n"
 msgstr ""
-"Składnia: mkpasswd [OPCJE]... [HASŁO [ZARODEK]]\n"
-"Koduje HASŁO przy użyciu funkcji crypt(3).\n"
+"Składnia: mkpasswd [OPCJE]... [HASŁO [ZARODEK]]\n"
+"Koduje HASŁO przy użyciu funkcji crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TYP      wybór metody TYP\n"
+"      -5                    to samo, co --method=md5crypt\n"
+"      -S, --salt=ZARODEK    użycie podanego ZARODKA\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -R, --rounds=LICZBA   użycie podanej LICZBY cykli\n"
+"      -P, --password-fd=NUM odczyt hasła z deskryptora pliku NUM zamiast\n"
+"                            z /dev/tty\n"
+"      -s, --stdin           to samo co --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -283,24 +354,17 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -m, --method=TYP      wybór metody TYP\n"
-"      -5                    to samo, co --method=md5\n"
-"      -S, --salt=ZARODEK    użycie podanego ZARODKA\n"
-"      -R, --rounds=LICZBA   użycie podanej LICZBY cykli\n"
-"      -P, --password-fd=NUM odczyt hasła z deskryptora pliku NUM zamiast\n"
-"                            z /dev/tty\n"
-"      -s, --stdin           to samo co --password-fd=0\n"
-"      -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
-"      -V, --version         wyświetlenie informacji o wersji i zakończenie "
-"działania\n"
+"      -h, --help            wyświetlenie tego opisu i zakończenie działania\n"
+"      -V, --version         wyświetlenie informacji o wersji i zakończenie "
+"działania\n"
 "\n"
-"Jeśli nie podano HASŁA, pobierane jest interaktywnie.\n"
-"Jeśli nie podano ZARODKA, generowany jest losowy.\n"
-"Jeśli podano TYP 'help', wypisywane są dostępne metody.\n"
+"Jeśli nie podano HASŁA, pobierane jest interaktywnie.\n"
+"Jeśli nie podano ZARODKA, generowany jest losowy.\n"
+"Jeśli podano TYP 'help', wypisywane są dostępne metody.\n"
 "\n"
-"Błędy proszę zgłaszać na adres %s.\n"
+"Błędy proszę zgłaszać na adres %s.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, c-format
 msgid "Available methods:\n"
-msgstr "Dostępne metody:\n"
+msgstr "Dostępne metody:\n"

po/pt_BR.po

@@ -5,53 +5,53 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 4.7.5\n"
+"Project-Id-Version: whois 5.5.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2006-04-26 21:03-0300\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
+"PO-Revision-Date: 2020-02-17 10:30+0000\n"
 "Last-Translator: Anderson Goulart <globalx@gmail.com>\n"
 "Language-Team: Portuguese/Brazil\n"
 "Language: pt_BR\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:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"Versão %s \n"
+"Versão %s.\n"
 "\n"
-"Reporte bugs para %s \n"
+"Reporte falhas(bugs) para %s \n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
+#: ../whois.c:329
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr ""
+"Este TLD não possui servidor whois, mas você pode acessar a base de dados do "
+"whois em"
+
+#: ../whois.c:334
+msgid "This TLD has no whois server."
+msgstr "Não existe servidor whois para este TLD."
+
+#: ../whois.c:337
+msgid "No whois server is known for this kind of object."
+msgstr "Nenhum servidor whois é conhecido para este tipo de objeto."
+
+#: ../whois.c:340
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "Número AS ou rede IP desconhecidos. Por favor, atualize este programa."
+
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
 #, c-format
 msgid "Using server %s.\n"
 msgstr "Utilizando servidor %s.\n"
 
-#: ../whois.c:240
-msgid "This TLD has no whois server, but you can access the whois database at"
-msgstr ""
-"Este TLD não tem servidor whois, mas você pode acessar a base de dados do "
-"whois em"
-
-#: ../whois.c:245
-msgid "This TLD has no whois server."
-msgstr "Não existe servidor whois para este TLD."
-
-#: ../whois.c:248
-msgid "No whois server is known for this kind of object."
-msgstr "Nenhum servidor whois é conhecido para este tipo de objeto."
-
-#: ../whois.c:251
-msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "Número AS ou rede IP desconhecidos. Por favor, atualize este programa."
-
-#: ../whois.c:267
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -59,30 +59,30 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Procurando pela extremidade IPv4 %s de um endereço IPv6. 6to4.\n"
+"Procurando pelo endereço IPv4 %s a partir de um endereço 6to4 IPv6.\n"
 "\n"
 
-#: ../whois.c:273
-#, fuzzy, c-format
+#: ../whois.c:369
+#, c-format
 msgid ""
 "\n"
 "Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
 "\n"
 msgstr ""
 "\n"
-"Procurando pela extremidade IPv4 %s de um endereço IPv6. 6to4.\n"
+"Procurando pelo endereço IPv4 %s a partir de um endereço Teredo IPv6.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
 "\n"
 msgstr ""
-"Consulta: \"%s\"\n"
+"Texto de consulta: \"%s\"\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -92,155 +92,265 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Uma referência para·%s encontrada.\n"
+"Referência encontrada para %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
-msgstr "Não pôde processar esta linha: %s"
+msgstr "Não conseguiu processar esta linha: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Aviso: RIPE flags utilizados com um servidor tradicional."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
 msgstr ""
-"Erro catastrófico: o texto das condições de uso foi alterado.\n"
-"Por favor, atualize este programa. \n"
+"Erro catastrófico: o texto das condições de uso foi alterado.\n"
+"Por favor, atualize este programa.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
-msgstr "Host %s não encontrado."
+msgstr "Hospedeiro %s não encontrado."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
-msgstr "%s/tcp: serviço desconhecido"
+msgstr "%s/tcp: serviço desconhecido"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Tempo esgotado."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Interrompido pelo sinal %d..."
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
 "-H                     hide legal disclaimers\n"
+msgstr ""
+"Uso: whois [OPTION]... OBJECT...\n"
+"\n"
+"-h HOST                conecta no servidor(HOST)\n"
+"-p PORT                conecta na porta(PORT)\n"
+"-H                     esconde o aviso legal\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
 "      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 "\n"
+msgstr ""
+"      --verbose        exibe detalhes de execução\n"
+"      --help           exibe esta ajuda e termina\n"
+"      --version        exibe informações sobre a versão e termina\n"
+"\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
 "These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
 "-l                     find the one level less specific match\n"
 "-L                     find all levels less specific matches\n"
 "-m                     find all one level more specific matches\n"
 "-M                     find all levels of more specific matches\n"
+msgstr ""
+"Estas opções(flags) são suportadas pelo servider whois.ripe.net e alguns "
+"servidores RIPE compatíveis:\n"
+"-l                     encontre a correspondência menos específica de nível "
+"um\n"
+"-L                     encontra todos os níveis de correspondências menos "
+"específicas\n"
+"-m                     encontra todas as correspondências mais específicas "
+"do nível um\n"
+"-M                     encontra todos os níveis de correspondências mais "
+"específicas\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
 "-c                     find the smallest match containing a mnt-irt "
 "attribute\n"
 "-x                     exact match\n"
 "-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
+"-c                     busca a correspondência menos específica que contém o "
+"atributo mnt-irt\n"
+"-x                     busca exata\n"
+"-b                     retorna o resumo de faixas de endereços IP com o "
+"contato de abuso\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
 "-B                     turn off object filtering (show email addresses)\n"
 "-G                     turn off grouping of associated objects\n"
 "-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-B                     desliga o filtro de objetos (exibe o endereço de "
+"email)\n"
+"-G                     desliga o agrupamento de objectos associados\n"
+"-d                     retorna também os objetos de delegação de DNS "
+"reverso\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
 "-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
 "-T TYPE[,TYPE]...      only look for objects of TYPE\n"
 "-K                     only primary keys are returned\n"
 "-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-i ATTR[,ATTR]...      efetua uma busca inversa para os atributtos(ATTR) "
+"especificados\n"
+"-T TYPE[,TYPE]...      busca somente por objetos do tipo(TYPE) "
+"especificados\n"
+"-K                     somente chaves primárias são retornadas\n"
+"-r                     desabilita buscas recursivas para informações de "
+"contatos\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
 "-R                     force to show local copy of the domain object even\n"
 "                       if it contains referral\n"
 "-a                     also search all the mirrored databases\n"
 "-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
 "-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     força a exibição da cópia local do objeto de domínio "
+"mesmo que\n"
+"                       ele contenha referência\n"
+"-a                     busca em todas as bases de dados espelhadas\n"
+"-s SOURCE[,SOURCE]...  busca na base de dados espelhada a partir das "
+"fontes(SOURCE) especificadas\n"
+"-g SOURCE:FIRST-LAST   encontra atualizações a partir da fonte(SOURCE) entre "
+"o serial primeiro(FIRST) e último(LAST)\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
 "-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\n"
 msgstr ""
+"-t TYPE                obtém o modelo para objeto do tipo(TYPE) "
+"especificado\n"
+"-v TYPE                obtém o modelo detalhado para objeto do tipo(TYPE) "
+"especificado\n"
+"-q [version|sources|types]  consulta informações especificadas do servidor\n"
 
-#: ../mkpasswd.c:84
-#, fuzzy
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "BSDI extendido baseado em DES crypt(3)"
+
+#: ../mkpasswd.c:138
 msgid "standard 56 bit DES-based crypt(3)"
-msgstr "\tstandard 56 bit DES-based crypt(3)"
+msgstr "padrão 56 bit baseado em DES crypt(3)"
 
-#: ../mkpasswd.c:165
-#, fuzzy, c-format
+#: ../mkpasswd.c:207
+#, c-format
 msgid "Invalid method '%s'.\n"
-msgstr "Número inválido '%s'.\n"
+msgstr "Método inválido '%s'.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
-msgstr "Número inválido '%s'.\n"
+msgstr "Número inválido '%s'.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "Tente '%s --help para maiores informações.\n"
+msgstr "Tente '%s --help para maiores informações.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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"
+msgstr[0] "Tamanho do sal(salt) incorreto: %d byte enquanto %d era esperado.\n"
+msgstr[1] ""
+"Tamanho do sal(salt) incorreto: %d bytes enquanto %d era esperado.\n"
 
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:297
 #, 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"
+"Tamanho do sal(salt) incorreto: %d byte enquanto %d <= n <= %d era "
+"esperado.\n"
 msgstr[1] ""
-"Tamanho do salt incorreto: %d bytes enquanto %d <= n <= %d eram esperados.\n"
+"Tamanho do sal(salt) incorreto: %d bytes enquanto %d <= n <= %d era "
+"esperado.\n"
 
-#: ../mkpasswd.c:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
-msgstr "Caractere salt ilegal '%c'.\n"
+msgstr "Caractere sal(salt) ilegal '%c'.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Senha: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
-msgstr ""
+msgstr "Método não suportado por crypt(3).\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
 "Crypts the PASSWORD using crypt(3).\n"
 "\n"
 msgstr ""
-"Uso: mkpasswd [OPÇÕES]... [PASSWORD [SALT]]\n"
-"Encripta a PASSWORD utilizando crypt(3).\n"
+"Uso: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Encripta a senha(PASSWORD) utilizando crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:422
-#, fuzzy, c-format
+#: ../mkpasswd.c:500
+#, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TYPE     seleciona o método do tipo(TYPE) especificado\n"
+"      -5                    igual a --method=md5crypt\n"
+"      -S, --salt=SALT       usa o sal(SALT) especificado\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -R, --rounds=NUMBER   utiliza o número(NUMBER) de rodadas "
+"especificado\n"
+"      -P, --password-fd=NUM lê a senha do descritor de arquivo NUM\n"
+"                            ao invés do /dev/tty\n"
+"      -s, --stdin           igual a --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -250,100 +360,17 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -H, --hash=TYPE       seleciona o hash TYPE\n"
-"      -S, --salt=SALT       usa o SALT específico\n"
-"      -P, --password-fd=NUM lê a senha do descritor de arquivo NUM\n"
-"                            ao invés do /dev/tty\n"
-"      -s, --stdin           como em --password-fd=0\n"
-"      -h, --help            exibe essa ajuda e sai\n"
-"      -V, --version         exibe informações sobre a versão e sai\n"
+"      -h, --help            exibe essa ajuda(help) e sai\n"
+"      -V, --version         exibe informações sobre a versão(version) e sai\n"
 "\n"
-"Se PASSWORD estiver faltando, então este será requisitado interativamente.\n"
-"Se nenhum SALT for especificado, um randômico é gerado.\n"
-"Se TYPE é igual a 'help', os algoritmos disponíveis são exibidos.\n"
+"Se a senha(PASSWORD) estiver faltando, esta será requisitada "
+"interativamente.\n"
+"Se nenhum sal(SALT) for especificado, um sal randômico é gerado.\n"
+"Se o tipo(TYPE) é igual a 'help', os métodos disponíveis são exibidos.\n"
 "\n"
-"Reporte bugs para %s.\n"
+"Reporte falhas(bugs) para %s.\n"
 
-#: ../mkpasswd.c:452
-#, fuzzy, c-format
+#: ../mkpasswd.c:534
+#, c-format
 msgid "Available methods:\n"
-msgstr "Algoritmos disponíveis: \n"
-
-#, fuzzy
-#~ 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 ""
-#~ "Uso: whois [OPÇÕES]... OBJETO...\n"
-#~ "\n"
-#~ "-l                     descende em um nível a especificidade da busca "
-#~ "[RPSL]\n"
-#~ "-L                     busca as correspondências menos específicas\n"
-#~ "-m                     busca o primeiro nível mais específico\n"
-#~ "-M                     busca as correspondências mais específicas\n"
-#~ "-c                     busca a correspondência menos específica que "
-#~ "contém o atributo mnt-irt\n"
-#~ "-x                     busca exata [RPSL]\n"
-#~ "-d                     retorna também objetos de delegação de DNS reverso "
-#~ "[RPSL]\n"
-#~ "-i ATTR[,ATTR]...      efetua uma busca inversa para os ATTRibutos "
-#~ "especificados\n"
-#~ "-T TIPO[,TIPO]...      busca somente por objetos do TIPO\n"
-#~ "-K                     somente chaves primárias são retornadas [RPSL]\n"
-#~ "-r                     desabilita buscas recursivas para informações de "
-#~ "contatos\n"
-#~ "-R                     mostra a cópia local do objeto especificado "
-#~ "incluso\n"
-#~ "                       se contém uma referência\n"
-#~ "-a                     busca em todas as bases de dados\n"
-#~ "-s SOURCE[,SOURCE]...  busca na base de dados de SOURCE\n"
-#~ "-g SOURCE:FIRST-LAST   encontra atualizações de SOURCE da série FIRST até "
-#~ "LAST\n"
-#~ "-t TIPO                obtém o modelo para objeto de TIPO ('all' para uma "
-#~ "lista)\n"
-#~ "-v TIPO                obtém o modelo detalhado para objeto de TIPO\n"
-#~ "-q [version|sources|types]  consulta informações sobre o servidor [RPSL]\n"
-#~ "-F                     modo rápido (implica -r)\n"
-#~ "-h HOST                conecta no servidor HOST\n"
-#~ "-p PORTA                conecta na PORTA\n"
-#~ "-H                     esconde o aviso legal\n"
-#~ "      --verbose        mostra o que está acontecendo\n"
-#~ "      --help           exibe essa ajuda e sai\n"
-#~ "      --version        exibe informações sobre a versão e sai\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 inválido '%s'.\n"
+msgstr "Métodos disponíveis:\n"

po/ru.po

@@ -3,24 +3,24 @@
 # This file is distributed under the same license as the whois package.
 #
 # Andy Shevchenko <andy@smile.org.ua>, 2005.
-# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2012, 2013.
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010, 2012, 2013, 2019.
 msgid ""
 msgstr ""
-"Project-Id-Version: whois 5.0.24\n"
+"Project-Id-Version: whois 5.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
-"PO-Revision-Date: 2013-04-10 21:24+0400\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
+"PO-Revision-Date: 2019-06-29 09:55+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: Lokalize 1.4\n"
+"X-Generator: Lokalize 2.0\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:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -31,29 +31,29 @@ msgstr ""
 "\n"
 "Сообщения об ошибках отправляйте на %s.\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
-#, c-format
-msgid "Using server %s.\n"
-msgstr "Используется сервер %s.\n"
-
-#: ../whois.c:240
+#: ../whois.c:329
 msgid "This TLD has no whois server, but you can access the whois database at"
 msgstr ""
 "Данный TLD не имеет whois-сервера, но можно получить доступ к базе whois на"
 
-#: ../whois.c:245
+#: ../whois.c:334
 msgid "This TLD has no whois server."
 msgstr "Данный TLD не имеет whois-сервера."
 
-#: ../whois.c:248
+#: ../whois.c:337
 msgid "No whois server is known for this kind of object."
 msgstr "Нет whois-сервера для объектов данного вида."
 
-#: ../whois.c:251
+#: ../whois.c:340
 msgid "Unknown AS number or IP network. Please upgrade this program."
 msgstr "Неизвестный номер AS или IP-сеть. Пожалуйста, обновите программу."
 
-#: ../whois.c:267
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "Используется сервер %s.\n"
+
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -64,7 +64,7 @@ msgstr ""
 "Запрашивается конечная IPv4-точка %s для IPv6-адреса 6-в-4.\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, c-format
 msgid ""
 "\n"
@@ -75,7 +75,7 @@ msgstr ""
 "Запрашивается конечная IPv4-точка %s для IPv6-адреса Teredo.\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -84,7 +84,7 @@ msgstr ""
 "Строка запроса: \"%s\"\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -97,16 +97,16 @@ msgstr ""
 "Найдено перенаправление на %s.\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "Невозможно разобрать строку: %s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "Предупреждение: флаги RIPE используются с традиционным сервером."
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -114,71 +114,65 @@ msgstr ""
 "Катастрофическая ошибка: текст правовой оговорки был изменён.\n"
 "Пожалуйста, обновите программу.\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "Узел %s не найден."
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: неизвестный сервис"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "Задержка."
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "Прервано по сигналу %d..."
 
-#: ../whois.c:1189
+#: ../whois.c:1499
 #, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
 "-H                     hide legal disclaimers\n"
+msgstr ""
+"Использование: whois [ПАРАМЕТР]… ОБЪЕКТ…\n"
+"\n"
+"-h УЗЕЛ, --host УЗЕЛ   подключиться к серверному УЗЛУ\n"
+"-p ПОРТ, --port ПОРТ   подключаться по ПОРТУ\n"
+"-I                     запросить whois.iana.org и следовать результатам\n"
+"-H                     скрыть уведомление о правах\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
 "      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 "\n"
+msgstr ""
+"      --verbose        разъяснять, что происходит\n"
+"      --help           показать эту справку и закончить работу\n"
+"      --version        показать информацию о версии и закончить работу\n"
+"\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
 "These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
 "-l                     find the one level less specific match\n"
 "-L                     find all levels less specific matches\n"
 "-m                     find all one level more specific matches\n"
 "-M                     find all levels of more specific matches\n"
-"-c                     find the smallest match containing a mnt-irt "
-"attribute\n"
-"-x                     exact match\n"
-"-b                     return brief IP address ranges with abuse contact\n"
-"-B                     turn off object filtering (show email addresses)\n"
-"-G                     turn off grouping of associated objects\n"
-"-d                     return DNS reverse delegation objects too\n"
-"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
-"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
-"-K                     only primary keys are returned\n"
-"-r                     turn off recursive look-ups for contact information\n"
-"-R                     force to show local copy of the domain object even\n"
-"                       if it contains referral\n"
-"-a                     also search all the mirrored databases\n"
-"-s SOURCE[,SOURCE]...  search the database mirrored 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\n"
 msgstr ""
-"Использование: whois [ПАРАМЕТР]… ОБЪЕКТ…\n"
-"\n"
-"-h УЗЕЛ, --host УЗЕЛ   подключиться к УЗЛУ\n"
-"-p ПОРТ, --port ПОРТ   подключиться к ПОРТУ\n"
-"-H                     скрыть уведомление о правах\n"
-"      --verbose        разъяснять, что происходит\n"
-"      --help           показать эту справку и закончить работу\n"
-"      --version        показать информацию о версии и закончить работу\n"
-"\n"
 "Эти флаги поддерживаются whois.ripe.net и некоторыми RIPE-подобными "
 "серверами:\n"
 "-l                     одноуровневый минимальный поиск\n"
@@ -186,50 +180,100 @@ msgstr ""
 "-m                     найти первый уровень при максимуме указанных "
 "совпадений\n"
 "-M                     найти всё при максимуме указанных совпадений\n"
-"-c                     найти наименьшее совпадение, содержащее атрибут "
-"mnt-irt\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
+"-c                     найти наименьшее совпадение, содержащее атрибут mnt-"
+"irt\n"
 "-x                     точное совпадение\n"
 "-b                     вернуть краткий диапазон IP-адресов\n"
 "                       с контактом для жалоб\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
+"-B                     turn off object filtering (show email addresses)\n"
+"-G                     turn off grouping of associated objects\n"
+"-d                     return DNS reverse delegation objects too\n"
+msgstr ""
 "-B                     выключить объектную фильтрацию (показ адресов эл. "
 "почты)\n"
 "-G                     выключить группировку связанных объектов\n"
-"-d                     возвращать также реверсные делегированные объекты DNS\n"
+"-d                     возвращать также реверсные делегированные объекты "
+"DNS\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
+"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned\n"
+"-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
 "-i АТР[,АТР]…          выполнить инверсный поиск для указанных АТРибутов\n"
 "-T ТИП[,ТИП]…          поиск только объектов с типом ТИП\n"
 "-K                     возвращать только основные ключи\n"
 "-r                     выключить рекурсивный поиск контактной информации\n"
-"-R                     всегда показывать локальную копию объекта домена даже\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     also search all the mirrored databases\n"
+"-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     всегда показывать локальную копию объекта домена "
+"даже\n"
 "                       если она содержит перенаправление\n"
 "-a                     искать на всех зеркалах базы\n"
 "-s ИСТОЧНИК[,ИСТ]…     искать в базе-зеркале ИСТОЧНИКА\n"
 "-g ИСТОЧНИК:ПЕРВЫЙ-ПОСЛЕДНИЙ\n"
 "                       найти обновления ИСТОЧНИКА от ПЕРВОГО до ПОСЛЕДНЕГО\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
+"-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\n"
+msgstr ""
 "-t ТИП                 запросить шаблон для объекта с типом ТИП\n"
 "-v ТИП                 запросить расширенный шаблон для объекта с типом ТИП\n"
 "-q [version|sources|types]\n"
 "                       запросить указанную информацию о сервере\n"
 
-#: ../mkpasswd.c:84
-msgid "standard 56 bit DES-based crypt(3)"
-msgstr "стандартный 56-битный, базирующийся на DES, crypt(3)"
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "основанный на DES crypt(3), расширенный BSDI"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:138
+msgid "standard 56 bit DES-based crypt(3)"
+msgstr "основанный на стандартном 56-битном DES crypt(3)"
+
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "Неверный метод '%s'.\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "Неверный номер '%s'.\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "Доп. информацию можно получить, запустив '%s --help'.\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, c-format
 msgid "Wrong salt length: %d byte when %d expected.\n"
 msgid_plural "Wrong salt length: %d bytes when %d expected.\n"
@@ -237,7 +281,7 @@ msgstr[0] "Неверная длина соли: %d байт при ожидае
 msgstr[1] "Неверная длина соли: %d байта при ожидаемой %d.\n"
 msgstr[2] "Неверная длина соли: %d байт при ожидаемой %d.\n"
 
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:297
 #, 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"
@@ -245,22 +289,22 @@ msgstr[0] "Неверная длина соли: %d байт при ожидае
 msgstr[1] "Неверная длина соли: %d байта при ожидаемой %d <= n <= %d.\n"
 msgstr[2] "Неверная длина соли: %d байт при ожидаемой %d <= n <= %d.\n"
 
-#: ../mkpasswd.c:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "Недопустимый для соли символ '%c'.\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "Пароль: "
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr "Данный метод не поддерживается crypt(3).\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -271,16 +315,33 @@ msgstr ""
 "Шифрует ПАРОЛЬ, используя crypt(3).\n"
 "\n"
 
-#: ../mkpasswd.c:422
+#: ../mkpasswd.c:500
 #, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=ТИП        использовать метод ТИП\n"
+"      -5                      аналогично --method=md5crypt\n"
+"      -S, --salt=СОЛЬ         использовать указанную СОЛЬ\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -R, --rounds=ЧИСЛО      использовать указанное ЧИСЛО округлений\n"
+"      -P, --password-fd=НОМЕР прочитать пароль из дескриптора файла\n"
+"                              с НОМЕРом вместо /dev/tty\n"
+"      -s, --stdin             аналогично --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -290,13 +351,6 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -m, --method=ТИП        использовать метод ТИП\n"
-"      -5                      аналогично --method=md5\n"
-"      -S, --salt=СОЛЬ         использовать указанную СОЛЬ\n"
-"      -R, --rounds=ЧИСЛО      использовать указанное ЧИСЛО округлений\n"
-"      -P, --password-fd=НОМЕР прочитать пароль из дескриптора файла\n"
-"                              с НОМЕРом вместо /dev/tty\n"
-"      -s, --stdin             аналогично --password-fd=0\n"
 "      -h, --help              показать эту справку и закончить работу\n"
 "      -V, --version           показать версию и закончить работу\n"
 "\n"
@@ -306,7 +360,7 @@ msgstr ""
 "\n"
 "Сообщения об ошибках отправляйте на %s.\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, c-format
 msgid "Available methods:\n"
 msgstr "Доступные методы:\n"

po/tr.po

@@ -0,0 +1,357 @@
+# translation of whois to Turkish
+# Copyright (C) 2022
+# This file is distributed under the same license as the whois package.
+# Oğuz Ersen <oguz@ersen.moe>, 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: whois\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-04-01 22:10+0300\n"
+"PO-Revision-Date: 2022-04-01 23:06+0300\n"
+"Last-Translator: Oğuz Ersen <oguz@ersen.moe>\n"
+"Language-Team: \n"
+"Language: tr\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:240
+#, c-format
+msgid ""
+"Version %s.\n"
+"\n"
+"Report bugs to %s.\n"
+msgstr ""
+"Sürüm %s.\n"
+"\n"
+"Hataları %s adresine bildirin.\n"
+
+#: ../whois.c:329
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr ""
+"Bu TLD'nin whois sunucusu yok, ancak whois veri tabanına şu adresten "
+"erişebilirsiniz"
+
+#: ../whois.c:334
+msgid "This TLD has no whois server."
+msgstr "Bu TLD'nin whois sunucusu yok."
+
+#: ../whois.c:337
+msgid "No whois server is known for this kind of object."
+msgstr "Bu tür nesneler için bilinen bir whois sunucusu yok."
+
+#: ../whois.c:340
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "Bilinmeyen AS numarası veya IP ağı. Lütfen bu programı güncelleyin."
+
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
+#, c-format
+msgid "Using server %s.\n"
+msgstr "%s sunucusu kullanılıyor.\n"
+
+#: ../whois.c:362
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a 6to4 IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"6to4 IPv6 adresinin IPv4 uç noktası %s sorgulanıyor.\n"
+"\n"
+
+#: ../whois.c:369
+#, c-format
+msgid ""
+"\n"
+"Querying for the IPv4 endpoint %s of a Teredo IPv6 address.\n"
+"\n"
+msgstr ""
+"\n"
+"Teredo IPv6 adresinin IPv4 uç noktası %s sorgulanıyor.\n"
+"\n"
+
+#: ../whois.c:406
+#, c-format
+msgid ""
+"Query string: \"%s\"\n"
+"\n"
+msgstr ""
+"Sorgu dizgesi: \"%s\"\n"
+"\n"
+
+#: ../whois.c:416
+#, c-format
+msgid ""
+"\n"
+"\n"
+"Found a referral to %s.\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"%s için bir yönlendirme bulundu.\n"
+"\n"
+
+#: ../whois.c:458 ../whois.c:461
+#, c-format
+msgid "Cannot parse this line: %s"
+msgstr "Bu satır ayrıştırılamıyor: %s"
+
+#: ../whois.c:650
+msgid "Warning: RIPE flags used with a traditional server."
+msgstr "Uyarı: Geleneksel bir sunucuyla RIPE bayrakları kullanıldı."
+
+#: ../whois.c:823 ../whois.c:939
+msgid ""
+"Catastrophic error: disclaimer text has been changed.\n"
+"Please upgrade this program.\n"
+msgstr ""
+"Önemli hata: sorumluluk reddi metni değiştirildi.\n"
+"Lütfen bu programı güncelleyin.\n"
+
+#: ../whois.c:1040
+#, c-format
+msgid "Host %s not found."
+msgstr "%s sunucusu bulunamadı."
+
+#: ../whois.c:1050
+#, c-format
+msgid "%s/tcp: unknown service"
+msgstr "%s/tcp: bilinmeyen hizmet"
+
+#: ../whois.c:1125
+msgid "Timeout."
+msgstr "Zaman aşımı."
+
+#: ../whois.c:1131
+#, c-format
+msgid "Interrupted by signal %d..."
+msgstr "%d sinyali tarafından kesildi..."
+
+#: ../whois.c:1499
+#, c-format
+msgid ""
+"Usage: whois [OPTION]... OBJECT...\n"
+"\n"
+"-h HOST, --host HOST   connect to server HOST\n"
+"-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
+"-H                     hide legal disclaimers\n"
+msgstr ""
+"Kullanım: whois [SEÇENEK]... NESNE...\n"
+"\n"
+"-h HOST, --host HOST   HOST sunucusuna bağlan\n"
+"-p PORT, --port PORT   PORT bağlantı noktasına bağlan\n"
+"-I                     whois.iana.org'u sorgula ve yönlendirmesini takip et\n"
+"-H                     yasal uyarıları gizle\n"
+
+#: ../whois.c:1506
+#, c-format
+msgid ""
+"      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
+"      --help           display this help and exit\n"
+"      --version        output version information and exit\n"
+"\n"
+msgstr ""
+"      --verbose        ne yapıldığını açıkla\n"
+"      --no-recursion   kayıt defterinden kayıt sunucularına özyinelemeyi "
+"devre dışı bırak\n"
+"      --help           bu yardımı görüntüle ve çık\n"
+"      --version        sürüm bilgisini yazdır ve çık\n"
+"\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
+"These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
+"-l                     find the one level less specific match\n"
+"-L                     find all levels less specific matches\n"
+"-m                     find all one level more specific matches\n"
+"-M                     find all levels of more specific matches\n"
+msgstr ""
+"Bu bayraklar whois.ripe.net ve bazı RIPE benzeri sunucular tarafından "
+"desteklenmektedir:\n"
+"-l                     bir seviye daha az özel eşleşmeyi bul\n"
+"-L                     tüm seviyelerde daha az özel eşleşmeleri bul\n"
+"-m                     tüm bir seviye daha özel eşleşmeleri bul\n"
+"-M                     tüm seviyelerde daha özel eşleşmeleri bul\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
+"-c                     find the smallest match containing a mnt-irt "
+"attribute\n"
+"-x                     exact match\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
+"-c                     mnt-irt özniteliği içeren en küçük eşleşmeyi bul\n"
+"-x                     tam olarak eşleş\n"
+"-b                     kötüye kullanım irtibatıyla kısa IP adresi "
+"aralıklarını döndür\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
+"-B                     turn off object filtering (show email addresses)\n"
+"-G                     turn off grouping of associated objects\n"
+"-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-B                     nesne filtrelemeyi kapat (e-posta adreslerini "
+"göster)\n"
+"-G                     ilişkili nesnelerin gruplandırılmasını kapat\n"
+"-d                     DNS ters yetki nesnelerini de döndür\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
+"-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
+"-T TYPE[,TYPE]...      only look for objects of TYPE\n"
+"-K                     only primary keys are returned\n"
+"-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-i ÖZNİ[,ÖZNİ]...      belirtilen ÖZNİtelikler için ters arama yap\n"
+"-T TÜR[,TÜR]...        yalnızca TÜR nesnelerini ara\n"
+"-K                     yalnızca birincil anahtarları döndür\n"
+"-r                     iletişim bilgileri için özyinelemeli aramaları kapat\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
+"-R                     force to show local copy of the domain object even\n"
+"                       if it contains referral\n"
+"-a                     also search all the mirrored databases\n"
+"-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
+"-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     yönlendirme içerse bile etki alanı nesnesinin yerel\n"
+"                       kopyasını göstermeye zorla\n"
+"-a                     ayrıca tüm yansıtılmış veri tabanlarında arama yap\n"
+"-s KAYNAK[,KAYNAK]...  KAYNAK'tan yansıtılan veri tabanında arama yap\n"
+"-g KAYNAK:İLK-SON      KAYNAK'tan İLK'ten SON'a kadar olan güncellemeleri "
+"bul\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
+"-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\n"
+msgstr ""
+"-t TÜR                 TÜR nesnesi için şablon iste\n"
+"-v TÜR                 TÜR nesnesi için ayrıntılı şablon iste\n"
+"-q [version|sources|types]  belirtilen sunucu bilgilerini sorgula\n"
+
+#: ../mkpasswd.c:135
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "BSDI genişletilmiş DES tabanlı crypt(3)"
+
+#: ../mkpasswd.c:138
+msgid "standard 56 bit DES-based crypt(3)"
+msgstr "standart 56 bit DES tabanlı crypt(3)"
+
+#: ../mkpasswd.c:207
+#, c-format
+msgid "Invalid method '%s'.\n"
+msgstr "Geçersiz yöntem '%s'.\n"
+
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
+#, c-format
+msgid "Invalid number '%s'.\n"
+msgstr "Geçersiz sayı '%s'.\n"
+
+#: ../mkpasswd.c:246
+#, c-format
+msgid "Try '%s --help' for more information.\n"
+msgstr "Daha fazla bilgi için '%s --help' komutunu deneyin.\n"
+
+#: ../mkpasswd.c:302
+#, 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] "Yanlış salt uzunluğu: %d bayt, beklenen: %d.\n"
+
+#: ../mkpasswd.c:307
+#, 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] "Yanlış salt uzunluğu: %d bayt, beklenen: %d <= n <= %d.\n"
+
+#: ../mkpasswd.c:316
+#, c-format
+msgid "Illegal salt character '%c'.\n"
+msgstr "Geçersiz salt karakteri '%c'.\n"
+
+#: ../mkpasswd.c:372 ../mkpasswd.c:385
+#, c-format
+msgid "Password: "
+msgstr "Parola: "
+
+#: ../mkpasswd.c:404
+#, c-format
+msgid "Method not supported by crypt(3).\n"
+msgstr "Yöntem crypt(3) tarafından desteklenmiyor.\n"
+
+#: ../mkpasswd.c:512
+#, c-format
+msgid ""
+"Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
+"Crypts the PASSWORD using crypt(3).\n"
+"\n"
+msgstr ""
+"Kullanım: mkpasswd [SEÇENEKLER]... [PAROLA [SALT]]\n"
+"PAROLA değerini crypt(3) kullanarak şifreler.\n"
+"\n"
+
+#: ../mkpasswd.c:515
+#, c-format
+msgid ""
+"      -m, --method=TYPE     select method TYPE\n"
+"      -5                    like --method=md5crypt\n"
+"      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TÜR      TÜR yöntemini seç\n"
+"      -5                    --method=md5crypt ile aynı\n"
+"      -S, --salt=SALT       belirtilen SALT değerini kullan\n"
+
+#: ../mkpasswd.c:520
+#, c-format
+msgid ""
+"      -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"
+msgstr ""
+"      -R, --rounds=SAYI     belirtilen SAYI kadar tur kullan\n"
+"      -P, --password-fd=NUM parolayı /dev/tty yerine NUM dosya\n"
+"                            tanıtıcısından oku\n"
+"      -s, --stdin           --password-fd=0 ile aynı\n"
+
+#: ../mkpasswd.c:526
+#, c-format
+msgid ""
+"      -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 ""
+"      -h, --help            bu yardımı görüntüle ve çık\n"
+"      -V, --version         sürüm bilgisini yazdır ve çık\n"
+"\n"
+"PAROLA eksikse etkileşimli olarak sorulur.\n"
+"SALT belirtilmezse, rastgele bir tane oluşturulur.\n"
+"TÜR 'help' ise kullanılabilir yöntemler yazdırılır.\n"
+"\n"
+"Hataları %s adresine bildirin.\n"
+
+#: ../mkpasswd.c:549
+#, c-format
+msgid "Available methods:\n"
+msgstr "Kullanılabilir yöntemler:\n"

po/zh_CN.po

@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: whois\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-10 04:23+0200\n"
+"POT-Creation-Date: 2022-01-03 17:52+0100\n"
 "PO-Revision-Date: 2013-12-25 17:40+0800\n"
 "Last-Translator: Terence Ng <pheotiman@gmail.com>\n"
-"Language-Team: Chinese (China) <zh_CN@li.org>\n"
+"Language-Team: \n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.7\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../whois.c:148
+#: ../whois.c:240
 #, c-format
 msgid ""
 "Version %s.\n"
@@ -30,28 +30,28 @@ msgstr ""
 "\n"
 "向 %s 报告漏洞。\n"
 
-#: ../whois.c:202 ../whois.c:255 ../whois.c:261 ../whois.c:291
+#: ../whois.c:329
+msgid "This TLD has no whois server, but you can access the whois database at"
+msgstr "此顶级域名没有 whois 服务器，但您可在这里访问 whois 数据库："
+
+#: ../whois.c:334
+msgid "This TLD has no whois server."
+msgstr "此顶级域名没有对应的 whois 服务器。"
+
+#: ../whois.c:337
+msgid "No whois server is known for this kind of object."
+msgstr "无针对此类对象的 whois 服务器。"
+
+#: ../whois.c:340
+msgid "Unknown AS number or IP network. Please upgrade this program."
+msgstr "未知的 AS 号码或 IP 地址。请升级此程序。"
+
+#: ../whois.c:344 ../whois.c:353 ../whois.c:388 ../whois.c:405
 #, c-format
 msgid "Using server %s.\n"
 msgstr "使用服务器 %s。\n"
 
-#: ../whois.c:240
-msgid "This TLD has no whois server, but you can access the whois database at"
-msgstr "此顶级域名没有 whois 服务器，但您可在这里访问 whois 数据库："
-
-#: ../whois.c:245
-msgid "This TLD has no whois server."
-msgstr "此顶级域名没有对应的 whois 服务器。"
-
-#: ../whois.c:248
-msgid "No whois server is known for this kind of object."
-msgstr "无针对此类对象的 whois 服务器。"
-
-#: ../whois.c:251
-msgid "Unknown AS number or IP network. Please upgrade this program."
-msgstr "未知的 AS 号码或 IP 地址。请升级此程序。"
-
-#: ../whois.c:267
+#: ../whois.c:362
 #, c-format
 msgid ""
 "\n"
@@ -62,7 +62,7 @@ msgstr ""
 "查询和一个6to4 IPv6 地址相对应的 IPv4 终端 %s。\n"
 "\n"
 
-#: ../whois.c:273
+#: ../whois.c:369
 #, c-format
 msgid ""
 "\n"
@@ -73,7 +73,7 @@ msgstr ""
 "查询一个Teredo IPv6 地址相对应的 IPv4 终端 %s。\n"
 "\n"
 
-#: ../whois.c:292
+#: ../whois.c:406
 #, c-format
 msgid ""
 "Query string: \"%s\"\n"
@@ -82,7 +82,7 @@ msgstr ""
 "查询字符串: \"%s\"\n"
 "\n"
 
-#: ../whois.c:302
+#: ../whois.c:416
 #, c-format
 msgid ""
 "\n"
@@ -95,16 +95,16 @@ msgstr ""
 "发现一个到 %s 的引用。\n"
 "\n"
 
-#: ../whois.c:344 ../whois.c:347
+#: ../whois.c:458 ../whois.c:461
 #, c-format
 msgid "Cannot parse this line: %s"
 msgstr "不能分析该行：%s"
 
-#: ../whois.c:516
+#: ../whois.c:650
 msgid "Warning: RIPE flags used with a traditional server."
 msgstr "警告: 对传统服务器使用了 RIPE 标志。"
 
-#: ../whois.c:675 ../whois.c:773
+#: ../whois.c:823 ../whois.c:939
 msgid ""
 "Catastrophic error: disclaimer text has been changed.\n"
 "Please upgrade this program.\n"
@@ -112,122 +112,164 @@ msgstr ""
 "严重错误: 声明(disclaimer)文本已经被改变。\n"
 "请升级此程序。\n"
 
-#: ../whois.c:828
+#: ../whois.c:1040
 #, c-format
 msgid "Host %s not found."
 msgstr "没有找到主机 %s。"
 
-#: ../whois.c:838
+#: ../whois.c:1050
 #, c-format
 msgid "%s/tcp: unknown service"
 msgstr "%s/tcp: 未知服务"
 
-#: ../whois.c:913
+#: ../whois.c:1125
 msgid "Timeout."
 msgstr "超时。"
 
-#: ../whois.c:919
+#: ../whois.c:1131
 #, c-format
 msgid "Interrupted by signal %d..."
 msgstr "被信号 %d 中断..."
 
-#: ../whois.c:1189
-#, c-format
+#: ../whois.c:1499
+#, fuzzy, c-format
 msgid ""
 "Usage: whois [OPTION]... OBJECT...\n"
 "\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
 "-H                     hide legal disclaimers\n"
+msgstr ""
+"用法： whois 【选项】 …… 对象 ……\n"
+"\n"
+"-h HOST, --host HOST    连接到服务器 HOST\n"
+"-p PORT, --port PORT    连接到端口 PORT\n"
+"-H                      隐藏法律声明\n"
+
+#: ../whois.c:1506
+#, fuzzy, c-format
+msgid ""
 "      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 "\n"
+msgstr ""
+"      --verbose         解释正在做什么\n"
+"      --help            显示帮助并退出\n"
+"      --version         输出版本信息并退出\n"
+"\n"
+
+#: ../whois.c:1513
+#, c-format
+msgid ""
 "These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
 "-l                     find the one level less specific match\n"
 "-L                     find all levels less specific matches\n"
 "-m                     find all one level more specific matches\n"
 "-M                     find all levels of more specific matches\n"
+msgstr ""
+"这些标志是由 whois.ripe.net 和 RIPE-like 服务器支持的：\n"
+" -l                     寻找有更少具体匹配的一个级别\n"
+"-L                     寻找所有更少具体匹配的级别\n"
+"-m                   寻找有更加具体匹配的一个级别\n"
+"-M                   寻找有更加具体的匹配的所有级别\n"
+
+#: ../whois.c:1520
+#, c-format
+msgid ""
 "-c                     find the smallest match containing a mnt-irt "
 "attribute\n"
 "-x                     exact match\n"
 "-b                     return brief IP address ranges with abuse contact\n"
+msgstr ""
+"-c                     寻找包含 mnt-irt 属性的最小匹配\n"
+"-x                     精确匹配\n"
+"-b                     return brief IP address ranges with abuse contact\n"
+
+#: ../whois.c:1525
+#, c-format
+msgid ""
 "-B                     turn off object filtering (show email addresses)\n"
 "-G                     turn off grouping of associated objects\n"
 "-d                     return DNS reverse delegation objects too\n"
+msgstr ""
+"-B                     关闭对象过滤（显示 email 地址）\n"
+"-G                    关闭相关联对象的分组\n"
+"-d                     返回 DNS 反解授权对象\n"
+
+#: ../whois.c:1530
+#, c-format
+msgid ""
 "-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
 "-T TYPE[,TYPE]...      only look for objects of TYPE\n"
 "-K                     only primary keys are returned\n"
 "-r                     turn off recursive look-ups for contact information\n"
+msgstr ""
+"-i ATTR[,ATTR]...      对特定的属性（ ATTR ）进行逆向查询\n"
+"-T TYPE[,TYPE]...      只寻找 TYPE 的对象\n"
+"-K                      只返回主键\n"
+"-r                      关闭联系信息的递归查询\n"
+
+#: ../whois.c:1536
+#, c-format
+msgid ""
 "-R                     force to show local copy of the domain object even\n"
 "                       if it contains referral\n"
 "-a                     also search all the mirrored databases\n"
 "-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
 "-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+msgstr ""
+"-R                     强制显示域对象的本地副本，即使\n"
+"                         它包含引用\n"
+"-a                     一并搜索所有的数据库镜像\n"
+"-s SOURCE[,SOURCE]...   从 SOURCE 中搜索数据库镜像\n"
+"-g SOURCE:FIRST-LAST   从串行的 FIRST 到 LAST 的 SOURCE 中查找更新\n"
+
+#: ../whois.c:1543
+#, c-format
+msgid ""
 "-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\n"
 msgstr ""
-"用法： whois 【选项】 …… 对象 …… \n"
-"\n"
-"-h HOST, --host HOST    连接到服务器 HOST\n"
-"-p PORT, --port PORT    连接到端口 PORT\n"
-"-H                      隐藏法律声明 \n"
-"      --verbose         解释正在做什么 \n"
-"      --help            显示帮助并退出 \n"
-"      --version         输出版本信息并退出 \n"
-"\n"
-"这些标志是由 whois.ript.net 和 RIPE-like 服务器支持的： \n"
-" -l                     寻找有更少具体匹配的一个级别 \n"
-"-L                     寻找所有更少具体匹配的级别 \n"
-"-m                   寻找有更加具体匹配的一个级别 \n"
-"-M                   寻找有更加具体的匹配的所有级别 \n"
-"-c                     寻找包含 mnt-irt 属性的最小匹配 \n"
-"-x                     精确匹配 \n"
-"-b                     return brief IP address ranges with abuse contact\n"
-"-B                     关闭对象过滤（显示 email 地址） \n"
-"-G                    关闭相关联对象的分组 \n"
-"-d                     返回 DNS 反解授权对象 \n"
-"-i ATTR[,ATTR]...      对特定的属性（ ATTR ）进行逆向查询 \n"
-"-T TYPE[,TYPE]...      只寻找 TYPE 的对象 \n"
-"-K                      只返回主键 \n"
-"-r                      关闭联系信息的递归查询 \n"
-"-R                     强制显示域对象的本地副本，即使 \n"
-"                         它包含引用 \n"
-"-a                     一并搜索所有的数据库镜像 \n"
-"-s SOURCE[,SOURCE]...   从 SOURCE 中搜索数据库镜像 \n"
-"-g SOURCE:FIRST-LAST   从串行的 FIRST 到 LAST 的 SOURCE 中查找更新 \n"
-"-t TYPE                 请求 TYPE 对象的模板 \n"
-"-v TYPE                 请求 TYPE 对象的详细模板 \n"
-"-q [version|sources|types]   询问制定服务器信息 \n"
+"-t TYPE                 请求 TYPE 对象的模板\n"
+"-v TYPE                 请求 TYPE 对象的详细模板\n"
+"-q [version|sources|types]   询问制定服务器信息\n"
 
-#: ../mkpasswd.c:84
+#: ../mkpasswd.c:135
+#, fuzzy
+msgid "BSDI extended DES-based crypt(3)"
+msgstr "以标准56位DES为基础的 crypt(3)"
+
+#: ../mkpasswd.c:138
 msgid "standard 56 bit DES-based crypt(3)"
 msgstr "以标准56位DES为基础的 crypt(3)"
 
-#: ../mkpasswd.c:165
+#: ../mkpasswd.c:207
 #, c-format
 msgid "Invalid method '%s'.\n"
 msgstr "无效方式 '%s'。\n"
 
-#: ../mkpasswd.c:174 ../mkpasswd.c:184
+#: ../mkpasswd.c:216 ../mkpasswd.c:228
 #, c-format
 msgid "Invalid number '%s'.\n"
 msgstr "无效的数字 '%s'。\n"
 
-#: ../mkpasswd.c:201
+#: ../mkpasswd.c:246
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "尝试用 '%s --help' 获取更多的信息。\n"
 
-#: ../mkpasswd.c:242
+#: ../mkpasswd.c:292
 #, 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"
 
-#: ../mkpasswd.c:247
+#: ../mkpasswd.c:297
 #, c-format
 msgid "Wrong salt length: %d byte when %d <= n <= %d expected.\n"
 msgid_plural "Wrong salt length: %d bytes when %d <= n <= %d expected.\n"
@@ -235,22 +277,22 @@ msgstr[0] ""
 "错误的随机字符（salt） 长度: 当前为 %d 字节，预期长度范围为 %d <= n <= %d 字"
 "节。\n"
 
-#: ../mkpasswd.c:256
+#: ../mkpasswd.c:306
 #, c-format
 msgid "Illegal salt character '%c'.\n"
 msgstr "非法的随机数字符 '%c'。\n"
 
-#: ../mkpasswd.c:306 ../mkpasswd.c:322
+#: ../mkpasswd.c:357 ../mkpasswd.c:370
 #, c-format
 msgid "Password: "
 msgstr "密码："
 
-#: ../mkpasswd.c:340
+#: ../mkpasswd.c:389
 #, c-format
 msgid "Method not supported by crypt(3).\n"
 msgstr "不被 crypt(3) 支持的方法。\n"
 
-#: ../mkpasswd.c:419
+#: ../mkpasswd.c:497
 #, c-format
 msgid ""
 "Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n"
@@ -261,16 +303,32 @@ msgstr ""
 "用 crypt(3) 加密 PASSWORD。\n"
 "\n"
 
-#: ../mkpasswd.c:422
-#, c-format
+#: ../mkpasswd.c:500
+#, fuzzy, c-format
 msgid ""
 "      -m, --method=TYPE     select method TYPE\n"
-"      -5                    like --method=md5\n"
+"      -5                    like --method=md5crypt\n"
 "      -S, --salt=SALT       use the specified SALT\n"
+msgstr ""
+"      -m, --method=TYPE \t选择使用 TYPE 的方法\n"
+"      -S, --salt=SALT \t\t使用指定随机字符\n"
+
+#: ../mkpasswd.c:505
+#, c-format
+msgid ""
 "      -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"
+msgstr ""
+"      -R, --rounds=NUMBER \t使用指定的循环次数 NUMBER\n"
+"      -P, --password-fd=NUM \t从文件描述符 NUM 中读取密码来\n"
+"\t\t\t\t替代从 /dev/tty 中获取密码\n"
+"      -s, --stdin \t\t同 --password-fd=0\n"
+
+#: ../mkpasswd.c:511
+#, c-format
+msgid ""
 "      -h, --help            display this help and exit\n"
 "      -V, --version         output version information and exit\n"
 "\n"
@@ -280,12 +338,6 @@ msgid ""
 "\n"
 "Report bugs to %s.\n"
 msgstr ""
-"      -m, --method=TYPE \t选择使用 TYPE 的方法\n"
-"      -S, --salt=SALT \t\t使用指定随机字符\n"
-"      -R, --rounds=NUMBER \t使用指定的循环次数 NUMBER \n"
-"      -P, --password-fd=NUM \t从文件描述符 NUM 中读取密码来\n"
-"\t\t\t\t替代从 /dev/tty 中获取密码\n"
-"      -s, --stdin \t\t同 --password-fd=0\n"
 "      -h, --help \t\t显示帮助信息并退出\n"
 "      -V, --version \t\t输出版本信息并退出\n"
 "\n"
@@ -295,7 +347,7 @@ msgstr ""
 "\n"
 "请将BUGS提交给 %s。\n"
 
-#: ../mkpasswd.c:452
+#: ../mkpasswd.c:534
 #, c-format
 msgid "Available methods:\n"
 msgstr "可用方式：\n"

ripe-mail

@@ -1,90 +0,0 @@
-From ripe-dbm@ripe.net  Mon Jan 27 10:09:59 2003
-Return-Path: <ripe-dbm@ripe.net>
-Delivered-To: md@wonderland.linux.it
-Received: from attila.bofh.it (localhost [127.0.0.1])
-	by wonderland.linux.it (Postfix/Md) with ESMTP id 582BA33CD5
-	for <md@wonderland.linux.it>; Mon, 27 Jan 2003 10:09:59 +0100 (CET)
-Received: from picard.linux.it (picard.linux.it [::ffff:62.177.1.107])
-	by attila.bofh.it (Postfix) with ESMTP id 46AE15F966
-	for <md@wonderland.linux.it>; Mon, 27 Jan 2003 09:03:25 +0100 (CET)
-Received: from birch.ripe.net (birch.ripe.net [::ffff:193.0.1.96])
-	by picard.linux.it (Postfix) with ESMTP id 4A76942B2
-	for <md@Linux.IT>; Mon, 27 Jan 2003 09:05:01 +0100 (CET)
-Received: from x24.ripe.net (x24.ripe.net [193.0.1.24])
-	by birch.ripe.net (8.12.5/8.11.6) with ESMTP id h0R83NAq030231;
-	Mon, 27 Jan 2003 09:03:23 +0100
-Received: (from ripe-dbm@localhost)
-	by x24.ripe.net (8.12.4/8.12.6) id h0R83M5k002263;
-	Mon, 27 Jan 2003 09:03:22 +0100
-Message-Id: <200301270803.h0R83M5k002263@x24.ripe.net>
-From: RIPE Database Administration <ripe-dbm@ripe.net>
-Cc: Can Bican <can@ripe.net>
-To: md@Linux.IT
-FCC: cur
-Subject: Re: NCC#2003013332 Re: [db-wg] IPv6 Whois update
-Reply-To: ripe-dbm@ripe.net
-X-Organization: RIPE Network Coordination Centre
-X-Phone: +31 20 535 4444
-X-Fax: +31 20 535 4341
-X-Mailer: BaT/0.67
-Sender: RIPE Database Manager <ripe-dbm@ripe.net>
-Date: Mon, 27 Jan 2003 09:03:21 +0100
-MIME-Version: 1.0
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-X-Spam-Status: No, hits=0.6 required=5.0
-	tests=DEAR_SOMEBODY,QUOTED_EMAIL_TEXT,SIGNATURE_SHORT_DENSE,
-	      SPAM_PHRASE_05_08
-	version=2.43
-X-Spam-Level: 
-Status: RO
-Content-Length: 1239
-Lines: 46
-
-
-Dear Marco d'Itri,
-
-For the month October, 2002:
-We had 55 milion queries, 4.3 milion done with your client.
-
-This number is probably not the best indicator as some IPs do a lot of
-queries so here are also the statistics for different IP addresses using
-your client:
-31364 (of 853385) different IP addresses used your client.
-
-If you have any more questions, please contact <ripe-dbm@ripe.net>.
-
-Regards,
-
-Tiago Antao
-____________________________
-RIPE Database Administration.
-
-
-
-Original message follows:
-------------------------
-
-On Thursday 23 January 2003 18:52, Marco d'Itri wrote:
-> On Jan 23, Can Bican <can@ripe.net> wrote:
->  >This is a feature we supported, and we'll keep supporting it. It's a
->  > mistake on our side that we'll change promptly, so please don't change
->  > the behaviour. We'll make the proxy accept -V switches of these types.
->
-> Thank you for your prompt reply.
-> BTW, is any statistics about -V arguments available? I wonder how many
-> queries are made with my client (i.e. the -V argument matches /^Md/).
-
-   I have forwarded your request to ripe-dbm@ripe.net. You can contact that 
-address if you'd like more/less specific requirements about the counts.
-
-   Regards,
-
--- 
-Can Bican
-DB Group
-RIPE NCC
-
-
-
-

servers_charset_list

@@ -1,25 +1,32 @@
-# server name		charset		optional parameters
+# server name		encoding	optional parameters
+whois.afrinic.net	utf-8
+whois.apnic.net		iso-8859-1
 whois.cat		utf-8		-C UTF-8
 whois.conac.cn		utf-8
 whois.corenic.net	utf-8		-C UTF-8
 whois.online.rs.corenic.net	utf-8	-C UTF-8
 whois.site.rs.corenic.net	utf-8	-C UTF-8
-whois.lacnic.net	iso-8859-1
+whois.lacnic.net	utf-8
 whois.museum		utf-8		-C UTF-8
+whois.ripe.net		utf-8		--charset UTF-8
+
+whois.nic.llyw.cymru	utf-8
+whois.nic.gov.scot	utf-8
+whois.nic.gov.wales	utf-8
 
 whois.aeda.net.ae	utf-8
 whois.nic.ar		utf-8
-whois.ax		iso-8859-1
+whois.ax		utf-8
 whois.registro.br	iso-8859-1
-whois.cira.ca		iso-8859-1
+whois.cira.ca		utf-8
 whois.nic.ch		utf-8
-whois.nic.cl		iso-8859-1
+whois.nic.cl		utf-8
 whois.cnnic.cn		utf-8
-cwhois.cnnic.cn		utf-8
 whois.nic.cz		utf-8
 whois.denic.de		utf-8
 whois.enum.denic.de	utf-8
 whois.dk-hostmaster.dk	utf-8		--charset=utf-8
+whois.punktum.dk	utf-8		--charset=utf-8
 whois.tld.ee		utf-8
 whois.eu		utf-8
 whois.fi		iso-8859-1
@@ -31,9 +38,9 @@ whois.nic.hu		iso-8859-1
 whois.nic.ir		utf-8
 whois.isnic.is		iso-8859-1
 whois.nic.it		utf-8
-whois.jprs.jp		iso-2022-jp
+whois.jprs.jp		utf-8
 whois.nic.ad.jp		iso-2022-jp
-whois.domain.kg		cp1251
+whois.kg		cp1251
 whois.nic.or.kr		utf-8
 whois.kr		utf-8
 whois.nic.kz		utf-8
@@ -46,7 +53,7 @@ whois.norid.no		iso-8859-1
 whois.iis.nu		utf-8
 whois.registry.om	utf-8
 whois.registry.pf	utf-8
-whois.dns.pt		iso-8859-1
+whois.dns.pt		utf-8
 whois.registry.qa	utf-8
 whois.nic.re		utf-8
 whois.rnids.rs		utf-8
@@ -54,10 +61,12 @@ whois.nic.net.sa	utf-8
 whois.iis.se		utf-8
 whois.sgnic.sg		utf-8
 whois.tld.sy		utf-8
-whois.thnic.co.th	utf-8
-whois.ati.tn		windows-1252
-whois.nic.tr		iso-8859-9
+whois.thains.co.th	utf-8
+whois.ati.tn		utf-8
+whois.trabis.gov.tr	utf-8
 whois.twnic.net.tw	utf-8
+whois.nic.ac.uk		utf-8
+whois.gov.uk		utf-8
 whois.biz.ua		utf-8
 whois.co.ua		utf-8
 whois.pp.ua		utf-8
@@ -65,4 +74,5 @@ whois.ua		utf-8
 whois.nic.org.uy	utf-8
 whois.nic.wf		utf-8
 whois.nic.yt		utf-8
+whois.nic.xn--otu796d	utf-8
 

simple_recode.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 by Marco d'Itri <md@linux.it>.
+ * Copyright (C) by Marco d'Itri <md@linux.it>.
  *
  * simple_recode was inspired by a similar function found in Simon
  * Josefsson's libidn.
@@ -15,8 +15,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include <stdlib.h>
@@ -72,7 +73,7 @@ char *simple_recode(const iconv_t handle, const char *str)
 	size_t err = iconv(handle, &inp, &inbytes_remaining, &outp,
 		&outbytes_remaining);
 
-	if (err != -1)
+	if (err != (size_t) -1)
 	    break; /* success */
 
 	switch (errno) {

simple_recode.h

@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef SIMPLE_RECODE_H
 #define SIMPLE_RECODE_H
 

tld_serv_list

@@ -1,4 +1,4 @@
-# http://www.iana.org/domains/root/db/
+# https://www.iana.org/domains/root/db/
 #
 # Domain names MUST be lowercase and MUST begin with "." or "-".
 # First match wins.
@@ -37,130 +37,139 @@
 .za.org	whois.za.org
 .org	whois.pir.org
 
+# Technically these are SLDs of new gTLDs (hence listed in new_gtlds_list),
+# but the registrar (JISC) asked to add the servers for these
+# government-related domains.
+.llyw.cymru	whois.nic.llyw.cymru
+.gov.scot	whois.nic.gov.scot
+.gov.wales	whois.nic.gov.wales
+
 .edu	whois.educause.edu
-.gov	whois.dotgov.gov
+.gov	whois.nic.gov
 .int	whois.iana.org
 .mil	NONE
 
 .e164.arpa	whois.ripe.net
 .in-addr.arpa	ARPA
+.ip6.arpa	IP6
 .arpa	whois.iana.org
 
 .aero	whois.aero
 .asia	whois.nic.asia
-.biz	whois.biz
+.biz	whois.nic.biz
 .cat	whois.nic.cat
 .coop	whois.nic.coop
-.info	whois.afilias.net
-.jobs	VERISIGN whois.nic.jobs
-.mobi	whois.afilias.net
-.museum	whois.museum
+.info	NONE
+.jobs	NONE
+.mobi	NONE
+.museum	whois.nic.museum
 .name	whois.nic.name
-.post	whois.dotpostregistry.net
-.pro	whois.afilias.net
+.post	whois.nic.post
+.pro	NONE
 .tel	whois.nic.tel
-.travel	whois.nic.travel
+.travel	NONE
 .xxx	whois.nic.xxx
 
 .ac	whois.nic.ac
-.ad	NONE		# www.nic.ad
+.ad	whois.nic.ad
 .ae	whois.aeda.net.ae
 .af	whois.nic.af
 .ag	whois.nic.ag
-.ai	whois.ai
-.al	NONE		# http://www.akep.al/en/kerkoni-domain
+.ai	whois.nic.ai
+.al	NONE		# www.akep.al
 .am	whois.amnic.net
-.ao	NONE		# www.dns.ao
+.ao	WEB https://www.dns.ao/ao/whois/	# www.dns.ao
 .aq	NONE		# 2day.com
 .ar	whois.nic.ar
 .as	whois.nic.as
 .priv.at whois.nic.priv.at	# "unofficial" SLD
 .at	whois.nic.at
-.au	whois.audns.net.au
+.au	whois.auda.org.au
 .aw	whois.nic.aw
 .ax	whois.ax	# www.ax
-.az	WEB http://www.nic.az/
-.ba	WEB http://www.nic.ba/stream/whois/
-.bb	WEB http://whois.telecoms.gov.bb/search_domain.php
-.bd	WEB http://www.registry.com.bd/whois.php
+.gov.az	WEB https://www.gov.az/
+.az	WEB https://whois.az/
+.ba	WEB https://nic.ba/
+.bb	WEB https://whois.telecoms.gov.bb/
+.bd	WEB https://bdia.btcl.com.bd/
 .be	whois.dns.be
-.bf	NONE		# http://www.arce.bf/ http://www.onatel.bf/internet/domaine.htm
+.bf	whois.registre.bf	# http://www.arcep.bf/noms-de-domaine/
 .bg	whois.register.bg
-.bh	NONE		# www.inet.com.bh
+.bh	whois.nic.bh
 .bi	whois1.nic.bi
 .bj	whois.nic.bj
 #.bl
-.bm	whois.afilias-srs.net
+.bm	whois.nic.bm
 .bn	whois.bnnic.bn
 .bo	whois.nic.bo
 #.bq
 .br	whois.registro.br
-.bs	WEB http://www.nic.bs/cgi-bin/search.pl
+.bs	NONE		# http://www.register.bs/
 .bt	WEB http://www.nic.bt/
 .bv	NONE		# http://www.norid.no/domenenavnbaser/bv-sj.html
 .by	whois.cctld.by
 .bw	whois.nic.net.bw
-.bz	AFILIAS
+.bz	RECURSIVE whois.identitydigital.services
 .co.ca	whois.co.ca
 .ca	whois.cira.ca
 .cc	VERISIGN ccwhois.verisign-grs.com
 .cd	whois.nic.cd
-.cf	whois.dot.cf
-.cg	NONE
+.cf	NONE
+.cg	NONE		# www.nic.cg
 .ch	whois.nic.ch
 .ci	whois.nic.ci
 .ck	NONE
 .cl	whois.nic.cl
-.cm	whois.netcom.cm
+.cm	whois.nic.cm
 .edu.cn	whois.edu.cn
 .cn	whois.cnnic.cn
 .uk.co	whois.uk.co
-.co	whois.nic.co
+.co	whois.registry.co
 .cr	whois.nic.cr
-.cu	WEB http://www.nic.cu/
-.cv	WEB http://www.dns.cv/
-.cw	NONE		# http://www.una.cw/cw_registry/
+.cu	WEB https://www.nic.cu/
+.cv	whois.nic.cv
+.cw	NONE		# https://www.uoc.cw/cw-registry
 .cx	whois.nic.cx
-.cy	WEB http://www.nic.cy/nslookup/online_database.php
+.cy	WEB https://www.nic.cy/cy-ui/home
 .cz	whois.nic.cz
 .de	whois.denic.de
-.dj	WEB http://www.nic.dj/whois.php
-.dk	whois.dk-hostmaster.dk
-.dm	whois.nic.dm
+.dj	NONE		# http://www.dj/
+.dk	whois.punktum.dk
+.dm	whois.dmdomains.dm
 .do	whois.nic.do
 .dz	whois.nic.dz
 .ec	whois.nic.ec
 .ee	whois.tld.ee
-.eg	NONE		# http://lookup.egregistry.eg/english.aspx
+.eg	NONE		# https://domain.eg/
 #.eh
 .er	NONE		# http://www.afridns.org/er/tld_er.txt
-.es	WEB https://www.nic.es/
+.es	WEB https://www.dominios.es/en
 .et	NONE	# http://www.ethionet.et/
 .eu	whois.eu
 .fi	whois.fi
-.fj	whois.usp.ac.fj
+.fj	www.whois.fj
 .fk	NONE		# http://www.fidc.co.fk/
-.fm	WEB http://dot.fm/whois/
+.fm	whois.nic.fm
 .fo	whois.nic.fo
 .fr	whois.nic.fr
-.ga	whois.dot.ga	# www.my.ga
+.ga	whois.nic.ga
 .gb	NONE
 .gd	whois.nic.gd
-.ge	WEB http://www.registration.ge/
+.ge	whois.nic.ge
 .gf	whois.mediaserv.net
 .gg	whois.gg
-.gh	WEB http://www.nic.gh/customer/search_c.htm
-.gi	whois2.afilias-grs.net
+.gh	whois.nic.gh
+.gi	whois.identitydigital.services
 .gl	whois.nic.gl
 .gm	WEB http://www.nic.gm/htmlpages/whois.htm
-.gn	NONE		# http://www.psg.com/dns/gn/
-.gp	WEB https://www.dom-enic.com/whois.html
-.gq	whois.dominio.gq
-.gr	WEB https://grweb.ics.forth.gr/public/whois.jsp?lang=en
+.gn	whois.ande.gov.gn
+.gp	whois.nic.gp
+.gq	WEB http://www.dominio.gq/en/whois.html
+.gr	WEB https://grweb.ics.forth.gr/public/whois?lang=en
 .gs	whois.nic.gs
-.gt	WEB http://www.gt/
-.gu	WEB http://gadao.gov.gu/domainsearch.htm
-.gw	WEB http://nic.gw/en/whois/
+.gt	WEB https://www.gt/sitio/?lang=en
+.gu	NONE
+.gw	WEB https://registar.nic.gw/en/whois/
 .gy	whois.registry.gy
 .hk	whois.hkirc.hk
 .hm	whois.registry.hm
@@ -168,11 +177,11 @@
 .hr	whois.dns.hr
 .ht	whois.nic.ht
 .hu	whois.nic.hu
-.id	whois.pandi.or.id
-.ie	whois.domainregistry.ie
+.id	whois.id
+.ie	whois.weare.ie
 .il	whois.isoc.org.il
 .im	whois.nic.im
-.in	whois.inregistry.net	# afilias
+.in	whois.nixiregistry.in
 .io	whois.nic.io
 .iq	whois.cmc.iq		# http://www.cmc.iq/en/iq.html
 .ir	whois.nic.ir
@@ -180,50 +189,50 @@
 .it	whois.nic.it
 .je	whois.je
 .jm	NONE		# http://myspot.mona.uwi.edu/mits/
-.jo	WEB http://www.dns.jo/Whois.aspx
+.jo	WEB https://www.domain.jo/FirstPageen.aspx
 .jp	whois.jprs.jp
 .ke	whois.kenic.or.ke
 .kg	whois.kg
-.kh	NONE		# http://www.trc.gov.kh/index.php/en/newsCategory/view?id=42&detail_id=68
+.kh	NONE		# https://www.trc.gov.kh/en/offline-services/dns-registration/
 .ki	whois.nic.ki
 .km	NONE		# www.domaine.km
 .kn	whois.nic.kn
 .kp	NONE		# NIC? http://www.star.co.kp/
 .kr	whois.kr
-.kw	WEB http://www.kw/
+.kw	whois.nic.kw
 .ky	whois.kyregistry.ky
 .kz	whois.nic.kz
 .la	whois.nic.la
-.lb	WEB http://www.aub.edu.lb/lbdr/
-.lc	whois2.afilias-grs.net
+.lb	whois.lbdr.org.lb
+.lc	RECURSIVE whois.identitydigital.services
 .li	whois.nic.li
 .lk	whois.nic.lk
 .lr	NONE		# http://www.psg.com/dns/lr/
-.ls	WEB http://www.co.ls/co.asp
+.ls	whois.nic.ls
 .lt	whois.domreg.lt
 .lu	whois.dns.lu
 .lv	whois.nic.lv
 .ly	whois.nic.ly
 .ma	whois.registre.ma
-.mc	NONE	# www.nic.mc
+.mc	whois.nic.mc
 .md	whois.nic.md
-.me	whois.nic.me	# afilias
+.me	RECURSIVE whois.nic.me	# whois.identitydigital.services
 #.mf
 .mg	whois.nic.mg
 .mh	NONE		# www.nic.net.mh
 .mk	whois.marnet.mk
-.ml	whois.dot.ml	# www.point.ml
-.mm	NONE		# www.nic.mm
+.ml	whois.nic.ml
+.mm	whois.registry.gov.mm
 .mn	whois.nic.mn
-.mo	WEB http://www.monic.mo/	# whois.monic.mo is restricted
+.mo	WEB https://www.monic.mo/monic/faces/whois	# whois.monic.mo is restricted
 .mp	NONE		# get.mp
 .mq	whois.mediaserv.net
-.mr	NONE		# www.nic.mr
+.mr	whois.nic.mr
 .ms	whois.nic.ms
-.mt	WEB https://www.nic.org.mt/dotmt/ # whois.nic.org.mt is restricted
-.mu	whois.nic.mu
+.mt	whois.nic.org.mt
+.mu	whois.tld.mu
 .mv	NONE		# NIC? www.dhiraagu.com.mv
-.mw	WEB http://www.registrar.mw/
+.mw	whois.nic.mw
 .mx	whois.mx
 .my	whois.mynic.my
 .mz	whois.nic.mz
@@ -232,42 +241,50 @@
 .ne	NONE		# NIC? http://www.intnet.ne
 .nf	whois.nic.nf
 .ng	whois.nic.net.ng
-.ni	WEB http://www.nic.ni/
+.ni	WEB https://www.nic.ni/
 .nl	whois.domain-registry.nl
 .no	whois.norid.no
-.np	WEB http://register.mos.com.np/np-whois-lookup
-.nr	WEB http://www.cenpac.net.nr/dns/whois.html
+.np	WEB https://register.com.np/whois-lookup
+.nr	WEB https://www.cenpac.net.nr/dns/whois.html
 .nu	whois.iis.nu
-.nz	whois.srs.net.nz
+.nz	whois.irs.net.nz
 .om	whois.registry.om
-.pa	WEB http://www.nic.pa/
+.pa	WEB http://www.nic.pa/en
 .pe	kero.yachay.pe
 .pf	whois.registry.pf
-.pg	NONE	# http://www.unitech.ac.pg/
-.edu.ph	WEB http://services.ph.net/dns/query.pl
+.pg	whois.nic.pg	# https://www.unitech.ac.pg/icts-dns/
+.edu.ph	WEB https://services.ph.net/dnshosting/dnshostingquery.pl
 .gov.ph	NONE	# http://dns.gov.ph/
-.ph	WEB http://www.dot.ph/whois
-.pk	WEB http://www.pknic.net.pk/
+.ph	WEB https://whois.dot.ph/
+.pk	whois.pknic.net.pk
 .co.pl	whois.co.pl	# "unofficial" SLD
 .pl	whois.dns.pl
 .pm	whois.nic.pm
-.pn	WEB http://www.pitcairn.pn/PnRegistry/
-.pr	whois.nic.pr
-.ps	whois.pnina.ps
+.pn	WEB https://www.nic.pn/
+.pr	RECURSIVE whois.nic.pr		# whois.identitydigital.services
+.ps	WEB https://www.pnina.ps/
 .pt	whois.dns.pt
 .pw	whois.nic.pw
-.py	WEB http://www.nic.py/consulta-datos.php
+.py	WEB https://www.nic.py/consultdompy.php
 .qa	whois.registry.qa
 .re	whois.nic.re
 .ro	whois.rotld.ro
 .rs	whois.rnids.rs
+.ac.ru	whois.free.net
 .edu.ru	whois.informika.ru
+.com.ru	whois.flexireg.net
+.msk.ru	whois.flexireg.net
+.net.ru	whois.nic.net.ru
+.nov.ru	whois.flexireg.net
+.org.ru	whois.nic.net.ru
+.pp.ru	whois.nic.net.ru
+.spb.ru	whois.flexireg.net
 .ru	whois.tcinet.ru
 .rw	whois.ricta.org.rw	# http://www.ricta.org.rw/
 .sa	whois.nic.net.sa
-.sb	whois.nic.sb
-.sc	whois2.afilias-grs.net		# www.nic.sc
-.sd	NONE		# http://wwe.domains.sd/
+.sb	whois.nic.net.sb
+.sc	whois.nic.sc
+.sd	whois.nic.sd
 .se	whois.iis.se
 .sg	whois.sgnic.sg
 .sh	whois.nic.sh
@@ -278,16 +295,19 @@
 .sm	whois.nic.sm
 .sn	whois.nic.sn
 .so	whois.nic.so
-.sr	NONE		# www.register.sr
-#.ss
+.sr	whois.sr	# https://isp.datasur.sr/
+.ss	whois.nic.ss
 .st	whois.nic.st
+.msk.su	whois.flexireg.net
+.nov.su	whois.flexireg.net
+.spb.su	whois.flexireg.net
 .su	whois.tcinet.ru
-.sv	WEB http://www.svnet.org.sv/
+.sv	WEB https://svnet.sv/
 .sx	whois.sx
 .sy	whois.tld.sy
 .sz	NONE		# http://www.sispa.org.sz/
 .tc	whois.nic.tc
-.td	WEB http://www.nic.td/
+.td	whois.nic.td
 .tf	whois.nic.tf
 .tg	whois.nic.tg
 .th	whois.thnic.co.th
@@ -296,10 +316,10 @@
 .tl	whois.nic.tl
 .tm	whois.nic.tm
 .tn	whois.ati.tn
-.to	whois.tonic.to
-.tr	whois.nic.tr
-.tt	WEB http://www.nic.tt/cgi-bin/search.pl
-.tv	VERISIGN tvwhois.verisign-grs.com
+.to	whois.tonicregistry.to
+.tr	whois.trabis.gov.tr
+.tt	WEB https://www.nic.tt/cgi-bin/search.pl
+.tv	RECURSIVE whois.nic.tv
 .tw	whois.twnic.net.tw
 .tz	whois.tznic.or.tz
 .biz.ua	whois.biz.ua
@@ -307,93 +327,104 @@
 .pp.ua	whois.pp.ua
 .ua	whois.ua
 .ug	whois.co.ug
-.ac.uk	whois.ja.net
-.bl.uk	NONE
-.british-library.uk NONE
-.gov.uk	whois.ja.net
-.icnet.uk NONE
-.jet.uk	NONE
+.ac.uk	whois.nic.ac.uk
+.gov.uk	whois.gov.uk
+.mil.uk	NONE
 .mod.uk	NONE
 .nhs.uk	NONE
-.nls.uk	NONE
 .parliament.uk NONE
-.police.uk NONE
 .uk	whois.nic.uk
 #.um
 .fed.us	whois.nic.gov
 .us	whois.nic.us
-.com.uy	WEB https://nic.anteldata.com.uy/dns/consultaWhois/whois.action
-.uy	whois.nic.org.uy
+.com.uy	WEB https://nic.com.uy/consulta-whois
+.gub.uy	WEB https://www.dominios.gub.uy/
+.mil.uy	WEB https://www.dominios.gub.uy/
+.uy	WEB https://www.nic.uy/
 .uz	whois.cctld.uz
 .va	NONE
-.vc	whois2.afilias-grs.net
+.vc	RECURSIVE whois.identitydigital.services
 .ve	whois.nic.ve
 .vg	whois.nic.vg
-.vi	WEB https://secure.nic.vi/whois-lookup/
-.vn	WEB http://www.vnnic.vn/en/domain
-.vu	vunic.vu
+.vi	whois.nic.vi
+.vn	WEB http://www.vnnic.vn/en
+.vu	whois.dnrs.vu
 .wf	whois.nic.wf
 .ws	whois.website.ws
-.ye	NONE		# NIC? http://www.y.net.ye/services/domain_name.htm
+.ye	whois.y.net.ye
 .yt	whois.nic.yt
 .ac.za	whois.ac.za
-.alt.za	whois.alt.za
+.alt.za	WEB https://whois.alt.za/
 .co.za	whois.registry.net.za
+.edu.za	WEB https://whois.edu.za/
 .gov.za	whois.gov.za
 .net.za	net-whois.registry.net.za
 .org.za	org-whois.registry.net.za
 .web.za	web-whois.registry.net.za
-.za	NONE		# http://www.zadna.org.za/content/page/domain-information
-.zm	whois.nic.zm
+.za	whois.nic.za
+.zm	whois.zicta.zm
 .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--2scrj9c		whois.nixiregistry.in	# India
 .xn--3e0b707e		whois.kr		# Korea, Republic of
-.xn--45brj9c		whois.inregistry.net	# India, Bengali AW
-.xn--54b7fta0cc		NONE			# Bangladesh
+.xn--3hcrj9c		whois.nixiregistry.in	# India
+.xn--45br5cyl		whois.nixiregistry.in	# India
+.xn--45brj9c		whois.nixiregistry.in	# India, Bengali
+.xn--4dbrk0ce		whois.isoc.org.il	# Israel
+.xn--54b7fta0cc		WEB https://bdia.btcl.com.bd/ # Bangladesh
 .xn--80ao21a		whois.nic.kz		# Kazakhstan
 .xn--90a3ac		whois.rnids.rs		# Serbia
 .xn--90ae		whois.imena.bg		# Bulgaria
 .xn--90ais		whois.cctld.by		# Belarus
-.xn--clchc0ea0b2g2a9gcd	whois.sgnic.sg		# Singapore, Tamil
+.xn--clchc0ea0b2g2a9gcd	whois.ta.sgnic.sg	# Singapore, Tamil
 .xn--d1alf		whois.marnet.mk		# Macedonia
-.xn--e1a4c		whois.eu		# European Union, Cyrillic AW
-.xn--fiqs8s		cwhois.cnnic.cn		# China, Simplified Chinese
-.xn--fiqz9s		cwhois.cnnic.cn		# China, Traditional Chinese
-.xn--fpcrj9c3d		whois.inregistry.net	# India, Telugu AW
+.xn--e1a4c		whois.eu		# European Union, Cyrillic
+.xn--fiqs8s		whois.cnnic.cn		# China, Simplified Chinese
+.xn--fiqz9s		whois.cnnic.cn		# China, Traditional Chinese
+.xn--fpcrj9c3d		whois.nixiregistry.in	# India, Telugu
 .xn--fzc2c9e2c		whois.nic.lk		# Sri Lanka, Sinhala
-.xn--gecrj9c		whois.inregistry.net	# India, Gujarati AW
-.xn--h2brj9c		whois.inregistry.net	# India, Hindi AW
+.xn--gecrj9c		whois.nixiregistry.in	# India, Gujarati
+.xn--h2breg3eve		whois.nixiregistry.in	# India
+.xn--h2brj9c8c		whois.nixiregistry.in	# India
+.xn--h2brj9c		whois.nixiregistry.in	# India, Hindi
 .xn--j1amh		whois.dotukr.com	# Ukraine
 .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--l1acc		NONE			# Mongolia
+.xn--l1acc		whois.mn		# Mongolia
 .xn--lgbbat1ad8j	whois.nic.dz		# Algeria
-.xn--mix891f		WEB http://www.monic.mo/ # Macao
 .xn--mgb9awbf		whois.registry.om	# Oman
 .xn--mgba3a4f16a	whois.nic.ir		# Iran
 .xn--mgbaam7a8h		whois.aeda.net.ae	# United Arab Emirates
+.xn--mgbah1a3hjkrd	whois.nic.mr		# Mauritania
 .xn--mgbai9azgqp6j	NONE			# Pakistan
-.xn--mgbayh7gpa		WEB http://idn.jo/whois_a.aspx	# Jordan
-.xn--mgbbh1a71e		whois.inregistry.net	# India, Urdu AW
+.xn--mgbayh7gpa		WEB https://www.domain.jo/FirstPageen.aspx # Jordan
+.xn--mgbbh1a71e		whois.nixiregistry.in	# India, Urdu
+.xn--mgbbh1a		whois.nixiregistry.in	# India
 .xn--mgbc0a9azcg	NONE			# Morocco
+.xn--mgbcpq6gpa1a	NONE			# Bahrain
 .xn--mgberp4a5d4ar	whois.nic.net.sa	# Saudi Arabia
+.xn--mgbgu82a		whois.nixiregistry.in	# India
 .xn--mgbpl2fh		NONE			# Sudan
 .xn--mgbtx2b		whois.cmc.iq		# Iraq
 .xn--mgbx4cd0ab		whois.mynic.my		# Malaysia AW
-.xn--node		whois.itdc.ge		# Georgia
+.xn--mix891f		WEB https://www.monic.mo/monic/faces/whois # Macao
+.xn--node		WEB http://რეგისტრაცია.გე/	# Georgia
 .xn--o3cw4h		whois.thnic.co.th	# Thailand
 .xn--ogbpf8fl		whois.tld.sy		# Syria
 .xn--p1ai		whois.tcinet.ru		# Russian Federation
-.xn--pgbs0dh		NONE			# Tunisia
-.xn--qxam		WEB https://grweb.ics.forth.gr/public/whois.jsp?lang=en # Greece AW
-.xn--s9brj9c		whois.inregistry.net	# India, Punjabi AW
+.xn--pgbs0dh		whois.ati.tn		# Tunisia
+.xn--q7ce6a		whois.nic.la		# Lao
+.xn--qxa6a		whois.eu		# European Union, Greek
+.xn--qxam		WEB https://grweb.ics.forth.gr/public/whois?lang=en # Greece
+.xn--rvc1e0am3e		whois.nixiregistry.in	# India
+.xn--s9brj9c		whois.nixiregistry.in	# India, Punjabi
 .xn--wgbh1c		whois.dotmasr.eg	# Egypt
 .xn--wgbl6a		whois.registry.qa	# Qatar
 .xn--xkc2al3hye2a	whois.nic.lk		# Sri Lanka, Tamil
-.xn--xkc2dl3a5ee0h	whois.inregistry.net	# India, Tamil AW
+.xn--xkc2dl3a5ee0h	whois.nixiregistry.in	# India, Tamil
 .xn--y9a3aq		whois.amnic.net		# Armenia
-.xn--yfro4i67o		whois.sgnic.sg		# Singapore, Chinese
-.xn--ygbi2ammx		whois.pnina.ps		# Palestinian Territory
+.xn--yfro4i67o		whois.zh.sgnic.sg	# Singapore, Chinese
+.xn--ygbi2ammx		NONE			# Palestinian Territory

utils.c

@@ -1,9 +1,9 @@
 /*
- * Copyright 1999-2008 by Marco d'Itri <md@linux.it>.
+ * Copyright by Marco d'Itri <md@linux.it>.
  *
  * do_nofail and merge_args come from the module-init-tools package.
- * Copyright 2001 by Rusty Russell.
- * Copyright 2002, 2003 by Rusty Russell, IBM Corporation.
+ * Copyright by Rusty Russell.
+ * Copyright by Rusty Russell, IBM Corporation.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -16,8 +16,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /* for strdup */

utils.h

@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef WHOIS_UTILS_H
 #define WHOIS_UTILS_H
 
@@ -16,8 +17,17 @@
 /* Portability macros */
 #ifdef __GNUC__
 # define NORETURN __attribute__((noreturn))
+# define NONNULL __attribute__((returns_nonnull))
+# define UNUSED __attribute__((unused))
 #else
 # define NORETURN
+# define NONNULL
+# define UNUSED
+#endif
+#if (defined __GNUC__ && __GNUC__ >= 11) && !defined __clang__
+# define MALLOC_FREE __attribute__((malloc(free)))
+#else
+# define MALLOC_FREE
 #endif
 
 #ifndef AI_IDN
@@ -54,7 +64,8 @@
 #endif
 
 /* Prototypes */
-void *do_nofail(void *ptr, const char *file, const int line);
+void *MALLOC_FREE NONNULL do_nofail(void *ptr, const char *file, const int line)
+;
 char **merge_args(char *args, char *argv[], int *argc);
 
 void NORETURN err_quit(const char *fmt, ...);

whois.1

@@ -1,16 +1,27 @@
-.TH "WHOIS" "1" "20 December 2009" "Marco d'Itri" "Debian GNU/Linux"
-.SH "NAME"
+.TH "WHOIS" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux"
+.SH NAME
 whois \- client for the whois directory service
-.SH "SYNOPSIS"
+.SH SYNOPSIS
 .B whois
-[\~{\~\fB\-h\fP | \fB\-\-host\fP\~}\~\fIHOST\fP\~]
-[\~{\~\fB\-p\fP | \fB\-\-port\fP\~}\~\fIPORT\fP\~]
-[\~\fB\-abBcdGHKlLmMrRx\fP\~]
-[\~\fB\-g\fP\~\fISOURCE:FIRST\-LAST\fP\~]
-[\~\fB\-i\fP\~\fIATTR\fP[\fI,ATTR\fP]...\~]
-[\~\fB\-s\fP\~\fISOURCE\fP[\fI,SOURCE\fP]...\~]
-[\~\fB\-T\fP\~\fITYPE\fP[\fI,TYPE\fP]...\~]
-[\~\fB\-\-verbose\fP\~]
+[
+.RB {\~ \-h \~|\~ \-\-host \~}
+.I HOST
+] [
+.RB {\~ \-p \~|\~ \-\-port \~}
+.I PORT
+]
+.RB [\~ \-abBcdGHIKlLmMrRx
+]
+.RB [\~ \-g \fI\~SOURCE:FIRST\-LAST\fR
+]
+.RB [\~ \-i
+.IR ATTR [, ATTR ]...\~]
+.RB [\~ \-s
+.IR SOURCE [, SOURCE ]...\~]
+.RB [\~ \-T
+.IR TYPE [, TYPE ]...\~]
+.RB [\~ \-\-verbose \~]
+.RB [\~ \-\-no\-recursion \~]
 .I OBJECT
 
 .B whois
@@ -25,31 +36,52 @@ whois \- client for the whois directory service
 .B \-v
 .I TYPE
 
+.B whois \-\-help
+
+.B whois \-\-version
+
+.SH DESCRIPTION
 .B whois
-.B \-\-help
-
-.B whois
-.B \-\-version
-
-.PP
-.SH "DESCRIPTION"
-\fBwhois\fP searches for an object in a \fIRFC\ 3912\fP database.
-
+searches for an object in a
+.I RFC 3912
+database.
+.P
 This version of the whois client tries to guess the right server to
-ask for the specified object. If no guess can be made it will connect
-to \fIwhois.networksolutions.com\fP for NIC handles or \fIwhois.arin.net\fP
+ask for the specified object.
+If no guess can be made it will connect to
+.I whois.networksolutions.com
+for NIC handles or
+.I whois.arin.net
 for IPv4 addresses and network names.
-.PP
-.SH "OPTIONS"
+.SH OPTIONS
 .TP 8
-.B \-h HOST, \-\-host HOST
-Connect to HOST.
+.B \-h
+.IR HOST ,
+.BI \-\-host= HOST
+Connect to
+.IR HOST .
 .TP 8
 .B \-H
-Do not display the legal disclaimers some registries like to show you.
+Do not display the legal disclaimers that some registries like to show you.
 .TP 8
-.B \-p, \-\-port PORT
-Connect to PORT.
+.B \-p
+.IR PORT ,
+.BI \-\-port= PORT
+Connect to
+.IR PORT .
+.TP 8
+.B \-I
+First query
+.I whois.iana.org
+and then follow its referral to the
+whois server authoritative for that request.
+This works for IP addresses,
+AS numbers and domains.
+.BR BEWARE :
+this implies that the IANA server will receive your complete query.
+.TP 8
+.B \-\-no\-recursion
+Disable recursion from registry to registrar servers.
 .TP 8
 .B \-\-verbose
 Be verbose.
@@ -58,9 +90,11 @@ Be verbose.
 Display online help.
 .TP 8
 .B \-\-version
-Display client version information.
+Display the program version.
 .P
-Other options are flags understood by \fIwhois.ripe.net\fP and some other
+Other options are flags understood by
+.I whois.ripe.net
+and some other
 RIPE-like servers:
 .TP 8
 .B \-a
@@ -70,33 +104,51 @@ Also search all the mirrored databases.
 Return brief IP address ranges with abuse contact.
 .TP 8
 .B \-B
-Disable object filtering. (Show the e-mail addresses.)
+Disable objects filtering.
+(Show the e-mail addresses.)
 .TP 8
 .B \-c
 Return the smallest IP address range with a reference to an irt object.
 .TP 8
 .B \-d
 Return the reverse DNS delegation object too.
-.\" .TP 8
-.\" .B \-F
-.\" Return attribute names in short format. Implies \fI-r\fP option.
 .TP 8
-.B \-g SOURCE:FIRST\-LAST
-Search updates from \fISOURCE\fP database between \fIFIRST\fP and \fILAST\fP
-update serial number. It's useful to obtain Near Real Time Mirroring stream.
+.B \-g
+.I SOURCE:FIRST\-LAST
+Search updates from
+.I SOURCE
+database between
+.I FIRST
+and
+.I LAST
+update serial number.
+It is useful to obtain Near Real Time Mirroring stream.
 .TP 8
 .B \-G
 Disable grouping of associated objects.
 .TP 8
-.B \-i ATTR[,ATTR]...
-Search objects having associated attributes. \fIATTR\fP is attribute name.
-Attribute value is positional \fIOBJECT\fP argument.
+.B \-i
+.IR ATTR [, ATTR ]...
+Inverse-search objects having associated attributes.
+.I ATTR
+is the attribute name, while the positional
+.I OBJECT
+argument is the attribute value.
 .TP 8
 .B \-K
-Return primary key attributes only. Exception is \fImembers\fP attribute of
-\fIset\fP object which is always returned. Another exceptions are all
-attributes of objects \fIorganisation\fP, \fIperson\fP, and \fIrole\fP that
-are never returned.
+Return primary key attributes only.
+An exception is the
+.I members
+attribute of
+.I set
+objects, which is always returned.
+Another exception are all
+attributes of the objects
+.IR organisation ,
+.I person
+and
+.IR role ,
+that are never returned.
 .TP 8
 .B \-l
 Return the one level less specific object.
@@ -110,69 +162,100 @@ Return all one level more specific objects.
 .B \-M
 Return all levels of more specific objects.
 .TP 8
-.B -q KEYWORD
-Return list of keywords supported by server. \fIKEYWORD\fP can be
-\fIversion\fP for server version, \fIsources\fP for list of source databases,
-or \fItypes\fP for object types.
+.B \-q
+.I KEYWORD
+Return information about the server.
+.I KEYWORD
+can be
+.I version
+for the server version,
+.I sources
+for the list of database sources or
+.I types
+for the list of supported object types.
 .TP 8
 .B \-r
-Disable recursive look-up for contact information.
+Disable recursive lookups for contact information.
 .TP 8
 .B \-R
 Disable following referrals and force showing the object from the local copy
 in the server.
 .TP 8
-.B \-s SOURCE[,SOURCE]...
-Request the server to search for objects mirrored from \fISOURCES\fP.
-Sources are delimited by comma and the order is significant.
-Use \fI-q sources\fP option to obtain list of valid sources.
+.B \-s
+.IR SOURCE [, SOURCE ]...
+Request the server to search for objects mirrored from
+.IR SOURCE .
+Sources are delimited by comma, and the order is significant.
+Use the
+.I \-q sources
+parameter to obtain a list of valid sources.
 .TP 8
-.B \-t TYPE
-Return the template for a object of \fITYPE\fP.
+.B \-t
+.I TYPE
+Return the template for a object of
+.IR TYPE .
 .TP 8
-.B \-T TYPE[,TYPE]...
-Restrict the search to objects of \fITYPE\fP. Multiple types are separated by
-a comma.
+.B \-T
+.IR TYPE [, TYPE ]...
+Restrict the search to objects of
+.IR TYPE .
+Multiple types are separated by a comma.
 .TP 8
-.B -v TYPE
-Return the verbose template for a object of \fITYPE\fP.
-.\" .TP 8
-.\" .B \-V AGENT
-.\" Change user agent identifier. Typical format is \fIXXn.n\fP like \fIMd5.0\fP.
-.\" RIPE uses the value to identify a client behind a registered proxy (in that
-.\" case a comma followed by a client IP address should be appended).
+.B \-v
+.I TYPE
+Return the verbose template for a object of
+.IR TYPE .
 .TP 8
-.B -x
+.B \-x
 Search for only exact match on network address prefix.
-.SH "NOTES"
-Please remember that \fIwhois.networksolutions.com\fP by default will
-only search in the domains database. If you want to search for NIC handles
-you have to prepend a \fI!\fP character. When you do this, the default
-server becomes \fIwhois.networksolutions.com\fP.
+.SH NOTES
+When querying the Verisign gTLDs
+(e.g.\& \&.com, \&.net...\&)
+thin registry servers
+for a domain, the program will automatically prepend the
+.I domain
+keyword to only show domain records.  The
+.I nameserver
+or
+.I registrar
+keywords must be used to show other kinds of records.
 .P
-When querying \fIwhois.arin.net\fP for IPv4 or IPv6 networks, the CIDR
+When querying
+.I whois.arin.net
+for IPv4 or IPv6 networks, the CIDR
 netmask length will be automatically removed from the query string.
 .P
-When querying \fIwhois.nic.ad.jp\fP for AS numbers, the program will
-automatically convert the request in the appropriate format, inserting
-a space after the string \fIAS\fP.
+When querying
+.I whois.nic.ad.jp
+for AS numbers, the program will automatically convert the request
+in the appropriate format, inserting a space after the string
+.IR AS .
 .P
-When querying \fIwhois.denic.de\fP for domain names and no other
+When querying
+.I whois.denic.de
+for domain names and no other
 flags have been specified, the program will automatically add the flag
-\fI\-T dn\fP.
+.IR "\-T dn" .
 .P
-When querying \fIwhois.dk-hostmaster.dk\fP for domain names and no other
+When querying
+.I whois.dk\-hostmaster.dk
+for domain names and no other
 flags have been specified, the program will automatically add the flag
-\fI\-\-show\-handles\fP.
+.IR "\-\-show\-handles" .
 .P
 RIPE-specific command line options are ignored when querying non-RIPE
-servers. This may or may not be the behaviour intended by the user.
-When querying a non-standard server, command line options which are not
-to be interpreted by the client should always follow the \fI\-\-\fP
+servers.
+This may or may not be the behaviour intended by the user.
+When using non-standard query parameters then the command line options
+which are not to be interpreted by the client must follow the
+.I \-\-
 separator (which marks the beginning of the query string).
 .P
-If the \fI/etc/whois.conf\fR configuration file exists, it will be consulted
-to find a server before applying the normal rules. Each line of the
+If the
+.I /etc/whois.conf
+configuration file exists, it will be consulted
+to find a server before applying the normal rules.
+Each line of the
 file should contain a regular expression to be matched against the query
 text and the whois server to use, separated by white space.
 IDN domains must use the ACE format.
@@ -189,36 +272,44 @@ current system locale and converted to the IDN ASCII Compatible Encoding.
 /etc/whois.conf
 .SH "ENVIRONMENT"
 .IP LANG
-When querying \fIwhois.nic.ad.jp\fP and \fIwhois.jprs.jp\fP English text
-is requested unless the \fILANG\fP or \fILC_MESSAGES\fP environment
-variables specify a Japanese locale.
+When querying
+.I whois.nic.ad.jp
+and
+.I whois.jprs.jp
+English text is requested unless the
+.I LANG
+or
+.I LC_MESSAGES
+environment variables specify a Japanese locale.
 .IP "WHOIS_OPTIONS"
 A list of options which will be evaluated before the ones specified on the
 command line.
 .IP "WHOIS_SERVER"
 This server will be queried if the program cannot guess where some kind
-of objects are located. If the variable does not exist then
-\fIwhois.arin.net\fP will be queried.
+of objects are located.
+If the variable does not exist then
+.I whois.arin.net
+will be queried.
 .SH "SEE ALSO"
-\fBwhois.conf\fP(5)
-.PP
-\fIRFC 3912\fP: WHOIS Protocol Specification
-.PP
-\fIRIPE Database Query Reference Manual:\fP
-\fI<http://www.ripe.net/data-tools/support/documentation/ripe-database-query-reference-manual>\fP
-.SH "BUGS"
+.IR whois.conf (5).
+.P
+.IR "RFC 3912" :
+WHOIS Protocol Specification.
+.P
+.IR "RIPE Database Query Reference Manual" :
+.RI < https://www.ripe.net/\:data\-tools/\:support/\:documentation/\:ripe\-database\-query\-reference\-manual >
+.SH BUGS
 The program may have buffer overflows in the command line parser:
 be sure to not pass untrusted data to it.
-It should be rewritten to use a dynamics strings library.
-.SH "HISTORY"
+It should be rewritten to use a dynamic strings library.
+.SH HISTORY
 This program closely tracks the user interface of the whois client
 developed at RIPE by Ambrose Magee and others on the base of the
 original BSD client.
-I also added support for the protocol extensions developed by David
-Kessens of QWest for the 6bone server.
-.SH "AUTHOR"
+.SH AUTHOR
 .B Whois
-and this man page were written by Marco d'Itri <\fImd@linux.it\fP>
+and this man page were written by Marco d'Itri
+.RI < md@linux.it >
 and are licensed under the terms of the GNU General Public License,
-version 2 or higher.
-
+version 2 or later.
+.\" SPDX-License-Identifier: GPL-2.0-or-later

whois.bash

@@ -0,0 +1,86 @@
+_whois_query() {
+	"$1" -q "$2" 2>/dev/null | while read -r item _; do
+		[[ $item == %* ]] && continue
+		printf "%s\n" "${item%%:*}"
+	done
+}
+
+_whois_hosts() {
+	# _known_hosts_real from github.com/scop/bash-completion if available
+	if declare -f _known_hosts_real &>/dev/null; then
+		_known_hosts_real -- "$1"
+		return 0
+	fi
+	COMPREPLY=($(compgen -A hostname -- "$1"))
+}
+
+_whois() {
+
+	case $3 in
+	--help | --version | -p | --port | -i)
+		return 0
+		;;
+	-h | --host)
+		_whois_hosts "$2"
+		return 0
+		;;
+	-T | -t | -v)
+		[[ ${_whois_types-} ]] ||
+			_whois_types=" $(_whois_query "$1" types)"
+		COMPREPLY=($(compgen -W '$_whois_types' -- "$2"))
+		return 0
+		;;
+	-s | -g)
+		[[ ${_whois_sources-} ]] ||
+			_whois_sources=" $(_whois_query "$1" sources)"
+		COMPREPLY=($(compgen -W '$_whois_sources' -- "$2"))
+		if [[ $3 == -g ]]; then
+			[[ ${#COMPREPLY[*]} -eq 1 ]] && COMPREPLY[0]+=:
+			compopt -o nospace
+		fi
+		return 0
+		;;
+	-q)
+		COMPREPLY=($(compgen -W 'version sources types' -- "$2"))
+		return 0
+		;;
+	esac
+
+	if [[ $2 == -* ]]; then
+		COMPREPLY=($(compgen -W '
+			-h --host
+			-p --port
+			-I
+			-H
+			--verbose
+			--no-recursion
+			--help
+			--version
+			-l
+			-L
+			-m
+			-M
+			-c
+			-x
+			-b
+			-B
+			-G
+			-d
+			-i
+			-T
+			-K
+			-r
+			-R
+			-a
+			-s
+			-g
+			-t
+			-v
+			-q
+		' -- "$2"))
+		return 0
+	fi
+
+	_whois_hosts "$2"
+
+} && complete -F _whois whois

whois.c

@@ -1,10 +1,20 @@
 /*
- * Copyright 1999-2010 by Marco d'Itri <md@linux.it>.
+ * Copyright (C) Marco d'Itri <md@linux.it>.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, see <https://www.gnu.org/licenses/>.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 /* for AI_IDN */
@@ -18,6 +28,7 @@
 #include "config.h"
 #include <string.h>
 #include <ctype.h>
+#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -36,9 +47,13 @@
 #elif defined HAVE_LIBIDN
 #include <idna.h>
 #endif
-#ifdef HAVE_INET_PTON
-#include <arpa/inet.h>
-#endif
+
+/* prototypes referenced in data.h */
+static void find_referral_server_apnic(char **, const char *);
+static void find_referral_server_arin(char **, const char *);
+static void find_referral_server_iana(char **, const char *);
+static void find_referral_server_recursive(char **, const char *);
+static void find_referral_server_verisign(char **, const char *);
 
 /* Application-specific */
 #include "version.h"
@@ -63,7 +78,7 @@
 #endif
 
 /* Global variables */
-int sockfd, verb = 0;
+int sockfd, verb = 0, no_recursion = 0;
 
 #ifdef ALWAYS_HIDE_DISCL
 int hide_discl = HIDE_NOT_STARTED;
@@ -86,6 +101,7 @@ int main(int argc, char *argv[])
 	{"version",		no_argument,		NULL, 1  },
 	{"verbose",		no_argument,		NULL, 2  },
 	{"help",		no_argument,		NULL, 3  },
+	{"no-recursion",	no_argument,		NULL, 4  },
 	{"server",		required_argument,	NULL, 'h'},
 	{"host",		required_argument,	NULL, 'h'},
 	{"port",		required_argument,	NULL, 'p'},
@@ -161,7 +177,7 @@ int main(int argc, char *argv[])
     argv = merge_args(getenv("WHOIS_OPTIONS"), argv, &argc);
 
     while ((ch = GETOPT_LONGISH(argc, argv,
-		"abBcdFg:Gh:Hi:KlLmMp:q:rRs:t:T:v:V:x",
+		"abBcdFg:Gh:Hi:IKlLmMp:q:rRs:t:T:v:V:x",
 		longopts, &longindex)) > 0) {
 	/* RIPE flags */
 	if (strchr(ripeflags, ch)) {
@@ -223,9 +239,15 @@ int main(int argc, char *argv[])
 	case 'H':
 	    hide_discl = HIDE_NOT_STARTED;	/* enable disclaimers hiding */
 	    break;
+	case 'I':
+	    server = strdup("\x0E");
+	    break;
 	case 'p':
 	    port = strdup(optarg);
 	    break;
+	case 4:
+	    no_recursion = 1;
+	    break;
 	case 3:
 	    usage(EXIT_SUCCESS);
 	case 2:
@@ -283,11 +305,8 @@ int main(int argc, char *argv[])
     }
 
 #ifdef CONFIG_FILE
-    if (!server) {
+    if (!server)
 	server = match_config_file(qstring);
-	if (verb && server)
-	    printf(_("Using server %s.\n"), server);
-    }
 #endif
 
     if (!server)
@@ -307,7 +326,7 @@ int handle_query(const char *hserver, const char *hport,
 	const char *query, const char *flags)
 {
     char *server = NULL, *port = NULL;
-    char *p, *query_string;
+    char *p, *query_string, *old_server, *new_server;
 
     if (hport) {
 	server = strdup(hserver);
@@ -340,16 +359,20 @@ int handle_query(const char *hserver, const char *hport,
 	case 4:
 	    if (verb)
 		printf(_("Using server %s.\n"), server + 1);
-	    sockfd = openconn(server + 1, NULL);
-	    free(server);
-	    server = query_crsnic(sockfd, query);
+	    old_server = server;
+	    server = query_verisign(server, NULL, query);
+	    free(old_server);
+	    if (no_recursion && server)
+		server[0] = '\0';
 	    break;
 	case 8:
 	    if (verb)
-		printf(_("Using server %s.\n"), "whois.afilias-grs.info");
-	    sockfd = openconn("whois.afilias-grs.info", NULL);
-	    free(server);
-	    server = query_afilias(sockfd, query);
+		printf(_("Using server %s.\n"), server + 1);
+	    old_server = server;
+	    server = query_server(server, NULL, query);
+	    free(old_server);
+	    if (no_recursion && server)
+		server[0] = '\0';
 	    break;
 	case 0x0A:
 	    p = convert_6to4(query);
@@ -371,6 +394,18 @@ int handle_query(const char *hserver, const char *hport,
 	    server = guess_server(p);
 	    free(p);
 	    goto retry;
+	case 0x0D:
+	    p = convert_in6arpa(query);
+	    free(server);
+	    server = guess_server(p);
+	    free(p);
+	    goto retry;
+	case 0x0E:
+	    if (verb)
+		printf(_("Using server %s.\n"), "whois.iana.org");
+	    free(server);
+	    server = query_server("whois.iana.org", NULL, query);
+	    break;
 	default:
 	    break;
     }
@@ -387,15 +422,17 @@ int handle_query(const char *hserver, const char *hport,
 	printf(_("Query string: \"%s\"\n\n"), query_string);
     }
 
-    sockfd = openconn(server, port);
-
-    server = do_query(sockfd, query_string);
+    new_server = query_server(server, port, query_string);
+    free(server);
+    if (port)
+	free(port);
     free(query_string);
 
     /* recursion is fun */
-    if (server && !strchr(query, ' ')) {
-	printf(_("\n\nFound a referral to %s.\n\n"), server);
-	handle_query(server, NULL, query, flags);
+    if (!no_recursion && new_server && !strchr(query, ' ')) {
+	printf(_("\n\nFound a referral to %s.\n\n"), new_server);
+	handle_query(new_server, NULL, query, flags);
+	free(new_server);
     }
 
     return 0;
@@ -473,12 +510,52 @@ const char *match_config_file(const char *s)
 }
 #endif
 
+/*
+ * Check if the argument is an autonomous system number in the form "ASnnnn"
+ * or "AS nnnn".
+ */
+int is_asn(const char *s, int allow_space, const char *suffix_separators)
+{
+    const char *p;
+    int max_numbers = 6;
+    int seen_number = 0;
+
+    if (!strncaseeq(s, "as", 2))
+	return 0;	 /* does not start with "as" (case insensitive) */
+
+    /* skip a single optional space */
+    p = s + 2;
+    if (allow_space && *p == ' ')
+	p++;
+
+    /* all numbers, but not too many */
+    while (*p) {
+	if (*p < '0' || *p > '9') {	/* not a number */
+	    if (!seen_number)
+		return 0;		/* just "as" with no numbers */
+	    if (suffix_separators && strchr(suffix_separators, *p))
+		return 1;		/* has a trailing separator */
+	    return 0;			/* has trailing garbage */
+	}
+
+	seen_number = 1;
+	if (max_numbers-- == 0)
+	    return 0;			/* too many numbers */
+	p++;
+    }
+
+    if (seen_number)
+	return 1;			/* a real ASN */
+    else
+	return 0;			/* trailing garbage */
+}
+
 /* Parses an user-supplied string and tries to guess the right whois server.
- * Returns a dinamically allocated buffer.
+ * Returns a dynamically allocated buffer.
  */
 char *guess_server(const char *s)
 {
-    unsigned long ip, as32;
+    unsigned long ip;
     unsigned int i;
     const char *colon, *tld;
 
@@ -487,12 +564,8 @@ char *guess_server(const char *s)
 	unsigned long v6prefix, v6net;
 
 	/* RPSL hierarchical objects */
-	if (strncaseeq(s, "as", 2)) {
-	    if (isasciidigit(s[2]))
-		return strdup(whereas(atol(s + 2)));
-	    else
-		return strdup("");
-	}
+	if (is_asn(s, 0, ":"))
+	    return strdup(whereas(atol(s + 2)));
 
 	v6prefix = strtol(s, NULL, 16);
 
@@ -527,26 +600,16 @@ char *guess_server(const char *s)
 
     /* no dot and no hyphen means it's a NSI NIC handle or ASN (?) */
     if (!strpbrk(s, ".-")) {
-	if (strncaseeq(s, "as", 2) &&		/* it's an AS */
-		(isasciidigit(s[2]) || s[2] == ' '))
-	    return strdup(whereas(atol(s + 2)));
+	if (is_asn(s, 1, NULL))
+	    return strdup(whereas(atol(s + 2))); /* it's an AS */
 	if (*s == '!')	/* NSI NIC handle */
 	    return strdup("whois.networksolutions.com");
 	else
 	    return strdup("\x05"); /* probably a unknown kind of nic handle */
     }
 
-    /* ASN32? */
-    if (strncaseeq(s, "as", 2) && s[2] && (as32 = asn32_to_long(s + 2)) != 0)
-	return strdup(whereas32(as32));
-
     /* smells like an IP? */
-#ifdef HAVE_INET_PTON
-    if (inet_pton(AF_INET, s, &ip) > 0) {
-	ip = ntohl(ip);
-#else
     if ((ip = myinet_aton(s))) {
-#endif
 	for (i = 0; ip_assign[i].serv; i++)
 	    if ((ip & ip_assign[i].mask) == ip_assign[i].net)
 		return strdup(ip_assign[i].serv);
@@ -563,7 +626,7 @@ char *guess_server(const char *s)
 	char *server = malloc(strlen("whois.nic.") + strlen(tld) + 1);
 	strcpy(server, "whois.nic.");
 	strcat(server, tld);
-	return(server);
+	return server;
     }
 
     /* no dot but hyphen */
@@ -587,23 +650,10 @@ char *guess_server(const char *s)
     return strdup("\x05");
 }
 
-const char *whereas32(const unsigned long asn)
-{
-    int i;
-
-    for (i = 0; as32_assign[i].serv; i++)
-	if (asn >= as32_assign[i].first && asn <= as32_assign[i].last)
-	    return as32_assign[i].serv;
-    return "\x06";
-}
-
 const char *whereas(const unsigned long asn)
 {
     int i;
 
-    if (asn > 65535)
-	return whereas32(asn);
-
     for (i = 0; as_assign[i].serv; i++)
 	if (asn >= as_assign[i].first && asn <= as_assign[i].last)
 	    return as_assign[i].serv;
@@ -672,22 +722,27 @@ char *queryformat(const char *server, const char *flags, const char *query)
     else if (strchr(query, ' ') || *flags) { }
     else if (streq(server, "whois.denic.de") && in_domain(query, "de"))
 	strcat(buf, "-T dn" DENIC_PARAM_ACE DENIC_PARAM_CHARSET " ");
-    else if (streq(server, "whois.dk-hostmaster.dk") && in_domain(query, "dk"))
+    else if ((streq(server, "whois.punktum.dk") ||
+		streq(server, "whois.dk-hostmaster.dk"))
+	    && in_domain(query, "dk"))
 	strcat(buf, "--show-handles ");
 
     /* mangle and add the query string */
     if (!isripe && streq(server, "whois.nic.ad.jp") &&
-	    strncaseeq(query, "AS", 2) && isasciidigit(query[2])) {
+	    is_asn(query, 1, NULL)) {
 	strcat(buf, "AS ");
 	strcat(buf, query + 2);
     }
     else if (!isripe && streq(server, "whois.arin.net") &&
 	    !strrchr(query, ' ')) {
-	if (strncaseeq(query, "AS", 2) && isasciidigit(query[2])) {
+	if (is_asn(query, 0, NULL)) {
 	    strcat(buf, "a ");
 	    strcat(buf, query + 2);
 	} else if (myinet_aton(query) || strchr(query, ':')) {
-	    strcat(buf, "n + ");
+	    if (strchr(query, '/'))
+		strcat(buf, "r + = ");
+	    else
+		strcat(buf, "n + ");
 	    strcat(buf, query);
 	} else
 	    strcat(buf, query);
@@ -697,8 +752,12 @@ char *queryformat(const char *server, const char *flags, const char *query)
 
     /* ask for english text */
     if (!isripe && (streq(server, "whois.nic.ad.jp") ||
-	    streq(server, "whois.jprs.jp")) && japanese_locale())
-	strcat(buf, "/e");
+	    streq(server, "whois.jprs.jp")) && japanese_locale()) {
+	/* but not if the user already added the /e flag */
+	char *flag = buf + strlen(buf) - 2;
+	if (!streq(flag, "/e"))
+	    strcat(buf, "/e");
+    }
 
     return buf;
 }
@@ -745,55 +804,218 @@ int hide_line(int *hiding, const char *const line)
 	return 0;
 }
 
+static void find_referral_server_apnic(char **referral_server, const char *buf)
+{
+    /* Possible states of this FSM:
+     * 0: searching for the descr or mnt-by attribute
+     * 1: searching for the mnt-by attribute (descr found)
+     * 2: searching for the descr attribute (mnt-by found)
+     * 3: searching for the end of the object (an empty line)
+     * 4: done: stop searching
+     *
+     * Since the descr attribute is user-provided, consider it only if it
+     * is in an object actually maintained by APNIC.
+     *
+     * If multiple records are returned then it users the referral in the
+     * first valid object found.
+     */
+    static int state = 0;
+    static char *rir_name = NULL;
+    char *p;
+
+    if (state == 4)
+	return;
+
+    if (state <= 2) {
+	if (strneq(buf, "descr:", 6)) {
+	    p = (char *)buf + 6;		/* skip until the colon */
+	    for (; *p == ' ' || *p == '\t'; p++);	/* skip white space */
+	    if (strneq(p, "Transferred to the ", 19)) {
+		rir_name = strdup(p + 19);
+		if ((p = strpbrk(rir_name, " ")))
+		    *p = '\0';
+		if (state == 0)
+		    state = 1;			/* still needs mnt-by */
+		else
+		    state = 3;
+	    }
+	} else if (strneq(buf, "mnt-by:", 7)) {
+	    p = (char *)buf + 7;		/* skip until the colon */
+	    for (; *p == ' ' || *p == '\t'; p++);	/* skip white space */
+	    if (streq(p, "APNIC-STUB")) {
+		if (state == 0)
+		    state = 2;			/* still needs descr */
+		else
+		    state = 3;
+	    }
+	} else if (streq(buf, "")) {
+	    if (state == 1)
+		free(rir_name);
+	    state = 0;			/* start again with a new object */
+	}
+	return;
+    }
+
+    if (state == 3 && streq(buf, "")) {
+	int i;
+	const char *rir_servers[] = {
+	    "AFRINIC",	"whois.afrinic.net",
+	    "ARIN",	"whois.arin.net",
+	    "LACNIC",	"whois.lacnic.net",
+	    "RIPE",	"whois.ripe.net",
+	    NULL,	NULL,
+	};
+
+	state = 4;
+
+	for (i = 0; rir_servers[i]; i += 2)
+	    if (streq(rir_name, rir_servers[i]))
+		*referral_server = strdup(rir_servers[i + 1]);
+	free(rir_name);
+    }
+}
+
+static void find_referral_server_arin(char **referral_server, const char *buf)
+{
+    char *p;
+
+    /* ARIN referrals:
+     * ReferralServer: rwhois://rwhois.fuse.net:4321/
+     * ReferralServer: whois://whois.ripe.net
+     * ReferralServer: whois.ripe.net
+     */
+    if (!strneq(buf, "ReferralServer:", 15))
+	return;
+
+    /* When whois.arin.net returns multiple NetRange records, they will
+     * appear from the less specific one to the most specific one.
+     * Since the range we care about is the most specific one then we
+     * need to use the last ReferralServer field found.
+     */
+    if (*referral_server) {
+	free(*referral_server);
+	*referral_server = NULL;
+    }
+
+    if ((p = strstr(buf, "rwhois://")))
+	*referral_server = strdup(p + 9);
+    else if ((p = strstr(buf, "whois://")))
+	*referral_server = strdup(p + 8);
+    else
+	*referral_server = strdup(buf + 17);
+    if (*referral_server && (p = strpbrk(*referral_server, "/")))
+	*p = '\0';
+}
+
+static void find_referral_server_iana(char **referral_server, const char *buf)
+{
+    const char *p;
+
+    if (*referral_server)
+	return;
+
+    /* IANA referrals:
+     * refer:        whois.apnic.net
+     */
+    if (!strneq(buf, "refer:", 6))
+	return;
+
+    p = buf + 6;				/* skip until the colon */
+    for (; *p == ' ' || *p == '\t'; p++);	/* skip white space */
+    *referral_server = strdup(p);
+}
+
+static void find_referral_server_recursive(char **referral_server, const char *buf)
+{
+    static int state = 0;
+    const char *p;
+
+    if (*referral_server)
+	return;
+
+    if (state == 0 && strneq(buf, "Domain Name:", 12))
+	state = 1;
+    else if (state == 1 && strneq(buf, "Domain Name:", 12))
+	state = 2;
+    else if (state == 1 && strneq(buf, "Registrar WHOIS Server:", 23)) {
+	p = buf + 23;				/* skip until the colon */
+	for (; *p && *p == ' '; p++);		/* skip the spaces */
+	*referral_server = strdup(p);
+	state = 2;
+    }
+}
+
+static void find_referral_server_verisign(char **referral_server, const char *buf)
+{
+    static int state = 0;
+    const char *p;
+
+    if (*referral_server)
+	return;
+
+    /* If there are multiple matches only the server of the first record
+     * is queried */
+    if (state == 0 && strneq(buf, "   Domain Name:", 15)) {
+	state = 1;
+    } else if (state == 0 && strneq(buf, "   Server Name:", 15)) {
+	*referral_server = strdup("");
+	state = 2;
+    } else if (state == 1 && strneq(buf, "   Registrar WHOIS Server:", 26)) {
+	p = buf + 26;				/* skip until the colon */
+	for (; *p && *p == ' '; p++);		/* skip the spaces */
+	*referral_server = strdup(p);
+	state = 2;
+    }
+}
+
 /* returns a string which should be freed by the caller, or NULL */
-char *do_query(const int sock, const char *query)
+char *query_server(const char *server, const char *port, const char *query)
 {
     char *temp, *p, buf[2000];
     FILE *fi;
     int hide = hide_discl;
+    int sock, i;
     char *referral_server = NULL;
+    void (*referral_handler)(char **referral_server, const char *buf) = NULL;
 
     temp = malloc(strlen(query) + 2 + 1);
     strcpy(temp, query);
     strcat(temp, "\r\n");
 
+    for (i = 0; server_referral_handlers[i].name; i++) {
+	/* If the first character is not printable then it represents
+	 * a general category of servers in the list.
+	 */
+	if (server[0] < ' ' &&
+		   strneq(server_referral_handlers[i].name, server, 1)) {
+	    server++;
+	    referral_handler = server_referral_handlers[i].handler;
+	    break;
+	} else if (streq(server_referral_handlers[i].name, server)) {
+	    referral_handler = server_referral_handlers[i].handler;
+	    break;
+	}
+    }
+
+    sock = openconn(server, port);
     fi = fdopen(sock, "r");
+    if (!fi)
+	err_sys("fdopen");
     if (write(sock, temp, strlen(temp)) < 0)
 	err_sys("write");
     free(temp);
 
     while (fgets(buf, sizeof(buf), fi)) {
-	/* 6bone-style referral:
-	 * % referto: whois -h whois.arin.net -p 43 as 1
-	 */
-	if (!referral_server && strneq(buf, "% referto:", 10)) {
-	    char nh[256], np[16], nq[1024];
+	alarm(20);				/* reset the timeout */
+	if ((p = strpbrk(buf, "\r\n")))		/* remove the trailing CR/LF */
+	    *p = '\0';
 
-	    if (sscanf(buf, REFERTO_FORMAT, nh, np, nq) == 3) {
-		/* XXX we are ignoring the new query string */
-		referral_server = malloc(strlen(nh) + 1 + strlen(np) + 1);
-		sprintf(referral_server, "%s:%s", nh, np);
-	    }
-	}
-
-	/* ARIN referrals:
-	 * ReferralServer: rwhois://rwhois.fuse.net:4321/
-	 * ReferralServer: whois://whois.ripe.net
-	 */
-	if (!referral_server && strneq(buf, "ReferralServer:", 15)) {
-	    if ((p = strstr(buf, "rwhois://")))
-		referral_server = strdup(p + 9);
-	    else if ((p = strstr(buf, "whois://")))
-		referral_server = strdup(p + 8);
-	    if (referral_server && (p = strpbrk(referral_server, "/\r\n")))
-		*p = '\0';
-	}
+	if (referral_handler)
+	    referral_handler(&referral_server, buf);
 
 	if (hide_line(&hide, buf))
 	    continue;
 
-	if ((p = strpbrk(buf, "\r\n")))
-	    *p = '\0';
 	recode_fputs(buf, stdout);
 	fputc('\n', stdout);
     }
@@ -806,112 +1028,36 @@ char *do_query(const int sock, const char *query)
 	err_quit(_("Catastrophic error: disclaimer text has been changed.\n"
 		   "Please upgrade this program.\n"));
 
+    /* defensive programming: make sure to avoid trivial referral loops */
+    if (referral_server && streq(server, referral_server)) {
+	free(referral_server);
+	referral_server = NULL;
+    }
+
     return referral_server;
 }
 
-char *query_crsnic(const int sock, const char *query)
+char *query_verisign(const char *server, const char *port, const char *query)
 {
-    char *temp, *p, buf[2000];
-    FILE *fi;
-    int hide = hide_discl;
+    char *temp, *p;
+    int sock;
     char *referral_server = NULL;
-    int state = 0;
+    int dotscount = 0;
 
     temp = malloc(strlen("domain ") + strlen(query) + 2 + 1);
+    *temp = '\0';
 
-    if (!strpbrk(query, "=~ "))
+    /* if this has more than one dot then it is a name server */
+    for (p = (char *) query; *p != '\0'; p++)
+	if (*p == '.')
+	    dotscount++;
+
+    if (dotscount == 1 && !strpbrk(query, "=~ "))
 	strcpy(temp, "domain ");
     strcat(temp, query);
-    strcat(temp, "\r\n");
 
-    fi = fdopen(sock, "r");
-    if (write(sock, temp, strlen(temp)) < 0)
-	err_sys("write");
+    referral_server = query_server(server, port, temp);
     free(temp);
-
-    while (fgets(buf, sizeof(buf), fi)) {
-	/* If there are multiple matches only the server of the first record
-	   is queried */
-	if (state == 0 && strneq(buf, "   Domain Name:", 15))
-	    state = 1;
-	if (state == 1 && (strneq(buf, "   Whois Server:", 16)
-		    || strneq(buf, "   WHOIS Server:", 16))) {
-	    for (p = buf; *p != ':'; p++);	/* skip until the colon */
-	    for (p++; *p == ' '; p++);		/* skip the spaces */
-	    referral_server = strdup(p);
-	    if ((p = strpbrk(referral_server, "\r\n ")))
-		*p = '\0';
-	    state = 2;
-	}
-
-	/* the output must not be hidden or no data will be shown for
-	   host records and not-existing domains */
-	if (hide_line(&hide, buf))
-	    continue;
-
-	if ((p = strpbrk(buf, "\r\n")))
-	    *p = '\0';
-	recode_fputs(buf, stdout);
-	fputc('\n', stdout);
-    }
-
-    if (ferror(fi))
-	err_sys("fgets");
-    fclose(fi);
-
-    return referral_server;
-}
-
-char *query_afilias(const int sock, const char *query)
-{
-    char *temp, *p, buf[2000];
-    FILE *fi;
-    int hide = hide_discl;
-    char *referral_server = NULL;
-    int state = 0;
-
-    temp = malloc(strlen(query) + 2 + 1);
-    strcpy(temp, query);
-    strcat(temp, "\r\n");
-
-    fi = fdopen(sock, "r");
-    if (write(sock, temp, strlen(temp)) < 0)
-	err_sys("write");
-    free(temp);
-
-    while (fgets(buf, sizeof(buf), fi)) {
-	/* If multiple attributes are returned then use the first result.
-	   This is not supposed to happen. */
-	if (state == 0 && strneq(buf, "Domain Name:", 12))
-	    state = 1;
-	if (state == 1 && strneq(buf, "Whois Server:", 13)) {
-	    for (p = buf; *p != ':'; p++);	/* skip until colon */
-	    for (p++; *p == ' '; p++);		/* skip colon and spaces */
-	    referral_server = strdup(p);
-	    if ((p = strpbrk(referral_server, "\r\n ")))
-		*p = '\0';
-	    state = 2;
-	}
-
-	/* the output must not be hidden or no data will be shown for
-	   host records and not-existing domains */
-	if (hide_line(&hide, buf))
-	    continue;
-
-	if ((p = strpbrk(buf, "\r\n")))
-	    *p = '\0';
-	recode_fputs(buf, stdout);
-	fputc('\n', stdout);
-    }
-
-    if (ferror(fi))
-	err_sys("fgets");
-    fclose(fi);
-
-    if (hide > HIDE_NOT_STARTED && hide != HIDE_TO_THE_END)
-	err_quit(_("Catastrophic error: disclaimer text has been changed.\n"
-		   "Please upgrade this program.\n"));
-
     return referral_server;
 }
 
@@ -933,9 +1079,9 @@ int openconn(const char *server, const char *port)
      * instead of connecting to the actual whois server.
      */
     if (AFL_MODE)
-	return (dup(0));
+	return dup(0);
 
-    alarm(60);
+    alarm(20);
 
 #ifdef HAVE_GETADDRINFO
     memset(&hints, 0, sizeof(struct addrinfo));
@@ -999,7 +1145,7 @@ int connect_with_timeout(int fd, const struct sockaddr *addr,
     struct timeval tv;
 
     if (timeout <= 0)
-	return (connect(fd, addr, addrlen));
+	return connect(fd, addr, addrlen);
 
     if ((savedflags = fcntl(fd, F_GETFL, 0)) < 0)
 	return -1;
@@ -1051,7 +1197,7 @@ int connect_with_timeout(int fd, const struct sockaddr *addr,
     return 0;
 }
 
-void NORETURN alarm_handler(int signum)
+void NORETURN alarm_handler(UNUSED int signum)
 {
     close(sockfd);
     err_quit(_("Timeout."));
@@ -1063,10 +1209,11 @@ void NORETURN sighandler(int signum)
     err_quit(_("Interrupted by signal %d..."), signum);
 }
 
-int japanese_locale(void) {
+int japanese_locale(void)
+{
     char *lang;
 
-    lang = getenv("LC_MESSAGE");
+    lang = getenv("LC_MESSAGES");
     if (lang) {
 	if (strneq(lang, "ja", 2))
 	    return 0;
@@ -1162,6 +1309,12 @@ char *normalize_domain(const char *dom)
     }
 
 #if defined HAVE_LIBIDN || defined HAVE_LIBIDN2
+    /* A leading ! means that this probably is a RADB query, so skip IDN
+     * processing because it would lower-case the command characters.
+     */
+    if (*ret == '!')
+	return ret;
+
     /* find the start of the last word if there are spaces in the query */
     for (p = ret; *p; p++)
 	if (*p == ' ')
@@ -1210,7 +1363,8 @@ char *normalize_domain(const char *dom)
 
 /* server and port have to be freed by the caller */
 void split_server_port(const char *const input,
-	char **server, char **port) {
+	char **server, char **port)
+{
     char *p;
 
     if (*input == '[' && (p = strchr(input, ']'))) {	/* IPv6 */
@@ -1250,18 +1404,6 @@ void split_server_port(const char *const input,
 char *convert_6to4(const char *s)
 {
     char *new;
-
-#ifdef HAVE_INET_PTON
-    struct in6_addr ipaddr;
-    unsigned char *ip;
-
-    if (inet_pton(AF_INET6, s, &ipaddr) <= 0)
-	return strdup("0.0.0.0");
-
-    ip = (unsigned char *)&ipaddr;
-    new = malloc(sizeof("255.255.255.255"));
-    sprintf(new, "%d.%d.%d.%d", *(ip + 2), *(ip + 3), *(ip + 4), *(ip + 5));
-#else
     int items;
     unsigned int a, b;
     char c;
@@ -1280,7 +1422,6 @@ char *convert_6to4(const char *s)
 
     new = malloc(sizeof("255.255.255.255"));
     sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff);
-#endif
 
     return new;
 }
@@ -1288,19 +1429,6 @@ char *convert_6to4(const char *s)
 char *convert_teredo(const char *s)
 {
     char *new;
-
-#ifdef HAVE_INET_PTON
-    struct in6_addr ipaddr;
-    unsigned char *ip;
-
-    if (inet_pton(AF_INET6, s, &ipaddr) <= 0)
-	return strdup("0.0.0.0");
-
-    ip = (unsigned char *)&ipaddr;
-    new = malloc(sizeof("255.255.255.255"));
-    sprintf(new, "%d.%d.%d.%d", *(ip + 12) ^ 0xff, *(ip + 13) ^ 0xff,
-	    *(ip + 14) ^ 0xff, *(ip + 15) ^ 0xff);
-#else
     unsigned int a, b;
 
     if (sscanf(s, "2001:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%*[^:]:%x:%x", &a, &b) != 2)
@@ -1310,7 +1438,6 @@ char *convert_teredo(const char *s)
     b ^= 0xffff;
     new = malloc(sizeof("255.255.255.255"));
     sprintf(new, "%u.%u.%u.%u", a >> 8, a & 0xff, b >> 8, b & 0xff);
-#endif
 
     return new;
 }
@@ -1351,7 +1478,68 @@ char *convert_inaddr(const char *s)
     return new;
 }
 
-#ifndef HAVE_INET_PTON
+char *convert_in6arpa(const char *s)
+{
+    char *ip, *p;
+    int character = 0;
+    int digits = 1;
+
+    ip = malloc(40);
+
+    p = strstr(s, ".ip6.arpa");
+    if (!p || p == s) {
+	ip[character] = '\0';
+	return ip;
+    }
+
+    /* start from the first character before ".ip6.arpa" */
+    p--;
+
+    while (1) {
+	/* check that this is a valid digit for an IPv6 address */
+	if (!((*p >= '0' && *p <= '9') || (*p >= 'a' && *p <= 'f') ||
+	      (*p >= 'A' && *p <= 'F'))) {
+	    ip[character] = '\0';
+	    return ip;
+	}
+
+	/* copy the digit to the IP address */
+	ip[character++] = *p;
+
+	/* stop if we have reached the beginning of the string */
+	if (p == s)
+	    break;
+
+	/* stop if we have parsed a complete address */
+	if (character == 39)
+	    break;
+
+	/* add the colon separator every four digits */
+	if ((digits++ % 4) == 0)
+	    ip[character++] = ':';
+
+	/* go to the precedent character and abort if it is not a dot */
+	p--;
+	if (*p != '.') {
+	    ip[character] = '\0';
+	    return ip;
+	}
+
+	/* abort if the string starts with the dot */
+	if (p == s) {
+	    ip[character] = '\0';
+	    return ip;
+	}
+
+	/* go to the precedent character and continue */
+	p--;
+    }
+
+    /* terminate the string */
+    ip[character] = '\0';
+    return ip;
+}
+
 unsigned long myinet_aton(const char *s)
 {
     unsigned long a, b, c, d;
@@ -1367,27 +1555,13 @@ unsigned long myinet_aton(const char *s)
 	return 0;
     return (a << 24) + (b << 16) + (c << 8) + d;
 }
-#endif
 
-unsigned long asn32_to_long(const char *s)
+int isasciidigit(const char c)
 {
-    unsigned long a, b;
-    char junk;
-
-    if (!s)
-	return 0;
-    if (sscanf(s, "%lu.%lu%c", &a, &b, &junk) != 2)
-	return 0;
-    if (a > 65535 || b > 65535)
-	return 0;
-    return (a << 16) + b;
-}
-
-int isasciidigit(const char c) {
     return (c >= '0' && c <= '9') ? 1 : 0;
 }
 
-/* http://www.ripe.net/ripe/docs/databaseref-manual.html */
+/* https://www.ripe.net/ripe/docs/databaseref-manual.html */
 
 void NORETURN usage(int error)
 {
@@ -1395,31 +1569,47 @@ void NORETURN usage(int error)
 "Usage: whois [OPTION]... OBJECT...\n\n"
 "-h HOST, --host HOST   connect to server HOST\n"
 "-p PORT, --port PORT   connect to PORT\n"
+"-I                     query whois.iana.org and follow its referral\n"
 "-H                     hide legal disclaimers\n"
+    ));
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "      --verbose        explain what is being done\n"
+"      --no-recursion   disable recursion from registry to registrar servers\n"
 "      --help           display this help and exit\n"
 "      --version        output version information and exit\n"
 "\n"
+    ));
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "These flags are supported by whois.ripe.net and some RIPE-like servers:\n"
 "-l                     find the one level less specific match\n"
 "-L                     find all levels less specific matches\n"
 "-m                     find all one level more specific matches\n"
 "-M                     find all levels of more specific matches\n"
+    ));
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "-c                     find the smallest match containing a mnt-irt attribute\n"
 "-x                     exact match\n"
 "-b                     return brief IP address ranges with abuse contact\n"
+    ));
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "-B                     turn off object filtering (show email addresses)\n"
 "-G                     turn off grouping of associated objects\n"
 "-d                     return DNS reverse delegation objects too\n"
+    ));
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "-i ATTR[,ATTR]...      do an inverse look-up for specified ATTRibutes\n"
 "-T TYPE[,TYPE]...      only look for objects of TYPE\n"
 "-K                     only primary keys are returned\n"
 "-r                     turn off recursive look-ups for contact information\n"
+    ));
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "-R                     force to show local copy of the domain object even\n"
 "                       if it contains referral\n"
 "-a                     also search all the mirrored databases\n"
 "-s SOURCE[,SOURCE]...  search the database mirrored from SOURCE\n"
 "-g SOURCE:FIRST-LAST   find updates from SOURCE from serial FIRST to LAST\n"
+    ));
+    fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
 "-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\n"

whois.conf

@@ -3,9 +3,9 @@
 # This file can contain details of alternative whois servers to use if
 # the compiled in servers are not suitable.  Each entry is a single
 # text line and consists of a regular expression pattern to match and
-# the whois server to be used for it, separated by blank space. 
+# the whois server to be used for it, separated by blank space.
 # IDN domains must use the ACE format.
 #
-# Eg: 
+# Eg:
 # \.nz$ nz.whois-servers.net
 #

whois.conf.5

@@ -1,12 +1,12 @@
-.TH "WHOIS.CONF" "5" "9 April 2013" "Petr Písař" "Debian GNU/Linux"
+.TH "WHOIS.CONF" "5" "2019-12-30" "Petr Písař" "Debian GNU/Linux"
 
-.SH "NAME"
+.SH NAME
 whois.conf \- alternative WHOIS servers list for whois client
 
-.SH "SYNOPSIS"
+.SH SYNOPSIS
 .B /etc/whois.conf
 
-.SH "DESCRIPTION"
+.SH DESCRIPTION
 This file contains a list of WHOIS servers which can augment or override
 the built-in list of the client.
 
@@ -25,7 +25,7 @@ case-insensitive suffix comparison against WHOIS object identifier is used.
 Internationalized domain names (IDN) must be specified in ascii-compatible
 encoding (ACE) format.
 
-.SH "EXAMPLE"
+.SH EXAMPLE
 \\.nz$             nz.whois-servers.net
 .br
 # Hangul Korean TLD
@@ -36,13 +36,15 @@ encoding (ACE) format.
 .br
 ^as645(1[2-9]|2[0-9]|3[0-4])$    whois.example.net
 
-.SH "FILES"
+.SH FILES
 /etc/whois.conf
 
 .SH "SEE ALSO"
-\fBwhois\fP(1)
+.IR whois (1)
 
-.SH "AUTHOR"
-This manual page was written by Petr Písař <\fIppisar@redhat.com\fP>
+.SH AUTHOR
+This manual page was written by Petr Písař
+.RI < ppisar@redhat.com >
 and is licensed under the terms of the GNU General Public License,
 version 2 or higher.
+\" SPDX-License-Identifier: GPL-2.0-or-later

whois.h

@@ -1,26 +1,19 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #include "utils.h"
 
-/* 6bone referto: extension */
-#define REFERTO_FORMAT	"%% referto: whois -h %255s -p %15s %1021[^\n\r]"
-
-/* String sent to RIPE servers - MUST NOT BE LONGER THAN FIVE CHARACTERS! */
-/* Do *NOT* change it if you don't know what you are doing! */
-#define IDSTRING "Md5.2"
-
 #define HIDE_TO_THE_END  -3
 #define HIDE_DISABLED    -2
 #define HIDE_NOT_STARTED -1
 
 /* prototypes */
+int is_asn(const char *, int, const char *);
 char *guess_server(const char *);
 const char *match_config_file(const char *);
 const char *whereas(const unsigned long);
-const char *whereas32(const unsigned long);
 char *queryformat(const char *, const char *, const char *);
 int hide_line(int *hiding, const char *const line);
-char *do_query(const int, const char *);
-char *query_crsnic(const int, const char *);
-char *query_afilias(const int, const char *);
+char *query_server(const char *, const char *, const char *);
+char *query_verisign(const char *, const char *, const char *);
 int openconn(const char *, const char *);
 int connect_with_timeout(int, const struct sockaddr *, socklen_t, int);
 void NORETURN usage(int error);
@@ -28,7 +21,6 @@ void NORETURN alarm_handler(int);
 void NORETURN sighandler(int);
 int japanese_locale(void);
 unsigned long myinet_aton(const char *);
-unsigned long asn32_to_long(const char *);
 int isasciidigit(const char);
 int endstrcaseeq(const char *, const char *);
 int in_domain(const char *, const char *);
@@ -38,6 +30,7 @@ char *normalize_domain(const char *);
 char *convert_6to4(const char *);
 char *convert_teredo(const char *);
 char *convert_inaddr(const char *);
+char *convert_in6arpa(const char *);
 int handle_query(const char *server, const char *port,
 		   const char *qstring, const char *fstring);
 void split_server_port(const char *const input, char **server, char **port);