Use the newest gettext release.
diff --git a/ABOUT-NLS b/ABOUT-NLS
index 3cc8286..0a9d56d 100644
--- a/ABOUT-NLS
+++ b/ABOUT-NLS
@@ -1,1379 +1 @@
-1 Notes on the Free Translation Project
-***************************************
-
-Free software is going international!  The Free Translation Project is a
-way to get maintainers of free software, translators, and users all
-together, so that free software will gradually become able to speak many
-languages.  A few packages already provide translations for their
-messages.
-
-   If you found this 'ABOUT-NLS' file inside a distribution, you may
-assume that the distributed package does use GNU 'gettext' internally,
-itself available at your nearest GNU archive site.  But you do _not_
-need to install GNU 'gettext' prior to configuring, installing or using
-this package with messages translated.
-
-   Installers will find here some useful hints.  These notes also
-explain how users should proceed for getting the programs to use the
-available translations.  They tell how people wanting to contribute and
-work on translations can contact the appropriate team.
-
-1.1 INSTALL Matters
-===================
-
-Some packages are "localizable" when properly installed; the programs
-they contain can be made to speak your own native language.  Most such
-packages use GNU 'gettext'.  Other packages have their own ways to
-internationalization, predating GNU 'gettext'.
-
-   By default, this package will be installed to allow translation of
-messages.  It will automatically detect whether the system already
-provides the GNU 'gettext' functions.  Installers may use special
-options at configuration time for changing the default behaviour.  The
-command:
-
-     ./configure --disable-nls
-
-will _totally_ disable translation of messages.
-
-   When you already have GNU 'gettext' installed on your system and run
-configure without an option for your new package, 'configure' will
-probably detect the previously built and installed 'libintl' library and
-will decide to use it.  If not, you may have to to use the
-'--with-libintl-prefix' option to tell 'configure' where to look for it.
-
-   Internationalized packages usually have many 'po/LL.po' files, where
-LL gives an ISO 639 two-letter code identifying the language.  Unless
-translations have been forbidden at 'configure' time by using the
-'--disable-nls' switch, all available translations are installed
-together with the package.  However, the environment variable 'LINGUAS'
-may be set, prior to configuration, to limit the installed set.
-'LINGUAS' should then contain a space separated list of two-letter
-codes, stating which languages are allowed.
-
-1.2 Using This Package
-======================
-
-As a user, if your language has been installed for this package, you
-only have to set the 'LANG' environment variable to the appropriate
-'LL_CC' combination.  If you happen to have the 'LC_ALL' or some other
-'LC_xxx' environment variables set, you should unset them before setting
-'LANG', otherwise the setting of 'LANG' will not have the desired
-effect.  Here 'LL' is an ISO 639 two-letter language code, and 'CC' is
-an ISO 3166 two-letter country code.  For example, let's suppose that
-you speak German and live in Germany.  At the shell prompt, merely
-execute 'setenv LANG de_DE' (in 'csh'), 'export LANG; LANG=de_DE' (in
-'sh') or 'export LANG=de_DE' (in 'bash').  This can be done from your
-'.login' or '.profile' file, once and for all.
-
-   You might think that the country code specification is redundant.
-But in fact, some languages have dialects in different countries.  For
-example, 'de_AT' is used for Austria, and 'pt_BR' for Brazil.  The
-country code serves to distinguish the dialects.
-
-   The locale naming convention of 'LL_CC', with 'LL' denoting the
-language and 'CC' denoting the country, is the one use on systems based
-on GNU libc.  On other systems, some variations of this scheme are used,
-such as 'LL' or 'LL_CC.ENCODING'.  You can get the list of locales
-supported by your system for your language by running the command
-'locale -a | grep '^LL''.
-
-   Not all programs have translations for all languages.  By default, an
-English message is shown in place of a nonexistent translation.  If you
-understand other languages, you can set up a priority list of languages.
-This is done through a different environment variable, called
-'LANGUAGE'.  GNU 'gettext' gives preference to 'LANGUAGE' over 'LANG'
-for the purpose of message handling, but you still need to have 'LANG'
-set to the primary language; this is required by other parts of the
-system libraries.  For example, some Swedish users who would rather read
-translations in German than English for when Swedish is not available,
-set 'LANGUAGE' to 'sv:de' while leaving 'LANG' to 'sv_SE'.
-
-   Special advice for Norwegian users: The language code for Norwegian
-bokma*l changed from 'no' to 'nb' recently (in 2003).  During the
-transition period, while some message catalogs for this language are
-installed under 'nb' and some older ones under 'no', it's recommended
-for Norwegian users to set 'LANGUAGE' to 'nb:no' so that both newer and
-older translations are used.
-
-   In the 'LANGUAGE' environment variable, but not in the 'LANG'
-environment variable, 'LL_CC' combinations can be abbreviated as 'LL' to
-denote the language's main dialect.  For example, 'de' is equivalent to
-'de_DE' (German as spoken in Germany), and 'pt' to 'pt_PT' (Portuguese
-as spoken in Portugal) in this context.
-
-1.3 Translating Teams
-=====================
-
-For the Free Translation Project to be a success, we need interested
-people who like their own language and write it well, and who are also
-able to synergize with other translators speaking the same language.
-Each translation team has its own mailing list.  The up-to-date list of
-teams can be found at the Free Translation Project's homepage,
-'http://translationproject.org/', in the "Teams" area.
-
-   If you'd like to volunteer to _work_ at translating messages, you
-should become a member of the translating team for your own language.
-The subscribing address is _not_ the same as the list itself, it has
-'-request' appended.  For example, speakers of Swedish can send a
-message to 'sv-request@li.org', having this message body:
-
-     subscribe
-
-   Keep in mind that team members are expected to participate _actively_
-in translations, or at solving translational difficulties, rather than
-merely lurking around.  If your team does not exist yet and you want to
-start one, or if you are unsure about what to do or how to get started,
-please write to 'coordinator@translationproject.org' to reach the
-coordinator for all translator teams.
-
-   The English team is special.  It works at improving and uniformizing
-the terminology in use.  Proven linguistic skills are praised more than
-programming skills, here.
-
-1.4 Available Packages
-======================
-
-Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of Jun 2014.
-The matrix shows, in regard of each package, for which languages PO
-files have been submitted to translation coordination, with a
-translation percentage of at least 50%.
-
-     Ready PO files       af am an ar as ast az be bg bn bn_IN bs ca crh cs
-                        +---------------------------------------------------+
-     a2ps               |                       []                []     [] |
-     aegis              |                                                   |
-     anubis             |                                                   |
-     aspell             |                []                       []     [] |
-     bash               |                          []             []     [] |
-     bfd                |                                                   |
-     binutils           |                                         []        |
-     bison              |                                                   |
-     bison-runtime      |                []                                 |
-     buzztrax           |                                                [] |
-     ccd2cue            |                                                   |
-     ccide              |                                                   |
-     cflow              |                                                   |
-     clisp              |                                                   |
-     coreutils          |                                         []     [] |
-     cpio               |                                                   |
-     cppi               |                                                   |
-     cpplib             |                                         []        |
-     cryptsetup         |                                                [] |
-     datamash           |                                                   |
-     denemo             |                                         []     [] |
-     dfarc              |                                         []        |
-     dialog             |       []                                []     [] |
-     dico               |                                                   |
-     diffutils          |                                                [] |
-     dink               |                                         []        |
-     direvent           |                                                   |
-     doodle             |                                                [] |
-     dos2unix           |                                                   |
-     dos2unix-man       |                                                   |
-     e2fsprogs          |                                         []     [] |
-     enscript           |                                         []        |
-     exif               |                                                [] |
-     fetchmail          |                                         []     [] |
-     findutils          |                                                [] |
-     flex               |                                         []        |
-     freedink           |                                         []     [] |
-     fusionforge        |                                                   |
-     gas                |                                                   |
-     gawk               |                                         []        |
-     gcal               |                                         []        |
-     gcc                |                                                   |
-     gdbm               |                                                   |
-     gettext-examples   | []             []        []             []     [] |
-     gettext-runtime    |                          []             []     [] |
-     gettext-tools      |                          []             []        |
-     gjay               |                                                   |
-     glunarclock        |                []        []                    [] |
-     gnubiff            |                                                [] |
-     gnubik             |          []                                       |
-     gnucash            |          ()              ()             []        |
-     gnuchess           |                                                   |
-     gnulib             |                                                [] |
-     gnunet             |                                                   |
-     gnunet-gtk         |                                                   |
-     gold               |                                                   |
-     gphoto2            |                                                [] |
-     gprof              |                          []                       |
-     gramadoir          |                                                   |
-     grep               |                          []             []     [] |
-     grub               |                                         []        |
-     gsasl              |                                                   |
-     gss                |                                                   |
-     gst-plugins-bad    |                          []                    [] |
-     gst-plugins-base   |                          []             []     [] |
-     gst-plugins-good   |                          []             []     [] |
-     gst-plugins-ugly   |                          []             []     [] |
-     gstreamer          |                []        []             []     [] |
-     gtick              |                                                [] |
-     gtkam              |                       []                       [] |
-     gtkspell           | []             []     []                []     [] |
-     guix               |                                                   |
-     guix-packages      |                                                   |
-     gutenprint         |                                         []        |
-     hello              |                                         []        |
-     help2man           |                                                   |
-     help2man-texi      |                                                   |
-     hylafax            |                                                   |
-     idutils            |                                                   |
-     iso_15924          |                                                [] |
-     iso_3166           | []          []        [] [] []  []   [] [] []  [] |
-     iso_3166_2         |                                                   |
-     iso_4217           |                                                [] |
-     iso_639            |             [] []     [] [] []  []      [] []  [] |
-     iso_639_3          |                []                          []     |
-     iso_639_5          |                                                   |
-     jwhois             |                                                   |
-     kbd                |                                                [] |
-     klavaro            |          []              [] []          []     [] |
-     ld                 |                          []                       |
-     leafpad            |                       [] []             []     [] |
-     libc               |                          []             []     [] |
-     libexif            |                       ()                          |
-     libextractor       |                                                   |
-     libgnutls          |                                                [] |
-     libgphoto2         |                                                [] |
-     libgphoto2_port    |                                                [] |
-     libgsasl           |                                                   |
-     libiconv           |                          []                    [] |
-     libidn             |                                                [] |
-     liferea            |          []    []                       []     [] |
-     lilypond           |                                         []     [] |
-     lordsawar          |                                         []        |
-     lprng              |                                                   |
-     lynx               |                                         []     [] |
-     m4                 |                                                [] |
-     mailfromd          |                                                   |
-     mailutils          |                                                   |
-     make               |                                                [] |
-     man-db             |                                         []     [] |
-     man-db-manpages    |                                                   |
-     midi-instruments   |          []                             []     [] |
-     minicom            |                                                [] |
-     mkisofs            |                                                [] |
-     myserver           |                                                [] |
-     nano               |                          []             []     [] |
-     opcodes            |                                                   |
-     parted             |                                                [] |
-     pies               |                                                   |
-     pnmixer            |                                                   |
-     popt               |                                                [] |
-     procps-ng          |                                                   |
-     procps-ng-man      |                                                   |
-     psmisc             |                                                [] |
-     pspp               |                                         []        |
-     pushover           |                                                [] |
-     pwdutils           |                                                   |
-     pyspread           |                                                   |
-     radius             |                                         []        |
-     recode             |                       []                []     [] |
-     recutils           |                                                   |
-     rpm                |                                                   |
-     rush               |                                                   |
-     sarg               |                                                   |
-     sed                |                []        []             []     [] |
-     sharutils          |                                                [] |
-     shishi             |                                                   |
-     skribilo           |                                                   |
-     solfege            |                                         []     [] |
-     solfege-manual     |                                                   |
-     spotmachine        |                                                   |
-     sudo               |                                         []     [] |
-     sudoers            |                                         []     [] |
-     sysstat            |                                                [] |
-     tar                |                          []             []     [] |
-     texinfo            |                                         []     [] |
-     texinfo_document   |                                         []     [] |
-     tigervnc           |                          []                       |
-     tin                |                                                   |
-     tin-man            |                                                   |
-     tracgoogleappsa... |                                                   |
-     trader             |                                                   |
-     util-linux         |                                                [] |
-     ve                 |                                                   |
-     vice               |                                                   |
-     vmm                |                                                   |
-     vorbis-tools       |                                                [] |
-     wastesedge         |                                                   |
-     wcd                |                                                   |
-     wcd-man            |                                                   |
-     wdiff              |                                         []     [] |
-     wget               |                                                [] |
-     wyslij-po          |                                                   |
-     xboard             |                                                   |
-     xdg-user-dirs      | []    []    [] []     [] []     []      [] []  [] |
-     xkeyboard-config   |                          []             []     [] |
-                        +---------------------------------------------------+
-                          af am an ar as ast az be bg bn bn_IN bs ca crh cs
-                           4  0  2  5  3 11   0  8 25  3   3    1 55  4  74
-
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
-                        +--------------------------------------------------+
-     a2ps               | []  []  []     []         [] [] []       []  []  |
-     aegis              | []  []                       []              []  |
-     anubis             | []  []                       []          []  []  |
-     aspell             | []  []         []         [] []          []  []  |
-     bash               |                           [] []              []  |
-     bfd                | []                           []          []  []  |
-     binutils           |                              []          []  []  |
-     bison              | []  []  []                [] [] []       []  []  |
-     bison-runtime      | []  []  []                [] [] []       []  []  |
-     buzztrax           | []  []                                   []  []  |
-     ccd2cue            | []  []                    []                 []  |
-     ccide              | []  []                    [] []          []  []  |
-     cflow              | []  []                    []             []  []  |
-     clisp              | []  []     []                []              []  |
-     coreutils          | []  []                       [] []           []  |
-     cpio               | []  []                       []          []  []  |
-     cppi               | []  []                    []             []  []  |
-     cpplib             | []  []                    [] []          []  []  |
-     cryptsetup         | []  []                       []          []  []  |
-     datamash           | []  []                    []                 []  |
-     denemo             | []                                               |
-     dfarc              | []  []                    [] []          []  []  |
-     dialog             | []  []  []                [] []    [] [] []  []  |
-     dico               | []  []                                   []  []  |
-     diffutils          | []  []  []                [] []              []  |
-     dink               | []  []                    [] []          []  []  |
-     direvent           | []  []                    []                 []  |
-     doodle             | []  []                    []             []      |
-     dos2unix           | []  []                    [] []              []  |
-     dos2unix-man       |     []                       []              []  |
-     e2fsprogs          | []  []                    [] []              []  |
-     enscript           | []  []         []         []             []  []  |
-     exif               | []  []                    [] []          []  []  |
-     fetchmail          | []  ()  []     []         [] []              []  |
-     findutils          | []  []  []                [] [] []       []  []  |
-     flex               | []  []                    [] []          []  []  |
-     freedink           | []  []  []                [] []    []    []  []  |
-     fusionforge        |     []                       []              []  |
-     gas                |                              []          []  []  |
-     gawk               | []  []                       []          []  []  |
-     gcal               | []  []                       []              []  |
-     gcc                |     []                                           |
-     gdbm               | []  []                    []             []  []  |
-     gettext-examples   | []  []  []                [] []          []  []  |
-     gettext-runtime    | []  []                    [] []          []  []  |
-     gettext-tools      | []  []                       []          []  []  |
-     gjay               |     []                    []             []  []  |
-     glunarclock        | []  []                    []             []  []  |
-     gnubiff            |     ()                    []             []  ()  |
-     gnubik             | []  []                    []             []  []  |
-     gnucash            | []  ()  ()     ()            ()          ()  ()  |
-     gnuchess           |     []                    [] []              []  |
-     gnulib             | []  []                    [] [] []       []  []  |
-     gnunet             |                              []                  |
-     gnunet-gtk         |     []                                           |
-     gold               |                              []          []  []  |
-     gphoto2            | []  ()                    []                 []  |
-     gprof              | []  []                    [] []          []  []  |
-     gramadoir          | []  []                    []             []  []  |
-     grep               | []  []                    [] [] []       []  []  |
-     grub               | []  []                       []          []  []  |
-     gsasl              | []  []                    []             []  []  |
-     gss                | []  []                    []             []  []  |
-     gst-plugins-bad    | []  []                                       []  |
-     gst-plugins-base   | []  []  []                   []          []  []  |
-     gst-plugins-good   | []  []  []                   []    []    []  []  |
-     gst-plugins-ugly   | []  []  []                [] []    []    []  []  |
-     gstreamer          | []  []  []                   []    []    []  []  |
-     gtick              | []  ()                    []             []  []  |
-     gtkam              | []  ()                    [] []          []  []  |
-     gtkspell           | []  []  []                [] []    []    []  []  |
-     guix               | []                        []                     |
-     guix-packages      |                                                  |
-     gutenprint         | []  []                                   []  []  |
-     hello              | []  []  []                [] [] []       []  []  |
-     help2man           | []  []  []                [] []          []  []  |
-     help2man-texi      |     []                       []              []  |
-     hylafax            |     []                       []                  |
-     idutils            | []  []                    []             []  []  |
-     iso_15924          | []  ()                    [] []    ()    []  ()  |
-     iso_3166           | []  ()  []                [] [] [] ()    []  ()  |
-     iso_3166_2         | []  ()                             ()        ()  |
-     iso_4217           | []  ()  []                   [] [] ()    []  ()  |
-     iso_639            | []  ()                    [] []    ()    []  ()  |
-     iso_639_3          |     ()                             ()        ()  |
-     iso_639_5          |     ()                             ()        ()  |
-     jwhois             |     []                    [] []          []  []  |
-     kbd                | []  []  []                [] []              []  |
-     klavaro            | []  []  []                [] []    []        []  |
-     ld                 | []                           []          []  []  |
-     leafpad            | []  []  []                [] []    []    []  []  |
-     libc               | []  []                       []          []  []  |
-     libexif            | []  []         ()            []              []  |
-     libextractor       |     []                                           |
-     libgnutls          |     []                    []             []  []  |
-     libgphoto2         | []  ()                                       []  |
-     libgphoto2_port    | []  ()                       []    []    []  []  |
-     libgsasl           | []  []                    []             []  []  |
-     libiconv           | []  []                    [] [] []       []  []  |
-     libidn             | []  []                    []             []  []  |
-     liferea            | []  ()  []                   []    []    []  []  |
-     lilypond           | []  []  []                [] []              []  |
-     lordsawar          | []  []                                           |
-     lprng              |                                                  |
-     lynx               | []  []                    []    []       []  []  |
-     m4                 | []  []  []                []             []  []  |
-     mailfromd          |                                              []  |
-     mailutils          |     []                       []          []  []  |
-     make               | []  []                       []          []  []  |
-     man-db             | []  []                    []                 []  |
-     man-db-manpages    |     []                                       []  |
-     midi-instruments   | []  []  []                [] [] []    [] []  []  |
-     minicom            | []  []                       []          []  []  |
-     mkisofs            |                           []             []  []  |
-     myserver           |     []                    []             []  []  |
-     nano               | []  []                    [] []    []    []  []  |
-     opcodes            | []  []                       []          []  []  |
-     parted             | []  []                                       []  |
-     pies               |     []                                           |
-     pnmixer            |     []                                       []  |
-     popt               | []  []                    [] []          []  []  |
-     procps-ng          |     []                                       []  |
-     procps-ng-man      |     []                                       []  |
-     psmisc             | []  []  []                []       []    []  []  |
-     pspp               |     []                       []              []  |
-     pushover           |     ()                    [] []              []  |
-     pwdutils           | []  []                                       []  |
-     pyspread           | []  []                                       []  |
-     radius             |                              []              []  |
-     recode             | []  []  []                [] []          []  []  |
-     recutils           |     []                       []          []  []  |
-     rpm                | []  []                    []             []  []  |
-     rush               |     []                                   []  []  |
-     sarg               | []                                           []  |
-     sed                | []  []  []                [] [] []       []  []  |
-     sharutils          |     []                    []    []           []  |
-     shishi             |     []                                   []  []  |
-     skribilo           | []                           []              []  |
-     solfege            | []  []                    [] [] []    [] []  []  |
-     solfege-manual     |     []                    [] [] []           []  |
-     spotmachine        | []  []                    []             []  []  |
-     sudo               | []  []                    [] []          []  []  |
-     sudoers            | []  []  []                []             []  []  |
-     sysstat            | []  []                    [] []          []  []  |
-     tar                | []  []                    [] [] []       []  []  |
-     texinfo            | []  []                    [] []              []  |
-     texinfo_document   |     []                    [] []              []  |
-     tigervnc           | []  []  []                []             []  []  |
-     tin                | []  []                          []           []  |
-     tin-man            |                []                                |
-     tracgoogleappsa... | []  []                    []             []  []  |
-     trader             | []  []         []         []             []  []  |
-     util-linux         | []  []                       []              []  |
-     ve                 |     []                    [] []          []  []  |
-     vice               | ()  ()                                       ()  |
-     vmm                |     []                                   []      |
-     vorbis-tools       | []  []                    []                 []  |
-     wastesedge         | []                                               |
-     wcd                |     []                    [] []          []      |
-     wcd-man            |     []                                           |
-     wdiff              | []  []                    [] [] []       []  []  |
-     wget               |     []                    [] [] []       []  []  |
-     wyslij-po          |     []                    []             []  []  |
-     xboard             | []  []                       []              []  |
-     xdg-user-dirs      | []  []  []                [] [] [] [] [] []  []  |
-     xkeyboard-config   | []  []  []                [] []          []  []  |
-                        +--------------------------------------------------+
-                          da  de  el en en_GB en_ZA eo es et eu fa fi  fr 
-                          119 131 32  1   6     0   94 95 22 13  4 102 139
-
-                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
-                        +-------------------------------------------------+
-     a2ps               |                   []          []    [] []       |
-     aegis              |                                     []          |
-     anubis             |                   [] []       []    []          |
-     aspell             | []                []          []    [] []       |
-     bash               |                      []       []    [] []       |
-     bfd                |                               []       []       |
-     binutils           |                               []    [] []       |
-     bison              |                   []                            |
-     bison-runtime      | []    []          [] []    [] []    [] []       |
-     buzztrax           |                                                 |
-     ccd2cue            |                      []                         |
-     ccide              |                   [] []                         |
-     cflow              | []                []          []                |
-     clisp              |                                                 |
-     coreutils          |                      []                []       |
-     cpio               | []                [] []       []    [] []       |
-     cppi               |       []          [] []             [] []       |
-     cpplib             |                               []       []       |
-     cryptsetup         |                                     []          |
-     datamash           |                                                 |
-     denemo             |                                     []          |
-     dfarc              |                   [] []             []          |
-     dialog             | [] [] []          [] []    [] [] [] [] []       |
-     dico               |                                                 |
-     diffutils          |                      []       []    [] []       |
-     dink               |                      []                         |
-     direvent           |                      []                         |
-     doodle             | []                                  []          |
-     dos2unix           |                      []                []       |
-     dos2unix-man       |                                                 |
-     e2fsprogs          |                      []       []                |
-     enscript           | []                []          []                |
-     exif               |       []          []          [] [] [] []       |
-     fetchmail          |                               []    [] []       |
-     findutils          | []    []          [] []       []    [] []       |
-     flex               | []                                              |
-     freedink           |                   [] []       []    []          |
-     fusionforge        |                                                 |
-     gas                |                               []                |
-     gawk               |                               []    () []       |
-     gcal               |                                                 |
-     gcc                |                                                 |
-     gdbm               |                                                 |
-     gettext-examples   | []    []          [] []       []    [] []       |
-     gettext-runtime    | []    []          [] []       []    [] []       |
-     gettext-tools      |                               []    [] []       |
-     gjay               |       []                                        |
-     glunarclock        | []    []          [] []       []    []          |
-     gnubiff            |                      []       []    ()          |
-     gnubik             |       []          []                []          |
-     gnucash            |          () () ()    ()             ()          |
-     gnuchess           |                                                 |
-     gnulib             | []    []             []             [] []       |
-     gnunet             |                                                 |
-     gnunet-gtk         |                                                 |
-     gold               |                               []    []          |
-     gphoto2            |                      []       []    [] []       |
-     gprof              | []                   []       []    []          |
-     gramadoir          | []                   []       []                |
-     grep               | []    []          [] []       []    [] []       |
-     grub               |       []             []             []          |
-     gsasl              | []                [] []       []    []          |
-     gss                | []                [] []       []    []          |
-     gst-plugins-bad    |                   [] []       []                |
-     gst-plugins-base   |       []          [] []       []                |
-     gst-plugins-good   |       []          [] []       []    [] []       |
-     gst-plugins-ugly   |       []          [] []       []    [] []       |
-     gstreamer          |       []          [] []       []    []          |
-     gtick              | []    []             []       []    []          |
-     gtkam              |                      []       [] [] [] []       |
-     gtkspell           | []    []    []    [] [] []    [] [] [] []       |
-     guix               |                                                 |
-     guix-packages      |                                                 |
-     gutenprint         |       []             []             []          |
-     hello              | []    []          [] []       []                |
-     help2man           |                   []                [] []       |
-     help2man-texi      |                                                 |
-     hylafax            |                               []                |
-     idutils            |                      []       []                |
-     iso_15924          |       []             []    [] [] [] []          |
-     iso_3166           | []    [] [] [] [] [] []    [] [] [] [] []    [] |
-     iso_3166_2         |                               []    []          |
-     iso_4217           |                   [] []       [] [] [] []       |
-     iso_639            | []    [] []       [] []       [] [] [] []       |
-     iso_639_3          |       []                            []          |
-     iso_639_5          |                                                 |
-     jwhois             |       []             []       []    []          |
-     kbd                |                      []       []    []          |
-     klavaro            |       []          [] []             []       [] |
-     ld                 | []                            []    [] []       |
-     leafpad            | []    []    []    [] []       []    [] ()       |
-     libc               |       []          []          []    [] []       |
-     libexif            |                                     []          |
-     libextractor       |                                                 |
-     libgnutls          |                                     []          |
-     libgphoto2         |                                     [] []       |
-     libgphoto2_port    |                                     [] []       |
-     libgsasl           | []                   []       []    []          |
-     libiconv           | []    []          [] []       []    [] []       |
-     libidn             |                   [] []       []    []          |
-     liferea            |       []    []       []             [] []       |
-     lilypond           |                                     []          |
-     lordsawar          |                                                 |
-     lprng              |                               []                |
-     lynx               |                      []       []    [] []       |
-     m4                 | []    []          []          []       []       |
-     mailfromd          |                                                 |
-     mailutils          |                                                 |
-     make               |                   []          []    [] []       |
-     man-db             |                               []       []       |
-     man-db-manpages    |                               []       []       |
-     midi-instruments   |       []    []    [] [] []    [] [] [] []       |
-     minicom            |                      []       []       []       |
-     mkisofs            |                               []    []          |
-     myserver           |                                     []          |
-     nano               | []    []          [] []             [] []       |
-     opcodes            | []                            []    []          |
-     parted             |       []             []       []    [] []       |
-     pies               |                                                 |
-     pnmixer            |                   []                []          |
-     popt               | []    [] []       [] []    [] [] [] [] []       |
-     procps-ng          |                                                 |
-     procps-ng-man      |                                                 |
-     psmisc             |                   [] []       []    []          |
-     pspp               |       []                               []       |
-     pushover           |                                     []          |
-     pwdutils           |                               []                |
-     pyspread           |                                                 |
-     radius             |                               []                |
-     recode             | []    []    []    [] []       []    []          |
-     recutils           |                                                 |
-     rpm                |                               []                |
-     rush               |       []                                        |
-     sarg               |                                                 |
-     sed                | []    []          [] []       []    [] []       |
-     sharutils          |                                                 |
-     shishi             |                                                 |
-     skribilo           |                      []                         |
-     solfege            |       []                            []          |
-     solfege-manual     |                                                 |
-     spotmachine        |                                                 |
-     sudo               |       []          []                [] []       |
-     sudoers            |                   []                [] []       |
-     sysstat            |                   [] []       []       []       |
-     tar                | []                [] []       []    [] []       |
-     texinfo            |                   []          []    []          |
-     texinfo_document   |                   [] []             []          |
-     tigervnc           |                                                 |
-     tin                |                                                 |
-     tin-man            |                                                 |
-     tracgoogleappsa... |       []    []    [] []                         |
-     trader             |                   [] []                         |
-     util-linux         |                                        []       |
-     ve                 |                                     []          |
-     vice               |                      ()             ()          |
-     vmm                |                                                 |
-     vorbis-tools       |                   []          []                |
-     wastesedge         |                                     []          |
-     wcd                |                                                 |
-     wcd-man            |                                                 |
-     wdiff              |       []             []             []          |
-     wget               |                   [] []             [] []       |
-     wyslij-po          |       []          []          []                |
-     xboard             |                                                 |
-     xdg-user-dirs      | [] [] [] [] [] [] [] []    [] [] [] [] []    [] |
-     xkeyboard-config   |       []          [] []       []    [] []       |
-                        +-------------------------------------------------+
-                          ga gd gl gu he hi hr hu hy ia id is it ja ka kk
-                          35  2 47  4  8  2 60 71  2  6 81 11 87 57  0  3
-
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
-                        +--------------------------------------------------+
-     a2ps               |                                  []          []  |
-     aegis              |                                              []  |
-     anubis             |                                  []    []    []  |
-     aspell             |                            []                []  |
-     bash               |                                        []    []  |
-     bfd                |                                                  |
-     binutils           |                                                  |
-     bison              |                                              []  |
-     bison-runtime      |          []    [] []             []    []    []  |
-     buzztrax           |                                                  |
-     ccd2cue            |                                                  |
-     ccide              |                   []                         []  |
-     cflow              |                                              []  |
-     clisp              |                                              []  |
-     coreutils          |                                        []    []  |
-     cpio               |                                              []  |
-     cppi               |                                                  |
-     cpplib             |                                              []  |
-     cryptsetup         |                                              []  |
-     datamash           |                                        []    []  |
-     denemo             |                                                  |
-     dfarc              |                      []                      []  |
-     dialog             |       []       [] []             []    []    []  |
-     dico               |                                                  |
-     diffutils          |                   []                   []    []  |
-     dink               |                                              []  |
-     direvent           |                                              []  |
-     doodle             |                                              []  |
-     dos2unix           |                                        []    []  |
-     dos2unix-man       |                                              []  |
-     e2fsprogs          |                                              []  |
-     enscript           |                                              []  |
-     exif               |    []             []                         []  |
-     fetchmail          |                                              []  |
-     findutils          |                                        []    []  |
-     flex               |                                              []  |
-     freedink           |                                        []    []  |
-     fusionforge        |                                                  |
-     gas                |                                                  |
-     gawk               |                                              []  |
-     gcal               |                                                  |
-     gcc                |                                                  |
-     gdbm               |                                                  |
-     gettext-examples   |          []       []             [] [] []    []  |
-     gettext-runtime    |    []                                  []    []  |
-     gettext-tools      |    []                                            |
-     gjay               |                                                  |
-     glunarclock        |                   []                         []  |
-     gnubiff            |                                              []  |
-     gnubik             |                                        []    []  |
-     gnucash            | () ()          () ()          ()       () () []  |
-     gnuchess           |                                        []    []  |
-     gnulib             |                                              []  |
-     gnunet             |                                                  |
-     gnunet-gtk         |                                                  |
-     gold               |                                                  |
-     gphoto2            |                                              []  |
-     gprof              |                                  []          []  |
-     gramadoir          |                                              []  |
-     grep               |                                        []    []  |
-     grub               |                []                      []    []  |
-     gsasl              |                                              []  |
-     gss                |                                                  |
-     gst-plugins-bad    |                   []                   []    []  |
-     gst-plugins-base   |                   []                   []    []  |
-     gst-plugins-good   |                [] []                   []    []  |
-     gst-plugins-ugly   |                   []             [] [] []    []  |
-     gstreamer          |                []                      []    []  |
-     gtick              |                                              []  |
-     gtkam              |                                        []    []  |
-     gtkspell           |          []    [] []       []    []    []    []  |
-     guix               |                                                  |
-     guix-packages      |                                                  |
-     gutenprint         |                                              []  |
-     hello              |                   []                   []    []  |
-     help2man           |                                        []        |
-     help2man-texi      |                                                  |
-     hylafax            |                                              []  |
-     idutils            |                                              []  |
-     iso_15924          |                () []                         []  |
-     iso_3166           | [] [] []       () [] [] []    []       []    []  |
-     iso_3166_2         |                ()                            []  |
-     iso_4217           |                () []                   []    []  |
-     iso_639            | [] []          () []    []    []             []  |
-     iso_639_3          | []             ()             []                 |
-     iso_639_5          |                ()                                |
-     jwhois             |                   []                         []  |
-     kbd                |                                              []  |
-     klavaro            |                                        []    []  |
-     ld                 |                                                  |
-     leafpad            |    []    []    [] []                         []  |
-     libc               |    []                                        []  |
-     libexif            |                                              []  |
-     libextractor       |                                              []  |
-     libgnutls          |                                  []          []  |
-     libgphoto2         |                                              []  |
-     libgphoto2_port    |                                              []  |
-     libgsasl           |                                              []  |
-     libiconv           |                []                            []  |
-     libidn             |                                              []  |
-     liferea            |                [] []                         []  |
-     lilypond           |                                              []  |
-     lordsawar          |                                                  |
-     lprng              |                                                  |
-     lynx               |                                              []  |
-     m4                 |                                              []  |
-     mailfromd          |                                                  |
-     mailutils          |                                                  |
-     make               |    []                                        []  |
-     man-db             |                                              []  |
-     man-db-manpages    |                                              []  |
-     midi-instruments   |    [] []       []          []    []       [] []  |
-     minicom            |                                        []        |
-     mkisofs            |                                              []  |
-     myserver           |                                                  |
-     nano               |                                  []    []    []  |
-     opcodes            |                                              []  |
-     parted             |    []                                        []  |
-     pies               |                                                  |
-     pnmixer            |                                              []  |
-     popt               | [] []             []                   []    []  |
-     procps-ng          |                                                  |
-     procps-ng-man      |                                                  |
-     psmisc             |                                              []  |
-     pspp               |                []                            []  |
-     pushover           |                                                  |
-     pwdutils           |                                              []  |
-     pyspread           |                                                  |
-     radius             |                                              []  |
-     recode             |                                        []    []  |
-     recutils           |                                              []  |
-     rpm                |                                              []  |
-     rush               |                                              []  |
-     sarg               |                                                  |
-     sed                |                                        []    []  |
-     sharutils          |                                              []  |
-     shishi             |                                                  |
-     skribilo           |                                                  |
-     solfege            |                                        []    []  |
-     solfege-manual     |                                              []  |
-     spotmachine        |                                              []  |
-     sudo               |    []                                  []    []  |
-     sudoers            |    []                                  []    []  |
-     sysstat            |                                        []    []  |
-     tar                |          []                            []    []  |
-     texinfo            |                                              []  |
-     texinfo_document   |                                              []  |
-     tigervnc           |                                              []  |
-     tin                |                                                  |
-     tin-man            |                                                  |
-     tracgoogleappsa... |                   []                   []    []  |
-     trader             |                                        []        |
-     util-linux         |                                              []  |
-     ve                 |                                              []  |
-     vice               |                                              []  |
-     vmm                |                                              []  |
-     vorbis-tools       |                                              []  |
-     wastesedge         |                                              []  |
-     wcd                |                                              []  |
-     wcd-man            |                                              []  |
-     wdiff              |                                              []  |
-     wget               |                                        []    []  |
-     wyslij-po          |                                              []  |
-     xboard             |                                              []  |
-     xdg-user-dirs      | [] [] [] []    [] [] [] []    []       []    []  |
-     xkeyboard-config   |    []          []                            []  |
-                        +--------------------------------------------------+
-                          kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl 
-                           5 15  4  6  0 13 23  3  3  3  4 11  2 42  1 125
-
-                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
-                        +------------------------------------------------+
-     a2ps               |          []     []  []   [] []       []    []  |
-     aegis              |                     []      []                 |
-     anubis             |          []                 []             []  |
-     aspell             |          []         []   [] []    [] []    []  |
-     bash               |          []         []      []    [] []    []  |
-     bfd                |                             []             []  |
-     binutils           |                             []             []  |
-     bison              |          []         []                     []  |
-     bison-runtime      |          []     []  []   [] []       [] [] []  |
-     buzztrax           |                     []                         |
-     ccd2cue            |                     []                     []  |
-     ccide              |          []                 []             []  |
-     cflow              |          []         []                     []  |
-     clisp              |                             []                 |
-     coreutils          |          []                 []       []    []  |
-     cpio               |          []                 []             []  |
-     cppi               |          []         []                     []  |
-     cpplib             |                     []      []             []  |
-     cryptsetup         |          []         []                     []  |
-     datamash           |                     []                     []  |
-     denemo             |                                                |
-     dfarc              |          []         []                     []  |
-     dialog             |          []         []   [] []    [] []    []  |
-     dico               |          []                                    |
-     diffutils          |          []         []                     []  |
-     dink               |                                                |
-     direvent           |          []         []                     []  |
-     doodle             |                                         [] []  |
-     dos2unix           |          []         []      []             []  |
-     dos2unix-man       |          []         []                         |
-     e2fsprogs          |          []                                    |
-     enscript           |          []         []   [] []       []    []  |
-     exif               |          []         []   [] []    []       []  |
-     fetchmail          |          []                 []          []     |
-     findutils          |          []         []      []    [] []    []  |
-     flex               |          []         []   [] []             []  |
-     freedink           |          []         []      []       []    []  |
-     fusionforge        |                                                |
-     gas                |                                                |
-     gawk               |          []                                    |
-     gcal               |                                                |
-     gcc                |                                                |
-     gdbm               |          []         []                     []  |
-     gettext-examples   |          []     []  []   [] []    [] []    []  |
-     gettext-runtime    | []       []     []  []   [] []    [] []    []  |
-     gettext-tools      |          []         []   [] []    [] []    []  |
-     gjay               |                                            []  |
-     glunarclock        |          []         []   []       [] []    []  |
-     gnubiff            |                                            []  |
-     gnubik             |          []         []               []    []  |
-     gnucash            |          ()     ()  ()   () ()             []  |
-     gnuchess           |                     []                     []  |
-     gnulib             |          []         []      []       []    []  |
-     gnunet             |                                                |
-     gnunet-gtk         |                                                |
-     gold               |                                                |
-     gphoto2            |          []         []   [] []             []  |
-     gprof              |                     []   [] []             []  |
-     gramadoir          |                                   []       []  |
-     grep               |          []         []      []    [] []    []  |
-     grub               |          []         []      []       []    []  |
-     gsasl              |          []                       []       []  |
-     gss                |          []              []       []       []  |
-     gst-plugins-bad    |          []         []      []    []       []  |
-     gst-plugins-base   |          []         []      []    [] []    []  |
-     gst-plugins-good   |          []         []   [] []    [] []    []  |
-     gst-plugins-ugly   |          []         []   [] []    [] []    []  |
-     gstreamer          |          []         []   [] []    [] []    []  |
-     gtick              |          []         []      []    []       []  |
-     gtkam              |       [] []         []      []    []       []  |
-     gtkspell           |          []     []  []   [] []    [] [] [] []  |
-     guix               |                                                |
-     guix-packages      |                                                |
-     gutenprint         |                                   [] []        |
-     hello              |          []         []      []    [] []    []  |
-     help2man           |          []         []      []             []  |
-     help2man-texi      |          []                                    |
-     hylafax            |                                                |
-     idutils            |          []                 []             []  |
-     iso_15924          |          []     ()       [] []       []    []  |
-     iso_3166           | [] [] [] []     ()  []   [] [] [] [] [] [] []  |
-     iso_3166_2         |          []     ()                         []  |
-     iso_4217           | []       []     ()       [] [] []    []    []  |
-     iso_639            |    [] [] []     ()       [] [] [] [] []    []  |
-     iso_639_3          |       []        ()                             |
-     iso_639_5          |                 ()                         []  |
-     jwhois             |          []         []   []                []  |
-     kbd                |          []                 []                 |
-     klavaro            |       [] []         []      []       []        |
-     ld                 |                                                |
-     leafpad            | []       []     []  []      []    [] []    []  |
-     libc               |          []                 []    []           |
-     libexif            |          []         ()            []           |
-     libextractor       |          []                                    |
-     libgnutls          |          []                                    |
-     libgphoto2         |          []                                    |
-     libgphoto2_port    |          []         []      []    []       []  |
-     libgsasl           |          []              []       []       []  |
-     libiconv           |          []         []            [] []    []  |
-     libidn             |          []         []                     []  |
-     liferea            |          []     []  []   [] ()    []    []     |
-     lilypond           |                                                |
-     lordsawar          |                                                |
-     lprng              |          []                                    |
-     lynx               |                     []      []                 |
-     m4                 |          []         []   [] []             []  |
-     mailfromd          |          []                                    |
-     mailutils          |          []                                    |
-     make               |          []         []      []                 |
-     man-db             |          []                 []             []  |
-     man-db-manpages    |          []                 []             []  |
-     midi-instruments   |          []     []  []   [] []    [] []    []  |
-     minicom            |          []         []   [] []                 |
-     mkisofs            |          []                 []             []  |
-     myserver           |                                      []    []  |
-     nano               |          []         []   [] []       []    []  |
-     opcodes            |                                                |
-     parted             |          []         []      []    [] []    []  |
-     pies               |          []                                    |
-     pnmixer            |                             []                 |
-     popt               |          []     []  []      []       []    []  |
-     procps-ng          |          []                                    |
-     procps-ng-man      |          []                                    |
-     psmisc             |          []         []      []             []  |
-     pspp               |          []                 []                 |
-     pushover           |                                                |
-     pwdutils           |          []                                    |
-     pyspread           | []                  []                         |
-     radius             |          []                 []                 |
-     recode             |          []     []  []   [] []    [] []    []  |
-     recutils           |                     []                     []  |
-     rpm                |          []                                    |
-     rush               |          []         []                     []  |
-     sarg               |                     []      []                 |
-     sed                |          []     []  []   [] []    [] []    []  |
-     sharutils          |          []         []                     []  |
-     shishi             |          []                                []  |
-     skribilo           |                                            []  |
-     solfege            |          []         []      []                 |
-     solfege-manual     |          []         []                         |
-     spotmachine        |                     []                     []  |
-     sudo               |          []         []      []    [] []    []  |
-     sudoers            |          []         []               []    []  |
-     sysstat            |          []         []      []    []       []  |
-     tar                |          []         []      []       []    []  |
-     texinfo            |          []         []      []                 |
-     texinfo_document   |          []         []                         |
-     tigervnc           |                     []      []             []  |
-     tin                |                             []                 |
-     tin-man            |                                                |
-     tracgoogleappsa... |          []         []      []             []  |
-     trader             |                             []             []  |
-     util-linux         |          []         []                         |
-     ve                 |          []         []                     []  |
-     vice               |                                                |
-     vmm                |                                                |
-     vorbis-tools       |          []                          []    []  |
-     wastesedge         |                                                |
-     wcd                |                                                |
-     wcd-man            |                                                |
-     wdiff              |          []         []      []       []    []  |
-     wget               |          []         []      []    []       []  |
-     wyslij-po          | []       []         []                     []  |
-     xboard             |          []                 []             []  |
-     xdg-user-dirs      | [] [] [] []  [] []  []   [] []    [] [] [] []  |
-     xkeyboard-config   |          []         []      []       []        |
-                        +------------------------------------------------+
-                          nn or pa pl  ps pt pt_BR ro ru rw sk sl sq sr 
-                           7  3  6 114  1 12  88   32 82  3 40 45  7 101
-
-                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
-                        +----------------------------------------------+
-     a2ps               | []              [] [] []     []              |
-     aegis              |                              []              |
-     anubis             | []                 [] []     []              |
-     aspell             | []                    []     []  []     []   |
-     bash               | []                    []     []         []   |
-     bfd                | []                    []     []              |
-     binutils           | []                    []     []              |
-     bison              | []                    []     []         []   |
-     bison-runtime      | []              [] [] []     []         []   |
-     buzztrax           | []                           []         []   |
-     ccd2cue            |                       []     []         []   |
-     ccide              | []                    []     []         []   |
-     cflow              | []                    []     []         []   |
-     clisp              |                                              |
-     coreutils          | []                    []     []              |
-     cpio               | []                 [] []     []         []   |
-     cppi               | []                    []     []         []   |
-     cpplib             | []                 [] []     []         []   |
-     cryptsetup         |                       []     []         []   |
-     datamash           | []                    []     []              |
-     denemo             |                                         []   |
-     dfarc              | []                           []              |
-     dialog             | []  []          []           []  []     []   |
-     dico               |                       []                     |
-     diffutils          | []                 [] []     []         []   |
-     dink               | []                                           |
-     direvent           |                       []     []              |
-     doodle             | []                           []              |
-     dos2unix           | []                    []     []         []   |
-     dos2unix-man       | []                    []                []   |
-     e2fsprogs          | []                    []     []         []   |
-     enscript           | []                 [] []     []              |
-     exif               | []                 [] []     []         []   |
-     fetchmail          | []                 []        []         []   |
-     findutils          | []                 [] []     []         []   |
-     flex               | []                 []        []         []   |
-     freedink           | []              []           []              |
-     fusionforge        |                                              |
-     gas                |                       []                     |
-     gawk               | []                           []         []   |
-     gcal               | []                 []                   []   |
-     gcc                | []                                           |
-     gdbm               |                       []     []              |
-     gettext-examples   | []                 [] []     []         []   |
-     gettext-runtime    | []                 [] []     []         []   |
-     gettext-tools      | []                 [] []     []         []   |
-     gjay               |                 []           []         []   |
-     glunarclock        | []                           []  []     []   |
-     gnubiff            | []                           []              |
-     gnubik             | []                    []     []         []   |
-     gnucash            |        () ()              () ()         []   |
-     gnuchess           |                       []     []         []   |
-     gnulib             | []                    []     []         []   |
-     gnunet             |                                              |
-     gnunet-gtk         |                                              |
-     gold               |                       []     []              |
-     gphoto2            | []                    []     []         []   |
-     gprof              | []                 [] []     []              |
-     gramadoir          | []                           []         []   |
-     grep               | []              []    []     []         []   |
-     grub               | []                 [] []     []              |
-     gsasl              | []                    []     []         []   |
-     gss                | []                           []         []   |
-     gst-plugins-bad    | []                 [] []     []         []   |
-     gst-plugins-base   | []                 [] []     []         []   |
-     gst-plugins-good   | []                 [] []     []         []   |
-     gst-plugins-ugly   | []                 [] []     []         []   |
-     gstreamer          | []                 [] []     []         []   |
-     gtick              |                       []     []         []   |
-     gtkam              | []                    []     []         []   |
-     gtkspell           | []              [] [] []     []  []     []   |
-     guix               |                                              |
-     guix-packages      |                                              |
-     gutenprint         |                    [] []     []         []   |
-     hello              | []              [] [] []     []         []   |
-     help2man           |                       []     []         []   |
-     help2man-texi      |                       []                     |
-     hylafax            |                              []              |
-     idutils            |                       []     []         []   |
-     iso_15924          | []              () [] []     ()         []   |
-     iso_3166           | []        []    () [] []     ()  []     []   |
-     iso_3166_2         |                 () [] []     ()         []   |
-     iso_4217           | []              () [] []     ()         []   |
-     iso_639            | []     [] []    () [] []     ()  []     []   |
-     iso_639_3          |        []       () [] []     ()              |
-     iso_639_5          |                 ()    []     ()              |
-     jwhois             | []                 []        []         []   |
-     kbd                | []                    []     []         []   |
-     klavaro            | []                    []  [] []     []  []   |
-     ld                 | []                 [] []     []         []   |
-     leafpad            | []              [] [] []     []         []   |
-     libc               | []                 [] []     []         []   |
-     libexif            | []                           []         ()   |
-     libextractor       |                       []     []              |
-     libgnutls          | []                    []     []         []   |
-     libgphoto2         | []                    []     []              |
-     libgphoto2_port    | []                    []     []         []   |
-     libgsasl           | []                    []     []         []   |
-     libiconv           | []                    []     []  []     []   |
-     libidn             | ()                    []     []         []   |
-     liferea            | []                 [] []     []         []   |
-     lilypond           |                              []              |
-     lordsawar          |                                              |
-     lprng              |                              []              |
-     lynx               | []                 [] []     []              |
-     m4                 | []                           []         []   |
-     mailfromd          |                       []     []              |
-     mailutils          |                              []              |
-     make               | []                    []     []         []   |
-     man-db             | []                           []         []   |
-     man-db-manpages    | []                                      []   |
-     midi-instruments   | []              [] [] []     []         []   |
-     minicom            | []                           []              |
-     mkisofs            |                       []     []         []   |
-     myserver           |                              []              |
-     nano               | []                    []     []         []   |
-     opcodes            |                       []     []         []   |
-     parted             | []                 [] []     []         []   |
-     pies               |                       []     []              |
-     pnmixer            |                       []     []         []   |
-     popt               | []     []       [] [] []     []         []   |
-     procps-ng          |                       []     []              |
-     procps-ng-man      |                       []                     |
-     psmisc             | []                    []     []         []   |
-     pspp               |                    [] []                []   |
-     pushover           | []                                           |
-     pwdutils           | []                           []              |
-     pyspread           |                       []                     |
-     radius             |                       []     []              |
-     recode             | []                 []        []         []   |
-     recutils           | []                    []     []              |
-     rpm                | []                    []     []         []   |
-     rush               |                       []     []              |
-     sarg               |                                              |
-     sed                | []                 [] []     []         []   |
-     sharutils          | []                    []     []         []   |
-     shishi             |                              []         []   |
-     skribilo           | []                    []                     |
-     solfege            | []                 []        []         []   |
-     solfege-manual     |                    []                        |
-     spotmachine        | []                    []     []              |
-     sudo               | []                 [] []     []         []   |
-     sudoers            | []                    []     []         []   |
-     sysstat            | []                 [] []     []         []   |
-     tar                | []                 [] []     []         []   |
-     texinfo            |                    [] []     []              |
-     texinfo_document   |                       []                     |
-     tigervnc           | []                    []                []   |
-     tin                |                                         []   |
-     tin-man            |                                              |
-     tracgoogleappsa... | []              []    []     []         []   |
-     trader             | []                                           |
-     util-linux         | []                    []     []         []   |
-     ve                 | []                    []     []         []   |
-     vice               | ()                 ()                        |
-     vmm                |                                              |
-     vorbis-tools       | []                           []              |
-     wastesedge         |                                              |
-     wcd                |                       []     []         []   |
-     wcd-man            |                       []                     |
-     wdiff              | []                    []     []         []   |
-     wget               |                       []     []         []   |
-     wyslij-po          |                       []     []              |
-     xboard             |                       []                []   |
-     xdg-user-dirs      | []     [] []    [] [] []     []         []   |
-     xkeyboard-config   | []                 [] []     []              |
-                        +----------------------------------------------+
-                          sv  sw ta te tg th tr uk  ur vi  wa wo zh_CN
-                          106  1  4  3  0 13 51 115  1 125  7  1  100 
-
-                          zh_HK zh_TW
-                        +-------------+
-     a2ps               |             | 30
-     aegis              |             |  9
-     anubis             |             | 19
-     aspell             |             | 29
-     bash               |        []   | 23
-     bfd                |             | 11
-     binutils           |             | 12
-     bison              |        []   | 18
-     bison-runtime      |        []   | 38
-     buzztrax           |             |  9
-     ccd2cue            |             | 10
-     ccide              |             | 17
-     cflow              |             | 16
-     clisp              |             | 10
-     coreutils          |             | 18
-     cpio               |             | 20
-     cppi               |             | 17
-     cpplib             |        []   | 19
-     cryptsetup         |             | 14
-     datamash           |             | 11
-     denemo             |             |  5
-     dfarc              |             | 17
-     dialog             |        []   | 42
-     dico               |             |  6
-     diffutils          |             | 22
-     dink               |             | 10
-     direvent           |             | 11
-     doodle             |             | 12
-     dos2unix           |        []   | 18
-     dos2unix-man       |             |  9
-     e2fsprogs          |             | 15
-     enscript           |             | 21
-     exif               |             | 27
-     fetchmail          |             | 19
-     findutils          |             | 29
-     flex               |        []   | 19
-     freedink           |             | 24
-     fusionforge        |             |  3
-     gas                |             |  5
-     gawk               |             | 13
-     gcal               |             |  8
-     gcc                |             |  2
-     gdbm               |             | 10
-     gettext-examples   |  []    []   | 40
-     gettext-runtime    |  []    []   | 35
-     gettext-tools      |        []   | 24
-     gjay               |             |  9
-     glunarclock        |        []   | 27
-     gnubiff            |             |  9
-     gnubik             |             | 19
-     gnucash            |        ()   |  6
-     gnuchess           |             | 11
-     gnulib             |             | 23
-     gnunet             |             |  1
-     gnunet-gtk         |             |  1
-     gold               |             |  7
-     gphoto2            |        []   | 19
-     gprof              |             | 21
-     gramadoir          |             | 14
-     grep               |        []   | 31
-     grub               |             | 21
-     gsasl              |        []   | 19
-     gss                |             | 17
-     gst-plugins-bad    |             | 21
-     gst-plugins-base   |             | 27
-     gst-plugins-good   |             | 32
-     gst-plugins-ugly   |             | 34
-     gstreamer          |        []   | 32
-     gtick              |             | 19
-     gtkam              |             | 24
-     gtkspell           |  []    []   | 48
-     guix               |             |  2
-     guix-packages      |             |  0
-     gutenprint         |             | 15
-     hello              |        []   | 30
-     help2man           |             | 18
-     help2man-texi      |             |  5
-     hylafax            |             |  5
-     idutils            |             | 14
-     iso_15924          |        []   | 23
-     iso_3166           |  []    []   | 58
-     iso_3166_2         |             |  9
-     iso_4217           |  []    []   | 28
-     iso_639            |  []    []   | 46
-     iso_639_3          |             | 10
-     iso_639_5          |             |  2
-     jwhois             |        []   | 20
-     kbd                |             | 17
-     klavaro            |             | 30
-     ld                 |        []   | 15
-     leafpad            |        []   | 39
-     libc               |        []   | 24
-     libexif            |             | 10
-     libextractor       |             |  5
-     libgnutls          |             | 13
-     libgphoto2         |             | 10
-     libgphoto2_port    |        []   | 19
-     libgsasl           |             | 18
-     libiconv           |        []   | 29
-     libidn             |             | 17
-     liferea            |             | 29
-     lilypond           |             | 11
-     lordsawar          |             |  3
-     lprng              |             |  3
-     lynx               |             | 19
-     m4                 |        []   | 22
-     mailfromd          |             |  4
-     mailutils          |             |  6
-     make               |             | 19
-     man-db             |             | 15
-     man-db-manpages    |             | 10
-     midi-instruments   |        []   | 43
-     minicom            |        []   | 17
-     mkisofs            |             | 13
-     myserver           |             |  9
-     nano               |        []   | 30
-     opcodes            |             | 12
-     parted             |        []   | 23
-     pies               |             |  4
-     pnmixer            |             |  9
-     popt               |        []   | 36
-     procps-ng          |             |  5
-     procps-ng-man      |             |  4
-     psmisc             |        []   | 22
-     pspp               |             | 13
-     pushover           |             |  6
-     pwdutils           |             |  8
-     pyspread           |             |  6
-     radius             |             |  9
-     recode             |             | 31
-     recutils           |             | 10
-     rpm                |        []   | 13
-     rush               |             | 10
-     sarg               |             |  4
-     sed                |        []   | 35
-     sharutils          |             | 13
-     shishi             |             |  7
-     skribilo           |             |  7
-     solfege            |             | 21
-     solfege-manual     |             |  9
-     spotmachine        |             | 11
-     sudo               |             | 26
-     sudoers            |             | 22
-     sysstat            |             | 23
-     tar                |        []   | 30
-     texinfo            |             | 17
-     texinfo_document   |             | 13
-     tigervnc           |             | 14
-     tin                |        []   |  7
-     tin-man            |             |  1
-     tracgoogleappsa... |        []   | 22
-     trader             |             | 12
-     util-linux         |             | 13
-     ve                 |             | 14
-     vice               |             |  1
-     vmm                |             |  3
-     vorbis-tools       |             | 13
-     wastesedge         |             |  3
-     wcd                |             |  8
-     wcd-man            |             |  3
-     wdiff              |        []   | 23
-     wget               |             | 21
-     wyslij-po          |             | 14
-     xboard             |             | 10
-     xdg-user-dirs      |  []    []   | 68
-     xkeyboard-config   |        []   | 28
-                        +-------------+
-       89 teams           zh_HK zh_TW
-      166 domains           7    42    2809
-
-   Some counters in the preceding matrix are higher than the number of
-visible blocks let us expect.  This is because a few extra PO files are
-used for implementing regional variants of languages, or language
-dialects.
-
-   For a PO file in the matrix above to be effective, the package to
-which it applies should also have been internationalized and distributed
-as such by its maintainer.  There might be an observable lag between the
-mere existence a PO file and its wide availability in a distribution.
-
-   If Jun 2014 seems to be old, you may fetch a more recent copy of this
-'ABOUT-NLS' file on most GNU archive sites.  The most up-to-date matrix
-with full percentage details can be found at
-'http://translationproject.org/extra/matrix.html'.
-
-1.5 Using 'gettext' in new packages
-===================================
-
-If you are writing a freely available program and want to
-internationalize it you are welcome to use GNU 'gettext' in your
-package.  Of course you have to respect the GNU Lesser General Public
-License which covers the use of the GNU 'gettext' library.  This means
-in particular that even non-free programs can use 'libintl' as a shared
-library, whereas only free software can use 'libintl' as a static
-library or use modified versions of 'libintl'.
-
-   Once the sources are changed appropriately and the setup can handle
-the use of 'gettext' the only thing missing are the translations.  The
-Free Translation Project is also available for packages which are not
-developed inside the GNU project.  Therefore the information given above
-applies also for every other Free Software Project.  Contact
-'coordinator@translationproject.org' to make the '.pot' files available
-to the translation teams.
+<https://www.gnu.org/software/gettext/manual/html_node/Users.html>
diff --git a/po/ChangeLog b/po/ChangeLog
index f06d636..597a4d1 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,16 @@
+2019-07-02  Bruno Haible  <bruno@clisp.org>
+
+	Use the newest gettext release.
+	* Makefile.in.in: Upgrade to gettext-0.20.1, keeping the change
+		2019-01-27  Bruno Haible  <bruno@clisp.org>
+		Accommodate a shell that is not in /bin/sh.
+		* Makefile.in.in (SHELL): Use the value found by configure.
+	* Rules-quot: Upgrade to gettext-0.20.1.
+	* en@boldquot.header: Upgrade to gettext-0.20.1.
+	* en@quot.header: Upgrade to gettext-0.20.1.
+	* insert-header.sin: Upgrade to gettext-0.20.1.
+	* remove-potcdate.sin: Upgrade to gettext-0.20.1.
+
 2019-04-26  Bruno Haible  <bruno@clisp.org>
 
 	* cs.po: Update from Petr Pisar <petr.pisar@atlas.cz>.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 0594ffc..4e93a63 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,13 +1,14 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2000-2019 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 #
-# Origin: gettext-0.19.8
-GETTEXT_MACRO_VERSION = 0.19
+# Origin: gettext-0.20
+GETTEXT_MACRO_VERSION = 0.20
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
@@ -52,16 +53,13 @@
 GMSGFMT_no = @GMSGFMT@
 GMSGFMT_yes = @GMSGFMT_015@
 GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
 XGETTEXT_ = @XGETTEXT@
 XGETTEXT_no = @XGETTEXT@
 XGETTEXT_yes = @XGETTEXT_015@
 XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
+MSGMERGE = @MSGMERGE@
 MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
 MSGINIT = msginit
 MSGCONV = msgconv
 MSGFILTER = msgfilter
@@ -93,17 +91,32 @@
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
 
-.po.mo:
-	@echo "$(MSGFMT) -c -o $@ $<"; \
-	$(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+# The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs.
+# The GNU Coding Standards say in
+# <https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>:
+#   "GNU distributions usually contain some files which are not source files
+#    ... . Since these files normally appear in the source directory, they
+#    should always appear in the source directory, not in the build directory.
+#    So Makefile rules to update them should put the updated files in the
+#    source directory."
+# Therefore we put these files in the source directory, not the build directory.
 
-.po.gmo:
+# During .po -> .gmo conversion, take into account the most recent changes to
+# the .pot file. This eliminates the need to update the .po files when the
+# .pot file has changed, which would be troublesome if the .po files are put
+# under version control.
+.po.gmo: $(srcdir)/$(DOMAIN).pot
 	@lang=`echo $* | sed -e 's,.*/,,'`; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \
-	cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+	echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
+	cd $(srcdir) && \
+	rm -f $${lang}.gmo && \
+	$(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
+	$(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+	mv t-$${lang}.gmo $${lang}.gmo && \
+	rm -f $${lang}.1po
 
 .sin.sed:
 	sed -e '/^#/d' $< > t-$@
@@ -112,7 +125,7 @@
 
 all: all-@USE_NLS@
 
-all-yes: stamp-po
+all-yes: $(srcdir)/stamp-po
 all-no:
 
 # Ensure that the gettext macros and this Makefile.in.in are in sync.
@@ -126,24 +139,24 @@
 # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
 # we don't want to bother translators with empty POT files). We assume that
 # LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
+# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target).
 
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
+# $(srcdir)/stamp-po is a timestamp denoting the last time at which the CATALOGS
+# have been loosely updated. Its purpose is that when a developer or translator
+# checks out the package from a version control system, and the $(DOMAIN).pot
+# file is not under version control, "make" will update the $(DOMAIN).pot and
+# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This
+# timestamp would not be necessary if updating the $(CATALOGS) would always
+# touch them; however, the rule for $(POFILES) has been designed to not touch
+# files that don't need to be changed.
+$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot
 	@$(CHECK_MACRO_VERSION)
 	test ! -f $(srcdir)/$(DOMAIN).pot || \
 	  test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
 	@test ! -f $(srcdir)/$(DOMAIN).pot || { \
-	  echo "touch stamp-po" && \
-	  echo timestamp > stamp-poT && \
-	  mv stamp-poT stamp-po; \
+	  echo "touch $(srcdir)/stamp-po" && \
+	  echo timestamp > $(srcdir)/stamp-poT && \
+	  mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \
 	}
 
 # Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
@@ -159,11 +172,9 @@
 	package_gnu="$(PACKAGE_GNU)"; \
 	test -n "$$package_gnu" || { \
 	  if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
-		 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
-			       -size -10000000c -exec grep 'GNU @PACKAGE@' \
-			       /dev/null '{}' ';' 2>/dev/null; \
+	         LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
 	       else \
-		 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+	         LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
 	       fi; \
 	     } | grep -v 'libtool:' >/dev/null; then \
 	     package_gnu=yes; \
@@ -184,26 +195,29 @@
 	case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
 	  '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
 	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --add-comments=TRANSLATORS: \
 	      --files-from=$(srcdir)/POTFILES.in \
 	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
+	      $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
 	    ;; \
 	  *) \
 	    $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-	      --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
+	      --add-comments=TRANSLATORS: \
 	      --files-from=$(srcdir)/POTFILES.in \
 	      --copyright-holder='$(COPYRIGHT_HOLDER)' \
 	      --package-name="$${package_prefix}@PACKAGE@" \
 	      --package-version='@VERSION@' \
 	      --msgid-bugs-address="$$msgid_bugs_address" \
+	      $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
 	    ;; \
 	esac
 	test ! -f $(DOMAIN).po || { \
 	  if test -f $(srcdir)/$(DOMAIN).pot-header; then \
 	    sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
-	    cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
-	    rm -f $(DOMAIN).1po; \
+	    cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \
+	    rm -f $(DOMAIN).1po \
+	    || exit 1; \
 	  fi; \
 	  if test -f $(srcdir)/$(DOMAIN).pot; then \
 	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -228,17 +242,19 @@
 # This target rebuilds a PO file if $(DOMAIN).pot has changed.
 # Note that a PO file is not touched if it doesn't need to be changed.
 $(POFILES): $(POFILESDEPS)
+	@test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot
 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
 	if test -f "$(srcdir)/$${lang}.po"; then \
-	  test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \
+	  echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \
 	  cd $(srcdir) \
-	    && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	    && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
+	           '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
 	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
+	           0.1[6-7] | 0.1[6-7].*) \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \
 	           *) \
-	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \
+	             $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \
 	         esac; \
 	       }; \
 	else \
@@ -373,28 +389,30 @@
 
 info dvi ps pdf html tags TAGS ctags CTAGS ID:
 
+install-dvi install-ps install-pdf install-html:
+
 mostlyclean:
 	rm -f remove-potcdate.sed
-	rm -f stamp-poT
+	rm -f $(srcdir)/stamp-poT
 	rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
 	rm -fr *.o
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo
+	rm -f Makefile Makefile.in POTFILES
 
 maintainer-clean: distclean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
-	rm -f stamp-po $(GMOFILES)
+	rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES)
 
 distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
 	test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
 	@$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
+dist2: $(srcdir)/stamp-po $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	if test "$(PACKAGE)" = "gettext-tools"; then \
 	  dists="$$dists Makevars.template"; \
@@ -439,13 +457,15 @@
 	tmpdir=`pwd`; \
 	echo "$$lang:"; \
 	test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
+	echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
 	cd $(srcdir); \
 	if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
-	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+	       '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
 	         $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	       0.1[6-7] | 0.1[6-7].*) \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
 	       *) \
-	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+	         $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
 	     esac; \
 	   }; then \
 	  if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
diff --git a/po/Makevars b/po/Makevars
index fdcfc02..28eedb6 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,4 +1,8 @@
 # Makefile variables for libiconv/po.
+#
+# Copyright (C) 2003-2019 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to use, copy, distribute, and modify it.
 
 # Usually the message domain is the same as the package name.
 DOMAIN = $(PACKAGE)
diff --git a/po/Rules-quot b/po/Rules-quot
index baf6528..18c024b 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -1,5 +1,9 @@
-# This file, Rules-quot, can be copied and used freely without restrictions.
 # Special Makefile rules for English message catalogs with quotation marks.
+#
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# This file, Rules-quot, and its auxiliary files (listed under
+# DISTFILES.common.extra1) are free software; the Free Software Foundation
+# gives unlimited permission to use, copy, distribute, and modify them.
 
 DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot
 
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
index fedb6a0..506ca9e 100644
--- a/po/en@boldquot.header
+++ b/po/en@boldquot.header
@@ -2,7 +2,7 @@
 # The msgids must be ASCII and therefore cannot contain real quotation
 # characters, only substitutes like grave accent (0x60), apostrophe (0x27)
 # and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
 #
 # This catalog translates grave accent (0x60) and apostrophe (0x27) to
 # left single quotation mark (U+2018) and right single quotation mark (U+2019).
diff --git a/po/en@quot.header b/po/en@quot.header
index a9647fc..6522f0c 100644
--- a/po/en@quot.header
+++ b/po/en@quot.header
@@ -2,7 +2,7 @@
 # The msgids must be ASCII and therefore cannot contain real quotation
 # characters, only substitutes like grave accent (0x60), apostrophe (0x27)
 # and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
 #
 # This catalog translates grave accent (0x60) and apostrophe (0x27) to
 # left single quotation mark (U+2018) and right single quotation mark (U+2019).
diff --git a/po/insert-header.sin b/po/insert-header.sin
index b26de01..ceeebb9 100644
--- a/po/insert-header.sin
+++ b/po/insert-header.sin
@@ -1,5 +1,10 @@
 # Sed script that inserts the file called HEADER before the header entry.
 #
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Written by Bruno Haible <bruno@clisp.org>, 2001.
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to use, copy, distribute, and modify it.
+#
 # At each occurrence of a line starting with "msgid ", we execute the following
 # commands. At the first occurrence, insert the file. At the following
 # occurrences, do nothing. The distinction between the first and the following
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
index 2436c49..8c70dfb 100644
--- a/po/remove-potcdate.sin
+++ b/po/remove-potcdate.sin
@@ -1,6 +1,12 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
+# Sed script that removes the POT-Creation-Date line in the header entry
 # from a POT file.
 #
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.  This file is offered as-is,
+# without any warranty.
+#
 # The distinction between the first and the following occurrences of the
 # pattern is achieved by looking at the hold space.
 /^"POT-Creation-Date: .*"$/{