gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r4708 - in GNUnet: . contrib m4 po


From: gnunet
Subject: [GNUnet-SVN] r4708 - in GNUnet: . contrib m4 po
Date: Sun, 25 Mar 2007 14:37:22 -0600 (MDT)

Author: grothoff
Date: 2007-03-25 14:37:21 -0600 (Sun, 25 Mar 2007)
New Revision: 4708

Modified:
   GNUnet/ABOUT-NLS
   GNUnet/ChangeLog
   GNUnet/INSTALL
   GNUnet/UPDATING
   GNUnet/configure.ac
   GNUnet/contrib/doxygen
   GNUnet/ltmain.sh
   GNUnet/m4/Makefile.in
   GNUnet/m4/codeset.m4
   GNUnet/m4/gettext.m4
   GNUnet/m4/glibc21.m4
   GNUnet/m4/iconv.m4
   GNUnet/m4/intdiv0.m4
   GNUnet/m4/intmax.m4
   GNUnet/m4/inttypes-pri.m4
   GNUnet/m4/inttypes_h.m4
   GNUnet/m4/lcmessage.m4
   GNUnet/m4/lib-ld.m4
   GNUnet/m4/lib-link.m4
   GNUnet/m4/lib-prefix.m4
   GNUnet/m4/longdouble.m4
   GNUnet/m4/longlong.m4
   GNUnet/m4/nls.m4
   GNUnet/m4/po.m4
   GNUnet/m4/printf-posix.m4
   GNUnet/m4/progtest.m4
   GNUnet/m4/size_max.m4
   GNUnet/m4/stdint_h.m4
   GNUnet/m4/uintmax_t.m4
   GNUnet/m4/ulonglong.m4
   GNUnet/m4/wchar_t.m4
   GNUnet/m4/wint_t.m4
   GNUnet/m4/xsize.m4
   GNUnet/po/GNUnet.pot
   GNUnet/po/Makefile.in.in
   GNUnet/po/de.po
   GNUnet/po/es.po
   GNUnet/po/rw.po
   GNUnet/po/sv.po
   GNUnet/po/vi.po
Log:
release bump

Modified: GNUnet/ABOUT-NLS
===================================================================
--- GNUnet/ABOUT-NLS    2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/ABOUT-NLS    2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,11 +1,10 @@
-1 Notes on the Free Translation Project
-***************************************
+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.
+together, so that 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,
@@ -16,15 +15,15 @@
    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.
+work at translations should 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
-==============================
+Quick configuration advice
+==========================
 
 If you want to exploit the full power of internationalization, you
 should configure it using
@@ -46,8 +45,8 @@
 you have installed a recent copy of the GNU gettext package with the
 included `libintl'.
 
-1.2 INSTALL Matters
-===================
+INSTALL Matters
+===============
 
 Some packages are "localizable" when properly installed; the programs
 they contain can be made to speak your own native language.  Most such
@@ -56,27 +55,27 @@
 
    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:
+provides the GNU `gettext' functions.  If not, the GNU `gettext' own
+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
+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
+will decide to use this.  This might be not what is 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
 
@@ -87,7 +86,7 @@
 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
+   Internationalized packages have usually 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
@@ -96,8 +95,8 @@
 `LINGUAS' should then contain a space separated list of two-letter
 codes, stating which languages are allowed.
 
-1.3 Using This Package
-======================
+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
@@ -118,8 +117,8 @@
 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''.
+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
@@ -132,21 +131,14 @@
 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
-=====================
+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
@@ -172,898 +164,522 @@
 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.
+the terminology in use.  Proven linguistic skill are praised more than
+programming skill, here.
 
-1.5 Available Packages
-======================
+Available Packages
+==================
 
 Languages are not equally supported in all packages.  The following
-matrix shows the current state of internationalization, as of October
-2006.  The matrix shows, in regard of each package, for which languages
+matrix shows the current state of internationalization, as of December
+2003.  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 eo
-                        +----------------------------------------------------+
-     GNUnet             |                                  []                |
-     a2ps               |             []                [] [] []     []      |
-     aegis              |                                  ()                |
-     ant-phone          |                                  ()                |
-     anubis             |                                  []                |
-     ap-utils           |                                                    |
-     aspell             |                      [] []    [] []        []      |
-     bash               |                      []          []             [] |
-     batchelor          |                                  []                |
-     bfd                |                                                    |
-     bibshelf           |                                  []                |
-     binutils           |                               []                   |
-     bison              |                               [] []                |
-     bison-runtime      |                                                    |
-     bluez-pin          | []                      []       [] []          [] |
-     cflow              |                               []                   |
-     clisp              |                                  []    []          |
-     console-tools      |                         []       []                |
-     coreutils          |                []    []          []                |
-     cpio               |                                                    |
-     cpplib             |                      []       [] []                |
-     cryptonit          |                                  []                |
-     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   |                               [] ()                |
-     gnuedu             |                                                    |
-     gnulib             | []          [] []    []       [] []                |
-     gnunet-gtk         |                                                    |
-     gnutls             |                                                    |
-     gpe-aerial         |                         []       []                |
-     gpe-beam           |                         []       []                |
-     gpe-calendar       |                                                    |
-     gpe-clock          |                         []       []                |
-     gpe-conf           |                         []       []                |
-     gpe-contacts       |                                                    |
-     gpe-edit           |                         []                         |
-     gpe-filemanager    |                                                    |
-     gpe-go             |                         []                         |
-     gpe-login          |                         []       []                |
-     gpe-ownerinfo      |                         []       []                |
-     gpe-package        |                                                    |
-     gpe-sketchbook     |                         []       []                |
-     gpe-su             |                         []       []                |
-     gpe-taskmanager    |                         []       []                |
-     gpe-timesheet      |                         []                         |
-     gpe-today          |                         []       []                |
-     gpe-todo           |                                                    |
-     gphoto2            |                         []    [] []        []      |
-     gprof              |                               [] []                |
-     gpsdrive           |                                  ()    ()          |
-     gramadoir          | []                               []                |
-     grep               | []          [] []    []          [] []             |
-     gretl              |                                                    |
-     gsasl              |                                                    |
-     gss                |                                                    |
-     gst-plugins        | []                   [] []    []                   |
-     gst-plugins-base   |                []    []       []                   |
-     gst-plugins-good   | []       []    []    [] []    []           []      |
-     gstreamer          | []             []    [] []    [] []        []      |
-     gtick              |                                  ()                |
-     gtkam              |                         []    [] []                |
-     gtkorphan          |                []                []                |
-     gtkspell           |             []                   [] []          [] |
-     gutenprint         |                               []                   |
-     hello              |                []    []       [] []             [] |
-     id-utils           |                               [] []                |
-     impost             |                                                    |
-     indent             |                      []          []             [] |
-     iso_3166           |                                  []             [] |
-     iso_3166_2         |                                                    |
-     iso_4217           |                                  []                |
-     iso_639            |                                  []             [] |
-     jpilot             |                         []                         |
-     jtag               |                                                    |
-     jwhois             |                                                    |
-     kbd                |                         []    [] [] []             |
-     keytouch           |                                                    |
-     keytouch-editor    |                                                    |
-     keytouch-keyboa... |                                                    |
-     latrine            |                                  ()                |
-     ld                 |                               []                   |
-     leafpad            |                []    [] []       [] []             |
-     libc               |                      [] []    [] [] []             |
-     libexif            |                                  []                |
-     libextractor       |                                  []                |
-     libgpewidget       |                         []    [] []                |
-     libgpg-error       |                                  []                |
-     libgphoto2         |                               [] []                |
-     libgphoto2_port    |                               [] []                |
-     libgsasl           |                                                    |
-     libiconv           |                                  []             [] |
-     libidn             |                               []                [] |
-     lifelines          |                               [] ()                |
-     lilypond           |                                  []                |
-     lingoteach         |                                                    |
-     lynx               |                      [] []    [] []                |
-     m4                 |                         []    [] [] []             |
-     mailutils          |                      []                            |
-     make               |                               [] []                |
-     man-db             |                      [] ()    [] []                |
-     minicom            |                         []    [] []                |
-     mysecretdiary      |                               [] []                |
-     nano               |                []    []          []                |
-     nano_1_0           |                      [] ()    [] []                |
-     opcodes            |                                  []                |
-     parted             |                                                    |
-     pilot-qof          |                                            []      |
-     psmisc             |                []                                  |
-     pwdutils           |                                                    |
-     python             |                                                    |
-     qof                |                                                    |
-     radius             |                      []                            |
-     recode             |             []       []       [] [] []          [] |
-     rpm                |                         []    []                   |
-     screem             |                                                    |
-     scrollkeeper       |          [] []       [] [] [] [] []        []      |
-     sed                |                      []          []             [] |
-     sh-utils           |                               [] []                |
-     shared-mime-info   |                []       []                 []   [] |
-     sharutils          |                []    [] []    [] [] []             |
-     shishi             |                                                    |
-     silky              |                                                    |
-     skencil            |                               [] ()                |
-     sketch             |                               [] ()                |
-     solfege            |                                                    |
-     soundtracker       |                               [] []                |
-     sp                 |                                  []                |
-     stardict           |                         []                         |
-     system-tools-ba... |       []       [] [] [] []    [] [] []     []      |
-     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 eo
-                          10  0  1  2  9 22  1 42 41  2 60 95 16  1  17   16
+     Ready PO files       am az be bg ca cs da de el en en_GB eo es
+                        +-------------------------------------------+
+     a2ps               |       []          [] [] []                |
+     aegis              |                      ()                   |
+     ant-phone          |                      ()                   |
+     anubis             |                                           |
+     ap-utils           |                                           |
+     bash               |             []       []             [] [] |
+     batchelor          |                                           |
+     bfd                |                   []                   [] |
+     binutils           |                   []                   [] |
+     bison              |                   [] []                [] |
+     bluez-pin          |                []                   []    |
+     clisp              |                                           |
+     clisp              |                      []    []          [] |
+     coreutils          |             []    [] []                [] |
+     cpio               |                   [] []                [] |
+     darkstat           |          []       ()                   [] |
+     diffutils          |             [] [] [] [] []          [] [] |
+     e2fsprogs          |                []    []                   |
+     enscript           |             []    [] []        []         |
+     error              |             []    [] []        []      [] |
+     fetchmail          |             [] () [] [] []             [] |
+     fileutils          |                   [] []                [] |
+     findutils          |       []    []    [] [] []          [] [] |
+     flex               |             []    [] []                [] |
+     fslint             |                                           |
+     gas                |                                        [] |
+     gawk               |             []    [] []                [] |
+     gbiff              |                      []                   |
+     gcal               |             []                            |
+     gcc                |                   []                   [] |
+     gettext            |       []    []    [] []                [] |
+     gettext-examples   |             []       []                [] |
+     gettext-runtime    |       []    []    [] []                [] |
+     gettext-tools      |             []       []                [] |
+     gimp-print         |                [] [] []        []      [] |
+     gliv               |                                           |
+     glunarclock        |                   [] []                   |
+     gnubiff            |                      []                   |
+     gnucash            |                []    ()        []      [] |
+     gnucash-glossary   |                   [] ()                [] |
+     gnupg              |             [] ()    [] []          [] [] |
+     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              |                                        [] |
+     gtick              |                      ()                   |
+     hello              |             []    [] [] []          [] [] |
+     id-utils           |                   [] []                   |
+     indent             |             []       []             [] [] |
+     jpilot             |                [] []                   [] |
+     jtag               |                                           |
+     jwhois             |                                        [] |
+     kbd                |                [] [] [] []             [] |
+     latrine            |                      ()                   |
+     ld                 |                   []                   [] |
+     libc               |             [] [] [] [] []             [] |
+     libgpewidget       |                []    []                   |
+     libiconv           |             []    [] []             [] [] |
+     lifelines          |                   [] ()                   |
+     lilypond           |                      []                   |
+     lingoteach         |                                           |
+     lingoteach_lessons |                      ()                () |
+     lynx               |             [] [] [] []                   |
+     m4                 |                [] [] [] []                |
+     mailutils          |             []                         [] |
+     make               |                   [] []                [] |
+     man-db             |             [] () [] []                () |
+     minicom            |                []    []                [] |
+     mysecretdiary      |                   [] []                [] |
+     nano               |             [] () [] []                [] |
+     nano_1_0           |             [] () [] []                [] |
+     opcodes            |                                        [] |
+     parted             |             [] [] [] []                [] |
+     ptx                |             []    [] []             [] [] |
+     python             |                                           |
+     radius             |                                        [] |
+     recode             |       []    []    [] [] []          [] [] |
+     rpm                |                [] []                      |
+     screem             |                                           |
+     scrollkeeper       |       []    [] [] [] []                [] |
+     sed                |             []    [] []             [] [] |
+     sh-utils           |                   [] []                [] |
+     shared-mime-info   |                                           |
+     sharutils          |             [] [] [] [] []             [] |
+     silky              |                      ()                   |
+     skencil            |                   [] ()                [] |
+     sketch             |                   [] ()                [] |
+     soundtracker       |                   [] []                [] |
+     sp                 |                      []                   |
+     tar                |                [] [] []                [] |
+     texinfo            |                   [] []             []    |
+     textutils          |             []    [] []                [] |
+     tin                |                      ()        ()         |
+     tuxpaint           |             [] [] [] [] []     []      [] |
+     util-linux         |             [] [] [] []                [] |
+     vorbis-tools       |       []       [] []                   [] |
+     wastesedge         |                      ()                   |
+     wdiff              |             []    [] []                [] |
+     wget               |          [] []    [] [] []             [] |
+     xchat              |             []       [] []             [] |
+     xfree86_xkb_xml    |                []                         |
+     xpad               |                                        [] |
+                        +-------------------------------------------+
+                          am az be bg ca cs da de el en en_GB eo es
+                           0  0  8  3 37 38 56 73 15  1   5   12 64
+     
+                          et fa fi fr ga gl he hr hu id is it ja
+                        +----------------------------------------+
+     a2ps               | []    [] []                      ()    |
+     aegis              |                                        |
+     ant-phone          |                                        |
+     anubis             |          []                            |
+     ap-utils           |          []                            |
+     bash               |          []             []             |
+     batchelor          |             []                         |
+     bfd                |          []                            |
+     binutils           |          []                         [] |
+     bison              | []       []                []    []    |
+     bluez-pin          |       [] [] []          [] []          |
+     clisp              |                                        |
+     clisp              |          []                            |
+     coreutils          | []    [] [] []                   [] [] |
+     cpio               |          []    []       []             |
+     darkstat           |          () []          [] []          |
+     diffutils          |       [] []    [] []    [] []       [] |
+     e2fsprogs          |                                        |
+     enscript           |          []          []                |
+     error              |       [] [] []          []             |
+     fetchmail          |                                     [] |
+     fileutils          | []       [] []          []       [] [] |
+     findutils          | []    [] [] [] []    [] [] []    [] [] |
+     flex               |          [] []                         |
+     fslint             |                                        |
+     gas                |          []                            |
+     gawk               |          []       []                [] |
+     gbiff              |                                        |
+     gcal               |          []                            |
+     gcc                |          []                            |
+     gettext            |          []                         [] |
+     gettext-examples   |          []                         [] |
+     gettext-runtime    |       [] []                []       [] |
+     gettext-tools      |          []                         [] |
+     gimp-print         |          []                         [] |
+     gliv               |          ()                            |
+     glunarclock        |       []    [] []       []             |
+     gnubiff            |                                        |
+     gnucash            |          ()                      []    |
+     gnucash-glossary   |                                  []    |
+     gnupg              | []    [] []    []          []    [] [] |
+     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              |          []                            |
+     gtick              |       []    []                         |
+     hello              | [] [] [] [] [] [] [] [] [] []    [] [] |
+     id-utils           |          []             [] []    []    |
+     indent             | []    [] [] [] []       [] []    [] [] |
+     jpilot             |          []                         () |
+     jtag               |                                        |
+     jwhois             |          []             [] []    []    |
+     kbd                |          []                            |
+     latrine            |                                        |
+     ld                 |          []                            |
+     libc               |       [] []    []       []          [] |
+     libgpewidget       |          [] []          [] []          |
+     libiconv           | []    [] [] [] []    [] [] []    []    |
+     lifelines          |          ()                            |
+     lilypond           |          []                            |
+     lingoteach         |          []                []          |
+     lingoteach_lessons |                                        |
+     lynx               | []                      []       [] [] |
+     m4                 |          []    []          []       [] |
+     mailutils          |                                        |
+     make               |          []    [] [] []             [] |
+     man-db             |                                  () () |
+     minicom            |       [] []             []          [] |
+     mysecretdiary      |          []                []          |
+     nano               |          []    []          []    []    |
+     nano_1_0           |          []    []          []    []    |
+     opcodes            |          []                            |
+     parted             |          []    []                   [] |
+     ptx                | []    [] [] [] []       [] []          |
+     python             |                                        |
+     radius             |          []                            |
+     recode             |          []    [] []    [] []    []    |
+     rpm                |                                        |
+     screem             |                                        |
+     scrollkeeper       |                         []             |
+     sed                | []    [] [] [] []       [] []    [] [] |
+     sh-utils           | []    [] [] []          []       [] [] |
+     shared-mime-info   |                         []             |
+     sharutils          | []       []    []       []          [] |
+     silky              |       []                         ()    |
+     skencil            |          []                            |
+     sketch             |          []                            |
+     soundtracker       |          []    []    []          []    |
+     sp                 |          []                         () |
+     tar                | []    [] []    []    [] [] []    [] [] |
+     texinfo            |          []       [] []             [] |
+     textutils          |          [] [] []       []          [] |
+     tin                | []       ()                            |
+     tuxpaint           |       [] []       []    [] [] [] [] [] |
+     util-linux         | []    [] []             []       () [] |
+     vorbis-tools       |          []                            |
+     wastesedge         |          ()                            |
+     wdiff              | []       [] [] []       [] []          |
+     wget               | []    [] []    []    [] []          [] |
+     xchat              | []    [] []                            |
+     xfree86_xkb_xml    |                                        |
+     xpad               |             []                         |
+                        +----------------------------------------+
+                          et fa fi fr ga gl he hr hu id is it ja
+                          21  1 25 86 24 24  8 10 38 31  1 23 32
+     
+                          ko lg lt lv ms nb nl nn no pl pt pt_BR ro
+                        +-------------------------------------------+
+     a2ps               | ()          []    []    () ()     []   [] |
+     aegis              |                   ()                   () |
+     ant-phone          |                   []                   [] |
+     anubis             |             [] [] []       []          [] |
+     ap-utils           |                   []       ()          [] |
+     bash               |                                   []   [] |
+     batchelor          |                                        [] |
+     bfd                |                                        [] |
+     binutils           |                                           |
+     bison              |             []    []              []   [] |
+     bluez-pin          |                   []       []          [] |
+     clisp              |                                           |
+     clisp              |                   []                      |
+     coreutils          |                            []             |
+     cpio               | []                []       []     []   [] |
+     darkstat           |             []    []              []   [] |
+     diffutils          |             []             []     []   [] |
+     e2fsprogs          |                            []             |
+     enscript           |                   []              []   [] |
+     error              |                   []              []   [] |
+     fetchmail          |                   []       []     ()      |
+     fileutils          |                            []          [] |
+     findutils          | []                []       []     []   [] |
+     flex               | []                         []     []   [] |
+     fslint             |                   []                   [] |
+     gas                |                                           |
+     gawk               |                            []     []   [] |
+     gbiff              |                   []                   [] |
+     gcal               |                                           |
+     gcc                |                                           |
+     gettext            | []                         []          [] |
+     gettext-examples   |                            []          [] |
+     gettext-runtime    | []                         []          [] |
+     gettext-tools      | []                         []          [] |
+     gimp-print         |                   []                      |
+     gliv               |                   []              []   [] |
+     glunarclock        |             []    []                   [] |
+     gnubiff            |                                           |
+     gnucash            |                   []          []  ()      |
+     gnucash-glossary   |                   []          []          |
+     gnupg              |                                        [] |
+     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              |                                           |
+     gtick              |                   []                   [] |
+     hello              | []       [] [] [] [] [] [] []     []   [] |
+     id-utils           |                   []              []   [] |
+     indent             |                   []              []   [] |
+     jpilot             |                   ()    ()                |
+     jtag               |                                           |
+     jwhois             |                   []       []     []   [] |
+     kbd                |                   []       []          [] |
+     latrine            |                                        [] |
+     ld                 |                                           |
+     libc               | []             []       [] []     []      |
+     libgpewidget       |                   []          []       [] |
+     libiconv           |                   []       []     []   [] |
+     lifelines          |                                           |
+     lilypond           |                                           |
+     lingoteach         |                                           |
+     lingoteach_lessons |                                           |
+     lynx               |                   []              []      |
+     m4                 |                   []       []     []   [] |
+     mailutils          |                            []          [] |
+     make               | []                []       []     []      |
+     man-db             |                                        [] |
+     minicom            |                            []     []   [] |
+     mysecretdiary      |                   []              []   [] |
+     nano               |             []    []       []          [] |
+     nano_1_0           |             [] []    []    []          [] |
+     opcodes            |                   []                   [] |
+     parted             |                      []    [] []  []      |
+     ptx                |                [] []    [] [] []  []   [] |
+     python             |                                           |
+     radius             |                            []             |
+     recode             |                            []     []   [] |
+     rpm                | []                            []          |
+     screem             |                                           |
+     scrollkeeper       |                [] []       []          [] |
+     sed                |                            []     []   [] |
+     sh-utils           |                []                         |
+     shared-mime-info   |                   []                      |
+     sharutils          |                   []                      |
+     silky              |                                           |
+     skencil            |                               []  []      |
+     sketch             |                               []  []      |
+     soundtracker       |                                           |
+     sp                 |                                           |
+     tar                |             [] []       [] []     []   [] |
+     texinfo            |                []          []          [] |
+     textutils          | []             []                         |
+     tin                |                                           |
+     tuxpaint           | []    []    []    [] []    [] []  []   [] |
+     util-linux         |                   []              []      |
+     vorbis-tools       |                   []                   [] |
+     wastesedge         |                                           |
+     wdiff              |             []             []     []   [] |
+     wget               |                            []          [] |
+     xchat              |          []       []                      |
+     xfree86_xkb_xml    |                   []                      |
+     xpad               |                   []                   [] |
+                        +-------------------------------------------+
+                          ko lg lt lv ms nb nl nn no pl pt pt_BR ro
+                          12  0  1  2 12 10 60  4  4 38 25  35   76
+     
+                          ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
+                        +-------------------------------------------+
+     a2ps               | []    []    []    [] []                   | 16
+     aegis              | ()                                        |  0
+     ant-phone          |                                           |  2
+     anubis             | []                [] []                   |  9
+     ap-utils           |                      ()                   |  3
+     bash               | []                                        |  9
+     batchelor          |                                           |  2
+     bfd                |             []    []                      |  6
+     binutils           |             []    []           []         |  7
+     bison              | []          []    []                      | 14
+     bluez-pin          |    []       []             []             | 13
+     clisp              |                                           |  0
+     clisp              |                                           |  5
+     coreutils          | []    []    []    []                 []   | 16
+     cpio               | []          []                 []         | 14
+     darkstat           |    []    [] []                 ()    ()   | 12
+     diffutils          | []          []    []                 []   | 22
+     e2fsprogs          |             []    []                      |  5
+     enscript           | []          []    []                      | 12
+     error              |    []             []                 []   | 15
+     fetchmail          | [] []             []                      | 11
+     fileutils          | []    []    []    []           []    []   | 17
+     findutils          | [] [] [] [] []    []           []         | 29
+     flex               | []          []    []                      | 13
+     fslint             |                                           |  2
+     gas                |                   []                      |  3
+     gawk               |             []    []                      | 12
+     gbiff              |                                           |  3
+     gcal               |             []    []                      |  4
+     gcc                |                   []                      |  4
+     gettext            | [] [] []    []    []                 []   | 16
+     gettext-examples   |          [] []    []           []         | 11
+     gettext-runtime    | [] [] [] [] []    [] []        []    []   | 21
+     gettext-tools      |    [] [] [] []    []           []         | 14
+     gimp-print         |    []       []                            | 10
+     gliv               |                                           |  3
+     glunarclock        | []       [] []             []             | 13
+     gnubiff            |                                           |  1
+     gnucash            | [] []                                []   |  9
+     gnucash-glossary   |    []       []                       []   |  8
+     gnupg              |    []       []    []                 []   | 17
+     gpe-aerial         | []          []                            |  7
+     gpe-beam           | []          []                            |  8
+     gpe-calendar       | [] []       []             []        []   | 13
+     gpe-clock          | [] []    [] []                            | 10
+     gpe-conf           | [] []       []                            |  9
+     gpe-contacts       | [] []       []                       []   | 11
+     gpe-edit           | [] []    [] []             []        []   | 12
+     gpe-go             | []                                        |  5
+     gpe-login          | [] []    [] []             []        []   | 13
+     gpe-ownerinfo      | [] []    [] []                       []   | 13
+     gpe-sketchbook     | [] []       []                            |  9
+     gpe-su             | [] []    [] []                            | 10
+     gpe-taskmanager    | [] []    [] []                            | 10
+     gpe-timesheet      | [] []    [] []                       []   | 12
+     gpe-today          | [] []    [] []             []        []   | 13
+     gpe-todo           | [] []       []             []        []   | 12
+     gphoto2            |    []       []                 []         | 11
+     gprof              |             []    []                      |  9
+     gpsdrive           |    []       []                            |  4
+     gramadoir          |                                           |  3
+     grep               | []    [] []       [] []                   | 26
+     gretl              |                                           |  2
+     gtick              | []                                        |  5
+     hello              | [] []       []    [] []                   | 33
+     id-utils           | []          []    []                      | 12
+     indent             | [] []    [] []    []                      | 21
+     jpilot             |             []    []    []     []    []   |  9
+     jtag               |    []                                     |  1
+     jwhois             | ()          ()    []                 []   | 11
+     kbd                |             []    []                      | 11
+     latrine            |                                           |  1
+     ld                 |             []    []                      |  5
+     libc               |    []       []    []           []         | 20
+     libgpewidget       |    []    [] []             []             | 13
+     libiconv           | [] [] [] [] []    [] []    []  []         | 27
+     lifelines          |             []                            |  2
+     lilypond           |             []                            |  3
+     lingoteach         |                                           |  2
+     lingoteach_lessons |                                ()         |  0
+     lynx               | []          []    [] []                   | 14
+     m4                 | []          []                 []         | 15
+     mailutils          | []                                        |  5
+     make               | []          []    []           []         | 16
+     man-db             |             []                            |  5
+     minicom            | []                                        | 11
+     mysecretdiary      |             []    []                      | 10
+     nano               | []       [] []    [] []                   | 17
+     nano_1_0           | []          []    [] []                   | 17
+     opcodes            |             []    []                      |  6
+     parted             |             []    []           []         | 15
+     ptx                | []          []    []                      | 22
+     python             |                                           |  0
+     radius             | []                                        |  4
+     recode             | []    []    []    []                      | 20
+     rpm                | []          []    []                      |  7
+     screem             |             []                 []         |  2
+     scrollkeeper       | [] []    [] []                            | 15
+     sed                |    [] [] [] []    [] []                   | 23
+     sh-utils           | []    []          []                      | 14
+     shared-mime-info   |          [] []                            |  4
+     sharutils          | []       [] []    []                 []   | 17
+     silky              |    ()                                     |  2
+     skencil            |             []                            |  6
+     sketch             |             []                            |  6
+     soundtracker       |    []       []                            |  9
+     sp                 |                   []                      |  3
+     tar                |    [] []    []    []           []         | 24
+     texinfo            | []          []    []           []         | 14
+     textutils          | []    []    []    []                 []   | 16
+     tin                |                                           |  1
+     tuxpaint           |    []       []    []       []  []         | 29
+     util-linux         | []          []    []                      | 15
+     vorbis-tools       | []                                        |  8
+     wastesedge         |                                           |  0
+     wdiff              | [] []       []    []                      | 18
+     wget               | [] [] []    []    [] []        []    []   | 23
+     xchat              |    [] [] [] []                 []         | 14
+     xfree86_xkb_xml    | [] []    []       [] []        []         |  8
+     xpad               |                                           |  4
+                        +-------------------------------------------+
+       51 teams           ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
+      120 domains         59 42 16 25 81  0 56 12  1 10  21    22    1260
 
-                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
-                        +--------------------------------------------------+
-     GNUnet             |                                                  |
-     a2ps               |    []       [] []                             () |
-     aegis              |                                                  |
-     ant-phone          |                []                                |
-     anubis             |                []                                |
-     ap-utils           |             [] []                                |
-     aspell             |                []  []                         [] |
-     bash               | []             []                    []          |
-     batchelor          |                []  []                            |
-     bfd                | []                                               |
-     bibshelf           | []                 []                         [] |
-     binutils           | []          [] []                                |
-     bison              | [] []          []  []                   []    [] |
-     bison-runtime      |    []          []  []                   []    [] |
-     bluez-pin          |             [] []  []                [] []       |
-     cflow              |                    []                            |
-     clisp              | []             []                                |
-     console-tools      |                                                  |
-     coreutils          | [] []       [] []  []                []          |
-     cpio               | []             []  []                            |
-     cpplib             | []             []                                |
-     cryptonit          |                []                                |
-     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   | []                                            [] |
-     gnuedu             | []                                               |
-     gnulib             | [] [] []    [] []  [] []             []          |
-     gnunet-gtk         |                                                  |
-     gnutls             |                                                  |
-     gpe-aerial         | []             []                                |
-     gpe-beam           | []             []                                |
-     gpe-calendar       |                                                  |
-     gpe-clock          | []          [] []                    []          |
-     gpe-conf           |                []                                |
-     gpe-contacts       | []             []                                |
-     gpe-edit           | []             []                    [] []       |
-     gpe-filemanager    | []                                               |
-     gpe-go             | []             []                    []          |
-     gpe-login          | []             []                    []          |
-     gpe-ownerinfo      | []          [] []                    [] []       |
-     gpe-package        | []                                               |
-     gpe-sketchbook     | []             []                                |
-     gpe-su             | []          [] []                    []          |
-     gpe-taskmanager    | []          [] []                                |
-     gpe-timesheet      | []             []  []                   []       |
-     gpe-today          | []          [] []  []                            |
-     gpe-todo           | []                                               |
-     gphoto2            | []          [] []                    []       [] |
-     gprof              | []             []  []                   []       |
-     gpsdrive           | ()             ()                    []       () |
-     gramadoir          |                []  []                            |
-     grep               | [] [] []    [] []  [] []    []    [] [] []    [] |
-     gretl              | []             []                             [] |
-     gsasl              |                    []                   []       |
-     gss                |                []                                |
-     gst-plugins        |                []                    []       [] |
-     gst-plugins-base   |                                      []       [] |
-     gst-plugins-good   |       []                             []       [] |
-     gstreamer          |             []                       []       [] |
-     gtick              |                    []                            |
-     gtkam              | []             []                    []       [] |
-     gtkorphan          |                []                             [] |
-     gtkspell           | []    []    [] []  []                         [] |
-     gutenprint         |                                      []          |
-     hello              | [] [] [] [] [] []  [] []    []    [] [] []    [] |
-     id-utils           |                []  []                [] []    [] |
-     impost             |                []  []                            |
-     indent             | [] [] []    [] []  [] []             [] []    [] |
-     iso_3166           |             [] []                    []          |
-     iso_3166_2         |                []                                |
-     iso_4217           |    []       []        []             []          |
-     iso_639            |          [] [] []  []                []          |
-     jpilot             | []             []                                |
-     jtag               |                []                                |
-     jwhois             | []             []                    [] []    [] |
-     kbd                | []             []                                |
-     keytouch           |                    []                            |
-     keytouch-editor    |                    []                            |
-     keytouch-keyboa... |                    []                            |
-     latrine            |                []  []                         [] |
-     ld                 | []             []                                |
-     leafpad            | []             []  []       []       []       [] |
-     libc               | []          [] []     []             []          |
-     libexif            | []                                               |
-     libextractor       |                    []                            |
-     libgpewidget       | []             []  []                [] []       |
-     libgpg-error       |                                                  |
-     libgphoto2         | []             []                             [] |
-     libgphoto2_port    |                []                             [] |
-     libgsasl           |                []  []                            |
-     libiconv           |    []              []                            |
-     libidn             |                []                             [] |
-     lifelines          |                ()                                |
-     lilypond           |                []                                |
-     lingoteach         |                []                       []    [] |
-     lynx               |    []                                []       [] |
-     m4                 |                []  [] []                []       |
-     mailutils          | []             []                                |
-     make               | []          [] []  [] []    []    []    []       |
-     man-db             | ()                                               |
-     minicom            | []          [] []                    []          |
-     mysecretdiary      | []             []                       []       |
-     nano               | []    []       []  []                []       [] |
-     nano_1_0           | []             []     []                []    [] |
-     opcodes            | []          [] []  []                            |
-     parted             | []             []                       []    [] |
-     pilot-qof          |                                                  |
-     psmisc             |       []                             []       [] |
-     pwdutils           |                                                  |
-     python             |                                                  |
-     qof                |                                         []       |
-     radius             | []             []                                |
-     recode             | []             []  [] []    []       [] []    [] |
-     rpm                |                []                       []       |
-     screem             |                                                  |
-     scrollkeeper       | []          []                       []          |
-     sed                | [] []          []  []                []          |
-     sh-utils           | [] []       [] []  []                []       [] |
-     shared-mime-info   | []    []    [] []                    []       [] |
-     sharutils          | [] []       [] []  [] []             []       [] |
-     shishi             |                                                  |
-     silky              |                []                                |
-     skencil            | []             []                                |
-     sketch             | []             []                                |
-     solfege            |                                               [] |
-     soundtracker       | []             []                             [] |
-     sp                 |                []                                |
-     stardict           |                                      []          |
-     system-tools-ba... | []    []    [] []                 [] [] []    [] |
-     tar                | [] []       [] []  []                []       [] |
-     texinfo            |                []           []                   |
-     textutils          | []             []  [] []             []          |
-     tin                |    []          ()                                |
-     tp-robot           |             [] []  []                []          |
-     tuxpaint           |                    []                []          |
-     unicode-han-tra... |                                                  |
-     unicode-transla... |                []  []                            |
-     util-linux         | [] []       [] []                    [] []    [] |
-     vorbis-tools       | []             []                                |
-     wastesedge         |                ()                                |
-     wdiff              | [] []          []  [] []             [] []    [] |
-     wget               |    []       [] []  []             [] [] []    [] |
-     xchat              | []    []    [] []        []    []    []       [] |
-     xkeyboard-config   |             [] []                    []       [] |
-     xpad               | []                 []                []          |
-                        +--------------------------------------------------+
-                          es et eu fa fi fr  ga gl gu he hi hr hu id is it
-                          88 22 14  2 40 115 61 14  1  8  1  6 59 31  0 52
-
-                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
-                        +-------------------------------------------------+
-     GNUnet             |                                                 |
-     a2ps               |    ()                      []          []    () |
-     aegis              |                                        ()       |
-     ant-phone          |                                        []       |
-     anubis             |                            []    []    []       |
-     ap-utils           |                            []                   |
-     aspell             |                         []             []       |
-     bash               |                                        []       |
-     batchelor          |                            []          []       |
-     bfd                |                                                 |
-     bibshelf           |                            []                   |
-     binutils           |                                                 |
-     bison              |                            []    []    []       |
-     bison-runtime      |                            []    []    []       |
-     bluez-pin          |       []                   []          []       |
-     cflow              |                                                 |
-     clisp              |                                        []       |
-     console-tools      |                                                 |
-     coreutils          |                                        []       |
-     cpio               |                                                 |
-     cpplib             |                                        []       |
-     cryptonit          |                                        []       |
-     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   |                                        []       |
-     gnuedu             |                                                 |
-     gnulib             | [] []                      []          []       |
-     gnunet-gtk         |                                                 |
-     gnutls             |                                                 |
-     gpe-aerial         |                                        []       |
-     gpe-beam           |                                        []       |
-     gpe-calendar       | []                                              |
-     gpe-clock          | [] []                                  []       |
-     gpe-conf           |    []                                  []       |
-     gpe-contacts       |    []                                           |
-     gpe-edit           | [] []                                  []       |
-     gpe-filemanager    | [] []                                           |
-     gpe-go             | [] []                                  []       |
-     gpe-login          | [] []                                  []       |
-     gpe-ownerinfo      | []                                     []       |
-     gpe-package        | [] []                                           |
-     gpe-sketchbook     |    []                                  []       |
-     gpe-su             | [] []                                  []       |
-     gpe-taskmanager    | [] [] []                               []       |
-     gpe-timesheet      |                                        []       |
-     gpe-today          | []                                     []       |
-     gpe-todo           | []                                              |
-     gphoto2            | []                                     []       |
-     gprof              |                                                 |
-     gpsdrive           | ()                                     ()    () |
-     gramadoir          |                                        ()       |
-     grep               | []       []                      []    []       |
-     gretl              |                                                 |
-     gsasl              |                                        []       |
-     gss                |                                                 |
-     gst-plugins        |                                        []       |
-     gst-plugins-base   |                                                 |
-     gst-plugins-good   |                                        []       |
-     gstreamer          |                                        []       |
-     gtick              |                                                 |
-     gtkam              | []                                              |
-     gtkorphan          |                                        []       |
-     gtkspell           |                         []             []       |
-     gutenprint         |                                                 |
-     hello              | [] []                      []    []    [] []    |
-     id-utils           |                                        []       |
-     impost             |                                                 |
-     indent             | []                                     []       |
-     iso_3166           |                                        []       |
-     iso_3166_2         |                                        []       |
-     iso_4217           | []                      []             []       |
-     iso_639            | []                                     []       |
-     jpilot             | ()                                     ()    () |
-     jtag               |                                                 |
-     jwhois             |                                        []       |
-     kbd                |                                        []       |
-     keytouch           |                                        []       |
-     keytouch-editor    |                                                 |
-     keytouch-keyboa... |                                                 |
-     latrine            |                                        []       |
-     ld                 |                                                 |
-     leafpad            | []             []                               |
-     libc               | [] []                            []    []    [] |
-     libexif            |                                                 |
-     libextractor       |                                                 |
-     libgpewidget       |                                        []       |
-     libgpg-error       |                                                 |
-     libgphoto2         | []                                              |
-     libgphoto2_port    | []                                              |
-     libgsasl           |                                        []       |
-     libiconv           |                                                 |
-     libidn             | []                                     []       |
-     lifelines          |                                        []       |
-     lilypond           |                                                 |
-     lingoteach         |                                        []       |
-     lynx               | []                                     []       |
-     m4                 | []                                     []       |
-     mailutils          |                                                 |
-     make               | [] []                                  []       |
-     man-db             | ()                                              |
-     minicom            | []                                              |
-     mysecretdiary      |                                        []       |
-     nano               |                            []    []    []       |
-     nano_1_0           |                            []    []       []    |
-     opcodes            |                                        []       |
-     parted             | []                                     []       |
-     pilot-qof          |                                                 |
-     psmisc             | []                               []    []       |
-     pwdutils           |                                                 |
-     python             |                                                 |
-     qof                |                                                 |
-     radius             |                                                 |
-     recode             |                                        []       |
-     rpm                | [] []                                           |
-     screem             | []                                              |
-     scrollkeeper       |                                  [] [] [] []    |
-     sed                | []                                     []       |
-     sh-utils           | []                               []             |
-     shared-mime-info   |    []          []                []    [] []    |
-     sharutils          | []                                     []       |
-     shishi             |                                                 |
-     silky              |                                        []       |
-     skencil            |                                                 |
-     sketch             |                                                 |
-     solfege            |                                                 |
-     soundtracker       |                                                 |
-     sp                 | ()                                              |
-     stardict           |                      []                []       |
-     system-tools-ba... | [] []          []                      []       |
-     tar                | []       []                            []       |
-     texinfo            | []                               []    []       |
-     textutils          | [] []                            []             |
-     tin                |                                                 |
-     tp-robot           |                                        []       |
-     tuxpaint           |                                           []    |
-     unicode-han-tra... |                                                 |
-     unicode-transla... |                                                 |
-     util-linux         | []                                     []       |
-     vorbis-tools       |                                        []       |
-     wastesedge         |                                        []       |
-     wdiff              |                            []    []             |
-     wget               | []                                     []       |
-     xchat              | [] []                []                []       |
-     xkeyboard-config   |                                        []       |
-     xpad               |    []                      []          []       |
-                        +-------------------------------------------------+
-                          ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no
-                          52 24  2  2  1  3  0  2  3 21  0 15  1 97  5  1
-
-                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
-                        
+------------------------------------------------------+
-     GNUnet             |                                                      
|
-     a2ps               |           ()     []      [] []       []    [] []     
|
-     aegis              |                          () ()                       
|
-     ant-phone          |                          []                   []     
|
-     anubis             |           []             [] []                       
|
-     ap-utils           |           ()                                         
|
-     aspell             |                          [] []                       
|
-     bash               |                  []      [] []                       
|
-     batchelor          |                          []                   []     
|
-     bfd                |                                                      
|
-     bibshelf           |                                               []     
|
-     binutils           |                             []                []     
|
-     bison              |           []     []      [] []                []     
|
-     bison-runtime      |           []             []          []       []     
|
-     bluez-pin          |           []     []   [] [] []    [] []    [] []     
|
-     cflow              |           []                                         
|
-     clisp              |                             []                       
|
-     console-tools      |                             []                       
|
-     coreutils          |           []                []       []       []     
|
-     cpio               |           []                []                []     
|
-     cpplib             |                                               []     
|
-     cryptonit          |                  []                           []     
|
-     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   |              []                   []          []     
|
-     gnuedu             |                                                      
|
-     gnulib             |           []             [] []       []       []     
|
-     gnunet-gtk         |                                               []     
|
-     gnutls             |           []                                  []     
|
-     gpe-aerial         |              []  []      [] []       []    [] []     
|
-     gpe-beam           |              []  []      [] []       []    [] []     
|
-     gpe-calendar       |                             []                       
|
-     gpe-clock          |              []  []      [] []    [] []    [] []     
|
-     gpe-conf           |              []  []      [] []    [] []       []     
|
-     gpe-contacts       |                          [] []       []    [] []     
|
-     gpe-edit           |              []  []      [] []    [] []    [] []     
|
-     gpe-filemanager    |                                      []       []     
|
-     gpe-go             |                  []      [] []       []    [] []     
|
-     gpe-login          |              []  []      [] []    [] []    [] []     
|
-     gpe-ownerinfo      |              []  []      [] []    [] []    [] []     
|
-     gpe-package        |                                      []       []     
|
-     gpe-sketchbook     |              []  []      [] []    [] []    [] []     
|
-     gpe-su             |              []  []      [] []    [] []    [] []     
|
-     gpe-taskmanager    |              []  []      [] []    [] []    [] []     
|
-     gpe-timesheet      |              []  []      [] []    [] []    [] []     
|
-     gpe-today          |              []  []      [] []    [] []    [] []     
|
-     gpe-todo           |                             []       []    [] []     
|
-     gphoto2            |           []             []       []       [] []     
|
-     gprof              |                  []      []                   []     
|
-     gpsdrive           |        []                []                   []     
|
-     gramadoir          |                                   []          []     
|
-     grep               |           [] []  []      [] []       []    [] []     
|
-     gretl              |           []                                         
|
-     gsasl              |           []                               [] []     
|
-     gss                |           []             []                   []     
|
-     gst-plugins        |     []                                  [] [] []     
|
-     gst-plugins-base   |                                               []     
|
-     gst-plugins-good   |     []                                  [] [] []     
|
-     gstreamer          |                                         [] [] []     
|
-     gtick              |                             []                       
|
-     gtkam              |           []     []         []                []     
|
-     gtkorphan          |                                               []     
|
-     gtkspell           |                  []   [] [] []    [] []    [] []     
|
-     gutenprint         |                                               []     
|
-     hello              |           []     []      [] []    [] []    [] []     
|
-     id-utils           |                  []      [] []                []     
|
-     impost             |                                               []     
|
-     indent             |                  []      [] []    []       [] []     
|
-     iso_3166           |              []                []    [] [] [] []     
|
-     iso_3166_2         |                                                      
|
-     iso_4217           |                                []    []    [] []     
|
-     iso_639            |                                []    []    [] []     
|
-     jpilot             |                                                      
|
-     jtag               |                                   []                 
|
-     jwhois             |           []     []      []                   []     
|
-     kbd                |           []             []                   []     
|
-     keytouch           |                                               []     
|
-     keytouch-editor    |                                               []     
|
-     keytouch-keyboa... |                                               []     
|
-     latrine            |                          []                   []     
|
-     ld                 |                                               []     
|
-     leafpad            |           [] []             []    []          []  [] 
|
-     libc               |           []     []         []    []          []     
|
-     libexif            |           []                                         
|
-     libextractor       |                          []                   []     
|
-     libgpewidget       |              []  []      []       [] []    [] []     
|
-     libgpg-error       |           []             []                          
|
-     libgphoto2         |           []                                         
|
-     libgphoto2_port    |           []                []                []     
|
-     libgsasl           |           []             []                [] []     
|
-     libiconv           |                                      []    []        
|
-     libidn             |           []                               [] ()     
|
-     lifelines          |           []                                  []     
|
-     lilypond           |                                                      
|
-     lingoteach         |                  []                                  
|
-     lynx               |                  []         []                []     
|
-     m4                 |           []     []      [] []                []     
|
-     mailutils          |           []             [] []                []     
|
-     make               |           []     []         []                []     
|
-     man-db             |                          []                   []     
|
-     minicom            |           []     []      [] []                []     
|
-     mysecretdiary      |                  []      [] []                []     
|
-     nano               |                  []      []                   []     
|
-     nano_1_0           |           []             [] []                []     
|
-     opcodes            |                          []                   []     
|
-     parted             |           []                                         
|
-     pilot-qof          |                                               []     
|
-     psmisc             |           []                                  []     
|
-     pwdutils           |           []                                  []     
|
-     python             |                                                      
|
-     qof                |                  []                           []     
|
-     radius             |           []                []                       
|
-     recode             |           [] []  []      [] []       []       []     
|
-     rpm                |           [] []             []                []     
|
-     screem             |                                                      
|
-     scrollkeeper       |           []             [] []    []    [] [] []     
|
-     sed                |           [] []  []      [] []    [] []    [] []     
|
-     sh-utils           |                             []       []    []        
|
-     shared-mime-info   |              []  []                     [] [] []     
|
-     sharutils          |           []                []             [] []     
|
-     shishi             |           []                                         
|
-     silky              |                                   []                 
|
-     skencil            |              []  []                           []     
|
-     sketch             |              []  []                           []     
|
-     solfege            |                                               []     
|
-     soundtracker       |                                   []          []     
|
-     sp                 |                                                      
|
-     stardict           |                             []    []          []     
|
-     system-tools-ba... |        [] [] []  []      []             [] [] []  [] 
|
-     tar                |           []             [] []       []       []     
|
-     texinfo            |           []             [] []                []     
|
-     textutils          |                             []       []       []     
|
-     tin                |                             ()                       
|
-     tp-robot           |                             []                       
|
-     tuxpaint           |              []                      [] [] [] []     
|
-     unicode-han-tra... |                                                      
|
-     unicode-transla... |                                                      
|
-     util-linux         |                  []         []       []       []     
|
-     vorbis-tools       |                          [] []                       
|
-     wastesedge         |                                                      
|
-     wdiff              |           []     []      [] []    []          []     
|
-     wget               |              []             []    []          []     
|
-     xchat              |        []                   []    [] [] [] [] []     
|
-     xkeyboard-config   |                                      []       []     
|
-     xpad               |                                   [] []       []     
|
-                        
+------------------------------------------------------+
-                          nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv  ta
-                           0   2  3 58 30  54    5 73 72  4 40 46 11 50 128  2
-
-                          tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
-                        +---------------------------------------------------+
-     GNUnet             |                    []                             |  
2
-     a2ps               |          [] []     []                             | 
19
-     aegis              |                                                   |  0
-     ant-phone          |          []        []                             |  
6
-     anubis             |          [] []     []                             | 
11
-     ap-utils           |             ()     []                             |  
4
-     aspell             |             []     []  []                         | 
15
-     bash               |                    []                             | 
11
-     batchelor          |          []        []                             |  
9
-     bfd                |                                                   |  
1
-     bibshelf           |                    []                             |  
7
-     binutils           |          []        []                     []      |  
9
-     bison              |          []        []                     []      | 
19
-     bison-runtime      |                    []         []          []      | 
15
-     bluez-pin          |          [] []     []  []     []          []      | 
28
-     cflow              |             []     []                             |  
5
-     clisp              |                                                   |  
6
-     console-tools      |          []        []                             |  
5
-     coreutils          |          []        []                             | 
16
-     cpio               |          [] []     []                             |  
9
-     cpplib             |          []        []         []          []      | 
11
-     cryptonit          |                                                   |  
5
-     darkstat           |                    []         ()          ()      | 
15
-     dialog             |          [] []     []         []          []      | 
30
-     diffutils          |          []        []         []          []      | 
28
-     doodle             |                    []                             |  
6
-     e2fsprogs          |          []        []                             | 
10
-     enscript           |          [] []     []                             | 
16
-     error              |          []        []         []          []      | 
18
-     fetchmail          |          []        []                             | 
12
-     fileutils          |          []                   []          []      | 
18
-     findutils          |          []        []                     []      | 
17
-     flex               |          []        []                             | 
15
-     fslint             |                    []                             |  
9
-     gas                |          []                                       |  
3
-     gawk               |          []        []                             | 
15
-     gbiff              |                    []                             |  
5
-     gcal               |          []                                       |  
5
-     gcc                |          []                   []          []      |  
6
-     gettext-examples   |          [] []     []         []    []    []      | 
27
-     gettext-runtime    |          [] []     []         []    []    []      | 
28
-     gettext-tools      |          [] []     []         []          []      | 
19
-     gimp-print         |             []     []                             | 
12
-     gip                |                    []                     []      | 
12
-     gliv               |          []        []                             |  
8
-     glunarclock        |                    []  []                 []      | 
15
-     gmult              |          []        []         []          []      | 
15
-     gnubiff            |                    []                             |  
1
-     gnucash            |          ()                                       |  
2
-     gnucash-glossary   |                    []                     []      |  
9
-     gnuedu             |                    []                             |  
2
-     gnulib             |          [] []     []         []          []      | 
28
-     gnunet-gtk         |                                                   |  
1
-     gnutls             |                                                   |  
2
-     gpe-aerial         |                    []         []                  | 
14
-     gpe-beam           |                    []         []                  | 
14
-     gpe-calendar       |                    []                             |  
3
-     gpe-clock          |          []        []  []     []                  | 
21
-     gpe-conf           |                    []         []                  | 
14
-     gpe-contacts       |                    []         []                  | 
10
-     gpe-edit           |          []        []  []                 []      | 
20
-     gpe-filemanager    |                    []                             |  
6
-     gpe-go             |          []        []                             | 
15
-     gpe-login          |          []        []  []     []          []      | 
21
-     gpe-ownerinfo      |          []        []         []          []      | 
21
-     gpe-package        |                    []                             |  
6
-     gpe-sketchbook     |          []        []                             | 
16
-     gpe-su             |          []        []         []                  | 
20
-     gpe-taskmanager    |          []        []         []                  | 
20
-     gpe-timesheet      |          []        []         []          []      | 
18
-     gpe-today          |          []        []  []     []          []      | 
21
-     gpe-todo           |                    []                             |  
7
-     gphoto2            |             []     []         []          []      | 
20
-     gprof              |          []        []                             | 
11
-     gpsdrive           |                                                   |  
4
-     gramadoir          |                    []                             |  
7
-     grep               |          [] []     []                     []      | 
34
-     gretl              |                                                   |  
4
-     gsasl              |                    []         []                  |  
8
-     gss                |                    []                             |  
5
-     gst-plugins        |             []     []                     []      | 
15
-     gst-plugins-base   |             []     []         []                  |  
9
-     gst-plugins-good   |             []     []         []    []    []      | 
20
-     gstreamer          |          [] []     []                             | 
17
-     gtick              |                    []                             |  
3
-     gtkam              |                    []                             | 
13
-     gtkorphan          |                    []                             |  
7
-     gtkspell           |             []     []  []     []    []    []      | 
26
-     gutenprint         |                                                   |  
3
-     hello              |          [] []     []         []          []      | 
37
-     id-utils           |          []        []                             | 
14
-     impost             |                    []                             |  
4
-     indent             |          []        []         []          []      | 
25
-     iso_3166           |       [] []        []               []            | 
16
-     iso_3166_2         |                                                   |  
2
-     iso_4217           |          []        []                             | 
14
-     iso_639            |                    []                             | 
14
-     jpilot             |          [] []     []         []                  |  
7
-     jtag               |                    []                             |  
3
-     jwhois             |          []        []                     []      | 
13
-     kbd                |          []        []                             | 
12
-     keytouch           |                    []                             |  
4
-     keytouch-editor    |                                                   |  
2
-     keytouch-keyboa... |                    []                             |  
3
-     latrine            |          []        []                             |  
8
-     ld                 |          []        []         []          []      |  
8
-     leafpad            |          []        []         []          []      | 
23
-     libc               |          []                   []          []      | 
23
-     libexif            |                    []                             |  
4
-     libextractor       |                    []                             |  
5
-     libgpewidget       |                    []  []     []                  | 
19
-     libgpg-error       |                    []                             |  
4
-     libgphoto2         |             []                                    |  
8
-     libgphoto2_port    |             []     []                     []      | 
11
-     libgsasl           |                    []                             |  
8
-     libiconv           |                    []                             |  
7
-     libidn             |                    []         []                  | 
10
-     lifelines          |                                                   |  
4
-     lilypond           |                                                   |  
2
-     lingoteach         |                    []                             |  
6
-     lynx               |          [] []     []                             | 
15
-     m4                 |                    []         []          []      | 
18
-     mailutils          |             []                                    |  
8
-     make               |          []        []         []                  | 
20
-     man-db             |                    []                             |  
6
-     minicom            |                    []                             | 
14
-     mysecretdiary      |          []        []                             | 
12
-     nano               |                    []                     []      | 
17
-     nano_1_0           |          [] []     []                             | 
18
-     opcodes            |          []        []                             | 
10
-     parted             |          [] []                            []      | 
10
-     pilot-qof          |                    []                             |  
3
-     psmisc             |                    []                             | 
10
-     pwdutils           |                    []                             |  
3
-     python             |                                                   |  0
-     qof                |                    []                             |  
4
-     radius             |             []                                    |  
6
-     recode             |          []        []         []                  | 
25
-     rpm                |          [] []     []                     []      | 
14
-     screem             |                    []                             |  
2
-     scrollkeeper       |          [] []     []                     []      | 
26
-     sed                |          []        []                     []      | 
22
-     sh-utils           |          []                                       | 
15
-     shared-mime-info   |             []     []         []          []      | 
24
-     sharutils          |          []        []                     []      | 
23
-     shishi             |                                                   |  
1
-     silky              |                    []                             |  
4
-     skencil            |                    []                             |  
7
-     sketch             |                                                   |  
6
-     solfege            |                                                   |  
2
-     soundtracker       |          []        []                             |  
9
-     sp                 |          []                                       |  
3
-     stardict           |             []     []         []          []      | 
11
-     system-tools-ba... |    []    [] []     []     []  []          []      | 
37
-     tar                |          [] []     []                     []      | 
20
-     texinfo            |          []        []         []                  | 
15
-     textutils          |          []                   []          []      | 
17
-     tin                |                                                   |  
1
-     tp-robot           |                    []         []          []      | 
10
-     tuxpaint           |                    []  []                 []      | 
16
-     unicode-han-tra... |                                                   |  0
-     unicode-transla... |                                                   |  
2
-     util-linux         |          [] []     []                             | 
20
-     vorbis-tools       |             []     []                             | 
11
-     wastesedge         |                                                   |  
1
-     wdiff              |          []        []                             | 
22
-     wget               |          []        []                     []      | 
19
-     xchat              |             []     []         []          []      | 
29
-     xkeyboard-config   |          [] []     []                     []      | 
11
-     xpad               |                    []         []          []      | 
14
-                        +---------------------------------------------------+
-       77 teams           tg th tk tr uk ven vi  wa xh zh_CN zh_HK zh_TW zu
-      170 domains          0  1  1 77 39  0  136 10  1  48     5    54    0  
2028
-
    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
@@ -1075,13 +691,13 @@
 lag between the mere existence a PO file and its wide availability in a
 distribution.
 
-   If October 2006 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
+   If December 2003 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
-===================================
+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

Modified: GNUnet/ChangeLog
===================================================================
--- GNUnet/ChangeLog    2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/ChangeLog    2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,3 +1,6 @@
+Sun Mar 25 13:47:08 MDT 2007
+       Releasing GNUnet 0.7.1c.
+
 Wed Feb 28 15:29:05 MST 2007
        Enabled abortion of gnunet-peer-info with CTRL-C.
 
@@ -15,6 +18,9 @@
 Thu Feb 15 21:54:15 MST 2007
        Added support for IO load detection.
 
+Sun Feb 11 13:53:13 MST 2007
+       Releasing GNUnet 0.7.1b.
+
 Thu Feb  8 13:21:34 MST 2007
        Updating gettext to 0.16.1.
        Minor bugfix in build process (#1180, #1181).

Modified: GNUnet/INSTALL
===================================================================
--- GNUnet/INSTALL      2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/INSTALL      2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,16 +1,13 @@
-Installation Instructions
-*************************
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+Foundation, Inc.
 
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
-
-This file is free documentation; the Free Software Foundation gives
+   This file is free documentation; the Free Software Foundation gives
 unlimited permission to copy, distribute and modify it.
 
 Basic Installation
 ==================
 
-These are generic installation instructions.
+   These are generic installation instructions.
 
    The `configure' shell script attempts to guess correct values for
 various system-dependent variables used during compilation.  It uses
@@ -70,9 +67,9 @@
 Compilers and Options
 =====================
 
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about.  Run `./configure --help' for
-details on some of the pertinent environment variables.
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
 
    You can give `configure' initial values for configuration parameters
 by setting variables in the command line or in the environment.  Here
@@ -85,7 +82,7 @@
 Compiling For Multiple Architectures
 ====================================
 
-You can compile the package for more than one kind of computer at the
+   You can compile the package for more than one kind of computer at the
 same time, by placing the object files for each architecture in their
 own directory.  To do this, you must use a version of `make' that
 supports the `VPATH' variable, such as GNU `make'.  `cd' to the
@@ -102,19 +99,19 @@
 Installation Names
 ==================
 
-By default, `make install' installs the package's commands under
-`/usr/local/bin', include files under `/usr/local/include', etc.  You
-can specify an installation prefix other than `/usr/local' by giving
-`configure' the option `--prefix=PREFIX'.
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
 
    You can specify separate installation prefixes for
 architecture-specific files and architecture-independent files.  If you
-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
-PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files still use the regular prefix.
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
 
    In addition, if you use an unusual directory layout you can give
-options like `--bindir=DIR' to specify different values for particular
+options like `--bindir=PATH' to specify different values for particular
 kinds of files.  Run `configure --help' for a list of the directories
 you can set and what kinds of files go in them.
 
@@ -125,7 +122,7 @@
 Optional Features
 =================
 
-Some packages pay attention to `--enable-FEATURE' options to
+   Some packages pay attention to `--enable-FEATURE' options to
 `configure', where FEATURE indicates an optional part of the package.
 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
 is something like `gnu-as' or `x' (for the X Window System).  The
@@ -140,11 +137,11 @@
 Specifying the System Type
 ==========================
 
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
 `--build=TYPE' option.  TYPE can either be a short name for the system
 type, such as `sun4', or a canonical name which has the form:
 
@@ -159,7 +156,7 @@
 need to know the machine type.
 
    If you are _building_ compiler tools for cross-compiling, you should
-use the option `--target=TYPE' to select the type of system they will
+use the `--target=TYPE' option to select the type of system they will
 produce code for.
 
    If you want to _use_ a cross compiler, that generates code for a
@@ -170,9 +167,9 @@
 Sharing Defaults
 ================
 
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
 `configure' looks for `PREFIX/share/config.site' if it exists, then
 `PREFIX/etc/config.site' if it exists.  Or, you can set the
 `CONFIG_SITE' environment variable to the location of the site script.
@@ -181,7 +178,7 @@
 Defining Variables
 ==================
 
-Variables not defined in a site shell script can be set in the
+   Variables not defined in a site shell script can be set in the
 environment passed to `configure'.  However, some packages may run
 configure again during the build, and the customized values of these
 variables may be lost.  In order to avoid this problem, you should set
@@ -189,18 +186,14 @@
 
      ./configure CC=/usr/local2/bin/gcc
 
-causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).  Here is a another example:
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
 
-     /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
-
 `configure' Invocation
 ======================
 
-`configure' recognizes the following options to control how it operates.
+   `configure' recognizes the following options to control how it
+operates.
 
 `--help'
 `-h'

Modified: GNUnet/UPDATING
===================================================================
--- GNUnet/UPDATING     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/UPDATING     2007-03-25 20:37:21 UTC (rev 4708)
@@ -8,6 +8,21 @@
 data-preserving migration may not be possible.  For SVN versions,
 you're on your own.
 
+
+0.7.1b to 0.7.1c
+================
+
+Run
+
+$ gnunet-update
+
+This may take a bit longer than usual (depending on your
+database size, it may take a few hours!).  You may also
+want to manually re-run gnunet-insert (due to bugfixes
+related to content expiration and preview-generation
+bugs in an older libextractor version).
+
+
 0.7.1a to 0.7.1b
 ================
 

Modified: GNUnet/configure.ac
===================================================================
--- GNUnet/configure.ac 2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/configure.ac 2007-03-25 20:37:21 UTC (rev 4708)
@@ -21,8 +21,8 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([GNUnet], [0.7.1b],address@hidden)
-AM_INIT_AUTOMAKE([GNUnet], [0.7.1b])
+AC_INIT([GNUnet], [0.7.1c],address@hidden)
+AM_INIT_AUTOMAKE([GNUnet], [0.7.1c])
 AM_CONFIG_HEADER([config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])

Modified: GNUnet/contrib/doxygen
===================================================================
--- GNUnet/contrib/doxygen      2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/contrib/doxygen      2007-03-25 20:37:21 UTC (rev 4708)
@@ -23,7 +23,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.7.1b
+PROJECT_NUMBER         = 0.7.1c
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

Modified: GNUnet/ltmain.sh
===================================================================
--- GNUnet/ltmain.sh    2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/ltmain.sh    2007-03-25 20:37:21 UTC (rev 4708)
@@ -43,7 +43,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-4"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
 # See if we are running on zsh, and set the options which allow our
@@ -2082,7 +2082,10 @@
        case $pass in
        dlopen) libs="$dlfiles" ;;
        dlpreopen) libs="$dlprefiles" ;;
-       link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+       link)
+         libs="$deplibs %DEPLIBS%"
+         test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+         ;;
        esac
       fi
       if test "$pass" = dlopen; then
@@ -3201,6 +3204,11 @@
            age="$number_minor"
            revision="$number_minor"
            ;;
+         *)
+           $echo "$modename: unknown library version type \`$version_type'" 
1>&2
+           $echo "Fatal configuration error.  See the $PACKAGE docs for more 
information." 1>&2
+           exit $EXIT_FAILURE
+           ;;
          esac
          ;;
        no)

Modified: GNUnet/m4/Makefile.in
===================================================================
--- GNUnet/m4/Makefile.in       2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/Makefile.in       2007-03-25 20:37:21 UTC (rev 4708)
@@ -92,7 +92,6 @@
 F77 = @F77@
 FFLAGS = @FFLAGS@
 GMSGFMT = @GMSGFMT@
-GMSGFMT_015 = @GMSGFMT_015@
 GNUNETGTK_CFLAGS = @GNUNETGTK_CFLAGS@
 GNUNETGTK_LIBS = @GNUNETGTK_LIBS@
 GREP = @GREP@
@@ -123,7 +122,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 INTLLIBS = @INTLLIBS@
-INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBADD_DL = @LIBADD_DL@
 LIBCURL = @LIBCURL@
@@ -147,8 +145,8 @@
 MAKEINFO = @MAKEINFO@
 MINGW_FALSE = @MINGW_FALSE@
 MINGW_TRUE = @MINGW_TRUE@
+MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
-MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
 MYSQL_CPPFLAGS = @MYSQL_CPPFLAGS@
 MYSQL_LDFLAGS = @MYSQL_LDFLAGS@
@@ -176,7 +174,6 @@
 XFREEBSD_FALSE = @XFREEBSD_FALSE@
 XFREEBSD_TRUE = @XFREEBSD_TRUE@
 XGETTEXT = @XGETTEXT@
-XGETTEXT_015 = @XGETTEXT_015@
 XML2_CONFIG = @XML2_CONFIG@
 XML_CPPFLAGS = @XML_CPPFLAGS@
 XML_LIBS = @XML_LIBS@

Modified: GNUnet/m4/codeset.m4
===================================================================
--- GNUnet/m4/codeset.m4        2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/codeset.m4        2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# codeset.m4 serial 2 (gettext-0.16)
-dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# codeset.m4 serial AM1 (gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 
@@ -10,7 +12,7 @@
 [
   AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
     [AC_TRY_LINK([#include <langinfo.h>],
-      [char* cs = nl_langinfo(CODESET); return !cs;],
+      [char* cs = nl_langinfo(CODESET);],
       am_cv_langinfo_codeset=yes,
       am_cv_langinfo_codeset=no)
     ])

Modified: GNUnet/m4/gettext.m4
===================================================================
--- GNUnet/m4/gettext.m4        2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/gettext.m4        2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# gettext.m4 serial 59 (gettext-0.16.1)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# gettext.m4 serial 28 (gettext-0.13)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -15,7 +17,7 @@
 
 dnl Authors:
 dnl   Ulrich Drepper <address@hidden>, 1995-2000.
-dnl   Bruno Haible <address@hidden>, 2000-2006.
+dnl   Bruno Haible <address@hidden>, 2000-2003.
 
 dnl Macro to add for using GNU gettext.
 
@@ -63,13 +65,8 @@
   ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], 
[need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
 ])])])])
-  define([gt_included_intl],
-    ifelse([$1], [external],
-      ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
-      [yes]))
-  define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
-  gt_NEEDS_INIT
-  AM_GNU_GETTEXT_NEED([$2])
+  define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
+  define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
 
   AC_REQUIRE([AM_PO_SUBDIRS])dnl
   ifelse(gt_included_intl, yes, [
@@ -83,7 +80,7 @@
   dnl Sometimes libintl requires libiconv, so first search for libiconv.
   dnl Ideally we would do this search only after the
   dnl      if test "$USE_NLS" = "yes"; then
-  dnl        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != 
"yes"; }; then
+  dnl        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
   dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
   dnl the configure script would need to contain the same shell code
   dnl again, outside any 'if'. There are two solutions:
@@ -95,11 +92,8 @@
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
-  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
-  gt_INTL_MACOSX
-
   dnl Set USE_NLS.
-  AC_REQUIRE([AM_NLS])
+  AM_NLS
 
   ifelse(gt_included_intl, yes, [
     BUILD_INCLUDED_LIBINTL=no
@@ -109,15 +103,6 @@
   LTLIBINTL=
   POSUB=
 
-  dnl Add a version number to the cache macros.
-  case " $gt_needs " in
-    *" need-formatstring-macros "*) gt_api_version=3 ;;
-    *" need-ngettext "*) gt_api_version=2 ;;
-    *) gt_api_version=1 ;;
-  esac
-  gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
-  gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
   dnl If we use NLS figure out what method
   if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
@@ -136,35 +121,28 @@
         dnl to use.  If GNU gettext is available we use this.  Else we have
         dnl to fall back to GNU NLS library.
 
-        if test $gt_api_version -ge 3; then
-          gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+        dnl Add a version number to the cache macros.
+        define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3, 
ifelse([$2], [need-ngettext], 2, 1)))
+        define([gt_cv_func_gnugettext_libc], 
[gt_cv_func_gnugettext]gt_api_version[_libc])
+        define([gt_cv_func_gnugettext_libintl], 
[gt_cv_func_gnugettext]gt_api_version[_libintl])
+
+        AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+         [AC_TRY_LINK([#include <libintl.h>
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
 #endif
 changequote(,)dnl
 typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
 changequote([,])dnl
-'
-        else
-          gt_revision_test_code=
-        fi
-        if test $gt_api_version -ge 2; then
-          gt_expression_test_code=' + * ngettext ("", "", 0)'
-        else
-          gt_expression_test_code=
-        fi
-
-        AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
-         [AC_TRY_LINK([#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
+], [])[extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;],
             [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + 
*_nl_domain_bindings],
-            [eval "$gt_func_gnugettext_libc=yes"],
-            [eval "$gt_func_gnugettext_libc=no"])])
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext 
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
+            gt_cv_func_gnugettext_libc=yes,
+            gt_cv_func_gnugettext_libc=no)])
 
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != 
"yes"; }; then
+        if test "$gt_cv_func_gnugettext_libc" != "yes"; then
           dnl Sometimes libintl requires libiconv, so first search for 
libiconv.
           ifelse(gt_included_intl, yes, , [
             AM_ICONV_LINK
@@ -175,40 +153,52 @@
           dnl even if libiconv doesn't exist.
           AC_LIB_LINKFLAGS_BODY([intl])
           AC_CACHE_CHECK([for GNU gettext in libintl],
-            [$gt_func_gnugettext_libintl],
+            gt_cv_func_gnugettext_libintl,
            [gt_save_CPPFLAGS="$CPPFLAGS"
             CPPFLAGS="$CPPFLAGS $INCINTL"
             gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.
             AC_TRY_LINK([#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
+const char *_nl_expand_alias ();],
               [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + 
*_nl_expand_alias ("")],
-              [eval "$gt_func_gnugettext_libintl=yes"],
-              [eval "$gt_func_gnugettext_libintl=no"])
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext 
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
+              gt_cv_func_gnugettext_libintl=yes,
+              gt_cv_func_gnugettext_libintl=no)
             dnl Now see whether libintl exists and depends on libiconv.
-            if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" 
!= yes; } && test -n "$LIBICONV"; then
+            if test "$gt_cv_func_gnugettext_libintl" != yes && test -n 
"$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"
               AC_TRY_LINK([#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
+]ifelse([$2], [need-formatstring-macros],
+[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
+#endif
+changequote(,)dnl
+typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
+changequote([,])dnl
+], [])[extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
-const char *_nl_expand_alias (const char *);],
+const char *_nl_expand_alias ();],
                 [bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + 
*_nl_expand_alias ("")],
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext 
("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
                [LIBINTL="$LIBINTL $LIBICONV"
                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                eval "$gt_func_gnugettext_libintl=yes"
+                gt_cv_func_gnugettext_libintl=yes
                ])
             fi
             CPPFLAGS="$gt_save_CPPFLAGS"
@@ -219,8 +209,8 @@
         dnl use it.  But if this macro is used in GNU gettext, and GNU
         dnl gettext is already preinstalled in libintl, we update this
         dnl libintl.  (Cf. the install rule in intl/Makefile.in.)
-        if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; 
} \
-           || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" 
= "yes"; } \
+        if test "$gt_cv_func_gnugettext_libc" = "yes" \
+           || { test "$gt_cv_func_gnugettext_libintl" = "yes" \
                 && test "$PACKAGE" != gettext-runtime \
                 && test "$PACKAGE" != gettext-tools; }; then
           gt_use_preinstalled_gnugettext=yes
@@ -243,12 +233,11 @@
         dnl Mark actions used to generate GNU NLS library.
         BUILD_INCLUDED_LIBINTL=yes
         USE_INCLUDED_LIBINTL=yes
-        
LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a
 $LIBICONV $LIBTHREAD"
-        
LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a
 $LTLIBICONV $LTLIBTHREAD"
+        
LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a
 $LIBICONV"
+        
LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a
 $LTLIBICONV"
         LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
       fi
 
-      CATOBJEXT=
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
          || test "$nls_cv_use_gnu_gettext" = "yes"; then
         dnl Mark actions to use GNU gettext tools.
@@ -256,15 +245,6 @@
       fi
     ])
 
-    if test -n "$INTL_MACOSX_LIBS"; then
-      if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
-        LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
-        LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
-      fi
-    fi
-
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then
       AC_DEFINE(ENABLE_NLS, 1,
@@ -280,7 +260,7 @@
   if test "$USE_NLS" = "yes"; then
     AC_MSG_CHECKING([where the gettext function comes from])
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = 
"yes"; }; then
+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
         gt_source="external libintl"
       else
         gt_source="libc"
@@ -294,7 +274,7 @@
   if test "$USE_NLS" = "yes"; then
 
     if test "$gt_use_preinstalled_gnugettext" = "yes"; then
-      if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = 
"yes"; }; then
+      if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
         AC_MSG_CHECKING([how to link with libintl])
         AC_MSG_RESULT([$LIBINTL])
         AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
@@ -340,7 +320,6 @@
     AC_SUBST(GENCAT)
 
     dnl For backward compatibility. Some Makefiles may be using this.
-    INTLOBJS=
     if test "$USE_INCLUDED_LIBINTL" = yes; then
       INTLOBJS="\$(GETTOBJS)"
     fi
@@ -362,56 +341,145 @@
 ])
 
 
-dnl Checks for special options needed on MacOS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
+dnl Checks for all prerequisites of the intl subdirectory,
+dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
+dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+AC_DEFUN([AM_INTL_SUBDIR],
 [
-  dnl Check for API introduced in MacOS X 10.2.
-  AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
-    gt_cv_func_CFPreferencesCopyAppValue,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
-       [CFPreferencesCopyAppValue(NULL, NULL)],
-       [gt_cv_func_CFPreferencesCopyAppValue=yes],
-       [gt_cv_func_CFPreferencesCopyAppValue=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
-    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
-      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue 
in the CoreFoundation framework.])
+  AC_REQUIRE([AC_PROG_INSTALL])dnl
+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
+  AC_REQUIRE([AC_PROG_CC])dnl
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([AC_PROG_RANLIB])dnl
+  AC_REQUIRE([AC_ISC_POSIX])dnl
+  AC_REQUIRE([AC_HEADER_STDC])dnl
+  AC_REQUIRE([AC_C_CONST])dnl
+  AC_REQUIRE([bh_C_SIGNED])dnl
+  AC_REQUIRE([AC_C_INLINE])dnl
+  AC_REQUIRE([AC_TYPE_OFF_T])dnl
+  AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+  AC_REQUIRE([jm_AC_TYPE_LONG_LONG])dnl
+  AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+  AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+  AC_REQUIRE([gt_TYPE_WINT_T])dnl
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gt_TYPE_INTMAX_T])
+  AC_REQUIRE([gt_PRINTF_POSIX])
+  AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+  AC_REQUIRE([AC_FUNC_MMAP])dnl
+  AC_REQUIRE([jm_GLIBC21])dnl
+  AC_REQUIRE([gt_INTDIV0])dnl
+  AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
+  AC_REQUIRE([gt_INTTYPES_PRI])dnl
+  AC_REQUIRE([gl_XSIZE])dnl
+
+  AC_CHECK_TYPE([ptrdiff_t], ,
+    [AC_DEFINE([ptrdiff_t], [long],
+       [Define as the type of the result of subtracting two pointers, if the 
system doesn't define it.])
+    ])
+  AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
+stdlib.h string.h unistd.h sys/param.h])
+  AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
+mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
+strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
+__fsetlocking])
+
+  dnl Use the _snprintf function only if it is declared (because on NetBSD it
+  dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+  dnl Use the *_unlocked functions only if they are declared.
+  dnl (because some of them were defined without being declared in Solaris
+  dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+  dnl on Solaris 2.5.1 to run on Solaris 2.6).
+  dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+  case $gt_cv_func_printf_posix in
+    *yes) HAVE_POSIX_PRINTF=1 ;;
+    *) HAVE_POSIX_PRINTF=0 ;;
+  esac
+  AC_SUBST([HAVE_POSIX_PRINTF])
+  if test "$ac_cv_func_asprintf" = yes; then
+    HAVE_ASPRINTF=1
+  else
+    HAVE_ASPRINTF=0
   fi
-  dnl Check for API introduced in MacOS X 10.3.
-  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
-    [gt_save_LIBS="$LIBS"
-     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
-     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], 
[CFLocaleCopyCurrent();],
-       [gt_cv_func_CFLocaleCopyCurrent=yes],
-       [gt_cv_func_CFLocaleCopyCurrent=no])
-     LIBS="$gt_save_LIBS"])
-  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
-    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
-      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the 
CoreFoundation framework.])
+  AC_SUBST([HAVE_ASPRINTF])
+  if test "$ac_cv_func_snprintf" = yes; then
+    HAVE_SNPRINTF=1
+  else
+    HAVE_SNPRINTF=0
   fi
-  INTL_MACOSX_LIBS=
-  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test 
$gt_cv_func_CFLocaleCopyCurrent = yes; then
-    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
+  AC_SUBST([HAVE_SNPRINTF])
+  if test "$ac_cv_func_wprintf" = yes; then
+    HAVE_WPRINTF=1
+  else
+    HAVE_WPRINTF=0
   fi
-  AC_SUBST([INTL_MACOSX_LIBS])
-])
+  AC_SUBST([HAVE_WPRINTF])
 
+  AM_ICONV
+  AM_LANGINFO_CODESET
+  if test $ac_cv_header_locale_h = yes; then
+    AM_LC_MESSAGES
+  fi
 
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
-  m4_divert_text([DEFAULTS], [gt_needs=])
-  m4_define([gt_NEEDS_INIT], [])
+  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+  dnl because plural.y uses bison specific features. It requires at least
+  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+  dnl compile.
+  dnl bison is only needed for the maintainer (who touches plural.y). But in
+  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+  dnl the rule in general Makefile. Now, some people carelessly touch the
+  dnl files or have a broken "make" program, hence the plural.c rule will
+  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+  dnl present or too old.
+  AC_CHECK_PROGS([INTLBISON], [bison])
+  if test -z "$INTLBISON"; then
+    ac_verc_fail=yes
+  else
+    dnl Found it, now check the version.
+    AC_MSG_CHECKING([version of bison])
+changequote(<<,>>)dnl
+    ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* 
\([0-9]*\.[0-9.]*\).*$/\1/p'`
+    case $ac_prog_version in
+      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+      1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+changequote([,])dnl
+         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+    esac
+    AC_MSG_RESULT([$ac_prog_version])
+  fi
+  if test $ac_verc_fail = yes; then
+    INTLBISON=:
+  fi
 ])
 
 
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
+dnl Check whether a function is declared.
+AC_DEFUN([gt_CHECK_DECL],
 [
-  m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
+  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+    [AC_TRY_COMPILE([$2], [
+#ifndef $1
+  char *p = (char *) $1;
+#endif
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+  if test $ac_cv_have_decl_$1 = yes; then
+    gt_value=1
+  else
+    gt_value=0
+  fi
+  AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
 ])
 
 

Modified: GNUnet/m4/glibc21.m4
===================================================================
--- GNUnet/m4/glibc21.m4        2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/glibc21.m4        2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,13 +1,15 @@
-# glibc21.m4 serial 3
-dnl Copyright (C) 2000-2002, 2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40)
+dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 # Test for the GNU C Library, version 2.1 or newer.
 # From Bruno Haible.
 
-AC_DEFUN([gl_GLIBC21],
+AC_DEFUN([jm_GLIBC21],
   [
     AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
       ac_cv_gnu_library_2_1,

Modified: GNUnet/m4/iconv.m4
===================================================================
--- GNUnet/m4/iconv.m4  2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/iconv.m4  2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
 # iconv.m4 serial AM4 (gettext-0.11.3)
 dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 

Modified: GNUnet/m4/intdiv0.m4
===================================================================
--- GNUnet/m4/intdiv0.m4        2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/intdiv0.m4        2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
 # intdiv0.m4 serial 1 (gettext-0.11.3)
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 

Modified: GNUnet/m4/intmax.m4
===================================================================
--- GNUnet/m4/intmax.m4 2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/intmax.m4 2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# intmax.m4 serial 3 (gettext-0.16)
-dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# intmax.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 dnl Test whether the system has the 'intmax_t' type, but don't attempt to
@@ -10,11 +12,11 @@
 
 AC_DEFUN([gt_TYPE_INTMAX_T],
 [
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
   AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t,
     [AC_TRY_COMPILE([
-#include <stddef.h>
+#include <stddef.h> 
 #include <stdlib.h>
 #if HAVE_STDINT_H_WITH_UINTMAX
 #include <stdint.h>
@@ -22,10 +24,7 @@
 #if HAVE_INTTYPES_H_WITH_UINTMAX
 #include <inttypes.h>
 #endif
-],     [intmax_t x = -1;
-        return !x;],
-       gt_cv_c_intmax_t=yes,
-       gt_cv_c_intmax_t=no)])
+], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)])
   if test $gt_cv_c_intmax_t = yes; then
     AC_DEFINE(HAVE_INTMAX_T, 1,
       [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])

Modified: GNUnet/m4/inttypes-pri.m4
===================================================================
--- GNUnet/m4/inttypes-pri.m4   2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/inttypes-pri.m4   2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,20 +1,20 @@
-# inttypes-pri.m4 serial 4 (gettext-0.16)
-dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# inttypes-pri.m4 serial 1 (gettext-0.11.4)
+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 
-AC_PREREQ(2.52)
-
 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
 # macros to non-string values.  This is the case on AIX 4.3.3.
 
 AC_DEFUN([gt_INTTYPES_PRI],
 [
-  AC_CHECK_HEADERS([inttypes.h])
-  if test $ac_cv_header_inttypes_h = yes; then
+  AC_REQUIRE([gt_HEADER_INTTYPES_H])
+  if test $gt_cv_header_inttypes_h = yes; then
     AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
       gt_cv_inttypes_pri_broken,
       [
@@ -28,9 +28,5 @@
   if test "$gt_cv_inttypes_pri_broken" = yes; then
     AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
       [Define if <inttypes.h> exists and defines unusable PRI* macros.])
-    PRI_MACROS_BROKEN=1
-  else
-    PRI_MACROS_BROKEN=0
   fi
-  AC_SUBST([PRI_MACROS_BROKEN])
 ])

Modified: GNUnet/m4/inttypes_h.m4
===================================================================
--- GNUnet/m4/inttypes_h.m4     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/inttypes_h.m4     2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,24 +1,26 @@
-# inttypes_h.m4 serial 7
-dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# inttypes_h.m4 serial 5 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert.
 
 # Define HAVE_INTTYPES_H_WITH_UINTMAX if <inttypes.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
+AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
 [
-  AC_CACHE_CHECK([for inttypes.h], gl_cv_header_inttypes_h,
+  AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h,
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <inttypes.h>],
-    [uintmax_t i = (uintmax_t) -1; return !i;],
-    gl_cv_header_inttypes_h=yes,
-    gl_cv_header_inttypes_h=no)])
-  if test $gl_cv_header_inttypes_h = yes; then
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_inttypes_h=yes,
+    jm_ac_cv_header_inttypes_h=no)])
+  if test $jm_ac_cv_header_inttypes_h = yes; then
     AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1,
       [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>,
        and declares uintmax_t. ])

Modified: GNUnet/m4/lcmessage.m4
===================================================================
--- GNUnet/m4/lcmessage.m4      2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/lcmessage.m4      2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# lcmessage.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# lcmessage.m4 serial 3 (gettext-0.11.3)
+dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -18,12 +20,12 @@
 
 # Check whether LC_MESSAGES is available in <locale.h>.
 
-AC_DEFUN([gt_LC_MESSAGES],
+AC_DEFUN([AM_LC_MESSAGES],
 [
-  AC_CACHE_CHECK([for LC_MESSAGES], gt_cv_val_LC_MESSAGES,
+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
     [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       gt_cv_val_LC_MESSAGES=yes, gt_cv_val_LC_MESSAGES=no)])
-  if test $gt_cv_val_LC_MESSAGES = yes; then
+       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+  if test $am_cv_val_LC_MESSAGES = yes; then
     AC_DEFINE(HAVE_LC_MESSAGES, 1,
       [Define if your <locale.h> file defines LC_MESSAGES.])
   fi

Modified: GNUnet/m4/lib-ld.m4
===================================================================
--- GNUnet/m4/lib-ld.m4 2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/lib-ld.m4 2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
 # lib-ld.m4 serial 3 (gettext-0.13)
 dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl Subroutines of libtool.m4,
 dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision

Modified: GNUnet/m4/lib-link.m4
===================================================================
--- GNUnet/m4/lib-link.m4       2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/lib-link.m4       2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,13 +1,13 @@
-# lib-link.m4 serial 9 (gettext-0.16)
-dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# lib-link.m4 serial 4 (gettext-0.12)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 
-AC_PREREQ(2.50)
-
 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
 dnl the libraries corresponding to explicit and implicit dependencies.
 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
@@ -95,8 +95,6 @@
 dnl hardcode_direct, hardcode_minus_L.
 AC_DEFUN([AC_LIB_RPATH],
 [
-  dnl Tell automake >= 1.10 to complain if config.rpath is missing.
-  m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
   AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
@@ -126,7 +124,6 @@
 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
 [
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   dnl By default, look in $includedir and $libdir.
@@ -149,7 +146,7 @@
         ])
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
+        additional_libdir="$withval/lib"
       fi
     fi
 ])
@@ -198,16 +195,9 @@
           found_so=
           found_a=
           if test $use_additional = yes; then
-            if test -n "$shlibext" \
-               && { test -f "$additional_libdir/lib$name.$shlibext" \
-                    || { test "$shlibext" = dll \
-                         && test -f "$additional_libdir/lib$name.dll.a"; }; }; 
then
+            if test -n "$shlibext" && test -f 
"$additional_libdir/lib$name.$shlibext"; then
               found_dir="$additional_libdir"
-              if test -f "$additional_libdir/lib$name.$shlibext"; then
-                found_so="$additional_libdir/lib$name.$shlibext"
-              else
-                found_so="$additional_libdir/lib$name.dll.a"
-              fi
+              found_so="$additional_libdir/lib$name.$shlibext"
               if test -f "$additional_libdir/lib$name.la"; then
                 found_la="$additional_libdir/lib$name.la"
               fi
@@ -227,16 +217,9 @@
               case "$x" in
                 -L*)
                   dir=`echo "X$x" | sed -e 's/^X-L//'`
-                  if test -n "$shlibext" \
-                     && { test -f "$dir/lib$name.$shlibext" \
-                          || { test "$shlibext" = dll \
-                               && test -f "$dir/lib$name.dll.a"; }; }; then
+                  if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; 
then
                     found_dir="$dir"
-                    if test -f "$dir/lib$name.$shlibext"; then
-                      found_so="$dir/lib$name.$shlibext"
-                    else
-                      found_so="$dir/lib$name.dll.a"
-                    fi
+                    found_so="$dir/lib$name.$shlibext"
                     if test -f "$dir/lib$name.la"; then
                       found_la="$dir/lib$name.la"
                     fi
@@ -263,7 +246,7 @@
               dnl Linking with a shared library. We attempt to hardcode its
               dnl directory into the executable's runpath, unless it's the
               dnl standard /usr/lib.
-              if test "$enable_rpath" = no || test "X$found_dir" = 
"X/usr/$acl_libdirstem"; then
+              if test "$enable_rpath" = no || test "X$found_dir" = 
"X/usr/lib"; then
                 dnl No hardcoding is needed.
                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
               else
@@ -349,8 +332,8 @@
             dnl Assume the include files are nearby.
             additional_includedir=
             case "$found_dir" in
-              */$acl_libdirstem | */$acl_libdirstem/)
-                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 
"s,/$acl_libdirstem/"'*$,,'`
+              */lib | */lib/)
+                basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
                 additional_includedir="$basedir/include"
                 ;;
             esac
@@ -367,7 +350,7 @@
                 if test "X$additional_includedir" = "X/usr/local/include"; then
                   if test -n "$GCC"; then
                     case $host_os in
-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                      linux*) haveit=yes;;
                     esac
                   fi
                 fi
@@ -411,12 +394,12 @@
                     dnl   3. if it's already present in $LDFLAGS or the already
                     dnl      constructed $LIBNAME,
                     dnl   4. if it doesn't exist as a directory.
-                    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; 
then
+                    if test "X$additional_libdir" != "X/usr/lib"; then
                       haveit=
-                      if test "X$additional_libdir" = 
"X/usr/local/$acl_libdirstem"; then
+                      if test "X$additional_libdir" = "X/usr/local/lib"; then
                         if test -n "$GCC"; then
                           case $host_os in
-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+                            linux*) haveit=yes;;
                           esac
                         fi
                       fi
@@ -566,79 +549,3 @@
     fi
   done
 ])
-
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
-[
-  AC_REQUIRE([AC_LIB_RPATH])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
-  $1=
-  if test "$enable_rpath" != no; then
-    if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; 
then
-      dnl Use an explicit option to hardcode directories into the resulting
-      dnl binary.
-      rpathdirs=
-      next=
-      for opt in $2; do
-        if test -n "$next"; then
-          dir="$next"
-          dnl No need to hardcode the standard /usr/lib.
-          if test "X$dir" != "X/usr/$acl_libdirstem"; then
-            rpathdirs="$rpathdirs $dir"
-          fi
-          next=
-        else
-          case $opt in
-            -L) next=yes ;;
-            -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
-                 dnl No need to hardcode the standard /usr/lib.
-                 if test "X$dir" != "X/usr/$acl_libdirstem"; then
-                   rpathdirs="$rpathdirs $dir"
-                 fi
-                 next= ;;
-            *) next= ;;
-          esac
-        fi
-      done
-      if test "X$rpathdirs" != "X"; then
-        if test -n ""$3""; then
-          dnl libtool is used for linking. Use -R options.
-          for dir in $rpathdirs; do
-            $1="${$1}${$1:+ }-R$dir"
-          done
-        else
-          dnl The linker is used for linking directly.
-          if test -n "$hardcode_libdir_separator"; then
-            dnl Weird platform: only the last -rpath option counts, the user
-            dnl must pass all path elements in one option.
-            alldirs=
-            for dir in $rpathdirs; do
-              alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir"
-            done
-            acl_save_libdir="$libdir"
-            libdir="$alldirs"
-            eval flag=\"$hardcode_libdir_flag_spec\"
-            libdir="$acl_save_libdir"
-            $1="$flag"
-          else
-            dnl The -rpath options are cumulative.
-            for dir in $rpathdirs; do
-              acl_save_libdir="$libdir"
-              libdir="$dir"
-              eval flag=\"$hardcode_libdir_flag_spec\"
-              libdir="$acl_save_libdir"
-              $1="${$1}${$1:+ }$flag"
-            done
-          fi
-        fi
-      fi
-    fi
-  fi
-  AC_SUBST([$1])
-])

Modified: GNUnet/m4/lib-prefix.m4
===================================================================
--- GNUnet/m4/lib-prefix.m4     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/lib-prefix.m4     2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# lib-prefix.m4 serial 5 (gettext-0.15)
-dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# lib-prefix.m4 serial 3 (gettext-0.13)
+dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 
@@ -24,7 +26,6 @@
   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
@@ -46,7 +47,7 @@
         ])
       else
         additional_includedir="$withval/include"
-        additional_libdir="$withval/$acl_libdirstem"
+        additional_libdir="$withval/lib"
       fi
     fi
 ])
@@ -70,7 +71,7 @@
         if test "X$additional_includedir" = "X/usr/local/include"; then
           if test -n "$GCC"; then
             case $host_os in
-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+              linux*) haveit=yes;;
             esac
           fi
         fi
@@ -88,7 +89,7 @@
     dnl   2. if it's already present in $LDFLAGS,
     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
     dnl   4. if it doesn't exist as a directory.
-    if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
+    if test "X$additional_libdir" != "X/usr/lib"; then
       haveit=
       for x in $LDFLAGS; do
         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
@@ -98,7 +99,7 @@
         fi
       done
       if test -z "$haveit"; then
-        if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
+        if test "X$additional_libdir" = "X/usr/local/lib"; then
           if test -n "$GCC"; then
             case $host_os in
               linux*) haveit=yes;;
@@ -152,34 +153,3 @@
   exec_prefix="$acl_save_exec_prefix"
   prefix="$acl_save_prefix"
 ])
-
-dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
-dnl the basename of the libdir, either "lib" or "lib64".
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
-  dnl There is no formal standard regarding lib and lib64. The current
-  dnl practice is that on a system supporting 32-bit and 64-bit instruction
-  dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
-  dnl libraries go under $prefix/lib. We determine the compiler's default
-  dnl mode by looking at the compiler's library search path. If at least
-  dnl of its elements ends in /lib64 or points to a directory whose absolute
-  dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
-  dnl default, namely "lib".
-  acl_libdirstem=lib
-  searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 
's,^libraries: ,,p' | sed -e 's,^=,,'`
-  if test -n "$searchpath"; then
-    acl_save_IFS="${IFS=       }"; IFS=":"
-    for searchdir in $searchpath; do
-      if test -d "$searchdir"; then
-        case "$searchdir" in
-          */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
-          *) searchdir=`cd "$searchdir" && pwd`
-             case "$searchdir" in
-               */lib64 ) acl_libdirstem=lib64 ;;
-             esac ;;
-        esac
-      fi
-    done
-    IFS="$acl_save_IFS"
-  fi
-])

Modified: GNUnet/m4/longdouble.m4
===================================================================
--- GNUnet/m4/longdouble.m4     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/longdouble.m4     2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,16 +1,15 @@
-# longdouble.m4 serial 2 (gettext-0.15)
-dnl Copyright (C) 2002-2003, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# longdouble.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 dnl Test whether the compiler supports the 'long double' type.
 dnl Prerequisite: AC_PROG_CC
 
-dnl This file is only needed in autoconf <= 2.59.  Newer versions of autoconf
-dnl have a macro AC_TYPE_LONG_DOUBLE with identical semantics.
-
 AC_DEFUN([gt_TYPE_LONGDOUBLE],
 [
   AC_CACHE_CHECK([for long double], gt_cv_c_long_double,

Modified: GNUnet/m4/longlong.m4
===================================================================
--- GNUnet/m4/longlong.m4       2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/longlong.m4       2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,46 +1,23 @@
-# longlong.m4 serial 8
-dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# longlong.m4 serial 4
+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert.
 
-# Define HAVE_LONG_LONG_INT if 'long long int' works.
-# This fixes a bug in Autoconf 2.60, but can be removed once we
-# assume 2.61 everywhere.
+# Define HAVE_LONG_LONG if 'long long' works.
 
-# Note: If the type 'long long int' exists but is only 32 bits large
-# (as on some very old compilers), AC_TYPE_LONG_LONG_INT will not be
-# defined. In this case you can treat 'long long int' like 'long int'.
-
-AC_DEFUN([AC_TYPE_LONG_LONG_INT],
+AC_DEFUN([jm_AC_TYPE_LONG_LONG],
 [
-  AC_CACHE_CHECK([for long long int], [ac_cv_type_long_long_int],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-         [[long long int ll = 9223372036854775807ll;
-           long long int nll = -9223372036854775807LL;
-           typedef int a[((-9223372036854775807LL < 0
-                           && 0 < 9223372036854775807ll)
-                          ? 1 : -1)];
-           int i = 63;]],
-         [[long long int llmax = 9223372036854775807ll;
-           return ((ll << 63) | (ll >> 63) | (ll < i) | (ll > i)
-                   | (llmax / ll) | (llmax % ll));]])],
-       [ac_cv_type_long_long_int=yes],
-       [ac_cv_type_long_long_int=no])])
-  if test $ac_cv_type_long_long_int = yes; then
-    AC_DEFINE([HAVE_LONG_LONG_INT], 1,
-      [Define to 1 if the system has the type `long long int'.])
-  fi
-])
-
-# This macro is obsolescent and should go away soon.
-AC_DEFUN([gl_AC_TYPE_LONG_LONG],
-[
-  AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
-  ac_cv_type_long_long=$ac_cv_type_long_long_int
+  AC_CACHE_CHECK([for long long], ac_cv_type_long_long,
+  [AC_TRY_LINK([long long ll = 1LL; int i = 63;],
+    [long long llmax = (long long) -1;
+     return ll << i | ll >> i | llmax / ll | llmax % ll;],
+    ac_cv_type_long_long=yes,
+    ac_cv_type_long_long=no)])
   if test $ac_cv_type_long_long = yes; then
     AC_DEFINE(HAVE_LONG_LONG, 1,
       [Define if you have the 'long long' type.])

Modified: GNUnet/m4/nls.m4
===================================================================
--- GNUnet/m4/nls.m4    2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/nls.m4    2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# nls.m4 serial 1 (gettext-0.12)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -17,8 +19,6 @@
 dnl   Ulrich Drepper <address@hidden>, 1995-2000.
 dnl   Bruno Haible <address@hidden>, 2000-2003.
 
-AC_PREREQ(2.50)
-
 AC_DEFUN([AM_NLS],
 [
   AC_MSG_CHECKING([whether NLS is requested])
@@ -29,3 +29,21 @@
   AC_MSG_RESULT($USE_NLS)
   AC_SUBST(USE_NLS)
 ])
+
+AC_DEFUN([AM_MKINSTALLDIRS],
+[
+  dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+  dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
+  dnl Try to locate it.
+  MKINSTALLDIRS=
+  if test -n "$ac_aux_dir"; then
+    case "$ac_aux_dir" in
+      /*) MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ;;
+      *) MKINSTALLDIRS="\$(top_builddir)/$ac_aux_dir/mkinstalldirs" ;;
+    esac
+  fi
+  if test -z "$MKINSTALLDIRS"; then
+    MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+  fi
+  AC_SUBST(MKINSTALLDIRS)
+])

Modified: GNUnet/m4/po.m4
===================================================================
--- GNUnet/m4/po.m4     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/po.m4     2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# po.m4 serial 13 (gettext-0.15)
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# po.m4 serial 2 (gettext-0.13)
+dnl Copyright (C) 1995-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -17,14 +19,12 @@
 dnl   Ulrich Drepper <address@hidden>, 1995-2000.
 dnl   Bruno Haible <address@hidden>, 2000-2003.
 
-AC_PREREQ(2.50)
-
 dnl Checks for all prerequisites of the po subdirectory.
 AC_DEFUN([AM_PO_SUBDIRS],
 [
   AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   AC_REQUIRE([AC_PROG_INSTALL])dnl
-  AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+  AC_REQUIRE([AM_MKINSTALLDIRS])dnl
   AC_REQUIRE([AM_NLS])dnl
 
   dnl Perform the following tests also if --disable-nls has been given,
@@ -34,57 +34,59 @@
   dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
   dnl The second test excludes FreeBSD msgfmt.
   AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-    [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+    [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
      (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage 
>/dev/null; then exit 1; else exit 0; fi)],
     :)
   AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 
-  dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
-  case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
-    *) MSGFMT_015=$MSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([MSGFMT_015])
-changequote(,)dnl
-  case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
-    *) GMSGFMT_015=$GMSGFMT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([GMSGFMT_015])
-
   dnl Search for GNU xgettext 0.12 or newer in the PATH.
   dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
   dnl The second test excludes FreeBSD xgettext.
   AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= 
/dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
+    [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= 
/dev/null >/dev/null 2>&1 &&
      (if $ac_dir/$ac_word --omit-header --copyright-holder= 
--msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then 
exit 1; else exit 0; fi)],
     :)
   dnl Remove leftover from FreeBSD xgettext call.
   rm -f messages.po
 
-  dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
-  case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
-    '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
-    *) XGETTEXT_015=$XGETTEXT ;;
-  esac
-changequote([,])dnl
-  AC_SUBST([XGETTEXT_015])
-
   dnl Search for GNU msgmerge 0.11 or newer in the PATH.
   AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
-    [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 
2>&1], :)
+    [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
 
-  dnl Installation directories.
-  dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
-  dnl have to define it here, so that it can be used in po/Makefile.
-  test -n "$localedir" || localedir='${datadir}/locale'
-  AC_SUBST([localedir])
+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU msgfmt.
+  if test "$GMSGFMT" != ":"; then
+    dnl If it is no GNU msgfmt we define it as : so that the
+    dnl Makefiles still can work.
+    if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
+       (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage 
>/dev/null; then exit 1; else exit 0; fi); then
+      : ;
+    else
+      GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
+      AC_MSG_RESULT(
+        [found $GMSGFMT program is not GNU msgfmt; ignore it])
+      GMSGFMT=":"
+    fi
+  fi
 
-  AC_CONFIG_COMMANDS([po-directories], [[
+  dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
+  dnl Test whether we really found GNU xgettext.
+  if test "$XGETTEXT" != ":"; then
+    dnl If it is no GNU xgettext we define it as : so that the
+    dnl Makefiles still can work.
+    if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= 
/dev/null >/dev/null 2>&1 &&
+       (if $XGETTEXT --omit-header --copyright-holder= --msgid-bugs-address= 
/dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; 
fi); then
+      : ;
+    else
+      AC_MSG_RESULT(
+        [found xgettext program is not GNU xgettext; ignore it])
+      XGETTEXT=":"
+    fi
+    dnl Remove leftover from FreeBSD xgettext call.
+    rm -f messages.po
+  fi
+
+  AC_OUTPUT_COMMANDS([
     for ac_file in $CONFIG_FILES; do
       # Support "outfile[:infile[:infile...]]"
       case "$ac_file" in
@@ -104,9 +106,6 @@
           /*) top_srcdir="$ac_given_srcdir" ;;
           *)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
         esac
-        # Treat a directory as a PO directory if and only if it has a
-        # POTFILES.in file. This allows packages to have multiple PO
-        # directories under different names or in different locations.
         if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
           rm -f "$ac_dir/POTFILES"
           test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo 
"creating $ac_dir/POTFILES"
@@ -120,13 +119,12 @@
             if test -n "$OBSOLETE_ALL_LINGUAS"; then
               test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in 
configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is 
obsolete"
             fi
-            ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" 
"$ac_given_srcdir/$ac_dir/LINGUAS"`
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
+            ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
+            # Hide the ALL_LINGUAS assigment from automake.
             eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
             POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
           else
             # The set of available languages was given in configure.in.
-            # Hide the ALL_LINGUAS assigment from automake < 1.5.
             eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
           fi
           # Compute POFILES
@@ -196,10 +194,10 @@
         fi
         ;;
       esac
-    done]],
+    done],
    [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
     # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
-    # from automake < 1.5.
+    # from automake.
     eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
     # Capture the value of LINGUAS because we need it to compute CATALOGS.
     LINGUAS="${LINGUAS-%UNSET%}"
@@ -285,7 +283,7 @@
 changequote([,])dnl
 
   # Set POTFILES to the value of the Makefile variable POTFILES.
-  sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 
's/VARIABLE/POTFILES/g'`
+  sed_x_POTFILES="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 
's/VARIABLE/POTFILES/g'`"
   POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
   # Compute POTFILES_DEPS as
   #   $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
@@ -300,14 +298,14 @@
   fi
   if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
     # The LINGUAS file contains the set of available languages.
-    ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" 
"$ac_given_srcdir/$ac_dir/LINGUAS"`
+    ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
     POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
   else
     # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
-    sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 
's/VARIABLE/LINGUAS/g'`
+    sed_x_LINGUAS="`$gt_echo \"$sed_x_variable\" | sed -e '/^ *#/d' -e 
's/VARIABLE/LINGUAS/g'`"
     ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
   fi
-  # Hide the ALL_LINGUAS assigment from automake < 1.5.
+  # Hide the ALL_LINGUAS assigment from automake.
   eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
   # Compute POFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -325,8 +323,6 @@
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
   # Compute MSGFILES
   # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
-  # Compute RESOURCESDLLFILES
-  # as      $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob 
$(lang))/$(DOMAIN).resources.dll)
   case "$ac_given_srcdir" in
     .) srcdirpre= ;;
     *) srcdirpre='$(srcdir)/' ;;
@@ -339,7 +335,6 @@
   CLASSFILES=
   QMFILES=
   MSGFILES=
-  RESOURCESDLLFILES=
   for lang in $ALL_LINGUAS; do
     POFILES="$POFILES $srcdirpre$lang.po"
     UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
@@ -350,8 +345,6 @@
     QMFILES="$QMFILES $srcdirpre$lang.qm"
     frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
     MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
-    frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 
's/^uz-UZ$/uz-UZ-Latn/'`
-    RESOURCESDLLFILES="$RESOURCESDLLFILES 
$srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
   done
   # CATALOGS depends on both $ac_dir and the user's LINGUAS
   # environment variable.
@@ -383,7 +376,6 @@
   JAVACATALOGS=
   QTCATALOGS=
   TCLCATALOGS=
-  CSHARPCATALOGS=
   if test -n "$INST_LINGUAS"; then
     for lang in $INST_LINGUAS; do
       CATALOGS="$CATALOGS $lang.gmo"
@@ -391,12 +383,10 @@
       QTCATALOGS="$QTCATALOGS $lang.qm"
       frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
       TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 
's/^uz-UZ$/uz-UZ-Latn/'`
-      CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
     done
   fi
 
-  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e 
"s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e 
"s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e 
"s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e 
"s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e 
"s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e 
"s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e 
"s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" 
> "$ac_file.tmp"
+  sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e 
"s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e 
"s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e 
"s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e 
"s|@MSGFILES@|$MSGFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e 
"s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e 
"s|@TCLCATALOGS@|$TCLCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > 
"$ac_file.tmp"
   if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
     # Add dependencies that cannot be formulated as a simple suffix rule.
     for lang in $ALL_LINGUAS; do
@@ -408,17 +398,6 @@
 EOF
     done
   fi
-  if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
-    # Add dependencies that cannot be formulated as a simple suffix rule.
-    for lang in $ALL_LINGUAS; do
-      frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 
's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 
's/^uz-UZ$/uz-UZ-Latn/'`
-      cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-       @echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po 
-r \$(DOMAIN)"; \
-       \$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r 
"\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
-    done
-  fi
   if test -n "$POMAKEFILEDEPS"; then
     cat >> "$ac_file.tmp" <<EOF
 Makefile: $POMAKEFILEDEPS

Modified: GNUnet/m4/printf-posix.m4
===================================================================
--- GNUnet/m4/printf-posix.m4   2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/printf-posix.m4   2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
 # printf-posix.m4 serial 2 (gettext-0.13.1)
 dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 dnl Test whether the printf() function supports POSIX/XSI format strings with

Modified: GNUnet/m4/progtest.m4
===================================================================
--- GNUnet/m4/progtest.m4       2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/progtest.m4       2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# progtest.m4 serial 4 (gettext-0.14.2)
-dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# progtest.m4 serial 3 (gettext-0.12)
+dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 dnl
 dnl This file can can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public
@@ -16,8 +18,6 @@
 dnl Authors:
 dnl   Ulrich Drepper <address@hidden>, 1996.
 
-AC_PREREQ(2.50)
-
 # Search path for a program which passes the given test.
 
 dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
@@ -67,7 +67,6 @@
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
           if [$3]; then
             ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
             break 2

Modified: GNUnet/m4/size_max.m4
===================================================================
--- GNUnet/m4/size_max.m4       2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/size_max.m4       2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# size_max.m4 serial 5
-dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# size_max.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 
@@ -11,9 +13,8 @@
   AC_CHECK_HEADERS(stdint.h)
   dnl First test whether the system already has SIZE_MAX.
   AC_MSG_CHECKING([for SIZE_MAX])
-  AC_CACHE_VAL([gl_cv_size_max], [
-    gl_cv_size_max=
-    AC_EGREP_CPP([Found it], [
+  result=
+  AC_EGREP_CPP([Found it], [
 #include <limits.h>
 #if HAVE_STDINT_H
 #include <stdint.h>
@@ -21,42 +22,40 @@
 #ifdef SIZE_MAX
 Found it
 #endif
-], gl_cv_size_max=yes)
-    if test -z "$gl_cv_size_max"; then
-      dnl Define it ourselves. Here we assume that the type 'size_t' is not 
wider
-      dnl than the type 'unsigned long'. Try hard to find a definition that can
-      dnl be used in a preprocessor #if, i.e. doesn't contain a cast.
-      _AC_COMPUTE_INT([sizeof (size_t) * CHAR_BIT - 1], size_t_bits_minus_1,
-        [#include <stddef.h>
-#include <limits.h>], size_t_bits_minus_1=)
-      _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
-        [#include <stddef.h>], fits_in_uint=)
-      if test -n "$size_t_bits_minus_1" && test -n "$fits_in_uint"; then
-        if test $fits_in_uint = 1; then
-          dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
-          dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned 
long'.
-          AC_TRY_COMPILE([#include <stddef.h>
-            extern size_t foo;
-            extern unsigned long foo;
-            ], [], fits_in_uint=0)
-        fi
-        dnl We cannot use 'expr' to simplify this expression, because 'expr'
-        dnl works only with 'long' integers in the host environment, while we
-        dnl might be cross-compiling from a 32-bit platform to a 64-bit 
platform.
-        if test $fits_in_uint = 1; then
-          gl_cv_size_max="(((1U << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        else
-          gl_cv_size_max="(((1UL << $size_t_bits_minus_1) - 1) * 2 + 1)"
-        fi
+], result=yes)
+  if test -z "$result"; then
+    dnl Define it ourselves. Here we assume that the type 'size_t' is not wider
+    dnl than the type 'unsigned long'.
+    dnl The _AC_COMPUTE_INT macro works up to LONG_MAX, since it uses 'expr',
+    dnl which is guaranteed to work from LONG_MIN to LONG_MAX.
+    _AC_COMPUTE_INT([~(size_t)0 / 10], res_hi,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([~(size_t)0 % 10], res_lo,
+      [#include <stddef.h>], result=?)
+    _AC_COMPUTE_INT([sizeof (size_t) <= sizeof (unsigned int)], fits_in_uint,
+      [#include <stddef.h>], result=?)
+    if test "$fits_in_uint" = 1; then
+      dnl Even though SIZE_MAX fits in an unsigned int, it must be of type
+      dnl 'unsigned long' if the type 'size_t' is the same as 'unsigned long'.
+      AC_TRY_COMPILE([#include <stddef.h>
+        extern size_t foo;
+        extern unsigned long foo;
+        ], [], fits_in_uint=0)
+    fi
+    if test -z "$result"; then
+      if test "$fits_in_uint" = 1; then
+        result="$res_hi$res_lo"U
       else
-        dnl Shouldn't happen, but who knows...
-        gl_cv_size_max='((size_t)~(size_t)0)'
+        result="$res_hi$res_lo"UL
       fi
+    else
+      dnl Shouldn't happen, but who knows...
+      result='~(size_t)0'
     fi
-  ])
-  AC_MSG_RESULT([$gl_cv_size_max])
-  if test "$gl_cv_size_max" != yes; then
-    AC_DEFINE_UNQUOTED([SIZE_MAX], [$gl_cv_size_max],
+  fi
+  AC_MSG_RESULT([$result])
+  if test "$result" != yes; then
+    AC_DEFINE_UNQUOTED([SIZE_MAX], [$result],
       [Define as the maximum value of type 'size_t', if the system doesn't 
define it.])
   fi
 ])

Modified: GNUnet/m4/stdint_h.m4
===================================================================
--- GNUnet/m4/stdint_h.m4       2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/stdint_h.m4       2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,24 +1,26 @@
-# stdint_h.m4 serial 6
-dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# stdint_h.m4 serial 3 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert.
 
 # Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists,
 # doesn't clash with <sys/types.h>, and declares uintmax_t.
 
-AC_DEFUN([gl_AC_HEADER_STDINT_H],
+AC_DEFUN([jm_AC_HEADER_STDINT_H],
 [
-  AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h,
+  AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h,
   [AC_TRY_COMPILE(
     [#include <sys/types.h>
 #include <stdint.h>],
-    [uintmax_t i = (uintmax_t) -1; return !i;],
-    gl_cv_header_stdint_h=yes,
-    gl_cv_header_stdint_h=no)])
-  if test $gl_cv_header_stdint_h = yes; then
+    [uintmax_t i = (uintmax_t) -1;],
+    jm_ac_cv_header_stdint_h=yes,
+    jm_ac_cv_header_stdint_h=no)])
+  if test $jm_ac_cv_header_stdint_h = yes; then
     AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1,
       [Define if <stdint.h> exists, doesn't clash with <sys/types.h>,
        and declares uintmax_t. ])

Modified: GNUnet/m4/uintmax_t.m4
===================================================================
--- GNUnet/m4/uintmax_t.m4      2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/uintmax_t.m4      2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
-# uintmax_t.m4 serial 9
-dnl Copyright (C) 1997-2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# uintmax_t.m4 serial 7 (gettext-0.12)
+dnl Copyright (C) 1997-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert.
 
@@ -11,12 +13,12 @@
 # Define uintmax_t to 'unsigned long' or 'unsigned long long'
 # if it is not already defined in <stdint.h> or <inttypes.h>.
 
-AC_DEFUN([gl_AC_TYPE_UINTMAX_T],
+AC_DEFUN([jm_AC_TYPE_UINTMAX_T],
 [
-  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
-  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
-  if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; 
then
-    AC_REQUIRE([gl_AC_TYPE_UNSIGNED_LONG_LONG])
+  AC_REQUIRE([jm_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([jm_AC_HEADER_STDINT_H])
+  if test $jm_ac_cv_header_inttypes_h = no && test $jm_ac_cv_header_stdint_h = 
no; then
+    AC_REQUIRE([jm_AC_TYPE_UNSIGNED_LONG_LONG])
     test $ac_cv_type_unsigned_long_long = yes \
       && ac_type='unsigned long long' \
       || ac_type='unsigned long'

Modified: GNUnet/m4/ulonglong.m4
===================================================================
--- GNUnet/m4/ulonglong.m4      2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/ulonglong.m4      2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,46 +1,23 @@
-# ulonglong.m4 serial 6
-dnl Copyright (C) 1999-2006 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# ulonglong.m4 serial 3
+dnl Copyright (C) 1999-2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Paul Eggert.
 
-# Define HAVE_UNSIGNED_LONG_LONG_INT if 'unsigned long long int' works.
-# This fixes a bug in Autoconf 2.60, but can be removed once we
-# assume 2.61 everywhere.
+# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works.
 
-# Note: If the type 'unsigned long long int' exists but is only 32 bits
-# large (as on some very old compilers), AC_TYPE_UNSIGNED_LONG_LONG_INT
-# will not be defined. In this case you can treat 'unsigned long long int'
-# like 'unsigned long int'.
-
-AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT],
+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG],
 [
-  AC_CACHE_CHECK([for unsigned long long int],
-    [ac_cv_type_unsigned_long_long_int],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-         [[unsigned long long int ull = 18446744073709551615ULL;
-           typedef int a[(18446744073709551615ULL <= (unsigned long long int) 
-1
-                          ? 1 : -1)];
-          int i = 63;]],
-         [[unsigned long long int ullmax = 18446744073709551615ull;
-           return (ull << 63 | ull >> 63 | ull << i | ull >> i
-                   | ullmax / ull | ullmax % ull);]])],
-       [ac_cv_type_unsigned_long_long_int=yes],
-       [ac_cv_type_unsigned_long_long_int=no])])
-  if test $ac_cv_type_unsigned_long_long_int = yes; then
-    AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1,
-      [Define to 1 if the system has the type `unsigned long long int'.])
-  fi
-])
-
-# This macro is obsolescent and should go away soon.
-AC_DEFUN([gl_AC_TYPE_UNSIGNED_LONG_LONG],
-[
-  AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT])
-  ac_cv_type_unsigned_long_long=$ac_cv_type_unsigned_long_long_int
+  AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long,
+  [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;],
+    [unsigned long long ullmax = (unsigned long long) -1;
+     return ull << i | ull >> i | ullmax / ull | ullmax % ull;],
+    ac_cv_type_unsigned_long_long=yes,
+    ac_cv_type_unsigned_long_long=no)])
   if test $ac_cv_type_unsigned_long_long = yes; then
     AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1,
       [Define if you have the 'unsigned long long' type.])

Modified: GNUnet/m4/wchar_t.m4
===================================================================
--- GNUnet/m4/wchar_t.m4        2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/wchar_t.m4        2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
 # wchar_t.m4 serial 1 (gettext-0.12)
 dnl Copyright (C) 2002-2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 dnl Test whether <stddef.h> has the 'wchar_t' type.

Modified: GNUnet/m4/wint_t.m4
===================================================================
--- GNUnet/m4/wint_t.m4 2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/wint_t.m4 2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,8 +1,10 @@
 # wint_t.m4 serial 1 (gettext-0.12)
 dnl Copyright (C) 2003 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 dnl From Bruno Haible.
 dnl Test whether <wchar.h> has the 'wint_t' type.

Modified: GNUnet/m4/xsize.m4
===================================================================
--- GNUnet/m4/xsize.m4  2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/m4/xsize.m4  2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,13 +1,14 @@
-# xsize.m4 serial 3
-dnl Copyright (C) 2003-2004 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# xsize.m4 serial 2
+dnl Copyright (C) 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License.  As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
 
 AC_DEFUN([gl_XSIZE],
 [
   dnl Prerequisites of lib/xsize.h.
   AC_REQUIRE([gl_SIZE_MAX])
-  AC_REQUIRE([AC_C_INLINE])
   AC_CHECK_HEADERS(stdint.h)
 ])

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/po/GNUnet.pot        2007-03-25 20:37:21 UTC (rev 4708)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-28 21:37-0700\n"
+"POT-Creation-Date: 2007-03-25 14:12-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -1469,19 +1469,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
+#: src/include/gnunet_util_error.h:177 src/include/gnunet_util_error.h:179
+#: src/include/gnunet_util_error.h:181 src/include/gnunet_util_error.h:183
 #, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
+msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
-#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
 #, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr ""
 
-#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr ""
@@ -2914,112 +2914,112 @@
 msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1690
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1663
+#: src/applications/gap/gap.c:1691
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1837
+#: src/applications/gap/gap.c:1865
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1849 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1877 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1856 src/applications/gap/gap.c:1862
-#: src/applications/gap/gap.c:1869
+#: src/applications/gap/gap.c:1884 src/applications/gap/gap.c:1890
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2152
+#: src/applications/gap/gap.c:2181
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2153
+#: src/applications/gap/gap.c:2182
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2154
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2184
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2185
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2187
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2189
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2190
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2191
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2192
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2193
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2194
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2195
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2196
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2197
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2198
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2199
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2215
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2243
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr ""
@@ -3657,8 +3657,13 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:310
+#: src/applications/fs/ecrs/upload.c:236
 #, c-format
+msgid "Cannot open file `%s': `%s'"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:316
+#, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
@@ -4066,74 +4071,86 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1142
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:1125
+#: src/server/connection.c:1151
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/server/connection.c:2583
+#: src/server/connection.c:2630
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/server/connection.c:2661
+#: src/server/connection.c:2708
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2678
+#: src/server/connection.c:2725
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:3115
+#: src/server/connection.c:3166
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3119
+#: src/server/connection.c:3170
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3121
+#: src/server/connection.c:3172
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3124
+#: src/server/connection.c:3175
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/server/connection.c:3128
+#: src/server/connection.c:3179
 msgid "# bytes transmitted"
 msgstr ""
 
-#: src/server/connection.c:3132
+#: src/server/connection.c:3183
 msgid "# bytes received"
 msgstr ""
 
-#: src/server/connection.c:3135
+#: src/server/connection.c:3186
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/server/connection.c:3137
+#: src/server/connection.c:3188
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/connection.c:3139
-msgid "# total advertised bytes per second received limit"
+#: src/server/connection.c:3190
+msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3141
-msgid "# total allowed bytes per second transmission limit"
+#: src/server/connection.c:3192
+msgid "# total bytes per second receive limit"
 msgstr ""
 
-#: src/server/connection.c:3143
+#: src/server/connection.c:3194
 msgid "# total number of messages in send buffers"
 msgstr ""
 
+#: src/server/connection.c:3196
+msgid "# total number of bytes we were allowed to sent but did not"
+msgstr ""
+
+#: src/server/connection.c:3198
+msgid "# total number of bytes we were allowed to sent"
+msgstr ""
+
+#: src/server/connection.c:3200
+msgid "# total number of bytes we are currently allowed to send"
+msgstr ""
+
 #: src/server/startup.c:207
 #, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"

Modified: GNUnet/po/Makefile.in.in
===================================================================
--- GNUnet/po/Makefile.in.in    2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/po/Makefile.in.in    2007-03-25 20:37:21 UTC (rev 4708)
@@ -1,5 +1,5 @@
 # Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <address@hidden>
+# Copyright (C) 1995-1997, 2000-2003 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
@@ -8,11 +8,10 @@
 # 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.16
+# Origin: gettext-0.13
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 
 SHELL = /bin/sh
 @SET_MAKE@
@@ -23,38 +22,18 @@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-datarootdir = @datarootdir@
 datadir = @datadir@
-localedir = @localedir@
+localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
 
-# We use $(mkdir_p).
-# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
-# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
-# @install_sh@ does not start with $(SHELL), so we add it.
-# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
-# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
-# versions, $(mkinstalldirs) and $(install_sh) are unused.
-mkinstalldirs = $(SHELL) @install_sh@ -d
-install_sh = $(SHELL) @install_sh@
-MKDIR_P = @MKDIR_P@
-mkdir_p = @mkdir_p@
-
-GMSGFMT_ = @GMSGFMT@
-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))
+GMSGFMT = @GMSGFMT@
+MSGFMT = @MSGFMT@
+XGETTEXT = @XGETTEXT@
 MSGMERGE = msgmerge
 MSGMERGE_UPDATE = @MSGMERGE@ --update
 MSGINIT = msginit
@@ -67,7 +46,7 @@
 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 \
+DISTFILES = $(DISTFILES.common) Makevars POTFILES.in $(DOMAIN).pot stamp-po \
 $(POFILES) $(GMOFILES) \
 $(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
 
@@ -78,7 +57,7 @@
 # Makevars gets inserted here. (Don't remove this line!)
 
 .SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update
 
 .po.mo:
        @echo "$(MSGFMT) -c -o $@ $<"; \
@@ -100,12 +79,6 @@
 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,
@@ -115,13 +88,10 @@
 # $(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; \
-       }
+       test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
+       @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
@@ -130,16 +100,11 @@
 # 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"
+         --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 && \
@@ -165,20 +130,16 @@
 # 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
+       test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+       echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
+       cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot
 
 
 install: install-exec install-data
 install-exec:
 install-data: address@hidden@
        if test "$(PACKAGE)" = "gettext-tools"; then \
-         $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
          for file in $(DISTFILES.common) Makevars.template; do \
            $(INSTALL_DATA) $(srcdir)/$$file \
                            $(DESTDIR)$(gettextsrcdir)/$$file; \
@@ -191,13 +152,13 @@
        fi
 install-data-no: all
 install-data-yes: all
-       $(mkdir_p) $(DESTDIR)$(datadir)
+       $(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; \
-         $(mkdir_p) $(DESTDIR)$$dir; \
+         $(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"; \
@@ -237,19 +198,19 @@
 installdirs-exec:
 installdirs-data: address@hidden@
        if test "$(PACKAGE)" = "gettext-tools"; then \
-         $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
+         $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \
        else \
          : ; \
        fi
 installdirs-data-no:
 installdirs-data-yes:
-       $(mkdir_p) $(DESTDIR)$(datadir)
+       $(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; \
-         $(mkdir_p) $(DESTDIR)$$dir; \
+         $(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 \
@@ -324,14 +285,11 @@
        $(MAKE) update-po
        @$(MAKE) dist2
 # This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
+dist2: $(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; \
@@ -343,9 +301,9 @@
        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; \
+           cp -p $$file $(distdir); \
          else \
-           cp -p $(srcdir)/$$file $(distdir) || exit 1; \
+           cp -p $(srcdir)/$$file $(distdir); \
          fi; \
        done
 
@@ -354,13 +312,6 @@
        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:
@@ -392,9 +343,10 @@
 update-gmo: Makefile $(GMOFILES)
        @:
 
-Makefile: Makefile.in.in Makevars $(top_builddir)/config.status 
@POMAKEFILEDEPS@
+Makefile: Makefile.in.in $(top_builddir)/config.status @POMAKEFILEDEPS@
        cd $(top_builddir) \
-         && $(SHELL) ./config.status $(subdir)/address@hidden po-directories
+         && CONFIG_FILES=$(subdir)/address@hidden CONFIG_HEADERS= \
+              $(SHELL) ./config.status
 
 force:
 

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/po/de.po     2007-03-25 20:37:21 UTC (rev 4708)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-28 21:37-0700\n"
+"POT-Creation-Date: 2007-03-25 14:12-0600\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -1588,19 +1588,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
+#: src/include/gnunet_util_error.h:177 src/include/gnunet_util_error.h:179
+#: src/include/gnunet_util_error.h:181 src/include/gnunet_util_error.h:183
 #, fuzzy, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
+msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
-#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
@@ -3130,112 +3130,112 @@
 msgid "allows mapping of the network topology"
 msgstr "Erlaubt die Kartographierung der Netzwerktopologie"
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1690
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/applications/gap/gap.c:1663
+#: src/applications/gap/gap.c:1691
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1837
+#: src/applications/gap/gap.c:1865
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
 "nicht geladen. Anfrage wird abgelehnt.\n"
 
-#: src/applications/gap/gap.c:1849 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1877 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/applications/gap/gap.c:1856 src/applications/gap/gap.c:1862
-#: src/applications/gap/gap.c:1869
+#: src/applications/gap/gap.c:1884 src/applications/gap/gap.c:1890
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 "Gewünschter Grad an Anonymität kann nicht erreicht werden, Anfrage wird "
 "ignoriert.\n"
 
-#: src/applications/gap/gap.c:2152
+#: src/applications/gap/gap.c:2181
 msgid "# gap requests total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/applications/gap/gap.c:2153
+#: src/applications/gap/gap.c:2182
 msgid "# gap requests policy: immediate drop"
 msgstr "# gap Anfragen mit taktischer Entscheidung: sofortiges Verwerfen"
 
-#: src/applications/gap/gap.c:2154
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests policy: not routed"
 msgstr "# gap Anfragen mit taktischer Entscheidung: kein Routing"
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2184
 msgid "# gap requests policy: not answered"
 msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2185
 msgid "# gap requests processed: attempted add to RT"
 msgstr "# gap Anfragen verarbeitet: versucht, der RT hinzuzufügen"
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests processed: local result"
 msgstr "# gap Anfragen verarbeitet: lokales Ergebnis"
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2187
 msgid "# gap routing successes (total)"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests dropped: collision in RT"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2189
 msgid "# gap requests forwarded (counting each peer)"
 msgstr "#gap Anfragen weitergeleitet (jeder Knoten gezählt)"
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2190
 msgid "# gap duplicate requests (pending)"
 msgstr "# gap doppelte Anfragen (unfertig)"
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2191
 msgid "# gap duplicate requests that were re-tried"
 msgstr "# gap doppelte Anfragen, die wiederholt wurden"
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2192
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr "# gap Wiederholungs-TTL-Differenz (kummulativ)"
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2193
 msgid "# gap reply duplicates"
 msgstr "#gap doppelte Antworten"
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2194
 msgid "# gap spurious replies"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2195
 msgid "# gap routing slots currently in use"
 msgstr "# gap Routingschächte im Moment in Verwendung"
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2196
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2197
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2198
 #, fuzzy
 msgid "# gap rewards pending"
 msgstr "# gap doppelte Anfragen (unfertig)"
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2199
 #, fuzzy
 msgid "# gap response weights"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2215
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
@@ -3243,7 +3243,7 @@
 "Verkehrsdienst konnte nicht geladen werden, GAP kann keinen verdeckenden "
 "Netzwerkverkehr sicherstellen.\n"
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2243
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "`%s' registriert Handler %d %d\n"
@@ -3957,7 +3957,12 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/applications/fs/ecrs/upload.c:310
+#: src/applications/fs/ecrs/upload.c:236
+#, fuzzy, c-format
+msgid "Cannot open file `%s': `%s'"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/applications/fs/ecrs/upload.c:316
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
@@ -4378,78 +4383,92 @@
 "Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
 "zu holen"
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1142
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "`%s' wählte %d von %d Nachrichten aus (MTU: %d).\n"
 
-#: src/server/connection.c:1125
+#: src/server/connection.c:1151
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Nachrichten Details: %u: Länge %d, Priorität: %d\n"
 
-#: src/server/connection.c:2583
+#: src/server/connection.c:2630
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
 
-#: src/server/connection.c:2661
+#: src/server/connection.c:2708
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Ungültige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2678
+#: src/server/connection.c:2725
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 "Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:3115
+#: src/server/connection.c:3166
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:3119
+#: src/server/connection.c:3170
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:3121
+#: src/server/connection.c:3172
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:3124
+#: src/server/connection.c:3175
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/server/connection.c:3128
+#: src/server/connection.c:3179
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/server/connection.c:3132
+#: src/server/connection.c:3183
 #, fuzzy
 msgid "# bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/server/connection.c:3135
+#: src/server/connection.c:3186
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/server/connection.c:3137
+#: src/server/connection.c:3188
 msgid "# bytes noise sent"
 msgstr "# Bytes Rauschen gesendet"
 
-#: src/server/connection.c:3139
-msgid "# total advertised bytes per second received limit"
+#: src/server/connection.c:3190
+msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3141
-msgid "# total allowed bytes per second transmission limit"
-msgstr ""
+#: src/server/connection.c:3192
+#, fuzzy
+msgid "# total bytes per second receive limit"
+msgstr "# Bytes Rauschen empfangen"
 
-#: src/server/connection.c:3143
+#: src/server/connection.c:3194
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
+#: src/server/connection.c:3196
+msgid "# total number of bytes we were allowed to sent but did not"
+msgstr ""
+
+#: src/server/connection.c:3198
+#, fuzzy
+msgid "# total number of bytes we were allowed to sent"
+msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
+
+#: src/server/connection.c:3200
+msgid "# total number of bytes we are currently allowed to send"
+msgstr ""
+
 #: src/server/startup.c:207
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -6633,9 +6652,6 @@
 #~ "Konfigurationsdatei `%s' nicht gefunden. Bitte führen Sie `gnunet-setup -"
 #~ "d' aus!\n"
 
-#~ msgid "Cannot open configuration file `%s'.\n"
-#~ msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
-
 #~ msgid "Cron stopped\n"
 #~ msgstr "Cron angehalten\n"
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/po/es.po     2007-03-25 20:37:21 UTC (rev 4708)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-28 21:37-0700\n"
+"POT-Creation-Date: 2007-03-25 14:12-0600\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -1576,19 +1576,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
+#: src/include/gnunet_util_error.h:177 src/include/gnunet_util_error.h:179
+#: src/include/gnunet_util_error.h:181 src/include/gnunet_util_error.h:183
 #, fuzzy, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
+msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
-#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
@@ -3071,115 +3071,115 @@
 msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1690
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/applications/gap/gap.c:1663
+#: src/applications/gap/gap.c:1691
 msgid "myself"
 msgstr "yo"
 
-#: src/applications/gap/gap.c:1837
+#: src/applications/gap/gap.c:1865
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Solicitada la cobertura de tráfico pero el servicio de tráfico no ha sido "
 "cargado. Rechazando la petición.\n"
 
-#: src/applications/gap/gap.c:1849 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1877 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/applications/gap/gap.c:1856 src/applications/gap/gap.c:1862
-#: src/applications/gap/gap.c:1869
+#: src/applications/gap/gap.c:1884 src/applications/gap/gap.c:1890
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 "Imposible satisfacer el nivel deseado de anonimato, ignorando la petición.\n"
 
-#: src/applications/gap/gap.c:2152
+#: src/applications/gap/gap.c:2181
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2153
+#: src/applications/gap/gap.c:2182
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2154
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2184
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2185
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2187
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2189
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2190
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2191
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2192
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2193
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2194
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2195
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2196
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2197
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2198
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2199
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2215
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2243
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "'%s' registrando manejadores %d %d\n"
@@ -3893,7 +3893,12 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/applications/fs/ecrs/upload.c:310
+#: src/applications/fs/ecrs/upload.c:236
+#, fuzzy, c-format
+msgid "Cannot open file `%s': `%s'"
+msgstr "Imposible abrir el fichero de configuración '%s'.\n"
+
+#: src/applications/fs/ecrs/upload.c:316
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
@@ -4310,77 +4315,91 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1142
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:1125
+#: src/server/connection.c:1151
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detalles del mensaje: %u: longitud %d, prioridad: %d\n"
 
-#: src/server/connection.c:2583
+#: src/server/connection.c:2630
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Mensaje de '%s' descartado: formato inválido.\n"
 
-#: src/server/connection.c:2661
+#: src/server/connection.c:2708
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Secuencia de números no válida %u <= %u, omitiendo mensaje.\n"
 
-#: src/server/connection.c:2678
+#: src/server/connection.c:2725
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "Mensajes recibidos de mas de un día de antigüedad. Omitidos.\n"
 
-#: src/server/connection.c:3115
+#: src/server/connection.c:3166
 msgid "# outgoing messages dropped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/server/connection.c:3119
+#: src/server/connection.c:3170
 msgid "# bytes of outgoing messages dropped"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/server/connection.c:3121
+#: src/server/connection.c:3172
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3124
+#: src/server/connection.c:3175
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/server/connection.c:3128
+#: src/server/connection.c:3179
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:3132
+#: src/server/connection.c:3183
 #, fuzzy
 msgid "# bytes received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/server/connection.c:3135
+#: src/server/connection.c:3186
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:3137
+#: src/server/connection.c:3188
 msgid "# bytes noise sent"
 msgstr "# \"bytes-ruido\" mandados"
 
-#: src/server/connection.c:3139
-msgid "# total advertised bytes per second received limit"
+#: src/server/connection.c:3190
+msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3141
-msgid "# total allowed bytes per second transmission limit"
-msgstr ""
+#: src/server/connection.c:3192
+#, fuzzy
+msgid "# total bytes per second receive limit"
+msgstr "# bytes de ruido recibidos"
 
-#: src/server/connection.c:3143
+#: src/server/connection.c:3194
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "número de mensajes en un bloque de mensajes"
 
+#: src/server/connection.c:3196
+msgid "# total number of bytes we were allowed to sent but did not"
+msgstr ""
+
+#: src/server/connection.c:3198
+#, fuzzy
+msgid "# total number of bytes we were allowed to sent"
+msgstr "número de mensajes en un bloque de mensajes"
+
+#: src/server/connection.c:3200
+msgid "# total number of bytes we are currently allowed to send"
+msgstr ""
+
 #: src/server/startup.c:207
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -6458,9 +6477,6 @@
 #~ "El·fichero·de·configuración·'%s'·no·ha·sido·encontrado.··¡Ejecute·'gnunet-"
 #~ "setup -d'!\n"
 
-#~ msgid "Cannot open configuration file `%s'.\n"
-#~ msgstr "Imposible abrir el fichero de configuración '%s'.\n"
-
 #~ msgid "Stopping cron\n"
 #~ msgstr "Deteniendo cron\n"
 

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/po/rw.po     2007-03-25 20:37:21 UTC (rev 4708)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-28 21:37-0700\n"
+"POT-Creation-Date: 2007-03-25 14:12-0600\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -1512,19 +1512,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr "Ubuturo ku ni"
 
-#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
+#: src/include/gnunet_util_error.h:177 src/include/gnunet_util_error.h:179
+#: src/include/gnunet_util_error.h:181 src/include/gnunet_util_error.h:183
 #, fuzzy, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
+msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "Byanze ku"
 
-#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
-#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
 
-#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "`%s'Byanze ku IDOSIYE ku Na: Ikosa"
@@ -3138,117 +3138,117 @@
 msgid "allows mapping of the network topology"
 msgstr "urusobe"
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1690
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/applications/gap/gap.c:1663
+#: src/applications/gap/gap.c:1691
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1837
+#: src/applications/gap/gap.c:1865
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1849 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1877 src/applications/fs/module/anonymity.c:67
 #, fuzzy
 msgid "Failed to get traffic stats.\n"
 msgstr "Kuri Ikibazo# Ibyerekeye"
 
-#: src/applications/gap/gap.c:1856 src/applications/gap/gap.c:1862
-#: src/applications/gap/gap.c:1869
+#: src/applications/gap/gap.c:1884 src/applications/gap/gap.c:1890
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2152
+#: src/applications/gap/gap.c:2181
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2153
+#: src/applications/gap/gap.c:2182
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2154
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2184
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2185
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2187
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2189
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2190
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2191
 #, fuzzy
 msgid "# gap duplicate requests that were re-tried"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2192
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2193
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2194
 #, fuzzy
 msgid "# gap spurious replies"
 msgstr "#hejuru Ibibazo BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2195
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2196
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2197
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2198
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2199
 #, fuzzy
 msgid "# gap response weights"
 msgstr "#hejuru Ibibazo BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2215
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2243
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr ""
@@ -3976,7 +3976,12 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Itangira... Modire Byanze Umukiriya"
 
-#: src/applications/fs/ecrs/upload.c:310
+#: src/applications/fs/ecrs/upload.c:236
+#, fuzzy, c-format
+msgid "Cannot open file `%s': `%s'"
+msgstr "Gufungura Iboneza IDOSIYE"
+
+#: src/applications/fs/ecrs/upload.c:316
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
@@ -4398,83 +4403,97 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1142
 #, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "`%s'Byahiswemo Inyuma Bya Ubutumwa"
 
-#: src/server/connection.c:1125
+#: src/server/connection.c:1151
 #, fuzzy, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2583
+#: src/server/connection.c:2630
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2661
+#: src/server/connection.c:2708
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2678
+#: src/server/connection.c:2725
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:3115
+#: src/server/connection.c:3166
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:3119
+#: src/server/connection.c:3170
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3121
+#: src/server/connection.c:3172
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3124
+#: src/server/connection.c:3175
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:3128
+#: src/server/connection.c:3179
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "#Bayite Bya Ubwoko"
 
-#: src/server/connection.c:3132
+#: src/server/connection.c:3183
 #, fuzzy
 msgid "# bytes received"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/server/connection.c:3135
+#: src/server/connection.c:3186
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:3137
+#: src/server/connection.c:3188
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3139
-msgid "# total advertised bytes per second received limit"
+#: src/server/connection.c:3190
+msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3141
-msgid "# total allowed bytes per second transmission limit"
-msgstr ""
+#: src/server/connection.c:3192
+#, fuzzy
+msgid "# total bytes per second receive limit"
+msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:3143
+#: src/server/connection.c:3194
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
 
+#: src/server/connection.c:3196
+msgid "# total number of bytes we were allowed to sent but did not"
+msgstr ""
+
+#: src/server/connection.c:3198
+#, fuzzy
+msgid "# total number of bytes we were allowed to sent"
+msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
+
+#: src/server/connection.c:3200
+msgid "# total number of bytes we are currently allowed to send"
+msgstr ""
+
 #: src/server/startup.c:207
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -6474,10 +6493,6 @@
 #~ msgstr "Gufungura Iboneza IDOSIYE"
 
 #, fuzzy
-#~ msgid "Cannot open configuration file `%s'.\n"
-#~ msgstr "Gufungura Iboneza IDOSIYE"
-
-#, fuzzy
 #~ msgid "Shutdown complete.\n"
 #~ msgstr "Byuzuye"
 

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/po/sv.po     2007-03-25 20:37:21 UTC (rev 4708)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-28 21:37-0700\n"
+"POT-Creation-Date: 2007-03-25 14:12-0600\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -1520,19 +1520,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
+#: src/include/gnunet_util_error.h:177 src/include/gnunet_util_error.h:179
+#: src/include/gnunet_util_error.h:181 src/include/gnunet_util_error.h:183
 #, fuzzy, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
+msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
-#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
@@ -2988,112 +2988,112 @@
 msgid "allows mapping of the network topology"
 msgstr "tillåter kartläggning av nätverkstopologin"
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1690
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/applications/gap/gap.c:1663
+#: src/applications/gap/gap.c:1691
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1837
+#: src/applications/gap/gap.c:1865
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1849 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1877 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1856 src/applications/gap/gap.c:1862
-#: src/applications/gap/gap.c:1869
+#: src/applications/gap/gap.c:1884 src/applications/gap/gap.c:1890
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2152
+#: src/applications/gap/gap.c:2181
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2153
+#: src/applications/gap/gap.c:2182
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2154
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2184
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2185
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2187
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2189
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2190
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2191
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2192
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2193
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2194
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2195
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2196
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2197
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2198
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2199
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2215
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2243
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d\n"
@@ -3758,7 +3758,12 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/applications/fs/ecrs/upload.c:310
+#: src/applications/fs/ecrs/upload.c:236
+#, fuzzy, c-format
+msgid "Cannot open file `%s': `%s'"
+msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+
+#: src/applications/fs/ecrs/upload.c:316
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
@@ -4170,77 +4175,90 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1142
 #, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "\"%s\" valda %d av %d meddelanden (MTU: %d).\n"
 
-#: src/server/connection.c:1125
+#: src/server/connection.c:1151
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
 
-#: src/server/connection.c:2583
+#: src/server/connection.c:2630
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/server/connection.c:2661
+#: src/server/connection.c:2708
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2678
+#: src/server/connection.c:2725
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:3115
+#: src/server/connection.c:3166
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3119
+#: src/server/connection.c:3170
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:3121
+#: src/server/connection.c:3172
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:3124
+#: src/server/connection.c:3175
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/server/connection.c:3128
+#: src/server/connection.c:3179
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/server/connection.c:3132
+#: src/server/connection.c:3183
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/server/connection.c:3135
+#: src/server/connection.c:3186
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/server/connection.c:3137
+#: src/server/connection.c:3188
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/connection.c:3139
-msgid "# total advertised bytes per second received limit"
+#: src/server/connection.c:3190
+msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3141
-msgid "# total allowed bytes per second transmission limit"
+#: src/server/connection.c:3192
+msgid "# total bytes per second receive limit"
 msgstr ""
 
-#: src/server/connection.c:3143
+#: src/server/connection.c:3194
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "antal meddelanden i ett meddelandeblock"
 
+#: src/server/connection.c:3196
+msgid "# total number of bytes we were allowed to sent but did not"
+msgstr ""
+
+#: src/server/connection.c:3198
+#, fuzzy
+msgid "# total number of bytes we were allowed to sent"
+msgstr "antal meddelanden i ett meddelandeblock"
+
+#: src/server/connection.c:3200
+msgid "# total number of bytes we are currently allowed to send"
+msgstr ""
+
 #: src/server/startup.c:207
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -5973,9 +5991,6 @@
 #~ msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
 #~ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#~ msgid "Cannot open configuration file `%s'.\n"
-#~ msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
-
 #~ msgid "Cron stopped\n"
 #~ msgstr "Cron stoppad\n"
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2007-03-25 20:36:48 UTC (rev 4707)
+++ GNUnet/po/vi.po     2007-03-25 20:37:21 UTC (rev 4708)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-02-28 21:37-0700\n"
+"POT-Creation-Date: 2007-03-25 14:12-0600\n"
 "PO-Revision-Date: 2005-07-05 21:18+0400\n"
 "Last-Translator: Phan Vinh Thinh <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -1558,19 +1558,19 @@
 msgid "specify host on which gnunetd is running"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/include/gnunet_util_error.h:175 src/include/gnunet_util_error.h:177
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:181
+#: src/include/gnunet_util_error.h:177 src/include/gnunet_util_error.h:179
+#: src/include/gnunet_util_error.h:181 src/include/gnunet_util_error.h:183
 #, fuzzy, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
+msgid "Internal error: assertion failed at %s:%d in %s.\n"
 msgstr "Xác nhận thất bại tại %s:%d.\n"
 
-#: src/include/gnunet_util_error.h:188 src/include/gnunet_util_error.h:195
-#: src/include/gnunet_util_error.h:202 src/include/gnunet_util_error.h:209
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/include/gnunet_util_error.h:216 src/include/gnunet_util_error.h:223
+#: src/include/gnunet_util_error.h:218 src/include/gnunet_util_error.h:225
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "'%s' thất bại trên tập tin'%s' tại %s:%d với lỗi: %s\n"
@@ -3071,110 +3071,110 @@
 msgid "allows mapping of the network topology"
 msgstr "Theo dấu vết trace hình học của mạng GNUnet."
 
-#: src/applications/gap/gap.c:1662
+#: src/applications/gap/gap.c:1690
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
 
-#: src/applications/gap/gap.c:1663
+#: src/applications/gap/gap.c:1691
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1837
+#: src/applications/gap/gap.c:1865
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải.  Đang nhả ra "
 "yêu cầu.\n"
 
-#: src/applications/gap/gap.c:1849 src/applications/fs/module/anonymity.c:67
+#: src/applications/gap/gap.c:1877 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr "Lấy các thông tin truyền tải không thành công.\n"
 
-#: src/applications/gap/gap.c:1856 src/applications/gap/gap.c:1862
-#: src/applications/gap/gap.c:1869
+#: src/applications/gap/gap.c:1884 src/applications/gap/gap.c:1890
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr "Không thể thỏa mãn mức độ dấu tên mong muốn, đang lờ đi yêu cầu.\n"
 
-#: src/applications/gap/gap.c:2152
+#: src/applications/gap/gap.c:2181
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2153
+#: src/applications/gap/gap.c:2182
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2154
+#: src/applications/gap/gap.c:2183
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2155
+#: src/applications/gap/gap.c:2184
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2156
+#: src/applications/gap/gap.c:2185
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2157
+#: src/applications/gap/gap.c:2186
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2158
+#: src/applications/gap/gap.c:2187
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2159
+#: src/applications/gap/gap.c:2188
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2160
+#: src/applications/gap/gap.c:2189
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2161
+#: src/applications/gap/gap.c:2190
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2162
+#: src/applications/gap/gap.c:2191
 #, fuzzy
 msgid "# gap duplicate requests that were re-tried"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2163
+#: src/applications/gap/gap.c:2192
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2164
+#: src/applications/gap/gap.c:2193
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2165
+#: src/applications/gap/gap.c:2194
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2166
+#: src/applications/gap/gap.c:2195
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2167
+#: src/applications/gap/gap.c:2196
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2168
+#: src/applications/gap/gap.c:2197
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2169
+#: src/applications/gap/gap.c:2198
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2170
+#: src/applications/gap/gap.c:2199
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2186
+#: src/applications/gap/gap.c:2215
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
@@ -3182,7 +3182,7 @@
 "Nạp dịch vụ truyền tải không thành công; lỗ hổng không thể chắc chắn khả "
 "năng truyền tải.\n"
 
-#: src/applications/gap/gap.c:2214
+#: src/applications/gap/gap.c:2243
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d\n"
@@ -3870,7 +3870,12 @@
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "nạp môđun '%s' không thành công.  Đang cho máy khách biết.\n"
 
-#: src/applications/fs/ecrs/upload.c:310
+#: src/applications/fs/ecrs/upload.c:236
+#, fuzzy, c-format
+msgid "Cannot open file `%s': `%s'"
+msgstr "Không mở được tập tin cấu hình '%s'\n"
+
+#: src/applications/fs/ecrs/upload.c:316
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Đánh chỉ mục dữ liệu thất bại tại vị trí %i.\n"
@@ -4286,80 +4291,94 @@
 msgid "run in client mode (for getting client configuration values)"
 msgstr "chạy trong chế độ người dùng (để lấy giá trị cấu hình của người dùng)"
 
-#: src/server/connection.c:1116
+#: src/server/connection.c:1142
 #, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "'%s' đã chọn %d vượt quá %d thông báo (MTU: %d).\n"
 
-#: src/server/connection.c:1125
+#: src/server/connection.c:1151
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
 
-#: src/server/connection.c:2583
+#: src/server/connection.c:2630
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bỏ đi thông báo từ '%s': định dạng sai.\n"
 
-#: src/server/connection.c:2661
+#: src/server/connection.c:2708
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Số của chuỗi sai %u <= %u, đang bỏ đi thông báo.\n"
 
-#: src/server/connection.c:2678
+#: src/server/connection.c:2725
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/server/connection.c:3115
+#: src/server/connection.c:3166
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:3119
+#: src/server/connection.c:3170
 msgid "# bytes of outgoing messages dropped"
 msgstr "# byte của các thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:3121
+#: src/server/connection.c:3172
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:3124
+#: src/server/connection.c:3175
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3128
+#: src/server/connection.c:3179
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/server/connection.c:3132
+#: src/server/connection.c:3183
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte nhận được qua TCP"
 
-#: src/server/connection.c:3135
+#: src/server/connection.c:3186
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:3137
+#: src/server/connection.c:3188
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3139
-msgid "# total advertised bytes per second received limit"
+#: src/server/connection.c:3190
+msgid "# total bytes per second send limit"
 msgstr ""
 
-#: src/server/connection.c:3141
-msgid "# total allowed bytes per second transmission limit"
-msgstr ""
+#: src/server/connection.c:3192
+#, fuzzy
+msgid "# total bytes per second receive limit"
+msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/connection.c:3143
+#: src/server/connection.c:3194
 #, fuzzy
 msgid "# total number of messages in send buffers"
 msgstr "số thông báo trong một khối tin nhắn"
 
+#: src/server/connection.c:3196
+msgid "# total number of bytes we were allowed to sent but did not"
+msgstr ""
+
+#: src/server/connection.c:3198
+#, fuzzy
+msgid "# total number of bytes we were allowed to sent"
+msgstr "số thông báo trong một khối tin nhắn"
+
+#: src/server/connection.c:3200
+msgid "# total number of bytes we are currently allowed to send"
+msgstr ""
+
 #: src/server/startup.c:207
 #, fuzzy, c-format
 msgid "Unable to obtain filesystem information for `%s': %u\n"
@@ -6476,10 +6495,6 @@
 #~ "Không tìm thấy tập tin cấu hình '%s'. Chương trình sẽ thử tạo tập tin cấu "
 #~ "hình mặc định tại vị trí đó.\n"
 
-#, fuzzy
-#~ msgid "Cannot open configuration file `%s'.\n"
-#~ msgstr "Không mở được tập tin cấu hình '%s'\n"
-
 #~ msgid "Cron stopped\n"
 #~ msgstr "Đã dừng cron\n"
 





reply via email to

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