findutils-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Findutils-patches] [PATCH] Update to version 0.17 of GNU gettext.


From: James Youngman
Subject: [Findutils-patches] [PATCH] Update to version 0.17 of GNU gettext.
Date: Fri, 6 Mar 2009 10:44:30 +0000

Update to version 0.17 of GNU gettext.
* configure.ac: Update to version 0.17 of gettext.
* import-gnulib.sh (refresh_output_files): Run autopoint too.
* ABOUT-NLS: Remove the file from source control, since gettext
produces it.
* .gitignore: Ignore ABOUT-NLS.
* po/Makefile.in.in: Likewise.
* po/.gitignore: Ignore po/Makefile.in.in.

Signed-off-by: James Youngman <address@hidden>
---
 .gitignore        |    1 +
 ABOUT-NLS         |  996 -----------------------------------------------------
 ChangeLog         |   11 +
 configure.ac      |    2 +-
 import-gnulib.sh  |    1 +
 po/.gitignore     |    1 +
 po/Makefile.in.in |  384 ---------------------
 7 files changed, 15 insertions(+), 1381 deletions(-)
 delete mode 100644 ABOUT-NLS
 delete mode 100644 po/Makefile.in.in

diff --git a/.gitignore b/.gitignore
index 5c51f11..0f7ef5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+ABOUT-NLS
 Makefile
 Makefile.in
 aclocal.m4
diff --git a/ABOUT-NLS b/ABOUT-NLS
deleted file mode 100644
index e32d52d..0000000
--- a/ABOUT-NLS
+++ /dev/null
@@ -1,996 +0,0 @@
-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.
-
-   When reporting bugs in the `intl/' directory or bugs which may be
-related to internationalization, you should tell about the version of
-`gettext' which is used.  The information can be found in the
-`intl/VERSION' file, in internationalized packages.
-
-1.1 Quick configuration advice
-==============================
-
-If you want to exploit the full power of internationalization, you
-should configure it using
-
-     ./configure --with-included-gettext
-
-to force usage of internationalizing routines provided within this
-package, despite the existence of internationalizing capabilities in the
-operating system where this package is being installed.  So far, only
-the `gettext' implementation in the GNU C library version 2 provides as
-many features (such as locale alias, message inheritance, automatic
-charset conversion or plural form handling) as the implementation here.
-It is also not possible to offer this additional functionality on top
-of a `catgets' implementation.  Future versions of GNU `gettext' will
-very likely convey even more functionality.  So it might be a good idea
-to change to GNU `gettext' as soon as possible.
-
-   So you need _not_ provide this option if you are using GNU libc 2 or
-you have installed a recent copy of the GNU gettext package with the
-included `libintl'.
-
-1.2 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.  If not, the included GNU
-`gettext' library will be used.  This library is wholly contained
-within this package, usually in the `intl/' subdirectory, so prior
-installation of the GNU `gettext' package is _not_ required.
-Installers may use special options at configuration time for changing
-the default behaviour.  The commands:
-
-     ./configure --with-included-gettext
-     ./configure --disable-nls
-
-will, respectively, bypass any pre-existing `gettext' to use the
-internationalizing routines provided within this package, or else,
-_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.a' file and
-will decide to use this.  This might not be desirable.  You should use
-the more recent version of the GNU `gettext' library.  I.e. if the file
-`intl/VERSION' shows that the library which comes with this package is
-more recent, you should use
-
-     ./configure --with-included-gettext
-
-to prevent auto-detection.
-
-   The configuration process will not test for the `catgets' function
-and therefore it will not be used.  The reason is that even an
-emulation of `gettext' on top of `catgets' could not provide all the
-extensions of the GNU `gettext' library.
-
-   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.3 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.  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 country 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.4 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://www.iro.umontreal.ca/contrib/po/HTML/', in the "National 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 address@hidden', 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 address@hidden' 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 skill are praised more than
-programming skill, here.
-
-1.5 Available Packages
-======================
-
-Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of May 2005.
-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 ar az be bg bs ca cs cy da de el en en_GB
-                        +-------------------------------------------------+
-     GNUnet             |                                                 |
-     a2ps               |             []                [] [] []     []   |
-     aegis              |                                  ()             |
-     ant-phone          |                                  ()             |
-     anubis             |                                  []             |
-     ap-utils           |                                                 |
-     aspell             |                         []    [] []        []   |
-     bash               |                      []          []             |
-     batchelor          |                                  []             |
-     bfd                |                                                 |
-     bibshelf           |                                  []             |
-     binutils           |                               []                |
-     bison              |                               [] []             |
-     bluez-pin          | []                      []       [] []          |
-     clisp              |                                  []    []       |
-     console-tools      |                         []       []             |
-     coreutils          |                []    []       [] []             |
-     cpio               |                                                 |
-     cpplib             |                      []       [] []             |
-     darkstat           |                []             () []             |
-     dialog             |                      [] [] [] [] [] []          |
-     diffutils          |                      [] []    [] [] []          |
-     doodle             |                                  []             |
-     e2fsprogs          |                         []       []             |
-     enscript           |                      []       [] []        []   |
-     error              |                      []       [] []        []   |
-     fetchmail          |                      []       [] () []          |
-     fileutils          |                               [] []             |
-     findutils          |                      []       []    []          |
-     flex               |                      []       [] []             |
-     fslint             |                                  []             |
-     gas                |                                                 |
-     gawk               |                      []       [] []             |
-     gbiff              |                                  []             |
-     gcal               |                      []                         |
-     gcc                |                                  []             |
-     gettext-examples   | []                   []          [] []          |
-     gettext-runtime    |             []       []       [] []             |
-     gettext-tools      |                      []          []             |
-     gimp-print         |                         []    [] []        []   |
-     gip                |                                                 |
-     gliv               |                                  []             |
-     glunarclock        |                                                 |
-     gmult              | []                               []             |
-     gnubiff            |                                  ()             |
-     gnucash            |                         []       () ()     []   |
-     gnucash-glossary   |                               [] ()             |
-     gpe-aerial         |                         []       []             |
-     gpe-beam           |                         []       []             |
-     gpe-calendar       |                         []       []             |
-     gpe-clock          |                         []       []             |
-     gpe-conf           |                         []       []             |
-     gpe-contacts       |                                                 |
-     gpe-edit           |                         []                      |
-     gpe-go             |                         []                      |
-     gpe-login          |                         []       []             |
-     gpe-ownerinfo      |                         []       []             |
-     gpe-sketchbook     |                         []       []             |
-     gpe-su             |                         []       []             |
-     gpe-taskmanager    |                         []       []             |
-     gpe-timesheet      |                         []                      |
-     gpe-today          |                         []       []             |
-     gpe-todo           |                         []       []             |
-     gphoto2            |                         []    [] []        []   |
-     gprof              |                               [] []             |
-     gpsdrive           |                                  ()    ()       |
-     gramadoir          | []                               []             |
-     grep               | []          [] []    []          [] []          |
-     gretl              |                                                 |
-     gsasl              |                                  []             |
-     gss                |                                                 |
-     gst-plugins        | []       []          [] []       []        []   |
-     gstreamer          | []                   [] []       []        []   |
-     gtick              | []                               ()             |
-     gtkspell           |             []                   [] []          |
-     hello              |                      []       [] [] []          |
-     id-utils           |                               [] []             |
-     impost             |                                                 |
-     indent             |                      []          []             |
-     iso_3166           |                                                 |
-     iso_3166_1         |                      [] []    [] [] []          |
-     iso_3166_2         |                                                 |
-     iso_3166_3         |                                  []             |
-     iso_4217           |                                                 |
-     iso_639            |                                                 |
-     jpilot             |                         []                      |
-     jtag               |                                                 |
-     jwhois             |                                                 |
-     kbd                |                         []    [] [] []          |
-     latrine            |                                  ()             |
-     ld                 |                               []                |
-     libc               |                      [] []    [] [] []          |
-     libextractor       |                                                 |
-     libgpewidget       |                         []    [] []             |
-     libgphoto2         |                                  []             |
-     libgphoto2_port    |                                  []             |
-     libgsasl           |                                                 |
-     libiconv           | []                   []       [] [] []          |
-     libidn             |                                                 |
-     lifelines          |                               [] ()             |
-     lilypond           |                                  []             |
-     lingoteach         |                                                 |
-     lynx               |                      [] []    [] []             |
-     m4                 |                         []    [] [] []          |
-     mailutils          |                      []                         |
-     make               |                               [] []             |
-     man-db             |                      [] ()    [] []             |
-     minicom            |                         []       []             |
-     mysecretdiary      |                               [] []             |
-     nano               |                      [] ()       []             |
-     nano_1_0           |                      [] ()    [] []             |
-     opcodes            |                                  []             |
-     parted             |                      [] []    [] []             |
-     psmisc             |                                                 |
-     ptx                |                      []       [] []             |
-     pwdutils           |                                                 |
-     python             |                                                 |
-     radius             |                      []                         |
-     recode             |             []       []       [] [] []          |
-     rpm                |                         []    []                |
-     screem             |                                                 |
-     scrollkeeper       |          [] []       [] [] [] [] []        []   |
-     sed                |                      []          []             |
-     sh-utils           |                               [] []             |
-     shared-mime-info   |                []       []                      |
-     sharutils          |                      [] []    [] [] []          |
-     silky              |                                                 |
-     skencil            |                               [] ()             |
-     sketch             |                               [] ()             |
-     solfege            |                                  []             |
-     soundtracker       |                               [] []             |
-     sp                 |                                  []             |
-     stardict           |                         []                      |
-     tar                |                                                 |
-     texinfo            |                               [] []             |
-     textutils          |                      []       [] []             |
-     tin                |                                  ()        ()   |
-     tp-robot           |                                  []             |
-     tuxpaint           | []                   [] []    [] [] []     []   |
-     unicode-han-tra... |                                                 |
-     unicode-transla... |                                                 |
-     util-linux         |                      [] []    [] []             |
-     vorbis-tools       |             []          []    []           []   |
-     wastesedge         |                                  ()             |
-     wdiff              |                      []       [] []        []   |
-     wget               |                                                 |
-     xchat              |                []    []          [] []     []   |
-     xkeyboard-config   |                                                 |
-     xpad               |                                                 |
-                        +-------------------------------------------------+
-                          af am ar az be bg bs ca cs cy da de el en en_GB
-                          10  0  0  2  7  5  0 40 43  2 51 91 19  1  14
-
-                          eo es et eu fa fi fr  ga gl he hi hr hu id is
-                        +-----------------------------------------------+
-     GNUnet             |                                               |
-     a2ps               |       []       [] []                          |
-     aegis              |                                               |
-     ant-phone          |                   []                          |
-     anubis             |                   []                          |
-     ap-utils           |                   []                          |
-     aspell             |                   []  []                      |
-     bash               | [] []             []                 []       |
-     batchelor          |                   []  []                      |
-     bfd                |    []                                         |
-     bibshelf           |    []                 []                      |
-     binutils           |    []             []                          |
-     bison              |    [] []          []  []                []    |
-     bluez-pin          | []             [] []  []             [] []    |
-     clisp              |    []             []                          |
-     console-tools      |                                               |
-     coreutils          |    [] []       [] []  []                      |
-     cpio               |    []             []                          |
-     cpplib             |    []             []                          |
-     darkstat           |    []             ()  []             [] []    |
-     dialog             |    [] [] []    [] []  []             []       |
-     diffutils          | [] []          [] []  [] [] []       [] []    |
-     doodle             |                       []                      |
-     e2fsprogs          |    []             []                          |
-     enscript           |                   []              []          |
-     error              |    []          [] []  []             []       |
-     fetchmail          |    []                                         |
-     fileutils          |    [] []          []  []             []       |
-     findutils          |    [] []          []  []                      |
-     flex               |    []             []  []                      |
-     fslint             |                   []                          |
-     gas                |    []             []                          |
-     gawk               |    []             []  []    []                |
-     gbiff              |                   []                          |
-     gcal               |    []             []                          |
-     gcc                |    []                                         |
-     gettext-examples   |    []             []  []                      |
-     gettext-runtime    |    []          [] []  []                []    |
-     gettext-tools      |    []             []                          |
-     gimp-print         |    []             []                          |
-     gip                |    []    []       []                          |
-     gliv               |                   ()                          |
-     glunarclock        |                []     []             []       |
-     gmult              |          []       []                          |
-     gnubiff            |                   ()                          |
-     gnucash            |    []                                ()       |
-     gnucash-glossary   |    []                                         |
-     gpe-aerial         |    []             []                          |
-     gpe-beam           |    []             []                          |
-     gpe-calendar       |    []             []                 [] []    |
-     gpe-clock          |    []          [] []                          |
-     gpe-conf           |                   []                          |
-     gpe-contacts       |                   []                          |
-     gpe-edit           |                   []                    []    |
-     gpe-go             |    []             []                          |
-     gpe-login          |    []             []                 []       |
-     gpe-ownerinfo      |    []          [] []                 [] []    |
-     gpe-sketchbook     |    []             []                          |
-     gpe-su             |    []          [] []                          |
-     gpe-taskmanager    |    []          [] []                          |
-     gpe-timesheet      |    []             []  []                []    |
-     gpe-today          |    []          [] []  []                      |
-     gpe-todo           |    []             []                    []    |
-     gphoto2            |    []          [] []                 []       |
-     gprof              |    []             []                    []    |
-     gpsdrive           |    ()             ()                 []       |
-     gramadoir          |                   []  []                      |
-     grep               |    [] [] []    [] []  [] [] []    [] [] []    |
-     gretl              |    []             []                          |
-     gsasl              |          []       []  []                      |
-     gss                |                   []                          |
-     gst-plugins        |                   []                 []       |
-     gstreamer          |                                               |
-     gtick              |          []    [] []  []                      |
-     gtkspell           | [] []    []       []  []                      |
-     hello              | [] [] [] [] [] [] []  [] [] []    [] [] []    |
-     id-utils           |                   []                 [] []    |
-     impost             |                   []  []                      |
-     indent             | [] [] [] []    [] []  [] []          [] []    |
-     iso_3166           | []             [] []                          |
-     iso_3166_1         |    []    []    [] []  []             [] []    |
-     iso_3166_2         |                   []                          |
-     iso_3166_3         |                   []                          |
-     iso_4217           |       []       []        []                   |
-     iso_639            | []          [] [] []                          |
-     jpilot             |    []             []                          |
-     jtag               |                   []                          |
-     jwhois             |    []             []                 [] []    |
-     kbd                |    []             []                          |
-     latrine            |                   []  []                      |
-     ld                 |    []             []                          |
-     libc               |    []          [] []     []          []       |
-     libextractor       |                                               |
-     libgpewidget       |    []             []  []             [] []    |
-     libgphoto2         |    []             []                 []       |
-     libgphoto2_port    |                   []                          |
-     libgsasl           |                   []  []                      |
-     libiconv           | [] [] []       [] []  [] []       [] [] []    |
-     libidn             | []                []                          |
-     lifelines          |                   ()                          |
-     lilypond           |                                               |
-     lingoteach         |                   []                    []    |
-     lynx               |       []                             []       |
-     m4                 |                   []  [] []             []    |
-     mailutils          |    []             []                          |
-     make               |    []          [] []  [] [] []    []          |
-     man-db             |    ()                                         |
-     minicom            |    []          [] []                 []       |
-     mysecretdiary      |    []             []                    []    |
-     nano               |    []    []    () []                          |
-     nano_1_0           |    []             []     []             []    |
-     opcodes            |    []          [] []                          |
-     parted             |    []             []     []                   |
-     psmisc             |          []                                   |
-     ptx                | [] [] []       [] []  [] []          [] []    |
-     pwdutils           |                                               |
-     python             |                                               |
-     radius             |    []             []                          |
-     recode             | [] []             []     [] []       [] []    |
-     rpm                |                   []                          |
-     screem             |                                               |
-     scrollkeeper       |    []          []                    []       |
-     sed                | [] [] []          []  []             []       |
-     sh-utils           |    [] []       [] []  []             []       |
-     shared-mime-info   | [] []    []    [] []                 []       |
-     sharutils          |    [] []       [] []     []          []       |
-     silky              |                   []                          |
-     skencil            |    []             []                          |
-     sketch             |    []             []                          |
-     solfege            |                                               |
-     soundtracker       |    []             []                          |
-     sp                 |                   []                          |
-     stardict           |                                      []       |
-     tar                |    [] []          []  []                      |
-     texinfo            | []                []        []                |
-     textutils          |    []             []  [] []          []       |
-     tin                |       []          ()                          |
-     tp-robot           |                   []                 []       |
-     tuxpaint           |    []          [] []  []    []       [] [] [] |
-     unicode-han-tra... |                                               |
-     unicode-transla... |                   []  []                      |
-     util-linux         |    [] []       [] []                 []       |
-     vorbis-tools       |    []             []                          |
-     wastesedge         |                   ()                          |
-     wdiff              |    [] []          []  [] []          [] []    |
-     wget               |       [] []           []          []          |
-     xchat              |    []    []    [] []           []             |
-     xkeyboard-config   |                                               |
-     xpad               |    []                 []             []       |
-                        +-----------------------------------------------+
-                          eo es et eu fa fi fr  ga gl he hi hr hu id is
-                          15 85 21 15  2 35 115 45 16  8  1  6 40 27  1
-
-                          it ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
-                        +--------------------------------------------------+
-     GNUnet             |                                                  |
-     a2ps               | ()    ()                   []       []    ()     |
-     aegis              |                                     ()           |
-     ant-phone          |                                     []           |
-     anubis             |                            []    [] []           |
-     ap-utils           |                                                  |
-     aspell             |                         []          []           |
-     bash               |                                     []           |
-     batchelor          |                                     []           |
-     bfd                |                                                  |
-     bibshelf           | []                                               |
-     binutils           |                                                  |
-     bison              | []                         []    [] []           |
-     bluez-pin          |          []                         []           |
-     clisp              |                                     []           |
-     console-tools      |                                                  |
-     coreutils          |    []                               []           |
-     cpio               |                                                  |
-     cpplib             |                                     []           |
-     darkstat           |                            []       []           |
-     dialog             | []                                  []           |
-     diffutils          | [] []                      []       []           |
-     doodle             | []                                               |
-     e2fsprogs          | []                                               |
-     enscript           |                                     []           |
-     error              |                                     []           |
-     fetchmail          |    []                               []           |
-     fileutils          | [] []       []                                   |
-     findutils          | []                                  []           |
-     flex               |       []                            []           |
-     fslint             |                                     []           |
-     gas                |                                                  |
-     gawk               |    []                               []           |
-     gbiff              |                                     []           |
-     gcal               |                                                  |
-     gcc                |                                                  |
-     gettext-examples   | [] []                               []           |
-     gettext-runtime    | [] [] []                            []           |
-     gettext-tools      | [] [] []                                         |
-     gimp-print         |    []                               []           |
-     gip                |                                     []           |
-     gliv               |                                     []           |
-     glunarclock        |                            []       []           |
-     gmult              | [] []                                            |
-     gnubiff            | ()                                               |
-     gnucash            | [] ()                            () []           |
-     gnucash-glossary   | []                                  []           |
-     gpe-aerial         |                                     []           |
-     gpe-beam           |                                     []           |
-     gpe-calendar       |                                     []           |
-     gpe-clock          |                                     []           |
-     gpe-conf           |                                     []           |
-     gpe-contacts       |                                                  |
-     gpe-edit           |                                     []           |
-     gpe-go             |                                     []           |
-     gpe-login          |                                     []           |
-     gpe-ownerinfo      |                                     []           |
-     gpe-sketchbook     |                                     []           |
-     gpe-su             |                                     []           |
-     gpe-taskmanager    |          []                         []           |
-     gpe-timesheet      |                                     []           |
-     gpe-today          |                                     []           |
-     gpe-todo           |                                     []           |
-     gphoto2            | [] []                               []           |
-     gprof              |                                                  |
-     gpsdrive           | () ()                               ()    ()     |
-     gramadoir          |                                     ()           |
-     grep               | [] []                            [] []           |
-     gretl              | []                                               |
-     gsasl              |                                     []           |
-     gss                |                                                  |
-     gst-plugins        | []                                  []           |
-     gstreamer          | []                                  []           |
-     gtick              | []                                  []           |
-     gtkspell           | []                      []          []           |
-     hello              | [] [] []          []       []    [] [] [] []     |
-     id-utils           | []                                  []           |
-     impost             |                                                  |
-     indent             | [] []                               []           |
-     iso_3166           |                                     []           |
-     iso_3166_1         |                                     []    []     |
-     iso_3166_2         |                                     []           |
-     iso_3166_3         |                                     []           |
-     iso_4217           |    []                   []          []           |
-     iso_639            |    []                               [] []        |
-     jpilot             |    ()                               ()    ()     |
-     jtag               |                                                  |
-     jwhois             | []                                  []           |
-     kbd                |                                     []           |
-     latrine            | []                                  []           |
-     ld                 |                                                  |
-     libc               |    [] []                         [] []    []     |
-     libextractor       |                                                  |
-     libgpewidget       |                                     []           |
-     libgphoto2         | [] []                                            |
-     libgphoto2_port    | [] []                                            |
-     libgsasl           |                                     []           |
-     libiconv           | []                                  []           |
-     libidn             | []                                               |
-     lifelines          |                                     []           |
-     lilypond           |                                                  |
-     lingoteach         | []                                  []           |
-     lynx               | [] []                               []           |
-     m4                 |    []                               []           |
-     mailutils          |                                                  |
-     make               |    [] []                            []           |
-     man-db             |    ()                                            |
-     minicom            |    []                                            |
-     mysecretdiary      |                                     []           |
-     nano               | []                         []    []              |
-     nano_1_0           | []                         []    []    []        |
-     opcodes            |                                     []           |
-     parted             | [] []                               [] []        |
-     psmisc             | []                               [] []           |
-     ptx                |                                  [] []    []     |
-     pwdutils           |                                                  |
-     python             |                                                  |
-     radius             |                                                  |
-     recode             | []                                  []           |
-     rpm                |    [] []                                         |
-     screem             |    []                                            |
-     scrollkeeper       |                                  [] [] []        |
-     sed                |    []                               []           |
-     sh-utils           | [] []                            []              |
-     shared-mime-info   |       []                         [] [] []        |
-     sharutils          | [] []                               []           |
-     silky              |                                     []           |
-     skencil            |                                                  |
-     sketch             |                                                  |
-     solfege            | []                                  []    []     |
-     soundtracker       | []                                               |
-     sp                 |    ()                                            |
-     stardict           |                      []             []           |
-     tar                | [] []                               []           |
-     texinfo            |    []                            [] []           |
-     textutils          |    [] []                         []              |
-     tin                |                                                  |
-     tp-robot           |                                     []           |
-     tuxpaint           | [] [] []       []          []       [] []        |
-     unicode-han-tra... |                                                  |
-     unicode-transla... |                                                  |
-     util-linux         | [] []                               []           |
-     vorbis-tools       |                                     []           |
-     wastesedge         |                                     []           |
-     wdiff              | []                         []    []              |
-     wget               |    []                                            |
-     xchat              | []    []          [] []             []           |
-     xkeyboard-config   |                                     []           |
-     xpad               |                                     []           |
-                        +--------------------------------------------------+
-                          it ja ko ku lg lt lv mk mn ms mt nb nl nn no nso
-                          46 35 11  2  1  1  2  2  3 11  0 15 96  7  5  0
-
-                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv
-                        +----------------------------------------------+
-     GNUnet             |                                              |
-     a2ps               |       ()     []      [] []       []    [] [] |
-     aegis              |                      () ()                   |
-     ant-phone          |                      []                      |
-     anubis             |       []             [] []                   |
-     ap-utils           |       ()                                     |
-     aspell             |                      [] []                   |
-     bash               |              []      [] []                   |
-     batchelor          |                      []                      |
-     bfd                |                                              |
-     bibshelf           |                                              |
-     binutils           |                         []                [] |
-     bison              |       []     []      [] []                [] |
-     bluez-pin          |       []     []   [] [] []    []       [] [] |
-     clisp              |                         []                   |
-     console-tools      |                         []                   |
-     coreutils          |       []                []       []       [] |
-     cpio               |       []                                  [] |
-     cpplib             |                                              |
-     darkstat           |       []     []      []       []       [] [] |
-     dialog             |       [] []  []   [] [] [] []                |
-     diffutils          |       []     []      [] []             [] [] |
-     doodle             |                                     []       |
-     e2fsprogs          |       []                                  [] |
-     enscript           |              []      [] []                [] |
-     error              |              []      []       []             |
-     fetchmail          |       []                []    []    []       |
-     fileutils          |       []             [] []       []       [] |
-     findutils          |       [] []          []       []       [] [] |
-     flex               |       []     []      [] []                [] |
-     fslint             |              []      []                []    |
-     gas                |                                              |
-     gawk               |       []     []      []                   [] |
-     gbiff              |                      []                      |
-     gcal               |                                           [] |
-     gcc                |                                              |
-     gettext-examples   |       []             [] []    []       [] [] |
-     gettext-runtime    |       []             [] []    [] []    [] [] |
-     gettext-tools      |       []             [] []    [] []    [] [] |
-     gimp-print         |                               []          [] |
-     gip                |                   []          []       []    |
-     gliv               |              []      []       []             |
-     glunarclock        |              []      [] []    []       [] [] |
-     gmult              |              []   [] []                []    |
-     gnubiff            |                      ()                   [] |
-     gnucash            |       () []             []    []          [] |
-     gnucash-glossary   |          []                   []          [] |
-     gpe-aerial         |          []  []      [] []             [] [] |
-     gpe-beam           |          []  []      [] []             [] [] |
-     gpe-calendar       |          []  []      [] []    []       [] [] |
-     gpe-clock          |          []  []      [] []    []       [] [] |
-     gpe-conf           |          []  []      [] []    []          [] |
-     gpe-contacts       |                      [] []             [] [] |
-     gpe-edit           |          []  []      [] []    []       [] [] |
-     gpe-go             |              []      [] []             [] [] |
-     gpe-login          |          []  []      [] []    []       [] [] |
-     gpe-ownerinfo      |          []  []      [] []    []       [] [] |
-     gpe-sketchbook     |          []  []      [] []    []       [] [] |
-     gpe-su             |          []  []      [] []    []       [] [] |
-     gpe-taskmanager    |          []  []      [] []    []       [] [] |
-     gpe-timesheet      |          []  []      [] []    []       [] [] |
-     gpe-today          |          []  []      [] []    []       [] [] |
-     gpe-todo           |    []    []  []      [] []    []       [] [] |
-     gphoto2            |                      []       []       [] [] |
-     gprof              |              []      []                   [] |
-     gpsdrive           |    []                []                      |
-     gramadoir          |                               []             |
-     grep               |       [] []  []      [] []       []    []    |
-     gretl              |       []                                     |
-     gsasl              |       []             []             [] [] [] |
-     gss                |       []             []                   [] |
-     gst-plugins        | []                                  [] [] [] |
-     gstreamer          |                         []          [] [] [] |
-     gtick              |                      [] []                [] |
-     gtkspell           |              []   [] [] []    []       []    |
-     hello              |       []     []      [] []    []       [] [] |
-     id-utils           |              []      [] []                [] |
-     impost             |                                              |
-     indent             |              []      [] []    []       [] [] |
-     iso_3166           |          []                []       [] [] [] |
-     iso_3166_1         |                               [] [] [] []    |
-     iso_3166_2         |                                              |
-     iso_3166_3         |                      []    []          []    |
-     iso_4217           |                            []          []    |
-     iso_639            |                            []          [] [] |
-     jpilot             |                                              |
-     jtag               |                               []             |
-     jwhois             |       []     []      [] ()                () |
-     kbd                |       []             []                   [] |
-     latrine            |                      []                   [] |
-     ld                 |                                           [] |
-     libc               |       []     []         []    []          [] |
-     libextractor       |                      []                      |
-     libgpewidget       |          []  []      []       []       [] [] |
-     libgphoto2         |                         []                [] |
-     libgphoto2_port    |                         []                   |
-     libgsasl           |       []             []                []    |
-     libiconv           |       []     []   [] [] []    [] [] [] [] [] |
-     libidn             |       []                                  () |
-     lifelines          |       []                                  [] |
-     lilypond           |                                              |
-     lingoteach         |              []                              |
-     lynx               |              []         []                [] |
-     m4                 |       []     []      [] []                [] |
-     mailutils          |       []             [] []                   |
-     make               |       []     []         []                [] |
-     man-db             |                      []                   [] |
-     minicom            |       []     []      [] []                   |
-     mysecretdiary      |              []      [] []                [] |
-     nano               |              []      []                   [] |
-     nano_1_0           |       []             [] []                [] |
-     opcodes            |                      []                   [] |
-     parted             |       [] []  []                           [] |
-     psmisc             |       []             []                      |
-     ptx                |       [] []  []      [] []                [] |
-     pwdutils           |       []                                     |
-     python             |                                              |
-     radius             |       []                []                   |
-     recode             |       []     []      [] []       []       [] |
-     rpm                |       [] []             []                [] |
-     screem             |                                              |
-     scrollkeeper       |       []             [] []    []    [] [] [] |
-     sed                |       [] []  []      [] []    []       [] [] |
-     sh-utils           |                         []       []    []    |
-     shared-mime-info   |          []  []         []          [] [] [] |
-     sharutils          |                         []             [] [] |
-     silky              |                               []             |
-     skencil            |          []  []                           [] |
-     sketch             |          []  []                           [] |
-     solfege            |                                              |
-     soundtracker       |                               []          [] |
-     sp                 |                                              |
-     stardict           |                         []    []             |
-     tar                |       []             [] []                [] |
-     texinfo            |       []             [] []                [] |
-     textutils          |                         []       []       [] |
-     tin                |                                              |
-     tp-robot           |                         []                   |
-     tuxpaint           |       [] []  []      []       []    [] [] [] |
-     unicode-han-tra... |                                              |
-     unicode-transla... |                                              |
-     util-linux         |              []         []                [] |
-     vorbis-tools       |                      [] []                   |
-     wastesedge         |                                              |
-     wdiff              |       []     []      [] []    []          [] |
-     wget               |                                              |
-     xchat              |    []                   []    [] [] [] [] [] |
-     xkeyboard-config   |                                              |
-     xpad               |                                              |
-                        +----------------------------------------------+
-                          or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv
-                           1  3 47 29  57    6 78 73  5 44 12 12 50 85
-
-                          ta tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
-                        +-----------------------------------------------+
-     GNUnet             |                                               |  0
-     a2ps               |             [] []     []                      | 19
-     aegis              |                                               |  0
-     ant-phone          |             []        []                      |  5
-     anubis             |             [] []     []                      | 11
-     ap-utils           |                ()     []                      |  2
-     aspell             |                []     [] []                   | 13
-     bash               |                       []                      | 11
-     batchelor          |             []        []                      |  7
-     bfd                |                                               |  1
-     bibshelf           |                       []                      |  5
-     binutils           |             []                                |  6
-     bison              |             []        []                      | 18
-     bluez-pin          |             [] []     [] []     []            | 25
-     clisp              |                                               |  7
-     console-tools      |             []        []                      |  5
-     coreutils          |             []        []                      | 17
-     cpio               |             [] []     []                      |  7
-     cpplib             |             []        []                      |  8
-     darkstat           |                       []        ()    ()      | 15
-     dialog             |             [] []     []                      | 25
-     diffutils          |             []        []        []    []      | 28
-     doodle             |                       []                      |  5
-     e2fsprogs          |             []                                |  8
-     enscript           |             []                                | 12
-     error              |             []        []              []      | 16
-     fetchmail          |             []                                | 12
-     fileutils          |             []                  []    []      | 18
-     findutils          |             []        []                      | 17
-     flex               |             []        []                      | 15
-     fslint             |                       []                      |  7
-     gas                |             []                                |  3
-     gawk               |             []                                | 14
-     gbiff              |                       []                      |  5
-     gcal               |             []                                |  5
-     gcc                |             []                  []            |  4
-     gettext-examples   |             [] []     []        []    []      | 21
-     gettext-runtime    |             [] []     []        []    []      | 25
-     gettext-tools      |             [] []     []        []    []      | 19
-     gimp-print         |                []                             | 11
-     gip                |                       []                      |  8
-     gliv               |             []        []                      |  7
-     glunarclock        |                       [] []                   | 13
-     gmult              |             []        []        []            | 13
-     gnubiff            |                       []                      |  3
-     gnucash            |             ()                        []      | 10
-     gnucash-glossary   |                       []              []      |  9
-     gpe-aerial         |                       []        []            | 13
-     gpe-beam           |                       []        []            | 13
-     gpe-calendar       |                       [] []     []    []      | 18
-     gpe-clock          |             []        [] []     []            | 17
-     gpe-conf           |                       []        []            | 12
-     gpe-contacts       |                       []        []            |  7
-     gpe-edit           |             []        [] []           []      | 15
-     gpe-go             |             []        []                      | 11
-     gpe-login          |             []        [] []     []    []      | 18
-     gpe-ownerinfo      |             []        []        []    []      | 19
-     gpe-sketchbook     |             []        []                      | 14
-     gpe-su             |             []        []        []            | 16
-     gpe-taskmanager    |             []        []        []            | 17
-     gpe-timesheet      |             []        []        []    []      | 17
-     gpe-today          |             []        [] []     []    []      | 19
-     gpe-todo           |                       [] []           []      | 17
-     gphoto2            |                []               []    []      | 18
-     gprof              |             []        []                      | 10
-     gpsdrive           |                                               |  3
-     gramadoir          |                       []                      |  6
-     grep               |             [] []     []              []      | 32
-     gretl              |                                               |  4
-     gsasl              |                       []        []            | 12
-     gss                |                       []                      |  5
-     gst-plugins        |                []     []              []      | 17
-     gstreamer          |             [] []     []              []      | 15
-     gtick              |                       []                      | 11
-     gtkspell           |                       [] []     []    []      | 21
-     hello              |             [] []     []        []            | 37
-     id-utils           |             []        []                      | 13
-     impost             |                       []                      |  3
-     indent             |             []        []        []    []      | 25
-     iso_3166           |          [] []        []                      | 12
-     iso_3166_1         |             []           []                   | 20
-     iso_3166_2         |                                               |  2
-     iso_3166_3         |                          []     []            |  8
-     iso_4217           |             []        []                      | 10
-     iso_639            |                       [] []                   | 12
-     jpilot             |             [] []               []            |  6
-     jtag               |                                               |  2
-     jwhois             |             []        []              []      | 12
-     kbd                |             []        []                      | 12
-     latrine            |             []        []                      |  8
-     ld                 |             []                                |  5
-     libc               |             []                  []            | 22
-     libextractor       |                                               |  1
-     libgpewidget       |                       [] []                   | 17
-     libgphoto2         |                                 []            |  9
-     libgphoto2_port    |                                               |  5
-     libgsasl           |                       []                      |  7
-     libiconv           |             [] []     [] []     []            | 32
-     libidn             |                       []        []            |  6
-     lifelines          |                                               |  4
-     lilypond           |                                               |  1
-     lingoteach         |                       []                      |  6
-     lynx               |             [] []     []                      | 15
-     m4                 |                       []        []            | 17
-     mailutils          |                []                             |  7
-     make               |             []                  []            | 18
-     man-db             |                                               |  5
-     minicom            |                                               | 11
-     mysecretdiary      |             []        []                      | 12
-     nano               |                       []              []      | 13
-     nano_1_0           |             [] []     []                      | 18
-     opcodes            |             []        []                      |  9
-     parted             |             [] []               []            | 18
-     psmisc             |                       []                      |  7
-     ptx                |             []                  []            | 23
-     pwdutils           |                                               |  1
-     python             |                                               |  0
-     radius             |                []                             |  6
-     recode             |             []        []                      | 22
-     rpm                |             [] []                             | 11
-     screem             |                                               |  1
-     scrollkeeper       |             [] []                     []      | 24
-     sed                |             []        []              []      | 21
-     sh-utils           |             []                                | 15
-     shared-mime-info   |                []               []    []      | 21
-     sharutils          |             []        []              []      | 20
-     silky              |                                               |  3
-     skencil            |                                               |  6
-     sketch             |                                               |  6
-     solfege            |                                               |  4
-     soundtracker       |             []                                |  8
-     sp                 |             []                                |  3
-     stardict           |                []     []        []    []      | 10
-     tar                |             [] []     []              []      | 15
-     texinfo            |             []                  []            | 14
-     textutils          |             []                  []    []      | 17
-     tin                |                                               |  1
-     tp-robot           |                       []        []    []      |  8
-     tuxpaint           |             []        [] []     []            | 34
-     unicode-han-tra... |                                               |  0
-     unicode-transla... |                                               |  2
-     util-linux         |             [] []     []                      | 18
-     vorbis-tools       |                []                             | 10
-     wastesedge         |                                               |  1
-     wdiff              |             []        []                      | 22
-     wget               |             []        []                      |  7
-     xchat              |                []     []        []    []      | 26
-     xkeyboard-config   |                       []                      |  2
-     xpad               |                       []                      |  5
-                        +-----------------------------------------------+
-       73 teams           ta tg th tk tr uk ven vi wa xh zh_CN zh_TW zu
-      149 domains          0  0  0  1 77 30  0  92 16  0  42    32    0  1746
-
-   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 May 2005 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://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.
-
-1.6 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 Library 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
address@hidden' to make the `.pot' files available to
-the translation teams.
-
diff --git a/ChangeLog b/ChangeLog
index 199ea8d..feb6297 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-03-06  James Youngman  <address@hidden>
+
+       Update to version 0.17 of GNU gettext.
+       * configure.ac: Update to version 0.17 of gettext.
+       * import-gnulib.sh (refresh_output_files): Run autopoint too.
+       * ABOUT-NLS: Remove the file from source control, since gettext
+       produces it.
+       * .gitignore: Ignore ABOUT-NLS.
+       * po/Makefile.in.in: Likewise.
+       * po/.gitignore: Ignore po/Makefile.in.in.
+
 2009-03-05  James Youngman  <address@hidden>
 
        Fix Savannah bug #25764, duplicate entry for proc in PRUNEFS.
diff --git a/configure.ac b/configure.ac
index 454ba7b..5580ddb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,7 +208,7 @@ jy_AC_ATTRIBUTE_NORETURN
 
 dnl internationalization macros
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.14.5)
+AM_GNU_GETTEXT_VERSION(0.17)
 
 dnl regextype.c and regexprops.c are designed to be usable outside findutils,
 dnl but findutils doesn't want to support all the regex types in gnulib,
diff --git a/import-gnulib.sh b/import-gnulib.sh
index 3543e37..e5550f1 100755
--- a/import-gnulib.sh
+++ b/import-gnulib.sh
@@ -203,6 +203,7 @@ EOF
 
 
 refresh_output_files() {
+    autopoint -f &&
     aclocal -I m4 -I gnulib/m4     &&
     autoheader                     &&
     autoconf                       &&
diff --git a/po/.gitignore b/po/.gitignore
index ce44cbb..1511725 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,6 +1,7 @@
 *.gmo
 Makefile
 Makefile.in
+Makefile.in.in
 POTFILES
 cat-id-tbl.c
 stamp-po
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
deleted file mode 100644
index 1f5cc28..0000000
--- a/po/Makefile.in.in
+++ /dev/null
@@ -1,384 +0,0 @@
-# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2005 by Ulrich Drepper <address@hidden>
-#
-# This file can be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU General Public
-# License but which still want to provide support for the GNU gettext
-# functionality.
-# Please note that the actual code of GNU gettext is covered by the GNU
-# General Public License and is *not* in the public domain.
-#
-# Origin: gettext-0.14.4
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-
-SHELL = /bin/sh
address@hidden@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = @datadir@
-localedir = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
-
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
-MSGMERGE_UPDATE = @MSGMERGE@ --update
-MSGINIT = msginit
-MSGCONV = msgconv
-MSGFILTER = msgfilter
-
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-UPDATEPOFILES = @UPDATEPOFILES@
-DUMMYPOFILES = @DUMMYPOFILES@
-DISTFILES.common = Makefile.in.in remove-potcdate.sin \
-$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) 
$(DISTFILES.common.extra3)
-DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
-$(POFILES) $(GMOFILES) \
-$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-
-# Makevars gets inserted here. (Don't remove this line!)
-
-.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
-
-.po.mo:
-       @echo "$(MSGFMT) -c -o $@ $<"; \
-       $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
-
-.po.gmo:
-       @lang=`echo $* | sed -e 's,.*/,,'`; \
-       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o 
$${lang}.gmo $${lang}.po"; \
-       cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o 
t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
-
-.sin.sed:
-       sed -e '/^#/d' $< > t-$@
-       mv t-$@ $@
-
-
-all: address@hidden@
-
-all-yes: stamp-po
-all-no:
-
-# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
-# 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).
-
-# 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
-       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; \
-       }
-
-# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
-# otherwise packages like GCC can not be built if only parts of the source
-# have been downloaded.
-
-# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
-# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
-       if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = 
'@'PACKAGE_BUGREPORT'@'; then \
-         msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
-       else \
-         msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
-       fi; \
-       $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
-         --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
-         --files-from=$(srcdir)/POTFILES.in \
-         --copyright-holder='$(COPYRIGHT_HOLDER)' \
-         --msgid-bugs-address="$$msgid_bugs_address"
-       test ! -f $(DOMAIN).po || { \
-         if test -f $(srcdir)/$(DOMAIN).pot; then \
-           sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > 
$(DOMAIN).1po && \
-           sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-           if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-             rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-           else \
-             rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-             mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-           fi; \
-         else \
-           mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-         fi; \
-       }
-
-# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
-# every "make" invocation, only create it when it is missing.
-# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
-$(srcdir)/$(DOMAIN).pot:
-       $(MAKE) $(DOMAIN).pot-update
-
-# 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): $(srcdir)/$(DOMAIN).pot
-       @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
-       if test -f "$(srcdir)/$${lang}.po"; then \
-         test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-         echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
-         cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
-       else \
-         $(MAKE) $${lang}.po-create; \
-       fi
-
-
-install: install-exec install-data
-install-exec:
-install-data: address@hidden@
-       if test "$(PACKAGE)" = "gettext-tools"; then \
-         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-         for file in $(DISTFILES.common) Makevars.template; do \
-           $(INSTALL_DATA) $(srcdir)/$$file \
-                           $(DESTDIR)$(gettextsrcdir)/$$file; \
-         done; \
-         for file in Makevars; do \
-           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-         done; \
-       else \
-         : ; \
-       fi
-install-data-no: all
-install-data-yes: all
-       $(mkinstalldirs) $(DESTDIR)$(datadir)
-       @catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-         dir=$(localedir)/$$lang/LC_MESSAGES; \
-         $(mkinstalldirs) $(DESTDIR)$$dir; \
-         if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; 
fi; \
-         $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
-         echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
-         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-           if test -n "$$lc"; then \
-             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 
2>/dev/null) | grep ' -> ' >/dev/null; then \
-               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d 
$$lc | sed -e 's/^.* -> //'`; \
-               mv $(DESTDIR)$(localedir)/$$lang/$$lc 
$(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-                for file in *; do \
-                  if test -f $$file; then \
-                    ln -s ../$$link/$$file 
$(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-                  fi; \
-                done); \
-               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-             else \
-               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-                 :; \
-               else \
-                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-               fi; \
-             fi; \
-             rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-             ln -s ../LC_MESSAGES/$(DOMAIN).mo 
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-             ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo 
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
-             cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo 
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-             echo "installing $$realcat link as 
$(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
-           fi; \
-         done; \
-       done
-
-install-strip: install
-
-installdirs: installdirs-exec installdirs-data
-installdirs-exec:
-installdirs-data: address@hidden@
-       if test "$(PACKAGE)" = "gettext-tools"; then \
-         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
-       else \
-         : ; \
-       fi
-installdirs-data-no:
-installdirs-data-yes:
-       $(mkinstalldirs) $(DESTDIR)$(datadir)
-       @catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-         dir=$(localedir)/$$lang/LC_MESSAGES; \
-         $(mkinstalldirs) $(DESTDIR)$$dir; \
-         for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
-           if test -n "$$lc"; then \
-             if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 
2>/dev/null) | grep ' -> ' >/dev/null; then \
-               link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d 
$$lc | sed -e 's/^.* -> //'`; \
-               mv $(DESTDIR)$(localedir)/$$lang/$$lc 
$(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-               mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-               (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
-                for file in *; do \
-                  if test -f $$file; then \
-                    ln -s ../$$link/$$file 
$(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
-                  fi; \
-                done); \
-               rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
-             else \
-               if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
-                 :; \
-               else \
-                 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
-                 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
-               fi; \
-             fi; \
-           fi; \
-         done; \
-       done
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall: uninstall-exec uninstall-data
-uninstall-exec:
-uninstall-data: address@hidden@
-       if test "$(PACKAGE)" = "gettext-tools"; then \
-         for file in $(DISTFILES.common) Makevars.template; do \
-           rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
-         done; \
-       else \
-         : ; \
-       fi
-uninstall-data-no:
-uninstall-data-yes:
-       catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
-         lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
-         for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
-           rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
-         done; \
-       done
-
-check: all
-
-info dvi ps pdf html tags TAGS ctags CTAGS ID:
-
-mostlyclean:
-       rm -f remove-potcdate.sed
-       rm -f 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
-
-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)
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir:
-       $(MAKE) update-po
-       @$(MAKE) dist2
-# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
-       dists="$(DISTFILES)"; \
-       if test "$(PACKAGE)" = "gettext-tools"; then \
-         dists="$$dists Makevars.template"; \
-       fi; \
-       if test -f $(srcdir)/$(DOMAIN).pot; then \
-         dists="$$dists $(DOMAIN).pot stamp-po"; \
-       fi; \
-       if test -f $(srcdir)/ChangeLog; then \
-         dists="$$dists ChangeLog"; \
-       fi; \
-       for i in 0 1 2 3 4 5 6 7 8 9; do \
-         if test -f $(srcdir)/ChangeLog.$$i; then \
-           dists="$$dists ChangeLog.$$i"; \
-         fi; \
-       done; \
-       if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
-       for file in $$dists; do \
-         if test -f $$file; then \
-           cp -p $$file $(distdir) || exit 1; \
-         else \
-           cp -p $(srcdir)/$$file $(distdir) || exit 1; \
-         fi; \
-       done
-
-update-po: Makefile
-       $(MAKE) $(DOMAIN).pot-update
-       test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
-       $(MAKE) update-gmo
-
-# General rule for creating PO files.
-
-.nop.po-create:
-       @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
-       echo "File $$lang.po does not exist. If you are a translator, you can 
create it through 'msginit'." 1>&2; \
-       exit 1
-
-# General rule for updating PO files.
-
-.nop.po-update:
-       @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
-       if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; 
fi; \
-       tmpdir=`pwd`; \
-       echo "$$lang:"; \
-       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
-       echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
-       cd $(srcdir); \
-       if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \
-         if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
-           rm -f $$tmpdir/$$lang.new.po; \
-         else \
-           if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
-             :; \
-           else \
-             echo "msgmerge for $$lang.po failed: cannot move 
$$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
-             exit 1; \
-           fi; \
-         fi; \
-       else \
-         echo "msgmerge for $$lang.po failed!" 1>&2; \
-         rm -f $$tmpdir/$$lang.new.po; \
-       fi
-
-$(DUMMYPOFILES):
-
-update-gmo: Makefile $(GMOFILES)
-       @:
-
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status 
@POMAKEFILEDEPS@
-       cd $(top_builddir) \
-         && CONFIG_FILES=$(subdir)/address@hidden CONFIG_HEADERS= \
-              $(SHELL) ./config.status
-
-force:
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
-- 
1.5.6.5





reply via email to

[Prev in Thread] Current Thread [Next in Thread]