gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r6719 - in GNUnet/debian: . config lintian po


From: gnunet
Subject: [GNUnet-SVN] r6719 - in GNUnet/debian: . config lintian po
Date: Thu, 17 Apr 2008 02:47:50 -0600 (MDT)

Author: elmargol
Date: 2008-04-17 02:47:49 -0600 (Thu, 17 Apr 2008)
New Revision: 6719

Modified:
   GNUnet/debian/changelog
   GNUnet/debian/config/gnunetd.conf
   GNUnet/debian/control
   GNUnet/debian/gnunet-client.install
   GNUnet/debian/gnunet-common.install
   GNUnet/debian/gnunet-dev.install
   GNUnet/debian/gnunet-server.README.Debian
   GNUnet/debian/gnunet-server.config
   GNUnet/debian/gnunet-server.dirs
   GNUnet/debian/gnunet-server.init
   GNUnet/debian/gnunet-server.install
   GNUnet/debian/gnunet-server.postinst
   GNUnet/debian/gnunet-server.postrm
   GNUnet/debian/gnunet-server.prerm
   GNUnet/debian/gnunet-server.templates
   GNUnet/debian/gnunet-tools.install
   GNUnet/debian/lintian/gnunet-client
   GNUnet/debian/lintian/gnunet-common
   GNUnet/debian/lintian/gnunet-server
   GNUnet/debian/lintian/gnunet-tools
   GNUnet/debian/po/POTFILES.in
   GNUnet/debian/po/cs.po
   GNUnet/debian/po/de.po
   GNUnet/debian/po/es.po
   GNUnet/debian/po/fr.po
   GNUnet/debian/po/gl.po
   GNUnet/debian/po/nl.po
   GNUnet/debian/po/pt.po
   GNUnet/debian/po/pt_BR.po
   GNUnet/debian/po/ru.po
   GNUnet/debian/po/sv.po
   GNUnet/debian/po/templates.pot
   GNUnet/debian/po/vi.po
   GNUnet/debian/rules
Log:
Use libmicrohttpd 0.3.0
Use libextractor 0.5.20
gnunet-server.postinst check if /var/run/gnunetd exist
New hostlist for 0.8.0
Do not provide /var/run/gnunetd (/var/run is tmpfs)



Modified: GNUnet/debian/changelog
===================================================================
--- GNUnet/debian/changelog     2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/changelog     2008-04-17 08:47:49 UTC (rev 6719)
@@ -1,16 +1,124 @@
-gnunet (0.7.2b-1) stable; urgency=low
+gnunet (0.8.0pre0-0 unstable; urgency=low
+  * New upstream version
+    - Use libmicrohttpd 0.3.0
+    - Use libextractor 0.5.20
+    - gnunet-server.postinst check if /var/run/gnunetd exist  
+    - New hostlist for 0.8.0 
+    - Do not provide /var/run/gnunetd (/var/run is tmpfs)
 
-  * New upstream Release
+ -- Markus Golser <address@hidden>  Sat, 12 Apr 2008 14:29:25 +0200
 
- -- Nils Durner <address@hidden>  Thu, 2 Aug 2007 19:13:50 +0200
+gnunet (0.7.3-4) unstable; urgency=medium
 
-gnunet (0.7.2b-1) feisty; urgency=low
+  * Adding updated Dutch debconf translation from Bart Cornelis
+    <address@hidden> (Closes: #469174).
 
-  * New upstream Release
-  * Fixed the debian directory
+ -- Daniel Baumann <address@hidden>  Fri,  7 Mar 2008 15:31:00 +0100
 
- -- elmargol <address@hidden>  Thu, 2 Aug 2007 13:56:37 +0200
+gnunet (0.7.3-3) unstable; urgency=medium
 
+  * Rebuilding against new dialog (Closes: #454948).
+
+ -- Daniel Baumann <address@hidden>  Wed, 13 Feb 2008 07:31:00 +0100
+
+gnunet (0.7.3-2) unstable; urgency=low
+
+  * Moved libgnunettesting_api.so.* to gnunet-client, they were accidentally
+    included to gnunet-dev before.
+
+ -- Daniel Baumann <address@hidden>  Mon, 21 Jan 2008 20:22:00 +0100
+ 
+gnunet (0.7.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <address@hidden>  Mon, 24 Dec 2007 16:04:00 +0100
+
+gnunet (0.7.2c-5) unstable; urgency=low
+
+  * Building against transitioned libmicrohttpd.
+  * Added Finnish debconf translation from Esko Arajaervi <address@hidden>
+    (Closes: #457419).
+  * Replacing msgid contact address in *.po files with packages address.
+
+ -- Daniel Baumann <address@hidden>  Sat, 22 Dec 2007 10:58:00 +0100
+
+gnunet (0.7.2c-4) unstable; urgency=medium
+
+  * Added missing build-dependency against libncursesw5-dev,
+    now the gnunet-setup curses interface gets build again (Closes: #454701).
+
+ -- Daniel Baumann <address@hidden>  Fri,  7 Dec 2007 09:30:00 +0100
+
+gnunet (0.7.2c-3) unstable; urgency=medium
+
+  * Some formal cleanups:
+    - Updated to new policy.
+    - Using Homepage field in control.
+    - Using versioned depends for libextractor.
+    - Comented lintian overrides.
+
+ -- Daniel Baumann <address@hidden>  Thu,  6 Dec 2007 22:36:00 +0100
+
+gnunet (0.7.2c-2) unstable; urgency=medium
+
+  * Updated install files to cover previously missed files (Closes: #454053).
+
+ -- Daniel Baumann <address@hidden>  Sun,  2 Dec 2007 22:29:00 +0100
+
+gnunet (0.7.2c-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Daniel Baumann <address@hidden>  Tue,  9 Oct 2007 10:20:00 +0200
+
+gnunet (0.7.2b-6) unstable; urgency=low
+
+  * Adding debug package.
+
+ -- Daniel Baumann <address@hidden>  Wed, 26 Sep 2007 10:21:00 +0200
+
+gnunet (0.7.2b-5) unstable; urgency=low
+
+  * Renamed gnunet-daemon package to gnunet-server for consistency reasons.
+    Since gnunet was splittet out after etch, there is no transitional package
+    required.
+
+ -- Daniel Baumann <address@hidden>  Wed, 15 Aug 2007 14:51:00 +0200
+
+gnunet (0.7.2b-4) unstable; urgency=low
+
+  * Added netbase dependency to gnunet-daemon as found out by Kurt Roeckx
+    <address@hidden> (Closes: #437922, #437984).
+
+ -- Daniel Baumann <address@hidden>  Wed, 15 Aug 2007 14:25:00 +0200
+
+gnunet (0.7.2b-3) unstable; urgency=low
+
+  * Fixed broken gnunet-daemon.postinst on new installations.
+
+ -- Daniel Baumann <address@hidden>  Tue, 14 Aug 2007 16:30:00 +0200
+
+gnunet (0.7.2b-2) unstable; urgency=low
+
+  * Added build-dependency to libadns1-dev.
+  * Synced gnunetd.conf and gnunetd-daemon.postinst with upstream,
+    using /var/lib/gnunet instead of /var/lib/GNUnet now (Closes: #301822).
+  * Synced gnunet-daemon.install and gnunet-client.install with upstream,
+    including new libraries (Closes: #431021, #434684).
+
+ -- Daniel Baumann <address@hidden>  Tue, 14 Aug 2007 15:57:00 +0200
+
+gnunet (0.7.2b-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated po files according to the work from the debian-l10n-english team
+    (Closes: #430802).
+  * Added updated French debconf translation from Christian Perrier
+    <address@hidden> (Closes: #431384).
+
+ -- Daniel Baumann <address@hidden>  Tue, 14 Aug 2007 14:39:00 +0200
+
 gnunet (0.7.2-1) unstable; urgency=low
 
   * New upstream release (Closes: #429478).

Modified: GNUnet/debian/config/gnunetd.conf
===================================================================
--- GNUnet/debian/config/gnunetd.conf   2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/config/gnunetd.conf   2008-04-17 08:47:49 UTC (rev 6719)
@@ -9,7 +9,7 @@
 [GNUNETD]
 GNUNETD_HOME = /var/lib/gnunet
 PIDFILE = /var/run/gnunetd/gnunetd.pid
-HOSTLISTURL = http://gnunet.org/hostlist.php 
http://gnunet.mine.nu:8081/hostlist http://de.gnunet.org/cgi-bin/hostlist.cgi 
http://uk.gnunet.org/hostlist
+HOSTLISTURL = http://vserver1236.vserver-on.de/hostlist-074 
 HTTP-PROXY =
 USER = gnunet
 TRANSPORTS = udp tcp nat
@@ -26,6 +26,7 @@
 [NETWORK]
 PORT = 2087
 TRUSTED = 127.0.0.0/8;
+INTERFACE = eth0
 IP =
 
 [LOGGING]
@@ -39,6 +40,7 @@
 MAXCPULOAD = 100
 HARDCPULIMIT = 0
 BASICLIMITING = YES
+INTERFACES = eth0
 
 [GNUNETD-EXPERIMENTAL]
 PADDING = NO

Modified: GNUnet/debian/control
===================================================================
--- GNUnet/debian/control       2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/control       2008-04-17 08:47:49 UTC (rev 6719)
@@ -1,28 +1,28 @@
 Source: gnunet
 Section: net
 Priority: optional
-Maintainer: Arnaud Kyheng <address@hidden>
+Maintainer: Ubuntu MOTU Developers <address@hidden>
+XSBC-Original-Maintainer: Arnaud Kyheng <address@hidden>
 Uploaders: Daniel Baumann <address@hidden>
-Build-Depends: debhelper (>= 5), autotools-dev, dialog, gettext, 
guile-1.8-dev, libcurl3-dev, libextractor-dev, libgcrypt11-dev, libglade2-dev, 
libgmp3-dev, libgtk2.0-dev, libltdl3-dev, libmysqlclient15-dev, 
libncurses5-dev, libsqlite3-dev, libxml2-dev, po-debconf, zlib1g-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 5), autotools-dev, dialog (>= 1.1-20071028-3), 
gettext, guile-1.8-dev, libadns1-dev, libcurl4-gnutls-dev, libextractor-dev (>= 
0.5.20), libgcrypt11-dev, libglade2-dev, libgmp3-dev, libgtk2.0-dev, 
libmicrohttpd-dev (>= 0.3.0), libltdl3-dev, libmysqlclient15-dev, 
libncursesw5-dev, libsqlite3-dev, libxml2-dev, po-debconf, zlib1g-dev
+Standards-Version: 3.7.3
+Homepage: http://www.gnunet.org/
 
 Package: gnunet
 Architecture: all
-Depends: gnunet-client (>= ${binary:Version}), gnunet-daemon (>= 
${binary:Version}), gnunet-tools (>= ${binary:Version})
+Depends: gnunet-client (= ${binary:Version}), gnunet-server (= 
${binary:Version}), gnunet-tools (= ${binary:Version})
 Description: secure, trust-based peer-to-peer framework (meta)
  GNUnet is a peer-to-peer framework which focuses on providing security. All
  link-to-link messages in the network are confidential and authenticated. The
  framework provides a transport abstraction layer and can currently encapsulate
  the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
-  Homepage: <http://www.gnunet.org/>
- .
- This package is a meta-package depending on gnunet-client, gnunet-daemon and
+ This package is a meta-package depending on gnunet-client, gnunet-server and
  gnunet-tools.
 
 Package: gnunet-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gettext
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnunet-common (= 
${binary:Version}), gettext
 Suggests: libextractor-plugins
 Description: secure, trust-based peer-to-peer framework (client)
  GNUnet is a peer-to-peer framework which focuses on providing security. All
@@ -30,8 +30,6 @@
  framework provides a transport abstraction layer and can currently encapsulate
  the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
-  Homepage: <http://www.gnunet.org/>
- .
  This package contains the command line client applications, such as
  gnunet-search and gnunet-download.
 
@@ -44,46 +42,53 @@
  framework provides a transport abstraction layer and can currently encapsulate
  the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
-  Homepage: <http://www.gnunet.org/>
- .
  This package contains the common files.
 
-Package: gnunet-daemon
+Package: gnunet-dbg
+Section: devel
+Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, gettext
-Description: secure, trust-based peer-to-peer framework (daemon)
+Depends: gnunet-client (= ${binary:Version}), gnunet-common (= 
${binary:Version}), gnunet-dev (= ${binary:Version}), gnunet-server (= 
${binary:Version}), gnunet-tools (= ${binary:Version})
+Description: secure, trust-based peer-to-peer framework (debug)
  GNUnet is a peer-to-peer framework which focuses on providing security. All
  link-to-link messages in the network are confidential and authenticated. The
  framework provides a transport abstraction layer and can currently encapsulate
  the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
-  Homepage: <http://www.gnunet.org/>
+ This package contains the debugging symbols.
+
+Package: gnunet-server
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnunet-common (= 
${binary:Version}), adduser, gettext, netbase
+Conflicts: gnunet-daemon
+Replaces: gnunet-daemon
+Description: secure, trust-based peer-to-peer framework (server)
+ GNUnet is a peer-to-peer framework which focuses on providing security. All
+ link-to-link messages in the network are confidential and authenticated. The
+ framework provides a transport abstraction layer and can currently encapsulate
+ the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
- This package contains the daemon, needed to run a GNUnet node.
+ This package contains the server, needed to run a GNUnet node.
 
 Package: gnunet-dev
 Section: libdevel
 Architecture: any
-Depends: gnunet-daemon (>= ${binary:Version}), gnunet-client (>= 
${binary:Version}), gnunet-tools (>= ${binary:Version})
+Depends: gnunet-server (= ${binary:Version}), gnunet-client (= 
${binary:Version}), gnunet-tools (= ${binary:Version}), libextractor-dev (>= 
0.5.20)
 Description: secure, trust-based peer-to-peer framework (development)
  GNUnet is a peer-to-peer framework which focuses on providing security. All
  link-to-link messages in the network are confidential and authenticated. The
  framework provides a transport abstraction layer and can currently encapsulate
  the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
-  Homepage: <http://www.gnunet.org/>
- .
  This package contains the development files.
 
 Package: gnunet-tools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, gettext
+Depends: ${shlibs:Depends}, ${misc:Depends}, gnunet-common (= 
${binary:Version}), gettext
 Description: secure, trust-based peer-to-peer framework (tools)
  GNUnet is a peer-to-peer framework which focuses on providing security. All
  link-to-link messages in the network are confidential and authenticated. The
  framework provides a transport abstraction layer and can currently encapsulate
  the peer-to-peer traffic in UDP, TCP, or SMTP messages.
  .
-  Homepage: <http://www.gnunet.org/>
- .
  This package contains additional tools such as the gnunet-setup graphical 
tool.

Modified: GNUnet/debian/gnunet-client.install
===================================================================
--- GNUnet/debian/gnunet-client.install 2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-client.install 2008-04-17 08:47:49 UTC (rev 6719)
@@ -1,23 +1,43 @@
-/usr/bin/gnunet-dht-query
+/usr/bin/gnunet-auto-share
+/usr/bin/gnunet-chat
 /usr/bin/gnunet-directory
 /usr/bin/gnunet-download
 /usr/bin/gnunet-download-manager.scm
 /usr/bin/gnunet-insert
 /usr/bin/gnunet-pseudonym
+/usr/bin/gnunet-remotetest
 /usr/bin/gnunet-search
 /usr/bin/gnunet-stats
 /usr/bin/gnunet-tbench
-/usr/bin/gnunet-template
 /usr/bin/gnunet-tracekit
+/usr/bin/gnunet-unindex
 /usr/bin/gnunet-vpn
+/usr/lib/libgnunetchat_api.so.*
 /usr/lib/libgnunetcollection.so.*
 /usr/lib/libgnunetdht_api.so.*
 /usr/lib/libgnunetecrs.so.*
 /usr/lib/libgnunetfs.so.*
 /usr/lib/libgnunetfsui.so.*
 /usr/lib/libgnunetgetoption_api.so.*
+/usr/lib/libgnunetidentity_api.so.*
 /usr/lib/libgnunetnamespace.so.*
+/usr/lib/libgnunetremote_api.so.*
+/usr/lib/libgnunetrpc_util.so.*
 /usr/lib/libgnunetstats_api.so.*
+/usr/lib/libgnunettesting_api.so.*
+/usr/lib/libgnunettracekit_api.so.*
+/usr/lib/libgnunettraffic_api.so.*
 /usr/lib/libgnuneturitrack.so.*
-/usr/lib/libgnunetidentity_api.so.*
-/usr/lib/libgnunetrpc_util.so.*
+/usr/share/man/man1/gnunet-auto-share.1
+/usr/share/man/man1/gnunet-chat.1
+/usr/share/man/man1/gnunet-directory.1
+/usr/share/man/man1/gnunet-download.1
+/usr/share/man/man1/gnunet-download-manager.1
+/usr/share/man/man1/gnunet-insert.1
+/usr/share/man/man1/gnunet-pseudonym.1
+/usr/share/man/man1/gnunet-search.1
+/usr/share/man/man1/gnunet-stats.1
+/usr/share/man/man1/gnunet-tbench.1
+/usr/share/man/man1/gnunet-tracekit.1
+/usr/share/man/man1/gnunet-unindex.1
+/usr/share/man/man1/gnunet-vpn.1

Modified: GNUnet/debian/gnunet-common.install
===================================================================
--- GNUnet/debian/gnunet-common.install 2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-common.install 2008-04-17 08:47:49 UTC (rev 6719)
@@ -1,3 +1,3 @@
 /usr/lib/libgnunetutil.so.*
-/usr/lib/libgnunetecrs_core.so.*
+/usr/lib/libgnunetutil.so.*
 /usr/share/locale/*/LC_MESSAGES/GNUnet.mo

Modified: GNUnet/debian/gnunet-dev.install
===================================================================
--- GNUnet/debian/gnunet-dev.install    2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-dev.install    2008-04-17 08:47:49 UTC (rev 6719)
@@ -2,3 +2,5 @@
 /usr/lib/*.so
 /usr/lib/*.la
 /usr/lib/GNUnet/*.la
+/usr/share/GNUnet/gnunet-testing.conf
+/usr/share/man/man1/gnunet-testbed.1

Modified: GNUnet/debian/gnunet-server.README.Debian
===================================================================
--- GNUnet/debian/gnunet-server.README.Debian   2008-04-17 07:15:19 UTC (rev 
6718)
+++ GNUnet/debian/gnunet-server.README.Debian   2008-04-17 08:47:49 UTC (rev 
6719)
@@ -3,11 +3,11 @@
 
 GNUnet starts by default at boot time. To change the default behaviour, run:
 
-       # dpkg-reconfigure -plow gnunet-daemon
+       # dpkg-reconfigure -plow gnunet-server
 
-In order to start, stop or restart manually the daemon, use:
+In order to start, stop or restart manually the server, use:
 
-       # /etc/init.d/gnunet-daemon
+       # /etc/init.d/gnunet-server
 
 with the parameter start, stop or restart.
 

Modified: GNUnet/debian/gnunet-server.config
===================================================================
--- GNUnet/debian/gnunet-server.config  2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-server.config  2008-04-17 08:47:49 UTC (rev 6719)
@@ -1,19 +1,18 @@
 #!/bin/sh
-# Author: Arnaud Kyheng <address@hidden>
 
 set -e
 
 # Source debconf library.
 . /usr/share/debconf/confmodule
 
-# Ask for GNUnet daemon user
-db_input medium gnunet-daemon/gnunet_user || true
+# Ask for GNUnet server user
+db_input medium gnunet-server/gnunet_user || true
 db_go
 
-# Ask for GNUnet daemon group
-db_input medium gnunet-daemon/gnunet_group || true
+# Ask for GNUnet server group
+db_input medium gnunet-server/gnunet_group || true
 db_go
 
 # Ask for GNUnet autostart
-db_input high gnunet-daemon/launch_at_startup || true
+db_input high gnunet-server/launch_at_startup || true
 db_go

Modified: GNUnet/debian/gnunet-server.dirs
===================================================================
--- GNUnet/debian/gnunet-server.dirs    2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-server.dirs    2008-04-17 08:47:49 UTC (rev 6719)
@@ -1,3 +1,2 @@
 /var/lib/gnunet
-/var/run/gnunetd
 /var/log/gnunetd

Modified: GNUnet/debian/gnunet-server.init
===================================================================
--- GNUnet/debian/gnunet-server.init    2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-server.init    2008-04-17 08:47:49 UTC (rev 6719)
@@ -1,14 +1,14 @@
 #!/bin/sh
 
 ### BEGIN INIT INFO
-# Provides:            gnunet-daemon
+# Provides:            gnunet-server
 # Required-Start:      $syslog $network $local_fs
 # Required-Stop:       $syslog $network $local_fs
 # Should-Start:
 # Should-Stop:
 # Default-Start:       2 3 4 5
 # Default-Stop:                0 1 6
-# Short-Description:   Starts the GNUnet daemon at boot time.
+# Short-Description:   Starts the GNUnet server at boot time.
 # Description:         GNUnet is a secure, trust-based peer-to-peer framework.
 ### END INIT INFO
 
@@ -24,11 +24,19 @@
 set -e
 
 # Get configuration
-if [ -r /etc/default/gnunet-daemon ]
+if [ -r /etc/default/gnunet-server ]
 then
-       . /etc/default/gnunet-daemon
+       . /etc/default/gnunet-server
 fi
 
+#check if /var/run/gnunetd exists
+if ! [ -d /var/run/gnunetd ]
+then
+       mkdir /var/run/gnunetd
+fi
+       #chown the var dir
+       chown ${GNUNET_USER}:${GNUNET_GROUP} /var/run/gnunetd
+
 case "${1}" in
        start)
                # We should not need --background, but if not here, the
@@ -38,14 +46,14 @@
 
                echo -n "Starting ${DESC}: "
                start-stop-daemon --start --background --chuid ${GNUNET_USER} \
-                       --pidfile "$PIDFILE" --exec ${DAEMON} -- -c \
+                       --pidfile "${PIDFILE}" --exec ${DAEMON} -- -c \
                        /etc/gnunetd.conf
                echo "${NAME}."
                ;;
 
        stop)
                echo -n "Stopping ${DESC}: "
-               start-stop-daemon --stop --pidfile $PIDFILE --exec ${DAEMON} \
+               start-stop-daemon --stop --pidfile ${PIDFILE} --exec ${DAEMON} \
                        --retry 15 --oknodo
                echo "${NAME}."
                ;;

Modified: GNUnet/debian/gnunet-server.install
===================================================================
--- GNUnet/debian/gnunet-server.install 2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-server.install 2008-04-17 08:47:49 UTC (rev 6719)
@@ -3,6 +3,12 @@
 /usr/bin/gnunet-peer-info
 /usr/bin/gnunet-update
 /usr/lib/libgnunetcore.so.*
+/usr/lib/libgnunetip.so.*
 /usr/lib/GNUnet/libgnunetmodule_*.so
 /usr/lib/GNUnet/libgnunettransport_*.so
-/usr/lib/libgnunetip.so.*
+/usr/share/man/man1/gnunetd.1
+/usr/share/man/man1/gnunet-peer-info.1
+/usr/share/man/man1/gnunet-transport-check.1
+/usr/share/man/man1/gnunet-update.1
+/usr/share/man/man5/gnunet.conf.5
+/usr/share/man/man5/gnunetd.conf.5

Modified: GNUnet/debian/gnunet-server.postinst
===================================================================
--- GNUnet/debian/gnunet-server.postinst        2008-04-17 07:15:19 UTC (rev 
6718)
+++ GNUnet/debian/gnunet-server.postinst        2008-04-17 08:47:49 UTC (rev 
6719)
@@ -1,5 +1,4 @@
 #!/bin/sh
-# Author: Arnaud Kyheng <address@hidden>
 
 set -e
 
@@ -9,43 +8,40 @@
                . /usr/share/debconf/confmodule
 
                # Read default values
-               CONFIG_FILE=/etc/default/gnunet-daemon
+               CONFIG_FILE="/etc/default/gnunet-server"
 
-               # Check for GNUNETD_HOME consistancy
-               # Look for historical location of GNUNETD_HOME
-               GNUNETD_HOME=`gnunet-update --get=PATHS:GNUNETD_HOME`
-               if [ ! $GNUNETD_HOME ] || [ ! -d "$GNUNETD_HOME" ]; then
-                       # Set up the new section and value
-                       echo -n "Updating /etc/gnunetd.conf with new [PATHS] 
mandatory section"
-                       GNUNETD_HOME=`gnunet-update --get=GNUNETD:GNUNETD_HOME`
-                       if [ ! $GNUNETD_HOME ] || [ ! -d "$GNUNETD_HOME" ]; then
-                               # using default value
-                               GNUNETD_HOME="/var/lib/GNUnet"
-                       fi
-                       CONFIG_NEW=`/bin/tempfile`
-                       cat > $CONFIG_NEW <<EOF
+               GNUNETD_HOME="`gnunet-update --get=PATHS:GNUNETD_HOME`" || true
+
+               if [ ! -d "${GNUNETD_HOME}" ]
+               then
+                       echo -n "Updating /etc/gnunetd.conf with new [PATHS] 
mandatory section: "
+
+                       # Using default value
+                       GNUNETD_HOME="/var/lib/gnunet"
+
+                       CONFIG_NEW="`/bin/tempfile`"
+
+cat > "${CONFIG_NEW}" << EOF
 [PATHS]
-GNUNETD_HOME = $GNUNETD_HOME
+GNUNETD_HOME = ${GNUNETD_HOME}
 
 EOF
-                       sed '/^GNUNETD_HOME/d' /etc/gnunetd.conf >> $CONFIG_NEW
+
+                       sed '/^GNUNETD_HOME/d' /etc/gnunetd.conf >> 
"${CONFIG_NEW}"
                        mv -f /etc/gnunetd.conf /etc/gnunetd.conf.bak
-                       cp -f $CONFIG_NEW /etc/gnunetd.conf
-                       rm -f $CONFIG_NEW
+                       cp -f "${CONFIG_NEW}" /etc/gnunetd.conf
+                       rm -f "${CONFIG_NEW}"
                        chmod 644 /etc/gnunetd.conf
-                       echo " [done]"
+
+                       echo "done."
                fi
 
-               # This is need to migrate data from 0.6.1b or later
-               echo "Migrating previous GNUnet data (gnunet-update)"
-               gnunet-update
-
                # Read debconf values
-               db_get gnunet-daemon/gnunet_user
+               db_get gnunet-server/gnunet_user
                gnunet_user="${RET}"
-               db_get gnunet-daemon/gnunet_group
+               db_get gnunet-server/gnunet_group
                gnunet_group="${RET}"
-               db_get gnunet-daemon/launch_at_startup
+               db_get gnunet-server/launch_at_startup
                launch_at_startup="${RET}"
 
                # Creating gnunet group if needed
@@ -67,10 +63,13 @@
                # Update files and directories permissions.
                # Assuming default values, this *should* not be changed.
                echo -n "Updating files and directories permissions: "
-               chown -R ${gnunet_user}:${gnunet_group} /var/run/gnunetd
+               
                chown -R ${gnunet_user}:${gnunet_group} /var/log/gnunetd
                # Use the new "gnunet-update -g"
-               GNUNETD_HOME=`gnunet-update --get=GNUNETD:GNUNETD_HOME`
+               if [ -z "${GNUNETD_HOME}" ]
+               then
+                       GNUNETD_HOME=`gnunet-update --get=GNUNETD:GNUNETD_HOME`
+               fi
                chown -R ${gnunet_user}:${gnunet_group} ${GNUNETD_HOME}
                echo  "done."
 
@@ -81,7 +80,7 @@
 cat > "${CONFIG_NEW}" <<EOF
 # This file controls the behaviour of the GNUnet init script.
 # It will be parsed as a shell script.
-# please do not edit by hand, use 'dpkg-reconfigure gnunet-daemon'.
+# please do not edit by hand, use 'dpkg-reconfigure gnunet-server'.
 
 GNUNET_USER=${gnunet_user}
 GNUNET_GROUP=${gnunet_group}
@@ -93,35 +92,40 @@
                # Secure access to the data directory
                chmod 0700 "${GNUNETD_HOME}" || true
 
+               # This is need to migrate data from 0.6.1b or later
+               echo -n "Migrating previous GNUnet data (gnunet-update): "
+               gnunet-update
+               echo "done."
+
                # Cleaning
                rm -f "${CONFIG_NEW}"
                echo "All done."
 
                if [ "${launch_at_startup}" = "true" ]
                then
-                       if [ -x /etc/init.d/gnunet-daemon ]
+                       if [ -x /etc/init.d/gnunet-server ]
                        then
-                               update-rc.d gnunet-daemon defaults > /dev/null 
2>&1 || true
+                               update-rc.d gnunet-server defaults > /dev/null 
2>&1 || true
 
                                if [ -x /usr/sbin/invoke-rc.d ]
                                then
-                                       invoke-rc.d gnunet-daemon start || true
+                                       invoke-rc.d gnunet-server start || true
                                else
-                                       /etc/init.d/gnunet-daemon start || true
+                                       /etc/init.d/gnunet-server start || true
                                fi
                        fi
                else
-                       if [ -x /etc/init.d/gnunet-daemon ]
+                       if [ -x /etc/init.d/gnunet-server ]
                        then
                                if [ -x /usr/sbin/invoke-rc.d ]
                                then
-                                       invoke-rc.d gnunet-daemon stop || true
+                                       invoke-rc.d gnunet-server stop || true
                                else
-                                       /etc/init.d/gnunet-daemon stop || true
+                                       /etc/init.d/gnunet-server stop || true
                                fi
                        fi
 
-                       update-rc.d -f gnunet-daemon remove > /dev/null 2>&1 || 
true
+                       update-rc.d -f gnunet-server remove > /dev/null 2>&1 || 
true
                fi
                ;;
 

Modified: GNUnet/debian/gnunet-server.postrm
===================================================================
--- GNUnet/debian/gnunet-server.postrm  2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-server.postrm  2008-04-17 08:47:49 UTC (rev 6719)
@@ -4,7 +4,7 @@
 
 case "${1}" in
        purge)
-               update-rc.d -f gnunet-daemon remove > /dev/null 2>&1 || exit 0
+               update-rc.d -f gnunet-server remove > /dev/null 2>&1 || true
 
                rm -rf /var/log/gnunetd
                rm -rf /var/run/gnunetd

Modified: GNUnet/debian/gnunet-server.prerm
===================================================================
--- GNUnet/debian/gnunet-server.prerm   2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-server.prerm   2008-04-17 08:47:49 UTC (rev 6719)
@@ -2,13 +2,13 @@
 
 set -e
 
-if [ -x /etc/init.d/gnunet-daemon ]
+if [ -x /etc/init.d/gnunet-server ]
 then
        if [ -x /usr/sbin/invoke-rc.d ]
        then
-               invoke-rc.d gnunet-daemon stop || exit 0
+               invoke-rc.d gnunet-server stop || exit "${?}"
        else
-               /etc/init.d/gnunet-daemon stop || exit 0
+               /etc/init.d/gnunet-server stop || exit "${?}"
        fi
 fi
 

Modified: GNUnet/debian/gnunet-server.templates
===================================================================
--- GNUnet/debian/gnunet-server.templates       2008-04-17 07:15:19 UTC (rev 
6718)
+++ GNUnet/debian/gnunet-server.templates       2008-04-17 08:47:49 UTC (rev 
6719)
@@ -7,28 +7,73 @@
 # Even minor modifications require translation updates and such
 # changes should be coordinated with translators and reviewers.
 
-Template: gnunet-daemon/launch_at_startup
+# Obsolete, should be removed
+Template: gnunet-server/warning
+Type: note
+_Description: Former installation of GNUnet detected
+ Since there are important changes in this version, the installer
+ will need to modify the GNUnet configuration file (/etc/gnunet.conf).
+ .
+ The installation process will backup /etc/gnunet.conf to
+ /etc/gnunet.conf.old, and will automatically build a new configuration
+ file.
+ .
+ Every personal settings will be preserved as much as possible.
+
+# Obsolete, should be removed
+Template: gnunet-server/failed
+Type: note
+_Description: Warning
+ For some obscure reason, the installer have failed to discover
+ the configuration settings in /etc/gnunet.conf.
+ .
+ The old configuration file will be moved to /etc/gnunet.conf.old.
+ .
+ Since some changes are *mandatory* in this file, a
+ fresh default configuration file will now be installed
+ .
+ Please take a look and make necessary changes in it if needed after
+ installation.
+
+# Obsolete, should be removed
+Template: gnunet-server/prior_07
+Type: note
+_Description: Upgrade from a version prior to 0.7.0
+ It seems that you are upgrading GNUnet from a version prior to 0.7.x.
+ GNUnet 0.7.x introduced new configuration files and a new database
+ storage format which is not compatible with versions prior to 0.7.x.
+ .
+ GNUnet cannot convert your database format to the new format.
+ .
+ Your database storage will be automatically moved to /var/lib/GNUnet.prior07,
+ and the gnunet package will build a new empty storage for you.
+ .
+ Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07
+ and replaced by /etc/gnunetd.conf which you can modify later by running
+ "gnunet-setup -d -c /etc/gnunetd.conf", as root.
+
+Template: gnunet-server/launch_at_startup
 Type: boolean
 Default: true
-_Description: Should the GNUnet daemon be launched on boot?
- If you choose this option, a GNUnet server will be started each time
- the system is launched. Otherwise, you will need to launch
+_Description: Should the GNUnet server be launched on boot?
+ If you choose this option, a GNUnet server will be launched each time
+ the system is started. Otherwise, you will need to launch
  GNUnet each time you want to use it.
 
-Template: gnunet-daemon/gnunet_user
+Template: gnunet-server/gnunet_user
 Type: string
 Default: gnunet
 _Description: GNUnet user:
- Please choose the user that the GNUnet daemon process will run as.
+ Please choose the user that the GNUnet server process will run as.
  .
  This should be a dedicated account. If the specified account does not
  already exist, it will automatically be created, with no login shell.
 
-Template: gnunet-daemon/gnunet_group
+Template: gnunet-server/gnunet_group
 Type: string
 Default: gnunet
 _Description: GNUnet group:
- Please choose the group that the GNUnet daemon process will run as.
+ Please choose the group that the GNUnet server process will run as.
  .
  This should be a dedicated group, not one that already owns data.
  Only the members of this group will have access to GNUnet data, and

Modified: GNUnet/debian/gnunet-tools.install
===================================================================
--- GNUnet/debian/gnunet-tools.install  2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/gnunet-tools.install  2008-04-17 08:47:49 UTC (rev 6719)
@@ -5,3 +5,4 @@
 /usr/share/GNUnet/config-daemon.scm
 /usr/share/GNUnet/gnunet-logo-color.png
 /usr/share/GNUnet/gnunet-setup.glade
+/usr/share/man/man1/gnunet-setup.1

Modified: GNUnet/debian/lintian/gnunet-client
===================================================================
--- GNUnet/debian/lintian/gnunet-client 2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/lintian/gnunet-client 2008-04-17 08:47:49 UTC (rev 6719)
@@ -1 +1,3 @@
+# internal libraries are not splitted out into a dedicated package to avoid
+# micropackaging.
 gnunet-client: package-name-doesnt-match-sonames

Modified: GNUnet/debian/lintian/gnunet-common
===================================================================
--- GNUnet/debian/lintian/gnunet-common 2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/lintian/gnunet-common 2008-04-17 08:47:49 UTC (rev 6719)
@@ -1 +1,3 @@
+# internal libraries are not splitted out into a dedicated package to avoid
+# micropackaging.
 gnunet-common: package-name-doesnt-match-sonames

Modified: GNUnet/debian/lintian/gnunet-server
===================================================================
--- GNUnet/debian/lintian/gnunet-server 2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/lintian/gnunet-server 2008-04-17 08:47:49 UTC (rev 6719)
@@ -1 +1,3 @@
-gnunet-daemon: package-name-doesnt-match-sonames
+# internal libraries are not splitted out into a dedicated package to avoid
+# micropackaging.
+gnunet-server: package-name-doesnt-match-sonames

Modified: GNUnet/debian/lintian/gnunet-tools
===================================================================
--- GNUnet/debian/lintian/gnunet-tools  2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/lintian/gnunet-tools  2008-04-17 08:47:49 UTC (rev 6719)
@@ -1 +1,3 @@
+# internal libraries are not splitted out into a dedicated package to avoid
+# micropackaging.
 gnunet-tools: package-name-doesnt-match-sonames

Modified: GNUnet/debian/po/POTFILES.in
===================================================================
--- GNUnet/debian/po/POTFILES.in        2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/POTFILES.in        2008-04-17 08:47:49 UTC (rev 6719)
@@ -1 +1 @@
-[type: gettext/rfc822deb] gnunet-daemon.templates
+[type: gettext/rfc822deb] gnunet-server.templates

Modified: GNUnet/debian/po/cs.po
===================================================================
--- GNUnet/debian/po/cs.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/cs.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: gnunet\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: 2007-06-23 12:42+0200\n"
 "Last-Translator: Miroslav Kure <address@hidden>\n"
 "Language-Team: Czech <address@hidden>\n"
@@ -23,18 +23,137 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Byla rozpoznána předchozí instalace GNUnet"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+"Protože se v této verzi udály významné změny, je nutné upravit váš "
+"konfigurační soubor GNUnet (/etc/gnunet.conf)."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"Instalační proces zazálohuje /etc/gnunet.conf do /etc/gnunet.conf.old a "
+"automaticky vytvoří nový konfigurační soubor."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr "Všechna osobní nastavení byla pokud možno zachována."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Varování"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"Z nějakého obskurního důvodu nerozpoznal instalátor v souboru /etc/gnunet."
+"conf žádné nastavení."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr "Starý konfigurační soubor bude přesunut do /etc/gnunet.conf.old."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"Protože jsou některé změny v tomto souboru *povinné*, nainstaluje se nyní "
+"výchozí konfigurační soubor."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr "Po instalaci jej projděte a případně proveďte nezbytné změny."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Přechod z dřívější verze než 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+"Zdá se, že aktualizujete GNUnet z dřívější verze než 0.7.x. GNUnet 0.7.x "
+"zavedl nový formát konfiguračních souborů a nový formát uložení databáze, "
+"které nejsou kompatibilní s verzemi před 0.7.x."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr "GNUnet nemůže převést váš formát databáze do nového formátu."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+"Vaše databáze bude automaticky přesunuta do /var/lib/GNUnet.prior07 a balík "
+"gnunet vám automaticky vytvoří novou, prázdnou databázi."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+"Také váš konfigurační soubor /etc/gnunet.conf bude přesunut do /etc/gnunet."
+"conf.prior07 a bude nahrazen novějším /etc/gnunet.conf, který můžete později "
+"upravit spuštěním příkazu \"gnunet-setup -d -c /etc/gnunet.conf\" jako "
+"uživatel root."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
-msgstr "Má se daemon GNUnet spouštět při zavádění systému?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
+msgstr "Má se server GNUnet spouštět při zavádění systému?"
 
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
+#: ../gnunet-server.templates:5001
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Zvolíte-li tuto možnost, bude se server GNUnet spouštět při každém zavádění "
@@ -43,19 +162,19 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr "Uživatel GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Please choose the user that the GNUnet daemon process will run as."
-msgstr "Zadejte prosím uživatele, pod kterým se bude daemon GNUnet spouštět."
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
+msgstr "Zadejte prosím uživatele, pod kterým se bude server GNUnet spouštět."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
@@ -65,19 +184,19 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr "Skupina GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-msgid "Please choose the group that the GNUnet daemon process will run as."
-msgstr "Zadejte prosím skupinu, pod kterou se bude daemon GNUnet spouštět."
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
+msgstr "Zadejte prosím skupinu, pod kterou se bude server GNUnet spouštět."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "
@@ -86,3 +205,17 @@
 "Mělo by jít o dedikovanou skupinu různou od té, která již vlastní data. "
 "Pouze členové této skupiny budou mít přístup k datům GNUnetu a budou moci "
 "spouštět a zastavovat server GNUnet."
+
+#~ msgid ""
+#~ "If you choose this option, that user will automatically be created  as a "
+#~ "system user, for whom no login will be allowed."
+#~ msgstr ""
+#~ "Zvolíte-li tuto možnost, bude tento uživatel automaticky vytvořen jako "
+#~ "systémový a bude mu zakázáno přihlášení."
+
+#~ msgid ""
+#~ "For security reason, the best is to create a new group for this, and make "
+#~ "sure that it owns no data beside GNUnet's ones."
+#~ msgstr ""
+#~ "Z bezpečnostních důvodů je nejlepší vytvořit novou skupinu, která "
+#~ "nevlastní kromě GNUnetu žádná jiná data."

Modified: GNUnet/debian/po/de.po
===================================================================
--- GNUnet/debian/po/de.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/de.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.7.1c-2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: 2007-06-20 17:29+0200\n"
 "Last-Translator: Helge Kreutzmann <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -14,18 +14,143 @@
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "�ltere Installation von GNUnet erkannt"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+"Da es wichtige �nderungen in dieser Version gibt, muss das "
+"Installationsprogramm die GNUnet-Konfigurationsdatei (/etc/gnunet.conf) "
+"anpassen."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"Der Installationsprozess wird eine Sicherungskopie von /etc/gnunet.conf als /"
+"etc/gnunet.conf.old anlegen und automatisch eine neue Konfigurationsdatei "
+"aufbauen."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr "Soweit wie m�glich bleiben alle pers�nlichen Einstellungen erhalten."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Warnung"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"Aus irgendwelchen obskuren Gr�nden ist es dem Installationsprogramm nicht "
+"gelungen, die Konfigurationseinstellungen aus /etc/gnunet.conf auszulesen."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr "Die alte Konfigurationsdatei wird in /etc/gnunet.conf.old umbenannt."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"Da einige �nderungen an dieser Datei *zwingend* sind, wird jetzt eine "
+"frische Standardkonfigurationsdatei installiert."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr ""
+"Bitte �berpr�fen Sie diese und nehmen Sie bei Bedarf nach der Installation "
+"die notwendigen �nderungen vor."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Upgrade von einer Version vor 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+"Es scheint, dass Sie ein Upgrade von GNUnet von einer Version vor 0.7.x "
+"durchf�hren. GNUnet 0.7.x f�hrte neue Konfigurationsdateien und ein neues "
+"Datenbankspeicherformat ein, die nicht mit denen von Versionen vor 0.7.x "
+"kompatibel sind."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr "GNUnet kann Ihr Datenbankformat nicht in das neue Format konvertieren."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+"Ihre Datenbankspeicherung wird automatisch nach /var/lib/GNUnet.prior07 "
+"verschoben und das GNUnet-Paket wird eine neue, leere Speicherung f�r Sie "
+"erstellen."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+"Auch Ihre /etc/gnunet.conf-Datei wird nach /etc/gnunet.conf.prior07 "
+"verschoben und durch /etc/gnunetd.conf ersetzt, die Sie sp�ter als Root "
+"mittels Ausf�hrung von �gnunet-setup -d -c /etc/gnunetd.conf� ver�ndern "
+"k�nnen."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
 msgstr "Soll der GNUnet-Daemon beim Systemstart aktiviert werden?"
 
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
+#: ../gnunet-server.templates:5001
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Falls Sie diese Option ausw�hlen, wird ein GNUnet-Server jedes Mal "
@@ -34,21 +159,21 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr "GNUnet-Benutzer:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Please choose the user that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
 msgstr ""
 "Bitte w�hlen Sie den Benutzer aus, unter dessen Kennung der GNUnet-"
 "Daemonprozess laufen wird."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
@@ -58,21 +183,21 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr "GNUnet-Gruppe:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-msgid "Please choose the group that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
 msgstr ""
 "Bitte w�hlen Sie die Gruppe, unter deren Kennung der GNUnet-Daemonprozess "
 "laufen wird."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "
@@ -82,3 +207,38 @@
 "besitzt. Nur die Mitglieder dieser Gruppe werden Zugriff auf GNUnet-Daten "
 "haben und nur ihnen wird es erlaubt, den GNUnet-Server zu starten und zu "
 "beenden."
+
+#~ msgid ""
+#~ "Only the members of this group are allowed to start and stop the GNUnet "
+#~ "server and have access to GNUnet data."
+#~ msgstr ""
+#~ "Nur die Mitglieder dieser Gruppe d�rfen den GNUnet-Server starten und "
+#~ "stoppen und haben Zugriff auf die GNUnet-Daten."
+
+#~ msgid "Launch at startup?"
+#~ msgstr "Beim Systemstart starten?"
+
+#~ msgid "Setup GNUnet as a system service."
+#~ msgstr "GNUnet als Systemdienst einrichten."
+
+#~ msgid ""
+#~ "For security reasons, it's best to create a new user exclusively for  "
+#~ "GNUnet."
+#~ msgstr ""
+#~ "Aus Sicherheitsgr�nden ist es am besten, einen neuen Benutzer exklusiv "
+#~ "f�r GNUnet zu erstellen."
+
+#~ msgid ""
+#~ "If you choose this option, that user will automatically be created  as a "
+#~ "system user, for whom no login will be allowed."
+#~ msgstr ""
+#~ "Falls Sie diese Option w�hlen, wird dieser Benutzer automatisch als "
+#~ "Systembenutzer erstellt, f�r den kein Login erlaubt wird."
+
+#~ msgid ""
+#~ "For security reason, the best is to create a new group for this, and make "
+#~ "sure that it owns no data beside GNUnet's ones."
+#~ msgstr ""
+#~ "Aus Sicherheitsgr�nden ist es am besten, eine neue Gruppe hierf�r zu "
+#~ "erstellen und sicherzustellen, dass sie keine Daten au�er denen f�r "
+#~ "GNUnet besitzt."

Modified: GNUnet/debian/po/es.po
===================================================================
--- GNUnet/debian/po/es.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/es.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -30,7 +30,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.7.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: 2007-05-26 00:47-0500\n"
 "Last-Translator: César Gómez Martín <address@hidden>\n"
 "Language-Team: Debian l10n spanish <address@hidden>\n"
@@ -41,23 +41,149 @@
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Se ha detectado una instalación antigua de GNUnet"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+"El instalador necesitará modificar el fichero de configuración de GNUnet (/"
+"etc/gnunet.conf) puesto que hay cambios importantes en esta versión."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"El proceso de instalación hará copia de seguridad del fichero /etc/gnunet."
+"conf en /etc/gnunet.conf.old, y construirá automáticamente un nuevo fichero "
+"de configuración."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr ""
+"Se intentará mantener sus configuraciones personales tanto como sea posible."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Advertencia"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"Por alguna extraña razón, el instalador no ha podido encontrar sus "
+"configuraciones en /etc/gnunet.conf."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr "Se moverá su antiguo fichero de configuración a /etc/gnunet.conf.old."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"Ahora se instalará un nuevo fichero de configuración debido a que algunos "
+"cambios en este fichero son *obligatorios*."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr ""
+"Por favor, eche un vistazo y, si es necesario, haga los cambios que se "
+"necesiten después de la instalación."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Actualización desde una versión anterior a la 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+"Parece que está actualizando GNUnet desde una versión anterior a la 0.7.x. "
+"Se han introducido en GNUnet 0.7.x nuevos ficheros de configuración y un "
+"nuevo formato de almacenamiento que no es compatible con versiones "
+"anteriores a 0.7.x."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr ""
+"GNUnet no puede convertir el formato de su base de datos al nuevo formato."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+"El almacenamiento de su base de datos se moverá automáticamente a /var/lib/"
+"GNUnet.prior07, y el paquete gnunet construirá un nuevo almacenamiento vacío "
+"para usted."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+"También se moverá su fichero /etc/gnunet.conf a /etc/gnunet.conf.prior07 y "
+"se reemplazará por el fichero /etc/gnunetd.conf que podrá modificar "
+"posteriormente ejecutando «gnunet-setup -d -c /etc/gnunetd.conf» como "
+"superusuario."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
+#: ../gnunet-server.templates:5001
 #, fuzzy
 #| msgid ""
 #| "If you accept here, a GNUnet server will be started each time your "
 #| "machine starts.  If you decline this option, you need to launch GNUnet "
 #| "each time you want to use it."
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Si aquí responde afirmativamente se iniciará un servidor GNUnet cada vez que "
@@ -66,21 +192,21 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr "Usuario GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 #, fuzzy
-#| msgid "Define the user owning the GNUnet daemon process."
-msgid "Please choose the user that the GNUnet daemon process will run as."
+#| msgid "Define the user owning the GNUnet server process."
+msgid "Please choose the user that the GNUnet server process will run as."
 msgstr "Indique el usuario al que pertenecerá el proceso demonio GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
@@ -88,23 +214,61 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr "Grupo GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 #, fuzzy
-#| msgid "Define the group owning the GNUnet daemon process."
-msgid "Please choose the group that the GNUnet daemon process will run as."
+#| msgid "Define the group owning the GNUnet server process."
+msgid "Please choose the group that the GNUnet server process will run as."
 msgstr "Indique el grupo al que pertenecerá el proceso demonio GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "
 "start and stop the GNUnet server."
 msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| "Only the members of this group are allowed to start and stop the GNUnet "
+#~| "server and  have access to GNUnet data."
+#~ msgid ""
+#~ "Only the members of this group are allowed to start and stop the GNUnet "
+#~ "server and have access to GNUnet data."
+#~ msgstr ""
+#~ "Sólo los miembros de este grupo tienen acceso a los datos de GNUnet y "
+#~ "permiso tanto para iniciar como para parar el servidor. "
+
+#~ msgid "Launch at startup?"
+#~ msgstr "¿Arrancar en el inicio?"
+
+#~ msgid "Setup GNUnet as a system service."
+#~ msgstr "Configuración de GNUnet como un servicio del sistema."
+
+#~ msgid ""
+#~ "For security reasons, it's best to create a new user exclusively for  "
+#~ "GNUnet."
+#~ msgstr ""
+#~ "Por razones de seguridad es aconsejable crear un nuevo usuario exclusivo "
+#~ "para GNUnet."
+
+#~ msgid ""
+#~ "If you choose this option, that user will automatically be created  as a "
+#~ "system user, for whom no login will be allowed."
+#~ msgstr ""
+#~ "Ese usuario se creará automáticamente como un usuario del sistema si "
+#~ "selecciona esta opción, el usuario no podrá entrar en el sistema."
+
+#~ msgid ""
+#~ "For security reason, the best is to create a new group for this, and make "
+#~ "sure that it owns no data beside GNUnet's ones."
+#~ msgstr ""
+#~ "Por razones de seguridad, lo mejor es crear un grupo nuevo para esto y "
+#~ "estar seguro de que no contiene ningún dato que no sea de GNUnet."

Modified: GNUnet/debian/po/fr.po
===================================================================
--- GNUnet/debian/po/fr.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/fr.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -1,98 +1,216 @@
+# Translation of gnunet debconf templates to French
+# This file is distributed under the same license as the gnunet package
 #
-#    Translators, if you are not familiar with the PO format, gettext
-#    documentation is worth reading, especially sections dedicated to
-#    this format, e.g. by running:
-#         info -n '(gettext)PO Files'
-#         info -n '(gettext)Header Entry'
-#
-#    Some information specific to po-debconf are available at
-#            /usr/share/doc/po-debconf/README-trans
-#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-#    Developers do not need to manually edit POT or PO files.
-#
+# Christian Perrier <address@hidden>, 2007.
+# Copyright information:
+# 2001-2006 Eric Madesclair <address@hidden>
+# 2007- Christian Perrier <address@hidden>
 msgid ""
 msgstr ""
-"Project-Id-Version: gnunet\n"
+"Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
-"PO-Revision-Date: 2005-10-18 18:27+0100\n"
-"Last-Translator: Eric Madesclair <address@hidden>\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
+"PO-Revision-Date: 2007-06-25 07:38+0200\n"
+"Last-Translator: Christian Perrier <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#. Type: boolean
+#. Type: note
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Ancienne installation de GNUnet détectée"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
 msgstr ""
+"Comme la nouvelle version comporte beaucoup de modifications, l'outil "
+"d'installation va modifier le fichier de configuration (/etc/gnunet.conf) en "
+"conséquence."
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"Le processus d'installation sauvegardera le fichier /etc/gnunet.conf dans /"
+"etc/gnunet.conf.old et créera un nouveau fichier de configuration."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr ""
+"Les paramètres de configuration personnalisés seront préservés autant "
+"que possible."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Impossible de déterminer les paramètres de configuration"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"Pour une raison indéterminée, le processus d'installation n'a pas pu "
+"déterminer les paramètres de configuration dans /etc/gnunet.conf."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr ""
+"L'ancien fichier de configuration sera déplacé dans /etc/gnunet.conf.old."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"Certains réglages sont devenus *obligatoires* et un nouveau fichier de "
+"configuration va donc être installé."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr ""
+"Veuillez vérifier ce fichier de configuration et faire les modifications "
+"nécessaires, si besoin, après l'installation."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Mise à jour depuis une version antérieure à la 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+"Il semble que vous mettiez à jour GNUnet depuis une version antérieure à "
+"la 0.7.x. Avec GNUnet 0.7.x, de nouveaux fichiers de configuration ont été "
+"ajoutés et le format des données de la base a été modifié. Ces "
+"modifications ne sont pas compatibles avec les versions antérieures à la "
+"0.7.x."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr ""
+"GNUnet ne peut pas convertir le format de la base de données dans le "
+"nouveau format."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+"Votre base de données sera déplacée automatiquement dans /var/lib/GNUnet."
+"prior07 et une nouvelle base vide sera créée pour vous."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+"Le fichier /etc/gnunet.conf a été renommé en /etc/gnunet.conf.prior07 et "
+"remplacé par un nouveau fichier /etc/gnunetd.conf que vous pourrez modifier "
+"plus tard en lançant la commande « gnunet-setup -d -c /etc/gnunetd.conf » "
+"en tant que superutilisateur (« root »)."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-#| msgid ""
-#| "If you accept here, a GNUnet server will be started each time your "
-#| "machine starts.  If you decline this option, you need to launch GNUnet "
-#| "each time you want to use it."
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
+msgstr "Faut-il lancer le démon GNUnet au démarrage du système ?"
+
+#. Type: boolean
+#. Description
+#: ../gnunet-server.templates:5001
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
-"Si vous choisissez cette option, le serveur GNUnet sera lanc� � chaque "
-"d�marrage de votre machine. Dans le cas contraire, vous devrez lancer vous-"
-"m�me GNUnet chaque que fois que vous souhaiterez l'utiliser."
+"Si vous choisissez cette option, le serveur GNUnet sera lancé à chaque "
+"démarrage de votre machine. Dans le cas contraire, vous devrez lancer vous-"
+"même GNUnet chaque fois que vous souhaiterez l'utiliser."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-#, fuzzy
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
-msgstr "Utilisateur GNUnet�:"
+msgstr "Utilisateur GNUnet :"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-#, fuzzy
-#| msgid "Define the user owning the GNUnet daemon process."
-msgid "Please choose the user that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
 msgstr ""
-"Veuillez indiquer l'utilisateur sous l'identit� duquel s'ex�cutera le d�mon "
-"GNUnet."
+"Veuillez indiquer l'identifiant qu'utilisera le démon GNUnet pendant son "
+"fonctionnement."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
 msgstr ""
+"Il est conseillé d'utiliser un identifiant dédié. S'il n'existe pas, il "
+"sera créé sans connexion interactive possible (pas de « shell »)."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
-msgstr "Groupe de GNUnet�:"
+msgstr "Groupe de GNUnet :"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-#| msgid "Define the group owning the GNUnet daemon process."
-msgid "Please choose the group that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
 msgstr ""
-"Veuillez indiquer le groupe sous l'identit� duquel s'ex�cutera le d�mon "
+"Veuillez indiquer le groupe sous l'identité duquel s'exécutera le démon "
 "GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "
 "start and stop the GNUnet server."
 msgstr ""
+"Il est conseillé d'utiliser un groupe dédié, qui ne possède pas déjà "
+"de données. Seuls les membres de ce groupe auront accès aux données de "
+"GNUnet et seront autorisés à démarrer et arrêter le serveur GNUnet."

Modified: GNUnet/debian/po/gl.po
===================================================================
--- GNUnet/debian/po/gl.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/gl.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: gnunet\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: 2007-06-11 13:21+0200\n"
 "Last-Translator: Jacobo Tarrio <address@hidden>\n"
 "Language-Team: Galician <address@hidden>\n"
@@ -14,18 +14,140 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Detectouse unha instalación anterior de GNUnet"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+"Como hai cambios importantes nesta versión, o instalador ha ter que "
+"modificar o ficheiro de configuración de GNUnet (/etc/gnunet.conf)."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"O proceso de instalación ha copiar /etc/gnunet.conf a /etc/gnunet.conf.old, "
+"e ha construír automaticamente un novo ficheiro de configuración."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr "Hase conservar cada configuración persoal o máximo que sexa posible."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Aviso"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"Por algún motivo, o instalador non puido descubrir a configuración de /etc/"
+"gnunet.conf."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr ""
+"Hase trasladar o ficheiro de configuración antigo a /etc/gnunet.conf.old."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"Xa que algúns cambios son *obrigatorios* neste ficheiro, hase instalar un "
+"novo ficheiro de configuración por defecto."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr ""
+"Bótelle unha ollada e faga os cambios necesarios nel trala instalación."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Actualizar dunha versión anterior á 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+"Semella que está a actualizar GNUnet dunha versión anterior á 0.7.x. GNUnet "
+"0.7.x introduciu novos ficheiros de configuración e un novo formato de "
+"armacenamento de base de datos que non é compatible coas versións anteriores "
+"á 0.7.x."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr "GNUnet non pode converter a base de datos ao novo formato."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+"Hase trasladar a súa base de datos automaticamente a /var/lib/GNUnet."
+"prior07, e o paquete gnunet ha construír unha nova base de datos baleira "
+"para vostede."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+"Tamén se ha trasladar o ficheiro /etc/gnunet.conf a /etc/gnunet.conf.prior07 "
+"e se ha substituír por /etc/gnunetd.conf, que ha poder modificar despois "
+"executando \"gnunet-setup -d -c /etc/gnunetd.conf\" coma administrador."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
 msgstr "¿Debe iniciarse o servizo GNUnet co sistema?"
 
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
+#: ../gnunet-server.templates:5001
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Se escolle esta opción, hase iniciar un servidor GNUnet cada vez que inicie "
@@ -33,19 +155,19 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr "Usuario de GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Please choose the user that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
 msgstr "Escolla o usuario co que se ha executar o servizo GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
@@ -55,19 +177,19 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr "Grupo de GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-msgid "Please choose the group that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
 msgstr "Escolla o grupo co que se ha executar o servizo GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "

Modified: GNUnet/debian/po/nl.po
===================================================================
--- GNUnet/debian/po/nl.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/nl.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -7,81 +7,144 @@
 msgstr ""
 "Project-Id-Version: gnunet\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
-"PO-Revision-Date: 2007-04-29 14:40+0100\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
+"PO-Revision-Date: 2008-02-26 17:44+0100\n"
 "Last-Translator: Bart Cornelis <address@hidden>\n"
 "Language-Team: debian-l10n-dutch <address@hidden>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: Dutch\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Er is een oudere installatie van GNUnet gevonden"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Since there are important changes in this version, the installer will 
need to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr "Aangezien er in deze versie belangrijke veranderingen zijn zal het 
installatieprogramma het configuratiebestand van GNUnet (/etc/gnunet.conf) 
moeten aanpassen."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "The installation process will backup /etc/gnunet.conf to 
/etc/gnunet.conf.old, and will automatically build a new configuration file."
+msgstr "Het installatieproces maakt eerst een reservekopie van de huidige 
/etc/gnunet.conf met de naam /etc/gnunet.conf.old, en maakt vervolgens een 
nieuw configuratiebestand."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr "Aangepaste instellingen worden zoveel mogelijk bewaard."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Waarschuwing"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "For some obscure reason, the installer have failed to discover the 
configuration settings in /etc/gnunet.conf."
+msgstr "Om onbekende reden is het installatieproces er niet in geslaagd om de 
configuratie-instellingen in /etc/gnunet.conf te ontdekken."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr "Het oude configuratiebestand wordt verplaatst naar 
/etc/gnunet.conf.old."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Since some changes are *mandatory* in this file, a fresh default 
configuration file will now be installed"
+msgstr "Aangezien sommige aanpassingen in de bestand *verplicht* zijn wordt er 
nu een nieuw standaard configuratiebestand geïnstalleerd."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Please take a look and make necessary changes in it if needed after 
installation."
+msgstr "Gelieve dit na de installatie na te kijken en indien nodig aan te 
passen."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Opwaardering van een versie ouder dan 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "It seems that you are upgrading GNUnet from a version prior to 0.7.x. 
GNUnet 0.7.x introduced new configuration files and a new database storage 
format which is not compatible with versions prior to 0.7.x."
+msgstr "Het lijkt erop dat u opwaardeert van een GNUnet versie ouder dan 
0.7.x. GNUnet 0.7.x heeft nieuwe configuratiebestanden en een nieuw 
database-opslagformaat ingevoerd die beide niet compatibel zijn met versies 
ouder dan 0.7.x."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr "GNUnet is niet in staat om uw database om te zetten naar het nieuwe 
formaat."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Your database storage will be automatically moved to 
/var/lib/GNUnet.prior07, and the gnunet package will build a new empty storage 
for you."
+msgstr "Uw database wordt automatisch verplaatst naar /var/lib/GNUnet.prior07, 
en er wordt een nieuwe lege database voor u aangemaakt."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Your /etc/gnunet.conf file will also be moved to 
/etc/gnunet.conf.prior07 and replaced by /etc/gnunetd.conf which you can modify 
later by running \"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr "Uw /etc/gnunet.conf wordt verplaatst naar /etc/gnunet.conf.prior07 en 
vervangen door /etc/gnunetd.conf. Dit nieuwe bestand kunt u later aanpassen 
door het commando 'gnunet-setup -d -c /etc/gnunetd.conf' uit te voeren als 
root."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
-msgstr ""
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
+msgstr "Wilt u dat de GNUnet-server opgestart wordt tijdens het opstarten van 
de computer?"
 
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-#, fuzzy
-#| msgid ""
-#| "If you accept here, a GNUnet server will be started each time your "
-#| "machine starts.  If you decline this option, you need to launch GNUnet "
-#| "each time you want to use it."
-msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
-"want to use it."
-msgstr ""
-"Als u dit aanvaard wordt de GNUnet-server telkens u het systeem opstart "
-"gestart. Als u dit afslaat dient u GNUnet handmatig te starten telkens u "
-"GNUnet wilt gebruiken."
+#: ../gnunet-server.templates:5001
+msgid "If you choose this option, a GNUnet server will be launched each time 
the system is started. Otherwise, you will need to launch GNUnet each time you 
want to use it."
+msgstr "Als u deze optie kiest wordt de GNUnet-server gestart telkens wanneer 
u het systeem opstart. Als u hier weigert dient u GNUnet handmatig te starten 
telkens wanneer u het wilt gebruiken."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr "GNUnet-gebruiker:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-#, fuzzy
-#| msgid "Define the user owning the GNUnet daemon process."
-msgid "Please choose the user that the GNUnet daemon process will run as."
-msgstr ""
-"Als welke gebruiker dient het GNUnet-achtergronddienstproces te draaien?"
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
+msgstr "Als welke gebruiker dient het GNUnet-serverproces te draaien?"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-msgid ""
-"This should be a dedicated account. If the specified account does not "
-"already exist, it will automatically be created, with no login shell."
-msgstr ""
+#: ../gnunet-server.templates:6001
+msgid "This should be a dedicated account. If the specified account does not 
already exist, it will automatically be created, with no login shell."
+msgstr "Dit dient een toegewezen account te zijn. Als de toegewezen account 
nog niet bestaat wordt deze automatisch en zonder login-shell aangemaakt."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr "GNUnet-groep:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-#, fuzzy
-#| msgid "Define the group owning the GNUnet daemon process."
-msgid "Please choose the group that the GNUnet daemon process will run as."
-msgstr ""
-"Welke groep dient eigenaar te zijn van het GNUnet-achtergronddienstproces?"
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
+msgstr "Als welke groep dient het GNUnet-serverproces te draaien?"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-msgid ""
-"This should be a dedicated group, not one that already owns data. Only the "
-"members of this group will have access to GNUnet data, and be allowed to "
-"start and stop the GNUnet server."
-msgstr ""
+#: ../gnunet-server.templates:7001
+msgid "This should be a dedicated group, not one that already owns data. Only 
the members of this group will have access to GNUnet data, and be allowed to 
start and stop the GNUnet server."
+msgstr "Dit dient een toegewezen groep te zijn die nog geen data bezit. Enkel 
de leden van deze groep hebben toegang tot de data van GNUnet, en kunnen de 
GNUnet-server starten en stoppen."
+

Modified: GNUnet/debian/po/pt.po
===================================================================
--- GNUnet/debian/po/pt.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/pt.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.7.0e-1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: 2007-06-11 08:26+0100\n"
 "Last-Translator: Rui Branco <address@hidden>\n"
 "Language-Team: Portuguese <address@hidden>\n"
@@ -16,18 +16,144 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Detectada uma instalação actual do GNUnet"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+"Pelo facto de existirem alterações importantes nesta versão, o instalador "
+"necessitará de modificar o ficheiro de configuração do GNUnet (/etc/gnunet."
+"conf)."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"O processo de instalação irá salvaguardar o ficheiro /etc/gnunet.conf para /"
+"etc/gnunet.conf.old e automaticamente construir um novo ficheiro de "
+"configuração."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr ""
+"Todas as configurações pessoais serão preservadas na medida do possível."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Aviso"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"Por alguma razão obscura, o instalador falhou na tentativa de detectar as "
+"suas configurações em /etc/gnunet.conf."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr "A antiga configuração será movida para /etc/gnunet.conf.old."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"Como algumas alterações neste ficheiro são *mandatórias*, uma nova "
+"configuração por omissão será instalada"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr ""
+"Perca um pouco de tempo e faça as alterações necessárias nele se for "
+"necessário depois da instalação."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Actualização a partir de uma versão anterior a 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+"Pareçe que está a actualizar o GNUnet a partir de uma versão anterior a 0.7."
+"x. O GNUnet 0.7.x introduziu novos ficheiros de configuração e um novo "
+"formato de base de dados que não é compatível com as versões anteriores a "
+"0.7.x."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr ""
+"O GNUnet não pode converter o formato da sua base de dados para o novo "
+"formato."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+"O local da base de dados será automaticamente movido para /var/lib/GNUnet."
+"prior07, o pacote gnunet criará um novo local vazio para si."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+"O seu ficheiro /etc/gnunet.conf será também movido para /etc/gnunet.conf."
+"prior07 e substituído por /etc/gnunetd.conf o qual poderá alterar mais tarde "
+"correndo \"gnunet-setup·-d·-c·/etc/gnunetd.conf\" como root."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
-msgstr "Deverá o daemon GNUnet ser lanchado durante o arranque?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
+msgstr "Deverá o server GNUnet ser lanchado durante o arranque?"
 
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
+#: ../gnunet-server.templates:5001
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Se aceitar esta opção, um servidor GNUnet será iniciado cada vez que o "
@@ -36,20 +162,20 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr "Utilizador GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Please choose the user that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
 msgstr ""
-"Por favor escolha o utilizador através do qual o daemon GNUnet irá correr."
+"Por favor escolha o utilizador através do qual o server GNUnet irá correr."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
@@ -59,19 +185,19 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr "Grupo GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-msgid "Please choose the group that the GNUnet daemon process will run as."
-msgstr "Por favor escolha o frupo através do qual o daemon GNUnet irá correr.."
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
+msgstr "Por favor escolha o frupo através do qual o server GNUnet irá correr.."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "

Modified: GNUnet/debian/po/pt_BR.po
===================================================================
--- GNUnet/debian/po/pt_BR.po   2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/pt_BR.po   2008-04-17 08:47:49 UTC (rev 6719)
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.6.6b-1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: 2005-05-26 10:42-0300\n"
 "Last-Translator: Guilherme de S. Pastore <address@hidden>\n"
 "Language-Team: Debian-BR <address@hidden>\n"
@@ -21,23 +21,140 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Instala��o anterior do GNUnet detectada"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+#, fuzzy
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+"Como h� mudan�as importantes nesta vers�o, n�s precisaremos modificar o seu "
+"arquivo de configura��o do GNUnet (/etc/gnunet.conf)."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"O processo de instala��o far� uma c�pia de /etc/gnunet.conf em /etc/gnunet."
+"conf.old, e automaticamente construir� um novo arquivo de configura��o."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+#, fuzzy
+msgid "Every personal settings will be preserved as much as possible."
+msgstr "Suas configura��es pessoais ser�o preservadas o m�ximo poss�vel."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Aviso"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+#, fuzzy
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"Por alguma raz�o desconhecida, n�s n�o conseguimos descobrir suas "
+"configura��es em /etc/gnunet.conf"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+#, fuzzy
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr ""
+"Seu arquivo de configura��o anterior ser� movido para /etc/gnunet.conf.old."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"J� que algumas mudan�as s�o *obrigat�rias* nesse arquivo, um novo arquivo de "
+"configura��o padr�o ser� instalado agora"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr ""
+"Por favor, verifique e, se preciso, fa�a as mudan�as necess�rias ap�s a "
+"instala��o."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
+#: ../gnunet-server.templates:5001
 #, fuzzy
 #| msgid ""
 #| "If you accept here, a GNUnet server will be started each time your "
 #| "machine starts.  If you decline this option, you need to launch GNUnet "
 #| "each time you want to use it."
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Se voc� aceitar, um servidor GNUnet ser� iniciado cada vez que o seu "
@@ -46,22 +163,22 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 #, fuzzy
 msgid "GNUnet user:"
 msgstr "Usu�rio do GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 #, fuzzy
-#| msgid "Define the user owning the GNUnet daemon process."
-msgid "Please choose the user that the GNUnet daemon process will run as."
-msgstr "Defina o usu�rio que ser� dono do processo do daemon do GNUnet."
+#| msgid "Define the user owning the GNUnet server process."
+msgid "Please choose the user that the GNUnet server process will run as."
+msgstr "Defina o usu�rio que ser� dono do processo do server do GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
@@ -69,24 +186,68 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 #, fuzzy
 msgid "GNUnet group:"
 msgstr "Grupo do GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 #, fuzzy
-#| msgid "Define the group owning the GNUnet daemon process."
-msgid "Please choose the group that the GNUnet daemon process will run as."
-msgstr "Defina o grupo que ser� respons�vel pelo processo de daemon do GNUnet."
+#| msgid "Define the group owning the GNUnet server process."
+msgid "Please choose the group that the GNUnet server process will run as."
+msgstr "Defina o grupo que ser� respons�vel pelo processo de server do GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "
 "start and stop the GNUnet server."
 msgstr ""
+
+#, fuzzy
+#~| msgid ""
+#~| "Only the members of this group are allowed to start and stop the GNUnet "
+#~| "server and  have access to GNUnet data."
+#~ msgid ""
+#~ "Only the members of this group are allowed to start and stop the GNUnet "
+#~ "server and have access to GNUnet data."
+#~ msgstr ""
+#~ "Somente os membros deste grupo t�m permiss�o para iniciar e parar o "
+#~ "servidor GNUnet e t�m acesso aos dados do GNUnet."
+
+#, fuzzy
+#~ msgid "Launch at startup?"
+#~ msgstr "Rodar na inicializa��o?"
+
+#, fuzzy
+#~ msgid "Setup GNUnet as a system service."
+#~ msgstr "Voc� deseja rodar o GNUnet como um servi�o do sistema?"
+
+#, fuzzy
+#~ msgid ""
+#~ "For security reasons, it's best to create a new user exclusively for  "
+#~ "GNUnet."
+#~ msgstr ""
+#~ "Por raz�es de seguran�a, o melhor � criar um novo usu�rio para isso, e "
+#~ "ter certeza de que ele n�o � dono de informa��o alguma que n�o as do "
+#~ "GNUnet."
+
+#, fuzzy
+#~ msgid ""
+#~ "If you choose this option, that user will automatically be created  as a "
+#~ "system user, for whom no login will be allowed."
+#~ msgstr ""
+#~ "Se voc� escolher essa op��o, o usu�rio ser� criado automaticamente (como "
+#~ "uma conta de sistema) e n�o ser� autorizado a se logar."
+
+#~ msgid ""
+#~ "For security reason, the best is to create a new group for this, and make "
+#~ "sure that it owns no data beside GNUnet's ones."
+#~ msgstr ""
+#~ "Por raz�es de seguran�a, o melhor � criar um novo grupo para isto, e ter "
+#~ "certeza de que ele n�o � dono de nenhuma informa��o, com exce��o das do "
+#~ "GNUnet."

Modified: GNUnet/debian/po/ru.po
===================================================================
--- GNUnet/debian/po/ru.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/ru.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: 2007-06-20 20:50+0400\n"
 "Last-Translator: Yuri Kozlov <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -18,18 +18,140 @@
 "Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Обнаружена предыдущая установка GNUnet"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+"Так как в данной версии произошли важные изменения, при установке будет "
+"изменён файл конфигурации GNUnet (/etc/gnunet.conf)."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"Во время установки будет создана резервная копия /etc/gnunet.conf с именем /"
+"etc/gnunet.conf.old, и будет создан новый конфигурационный файл."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr ""
+"Все пользовательские настройки будут перенесены насколько это возможно."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Внимание"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"По неизвестной причине не удалось обнаружить настройки конфигурации в файле /"
+"etc/gnunet.conf."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr ""
+"Старый конфигурационный файл будет сохранён под именем /etc/gnunet.conf.old."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"Так как в этом файле нужно *обязательно* сделать некоторые изменения, будет "
+"установлен новый конфигурационный файл"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr ""
+"После установки обязательно просмотрите его и сделайте необходимые изменения."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Обновление с версии меньшей 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+"Кажется, что вы производите обновление GNUnet с версии меньше 0.7.x. В "
+"GNUnet 0.7.x появились новые конфигурационные файлы и новый формат хранилища "
+"данных, который не совместим с версиями меньше 0.7.x."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr "GNUnet не может преобразовать вашу базу данных в новый формат."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+"Хранилище вашей базы данных будет автоматически перенесено в /var/lib/GNUnet."
+"prior07, а пакет gnunet создаст новое пустое хранилище."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+"Ваш файл /etc/gnunet.conf также будет переименован в /etc/gnunet.conf."
+"prior07 и заменён файлом /etc/gnunetd.conf, который позже вы можете "
+"изменить, запустив команду \"gnunet-setup -d -c /etc/gnunetd.conf\", имея "
+"права суперпользователя."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
 msgstr "Запускать демон GNUnet при загрузке?"
 
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
+#: ../gnunet-server.templates:5001
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Если вы ответите утвердительно, сервер GNUnet будет запускаться каждый раз "
@@ -38,21 +160,21 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr "Пользователь GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Please choose the user that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
 msgstr ""
 "Введите пользователя с правами которого должен запускаться процесс демона "
 "GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
@@ -63,20 +185,20 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr "Группа GNUnet:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-msgid "Please choose the group that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
 msgstr ""
 "Введите группу с правами которой должен запускаться процесс демона GNUnet."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "

Modified: GNUnet/debian/po/sv.po
===================================================================
--- GNUnet/debian/po/sv.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/sv.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: gnunet\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-11 07:59+0200\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: 2007-06-11 09:30+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -23,56 +23,226 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Tidigare installation av GNUnet hittades"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+"Eftersom det finns viktiga ändringar i denna version behöver installeraren "
+"göra ändringar i konfigurationsfilen för GNUnet (/etc/gnunet.conf)."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"Installationsprocessen kommer att säkerhetskopiera /etc/gnunet.conf till /"
+"etc/gnunet.conf.old och automatiskt bygga en ny konfigurationsfil."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr "Alla personliga inställningar kommer att behållas om möjligt."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Varning"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"Av någon underlig anledning misslyckades installeraren att identifiera dina "
+"konfigurationsinställningar i /etc/gnunet.conf."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr ""
+"Den gamla konfigurationsfilen kommer att flyttas till /etc/gnunet.conf.old."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"Eftersom vissa ändringar är *obligatoriska* i denna fil kommer en färsk "
+"standardkonfigurationsfil nu att installeras"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr ""
+"Ta en titt på den och gör nödvändiga ändringar i den om det behövs efter "
+"installationen."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Uppgradering från en version före 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+"Det verkar som om du uppgraderar GNUnet från en version före 0.7.x. GNUnet "
+"0.7.x introducerade nya konfigurationsfiler och ett nytt lagringsformat för "
+"databasen som inte är kompatibel med versioner före 0.7.x."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr "GNUnet kan inte konvertera din databas till det nya formatet."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+"Din databas kommer att flyttas automatiskt till /var/lib/GNUnet.prior07 och "
+"gnunet-paketet kommer att bygga en ny tom lagringsplats åt dig."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+"Filen /etc/gnunet.conf kommer också att flyttas till /etc/gnunet.conf."
+"prior07 och ersättas av /etc/gnunetd.conf som du senare kan ändra genom att "
+"köra \"gnunet-setup -d -c /etc/gnunetd.conf\", som root."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "Should the GNUnet daemon be launched on boot?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
 msgstr "Ska GNUnet-demonen startas vid systemets uppstart?"
 
-#| msgid ""
-#| "If you accept here, a GNUnet server will be started each time your "
-#| "machine starts.  If you decline this option, you need to launch GNUnet "
-#| "each time you want to use it."
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:5001
-msgid "If you choose this option, a GNUnet server will be started each time 
the system is launched. Otherwise, you will need to launch GNUnet each time you 
want to use it."
-msgstr "Om du väljer det här alternativet kommer en GNUnet-server att startas 
varje gång som systemet startar upp. Om inte behöver du starta GNUnet varje 
gång du vill använda det."
+#: ../gnunet-server.templates:5001
+msgid ""
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
+"want to use it."
+msgstr ""
+"Om du väljer det här alternativet kommer en GNUnet-server att startas varje "
+"gång som systemet startar upp. Om inte behöver du starta GNUnet varje gång "
+"du vill använda det."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr "GNUnet-användare:"
 
-#| msgid "Define the user owning the GNUnet daemon process."
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "Please choose the user that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
 msgstr "Välj den användare som GNUnet-demonens process ska köra som."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:6001
-msgid "This should be a dedicated account. If the specified account does not 
already exist, it will automatically be created, with no login shell."
-msgstr "Det här bör vara ett dedicerat konto. Om det angivna kontot inte finns 
kommer det automatiskt att skapas, utan något inloggningsskal."
+#: ../gnunet-server.templates:6001
+msgid ""
+"This should be a dedicated account. If the specified account does not "
+"already exist, it will automatically be created, with no login shell."
+msgstr ""
+"Det här bör vara ett dedicerat konto. Om det angivna kontot inte finns "
+"kommer det automatiskt att skapas, utan något inloggningsskal."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:7001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr "GNUnet-grupp:"
 
-#| msgid "Define the group owning the GNUnet daemon process."
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:7001
-msgid "Please choose the group that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
 msgstr "Välj den grupp som GNUnet-demonens process ska köra som."
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:7001
-msgid "This should be a dedicated group, not one that already owns data. Only 
the members of this group will have access to GNUnet data, and be allowed to 
start and stop the GNUnet server."
-msgstr "Det här bör vara en dedicerat grupp, inte en grupp som redan äger 
data. Endast medlemmar av den här gruppen kommer att få åtkomst till GNUnets 
data och kommer att tillåtas att starta och stoppa GNUnet-servern."
+#: ../gnunet-server.templates:7001
+msgid ""
+"This should be a dedicated group, not one that already owns data. Only the "
+"members of this group will have access to GNUnet data, and be allowed to "
+"start and stop the GNUnet server."
+msgstr ""
+"Det här bör vara en dedicerat grupp, inte en grupp som redan äger data. "
+"Endast medlemmar av den här gruppen kommer att få åtkomst till GNUnets data "
+"och kommer att tillåtas att starta och stoppa GNUnet-servern."
+
+#~| msgid ""
+#~| "Only the members of this group are allowed to start and stop the GNUnet "
+#~| "server and  have access to GNUnet data."
+#~ msgid ""
+#~ "Only the members of this group are allowed to start and stop the GNUnet "
+#~ "server and have access to GNUnet data."
+#~ msgstr ""
+#~ "Endast medlemmar av denna grupp tillåts att starta och stoppa GNUnet-"
+#~ "servern och har tillgång till GNUnets data."
+
+#, fuzzy
+#~ msgid "Launch at startup?"
+#~ msgstr "Starta vid systemets uppstart?"
+
+#, fuzzy
+#~ msgid "Setup GNUnet as a system service."
+#~ msgstr "Vill du starta GNUnet som en systemtjänst ?"
+
+#~ msgid ""
+#~ "For security reasons, it's best to create a new user exclusively for  "
+#~ "GNUnet."
+#~ msgstr ""
+#~ "Av säkerhetsskäl är det bäst att skapa en ny användare exklusivt för "
+#~ "GNUnet."
+
+#~ msgid ""
+#~ "If you choose this option, that user will automatically be created  as a "
+#~ "system user, for whom no login will be allowed."
+#~ msgstr ""
+#~ "Om du väljer detta alternativ kommer användaren att automatiskt skapas "
+#~ "som en systemanvändare, som inte tillåts logga in."
+
+#~ msgid ""
+#~ "For security reason, the best is to create a new group for this, and make "
+#~ "sure that it owns no data beside GNUnet's ones."
+#~ msgstr ""
+#~ "Av säkerhetsskäl är det bäst att skapa en ny grupp för detta och se till "
+#~ "att den inte äger något data förrutom det i GNUnet."

Modified: GNUnet/debian/po/templates.pot
===================================================================
--- GNUnet/debian/po/templates.pot      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/templates.pot      2008-04-17 08:47:49 UTC (rev 6719)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -16,36 +16,138 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
+#: ../gnunet-server.templates:5001
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Please choose the user that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
@@ -53,19 +155,19 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-msgid "Please choose the group that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "

Modified: GNUnet/debian/po/vi.po
===================================================================
--- GNUnet/debian/po/vi.po      2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/po/vi.po      2008-04-17 08:47:49 UTC (rev 6719)
@@ -1,12 +1,12 @@
 # Vietnamese translation for gnunet.
 # Copyright © 2007 Free Software Foundation, Inc.
 # Clytie Siddall <address@hidden>, 2005-2007.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.7.1c-2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-06-27 09:09+0000\n"
+"POT-Creation-Date: 2007-06-26 17:52+0200\n"
 "PO-Revision-Date: 2007-06-12 23:28+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -16,22 +16,139 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.6.3b1\n"
 
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Former installation of GNUnet detected"
+msgstr "Bản cài đặt GNUnet cũ đã được phát hiện."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"Since there are important changes in this version, the installer will need "
+"to modify the GNUnet configuration file (/etc/gnunet.conf)."
+msgstr ""
+"Vì phiên bản này thực hiện một số thay đổi quan trọng, trình cài đặt cần "
+"phải sửa đổi tập tin cấu hình GNUnet (/etc/gnunet.conf)."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid ""
+"The installation process will backup /etc/gnunet.conf to /etc/gnunet.conf."
+"old, and will automatically build a new configuration file."
+msgstr ""
+"Tiến trình cài đặt này sẽ sao lưu tập tin « /etc/gnunet.conf » vào « /etc/"
+"gnunet.conf.old », cũng tự động xây dựng một tập tin cấu hình mới."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:2001
+msgid "Every personal settings will be preserved as much as possible."
+msgstr "Mỗi thiết lập cá nhân sẽ được bảo quản càng nhiều càng có thể."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "Warning"
+msgstr "Cảnh báo"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"For some obscure reason, the installer have failed to discover the "
+"configuration settings in /etc/gnunet.conf."
+msgstr ""
+"Vì lý do lạ nào, trình cài đặt không tìm thấy thiết lập cấu hình trong « 
/etc/"
+"gnunet.conf »."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid "The old configuration file will be moved to /etc/gnunet.conf.old."
+msgstr "Tập tin cấu hình cũ sẽ được di chuyển vào « /etc/gnunet.conf.old »."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Since some changes are *mandatory* in this file, a fresh default "
+"configuration file will now be installed"
+msgstr ""
+"Vì một số thay đổi * bắt buộc phải thực hiện * trong tập tin này, một tập "
+"tin cấu hình mặc định mới sẽ được cài đặt ngay bây giờ."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:3001
+msgid ""
+"Please take a look and make necessary changes in it if needed after "
+"installation."
+msgstr "Sau khi cài đặt, bạn hãy kiểm tra nội dung của nó, sửa đổi nếu cần."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "Upgrade from a version prior to 0.7.0"
+msgstr "Nâng cấp từ phiên bản cũ hơn 0.7.0"
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"It seems that you are upgrading GNUnet from a version prior to 0.7.x. GNUnet "
+"0.7.x introduced new configuration files and a new database storage format "
+"which is not compatible with versions prior to 0.7.x."
+msgstr ""
+"Có vẻ là bạn đăng nâng cấp GNUnet từ một phiên bản cũ hơn 0.7.0. GNUnet 0.7."
+"x giới thiệu tập tin cấu hình kiểu mới và một định dạng cất giữ cơ sở dữ "
+"liệu không tương thích với phiên bản cũ hơn."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid "GNUnet cannot convert your database format to the new format."
+msgstr ""
+"GNUnet không thể chuyển đổi định dạng cơ sở dữ liệu của bạn sang định dạng "
+"mới."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your database storage will be automatically moved to /var/lib/GNUnet."
+"prior07, and the gnunet package will build a new empty storage for you."
+msgstr ""
+"Sức chứa cơ sở dữ liệu của bạn sẽ tự động được di chuyển sang « /var/lib/"
+"GNUnet.prior07 », và gói gnunet sẽ xây dựng một sức chứa trống mới cho bạn."
+
+#. Type: note
+#. Description
+#: ../gnunet-server.templates:4001
+msgid ""
+"Your /etc/gnunet.conf file will also be moved to /etc/gnunet.conf.prior07 "
+"and replaced by /etc/gnunetd.conf which you can modify later by running "
+"\"gnunet-setup -d -c /etc/gnunetd.conf\", as root."
+msgstr ""
+"Tập tin «  /etc/gnunet.conf » của bạn sẽ cũng được di chuyển sang « /etc/"
+"gnunet.conf.prior07 » và được thay thế bằng « /etc/gnunetd.conf » mà bạn có "
+"thể sửa đổi về sau bằng cách chạy lệnh « gnunet-setup -d -c /etc/gnunetd.conf 
"
+"» với tư cách người chủ."
+
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
-msgid "Should the GNUnet daemon be launched on boot?"
+#: ../gnunet-server.templates:5001
+msgid "Should the GNUnet server be launched on boot?"
 msgstr "Có nên khởi chạy trình nền GNUnet khi hệ thống khởi động không?"
 
-# msgid ""
-# If you accept here, a GNUnet server will be started each time your 
-# machine starts.  If you decline this option, you need to launch GNUnet 
-# each time you want to use it.
 #. Type: boolean
 #. Description
-#: ../gnunet-daemon.templates:2001
+#: ../gnunet-server.templates:5001
 msgid ""
-"If you choose this option, a GNUnet server will be started each time the "
-"system is launched. Otherwise, you will need to launch GNUnet each time you "
+"If you choose this option, a GNUnet server will be launched each time the "
+"system is started. Otherwise, you will need to launch GNUnet each time you "
 "want to use it."
 msgstr ""
 "Bật tùy chọn này thì trình GNUnet được khởi chạy mỗi lần khởi động hệ thống. "
@@ -39,20 +156,20 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid "GNUnet user:"
 msgstr "Người dùng GNUnet:"
 
-# msgid "Define the user owning the GNUnet daemon process."
+# msgid "Define the user owning the GNUnet server process."
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
-msgid "Please choose the user that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:6001
+msgid "Please choose the user that the GNUnet server process will run as."
 msgstr "Hãy chọn người dùng dưới đó tiến trình nền GNUnet sẽ chạy:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:3001
+#: ../gnunet-server.templates:6001
 msgid ""
 "This should be a dedicated account. If the specified account does not "
 "already exist, it will automatically be created, with no login shell."
@@ -62,20 +179,20 @@
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid "GNUnet group:"
 msgstr "Nhóm GNUnet:"
 
-# msgid "Define the group owning the GNUnet daemon process."
+# msgid "Define the group owning the GNUnet server process."
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
-msgid "Please choose the group that the GNUnet daemon process will run as."
+#: ../gnunet-server.templates:7001
+msgid "Please choose the group that the GNUnet server process will run as."
 msgstr "Hãy chọn nhớm dưới đó tiến trình nền GNUnet sẽ chạy:"
 
 #. Type: string
 #. Description
-#: ../gnunet-daemon.templates:4001
+#: ../gnunet-server.templates:7001
 msgid ""
 "This should be a dedicated group, not one that already owns data. Only the "
 "members of this group will have access to GNUnet data, and be allowed to "

Modified: GNUnet/debian/rules
===================================================================
--- GNUnet/debian/rules 2008-04-17 07:15:19 UTC (rev 6718)
+++ GNUnet/debian/rules 2008-04-17 08:47:49 UTC (rev 6719)
@@ -20,7 +20,7 @@
        dh_testdir
 
        # Configuring package
-       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man 
--enable-guile --enable-ipv6 disable-rpath --with-extractor=/usr 
--with-guile=/usr --with-libcurl=/usr --with-libgcrypt=/usr --with-mysql=/usr 
--with-sqlite=/usr
+       CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) 
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man 
--enable-guile --enable-ipv6 disable-rpath --with-extractor=/usr 
--with-guile=/usr --with-libcurl=/usr --with-libgcrypt=/usr --with-mysql=/usr 
--with-sqlite=/usr --with-microhttpd=/usr
 
 build: build-stamp
 build-stamp: config.status
@@ -37,7 +37,7 @@
        rm -f build-stamp
 
        # Cleaning package
-       -$(MAKE) distclean
+       [ ! -f Makefile ] || $(MAKE) distclean
        debconf-updatepo
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
        cp -f /usr/share/misc/config.sub config.sub
@@ -57,8 +57,10 @@
        # Installing package
        $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
-       install -D -m 0644 debian/config/gnunetd.conf 
debian/gnunet-daemon/etc/gnunetd.conf
+       install -D -m 0644 debian/config/gnunetd.conf 
debian/gnunet-server/etc/gnunetd.conf
 
+       mv debian/tmp/usr/bin/remotetest debian/tmp/usr/bin/gnunet-remotetest
+
        # Installing lintian overrides
        for LINTIAN in debian/lintian/*; \
        do \
@@ -70,18 +72,17 @@
        dh_testroot -a
        dh_installchangelogs -a ChangeLog
        dh_installdocs -a
-       dh_install -a --sourcedir=debian/tmp
-       dh_installman -a
+       dh_install -a --fail-missing --sourcedir=debian/tmp
        dh_installdebconf -a
        dh_installlogrotate -a
        dh_installinit -a -n
        dh_link -a
-       dh_strip -a
+       dh_strip -a --dbg-package=gnunet-dbg
        dh_compress -a
        dh_fixperms -a
        dh_makeshlibs -a
        dh_installdeb -a
-       dh_shlibdeps -a
+       dh_shlibdeps -v -a
        dh_gencontrol -a
        dh_md5sums -a
        dh_builddeb -a





reply via email to

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