gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r3871 - GNUnet/po


From: grothoff
Subject: [GNUnet-SVN] r3871 - GNUnet/po
Date: Sun, 3 Dec 2006 16:33:58 -0800 (PST)

Author: grothoff
Date: 2006-12-03 16:33:50 -0800 (Sun, 03 Dec 2006)
New Revision: 3871

Modified:
   GNUnet/po/GNUnet.pot
   GNUnet/po/POTFILES.in
   GNUnet/po/de.po
   GNUnet/po/es.po
   GNUnet/po/rw.po
   GNUnet/po/sv.po
   GNUnet/po/vi.po
Log:
fix

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2006-12-03 22:08:23 UTC (rev 3870)
+++ GNUnet/po/GNUnet.pot        2006-12-04 00:33:50 UTC (rev 3871)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-11-15 23:17-0700\n"
+"POT-Creation-Date: 2006-12-03 18:11-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -330,30 +330,52 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:442
-msgid "Prevent the specfied set of peers from connecting."
+msgid "Run gnunetd as this user."
 msgstr ""
 
 #: contrib/config-daemon.scm:443
-msgid "If this option is not set, any peer is allowed to connect."
+msgid ""
+"When started as root, gnunetd will change permissions to the given user."
 msgstr ""
 
 #: contrib/config-daemon.scm:454
+msgid "Run gnunetd as this group."
+msgstr ""
+
+#: contrib/config-daemon.scm:455
+msgid ""
+"When started as root, gnunetd will change permissions to the given group."
+msgstr ""
+
+#: contrib/config-daemon.scm:466
+msgid "Run gnunetd during system startup?"
+msgstr ""
+
+#: contrib/config-daemon.scm:479
+msgid "Prevent the specfied set of peers from connecting."
+msgstr ""
+
+#: contrib/config-daemon.scm:480
+msgid "If this option is not set, any peer is allowed to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:491
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:474
+#: contrib/config-daemon.scm:511
 msgid "General settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:475
+#: contrib/config-daemon.scm:512
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:541
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:503
+#: contrib/config-daemon.scm:543
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -362,11 +384,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:556
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:518
+#: contrib/config-daemon.scm:558
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -379,42 +401,42 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:573
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:574
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:551
+#: contrib/config-daemon.scm:591
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:552
+#: contrib/config-daemon.scm:592
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:566
+#: contrib/config-daemon.scm:606
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:618
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:590
+#: contrib/config-daemon.scm:630
 msgid "Configuration of the MySQL database"
 msgstr ""
 
-#: contrib/config-daemon.scm:609
+#: contrib/config-daemon.scm:649
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:651
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -425,15 +447,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:625
+#: contrib/config-daemon.scm:665
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:638
+#: contrib/config-daemon.scm:678
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:640
+#: contrib/config-daemon.scm:680
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -445,19 +467,19 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:654
+#: contrib/config-daemon.scm:694
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:671
+#: contrib/config-daemon.scm:711
 msgid "Applications"
 msgstr ""
 
-#: contrib/config-daemon.scm:687
+#: contrib/config-daemon.scm:727
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:728
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -466,88 +488,88 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:699
+#: contrib/config-daemon.scm:739
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:711
+#: contrib/config-daemon.scm:751
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:726
+#: contrib/config-daemon.scm:766
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:738
+#: contrib/config-daemon.scm:778
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:753
+#: contrib/config-daemon.scm:793
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:765
+#: contrib/config-daemon.scm:805
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
-#: contrib/config-daemon.scm:870
+#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:910
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:789
+#: contrib/config-daemon.scm:829
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:806
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:830
+#: contrib/config-daemon.scm:870
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:846
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:898
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:882
+#: contrib/config-daemon.scm:922
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:899
+#: contrib/config-daemon.scm:939
 msgid "Network interface"
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:951
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:923
+#: contrib/config-daemon.scm:963
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:935
+#: contrib/config-daemon.scm:975
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:998
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:970
+#: contrib/config-daemon.scm:1010
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:982
+#: contrib/config-daemon.scm:1022
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1024
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -557,37 +579,37 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:995
+#: contrib/config-daemon.scm:1035
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1036
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1007
+#: contrib/config-daemon.scm:1047
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1048
 msgid ""
 "The limit is given as a percentage o\n"
 "f the MAXNETUPBPS limit.  Use 100 to have MAXNETUPBPS be the hard limit.  "
 "Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1060
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1072
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1034
+#: contrib/config-daemon.scm:1074
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -632,11 +654,11 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1051
+#: contrib/config-daemon.scm:1091
 msgid "Network interface to monitor"
 msgstr ""
 
-#: contrib/config-daemon.scm:1053
+#: contrib/config-daemon.scm:1093
 msgid ""
 "\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
 "\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
@@ -649,11 +671,11 @@
 "\t\t \"gnunet-win-tool -n\"."
 msgstr ""
 
-#: contrib/config-daemon.scm:1072
+#: contrib/config-daemon.scm:1112
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1096 contrib/config-client.scm:286
+#: contrib/config-daemon.scm:1136 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
@@ -926,255 +948,69 @@
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest2.c:45
-#: src/applications/session/sessiontest.c:42
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:100
-#: src/applications/gap/gaptest.c:49
-msgid "# of connected peers"
+#: src/applications/dht/tools/dht-query.c:52
+msgid "Query (get KEY, put KEY VALUE) a DHT table."
 msgstr ""
 
-#: src/applications/dht/tools/dhttest2.c:160
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr ""
-
-#: src/applications/dht/tools/dhttest2.c:173
-#: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:116
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:53
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:57
-#: src/applications/dht/tools/dht-join.c:59
+#: src/applications/dht/tools/dht-query.c:56
 msgid "join table called NAME"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/applications/dht/tools/dht-query.c:59
 msgid "allow TIME ms to process each command"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:130
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:129
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:134
-#: src/applications/dht/tools/dht-query.c:167
+#: src/applications/dht/tools/dht-query.c:133
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:194
-#: src/applications/dht/tools/dht-join.c:165
+#: src/applications/dht/tools/dht-query.c:159
 #, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:210
+#: src/applications/dht/tools/dht-query.c:175
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:220
+#: src/applications/dht/tools/dht-query.c:185
 #, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:232
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:197
 #, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:258
+#: src/applications/dht/tools/dht-query.c:209
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht_api.c:148
-#: src/applications/dht/tools/dht_api.c:264
-#: src/applications/dht/tools/dht_api.c:321
-#: src/applications/dht/tools/dht_api.c:379
-#: src/applications/dht/tools/dht_api.c:415
+#: src/applications/dht/tools/dht_api.c:126
 #, c-format
-msgid "Failed to send `%s'.  Closing connection.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:226
-#: src/applications/dht/tools/dht_api.c:282
-#: src/applications/dht/tools/dht_api.c:340
-#: src/applications/dht/tools/dht_api.c:397
-#, c-format
-msgid "Received invalid `%s' request (size %d)\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:241
-#: src/applications/dht/tools/dht_api.c:297
-#: src/applications/dht/tools/dht_api.c:355
-#, c-format
-msgid "Received invalid `%s' request (wrong table)\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:429
-#, c-format
-msgid "Received unknown request type %d at %s:%d\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:473
-msgid "This client already participates in the given DHT!\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:548
-msgid "Cannot leave DHT: table not known!\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:571
-#, c-format
-msgid "gnunetd signaled error in response to `%s' message\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:576
-#, c-format
-msgid "Failed to receive response to `%s' message from gnunetd\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:581
-#, c-format
-msgid "Failed to send `%s' message to gnunetd\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:677
-#, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:52
-msgid "Join a DHT."
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:56
-msgid "allow SIZE bytes of memory for the local table"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:78
+#: src/applications/dht/module/cs.c:103
 #, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:79
-#, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:80
-#, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:189
-msgid "Error joining DHT.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:196
-#, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:205
-msgid "Error leaving DHT.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:952
-#, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:979
-#, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:1126
-#: src/applications/dht/module/dht.c:1141
-#, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:1453
-#, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:1611
-#: src/applications/dht/module/dht.c:2351
-#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
-#, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:1803
-#, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:2003
-#, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:2217
-#: src/applications/dht/module/dht.c:2522
-#, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:2899
-#: src/applications/dht/module/dht.c:3041
-#: src/applications/dht/module/dht.c:3182
-#: src/applications/dht/module/dht.c:3330
-#, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:3201
-#: src/applications/dht/module/dht.c:3351
-#, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
-msgstr ""
-
-#: src/applications/dht/module/cs.c:449
-#, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr ""
-
-#: src/applications/dht/module/cs.c:469
-#, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:546
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr ""
-
-#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
-#: src/applications/dht/module/cs.c:693
+#: src/applications/dht/module/cs.c:198 src/applications/dht/module/cs.c:217
+#: src/applications/dht/module/cs.c:227
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
-#, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr ""
-
 #: src/applications/chat/chat.c:87
 msgid "Message received from peer is invalid.\n"
 msgstr ""
@@ -1212,7 +1048,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
@@ -1296,7 +1132,7 @@
 msgstr ""
 
 #: src/applications/advertising/advertising.c:796
-#: src/applications/session/connect.c:800
+#: src/applications/session/connect.c:899
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -1421,53 +1257,70 @@
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/session/connect.c:225
+#: src/applications/session/sessiontest.c:42
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:101
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
+msgid "# of connected peers"
+msgstr ""
+
+#: src/applications/session/connect.c:257
+#: src/applications/session/connect.c:274
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:263
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
+#: src/applications/session/connect.c:315
+#, c-format
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:533
+#: src/applications/session/connect.c:594
 #, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:558
+#: src/applications/session/connect.c:612
 #, c-format
+msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
+msgstr ""
+
+#: src/applications/session/connect.c:644
+#, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:568
+#: src/applications/session/connect.c:654
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:626
+#: src/applications/session/connect.c:723
+#, c-format
 msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:637
+#: src/applications/session/connect.c:735
 #, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:888
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:791
+#: src/applications/session/connect.c:890
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:793
+#: src/applications/session/connect.c:892
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:795
+#: src/applications/session/connect.c:894
 msgid "# sessions established"
 msgstr ""
 
@@ -1506,6 +1359,11 @@
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
+#: src/applications/rpc/rpc.c:1291
+#, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr ""
+
 #: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
@@ -2064,6 +1922,12 @@
 "Failed to receive reply from gnunetd.\n"
 msgstr ""
 
+#: src/applications/tbench/tbenchtest.c:117
+#: src/applications/tbench/tbenchtest_udp.c:116
+#, c-format
+msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgstr ""
+
 #: src/applications/tbench/tbenchtest.c:211
 #: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
@@ -2155,7 +2019,7 @@
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:66
+#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
@@ -2683,12 +2547,12 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:321
+#: src/applications/fs/module/ondemand.c:334
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/fs/module/ondemand.c:432
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2696,32 +2560,32 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:446
+#: src/applications/fs/module/ondemand.c:459
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
 "%s' under `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:667
+#: src/applications/fs/module/ondemand.c:679
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1232
+#: src/applications/fs/module/fs.c:1134
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
 "s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1284
+#: src/applications/fs/module/fs.c:1175
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1324
+#: src/applications/fs/module/fs.c:1215
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -2733,34 +2597,30 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/searchtest.c:159
 #: src/applications/fs/fsui/fsuitest.c:193
-#: src/applications/fs/fsui/downloadtest.c:307
+#: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:265
-msgid "Error running search (consult logs)."
+#: src/applications/fs/fsui/search.c:275
+msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:263
-msgid "ECRS download failed (see logs)"
+#: src/applications/fs/fsui/download.c:267
+msgid "Download failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/unindex.c:99
-msgid "Unindex failed."
+#: src/applications/fs/fsui/unindex.c:109
+msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:222
+#: src/applications/fs/fsui/upload.c:245
 msgid "Failed to create temporary directory."
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:244
-msgid "Upload failed (consult logs)."
-msgstr ""
-
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
@@ -2769,68 +2629,68 @@
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:128
+#: src/applications/fs/ecrs/download.c:124
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:263
+#: src/applications/fs/ecrs/download.c:255
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:972
+#: src/applications/fs/ecrs/download.c:964
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:1157
+#: src/applications/fs/ecrs/download.c:1149
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:161
+#: src/applications/fs/ecrs/upload.c:162
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:172
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:179
+#: src/applications/fs/ecrs/upload.c:181
 msgid "Failed to connect to gnunetd."
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:191
+#: src/applications/fs/ecrs/upload.c:193
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:210
+#: src/applications/fs/ecrs/upload.c:212
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:217
+#: src/applications/fs/ecrs/upload.c:219
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:303
+#: src/applications/fs/ecrs/upload.c:305
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:851
+#: src/applications/fs/ecrs/meta.c:852
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:859
+#: src/applications/fs/ecrs/meta.c:860
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
@@ -2874,7 +2734,7 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:367
+#: src/applications/fs/uritrack/file_info.c:369
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
@@ -2922,13 +2782,13 @@
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:283
-#: src/applications/bootstrap_http/http.c:317
-#: src/applications/bootstrap_http/http.c:335
-#: src/applications/bootstrap_http/http.c:349
-#: src/applications/bootstrap_http/http.c:361
-#: src/applications/bootstrap_http/http.c:373
+#: src/applications/bootstrap_http/http.c:261
+#: src/applications/bootstrap_http/http.c:281
+#: src/applications/bootstrap_http/http.c:315
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:347
+#: src/applications/bootstrap_http/http.c:359
+#: src/applications/bootstrap_http/http.c:371
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -2942,7 +2802,7 @@
 msgid "Trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:409
+#: src/applications/bootstrap_http/http.c:407
 msgid "# hellos downloaded via http"
 msgstr ""
 
@@ -3243,81 +3103,85 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/server/connection.c:2420
+#: src/server/connection.c:2419
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/server/connection.c:2492
+#: src/server/connection.c:2491
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2509
+#: src/server/connection.c:2508
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:2932
+#: src/server/connection.c:2937
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2936
+#: src/server/connection.c:2941
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2938
+#: src/server/connection.c:2943
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2941
+#: src/server/connection.c:2946
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/server/connection.c:2945
+#: src/server/connection.c:2950
 msgid "# bytes transmitted"
 msgstr ""
 
-#: src/server/connection.c:2949
+#: src/server/connection.c:2954
 msgid "# bytes received"
 msgstr ""
 
-#: src/server/connection.c:2951
+#: src/server/connection.c:2956
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/server/connection.c:2952
+#: src/server/connection.c:2957
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/gnunetd.c:80
+#: src/server/gnunetd.c:82
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
 #, c-format
 msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:168
+#: src/server/gnunetd.c:170
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
 msgstr ""
 
-#: src/server/gnunetd.c:172
+#: src/server/gnunetd.c:174
 msgid "Starts the gnunetd daemon."
 msgstr ""
 
-#: src/server/gnunetd.c:175
+#: src/server/gnunetd.c:177
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:180
+msgid "run in quiet mode"
+msgstr ""
+
+#: src/server/gnunetd.c:184
 msgid "specify username as which gnunetd should run"
 msgstr ""
 
-#: src/server/gnunetd.c:228
+#: src/server/gnunetd.c:235
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3357,7 +3221,7 @@
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:594
+#: src/server/core.c:597
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr ""
@@ -3530,12 +3394,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
+#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
 #, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr ""
 
-#: src/util/network_client/tcpio.c:403
+#: src/util/network_client/tcpio.c:428
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr ""
@@ -3566,6 +3430,11 @@
 msgid "Can't create semaphore: %i"
 msgstr ""
 
+#: src/util/os/osconfig.c:349
+#, c-format
+msgid "Command `%s' failed with error code %u\n"
+msgstr ""
+
 #: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -3904,12 +3773,12 @@
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:264
+#: src/setup/gnunet-setup.c:265
 #, c-format
 msgid "`%s' is not available."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:280
+#: src/setup/gnunet-setup.c:281
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr ""
@@ -3974,190 +3843,194 @@
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:363
+#: src/setup/gtk/gconf.c:364
 msgid "Description"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:381
+#: src/setup/gtk/gconf.c:382
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:402
+#: src/setup/gtk/gconf.c:403
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:416 src/setup/ncurses/wizard_curs.c:142
+#: src/setup/gtk/gconf.c:417 src/setup/ncurses/wizard_curs.c:142
 #: src/setup/ncurses/wizard_curs.c:195 src/setup/ncurses/wizard_curs.c:232
 #: src/setup/ncurses/wizard_curs.c:287 src/setup/ncurses/wizard_curs.c:319
 #: src/setup/ncurses/wizard_curs.c:379
 msgid "Help"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:431
 msgid "Section"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:442
+#: src/setup/gtk/gconf.c:443
 msgid "Option"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:464
+#: src/setup/gtk/gconf.c:465
 msgid "Configuration saved."
 msgstr ""
 
-#: src/setup/gtk/gconf.c:472
+#: src/setup/gtk/gconf.c:473
 msgid "Failed to save configuration."
 msgstr ""
 
-#: src/setup/gtk/gconf.c:495
+#: src/setup/gtk/gconf.c:496
 msgid "Configuration changed. Save?"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:139
+#: src/setup/gtk/wizard_gtk.c:145
 msgid "(unknown connection)"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:389
+#: src/setup/gtk/wizard_gtk.c:422
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:411
+#: src/setup/gtk/wizard_gtk.c:444
 msgid "Do you want to save the new configuration?"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:438 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:473 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:445 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:480 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:454
-msgid "gnunet-update failed. Please run gnunet-update manually."
+#: src/setup/gtk/wizard_gtk.c:496
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:74
+#: src/setup/text/conf.c:75
 msgid "yes"
 msgstr ""
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:76
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:101
+#: src/setup/text/conf.c:102
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:110
+#: src/setup/text/conf.c:111
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:112
+#: src/setup/text/conf.c:113
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:132
+#: src/setup/text/conf.c:133
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:138
+#: src/setup/text/conf.c:139
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:144
+#: src/setup/text/conf.c:145
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:177
+#: src/setup/text/conf.c:178
 #, c-format
 msgid "Yes\n"
 msgstr ""
 
-#: src/setup/text/conf.c:182
+#: src/setup/text/conf.c:183
 #, c-format
 msgid "No\n"
 msgstr ""
 
-#: src/setup/text/conf.c:185 src/setup/text/conf.c:221
-#: src/setup/text/conf.c:246 src/setup/text/conf.c:304
-#: src/setup/text/conf.c:354
+#: src/setup/text/conf.c:186 src/setup/text/conf.c:222
+#: src/setup/text/conf.c:248 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:358
 #, c-format
 msgid "Help\n"
 msgstr ""
 
-#: src/setup/text/conf.c:188 src/setup/text/conf.c:201
-#: src/setup/text/conf.c:255 src/setup/text/conf.c:285
-#: src/setup/text/conf.c:335
+#: src/setup/text/conf.c:189 src/setup/text/conf.c:202
+#: src/setup/text/conf.c:257 src/setup/text/conf.c:287
+#: src/setup/text/conf.c:339
 #, c-format
 msgid "Abort\n"
 msgstr ""
 
-#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#: src/setup/text/conf.c:330 src/setup/text/conf.c:385
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:385
+#: src/setup/text/conf.c:391
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:459
+#: src/setup/text/conf.c:465
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:470
+#: src/setup/text/conf.c:476
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:492
+#: src/setup/text/conf.c:498
 msgid "Invalid entry.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:511
+#: src/setup/text/conf.c:517
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:542
+#: src/setup/text/conf.c:548
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:543
+#: src/setup/text/conf.c:549
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:427
+#: src/setup/text/conf.c:563 src/setup/ncurses/mconf.c:427
 #, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:562
+#: src/setup/text/conf.c:568
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:572
+#: src/setup/text/conf.c:580
 #, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:577
+#: src/setup/text/conf.c:585
 #, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr ""

Modified: GNUnet/po/POTFILES.in
===================================================================
--- GNUnet/po/POTFILES.in       2006-12-03 22:08:23 UTC (rev 3870)
+++ GNUnet/po/POTFILES.in       2006-12-04 00:33:50 UTC (rev 3871)
@@ -12,15 +12,9 @@
 src/transports/tcp6.c
 src/transports/tcp_helper.c
 src/transports/udp_helper.c
-src/applications/dht/tools/dhttest2.c
 src/applications/dht/tools/dht-query.c
 src/applications/dht/tools/dht_api.c
-src/applications/dht/tools/dht-join.c
-src/applications/dht/module/datastore_dht_master.c
-src/applications/dht/module/datastore_memory.c
-src/applications/dht/module/dht.c
 src/applications/dht/module/cs.c
-src/applications/dht/module/datastore_memory_test.c
 src/applications/chat/chat.c
 src/applications/chat/gnunet-chat.c
 src/applications/advertising/advertising.c
@@ -224,7 +218,6 @@
 src/transports/ip.h
 src/include/gnunet_core.h
 src/include/gnunet_dht.h
-src/include/gnunet_dht_datastore_memory.h
 src/include/gnunet_util.h
 src/include/gnunet_fragmentation_service.h
 src/include/gnunet_getoption_lib.h
@@ -280,7 +273,6 @@
 src/include/gnunet_uritrack_lib.h
 src/include/gnunet_namespace_lib.h
 src/applications/dht/module/dht.h
-src/applications/dht/module/datastore_dht_master.h
 src/applications/chat/chat.h
 src/applications/advertising/bootstrap.h
 src/applications/datastore/prefetch.h

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2006-12-03 22:08:23 UTC (rev 3870)
+++ GNUnet/po/de.po     2006-12-04 00:33:50 UTC (rev 3871)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-11-15 23:17-0700\n"
+"POT-Creation-Date: 2006-12-03 18:11-0700\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -338,31 +338,55 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:442
+#, fuzzy
+msgid "Run gnunetd as this user."
+msgstr "gnunet-update ausführen"
+
+#: contrib/config-daemon.scm:443
+msgid ""
+"When started as root, gnunetd will change permissions to the given user."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+#, fuzzy
+msgid "Run gnunetd as this group."
+msgstr "gnunet-update ausführen"
+
+#: contrib/config-daemon.scm:455
+msgid ""
+"When started as root, gnunetd will change permissions to the given group."
+msgstr ""
+
+#: contrib/config-daemon.scm:466
+msgid "Run gnunetd during system startup?"
+msgstr ""
+
+#: contrib/config-daemon.scm:479
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:443
+#: contrib/config-daemon.scm:480
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:491
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:474
+#: contrib/config-daemon.scm:511
 #, fuzzy
 msgid "General settings"
 msgstr "Weitere Einstellungen"
 
-#: contrib/config-daemon.scm:475
+#: contrib/config-daemon.scm:512
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:541
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:503
+#: contrib/config-daemon.scm:543
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -371,11 +395,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:556
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:518
+#: contrib/config-daemon.scm:558
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -388,45 +412,45 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:573
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:574
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:551
+#: contrib/config-daemon.scm:591
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:552
+#: contrib/config-daemon.scm:592
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:566
+#: contrib/config-daemon.scm:606
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:618
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:590
+#: contrib/config-daemon.scm:630
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: contrib/config-daemon.scm:609
+#: contrib/config-daemon.scm:649
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:651
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -437,15 +461,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:625
+#: contrib/config-daemon.scm:665
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:638
+#: contrib/config-daemon.scm:678
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:640
+#: contrib/config-daemon.scm:680
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -457,21 +481,21 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:654
+#: contrib/config-daemon.scm:694
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: contrib/config-daemon.scm:671
+#: contrib/config-daemon.scm:711
 #, fuzzy
 msgid "Applications"
 msgstr "_Optionen"
 
-#: contrib/config-daemon.scm:687
+#: contrib/config-daemon.scm:727
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:728
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -480,89 +504,89 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:699
+#: contrib/config-daemon.scm:739
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:711
+#: contrib/config-daemon.scm:751
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:726
+#: contrib/config-daemon.scm:766
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:738
+#: contrib/config-daemon.scm:778
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:753
+#: contrib/config-daemon.scm:793
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:765
+#: contrib/config-daemon.scm:805
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
-#: contrib/config-daemon.scm:870
+#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:910
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:789
+#: contrib/config-daemon.scm:829
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:806
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:830
+#: contrib/config-daemon.scm:870
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:846
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:898
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:882
+#: contrib/config-daemon.scm:922
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:899
+#: contrib/config-daemon.scm:939
 #, fuzzy
 msgid "Network interface"
 msgstr "Netzwerkgerät:"
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:951
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:923
+#: contrib/config-daemon.scm:963
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:935
+#: contrib/config-daemon.scm:975
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:998
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:970
+#: contrib/config-daemon.scm:1010
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:982
+#: contrib/config-daemon.scm:1022
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1024
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -572,37 +596,37 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:995
+#: contrib/config-daemon.scm:1035
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1036
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1007
+#: contrib/config-daemon.scm:1047
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1048
 msgid ""
 "The limit is given as a percentage o\n"
 "f the MAXNETUPBPS limit.  Use 100 to have MAXNETUPBPS be the hard limit.  "
 "Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1060
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1072
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1034
+#: contrib/config-daemon.scm:1074
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -647,12 +671,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1051
+#: contrib/config-daemon.scm:1091
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Netzwerkgerät:"
 
-#: contrib/config-daemon.scm:1053
+#: contrib/config-daemon.scm:1093
 msgid ""
 "\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
 "\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
@@ -665,12 +689,12 @@
 "\t\t \"gnunet-win-tool -n\"."
 msgstr ""
 
-#: contrib/config-daemon.scm:1072
+#: contrib/config-daemon.scm:1112
 #, fuzzy
 msgid "Load management"
 msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: contrib/config-daemon.scm:1096 contrib/config-client.scm:286
+#: contrib/config-daemon.scm:1136 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
@@ -984,258 +1008,70 @@
 "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
 "u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/applications/dht/tools/dhttest2.c:45
-#: src/applications/session/sessiontest.c:42
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:100
-#: src/applications/gap/gaptest.c:49
-msgid "# of connected peers"
-msgstr "# verbundener Knoten"
-
-#: src/applications/dht/tools/dhttest2.c:160
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Warte auf den Start von gnunetd (%u Iterationen verbleiben)...\n"
-
-#: src/applications/dht/tools/dhttest2.c:173
-#: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:116
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr ""
-"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
-"verbleiben)...\n"
-
-#: src/applications/dht/tools/dht-query.c:53
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
+#: src/applications/dht/tools/dht-query.c:52
+#, fuzzy
+msgid "Query (get KEY, put KEY VALUE) a DHT table."
 msgstr "Eine DHT Tabelle abfragen (get KEY, put KEY VALUE, remove KEY VALUE)."
 
-#: src/applications/dht/tools/dht-query.c:57
-#: src/applications/dht/tools/dht-join.c:59
+#: src/applications/dht/tools/dht-query.c:56
 msgid "join table called NAME"
 msgstr "Tabelle NAME anschließen"
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/applications/dht/tools/dht-query.c:59
 msgid "allow TIME ms to process each command"
 msgstr "TIME ms erlauben, um jedes Kommando zu bearbeiten"
 
-#: src/applications/dht/tools/dht-query.c:130
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:129
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "'%s(%s,%s)' erfolgreich abgeschlossen\n"
 
-#: src/applications/dht/tools/dht-query.c:134
-#: src/applications/dht/tools/dht-query.c:167
+#: src/applications/dht/tools/dht-query.c:133
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
 
-#: src/applications/dht/tools/dht-query.c:194
-#: src/applications/dht/tools/dht-join.c:165
+#: src/applications/dht/tools/dht-query.c:159
 #, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "Kein Tabellenname angegeben, verwende `%s'.\n"
 
-#: src/applications/dht/tools/dht-query.c:210
+#: src/applications/dht/tools/dht-query.c:175
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/applications/dht/tools/dht-query.c:220
+#: src/applications/dht/tools/dht-query.c:185
 #, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "Kommando `%s' benötigt eine zusätzliche Angabe (`%s').\n"
 
-#: src/applications/dht/tools/dht-query.c:232
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:197
 #, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "Kommando `%s' benötigt zwei zusätzliche Angaben (`%s' und `%s').\n"
 
-#: src/applications/dht/tools/dht-query.c:258
+#: src/applications/dht/tools/dht-query.c:209
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/applications/dht/tools/dht_api.c:148
-#: src/applications/dht/tools/dht_api.c:264
-#: src/applications/dht/tools/dht_api.c:321
-#: src/applications/dht/tools/dht_api.c:379
-#: src/applications/dht/tools/dht_api.c:415
+#: src/applications/dht/tools/dht_api.c:126
 #, c-format
-msgid "Failed to send `%s'.  Closing connection.\n"
-msgstr "Fehler beim Senden von `%s'. Verbindung wird geschlossen.\n"
-
-#: src/applications/dht/tools/dht_api.c:226
-#: src/applications/dht/tools/dht_api.c:282
-#: src/applications/dht/tools/dht_api.c:340
-#: src/applications/dht/tools/dht_api.c:397
-#, c-format
-msgid "Received invalid `%s' request (size %d)\n"
-msgstr "Ungültige Anfrage `%s' empfangen (Größe %d)\n"
-
-#: src/applications/dht/tools/dht_api.c:241
-#: src/applications/dht/tools/dht_api.c:297
-#: src/applications/dht/tools/dht_api.c:355
-#, c-format
-msgid "Received invalid `%s' request (wrong table)\n"
-msgstr "Ungültige Anfrage `%s' empfangen (falsche Tabelle)\n"
-
-#: src/applications/dht/tools/dht_api.c:429
-#, c-format
-msgid "Received unknown request type %d at %s:%d\n"
-msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
-
-#: src/applications/dht/tools/dht_api.c:473
-msgid "This client already participates in the given DHT!\n"
-msgstr "Dieser Client beteiligt sich bereits an der angegebenen DHT!\n"
-
-#: src/applications/dht/tools/dht_api.c:548
-msgid "Cannot leave DHT: table not known!\n"
-msgstr "DHT kann nicht verlassen werden: Tabelle unbekannt!\n"
-
-#: src/applications/dht/tools/dht_api.c:571
-#, c-format
-msgid "gnunetd signaled error in response to `%s' message\n"
-msgstr "gnunetd gab in Bezug auf die `%s' Nachricht einen Fehler zurück.\n"
-
-#: src/applications/dht/tools/dht_api.c:576
-#, c-format
-msgid "Failed to receive response to `%s' message from gnunetd\n"
-msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
-
-#: src/applications/dht/tools/dht_api.c:581
-#, c-format
-msgid "Failed to send `%s' message to gnunetd\n"
-msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
-
-#: src/applications/dht/tools/dht_api.c:677
-#, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Unerwartete Antwort zu `%s' Operation.\n"
 
-#: src/applications/dht/tools/dht-join.c:52
-msgid "Join a DHT."
-msgstr "Einer DHT anschließen."
-
-#: src/applications/dht/tools/dht-join.c:56
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "SIZE bytes an Speicher für die lokale Tabelle erlauben"
-
-#: src/applications/dht/tools/dht-join.c:78
+#: src/applications/dht/module/cs.c:103
 #, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "Aufruf von `%s' gibt %d zurück.\n"
-
-#: src/applications/dht/tools/dht-join.c:79
-#, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
-
-#: src/applications/dht/tools/dht-join.c:80
-#, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Aufruf von `%s' mit Wert '%.*s' (%d Bytes).\n"
-
-#: src/applications/dht/tools/dht-join.c:189
-msgid "Error joining DHT.\n"
-msgstr "Fehler beim Beitreten zu der DHT.\n"
-
-#: src/applications/dht/tools/dht-join.c:196
-#, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr "Der DHT beigetreten. Drücken Sie STRG-C, um sie zu verlassen.\n"
-
-#: src/applications/dht/tools/dht-join.c:205
-msgid "Error leaving DHT.\n"
-msgstr "Fehler beim Verlassen der DHT.\n"
-
-#: src/applications/dht/module/dht.c:952
-#, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr "Ungültiges optionales Feld `%s' empfangen von Knoten `%s'.\n"
-
-#: src/applications/dht/module/dht.c:979
-#, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
-
-#: src/applications/dht/module/dht.c:1126
-#: src/applications/dht/module/dht.c:1141
-#, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
-
-#: src/applications/dht/module/dht.c:1453
-#, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
-
-#: src/applications/dht/module/dht.c:1611
-#: src/applications/dht/module/dht.c:2351
-#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
-#, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "`%s' mit einem Timeout von über einer Stunde aufgerufen (Fehler?)\n"
-
-#: src/applications/dht/module/dht.c:1803
-#, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Ungültige Antwort auf `%s'.\n"
-
-#: src/applications/dht/module/dht.c:2003
-#, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr "Beschädigte Antwort auf `%s' in Master Tabelle.\n"
-
-#: src/applications/dht/module/dht.c:2217
-#: src/applications/dht/module/dht.c:2522
-#, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Ungültige Antwort auf `%s' von `%s'\n"
-
-#: src/applications/dht/module/dht.c:2899
-#: src/applications/dht/module/dht.c:3041
-#: src/applications/dht/module/dht.c:3182
-#: src/applications/dht/module/dht.c:3330
-#, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Ungültiger RPC `%s' empfangen.\n"
-
-#: src/applications/dht/module/dht.c:3201
-#: src/applications/dht/module/dht.c:3351
-#, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
-msgstr ""
-"RPC für `%s' empfangen für eine Tabelle, an der wir nicht beteiligt sind!\n"
-
-#: src/applications/dht/module/cs.c:449
-#, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
-
-#: src/applications/dht/module/cs.c:469
-#, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/dht/module/cs.c:546
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "sendAck fehlgeschlagen. Beende Verbindung zu Client.\n"
-
-#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
-#: src/applications/dht/module/cs.c:693
+#: src/applications/dht/module/cs.c:198 src/applications/dht/module/cs.c:217
+#: src/applications/dht/module/cs.c:227
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
-#, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
 #: src/applications/chat/chat.c:87
 msgid "Message received from peer is invalid.\n"
 msgstr "Empfangene Nachricht ist ungültig.\n"
@@ -1273,7 +1109,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
@@ -1363,7 +1199,7 @@
 msgstr "# Klartext PING Nachrichten gesendet"
 
 #: src/applications/advertising/advertising.c:796
-#: src/applications/session/connect.c:800
+#: src/applications/session/connect.c:899
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
@@ -1494,59 +1330,76 @@
 msgid "# bytes in datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/applications/session/connect.c:225
+#: src/applications/session/sessiontest.c:42
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:101
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
+msgid "# of connected peers"
+msgstr "# verbundener Knoten"
+
+#: src/applications/session/connect.c:257
+#: src/applications/session/connect.c:274
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/applications/session/connect.c:263
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
+#: src/applications/session/connect.c:315
+#, fuzzy, c-format
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 "Sitzungsschlüssel kann nicht verschlüsselt werden, der andere Knoten ist uns "
 "nicht bekannt!\n"
 
-#: src/applications/session/connect.c:533
+#: src/applications/session/connect.c:594
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Empfangene Nachricht ist ungültig.\n"
 
-#: src/applications/session/connect.c:558
+#: src/applications/session/connect.c:612
+#, fuzzy, c-format
+msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
+msgstr "Empfangene Nachricht ist ungültig.\n"
+
+#: src/applications/session/connect.c:644
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/applications/session/connect.c:568
+#: src/applications/session/connect.c:654
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 "setkey `%s' von `%s' hat eine ungültige CRC Prüfsumme (tatsächlich: %u, "
 "erwartet: %u).\n"
 
-#: src/applications/session/connect.c:626
+#: src/applications/session/connect.c:723
+#, fuzzy, c-format
 msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr ""
 "Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
 "Nachrichtenteilgröße ist ungültig.\n"
 
-#: src/applications/session/connect.c:637
-#, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
+#: src/applications/session/connect.c:735
+#, fuzzy, c-format
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr "Unbekannter Typ in engebetteter Nachricht: %u (%u bytes)\n"
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:888
 msgid "# session keys sent"
 msgstr "# Sitzungsschlüssel gesendet"
 
-#: src/applications/session/connect.c:791
+#: src/applications/session/connect.c:890
 msgid "# session keys rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/applications/session/connect.c:793
+#: src/applications/session/connect.c:892
 msgid "# session keys accepted"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/applications/session/connect.c:795
+#: src/applications/session/connect.c:894
 msgid "# sessions established"
 msgstr "# Sitzungen aufgebaut"
 
@@ -1590,6 +1443,11 @@
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "RPC Anfrage %u wird verworfen: Nachricht ist beschädigt.\n"
 
+#: src/applications/rpc/rpc.c:1291
+#, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "`%s' mit einem Timeout von über einer Stunde aufgerufen (Fehler?)\n"
+
 #: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
@@ -2179,6 +2037,14 @@
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
+#: src/applications/tbench/tbenchtest.c:117
+#: src/applications/tbench/tbenchtest_udp.c:116
+#, c-format
+msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgstr ""
+"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
+"verbleiben)...\n"
+
 #: src/applications/tbench/tbenchtest.c:211
 #: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
@@ -2275,7 +2141,7 @@
 "Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
 "nicht geladen. Anfrage wird abgelehnt.\n"
 
-#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:66
+#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
@@ -2866,13 +2732,13 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "`%s' schlug fehl. Ist `%s' eine Datei?\n"
 
-#: src/applications/fs/module/ondemand.c:321
+#: src/applications/fs/module/ondemand.c:334
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 "Indizierte Datei ist verschwunden, Block für Anfrage `%s' wird gelöscht\n"
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/fs/module/ondemand.c:432
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2883,7 +2749,7 @@
 "aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
 "löschen, da Ihr Index nun ungültige Referenzen enthält!\n"
 
-#: src/applications/fs/module/ondemand.c:446
+#: src/applications/fs/module/ondemand.c:459
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2892,7 +2758,7 @@
 "Die Konfigurationsdatei muss ein Verzeichnis für die Speicherung von FS "
 "Daten in der Sektion `%s' unter `%s' angeben.\n"
 
-#: src/applications/fs/module/ondemand.c:667
+#: src/applications/fs/module/ondemand.c:679
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2900,7 +2766,7 @@
 "Deindizierter ODB Block `%s' vom Offset %llu fehlt bereits im "
 "Datenspeicher.\n"
 
-#: src/applications/fs/module/fs.c:1232
+#: src/applications/fs/module/fs.c:1134
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2909,12 +2775,12 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/applications/fs/module/fs.c:1284
+#: src/applications/fs/module/fs.c:1175
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1324
+#: src/applications/fs/module/fs.c:1215
 msgid "enables (anonymous) file-sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
@@ -2926,40 +2792,35 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/searchtest.c:159
 #: src/applications/fs/fsui/fsuitest.c:193
-#: src/applications/fs/fsui/downloadtest.c:307
+#: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr "UND"
 
-#: src/applications/fs/fsui/search.c:265
+#: src/applications/fs/fsui/search.c:275
 #, fuzzy
-msgid "Error running search (consult logs)."
+msgid "Error running search (no reason given)."
 msgstr ""
 "Das Starten der Suche schlug fehl. Bitte ziehen Sie die Protokolldateien zu "
 "Rate.\n"
 
-#: src/applications/fs/fsui/download.c:263
+#: src/applications/fs/fsui/download.c:267
 #, fuzzy
-msgid "ECRS download failed (see logs)"
+msgid "Download failed (no reason given)"
 msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
 
-#: src/applications/fs/fsui/unindex.c:99
-msgid "Unindex failed."
-msgstr "Deindizierung schlug fehl."
+#: src/applications/fs/fsui/unindex.c:109
+msgid "Unindexing failed (no reason given)"
+msgstr ""
 
-#: src/applications/fs/fsui/upload.c:222
+#: src/applications/fs/fsui/upload.c:245
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/applications/fs/fsui/upload.c:244
-#, fuzzy
-msgid "Upload failed (consult logs)."
-msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
-
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr "CHK URI ist nicht erlaubt für Suchen.\n"
@@ -2968,17 +2829,17 @@
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
 
-#: src/applications/fs/ecrs/download.c:128
+#: src/applications/fs/ecrs/download.c:124
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "Temporäre Datei `%s' konnte nicht gelöscht werden: %s\n"
 
-#: src/applications/fs/ecrs/download.c:263
+#: src/applications/fs/ecrs/download.c:255
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Write(%d, %p, %d) schlug fehl: %s\n"
 
-#: src/applications/fs/ecrs/download.c:972
+#: src/applications/fs/ecrs/download.c:964
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2987,54 +2848,54 @@
 "Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
 "abgebrochen.\n"
 
-#: src/applications/fs/ecrs/download.c:1157
+#: src/applications/fs/ecrs/download.c:1149
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 "Inhalt `%s' scheint im Netzwerk nicht verfügbar zu sein (%u mal versucht).\n"
 
-#: src/applications/fs/ecrs/upload.c:161
+#: src/applications/fs/ecrs/upload.c:162
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:172
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Die Größe der Datei `%s' konnte nicht ermittelt werden"
 
-#: src/applications/fs/ecrs/upload.c:179
+#: src/applications/fs/ecrs/upload.c:181
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:191
+#: src/applications/fs/ecrs/upload.c:193
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:210
+#: src/applications/fs/ecrs/upload.c:212
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Initialisierung der Indizierung der Datei `%s' fehlgeschlagen.\n"
 
-#: src/applications/fs/ecrs/upload.c:217
+#: src/applications/fs/ecrs/upload.c:219
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/applications/fs/ecrs/upload.c:303
+#: src/applications/fs/ecrs/upload.c:305
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/applications/fs/ecrs/meta.c:851
+#: src/applications/fs/ecrs/meta.c:852
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Umbenennen der Datei `%s' zu `%s' fehlgeschlagen: %s\n"
 
-#: src/applications/fs/ecrs/meta.c:859
+#: src/applications/fs/ecrs/meta.c:860
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
@@ -3081,7 +2942,7 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
 
-#: src/applications/fs/uritrack/file_info.c:367
+#: src/applications/fs/uritrack/file_info.c:369
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
@@ -3132,13 +2993,13 @@
 msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
 #: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:283
-#: src/applications/bootstrap_http/http.c:317
-#: src/applications/bootstrap_http/http.c:335
-#: src/applications/bootstrap_http/http.c:349
-#: src/applications/bootstrap_http/http.c:361
-#: src/applications/bootstrap_http/http.c:373
+#: src/applications/bootstrap_http/http.c:261
+#: src/applications/bootstrap_http/http.c:281
+#: src/applications/bootstrap_http/http.c:315
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:347
+#: src/applications/bootstrap_http/http.c:359
+#: src/applications/bootstrap_http/http.c:371
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
@@ -3152,7 +3013,7 @@
 msgid "Trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/applications/bootstrap_http/http.c:409
+#: src/applications/bootstrap_http/http.c:407
 msgid "# hellos downloaded via http"
 msgstr "# Hellos per HTTP heruntergeladen"
 
@@ -3457,66 +3318,66 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Nachrichten Details: %u: Länge %d, Priorität: %d\n"
 
-#: src/server/connection.c:2420
+#: src/server/connection.c:2419
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
 
-#: src/server/connection.c:2492
+#: src/server/connection.c:2491
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Ungültige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2509
+#: src/server/connection.c:2508
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 "Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2932
+#: src/server/connection.c:2937
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2936
+#: src/server/connection.c:2941
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2938
+#: src/server/connection.c:2943
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:2941
+#: src/server/connection.c:2946
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/server/connection.c:2945
+#: src/server/connection.c:2950
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/server/connection.c:2949
+#: src/server/connection.c:2954
 #, fuzzy
 msgid "# bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/server/connection.c:2951
+#: src/server/connection.c:2956
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/server/connection.c:2952
+#: src/server/connection.c:2957
 msgid "# bytes noise sent"
 msgstr "# Bytes Rauschen gesendet"
 
-#: src/server/gnunetd.c:80
+#: src/server/gnunetd.c:82
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
 #, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/server/gnunetd.c:168
+#: src/server/gnunetd.c:170
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -3525,20 +3386,24 @@
 "Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
 "Standardfehlerausgabe (stderr) geschrieben."
 
-#: src/server/gnunetd.c:172
+#: src/server/gnunetd.c:174
 msgid "Starts the gnunetd daemon."
 msgstr "Startet den gnunetd Daemonen."
 
-#: src/server/gnunetd.c:175
+#: src/server/gnunetd.c:177
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:180
+msgid "run in quiet mode"
+msgstr ""
+
+#: src/server/gnunetd.c:184
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/server/gnunetd.c:228
+#: src/server/gnunetd.c:235
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3582,7 +3447,7 @@
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "Anwendung `%s' konnte nicht ordentlich heruntergefahren werden.\n"
 
-#: src/server/core.c:594
+#: src/server/core.c:597
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
@@ -3767,12 +3632,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
+#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/util/network_client/tcpio.c:403
+#: src/util/network_client/tcpio.c:428
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
@@ -3806,6 +3671,11 @@
 msgid "Can't create semaphore: %i"
 msgstr "Semaphore konnte nicht angelegt werden: %i"
 
+#: src/util/os/osconfig.c:349
+#, fuzzy, c-format
+msgid "Command `%s' failed with error code %u\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
 #: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -4150,12 +4020,12 @@
 msgid "No interface specified, using default\n"
 msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/setup/gnunet-setup.c:264
+#: src/setup/gnunet-setup.c:265
 #, c-format
 msgid "`%s' is not available."
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/setup/gnunet-setup.c:280
+#: src/setup/gnunet-setup.c:281
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
@@ -4220,206 +4090,210 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Fehler: Dienst konnte nicht gelöscht werden: %s\n"
 
-#: src/setup/gtk/gconf.c:363
+#: src/setup/gtk/gconf.c:364
 #, fuzzy
 msgid "Description"
 msgstr "Frage"
 
-#: src/setup/gtk/gconf.c:381
+#: src/setup/gtk/gconf.c:382
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:402
+#: src/setup/gtk/gconf.c:403
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:416 src/setup/ncurses/wizard_curs.c:142
+#: src/setup/gtk/gconf.c:417 src/setup/ncurses/wizard_curs.c:142
 #: src/setup/ncurses/wizard_curs.c:195 src/setup/ncurses/wizard_curs.c:232
 #: src/setup/ncurses/wizard_curs.c:287 src/setup/ncurses/wizard_curs.c:319
 #: src/setup/ncurses/wizard_curs.c:379
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:431
 #, fuzzy
 msgid "Section"
 msgstr "Frage"
 
-#: src/setup/gtk/gconf.c:442
+#: src/setup/gtk/gconf.c:443
 #, fuzzy
 msgid "Option"
 msgstr "_Optionen"
 
-#: src/setup/gtk/gconf.c:464
+#: src/setup/gtk/gconf.c:465
 #, fuzzy
 msgid "Configuration saved."
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/gtk/gconf.c:472
+#: src/setup/gtk/gconf.c:473
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/setup/gtk/gconf.c:495
+#: src/setup/gtk/gconf.c:496
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/setup/gtk/wizard_gtk.c:139
+#: src/setup/gtk/wizard_gtk.c:145
 #, fuzzy
 msgid "(unknown connection)"
 msgstr "Netzwerkverbindung"
 
-#: src/setup/gtk/wizard_gtk.c:389
+#: src/setup/gtk/wizard_gtk.c:422
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/setup/gtk/wizard_gtk.c:411
+#: src/setup/gtk/wizard_gtk.c:444
 #, fuzzy
 msgid "Do you want to save the new configuration?"
 msgstr "Möchten Sie Ihre Einstellungen speichern?"
 
-#: src/setup/gtk/wizard_gtk.c:438 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:473 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/setup/gtk/wizard_gtk.c:445 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:480 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr "Startprozeß konnte nicht geändert werden:"
 
-#: src/setup/gtk/wizard_gtk.c:454
-msgid "gnunet-update failed. Please run gnunet-update manually."
+#: src/setup/gtk/wizard_gtk.c:496
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:74
+#: src/setup/text/conf.c:75
 #, fuzzy
 msgid "yes"
 msgstr "Ja"
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:76
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:101
+#: src/setup/text/conf.c:102
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:110
+#: src/setup/text/conf.c:111
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:112
+#: src/setup/text/conf.c:113
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:132
+#: src/setup/text/conf.c:133
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:138
+#: src/setup/text/conf.c:139
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:144
+#: src/setup/text/conf.c:145
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:177
+#: src/setup/text/conf.c:178
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Ja"
 
-#: src/setup/text/conf.c:182
+#: src/setup/text/conf.c:183
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "Nein"
 
-#: src/setup/text/conf.c:185 src/setup/text/conf.c:221
-#: src/setup/text/conf.c:246 src/setup/text/conf.c:304
-#: src/setup/text/conf.c:354
+#: src/setup/text/conf.c:186 src/setup/text/conf.c:222
+#: src/setup/text/conf.c:248 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:358
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "Hilfe"
 
-#: src/setup/text/conf.c:188 src/setup/text/conf.c:201
-#: src/setup/text/conf.c:255 src/setup/text/conf.c:285
-#: src/setup/text/conf.c:335
+#: src/setup/text/conf.c:189 src/setup/text/conf.c:202
+#: src/setup/text/conf.c:257 src/setup/text/conf.c:287
+#: src/setup/text/conf.c:339
 #, fuzzy, c-format
 msgid "Abort\n"
 msgstr "_über"
 
-#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#: src/setup/text/conf.c:330 src/setup/text/conf.c:385
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:385
+#: src/setup/text/conf.c:391
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:459
+#: src/setup/text/conf.c:465
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:470
+#: src/setup/text/conf.c:476
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:492
+#: src/setup/text/conf.c:498
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/setup/text/conf.c:511
+#: src/setup/text/conf.c:517
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:542
+#: src/setup/text/conf.c:548
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:543
+#: src/setup/text/conf.c:549
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:427
+#: src/setup/text/conf.c:563 src/setup/ncurses/mconf.c:427
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/setup/text/conf.c:562
+#: src/setup/text/conf.c:568
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:572
+#: src/setup/text/conf.c:580
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/setup/text/conf.c:577
+#: src/setup/text/conf.c:585
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
@@ -4858,6 +4732,106 @@
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
+#~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+#~ msgstr "Warte auf den Start von gnunetd (%u Iterationen verbleiben)...\n"
+
+#~ msgid "Failed to send `%s'.  Closing connection.\n"
+#~ msgstr "Fehler beim Senden von `%s'. Verbindung wird geschlossen.\n"
+
+#~ msgid "Received invalid `%s' request (size %d)\n"
+#~ msgstr "Ungültige Anfrage `%s' empfangen (Größe %d)\n"
+
+#~ msgid "Received invalid `%s' request (wrong table)\n"
+#~ msgstr "Ungültige Anfrage `%s' empfangen (falsche Tabelle)\n"
+
+#~ msgid "Received unknown request type %d at %s:%d\n"
+#~ msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
+
+#~ msgid "This client already participates in the given DHT!\n"
+#~ msgstr "Dieser Client beteiligt sich bereits an der angegebenen DHT!\n"
+
+#~ msgid "Cannot leave DHT: table not known!\n"
+#~ msgstr "DHT kann nicht verlassen werden: Tabelle unbekannt!\n"
+
+#~ msgid "gnunetd signaled error in response to `%s' message\n"
+#~ msgstr "gnunetd gab in Bezug auf die `%s' Nachricht einen Fehler zurück.\n"
+
+#~ msgid "Failed to receive response to `%s' message from gnunetd\n"
+#~ msgstr ""
+#~ "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+
+#~ msgid "Failed to send `%s' message to gnunetd\n"
+#~ msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
+
+#~ msgid "Join a DHT."
+#~ msgstr "Einer DHT anschließen."
+
+#~ msgid "allow SIZE bytes of memory for the local table"
+#~ msgstr "SIZE bytes an Speicher für die lokale Tabelle erlauben"
+
+#~ msgid "Call to `%s' returns %d.\n"
+#~ msgstr "Aufruf von `%s' gibt %d zurück.\n"
+
+#~ msgid "Call to `%s' with key `%s'.\n"
+#~ msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
+
+#~ msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+#~ msgstr "Aufruf von `%s' mit Wert '%.*s' (%d Bytes).\n"
+
+#~ msgid "Error joining DHT.\n"
+#~ msgstr "Fehler beim Beitreten zu der DHT.\n"
+
+#~ msgid "Joined DHT.  Press CTRL-C to leave.\n"
+#~ msgstr "Der DHT beigetreten. Drücken Sie STRG-C, um sie zu verlassen.\n"
+
+#~ msgid "Error leaving DHT.\n"
+#~ msgstr "Fehler beim Verlassen der DHT.\n"
+
+#~ msgid "Malformed optional field `%s' received from peer `%s'.\n"
+#~ msgstr "Ungültiges optionales Feld `%s' empfangen von Knoten `%s'.\n"
+
+#~ msgid "Could not find peer `%s' in routing table!\n"
+#~ msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+
+#~ msgid "Received malformed response to `%s' from peer `%s'.\n"
+#~ msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
+
+#~ msgid "Invalid response to `%s' from peer `%s'.\n"
+#~ msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
+
+#~ msgid "Invalid response to `%s'.\n"
+#~ msgstr "Ungültige Antwort auf `%s'.\n"
+
+#~ msgid "Malformed response to `%s' on master table.\n"
+#~ msgstr "Beschädigte Antwort auf `%s' in Master Tabelle.\n"
+
+#~ msgid "Invalid response to `%s' from `%s'\n"
+#~ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
+
+#~ msgid "Received invalid RPC `%s'.\n"
+#~ msgstr "Ungültiger RPC `%s' empfangen.\n"
+
+#~ msgid "RPC for `%s' received for table that we do not participate in!\n"
+#~ msgstr ""
+#~ "RPC für `%s' empfangen für eine Tabelle, an der wir nicht beteiligt "
+#~ "sind!\n"
+
+#~ msgid "`%s' failed: table not found!\n"
+#~ msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
+
+#~ msgid "sendAck failed.  Terminating connection to client.\n"
+#~ msgstr "sendAck fehlgeschlagen. Beende Verbindung zu Client.\n"
+
+#~ msgid "Failed to deliver `%s' message.\n"
+#~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#~ msgid "Unindex failed."
+#~ msgstr "Deindizierung schlug fehl."
+
+#, fuzzy
+#~ msgid "Upload failed (consult logs)."
+#~ msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
+
 #~ msgid "Could not resolve name of SMTP server `%s': %s"
 #~ msgstr "Der Name des SMTP servers `%s' konnte nicht aufgelöst werden: %s"
 
@@ -5519,9 +5493,6 @@
 #~ msgid "Open the enhanced configurator"
 #~ msgstr "Erweiterten Konfigurator starten"
 
-#~ msgid "Run gnunet-update"
-#~ msgstr "gnunet-update ausführen"
-
 #~ msgid "Finish"
 #~ msgstr "Fertigstellen"
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2006-12-03 22:08:23 UTC (rev 3870)
+++ GNUnet/po/es.po     2006-12-04 00:33:50 UTC (rev 3871)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-11-15 23:17-0700\n"
+"POT-Creation-Date: 2006-12-03 18:11-0700\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -340,31 +340,55 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:442
+#, fuzzy
+msgid "Run gnunetd as this user."
+msgstr "Ejecutar gnunet-update"
+
+#: contrib/config-daemon.scm:443
+msgid ""
+"When started as root, gnunetd will change permissions to the given user."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+#, fuzzy
+msgid "Run gnunetd as this group."
+msgstr "Ejecutar gnunet-update"
+
+#: contrib/config-daemon.scm:455
+msgid ""
+"When started as root, gnunetd will change permissions to the given group."
+msgstr ""
+
+#: contrib/config-daemon.scm:466
+msgid "Run gnunetd during system startup?"
+msgstr ""
+
+#: contrib/config-daemon.scm:479
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:443
+#: contrib/config-daemon.scm:480
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:491
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:474
+#: contrib/config-daemon.scm:511
 #, fuzzy
 msgid "General settings"
 msgstr "Otras configuraciones"
 
-#: contrib/config-daemon.scm:475
+#: contrib/config-daemon.scm:512
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:541
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:503
+#: contrib/config-daemon.scm:543
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -373,11 +397,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:556
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:518
+#: contrib/config-daemon.scm:558
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -390,44 +414,44 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:573
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:574
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:551
+#: contrib/config-daemon.scm:591
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:552
+#: contrib/config-daemon.scm:592
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:566
+#: contrib/config-daemon.scm:606
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:618
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:590
+#: contrib/config-daemon.scm:630
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: contrib/config-daemon.scm:609
+#: contrib/config-daemon.scm:649
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:651
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -438,15 +462,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:625
+#: contrib/config-daemon.scm:665
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:638
+#: contrib/config-daemon.scm:678
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:640
+#: contrib/config-daemon.scm:680
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -458,21 +482,21 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:654
+#: contrib/config-daemon.scm:694
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "activa la compartición de ficheros anónima"
 
-#: contrib/config-daemon.scm:671
+#: contrib/config-daemon.scm:711
 #, fuzzy
 msgid "Applications"
 msgstr "_Opciones"
 
-#: contrib/config-daemon.scm:687
+#: contrib/config-daemon.scm:727
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:728
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -481,89 +505,89 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:699
+#: contrib/config-daemon.scm:739
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:711
+#: contrib/config-daemon.scm:751
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:726
+#: contrib/config-daemon.scm:766
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:738
+#: contrib/config-daemon.scm:778
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:753
+#: contrib/config-daemon.scm:793
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:765
+#: contrib/config-daemon.scm:805
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
-#: contrib/config-daemon.scm:870
+#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:910
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:789
+#: contrib/config-daemon.scm:829
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:806
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:830
+#: contrib/config-daemon.scm:870
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:846
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:898
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:882
+#: contrib/config-daemon.scm:922
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:899
+#: contrib/config-daemon.scm:939
 #, fuzzy
 msgid "Network interface"
 msgstr "Interfaz de red:"
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:951
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:923
+#: contrib/config-daemon.scm:963
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:935
+#: contrib/config-daemon.scm:975
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:998
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:970
+#: contrib/config-daemon.scm:1010
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:982
+#: contrib/config-daemon.scm:1022
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1024
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -573,37 +597,37 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:995
+#: contrib/config-daemon.scm:1035
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1036
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1007
+#: contrib/config-daemon.scm:1047
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1048
 msgid ""
 "The limit is given as a percentage o\n"
 "f the MAXNETUPBPS limit.  Use 100 to have MAXNETUPBPS be the hard limit.  "
 "Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1060
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1072
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1034
+#: contrib/config-daemon.scm:1074
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -648,12 +672,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1051
+#: contrib/config-daemon.scm:1091
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Interfaz de red:"
 
-#: contrib/config-daemon.scm:1053
+#: contrib/config-daemon.scm:1093
 msgid ""
 "\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
 "\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
@@ -666,12 +690,12 @@
 "\t\t \"gnunet-win-tool -n\"."
 msgstr ""
 
-#: contrib/config-daemon.scm:1072
+#: contrib/config-daemon.scm:1112
 #, fuzzy
 msgid "Load management"
 msgstr "Argumentos en la linea de comandos inválidos.\n"
 
-#: contrib/config-daemon.scm:1096 contrib/config-client.scm:286
+#: contrib/config-daemon.scm:1136 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
@@ -960,255 +984,70 @@
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/applications/dht/tools/dhttest2.c:45
-#: src/applications/session/sessiontest.c:42
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:100
-#: src/applications/gap/gaptest.c:49
-msgid "# of connected peers"
-msgstr "# de pares conectados"
-
-#: src/applications/dht/tools/dhttest2.c:160
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Esperando a gnunetd para empezar (%u ciclos restantes)...\n"
-
-#: src/applications/dht/tools/dhttest2.c:173
-#: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:116
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
-
-#: src/applications/dht/tools/dht-query.c:53
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
+#: src/applications/dht/tools/dht-query.c:52
+#, fuzzy
+msgid "Query (get KEY, put KEY VALUE) a DHT table."
 msgstr "Pregunta (coje KEY, pone KEY VALUE, borra KEY VALUE) a una tabla DHT."
 
-#: src/applications/dht/tools/dht-query.c:57
-#: src/applications/dht/tools/dht-join.c:59
+#: src/applications/dht/tools/dht-query.c:56
 msgid "join table called NAME"
 msgstr "únete a la tabla llamada NAME"
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/applications/dht/tools/dht-query.c:59
 msgid "allow TIME ms to process each command"
 msgstr "Reserva TIME ms para procesar cada comando"
 
-#: src/applications/dht/tools/dht-query.c:130
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:129
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "'%s (%s, %s)' logrado satisfactoriamente\n"
 
-#: src/applications/dht/tools/dht-query.c:134
-#: src/applications/dht/tools/dht-query.c:167
+#: src/applications/dht/tools/dht-query.c:133
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s, %s)' falló.\n"
 
-#: src/applications/dht/tools/dht-query.c:194
-#: src/applications/dht/tools/dht-join.c:165
+#: src/applications/dht/tools/dht-query.c:159
 #, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "Ningún nombre especificado para la tabla, usando '%s'.\n"
 
-#: src/applications/dht/tools/dht-query.c:210
+#: src/applications/dht/tools/dht-query.c:175
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/applications/dht/tools/dht-query.c:220
+#: src/applications/dht/tools/dht-query.c:185
 #, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "El comando '%s' requiere un argumento ('%s').\n"
 
-#: src/applications/dht/tools/dht-query.c:232
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:197
 #, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "El comando '%s' requiere dos argumentos ('%s' y '%s').\n"
 
-#: src/applications/dht/tools/dht-query.c:258
+#: src/applications/dht/tools/dht-query.c:209
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Comando inesperado '%s'.   Abortando.\n"
 
-#: src/applications/dht/tools/dht_api.c:148
-#: src/applications/dht/tools/dht_api.c:264
-#: src/applications/dht/tools/dht_api.c:321
-#: src/applications/dht/tools/dht_api.c:379
-#: src/applications/dht/tools/dht_api.c:415
+#: src/applications/dht/tools/dht_api.c:126
 #, c-format
-msgid "Failed to send `%s'.  Closing connection.\n"
-msgstr "Fallo al mandar '%s'.   Cerrando la conexión.\n"
-
-#: src/applications/dht/tools/dht_api.c:226
-#: src/applications/dht/tools/dht_api.c:282
-#: src/applications/dht/tools/dht_api.c:340
-#: src/applications/dht/tools/dht_api.c:397
-#, c-format
-msgid "Received invalid `%s' request (size %d)\n"
-msgstr "Recibida petición '%s' no válida (tamaño %d)\n"
-
-#: src/applications/dht/tools/dht_api.c:241
-#: src/applications/dht/tools/dht_api.c:297
-#: src/applications/dht/tools/dht_api.c:355
-#, c-format
-msgid "Received invalid `%s' request (wrong table)\n"
-msgstr "Recibida petición '%s' no válida (tabla errónea)\n"
-
-#: src/applications/dht/tools/dht_api.c:429
-#, c-format
-msgid "Received unknown request type %d at %s:%d\n"
-msgstr "Recibida petición de tipo desconocido %d en %s: %d\n"
-
-#: src/applications/dht/tools/dht_api.c:473
-msgid "This client already participates in the given DHT!\n"
-msgstr "Este cliente ya participa en el DHT dado\n"
-
-#: src/applications/dht/tools/dht_api.c:548
-msgid "Cannot leave DHT: table not known!\n"
-msgstr "Imposible dejar DHT: ¡tabla no conocida!\n"
-
-#: src/applications/dht/tools/dht_api.c:571
-#, c-format
-msgid "gnunetd signaled error in response to `%s' message\n"
-msgstr "gnunetd lanzó una señal de error en respuesta al mensaje '%s'\n"
-
-#: src/applications/dht/tools/dht_api.c:576
-#, c-format
-msgid "Failed to receive response to `%s' message from gnunetd\n"
-msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
-
-#: src/applications/dht/tools/dht_api.c:581
-#, c-format
-msgid "Failed to send `%s' message to gnunetd\n"
-msgstr "Falló al mandar el mensaje '%s' a gnunetd\n"
-
-#: src/applications/dht/tools/dht_api.c:677
-#, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Respuesta inesperada a la operación '%s'.\n"
 
-#: src/applications/dht/tools/dht-join.c:52
-msgid "Join a DHT."
-msgstr "Únete a DHT"
-
-#: src/applications/dht/tools/dht-join.c:56
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "Reserva SIZE bytes de memoria para la tabla local"
-
-#: src/applications/dht/tools/dht-join.c:78
+#: src/applications/dht/module/cs.c:103
 #, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "La llamada a '%s' devuelve %d.\n"
-
-#: src/applications/dht/tools/dht-join.c:79
-#, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Llamada a '%s' con la clave '%s'.\n"
-
-#: src/applications/dht/tools/dht-join.c:80
-#, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Llama a '%s' con el valor '%.*s' (%d bytes).\n"
-
-#: src/applications/dht/tools/dht-join.c:189
-msgid "Error joining DHT.\n"
-msgstr "Error uniéndose a DHT.\n"
-
-#: src/applications/dht/tools/dht-join.c:196
-#, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr "Unido a DHT.  Pulsa CTRL-C para abandonarlo.\n"
-
-#: src/applications/dht/tools/dht-join.c:205
-msgid "Error leaving DHT.\n"
-msgstr "Error abandonando DHT.\n"
-
-#: src/applications/dht/module/dht.c:952
-#, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr "Campo opcional anómalo '%s' recibido del par '%s'.\n"
-
-#: src/applications/dht/module/dht.c:979
-#, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
-
-#: src/applications/dht/module/dht.c:1126
-#: src/applications/dht/module/dht.c:1141
-#, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
-
-#: src/applications/dht/module/dht.c:1453
-#, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Respuesta inválida a '%s' del par '%s'.\n"
-
-#: src/applications/dht/module/dht.c:1611
-#: src/applications/dht/module/dht.c:2351
-#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
-#, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "'%s' fue llamada con un retraso de una hora(¿bug?)\n"
-
-#: src/applications/dht/module/dht.c:1803
-#, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Respuesta inválida a '%s'.\n"
-
-#: src/applications/dht/module/dht.c:2003
-#, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr "Respuesta anómala a '%s' en la tabla maestra.\n"
-
-#: src/applications/dht/module/dht.c:2217
-#: src/applications/dht/module/dht.c:2522
-#, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Respuesta inválida a '%s' de '%s'\n"
-
-#: src/applications/dht/module/dht.c:2899
-#: src/applications/dht/module/dht.c:3041
-#: src/applications/dht/module/dht.c:3182
-#: src/applications/dht/module/dht.c:3330
-#, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Recibido RPC '%s' inválida.\n"
-
-#: src/applications/dht/module/dht.c:3201
-#: src/applications/dht/module/dht.c:3351
-#, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
-msgstr "¡RPC para '%s' recibida de la tabla en la cual no participamos!\n"
-
-#: src/applications/dht/module/cs.c:449
-#, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "'%s' falló: ¡tabla no encontrada!\n"
-
-#: src/applications/dht/module/cs.c:469
-#, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "'%s' falló.  Finalizando conexión con el cliente.\n"
 
-#: src/applications/dht/module/cs.c:546
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "sendAck falló. Finalizando conexión con el cliente.\n"
-
-#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
-#: src/applications/dht/module/cs.c:693
+#: src/applications/dht/module/cs.c:198 src/applications/dht/module/cs.c:217
+#: src/applications/dht/module/cs.c:227
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "'%s' falló. Finalizando conexión con el cleinte.\n"
 
-#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
-#, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Falló al entregar el mensaje '%s'.\n"
-
 #: src/applications/chat/chat.c:87
 msgid "Message received from peer is invalid.\n"
 msgstr "El mensaje recibido del par es inválido.\n"
@@ -1246,7 +1085,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Usar --help para obtener una lista de opciones.\n"
@@ -1331,7 +1170,7 @@
 msgstr "# mensajes de texto mandados por PING"
 
 #: src/applications/advertising/advertising.c:796
-#: src/applications/session/connect.c:800
+#: src/applications/session/connect.c:899
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "'%s' registrando manejador %d (texto plano e hipertexto)\n"
@@ -1457,57 +1296,74 @@
 msgid "# bytes in datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/applications/session/connect.c:225
+#: src/applications/session/sessiontest.c:42
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:101
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
+msgid "# of connected peers"
+msgstr "# de pares conectados"
+
+#: src/applications/session/connect.c:257
+#: src/applications/session/connect.c:274
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/applications/session/connect.c:263
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
+#: src/applications/session/connect.c:315
+#, fuzzy, c-format
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
 
-#: src/applications/session/connect.c:533
+#: src/applications/session/connect.c:594
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "El mensaje recibido del par es inválido.\n"
 
-#: src/applications/session/connect.c:558
+#: src/applications/session/connect.c:612
+#, fuzzy, c-format
+msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
+msgstr "El mensaje recibido del par es inválido.\n"
+
+#: src/applications/session/connect.c:644
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/applications/session/connect.c:568
+#: src/applications/session/connect.c:654
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 "el cambio de clave '%s' de '%s' falló al comprobar el CRC (dio: %u, esperado "
 "%u).\n"
 
-#: src/applications/session/connect.c:626
+#: src/applications/session/connect.c:723
+#, fuzzy, c-format
 msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr ""
 "Error pasando la clave de sesión encriptada, el mensaje dado del tamaño de "
 "las partes es inválido.\n"
 
-#: src/applications/session/connect.c:637
-#, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
+#: src/applications/session/connect.c:735
+#, fuzzy, c-format
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:888
 msgid "# session keys sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/applications/session/connect.c:791
+#: src/applications/session/connect.c:890
 msgid "# session keys rejected"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/applications/session/connect.c:793
+#: src/applications/session/connect.c:892
 msgid "# session keys accepted"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/applications/session/connect.c:795
+#: src/applications/session/connect.c:894
 msgid "# sessions established"
 msgstr "# sesiones establecidas"
 
@@ -1550,6 +1406,11 @@
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Omitiendo la petición RPC %u: mensaje mal formado.\n"
 
+#: src/applications/rpc/rpc.c:1291
+#, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "'%s' fue llamada con un retraso de una hora(¿bug?)\n"
+
 #: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
@@ -2128,6 +1989,12 @@
 "\n"
 "Fallo al recibir la respuesta de gnunetd.\n"
 
+#: src/applications/tbench/tbenchtest.c:117
+#: src/applications/tbench/tbenchtest_udp.c:116
+#, c-format
+msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
+
 #: src/applications/tbench/tbenchtest.c:211
 #: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
@@ -2221,7 +2088,7 @@
 "Solicitada la cobertura de tráfico pero el servicio de tráfico no ha sido "
 "cargado. Rechazando la petición.\n"
 
-#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:66
+#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
@@ -2806,13 +2673,13 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' falló.  ¿Es '%s' un fichero?\n"
 
-#: src/applications/fs/module/ondemand.c:321
+#: src/applications/fs/module/ondemand.c:334
 #, fuzzy, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 "Fichero indexado desaparecido, borrando el bloque para preguntas '%s'\n"
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/fs/module/ondemand.c:432
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2823,7 +2690,7 @@
 "disponible durante tres días.  Por favor, desindexa los ficheros antes de "
 "borrarlos porque eso causa que el índice tenga referencias no válidas.\n"
 
-#: src/applications/fs/module/ondemand.c:446
+#: src/applications/fs/module/ondemand.c:459
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2832,14 +2699,14 @@
 "El fichero de configuración debe especificar un directorio para el "
 "almacenamiento de los datos de FS en la sección '%s' bajo '%s'.\n"
 
-#: src/applications/fs/module/ondemand.c:667
+#: src/applications/fs/module/ondemand.c:679
 #, fuzzy, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 "Bloque ODB '%s' desindexado del offset %llu perdido de la base de datos.\n"
 
-#: src/applications/fs/module/fs.c:1232
+#: src/applications/fs/module/fs.c:1134
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2848,12 +2715,12 @@
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/applications/fs/module/fs.c:1284
+#: src/applications/fs/module/fs.c:1175
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1324
+#: src/applications/fs/module/fs.c:1215
 msgid "enables (anonymous) file-sharing"
 msgstr "activa la compartición de ficheros anónima"
 
@@ -2865,38 +2732,33 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/searchtest.c:159
 #: src/applications/fs/fsui/fsuitest.c:193
-#: src/applications/fs/fsui/downloadtest.c:307
+#: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr "Y"
 
-#: src/applications/fs/fsui/search.c:265
+#: src/applications/fs/fsui/search.c:275
 #, fuzzy
-msgid "Error running search (consult logs)."
+msgid "Error running search (no reason given)."
 msgstr "Se produjo un fallo al comenzar la búsqueda. Consulte los logs.\n"
 
-#: src/applications/fs/fsui/download.c:263
+#: src/applications/fs/fsui/download.c:267
 #, fuzzy
-msgid "ECRS download failed (see logs)"
+msgid "Download failed (no reason given)"
 msgstr "La descarga del ERCS falló (vea los logs)."
 
-#: src/applications/fs/fsui/unindex.c:99
-msgid "Unindex failed."
-msgstr "El desindexado falló"
+#: src/applications/fs/fsui/unindex.c:109
+msgid "Unindexing failed (no reason given)"
+msgstr ""
 
-#: src/applications/fs/fsui/upload.c:222
+#: src/applications/fs/fsui/upload.c:245
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/applications/fs/fsui/upload.c:244
-#, fuzzy
-msgid "Upload failed (consult logs)."
-msgstr "La descarga del ERCS falló (vea los logs)."
-
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr "CHK URI no autorizado para buscar.\n"
@@ -2905,17 +2767,17 @@
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI no autorizado para buscar.\n"
 
-#: src/applications/fs/ecrs/download.c:128
+#: src/applications/fs/ecrs/download.c:124
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "Imposible desenlazar temporalmente el fichero '%s': %s\n"
 
-#: src/applications/fs/ecrs/download.c:263
+#: src/applications/fs/ecrs/download.c:255
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Escribiendo(%d, %p, %d) se produjo un fallo: %s\n"
 
-#: src/applications/fs/ecrs/download.c:972
+#: src/applications/fs/ecrs/download.c:964
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2923,7 +2785,7 @@
 "El contenido desencriptado no encuentra una clave. Esto puede ser un bug o "
 "un fichero introducido maliciosamente. Descarga abortada.\n"
 
-#: src/applications/fs/ecrs/download.c:1157
+#: src/applications/fs/ecrs/download.c:1149
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -2931,48 +2793,48 @@
 "El contenido '%s' parece no estar disponible en la red (intentado %u "
 "veces).\n"
 
-#: src/applications/fs/ecrs/upload.c:161
+#: src/applications/fs/ecrs/upload.c:162
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s' no es un fichero.\n"
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:172
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Imposible determinar el tamaño del fichero '%s'"
 
-#: src/applications/fs/ecrs/upload.c:179
+#: src/applications/fs/ecrs/upload.c:181
 msgid "Failed to connect to gnunetd."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/applications/fs/ecrs/upload.c:191
+#: src/applications/fs/ecrs/upload.c:193
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:210
+#: src/applications/fs/ecrs/upload.c:212
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 "Durante la inicialización de la indexación del fichero '%s' se produjo un "
 "fallo.\n"
 
-#: src/applications/fs/ecrs/upload.c:217
+#: src/applications/fs/ecrs/upload.c:219
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/applications/fs/ecrs/upload.c:303
+#: src/applications/fs/ecrs/upload.c:305
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
 
-#: src/applications/fs/ecrs/meta.c:851
+#: src/applications/fs/ecrs/meta.c:852
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Al renombrar el fichero '%s' a '%s' se produjo un fallo: %s\n"
 
-#: src/applications/fs/ecrs/meta.c:859
+#: src/applications/fs/ecrs/meta.c:860
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Imposible renombrar el fichero '%s' a '%s': el fichero ya existe\n"
@@ -3018,7 +2880,7 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Recolección de identificadores de fichero desactivada.\n"
 
-#: src/applications/fs/uritrack/file_info.c:367
+#: src/applications/fs/uritrack/file_info.c:369
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr "Borrada base de datos de URIs corrupta en '%s'."
@@ -3068,13 +2930,13 @@
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
 #: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:283
-#: src/applications/bootstrap_http/http.c:317
-#: src/applications/bootstrap_http/http.c:335
-#: src/applications/bootstrap_http/http.c:349
-#: src/applications/bootstrap_http/http.c:361
-#: src/applications/bootstrap_http/http.c:373
+#: src/applications/bootstrap_http/http.c:261
+#: src/applications/bootstrap_http/http.c:281
+#: src/applications/bootstrap_http/http.c:315
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:347
+#: src/applications/bootstrap_http/http.c:359
+#: src/applications/bootstrap_http/http.c:371
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
@@ -3088,7 +2950,7 @@
 msgid "Trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:409
+#: src/applications/bootstrap_http/http.c:407
 msgid "# hellos downloaded via http"
 msgstr "# saludos descargados vía HTTP"
 
@@ -3391,65 +3253,65 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detalles del mensaje: %u: longitud %d, prioridad: %d\n"
 
-#: src/server/connection.c:2420
+#: src/server/connection.c:2419
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Mensaje de '%s' descartado: formato inválido.\n"
 
-#: src/server/connection.c:2492
+#: src/server/connection.c:2491
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Secuencia de números no válida %u <= %u, omitiendo mensaje.\n"
 
-#: src/server/connection.c:2509
+#: src/server/connection.c:2508
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "Mensajes recibidos de mas de un día de antigüedad. Omitidos.\n"
 
-#: src/server/connection.c:2932
+#: src/server/connection.c:2937
 msgid "# outgoing messages dropped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/server/connection.c:2936
+#: src/server/connection.c:2941
 msgid "# bytes of outgoing messages dropped"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/server/connection.c:2938
+#: src/server/connection.c:2943
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2941
+#: src/server/connection.c:2946
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/server/connection.c:2945
+#: src/server/connection.c:2950
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:2949
+#: src/server/connection.c:2954
 #, fuzzy
 msgid "# bytes received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/server/connection.c:2951
+#: src/server/connection.c:2956
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:2952
+#: src/server/connection.c:2957
 msgid "# bytes noise sent"
 msgstr "# \"bytes-ruido\" mandados"
 
-#: src/server/gnunetd.c:80
+#: src/server/gnunetd.c:82
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s' comienzo completo.\n"
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
 #, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "'%s' se esta cerrando.\n"
 
-#: src/server/gnunetd.c:168
+#: src/server/gnunetd.c:170
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -3457,20 +3319,24 @@
 "se ejecuta en modo de depuración; gnunetd no sera un demonio y los mensajes "
 "de error serán escritos a través de stderr en vez de en un fichero de log"
 
-#: src/server/gnunetd.c:172
+#: src/server/gnunetd.c:174
 msgid "Starts the gnunetd daemon."
 msgstr "Arranca el demonio de gnunetd."
 
-#: src/server/gnunetd.c:175
+#: src/server/gnunetd.c:177
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:180
+msgid "run in quiet mode"
+msgstr ""
+
+#: src/server/gnunetd.c:184
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/server/gnunetd.c:228
+#: src/server/gnunetd.c:235
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3511,7 +3377,7 @@
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "Imposible apagar la aplicación '%s' adecuadamente.\n"
 
-#: src/server/core.c:594
+#: src/server/core.c:597
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
@@ -3688,12 +3554,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
+#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:403
+#: src/util/network_client/tcpio.c:428
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "¡'%s' falló, respuesta no válida!\n"
@@ -3725,6 +3591,11 @@
 msgid "Can't create semaphore: %i"
 msgstr "Imposible crear un semáforo: %i"
 
+#: src/util/os/osconfig.c:349
+#, fuzzy, c-format
+msgid "Command `%s' failed with error code %u\n"
+msgstr "'%s' falló con el código de error %s: %s"
+
 #: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -4066,12 +3937,12 @@
 msgid "No interface specified, using default\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/setup/gnunet-setup.c:264
+#: src/setup/gnunet-setup.c:265
 #, c-format
 msgid "`%s' is not available."
 msgstr "'%s' no esta disponible."
 
-#: src/setup/gnunet-setup.c:280
+#: src/setup/gnunet-setup.c:281
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Operación desconocida '%s'\n"
@@ -4136,203 +4007,207 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Error: imposible borrar el servicio: %s\n"
 
-#: src/setup/gtk/gconf.c:363
+#: src/setup/gtk/gconf.c:364
 #, fuzzy
 msgid "Description"
 msgstr "Pregunta"
 
-#: src/setup/gtk/gconf.c:381
+#: src/setup/gtk/gconf.c:382
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:402
+#: src/setup/gtk/gconf.c:403
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:416 src/setup/ncurses/wizard_curs.c:142
+#: src/setup/gtk/gconf.c:417 src/setup/ncurses/wizard_curs.c:142
 #: src/setup/ncurses/wizard_curs.c:195 src/setup/ncurses/wizard_curs.c:232
 #: src/setup/ncurses/wizard_curs.c:287 src/setup/ncurses/wizard_curs.c:319
 #: src/setup/ncurses/wizard_curs.c:379
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:431
 #, fuzzy
 msgid "Section"
 msgstr "Pregunta"
 
-#: src/setup/gtk/gconf.c:442
+#: src/setup/gtk/gconf.c:443
 #, fuzzy
 msgid "Option"
 msgstr "_Opciones"
 
-#: src/setup/gtk/gconf.c:464
+#: src/setup/gtk/gconf.c:465
 #, fuzzy
 msgid "Configuration saved."
 msgstr "Configuración de GNUnet"
 
-#: src/setup/gtk/gconf.c:472
+#: src/setup/gtk/gconf.c:473
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Imposible guardar la configuración"
 
-#: src/setup/gtk/gconf.c:495
+#: src/setup/gtk/gconf.c:496
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/setup/gtk/wizard_gtk.c:139
+#: src/setup/gtk/wizard_gtk.c:145
 #, fuzzy
 msgid "(unknown connection)"
 msgstr "Conexión de red"
 
-#: src/setup/gtk/wizard_gtk.c:389
+#: src/setup/gtk/wizard_gtk.c:422
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/setup/gtk/wizard_gtk.c:411
+#: src/setup/gtk/wizard_gtk.c:444
 #, fuzzy
 msgid "Do you want to save the new configuration?"
 msgstr "¿Quieres guardar tu configuración?"
 
-#: src/setup/gtk/wizard_gtk.c:438 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:473 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/setup/gtk/wizard_gtk.c:445 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:480 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr "Imposible cambiar el proceso de arranque:"
 
-#: src/setup/gtk/wizard_gtk.c:454
-msgid "gnunet-update failed. Please run gnunet-update manually."
+#: src/setup/gtk/wizard_gtk.c:496
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:74
+#: src/setup/text/conf.c:75
 #, fuzzy
 msgid "yes"
 msgstr "Bytes"
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:76
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:101
+#: src/setup/text/conf.c:102
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:110
+#: src/setup/text/conf.c:111
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:112
+#: src/setup/text/conf.c:113
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:132
+#: src/setup/text/conf.c:133
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:138
+#: src/setup/text/conf.c:139
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:144
+#: src/setup/text/conf.c:145
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:177
+#: src/setup/text/conf.c:178
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Sí"
 
-#: src/setup/text/conf.c:182
+#: src/setup/text/conf.c:183
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "No"
 
-#: src/setup/text/conf.c:185 src/setup/text/conf.c:221
-#: src/setup/text/conf.c:246 src/setup/text/conf.c:304
-#: src/setup/text/conf.c:354
+#: src/setup/text/conf.c:186 src/setup/text/conf.c:222
+#: src/setup/text/conf.c:248 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:358
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "Ayuda"
 
-#: src/setup/text/conf.c:188 src/setup/text/conf.c:201
-#: src/setup/text/conf.c:255 src/setup/text/conf.c:285
-#: src/setup/text/conf.c:335
+#: src/setup/text/conf.c:189 src/setup/text/conf.c:202
+#: src/setup/text/conf.c:257 src/setup/text/conf.c:287
+#: src/setup/text/conf.c:339
 #, fuzzy, c-format
 msgid "Abort\n"
 msgstr "_Acerca de"
 
-#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#: src/setup/text/conf.c:330 src/setup/text/conf.c:385
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:385
+#: src/setup/text/conf.c:391
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:459
+#: src/setup/text/conf.c:465
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:470
+#: src/setup/text/conf.c:476
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:492
+#: src/setup/text/conf.c:498
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/setup/text/conf.c:511
+#: src/setup/text/conf.c:517
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:542
+#: src/setup/text/conf.c:548
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:543
+#: src/setup/text/conf.c:549
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:427
+#: src/setup/text/conf.c:563 src/setup/ncurses/mconf.c:427
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/setup/text/conf.c:562
+#: src/setup/text/conf.c:568
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:572
+#: src/setup/text/conf.c:580
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/setup/text/conf.c:577
+#: src/setup/text/conf.c:585
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Fichero de configuración '%s' creado.\n"
@@ -4770,6 +4645,103 @@
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
+#~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+#~ msgstr "Esperando a gnunetd para empezar (%u ciclos restantes)...\n"
+
+#~ msgid "Failed to send `%s'.  Closing connection.\n"
+#~ msgstr "Fallo al mandar '%s'.   Cerrando la conexión.\n"
+
+#~ msgid "Received invalid `%s' request (size %d)\n"
+#~ msgstr "Recibida petición '%s' no válida (tamaño %d)\n"
+
+#~ msgid "Received invalid `%s' request (wrong table)\n"
+#~ msgstr "Recibida petición '%s' no válida (tabla errónea)\n"
+
+#~ msgid "Received unknown request type %d at %s:%d\n"
+#~ msgstr "Recibida petición de tipo desconocido %d en %s: %d\n"
+
+#~ msgid "This client already participates in the given DHT!\n"
+#~ msgstr "Este cliente ya participa en el DHT dado\n"
+
+#~ msgid "Cannot leave DHT: table not known!\n"
+#~ msgstr "Imposible dejar DHT: ¡tabla no conocida!\n"
+
+#~ msgid "gnunetd signaled error in response to `%s' message\n"
+#~ msgstr "gnunetd lanzó una señal de error en respuesta al mensaje '%s'\n"
+
+#~ msgid "Failed to receive response to `%s' message from gnunetd\n"
+#~ msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
+
+#~ msgid "Failed to send `%s' message to gnunetd\n"
+#~ msgstr "Falló al mandar el mensaje '%s' a gnunetd\n"
+
+#~ msgid "Join a DHT."
+#~ msgstr "Únete a DHT"
+
+#~ msgid "allow SIZE bytes of memory for the local table"
+#~ msgstr "Reserva SIZE bytes de memoria para la tabla local"
+
+#~ msgid "Call to `%s' returns %d.\n"
+#~ msgstr "La llamada a '%s' devuelve %d.\n"
+
+#~ msgid "Call to `%s' with key `%s'.\n"
+#~ msgstr "Llamada a '%s' con la clave '%s'.\n"
+
+#~ msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+#~ msgstr "Llama a '%s' con el valor '%.*s' (%d bytes).\n"
+
+#~ msgid "Error joining DHT.\n"
+#~ msgstr "Error uniéndose a DHT.\n"
+
+#~ msgid "Joined DHT.  Press CTRL-C to leave.\n"
+#~ msgstr "Unido a DHT.  Pulsa CTRL-C para abandonarlo.\n"
+
+#~ msgid "Error leaving DHT.\n"
+#~ msgstr "Error abandonando DHT.\n"
+
+#~ msgid "Malformed optional field `%s' received from peer `%s'.\n"
+#~ msgstr "Campo opcional anómalo '%s' recibido del par '%s'.\n"
+
+#~ msgid "Could not find peer `%s' in routing table!\n"
+#~ msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+
+#~ msgid "Received malformed response to `%s' from peer `%s'.\n"
+#~ msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
+
+#~ msgid "Invalid response to `%s' from peer `%s'.\n"
+#~ msgstr "Respuesta inválida a '%s' del par '%s'.\n"
+
+#~ msgid "Invalid response to `%s'.\n"
+#~ msgstr "Respuesta inválida a '%s'.\n"
+
+#~ msgid "Malformed response to `%s' on master table.\n"
+#~ msgstr "Respuesta anómala a '%s' en la tabla maestra.\n"
+
+#~ msgid "Invalid response to `%s' from `%s'\n"
+#~ msgstr "Respuesta inválida a '%s' de '%s'\n"
+
+#~ msgid "Received invalid RPC `%s'.\n"
+#~ msgstr "Recibido RPC '%s' inválida.\n"
+
+#~ msgid "RPC for `%s' received for table that we do not participate in!\n"
+#~ msgstr "¡RPC para '%s' recibida de la tabla en la cual no participamos!\n"
+
+#~ msgid "`%s' failed: table not found!\n"
+#~ msgstr "'%s' falló: ¡tabla no encontrada!\n"
+
+#~ msgid "sendAck failed.  Terminating connection to client.\n"
+#~ msgstr "sendAck falló. Finalizando conexión con el cliente.\n"
+
+#~ msgid "Failed to deliver `%s' message.\n"
+#~ msgstr "Falló al entregar el mensaje '%s'.\n"
+
+#~ msgid "Unindex failed."
+#~ msgstr "El desindexado falló"
+
+#, fuzzy
+#~ msgid "Upload failed (consult logs)."
+#~ msgstr "La descarga del ERCS falló (vea los logs)."
+
 #~ msgid "Could not resolve name of SMTP server `%s': %s"
 #~ msgstr "Imposible resolver el nombre del servidor de SMTP '%s': %s"
 
@@ -5307,9 +5279,6 @@
 #~ msgid "Open the enhanced configurator"
 #~ msgstr "Abre el editor de configuración avanzado"
 
-#~ msgid "Run gnunet-update"
-#~ msgstr "Ejecutar gnunet-update"
-
 #~ msgid "Finish"
 #~ msgstr "Finalizar"
 

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2006-12-03 22:08:23 UTC (rev 3870)
+++ GNUnet/po/rw.po     2006-12-04 00:33:50 UTC (rev 3871)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-11-15 23:17-0700\n"
+"POT-Creation-Date: 2006-12-03 18:11-0700\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -345,30 +345,54 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:442
+#, fuzzy
+msgid "Run gnunetd as this user."
+msgstr "Sitatisitiki"
+
+#: contrib/config-daemon.scm:443
+msgid ""
+"When started as root, gnunetd will change permissions to the given user."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+#, fuzzy
+msgid "Run gnunetd as this group."
+msgstr "ni OYA"
+
+#: contrib/config-daemon.scm:455
+msgid ""
+"When started as root, gnunetd will change permissions to the given group."
+msgstr ""
+
+#: contrib/config-daemon.scm:466
+msgid "Run gnunetd during system startup?"
+msgstr ""
+
+#: contrib/config-daemon.scm:479
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:443
+#: contrib/config-daemon.scm:480
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:491
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:474
+#: contrib/config-daemon.scm:511
 msgid "General settings"
 msgstr ""
 
-#: contrib/config-daemon.scm:475
+#: contrib/config-daemon.scm:512
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:541
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:503
+#: contrib/config-daemon.scm:543
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -377,11 +401,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:556
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:518
+#: contrib/config-daemon.scm:558
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -394,43 +418,43 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:573
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:574
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:551
+#: contrib/config-daemon.scm:591
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:552
+#: contrib/config-daemon.scm:592
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:566
+#: contrib/config-daemon.scm:606
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:618
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:590
+#: contrib/config-daemon.scm:630
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: contrib/config-daemon.scm:609
+#: contrib/config-daemon.scm:649
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:651
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -441,16 +465,16 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:625
+#: contrib/config-daemon.scm:665
 #, fuzzy
 msgid "Size of the routing table."
 msgstr "#imbonerahamwe#"
 
-#: contrib/config-daemon.scm:638
+#: contrib/config-daemon.scm:678
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:640
+#: contrib/config-daemon.scm:680
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -462,20 +486,20 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:654
+#: contrib/config-daemon.scm:694
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:671
+#: contrib/config-daemon.scm:711
 #, fuzzy
 msgid "Applications"
 msgstr "ibirindiro"
 
-#: contrib/config-daemon.scm:687
+#: contrib/config-daemon.scm:727
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:728
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -484,88 +508,88 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:699
+#: contrib/config-daemon.scm:739
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:711
+#: contrib/config-daemon.scm:751
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:726
+#: contrib/config-daemon.scm:766
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:738
+#: contrib/config-daemon.scm:778
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:753
+#: contrib/config-daemon.scm:793
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:765
+#: contrib/config-daemon.scm:805
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
-#: contrib/config-daemon.scm:870
+#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:910
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:789
+#: contrib/config-daemon.scm:829
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:806
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:830
+#: contrib/config-daemon.scm:870
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:846
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:898
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:882
+#: contrib/config-daemon.scm:922
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:899
+#: contrib/config-daemon.scm:939
 msgid "Network interface"
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:951
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:923
+#: contrib/config-daemon.scm:963
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:935
+#: contrib/config-daemon.scm:975
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:998
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:970
+#: contrib/config-daemon.scm:1010
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:982
+#: contrib/config-daemon.scm:1022
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1024
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -575,37 +599,37 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:995
+#: contrib/config-daemon.scm:1035
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1036
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1007
+#: contrib/config-daemon.scm:1047
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1048
 msgid ""
 "The limit is given as a percentage o\n"
 "f the MAXNETUPBPS limit.  Use 100 to have MAXNETUPBPS be the hard limit.  "
 "Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1060
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1072
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1034
+#: contrib/config-daemon.scm:1074
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -650,11 +674,11 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1051
+#: contrib/config-daemon.scm:1091
 msgid "Network interface to monitor"
 msgstr ""
 
-#: contrib/config-daemon.scm:1053
+#: contrib/config-daemon.scm:1093
 msgid ""
 "\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
 "\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
@@ -667,12 +691,12 @@
 "\t\t \"gnunet-win-tool -n\"."
 msgstr ""
 
-#: contrib/config-daemon.scm:1072
+#: contrib/config-daemon.scm:1112
 #, fuzzy
 msgid "Load management"
 msgstr "Komandi: Umurongo ingingo"
 
-#: contrib/config-daemon.scm:1096 contrib/config-client.scm:286
+#: contrib/config-daemon.scm:1136 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
@@ -1047,264 +1071,72 @@
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr "Ubutumwa Bivuye HTTP Ukwihuza"
 
-#: src/applications/dht/tools/dhttest2.c:45
-#: src/applications/session/sessiontest.c:42
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:100
-#: src/applications/gap/gaptest.c:49
+#: src/applications/dht/tools/dht-query.c:52
 #, fuzzy
-msgid "# of connected peers"
-msgstr "#Bya"
-
-#: src/applications/dht/tools/dhttest2.c:160
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr ""
-
-#: src/applications/dht/tools/dhttest2.c:173
-#: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:116
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:53
-#, fuzzy
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
+msgid "Query (get KEY, put KEY VALUE) a DHT table."
 msgstr "Kubona Gushyira Gukuraho... a imbonerahamwe#"
 
-#: src/applications/dht/tools/dht-query.c:57
-#: src/applications/dht/tools/dht-join.c:59
+#: src/applications/dht/tools/dht-query.c:56
 #, fuzzy
 msgid "join table called NAME"
 msgstr "imbonerahamwe#"
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/applications/dht/tools/dht-query.c:59
 #, fuzzy
 msgid "allow TIME ms to process each command"
 msgstr "Kwemerera Kuri Komandi:"
 
-#: src/applications/dht/tools/dht-query.c:130
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:129
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:134
-#: src/applications/dht/tools/dht-query.c:167
+#: src/applications/dht/tools/dht-query.c:133
 #, fuzzy, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)'Byanze"
 
-#: src/applications/dht/tools/dht-query.c:194
-#: src/applications/dht/tools/dht-join.c:165
+#: src/applications/dht/tools/dht-query.c:159
 #, fuzzy, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "imbonerahamwe# Izina: ikoresha"
 
-#: src/applications/dht/tools/dht-query.c:210
+#: src/applications/dht/tools/dht-query.c:175
 #, fuzzy, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/dht/tools/dht-query.c:220
+#: src/applications/dht/tools/dht-query.c:185
 #, fuzzy, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "Komandi:"
 
-#: src/applications/dht/tools/dht-query.c:232
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:197
 #, fuzzy, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "Komandi: ingingo Na"
 
-#: src/applications/dht/tools/dht-query.c:258
+#: src/applications/dht/tools/dht-query.c:209
 #, fuzzy, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Komandi:"
 
-#: src/applications/dht/tools/dht_api.c:148
-#: src/applications/dht/tools/dht_api.c:264
-#: src/applications/dht/tools/dht_api.c:321
-#: src/applications/dht/tools/dht_api.c:379
-#: src/applications/dht/tools/dht_api.c:415
+#: src/applications/dht/tools/dht_api.c:126
 #, fuzzy, c-format
-msgid "Failed to send `%s'.  Closing connection.\n"
-msgstr "Kuri Kohereza Ukwihuza"
-
-#: src/applications/dht/tools/dht_api.c:226
-#: src/applications/dht/tools/dht_api.c:282
-#: src/applications/dht/tools/dht_api.c:340
-#: src/applications/dht/tools/dht_api.c:397
-#, fuzzy, c-format
-msgid "Received invalid `%s' request (size %d)\n"
-msgstr "Sibyo Kubaza... Ingano"
-
-#: src/applications/dht/tools/dht_api.c:241
-#: src/applications/dht/tools/dht_api.c:297
-#: src/applications/dht/tools/dht_api.c:355
-#, fuzzy, c-format
-msgid "Received invalid `%s' request (wrong table)\n"
-msgstr "Sibyo Kubaza... imbonerahamwe#"
-
-#: src/applications/dht/tools/dht_api.c:429
-#, fuzzy, c-format
-msgid "Received unknown request type %d at %s:%d\n"
-msgstr "Kitazwi Kubaza... Ubwoko ku"
-
-#: src/applications/dht/tools/dht_api.c:473
-#, fuzzy
-msgid "This client already participates in the given DHT!\n"
-msgstr "Umukiriya in i"
-
-#: src/applications/dht/tools/dht_api.c:548
-#, fuzzy
-msgid "Cannot leave DHT: table not known!\n"
-msgstr "imbonerahamwe# OYA"
-
-#: src/applications/dht/tools/dht_api.c:571
-#, fuzzy, c-format
-msgid "gnunetd signaled error in response to `%s' message\n"
-msgstr "Ikosa in Kuri"
-
-#: src/applications/dht/tools/dht_api.c:576
-#, fuzzy, c-format
-msgid "Failed to receive response to `%s' message from gnunetd\n"
-msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
-
-#: src/applications/dht/tools/dht_api.c:581
-#, fuzzy, c-format
-msgid "Failed to send `%s' message to gnunetd\n"
-msgstr "Kuri Kohereza Ubutumwa Kuri"
-
-#: src/applications/dht/tools/dht_api.c:677
-#, fuzzy, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Subiza Kuri"
 
-#: src/applications/dht/tools/dht-join.c:52
-#, fuzzy
-msgid "Join a DHT."
-msgstr "a"
-
-#: src/applications/dht/tools/dht-join.c:56
-#, fuzzy
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "Kwemerera Bayite Bya Ububiko kugirango i imbonerahamwe#"
-
-#: src/applications/dht/tools/dht-join.c:78
+#: src/applications/dht/module/cs.c:103
 #, fuzzy, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "Kuri"
-
-#: src/applications/dht/tools/dht-join.c:79
-#, fuzzy, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Kuri Na: Urufunguzo"
-
-#: src/applications/dht/tools/dht-join.c:80
-#, fuzzy, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Kuri Na: Agaciro Bayite"
-
-#: src/applications/dht/tools/dht-join.c:189
-msgid "Error joining DHT.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:196
-#, fuzzy, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr "C Kuri"
-
-#: src/applications/dht/tools/dht-join.c:205
-msgid "Error leaving DHT.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:952
-#, fuzzy, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr "Bitari ngombwa Umwanya BYAKIRIWE Bivuye"
-
-#: src/applications/dht/module/dht.c:979
-#, fuzzy, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "OYA Gushaka in imbonerahamwe#"
-
-#: src/applications/dht/module/dht.c:1126
-#: src/applications/dht/module/dht.c:1141
-#, fuzzy, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr "Kuri Bivuye"
-
-#: src/applications/dht/module/dht.c:1453
-#, fuzzy, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Kuri Bivuye"
-
-#: src/applications/dht/module/dht.c:1611
-#: src/applications/dht/module/dht.c:2351
-#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
-#, fuzzy, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "`%s'Na: Igihe cyarenze: hejuru 1. ISAHA"
-
-#: src/applications/dht/module/dht.c:1803
-#, fuzzy, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Kuri"
-
-#: src/applications/dht/module/dht.c:2003
-#, fuzzy, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr "Kuri ku Mugenga imbonerahamwe#"
-
-#: src/applications/dht/module/dht.c:2217
-#: src/applications/dht/module/dht.c:2522
-#, fuzzy, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Kuri Bivuye"
-
-#: src/applications/dht/module/dht.c:2899
-#: src/applications/dht/module/dht.c:3041
-#: src/applications/dht/module/dht.c:3182
-#: src/applications/dht/module/dht.c:3330
-#, fuzzy, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Sibyo"
-
-#: src/applications/dht/module/dht.c:3201
-#: src/applications/dht/module/dht.c:3351
-#, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
-msgstr ""
-
-#: src/applications/dht/module/cs.c:449
-#, fuzzy, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "`%s'Byanze imbonerahamwe# OYA Byabonetse"
-
-#: src/applications/dht/module/cs.c:469
-#, fuzzy, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "`%s'Byanze."
 
-#: src/applications/dht/module/cs.c:546
-#, fuzzy
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "Byanze Ukwihuza Kuri Umukiriya"
-
-#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
-#: src/applications/dht/module/cs.c:693
+#: src/applications/dht/module/cs.c:198 src/applications/dht/module/cs.c:217
+#: src/applications/dht/module/cs.c:227
 #, fuzzy, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "`%s'Byanze."
 
-#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
-#, fuzzy, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Kuri Ibikubiyemo"
-
 #: src/applications/chat/chat.c:87
 #, fuzzy
 msgid "Message received from peer is invalid.\n"
@@ -1347,7 +1179,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, fuzzy, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
@@ -1438,7 +1270,7 @@
 msgstr ""
 
 #: src/applications/advertising/advertising.c:796
-#: src/applications/session/connect.c:800
+#: src/applications/session/connect.c:899
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -1573,55 +1405,71 @@
 msgid "# bytes in datastore"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/session/connect.c:225
+#: src/applications/session/sessiontest.c:42
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:101
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
+#, fuzzy
+msgid "# of connected peers"
+msgstr "#Bya"
+
+#: src/applications/session/connect.c:257
+#: src/applications/session/connect.c:274
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
 
-#: src/applications/session/connect.c:263
-#, fuzzy
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
+#: src/applications/session/connect.c:315
+#, fuzzy, c-format
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/session/connect.c:533
+#: src/applications/session/connect.c:594
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "`%s'Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:558
+#: src/applications/session/connect.c:612
 #, fuzzy, c-format
+msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
+msgstr "`%s'Ubutumwa BYAKIRIWE Bivuye"
+
+#: src/applications/session/connect.c:644
+#, fuzzy, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:568
+#: src/applications/session/connect.c:654
 #, fuzzy, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr "Bivuye Kugenzura..."
 
-#: src/applications/session/connect.c:626
-#, fuzzy
+#: src/applications/session/connect.c:723
+#, fuzzy, c-format
 msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr "Bishunzwe: Umukoro Urufunguzo Ubutumwa Ingano ni Sibyo"
 
-#: src/applications/session/connect.c:637
+#: src/applications/session/connect.c:735
 #, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:888
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:791
+#: src/applications/session/connect.c:890
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:793
+#: src/applications/session/connect.c:892
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:795
+#: src/applications/session/connect.c:894
 msgid "# sessions established"
 msgstr ""
 
@@ -1660,6 +1508,11 @@
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Kubaza... Ubutumwa"
 
+#: src/applications/rpc/rpc.c:1291
+#, fuzzy, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "`%s'Na: Igihe cyarenze: hejuru 1. ISAHA"
+
 #: src/applications/rpc/rpc.c:1415
 #, fuzzy, c-format
 msgid "RPC not unregistered: %s:%p\n"
@@ -2301,6 +2154,12 @@
 "Failed to receive reply from gnunetd.\n"
 msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
 
+#: src/applications/tbench/tbenchtest.c:117
+#: src/applications/tbench/tbenchtest_udp.c:116
+#, c-format
+msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgstr ""
+
 #: src/applications/tbench/tbenchtest.c:211
 #: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
@@ -2400,7 +2259,7 @@
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:66
+#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:67
 #, fuzzy
 msgid "Failed to get traffic stats.\n"
 msgstr "Kuri Ikibazo# Ibyerekeye"
@@ -3013,12 +2872,12 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "`%s'ntabwo ari idosiye"
 
-#: src/applications/fs/module/ondemand.c:321
+#: src/applications/fs/module/ondemand.c:334
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/fs/module/ondemand.c:432
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -3026,32 +2885,32 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:446
+#: src/applications/fs/module/ondemand.c:459
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
 "%s' under `%s'.\n"
 msgstr "IDOSIYE bushyinguro kugirango Bya Ibyatanzwe in Icyiciro"
 
-#: src/applications/fs/module/ondemand.c:667
+#: src/applications/fs/module/ondemand.c:679
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1232
+#: src/applications/fs/module/fs.c:1134
 #, fuzzy, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
 "s'.\n"
 msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
 
-#: src/applications/fs/module/fs.c:1284
+#: src/applications/fs/module/fs.c:1175
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1324
+#: src/applications/fs/module/fs.c:1215
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -3063,39 +2922,33 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/searchtest.c:159
 #: src/applications/fs/fsui/fsuitest.c:193
-#: src/applications/fs/fsui/downloadtest.c:307
+#: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:265
+#: src/applications/fs/fsui/search.c:275
 #, fuzzy
-msgid "Error running search (consult logs)."
+msgid "Error running search (no reason given)."
 msgstr "Kuri Kongeramo"
 
-#: src/applications/fs/fsui/download.c:263
+#: src/applications/fs/fsui/download.c:267
 #, fuzzy
-msgid "ECRS download failed (see logs)"
+msgid "Download failed (no reason given)"
 msgstr "OYA Gufungura IDOSIYE"
 
-#: src/applications/fs/fsui/unindex.c:99
-#, fuzzy
-msgid "Unindex failed."
-msgstr "/Idosiye IDOSIYE"
+#: src/applications/fs/fsui/unindex.c:109
+msgid "Unindexing failed (no reason given)"
+msgstr ""
 
-#: src/applications/fs/fsui/upload.c:222
+#: src/applications/fs/fsui/upload.c:245
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Kuri Kurema"
 
-#: src/applications/fs/fsui/upload.c:244
-#, fuzzy
-msgid "Upload failed (consult logs)."
-msgstr "OYA Gufungura IDOSIYE"
-
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
@@ -3104,70 +2957,70 @@
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:128
+#: src/applications/fs/ecrs/download.c:124
 #, fuzzy, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "OYA Kwandika Kuri IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:263
+#: src/applications/fs/ecrs/download.c:255
 #, fuzzy, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "`%s'%sByanze"
 
-#: src/applications/fs/ecrs/download.c:972
+#: src/applications/fs/ecrs/download.c:964
 #, fuzzy
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
 msgstr "Ibikubiyemo OYA BIHUYE Urufunguzo ni a Cyangwa a Byinjijwemo IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:1157
+#: src/applications/fs/ecrs/download.c:1149
 #, fuzzy, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr "Kuri OYA Bihari ku i urusobe"
 
-#: src/applications/fs/ecrs/upload.c:161
+#: src/applications/fs/ecrs/upload.c:162
 #, fuzzy, c-format
 msgid "`%s' is not a file.\n"
 msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:172
 #, fuzzy, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:179
+#: src/applications/fs/ecrs/upload.c:181
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/ecrs/upload.c:191
+#: src/applications/fs/ecrs/upload.c:193
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Ibirimo"
 
-#: src/applications/fs/ecrs/upload.c:210
+#: src/applications/fs/ecrs/upload.c:212
 #, fuzzy, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Bya in IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:217
+#: src/applications/fs/ecrs/upload.c:219
 #, fuzzy, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Itangira... Modire Byanze Umukiriya"
 
-#: src/applications/fs/ecrs/upload.c:303
+#: src/applications/fs/ecrs/upload.c:305
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:851
+#: src/applications/fs/ecrs/meta.c:852
 #, fuzzy, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Bya IDOSIYE Kuri Byanze"
 
-#: src/applications/fs/ecrs/meta.c:859
+#: src/applications/fs/ecrs/meta.c:860
 #, fuzzy, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "OYA Guhindura izina IDOSIYE Kuri IDOSIYE"
@@ -3212,7 +3065,7 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:367
+#: src/applications/fs/uritrack/file_info.c:369
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
@@ -3261,13 +3114,13 @@
 msgstr "Bya ni Sibyo Ijambobanga..."
 
 #: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:283
-#: src/applications/bootstrap_http/http.c:317
-#: src/applications/bootstrap_http/http.c:335
-#: src/applications/bootstrap_http/http.c:349
-#: src/applications/bootstrap_http/http.c:361
-#: src/applications/bootstrap_http/http.c:373
+#: src/applications/bootstrap_http/http.c:261
+#: src/applications/bootstrap_http/http.c:281
+#: src/applications/bootstrap_http/http.c:315
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:347
+#: src/applications/bootstrap_http/http.c:359
+#: src/applications/bootstrap_http/http.c:371
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
@@ -3281,7 +3134,7 @@
 msgid "Trying to download hostlist from `%s'\n"
 msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
 
-#: src/applications/bootstrap_http/http.c:409
+#: src/applications/bootstrap_http/http.c:407
 #, fuzzy
 msgid "# hellos downloaded via http"
 msgstr "#KB Yimuwe ku"
@@ -3591,92 +3444,96 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2420
+#: src/server/connection.c:2419
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2492
+#: src/server/connection.c:2491
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2509
+#: src/server/connection.c:2508
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:2932
+#: src/server/connection.c:2937
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:2936
+#: src/server/connection.c:2941
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:2938
+#: src/server/connection.c:2943
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2941
+#: src/server/connection.c:2946
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2945
+#: src/server/connection.c:2950
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "#Bayite Bya Ubwoko"
 
-#: src/server/connection.c:2949
+#: src/server/connection.c:2954
 #, fuzzy
 msgid "# bytes received"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/server/connection.c:2951
+#: src/server/connection.c:2956
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2952
+#: src/server/connection.c:2957
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/gnunetd.c:80
+#: src/server/gnunetd.c:82
 #, fuzzy, c-format
 msgid "`%s' startup complete.\n"
 msgstr "`%s'Byuzuye"
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
 #, fuzzy, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "`%s'ni Hasi"
 
-#: src/server/gnunetd.c:168
+#: src/server/gnunetd.c:170
 #, fuzzy
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
 msgstr "Gukoresha in Kosora amakosa Ubwoko OYA Na Ikosa Ubutumwa Kuri Bya a"
 
-#: src/server/gnunetd.c:172
+#: src/server/gnunetd.c:174
 #, fuzzy
 msgid "Starts the gnunetd daemon."
 msgstr "i"
 
-#: src/server/gnunetd.c:175
+#: src/server/gnunetd.c:177
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:180
+msgid "run in quiet mode"
+msgstr ""
+
+#: src/server/gnunetd.c:184
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "Ubuturo ku ni"
 
-#: src/server/gnunetd.c:228
+#: src/server/gnunetd.c:235
 #, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
@@ -3716,7 +3573,7 @@
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "OYA Zimya Porogaramu"
 
-#: src/server/core.c:594
+#: src/server/core.c:597
 #, fuzzy, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "OYA Kureka gufungura Serivisi"
@@ -3896,7 +3753,7 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
+#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr ""
@@ -3916,7 +3773,7 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/util/network_client/tcpio.c:403
+#: src/util/network_client/tcpio.c:428
 #, fuzzy, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "`%s'Byanze Subiza Sibyo"
@@ -3947,6 +3804,11 @@
 msgid "Can't create semaphore: %i"
 msgstr ""
 
+#: src/util/os/osconfig.c:349
+#, fuzzy, c-format
+msgid "Command `%s' failed with error code %u\n"
+msgstr "`%s'Byanze ku Na: Ikosa"
+
 #: src/util/os/dso.c:56
 #, fuzzy, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -4291,12 +4153,12 @@
 msgid "No interface specified, using default\n"
 msgstr "imbonerahamwe# Izina: ikoresha"
 
-#: src/setup/gnunet-setup.c:264
+#: src/setup/gnunet-setup.c:265
 #, fuzzy, c-format
 msgid "`%s' is not available."
 msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
 
-#: src/setup/gnunet-setup.c:280
+#: src/setup/gnunet-setup.c:281
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Imiterere Verisiyo"
@@ -4361,21 +4223,21 @@
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:363
+#: src/setup/gtk/gconf.c:364
 #, fuzzy
 msgid "Description"
 msgstr "Igaragaza Imiterere:"
 
-#: src/setup/gtk/gconf.c:381
+#: src/setup/gtk/gconf.c:382
 msgid "Value"
 msgstr "Agaciro"
 
-#: src/setup/gtk/gconf.c:402
+#: src/setup/gtk/gconf.c:403
 msgid "Default"
 msgstr ""
 
 # sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/setup/gtk/gconf.c:416 src/setup/ncurses/wizard_curs.c:142
+#: src/setup/gtk/gconf.c:417 src/setup/ncurses/wizard_curs.c:142
 #: src/setup/ncurses/wizard_curs.c:195 src/setup/ncurses/wizard_curs.c:232
 #: src/setup/ncurses/wizard_curs.c:287 src/setup/ncurses/wizard_curs.c:319
 #: src/setup/ncurses/wizard_curs.c:379
@@ -4383,182 +4245,186 @@
 msgid "Help"
 msgstr "/Kugoboka"
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:431
 #, fuzzy
 msgid "Section"
 msgstr "Insobanuramiterere"
 
-#: src/setup/gtk/gconf.c:442
+#: src/setup/gtk/gconf.c:443
 #, fuzzy
 msgid "Option"
 msgstr "ibirindiro"
 
-#: src/setup/gtk/gconf.c:464
+#: src/setup/gtk/gconf.c:465
 #, fuzzy
 msgid "Configuration saved."
 msgstr "A bushyinguro"
 
-#: src/setup/gtk/gconf.c:472
+#: src/setup/gtk/gconf.c:473
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/setup/gtk/gconf.c:495
+#: src/setup/gtk/gconf.c:496
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/setup/gtk/wizard_gtk.c:139
+#: src/setup/gtk/wizard_gtk.c:145
 #, fuzzy
 msgid "(unknown connection)"
 msgstr "Imiterere Verisiyo"
 
-#: src/setup/gtk/wizard_gtk.c:389
+#: src/setup/gtk/wizard_gtk.c:422
 #, fuzzy, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/setup/gtk/wizard_gtk.c:411
+#: src/setup/gtk/wizard_gtk.c:444
 #, fuzzy
 msgid "Do you want to save the new configuration?"
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/setup/gtk/wizard_gtk.c:438 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:473 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:445 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:480 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:454
-msgid "gnunet-update failed. Please run gnunet-update manually."
+#: src/setup/gtk/wizard_gtk.c:496
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:74
+#: src/setup/text/conf.c:75
 #, fuzzy
 msgid "yes"
 msgstr "Yego"
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:76
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:101
+#: src/setup/text/conf.c:102
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:110
+#: src/setup/text/conf.c:111
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:112
+#: src/setup/text/conf.c:113
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:132
+#: src/setup/text/conf.c:133
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:138
+#: src/setup/text/conf.c:139
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:144
+#: src/setup/text/conf.c:145
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:177
+#: src/setup/text/conf.c:178
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Yego"
 
-#: src/setup/text/conf.c:182
+#: src/setup/text/conf.c:183
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "Oya."
 
 # sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/setup/text/conf.c:185 src/setup/text/conf.c:221
-#: src/setup/text/conf.c:246 src/setup/text/conf.c:304
-#: src/setup/text/conf.c:354
+#: src/setup/text/conf.c:186 src/setup/text/conf.c:222
+#: src/setup/text/conf.c:248 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:358
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "/Kugoboka"
 
 # offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
-#: src/setup/text/conf.c:188 src/setup/text/conf.c:201
-#: src/setup/text/conf.c:255 src/setup/text/conf.c:285
-#: src/setup/text/conf.c:335
+#: src/setup/text/conf.c:189 src/setup/text/conf.c:202
+#: src/setup/text/conf.c:257 src/setup/text/conf.c:287
+#: src/setup/text/conf.c:339
 #, fuzzy, c-format
 msgid "Abort\n"
 msgstr "Ibyerekeye"
 
-#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#: src/setup/text/conf.c:330 src/setup/text/conf.c:385
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:385
+#: src/setup/text/conf.c:391
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:459
+#: src/setup/text/conf.c:465
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:470
+#: src/setup/text/conf.c:476
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:492
+#: src/setup/text/conf.c:498
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "Inkoresha siyo"
 
-#: src/setup/text/conf.c:511
+#: src/setup/text/conf.c:517
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:542
+#: src/setup/text/conf.c:548
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:543
+#: src/setup/text/conf.c:549
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:427
+#: src/setup/text/conf.c:563 src/setup/ncurses/mconf.c:427
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/setup/text/conf.c:562
+#: src/setup/text/conf.c:568
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:572
+#: src/setup/text/conf.c:580
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/setup/text/conf.c:577
+#: src/setup/text/conf.c:585
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Gufungura Iboneza IDOSIYE"
@@ -4886,6 +4752,118 @@
 msgstr "`%s'Byanze ku IDOSIYE ku Na: Ikosa"
 
 #, fuzzy
+#~ msgid "Failed to send `%s'.  Closing connection.\n"
+#~ msgstr "Kuri Kohereza Ukwihuza"
+
+#, fuzzy
+#~ msgid "Received invalid `%s' request (size %d)\n"
+#~ msgstr "Sibyo Kubaza... Ingano"
+
+#, fuzzy
+#~ msgid "Received invalid `%s' request (wrong table)\n"
+#~ msgstr "Sibyo Kubaza... imbonerahamwe#"
+
+#, fuzzy
+#~ msgid "Received unknown request type %d at %s:%d\n"
+#~ msgstr "Kitazwi Kubaza... Ubwoko ku"
+
+#, fuzzy
+#~ msgid "This client already participates in the given DHT!\n"
+#~ msgstr "Umukiriya in i"
+
+#, fuzzy
+#~ msgid "Cannot leave DHT: table not known!\n"
+#~ msgstr "imbonerahamwe# OYA"
+
+#, fuzzy
+#~ msgid "gnunetd signaled error in response to `%s' message\n"
+#~ msgstr "Ikosa in Kuri"
+
+#, fuzzy
+#~ msgid "Failed to receive response to `%s' message from gnunetd\n"
+#~ msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
+
+#, fuzzy
+#~ msgid "Failed to send `%s' message to gnunetd\n"
+#~ msgstr "Kuri Kohereza Ubutumwa Kuri"
+
+#, fuzzy
+#~ msgid "Join a DHT."
+#~ msgstr "a"
+
+#, fuzzy
+#~ msgid "allow SIZE bytes of memory for the local table"
+#~ msgstr "Kwemerera Bayite Bya Ububiko kugirango i imbonerahamwe#"
+
+#, fuzzy
+#~ msgid "Call to `%s' returns %d.\n"
+#~ msgstr "Kuri"
+
+#, fuzzy
+#~ msgid "Call to `%s' with key `%s'.\n"
+#~ msgstr "Kuri Na: Urufunguzo"
+
+#, fuzzy
+#~ msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+#~ msgstr "Kuri Na: Agaciro Bayite"
+
+#, fuzzy
+#~ msgid "Joined DHT.  Press CTRL-C to leave.\n"
+#~ msgstr "C Kuri"
+
+#, fuzzy
+#~ msgid "Malformed optional field `%s' received from peer `%s'.\n"
+#~ msgstr "Bitari ngombwa Umwanya BYAKIRIWE Bivuye"
+
+#, fuzzy
+#~ msgid "Could not find peer `%s' in routing table!\n"
+#~ msgstr "OYA Gushaka in imbonerahamwe#"
+
+#, fuzzy
+#~ msgid "Received malformed response to `%s' from peer `%s'.\n"
+#~ msgstr "Kuri Bivuye"
+
+#, fuzzy
+#~ msgid "Invalid response to `%s' from peer `%s'.\n"
+#~ msgstr "Kuri Bivuye"
+
+#, fuzzy
+#~ msgid "Invalid response to `%s'.\n"
+#~ msgstr "Kuri"
+
+#, fuzzy
+#~ msgid "Malformed response to `%s' on master table.\n"
+#~ msgstr "Kuri ku Mugenga imbonerahamwe#"
+
+#, fuzzy
+#~ msgid "Invalid response to `%s' from `%s'\n"
+#~ msgstr "Kuri Bivuye"
+
+#, fuzzy
+#~ msgid "Received invalid RPC `%s'.\n"
+#~ msgstr "Sibyo"
+
+#, fuzzy
+#~ msgid "`%s' failed: table not found!\n"
+#~ msgstr "`%s'Byanze imbonerahamwe# OYA Byabonetse"
+
+#, fuzzy
+#~ msgid "sendAck failed.  Terminating connection to client.\n"
+#~ msgstr "Byanze Ukwihuza Kuri Umukiriya"
+
+#, fuzzy
+#~ msgid "Failed to deliver `%s' message.\n"
+#~ msgstr "Kuri Ibikubiyemo"
+
+#, fuzzy
+#~ msgid "Unindex failed."
+#~ msgstr "/Idosiye IDOSIYE"
+
+#, fuzzy
+#~ msgid "Upload failed (consult logs)."
+#~ msgstr "OYA Gufungura IDOSIYE"
+
+#, fuzzy
 #~ msgid "Could not resolve name of SMTP server `%s': %s"
 #~ msgstr "OYA Izina: Bya Seriveri"
 
@@ -5906,10 +5884,6 @@
 #~ msgstr "ubutumwa"
 
 #, fuzzy
-#~ msgid "gnunetd statistics"
-#~ msgstr "Sitatisitiki"
-
-#, fuzzy
 #~ msgid "Error reading `%s' output from file `%s'.\n"
 #~ msgstr "Ibisohoka Bivuye IDOSIYE"
 
@@ -5946,10 +5920,6 @@
 #~ msgstr "Kuri Hasi Ikosa ITEGEKONGENGA"
 
 #, fuzzy
-#~ msgid "gnunetd is not running."
-#~ msgstr "ni OYA"
-
-#, fuzzy
 #~ msgid ""
 #~ "gnunetd (daemon) doesn't seem to be running.\n"
 #~ "Would you like to start it?\n"

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2006-12-03 22:08:23 UTC (rev 3870)
+++ GNUnet/po/sv.po     2006-12-04 00:33:50 UTC (rev 3871)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-11-15 23:17-0700\n"
+"POT-Creation-Date: 2006-12-03 18:11-0700\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -337,31 +337,55 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:442
+#, fuzzy
+msgid "Run gnunetd as this user."
+msgstr "Kör gnunet-update"
+
+#: contrib/config-daemon.scm:443
+msgid ""
+"When started as root, gnunetd will change permissions to the given user."
+msgstr ""
+
+#: contrib/config-daemon.scm:454
+#, fuzzy
+msgid "Run gnunetd as this group."
+msgstr "Kör gnunet-update"
+
+#: contrib/config-daemon.scm:455
+msgid ""
+"When started as root, gnunetd will change permissions to the given group."
+msgstr ""
+
+#: contrib/config-daemon.scm:466
+msgid "Run gnunetd during system startup?"
+msgstr ""
+
+#: contrib/config-daemon.scm:479
 msgid "Prevent the specfied set of peers from connecting."
 msgstr ""
 
-#: contrib/config-daemon.scm:443
+#: contrib/config-daemon.scm:480
 msgid "If this option is not set, any peer is allowed to connect."
 msgstr ""
 
-#: contrib/config-daemon.scm:454
+#: contrib/config-daemon.scm:491
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:474
+#: contrib/config-daemon.scm:511
 #, fuzzy
 msgid "General settings"
 msgstr "Andra inställningar"
 
-#: contrib/config-daemon.scm:475
+#: contrib/config-daemon.scm:512
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:541
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:503
+#: contrib/config-daemon.scm:543
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -370,11 +394,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:556
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:518
+#: contrib/config-daemon.scm:558
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -387,44 +411,44 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:573
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:574
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:551
+#: contrib/config-daemon.scm:591
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:552
+#: contrib/config-daemon.scm:592
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:566
+#: contrib/config-daemon.scm:606
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:618
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:590
+#: contrib/config-daemon.scm:630
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr ""
 "Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
-#: contrib/config-daemon.scm:609
+#: contrib/config-daemon.scm:649
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:651
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -435,15 +459,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:625
+#: contrib/config-daemon.scm:665
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:638
+#: contrib/config-daemon.scm:678
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:640
+#: contrib/config-daemon.scm:680
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -455,21 +479,21 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:654
+#: contrib/config-daemon.scm:694
 #, fuzzy
 msgid "Options for anonymous file sharing"
 msgstr "aktiverar (anonym) fildelning"
 
-#: contrib/config-daemon.scm:671
+#: contrib/config-daemon.scm:711
 #, fuzzy
 msgid "Applications"
 msgstr "_Alternativ"
 
-#: contrib/config-daemon.scm:687
+#: contrib/config-daemon.scm:727
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:728
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -478,89 +502,89 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:699
+#: contrib/config-daemon.scm:739
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:711
+#: contrib/config-daemon.scm:751
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:726
+#: contrib/config-daemon.scm:766
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:738
+#: contrib/config-daemon.scm:778
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:753
+#: contrib/config-daemon.scm:793
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:765
+#: contrib/config-daemon.scm:805
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
-#: contrib/config-daemon.scm:870
+#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:910
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:789
+#: contrib/config-daemon.scm:829
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:806
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:830
+#: contrib/config-daemon.scm:870
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:846
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:898
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:882
+#: contrib/config-daemon.scm:922
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:899
+#: contrib/config-daemon.scm:939
 #, fuzzy
 msgid "Network interface"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:951
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:923
+#: contrib/config-daemon.scm:963
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:935
+#: contrib/config-daemon.scm:975
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:998
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:970
+#: contrib/config-daemon.scm:1010
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:982
+#: contrib/config-daemon.scm:1022
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1024
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -570,37 +594,37 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:995
+#: contrib/config-daemon.scm:1035
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1036
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1007
+#: contrib/config-daemon.scm:1047
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1048
 msgid ""
 "The limit is given as a percentage o\n"
 "f the MAXNETUPBPS limit.  Use 100 to have MAXNETUPBPS be the hard limit.  "
 "Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1060
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1072
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1034
+#: contrib/config-daemon.scm:1074
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -645,12 +669,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1051
+#: contrib/config-daemon.scm:1091
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:1053
+#: contrib/config-daemon.scm:1093
 msgid ""
 "\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
 "\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
@@ -663,12 +687,12 @@
 "\t\t \"gnunet-win-tool -n\"."
 msgstr ""
 
-#: contrib/config-daemon.scm:1072
+#: contrib/config-daemon.scm:1112
 #, fuzzy
 msgid "Load management"
 msgstr "Ogiltiga kommandoradsargument.\n"
 
-#: contrib/config-daemon.scm:1096 contrib/config-client.scm:286
+#: contrib/config-daemon.scm:1136 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
@@ -954,255 +978,69 @@
 msgid "Received malformed message from udp-peer connection. Closing.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/applications/dht/tools/dhttest2.c:45
-#: src/applications/session/sessiontest.c:42
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:100
-#: src/applications/gap/gaptest.c:49
-msgid "# of connected peers"
-msgstr "# av anslutna parter"
-
-#: src/applications/dht/tools/dhttest2.c:160
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Väntar på att gnunetd ska starta (%u iterationer kvar)...\n"
-
-#: src/applications/dht/tools/dhttest2.c:173
-#: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:116
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
-
-#: src/applications/dht/tools/dht-query.c:53
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
+#: src/applications/dht/tools/dht-query.c:52
+msgid "Query (get KEY, put KEY VALUE) a DHT table."
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:57
-#: src/applications/dht/tools/dht-join.c:59
+#: src/applications/dht/tools/dht-query.c:56
 msgid "join table called NAME"
 msgstr ""
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/applications/dht/tools/dht-query.c:59
 msgid "allow TIME ms to process each command"
 msgstr "tillåt TID ms för behandling av varje kommando"
 
-#: src/applications/dht/tools/dht-query.c:130
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:129
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "\"%s(%s,%s)\" lyckades\n"
 
-#: src/applications/dht/tools/dht-query.c:134
-#: src/applications/dht/tools/dht-query.c:167
+#: src/applications/dht/tools/dht-query.c:133
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "\"%s(%s,%s)\" misslyckades.\n"
 
-#: src/applications/dht/tools/dht-query.c:194
-#: src/applications/dht/tools/dht-join.c:165
+#: src/applications/dht/tools/dht-query.c:159
 #, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#: src/applications/dht/tools/dht-query.c:210
+#: src/applications/dht/tools/dht-query.c:175
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/dht/tools/dht-query.c:220
+#: src/applications/dht/tools/dht-query.c:185
 #, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/applications/dht/tools/dht-query.c:232
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:197
 #, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "Kommando \"%s\" kräver två argument (\"%s\" och \"%s\").\n"
 
-#: src/applications/dht/tools/dht-query.c:258
+#: src/applications/dht/tools/dht-query.c:209
 #, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/applications/dht/tools/dht_api.c:148
-#: src/applications/dht/tools/dht_api.c:264
-#: src/applications/dht/tools/dht_api.c:321
-#: src/applications/dht/tools/dht_api.c:379
-#: src/applications/dht/tools/dht_api.c:415
+#: src/applications/dht/tools/dht_api.c:126
 #, c-format
-msgid "Failed to send `%s'.  Closing connection.\n"
-msgstr "Misslyckades att skicka \"%s\".  Stänger anslutning.\n"
-
-#: src/applications/dht/tools/dht_api.c:226
-#: src/applications/dht/tools/dht_api.c:282
-#: src/applications/dht/tools/dht_api.c:340
-#: src/applications/dht/tools/dht_api.c:397
-#, c-format
-msgid "Received invalid `%s' request (size %d)\n"
-msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
-
-#: src/applications/dht/tools/dht_api.c:241
-#: src/applications/dht/tools/dht_api.c:297
-#: src/applications/dht/tools/dht_api.c:355
-#, c-format
-msgid "Received invalid `%s' request (wrong table)\n"
-msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
-
-#: src/applications/dht/tools/dht_api.c:429
-#, c-format
-msgid "Received unknown request type %d at %s:%d\n"
-msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
-
-#: src/applications/dht/tools/dht_api.c:473
-msgid "This client already participates in the given DHT!\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:548
-msgid "Cannot leave DHT: table not known!\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht_api.c:571
-#, c-format
-msgid "gnunetd signaled error in response to `%s' message\n"
-msgstr "gnunetd signalerade fel i svar till \"%s\" meddelande\n"
-
-#: src/applications/dht/tools/dht_api.c:576
-#, c-format
-msgid "Failed to receive response to `%s' message from gnunetd\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#: src/applications/dht/tools/dht_api.c:581
-#, c-format
-msgid "Failed to send `%s' message to gnunetd\n"
-msgstr "Misslyckades att skicka \"%s\" meddelande till gnunetd\n"
-
-#: src/applications/dht/tools/dht_api.c:677
-#, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Oväntat svar till \"%s\" operation.\n"
 
-#: src/applications/dht/tools/dht-join.c:52
-msgid "Join a DHT."
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:56
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "tillåt STORLEK byte av minne för lokaltabellen"
-
-#: src/applications/dht/tools/dht-join.c:78
+#: src/applications/dht/module/cs.c:103
 #, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "Anrop till \"%s\" returnerade %d.\n"
-
-#: src/applications/dht/tools/dht-join.c:79
-#, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
-
-#: src/applications/dht/tools/dht-join.c:80
-#, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Anrop till \"%s\" med värde \"%.*s\" (%d byte).\n"
-
-#: src/applications/dht/tools/dht-join.c:189
-msgid "Error joining DHT.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:196
-#, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:205
-msgid "Error leaving DHT.\n"
-msgstr "Fel vid lämning av DHT.\n"
-
-#: src/applications/dht/module/dht.c:952
-#, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:979
-#, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
-
-#: src/applications/dht/module/dht.c:1126
-#: src/applications/dht/module/dht.c:1141
-#, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:1453
-#, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
-
-#: src/applications/dht/module/dht.c:1611
-#: src/applications/dht/module/dht.c:2351
-#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
-#, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
-
-#: src/applications/dht/module/dht.c:1803
-#, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
-
-#: src/applications/dht/module/dht.c:2003
-#, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr ""
-
-#: src/applications/dht/module/dht.c:2217
-#: src/applications/dht/module/dht.c:2522
-#, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
-
-#: src/applications/dht/module/dht.c:2899
-#: src/applications/dht/module/dht.c:3041
-#: src/applications/dht/module/dht.c:3182
-#: src/applications/dht/module/dht.c:3330
-#, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Mottog ogiltig RPC \"%s\".\n"
-
-#: src/applications/dht/module/dht.c:3201
-#: src/applications/dht/module/dht.c:3351
-#, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
-msgstr ""
-
-#: src/applications/dht/module/cs.c:449
-#, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
-
-#: src/applications/dht/module/cs.c:469
-#, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "\"%s\" misslyckades.  Terminerar anslutning till klient.\n"
 
-#: src/applications/dht/module/cs.c:546
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "sendAck misslyckades.  Terminerar anslutning till klient.\n"
-
-#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
-#: src/applications/dht/module/cs.c:693
+#: src/applications/dht/module/cs.c:198 src/applications/dht/module/cs.c:217
+#: src/applications/dht/module/cs.c:227
 #, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "\"%s\" misslyckades. Terminerar anslutning till klient.\n"
 
-#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
-#, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
 #: src/applications/chat/chat.c:87
 msgid "Message received from peer is invalid.\n"
 msgstr "Meddelande mottaget från motpart är ogiltig.\n"
@@ -1240,7 +1078,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
@@ -1324,7 +1162,7 @@
 msgstr "# PING-meddelanden i klartext skickade"
 
 #: src/applications/advertising/advertising.c:796
-#: src/applications/session/connect.c:800
+#: src/applications/session/connect.c:899
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "\"%s\" registrerar handtag %d (klartext och kryptotext)\n"
@@ -1449,53 +1287,70 @@
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/session/connect.c:225
+#: src/applications/session/sessiontest.c:42
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:101
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
+msgid "# of connected peers"
+msgstr "# av anslutna parter"
+
+#: src/applications/session/connect.c:257
+#: src/applications/session/connect.c:274
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:263
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
+#: src/applications/session/connect.c:315
+#, fuzzy, c-format
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
 
-#: src/applications/session/connect.c:533
+#: src/applications/session/connect.c:594
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Meddelande mottaget från motpart är ogiltig.\n"
 
-#: src/applications/session/connect.c:558
+#: src/applications/session/connect.c:612
+#, fuzzy, c-format
+msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
+msgstr "Meddelande mottaget från motpart är ogiltig.\n"
+
+#: src/applications/session/connect.c:644
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:568
+#: src/applications/session/connect.c:654
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:626
+#: src/applications/session/connect.c:723
+#, c-format
 msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:637
+#: src/applications/session/connect.c:735
 #, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:888
 msgid "# session keys sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/applications/session/connect.c:791
+#: src/applications/session/connect.c:890
 msgid "# session keys rejected"
 msgstr "# sessionnycklar vägrade"
 
-#: src/applications/session/connect.c:793
+#: src/applications/session/connect.c:892
 msgid "# session keys accepted"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/applications/session/connect.c:795
+#: src/applications/session/connect.c:894
 msgid "# sessions established"
 msgstr "# sessioner etablerade"
 
@@ -1534,6 +1389,11 @@
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
+#: src/applications/rpc/rpc.c:1291
+#, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
+
 #: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
@@ -2094,6 +1954,12 @@
 "Failed to receive reply from gnunetd.\n"
 msgstr ""
 
+#: src/applications/tbench/tbenchtest.c:117
+#: src/applications/tbench/tbenchtest_udp.c:116
+#, c-format
+msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
+
 #: src/applications/tbench/tbenchtest.c:211
 #: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
@@ -2185,7 +2051,7 @@
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:66
+#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
@@ -2733,12 +2599,12 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "\"%s\" misslyckades.  Är \"%s\" en fil?\n"
 
-#: src/applications/fs/module/ondemand.c:321
+#: src/applications/fs/module/ondemand.c:334
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr "Indexerad fil försvann, tar bort block för fråga \"%s\"\n"
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/fs/module/ondemand.c:432
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2746,20 +2612,20 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:446
+#: src/applications/fs/module/ondemand.c:459
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
 "%s' under `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:667
+#: src/applications/fs/module/ondemand.c:679
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1232
+#: src/applications/fs/module/fs.c:1134
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2768,12 +2634,12 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/applications/fs/module/fs.c:1284
+#: src/applications/fs/module/fs.c:1175
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1324
+#: src/applications/fs/module/fs.c:1215
 msgid "enables (anonymous) file-sharing"
 msgstr "aktiverar (anonym) fildelning"
 
@@ -2785,36 +2651,32 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/searchtest.c:159
 #: src/applications/fs/fsui/fsuitest.c:193
-#: src/applications/fs/fsui/downloadtest.c:307
+#: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr "OCH"
 
-#: src/applications/fs/fsui/search.c:265
-msgid "Error running search (consult logs)."
+#: src/applications/fs/fsui/search.c:275
+msgid "Error running search (no reason given)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:263
-msgid "ECRS download failed (see logs)"
+#: src/applications/fs/fsui/download.c:267
+#, fuzzy
+msgid "Download failed (no reason given)"
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/applications/fs/fsui/unindex.c:109
+msgid "Unindexing failed (no reason given)"
 msgstr ""
 
-#: src/applications/fs/fsui/unindex.c:99
-msgid "Unindex failed."
-msgstr "Avindexering misslyckades."
-
-#: src/applications/fs/fsui/upload.c:222
+#: src/applications/fs/fsui/upload.c:245
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/applications/fs/fsui/upload.c:244
-#, fuzzy
-msgid "Upload failed (consult logs)."
-msgstr "Uppladdning misslyckades.\n"
-
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr "CHK URI tillåts inte för sökning.\n"
@@ -2823,17 +2685,17 @@
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI tillåts inte för sökning.\n"
 
-#: src/applications/fs/ecrs/download.c:128
+#: src/applications/fs/ecrs/download.c:124
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:263
+#: src/applications/fs/ecrs/download.c:255
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/download.c:972
+#: src/applications/fs/ecrs/download.c:964
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2841,53 +2703,53 @@
 "Dekrypterat innehåll stämmer inte med nyckeln. Det är antingen ett fel eller "
 "en fil inlagd med onda avsikter. Hämtning avbruten.\n"
 
-#: src/applications/fs/ecrs/download.c:1157
+#: src/applications/fs/ecrs/download.c:1149
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:161
+#: src/applications/fs/ecrs/upload.c:162
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:172
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Kan inte hämta storlek på fil \"%s\""
 
-#: src/applications/fs/ecrs/upload.c:179
+#: src/applications/fs/ecrs/upload.c:181
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/fs/ecrs/upload.c:191
+#: src/applications/fs/ecrs/upload.c:193
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:210
+#: src/applications/fs/ecrs/upload.c:212
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Initiering av indexering av fil \"%s\" misslyckades.\n"
 
-#: src/applications/fs/ecrs/upload.c:217
+#: src/applications/fs/ecrs/upload.c:219
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/applications/fs/ecrs/upload.c:303
+#: src/applications/fs/ecrs/upload.c:305
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/applications/fs/ecrs/meta.c:851
+#: src/applications/fs/ecrs/meta.c:852
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Namnbyte på fil \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/meta.c:859
+#: src/applications/fs/ecrs/meta.c:860
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Kunde inte byta namn på fil \"%s\" till \"%s\": filen existerar\n"
@@ -2931,7 +2793,7 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/fs/uritrack/file_info.c:367
+#: src/applications/fs/uritrack/file_info.c:369
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
@@ -2979,13 +2841,13 @@
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
 #: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:283
-#: src/applications/bootstrap_http/http.c:317
-#: src/applications/bootstrap_http/http.c:335
-#: src/applications/bootstrap_http/http.c:349
-#: src/applications/bootstrap_http/http.c:361
-#: src/applications/bootstrap_http/http.c:373
+#: src/applications/bootstrap_http/http.c:261
+#: src/applications/bootstrap_http/http.c:281
+#: src/applications/bootstrap_http/http.c:315
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:347
+#: src/applications/bootstrap_http/http.c:359
+#: src/applications/bootstrap_http/http.c:371
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -2999,7 +2861,7 @@
 msgid "Trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/applications/bootstrap_http/http.c:409
+#: src/applications/bootstrap_http/http.c:407
 msgid "# hellos downloaded via http"
 msgstr ""
 
@@ -3301,84 +3163,88 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
 
-#: src/server/connection.c:2420
+#: src/server/connection.c:2419
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/server/connection.c:2492
+#: src/server/connection.c:2491
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2509
+#: src/server/connection.c:2508
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:2932
+#: src/server/connection.c:2937
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2936
+#: src/server/connection.c:2941
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2938
+#: src/server/connection.c:2943
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2941
+#: src/server/connection.c:2946
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/server/connection.c:2945
+#: src/server/connection.c:2950
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/server/connection.c:2949
+#: src/server/connection.c:2954
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/server/connection.c:2951
+#: src/server/connection.c:2956
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/server/connection.c:2952
+#: src/server/connection.c:2957
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/gnunetd.c:80
+#: src/server/gnunetd.c:82
 #, c-format
 msgid "`%s' startup complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
 #, c-format
 msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:168
+#: src/server/gnunetd.c:170
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
 msgstr ""
 
-#: src/server/gnunetd.c:172
+#: src/server/gnunetd.c:174
 msgid "Starts the gnunetd daemon."
 msgstr "Startar gnunetd-demonen."
 
-#: src/server/gnunetd.c:175
+#: src/server/gnunetd.c:177
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:180
+msgid "run in quiet mode"
+msgstr ""
+
+#: src/server/gnunetd.c:184
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "ange värd på vilken gnunetd körs"
 
-#: src/server/gnunetd.c:228
+#: src/server/gnunetd.c:235
 #, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3419,7 +3285,7 @@
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:594
+#: src/server/core.c:597
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr ""
@@ -3596,12 +3462,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
+#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:403
+#: src/util/network_client/tcpio.c:428
 #, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
@@ -3634,6 +3500,11 @@
 msgid "Can't create semaphore: %i"
 msgstr "Kan inte skapa semafor: %i"
 
+#: src/util/os/osconfig.c:349
+#, fuzzy, c-format
+msgid "Command `%s' failed with error code %u\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
 #: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -3975,12 +3846,12 @@
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:264
+#: src/setup/gnunet-setup.c:265
 #, c-format
 msgid "`%s' is not available."
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/setup/gnunet-setup.c:280
+#: src/setup/gnunet-setup.c:281
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -4045,203 +3916,207 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
-#: src/setup/gtk/gconf.c:363
+#: src/setup/gtk/gconf.c:364
 #, fuzzy
 msgid "Description"
 msgstr "Fråga"
 
-#: src/setup/gtk/gconf.c:381
+#: src/setup/gtk/gconf.c:382
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:402
+#: src/setup/gtk/gconf.c:403
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:416 src/setup/ncurses/wizard_curs.c:142
+#: src/setup/gtk/gconf.c:417 src/setup/ncurses/wizard_curs.c:142
 #: src/setup/ncurses/wizard_curs.c:195 src/setup/ncurses/wizard_curs.c:232
 #: src/setup/ncurses/wizard_curs.c:287 src/setup/ncurses/wizard_curs.c:319
 #: src/setup/ncurses/wizard_curs.c:379
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:431
 #, fuzzy
 msgid "Section"
 msgstr "Fråga"
 
-#: src/setup/gtk/gconf.c:442
+#: src/setup/gtk/gconf.c:443
 #, fuzzy
 msgid "Option"
 msgstr "_Alternativ"
 
-#: src/setup/gtk/gconf.c:464
+#: src/setup/gtk/gconf.c:465
 #, fuzzy
 msgid "Configuration saved."
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/gtk/gconf.c:472
+#: src/setup/gtk/gconf.c:473
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/setup/gtk/gconf.c:495
+#: src/setup/gtk/gconf.c:496
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr ""
 "Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
-#: src/setup/gtk/wizard_gtk.c:139
+#: src/setup/gtk/wizard_gtk.c:145
 #, fuzzy
 msgid "(unknown connection)"
 msgstr "Nätverksanslutning"
 
-#: src/setup/gtk/wizard_gtk.c:389
+#: src/setup/gtk/wizard_gtk.c:422
 #, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/setup/gtk/wizard_gtk.c:411
+#: src/setup/gtk/wizard_gtk.c:444
 #, fuzzy
 msgid "Do you want to save the new configuration?"
 msgstr "Vill du spara dina inställningar?"
 
-#: src/setup/gtk/wizard_gtk.c:438 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:473 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/setup/gtk/wizard_gtk.c:445 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:480 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/setup/gtk/wizard_gtk.c:454
-msgid "gnunet-update failed. Please run gnunet-update manually."
+#: src/setup/gtk/wizard_gtk.c:496
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:74
+#: src/setup/text/conf.c:75
 #, fuzzy
 msgid "yes"
 msgstr "Ja"
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:76
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:101
+#: src/setup/text/conf.c:102
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:110
+#: src/setup/text/conf.c:111
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:112
+#: src/setup/text/conf.c:113
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:132
+#: src/setup/text/conf.c:133
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:138
+#: src/setup/text/conf.c:139
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:144
+#: src/setup/text/conf.c:145
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:177
+#: src/setup/text/conf.c:178
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Ja"
 
-#: src/setup/text/conf.c:182
+#: src/setup/text/conf.c:183
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "Nej"
 
-#: src/setup/text/conf.c:185 src/setup/text/conf.c:221
-#: src/setup/text/conf.c:246 src/setup/text/conf.c:304
-#: src/setup/text/conf.c:354
+#: src/setup/text/conf.c:186 src/setup/text/conf.c:222
+#: src/setup/text/conf.c:248 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:358
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "Hjälp"
 
-#: src/setup/text/conf.c:188 src/setup/text/conf.c:201
-#: src/setup/text/conf.c:255 src/setup/text/conf.c:285
-#: src/setup/text/conf.c:335
+#: src/setup/text/conf.c:189 src/setup/text/conf.c:202
+#: src/setup/text/conf.c:257 src/setup/text/conf.c:287
+#: src/setup/text/conf.c:339
 #, fuzzy, c-format
 msgid "Abort\n"
 msgstr "_Om"
 
-#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#: src/setup/text/conf.c:330 src/setup/text/conf.c:385
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:385
+#: src/setup/text/conf.c:391
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:459
+#: src/setup/text/conf.c:465
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:470
+#: src/setup/text/conf.c:476
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:492
+#: src/setup/text/conf.c:498
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/setup/text/conf.c:511
+#: src/setup/text/conf.c:517
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:542
+#: src/setup/text/conf.c:548
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:543
+#: src/setup/text/conf.c:549
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:427
+#: src/setup/text/conf.c:563 src/setup/ncurses/mconf.c:427
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 "Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
-#: src/setup/text/conf.c:562
+#: src/setup/text/conf.c:568
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:572
+#: src/setup/text/conf.c:580
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 "Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
-#: src/setup/text/conf.c:577
+#: src/setup/text/conf.c:585
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
@@ -4582,6 +4457,76 @@
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
+#~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+#~ msgstr "Väntar på att gnunetd ska starta (%u iterationer kvar)...\n"
+
+#~ msgid "Failed to send `%s'.  Closing connection.\n"
+#~ msgstr "Misslyckades att skicka \"%s\".  Stänger anslutning.\n"
+
+#~ msgid "Received invalid `%s' request (size %d)\n"
+#~ msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
+
+#~ msgid "Received invalid `%s' request (wrong table)\n"
+#~ msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
+
+#~ msgid "Received unknown request type %d at %s:%d\n"
+#~ msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
+
+#~ msgid "gnunetd signaled error in response to `%s' message\n"
+#~ msgstr "gnunetd signalerade fel i svar till \"%s\" meddelande\n"
+
+#~ msgid "Failed to receive response to `%s' message from gnunetd\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#~ msgid "Failed to send `%s' message to gnunetd\n"
+#~ msgstr "Misslyckades att skicka \"%s\" meddelande till gnunetd\n"
+
+#~ msgid "allow SIZE bytes of memory for the local table"
+#~ msgstr "tillåt STORLEK byte av minne för lokaltabellen"
+
+#~ msgid "Call to `%s' returns %d.\n"
+#~ msgstr "Anrop till \"%s\" returnerade %d.\n"
+
+#~ msgid "Call to `%s' with key `%s'.\n"
+#~ msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
+
+#~ msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+#~ msgstr "Anrop till \"%s\" med värde \"%.*s\" (%d byte).\n"
+
+#~ msgid "Error leaving DHT.\n"
+#~ msgstr "Fel vid lämning av DHT.\n"
+
+#~ msgid "Could not find peer `%s' in routing table!\n"
+#~ msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+
+#~ msgid "Invalid response to `%s' from peer `%s'.\n"
+#~ msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
+
+#~ msgid "Invalid response to `%s'.\n"
+#~ msgstr "Ogiltigt svar på \"%s\".\n"
+
+#~ msgid "Invalid response to `%s' from `%s'\n"
+#~ msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
+
+#~ msgid "Received invalid RPC `%s'.\n"
+#~ msgstr "Mottog ogiltig RPC \"%s\".\n"
+
+#~ msgid "`%s' failed: table not found!\n"
+#~ msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
+
+#~ msgid "sendAck failed.  Terminating connection to client.\n"
+#~ msgstr "sendAck misslyckades.  Terminerar anslutning till klient.\n"
+
+#~ msgid "Failed to deliver `%s' message.\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#~ msgid "Unindex failed."
+#~ msgstr "Avindexering misslyckades."
+
+#, fuzzy
+#~ msgid "Upload failed (consult logs)."
+#~ msgstr "Uppladdning misslyckades.\n"
+
 #~ msgid "Could not resolve name of SMTP server `%s': %s"
 #~ msgstr "Kunde inte slå upp namnet för SMTP-server \"%s\": %s"
 
@@ -4872,9 +4817,6 @@
 #~ msgid "Back"
 #~ msgstr "Tillbaka"
 
-#~ msgid "Run gnunet-update"
-#~ msgstr "Kör gnunet-update"
-
 #~ msgid "Finish"
 #~ msgstr "Slutför"
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2006-12-03 22:08:23 UTC (rev 3870)
+++ GNUnet/po/vi.po     2006-12-04 00:33:50 UTC (rev 3871)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-11-15 23:17-0700\n"
+"POT-Creation-Date: 2006-12-03 18:11-0700\n"
 "PO-Revision-Date: 2005-07-05 21:18+0400\n"
 "Last-Translator: Phan Vinh Thinh <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -337,31 +337,53 @@
 msgstr ""
 
 #: contrib/config-daemon.scm:442
-msgid "Prevent the specfied set of peers from connecting."
+msgid "Run gnunetd as this user."
 msgstr ""
 
 #: contrib/config-daemon.scm:443
-msgid "If this option is not set, any peer is allowed to connect."
+msgid ""
+"When started as root, gnunetd will change permissions to the given user."
 msgstr ""
 
 #: contrib/config-daemon.scm:454
+msgid "Run gnunetd as this group."
+msgstr ""
+
+#: contrib/config-daemon.scm:455
+msgid ""
+"When started as root, gnunetd will change permissions to the given group."
+msgstr ""
+
+#: contrib/config-daemon.scm:466
+msgid "Run gnunetd during system startup?"
+msgstr ""
+
+#: contrib/config-daemon.scm:479
+msgid "Prevent the specfied set of peers from connecting."
+msgstr ""
+
+#: contrib/config-daemon.scm:480
+msgid "If this option is not set, any peer is allowed to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:491
 msgid "Rarely used settings for peer advertisements and connections"
 msgstr ""
 
-#: contrib/config-daemon.scm:474
+#: contrib/config-daemon.scm:511
 #, fuzzy
 msgid "General settings"
 msgstr "Thiết lập khác"
 
-#: contrib/config-daemon.scm:475
+#: contrib/config-daemon.scm:512
 msgid "Settings that change the behavior of GNUnet in general"
 msgstr ""
 
-#: contrib/config-daemon.scm:501
+#: contrib/config-daemon.scm:541
 msgid "Which database should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:503
+#: contrib/config-daemon.scm:543
 msgid ""
 "Which database should be used?  The options are \"sqstore_sqlite\" and "
 "\"sqstore_mysql\".  You must run gnunet-update after changing this value!\n"
@@ -370,11 +392,11 @@
 "is relatively simple.  Read the file doc/README.mysql for how to setup mysql."
 msgstr ""
 
-#: contrib/config-daemon.scm:516
+#: contrib/config-daemon.scm:556
 msgid "Which topology should be used?"
 msgstr ""
 
-#: contrib/config-daemon.scm:518
+#: contrib/config-daemon.scm:558
 msgid ""
 "Which topology should be used?  The only options at the moment are "
 "\"topology_default\" and \"topology_f2f\".  In default mode, GNUnet will try "
@@ -387,44 +409,44 @@
 "afraid of establishing (direct) connections to unknown peers."
 msgstr ""
 
-#: contrib/config-daemon.scm:533
+#: contrib/config-daemon.scm:573
 msgid "Modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:534
+#: contrib/config-daemon.scm:574
 msgid "Settings that select specific implementations for GNUnet modules"
 msgstr ""
 
-#: contrib/config-daemon.scm:551
+#: contrib/config-daemon.scm:591
 msgid "List of friends for friend-to-friend topology"
 msgstr ""
 
-#: contrib/config-daemon.scm:552
+#: contrib/config-daemon.scm:592
 msgid ""
 "Specifies the name of a file which contains a list of GNUnet peer IDs that "
 "are friends.  If used with the friend-to-friend topology, this will ensure "
 "that GNUnet only connects to these peers (via any available transport)."
 msgstr ""
 
-#: contrib/config-daemon.scm:566
+#: contrib/config-daemon.scm:606
 msgid "Name of the MySQL database GNUnet should use"
 msgstr ""
 
-#: contrib/config-daemon.scm:578
+#: contrib/config-daemon.scm:618
 msgid "Configuration file that specifies the MySQL username and password"
 msgstr ""
 
-#: contrib/config-daemon.scm:590
+#: contrib/config-daemon.scm:630
 #, fuzzy
 msgid "Configuration of the MySQL database"
 msgstr ""
 "Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
-#: contrib/config-daemon.scm:609
+#: contrib/config-daemon.scm:649
 msgid "MB of diskspace GNUnet can use for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:611
+#: contrib/config-daemon.scm:651
 msgid ""
 "How much disk space (MB) is GNUnet allowed to use for anonymous file "
 "sharing?  This does not take indexed files into account, only the space "
@@ -435,15 +457,15 @@
 "Note that if you change the quota, you need to run gnunet-update afterwards."
 msgstr ""
 
-#: contrib/config-daemon.scm:625
+#: contrib/config-daemon.scm:665
 msgid "Size of the routing table."
 msgstr ""
 
-#: contrib/config-daemon.scm:638
+#: contrib/config-daemon.scm:678
 msgid "Allow migrating content to this peer."
 msgstr ""
 
-#: contrib/config-daemon.scm:640
+#: contrib/config-daemon.scm:680
 msgid ""
 "If you say yes here, GNUnet will migrate content to your server, and you "
 "will not be able to control what data is stored on your machine. \n"
@@ -455,20 +477,20 @@
 "can be considered liable for it."
 msgstr ""
 
-#: contrib/config-daemon.scm:654
+#: contrib/config-daemon.scm:694
 msgid "Options for anonymous file sharing"
 msgstr ""
 
-#: contrib/config-daemon.scm:671
+#: contrib/config-daemon.scm:711
 #, fuzzy
 msgid "Applications"
 msgstr "Tùy _chọn"
 
-#: contrib/config-daemon.scm:687
+#: contrib/config-daemon.scm:727
 msgid "Is this machine unreachable behind a NAT?"
 msgstr ""
 
-#: contrib/config-daemon.scm:688
+#: contrib/config-daemon.scm:728
 msgid ""
 "Set to YES if this machine is behind a NAT that limits connections from the "
 "outside to the GNUnet port. Note that if you have configured your NAT box to "
@@ -477,89 +499,89 @@
 "you directly."
 msgstr ""
 
-#: contrib/config-daemon.scm:699
+#: contrib/config-daemon.scm:739
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:711
+#: contrib/config-daemon.scm:751
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:726
+#: contrib/config-daemon.scm:766
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:738
+#: contrib/config-daemon.scm:778
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:753
+#: contrib/config-daemon.scm:793
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:765
+#: contrib/config-daemon.scm:805
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:777 contrib/config-daemon.scm:818
-#: contrib/config-daemon.scm:870
+#: contrib/config-daemon.scm:817 contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:910
 msgid "Which IPs are not allowed to connect?"
 msgstr ""
 
-#: contrib/config-daemon.scm:789
+#: contrib/config-daemon.scm:829
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:806
+#: contrib/config-daemon.scm:846
 msgid "Which port should be used by the TCP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:830
+#: contrib/config-daemon.scm:870
 msgid "TCP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:846
+#: contrib/config-daemon.scm:886
 msgid "Which port should be used by the UDP IPv6 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:858
+#: contrib/config-daemon.scm:898
 msgid "What is the maximum transfer unit for UDP 6?"
 msgstr ""
 
-#: contrib/config-daemon.scm:882
+#: contrib/config-daemon.scm:922
 msgid "UDP6 transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:899
+#: contrib/config-daemon.scm:939
 #, fuzzy
 msgid "Network interface"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:951
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:923
+#: contrib/config-daemon.scm:963
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:935
+#: contrib/config-daemon.scm:975
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:958
+#: contrib/config-daemon.scm:998
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:970
+#: contrib/config-daemon.scm:1010
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:982
+#: contrib/config-daemon.scm:1022
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1024
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -569,37 +591,37 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:995
+#: contrib/config-daemon.scm:1035
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1036
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1007
+#: contrib/config-daemon.scm:1047
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1048
 msgid ""
 "The limit is given as a percentage o\n"
 "f the MAXNETUPBPS limit.  Use 100 to have MAXNETUPBPS be the hard limit.  "
 "Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1060
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1072
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1034
+#: contrib/config-daemon.scm:1074
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -644,12 +666,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1051
+#: contrib/config-daemon.scm:1091
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:1053
+#: contrib/config-daemon.scm:1093
 msgid ""
 "\tFor which interfaces should we do accounting?  GNUnet will evaluate\n"
 "\t\tthe total traffic (not only the GNUnet related traffic) and adjust\n"
@@ -662,12 +684,12 @@
 "\t\t \"gnunet-win-tool -n\"."
 msgstr ""
 
-#: contrib/config-daemon.scm:1072
+#: contrib/config-daemon.scm:1112
 #, fuzzy
 msgid "Load management"
 msgstr "Sai tham số dòng lệnh.\n"
 
-#: contrib/config-daemon.scm:1096 contrib/config-client.scm:286
+#: contrib/config-daemon.scm:1136 contrib/config-client.scm:286
 msgid "Root node"
 msgstr ""
 
@@ -967,255 +989,70 @@
 "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
 "đóng.\n"
 
-#: src/applications/dht/tools/dhttest2.c:45
-#: src/applications/session/sessiontest.c:42
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:101
-#: src/applications/tbench/tbenchtest_udp.c:100
-#: src/applications/gap/gaptest.c:49
-msgid "# of connected peers"
-msgstr "# của các đầu đã kết nối"
-
-#: src/applications/dht/tools/dhttest2.c:160
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Đang chờ chạy gnunetd (còn %u lần thử)...\n"
-
-#: src/applications/dht/tools/dhttest2.c:173
-#: src/applications/tbench/tbenchtest.c:117
-#: src/applications/tbench/tbenchtest_udp.c:116
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
-
-#: src/applications/dht/tools/dht-query.c:53
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
+#: src/applications/dht/tools/dht-query.c:52
+#, fuzzy
+msgid "Query (get KEY, put KEY VALUE) a DHT table."
 msgstr "Hỏi (nhận KEY, đặt KEY VALUE, xoá bỏ KEY VALUE) một bảng DHT."
 
-#: src/applications/dht/tools/dht-query.c:57
-#: src/applications/dht/tools/dht-join.c:59
+#: src/applications/dht/tools/dht-query.c:56
 msgid "join table called NAME"
 msgstr "nhập bảng có tên TÊN"
 
-#: src/applications/dht/tools/dht-query.c:60
+#: src/applications/dht/tools/dht-query.c:59
 msgid "allow TIME ms to process each command"
 msgstr "cho phép TIME mili giây để tiến hành mỗi câu lệnh"
 
-#: src/applications/dht/tools/dht-query.c:130
-#: src/applications/dht/tools/dht-query.c:163
+#: src/applications/dht/tools/dht-query.c:129
 #, c-format
 msgid "'%s(%s,%s)' succeeded\n"
 msgstr "'%s(%s,%s)' đã thành công\n"
 
-#: src/applications/dht/tools/dht-query.c:134
-#: src/applications/dht/tools/dht-query.c:167
+#: src/applications/dht/tools/dht-query.c:133
 #, c-format
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)' thất bại.\n"
 
-#: src/applications/dht/tools/dht-query.c:194
-#: src/applications/dht/tools/dht-join.c:165
+#: src/applications/dht/tools/dht-query.c:159
 #, fuzzy, c-format
 msgid "No table name specified, using `%s'.\n"
 msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
 
-#: src/applications/dht/tools/dht-query.c:210
+#: src/applications/dht/tools/dht-query.c:175
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
 msgstr "Kết nối tới gnunetd không thành công.\n"
 
-#: src/applications/dht/tools/dht-query.c:220
+#: src/applications/dht/tools/dht-query.c:185
 #, fuzzy, c-format
 msgid "Command `%s' requires an argument (`%s').\n"
 msgstr "Câu lệnh '%s' yêu cầu một tham số ('%s')\n"
 
-#: src/applications/dht/tools/dht-query.c:232
-#: src/applications/dht/tools/dht-query.c:246
+#: src/applications/dht/tools/dht-query.c:197
 #, fuzzy, c-format
 msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 msgstr "Câu lệnh '%s' yêu cầu hai tham số ('%s' và '%s')\n"
 
-#: src/applications/dht/tools/dht-query.c:258
+#: src/applications/dht/tools/dht-query.c:209
 #, fuzzy, c-format
 msgid "Unsupported command `%s'.  Aborting.\n"
 msgstr "Câu lệnh không hỗ trợ '%s'.  Đang thoát.\n"
 
-#: src/applications/dht/tools/dht_api.c:148
-#: src/applications/dht/tools/dht_api.c:264
-#: src/applications/dht/tools/dht_api.c:321
-#: src/applications/dht/tools/dht_api.c:379
-#: src/applications/dht/tools/dht_api.c:415
+#: src/applications/dht/tools/dht_api.c:126
 #, fuzzy, c-format
-msgid "Failed to send `%s'.  Closing connection.\n"
-msgstr "Gửi '%s' không thành công.  Đang đóng kết nối.\n"
-
-#: src/applications/dht/tools/dht_api.c:226
-#: src/applications/dht/tools/dht_api.c:282
-#: src/applications/dht/tools/dht_api.c:340
-#: src/applications/dht/tools/dht_api.c:397
-#, fuzzy, c-format
-msgid "Received invalid `%s' request (size %d)\n"
-msgstr "Nhận được yêu cầu '%s' sai (kích thước %d)\n"
-
-#: src/applications/dht/tools/dht_api.c:241
-#: src/applications/dht/tools/dht_api.c:297
-#: src/applications/dht/tools/dht_api.c:355
-#, fuzzy, c-format
-msgid "Received invalid `%s' request (wrong table)\n"
-msgstr "Nhận được yêu cầu '%s' sai (sai bảng)\n"
-
-#: src/applications/dht/tools/dht_api.c:429
-#, c-format
-msgid "Received unknown request type %d at %s:%d\n"
-msgstr "Nhận được yêu cầu không rõ dạng %d tại %s:%d\n"
-
-#: src/applications/dht/tools/dht_api.c:473
-msgid "This client already participates in the given DHT!\n"
-msgstr "Máy khách này đã tham gia trong DHT đưa ra!\n"
-
-#: src/applications/dht/tools/dht_api.c:548
-msgid "Cannot leave DHT: table not known!\n"
-msgstr "Không rời bỏ được DHT: bảng không biết!\n"
-
-#: src/applications/dht/tools/dht_api.c:571
-#, fuzzy, c-format
-msgid "gnunetd signaled error in response to `%s' message\n"
-msgstr "gnunetd đưa tín hiệu lỗi trong câu trả lời tới thông báo '%s'\n"
-
-#: src/applications/dht/tools/dht_api.c:576
-#, fuzzy, c-format
-msgid "Failed to receive response to `%s' message from gnunetd\n"
-msgstr "Nhận câu trả lời tới thông báo '%s' không thành công từ gnunetd\n"
-
-#: src/applications/dht/tools/dht_api.c:581
-#, fuzzy, c-format
-msgid "Failed to send `%s' message to gnunetd\n"
-msgstr "Gửi thông báo '%s' tới gnunetd không thành công\n"
-
-#: src/applications/dht/tools/dht_api.c:677
-#, fuzzy, c-format
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Câu trả lời không mong đợi tới thao tác '%s'.\n"
 
-#: src/applications/dht/tools/dht-join.c:52
-msgid "Join a DHT."
-msgstr "Nhập một DHT."
-
-#: src/applications/dht/tools/dht-join.c:56
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "cho phép SIZE byte bộ nhớ cho bảng nội bộ"
-
-#: src/applications/dht/tools/dht-join.c:78
+#: src/applications/dht/module/cs.c:103
 #, fuzzy, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "Gọi tới '%s' trả lại %d.\n"
-
-#: src/applications/dht/tools/dht-join.c:79
-#, fuzzy, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Gọi tới '%s' với chìa khóa '%s'.\n"
-
-#: src/applications/dht/tools/dht-join.c:80
-#, fuzzy, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Gọi tới '%s' với giá trị '%.*s' (%d byte).\n"
-
-#: src/applications/dht/tools/dht-join.c:189
-msgid "Error joining DHT.\n"
-msgstr "Lỗi nhập DHT.\n"
-
-#: src/applications/dht/tools/dht-join.c:196
-#, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr "Đã nhập DHT.  Nhấn CTRL-C để dời khỏi.\n"
-
-#: src/applications/dht/tools/dht-join.c:205
-msgid "Error leaving DHT.\n"
-msgstr "Lỗi dời khỏi DHT.\n"
-
-#: src/applications/dht/module/dht.c:952
-#, fuzzy, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr "Nhận được vùng không bắt buộc '%s' bị hỏng từ dầu peer '%s'.\n"
-
-#: src/applications/dht/module/dht.c:979
-#, fuzzy, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "Không tìm thấy đầu peer '%s' trong bảng định tuyến!\n"
-
-#: src/applications/dht/module/dht.c:1126
-#: src/applications/dht/module/dht.c:1141
-#, fuzzy, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr "Nhận được câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
-
-#: src/applications/dht/module/dht.c:1453
-#, fuzzy, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
-
-#: src/applications/dht/module/dht.c:1611
-#: src/applications/dht/module/dht.c:2351
-#: src/applications/dht/module/dht.c:2628 src/applications/rpc/rpc.c:1291
-#, fuzzy, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "đã gọi '%s' với thời gian chờ lớn hơn 1 giờ (lỗi bug?)\n"
-
-#: src/applications/dht/module/dht.c:1803
-#, fuzzy, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Câu trả lời không đúng tới '%s'.\n"
-
-#: src/applications/dht/module/dht.c:2003
-#, fuzzy, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr "Câu trả lời bị hỏng tới '%s' trên bảng chính.\n"
-
-#: src/applications/dht/module/dht.c:2217
-#: src/applications/dht/module/dht.c:2522
-#, fuzzy, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Câu trả lời không đúng tới '%s' từ '%s'\n"
-
-#: src/applications/dht/module/dht.c:2899
-#: src/applications/dht/module/dht.c:3041
-#: src/applications/dht/module/dht.c:3182
-#: src/applications/dht/module/dht.c:3330
-#, fuzzy, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Nhận được RPC sai '%s'.\n"
-
-#: src/applications/dht/module/dht.c:3201
-#: src/applications/dht/module/dht.c:3351
-#, fuzzy, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
-msgstr "Nhận được RPC cho '%s' cho bảng chúng ta không có phần trong đó!\n"
-
-#: src/applications/dht/module/cs.c:449
-#, fuzzy, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "'%s' không thành công: không tìm thấy bảng!\n"
-
-#: src/applications/dht/module/cs.c:469
-#, fuzzy, c-format
 msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr "'%s' không thành công.  Đang ngắt kết nối tới máy khách.\n"
 
-#: src/applications/dht/module/cs.c:546
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "Gửi sendAck không thành công.  Ngắt kết nối tới máy khách.\n"
-
-#: src/applications/dht/module/cs.c:666 src/applications/dht/module/cs.c:684
-#: src/applications/dht/module/cs.c:693
+#: src/applications/dht/module/cs.c:198 src/applications/dht/module/cs.c:217
+#: src/applications/dht/module/cs.c:227
 #, fuzzy, c-format
 msgid "`%s' failed. Terminating connection to client.\n"
 msgstr "'%s' không thành công. Ngắt kết nối tới máy khách.\n"
 
-#: src/applications/dht/module/cs.c:814 src/applications/dht/module/cs.c:867
-#, fuzzy, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Phân phát tin nhắn '%s' không thành công.\n"
-
 #: src/applications/chat/chat.c:87
 msgid "Message received from peer is invalid.\n"
 msgstr "Thông báo nhận được từ một đầu là sai.\n"
@@ -1253,7 +1090,7 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546 src/util/getopt/getopt.c:1067
-#: src/setup/gnunet-setup.c:283
+#: src/setup/gnunet-setup.c:284
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Dùng --help để xem danh sách các tùy chọn.\n"
@@ -1341,7 +1178,7 @@
 msgstr "# đã gửi các thông báo PING dạng văn bản thông thường"
 
 #: src/applications/advertising/advertising.c:796
-#: src/applications/session/connect.c:800
+#: src/applications/session/connect.c:899
 #, fuzzy, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -1472,56 +1309,73 @@
 msgid "# bytes in datastore"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/applications/session/connect.c:225
+#: src/applications/session/sessiontest.c:42
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:101
+#: src/applications/tbench/tbenchtest_udp.c:100
+#: src/applications/gap/gaptest.c:49
+msgid "# of connected peers"
+msgstr "# của các đầu đã kết nối"
+
+#: src/applications/session/connect.c:257
+#: src/applications/session/connect.c:274
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Không kiểm tra được chìa khóa buổi làm việc từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:263
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
+#: src/applications/session/connect.c:315
+#, fuzzy, c-format
+msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 "Không mã hóa được chìa khóa buổi làm việc, không biết đến đầu peer khác!\n"
 
-#: src/applications/session/connect.c:533
+#: src/applications/session/connect.c:594
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Thông báo nhận được từ một đầu là sai.\n"
 
-#: src/applications/session/connect.c:558
+#: src/applications/session/connect.c:612
 #, fuzzy, c-format
+msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
+msgstr "Thông báo nhận được từ một đầu là sai.\n"
+
+#: src/applications/session/connect.c:644
+#, fuzzy, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Nhận được thông báo '%s' sai từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:568
+#: src/applications/session/connect.c:654
 #, fuzzy, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr "Kiểm tra CRC của SKEY từ '%s' không thành công (có: %u, muốn %u).\n"
 
-#: src/applications/session/connect.c:626
+#: src/applications/session/connect.c:723
+#, fuzzy, c-format
 msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+"Error parsing encrypted session key from `%s', given message part size is "
+"invalid.\n"
 msgstr ""
 "Lỗi phân tích chìa khóa buổi làm việc đã mã hóa, kích thước của phần thông "
 "báo đưa ra là sai.\n"
 
-#: src/applications/session/connect.c:637
+#: src/applications/session/connect.c:735
 #, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
+msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:888
 msgid "# session keys sent"
 msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/session/connect.c:791
+#: src/applications/session/connect.c:890
 msgid "# session keys rejected"
 msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/session/connect.c:793
+#: src/applications/session/connect.c:892
 msgid "# session keys accepted"
 msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/session/connect.c:795
+#: src/applications/session/connect.c:894
 msgid "# sessions established"
 msgstr "# đã thiết lập buổi làm việc"
 
@@ -1564,6 +1418,11 @@
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Đang bỏ đi yêu cầu RPC %u: thông báo hỏng.\n"
 
+#: src/applications/rpc/rpc.c:1291
+#, fuzzy, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "đã gọi '%s' với thời gian chờ lớn hơn 1 giờ (lỗi bug?)\n"
+
 #: src/applications/rpc/rpc.c:1415
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
@@ -2140,6 +1999,12 @@
 "\n"
 "Không nhận thành công câu trả lời từ gnunetd.\n"
 
+#: src/applications/tbench/tbenchtest.c:117
+#: src/applications/tbench/tbenchtest_udp.c:116
+#, c-format
+msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
+
 #: src/applications/tbench/tbenchtest.c:211
 #: src/applications/tbench/tbenchtest_udp.c:210
 #, c-format
@@ -2236,7 +2101,7 @@
 "Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải.  Đang nhả ra "
 "yêu cầu.\n"
 
-#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:66
+#: src/applications/gap/gap.c:1832 src/applications/fs/module/anonymity.c:67
 msgid "Failed to get traffic stats.\n"
 msgstr "Lấy các thông tin truyền tải không thành công.\n"
 
@@ -2805,12 +2670,12 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' thất bại.  '%s' là một tập tin?\n"
 
-#: src/applications/fs/module/ondemand.c:321
+#: src/applications/fs/module/ondemand.c:334
 #, fuzzy, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr "Tập tin đã đánh chỉ mục biến mất, đang xóa khối cho yêu cầu '%s'\n"
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/fs/module/ondemand.c:432
 #, fuzzy, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2821,7 +2686,7 @@
 "hãy bỏ chỉ mục các tập tin trước khi xóa chúng vì chỉ mục hiện thời chứa các "
 "liên kết sai!"
 
-#: src/applications/fs/module/ondemand.c:446
+#: src/applications/fs/module/ondemand.c:459
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2830,13 +2695,13 @@
 "Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu FS trong phần '%s' dưới "
 "'%s'.\n"
 
-#: src/applications/fs/module/ondemand.c:667
+#: src/applications/fs/module/ondemand.c:679
 #, fuzzy, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr "Khối ODB đã bỏ chỉ mục '%s' từ %llu không có trong kho dữ liệu.\n"
 
-#: src/applications/fs/module/fs.c:1232
+#: src/applications/fs/module/fs.c:1134
 #, fuzzy, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2844,12 +2709,12 @@
 msgstr ""
 "Người dùng phải chỉ ra một số dương cho '%s' trong phần '%s' của cấu hình.\n"
 
-#: src/applications/fs/module/fs.c:1284
+#: src/applications/fs/module/fs.c:1175
 #, fuzzy, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển máy khách %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/module/fs.c:1324
+#: src/applications/fs/module/fs.c:1215
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -2861,39 +2726,33 @@
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:154
+#: src/applications/fs/fsui/searchtest.c:159
 #: src/applications/fs/fsui/fsuitest.c:193
-#: src/applications/fs/fsui/downloadtest.c:307
+#: src/applications/fs/fsui/downloadtest.c:312
 #: src/applications/fs/ecrs/helper.c:118 src/applications/fs/ecrs/helper.c:123
 #: src/applications/fs/ecrs/helper.c:126 src/applications/fs/ecrs/helper.c:130
 msgid "AND"
 msgstr "VÀ"
 
-#: src/applications/fs/fsui/search.c:265
+#: src/applications/fs/fsui/search.c:275
 #, fuzzy
-msgid "Error running search (consult logs)."
+msgid "Error running search (no reason given)."
 msgstr "Bắt đầu tìm kiếm thất bại. Hãy xem các bản ghi log.\n"
 
-#: src/applications/fs/fsui/download.c:263
+#: src/applications/fs/fsui/download.c:267
 #, fuzzy
-msgid "ECRS download failed (see logs)"
+msgid "Download failed (no reason given)"
 msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
 
-#: src/applications/fs/fsui/unindex.c:99
-#, fuzzy
-msgid "Unindex failed."
-msgstr "Bỏ đánh chỉ mục thất bại.\n"
+#: src/applications/fs/fsui/unindex.c:109
+msgid "Unindexing failed (no reason given)"
+msgstr ""
 
-#: src/applications/fs/fsui/upload.c:222
+#: src/applications/fs/fsui/upload.c:245
 #, fuzzy
 msgid "Failed to create temporary directory."
 msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
 
-#: src/applications/fs/fsui/upload.c:244
-#, fuzzy
-msgid "Upload failed (consult logs)."
-msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
-
 #: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr "Không cho phép tìm kiếm CHK URI.\n"
@@ -2902,17 +2761,17 @@
 msgid "LOC URI not allowed for search.\n"
 msgstr "Không cho phép tìm kiếm LOC URI.\n"
 
-#: src/applications/fs/ecrs/download.c:128
+#: src/applications/fs/ecrs/download.c:124
 #, fuzzy, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
 
-#: src/applications/fs/ecrs/download.c:263
+#: src/applications/fs/ecrs/download.c:255
 #, fuzzy, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "'%s' %s không thành công: %s\n"
 
-#: src/applications/fs/ecrs/download.c:972
+#: src/applications/fs/ecrs/download.c:964
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2920,53 +2779,53 @@
 "Nội dung đã giải mã không tương ứng chìa khóa. Đây là một lỗi bug hoặc một "
 "tập tin chèn vào với ý xấu. Dừng tải xuống.\n"
 
-#: src/applications/fs/ecrs/download.c:1157
+#: src/applications/fs/ecrs/download.c:1149
 #, fuzzy, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr "Nội dung '%s' có vẻ không có trên mạng.\n"
 
-#: src/applications/fs/ecrs/upload.c:161
+#: src/applications/fs/ecrs/upload.c:162
 #, fuzzy, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/applications/fs/ecrs/upload.c:171
+#: src/applications/fs/ecrs/upload.c:172
 #, fuzzy, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Không mở được tập tin cấu hình '%s'\n"
 
-#: src/applications/fs/ecrs/upload.c:179
+#: src/applications/fs/ecrs/upload.c:181
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Kết nối tới gnunetd không thành công.\n"
 
-#: src/applications/fs/ecrs/upload.c:191
+#: src/applications/fs/ecrs/upload.c:193
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Không hash được '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:210
+#: src/applications/fs/ecrs/upload.c:212
 #, fuzzy, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Nạp để đánh chỉ mục tập tin '%s' thất bại.\n"
 
-#: src/applications/fs/ecrs/upload.c:217
+#: src/applications/fs/ecrs/upload.c:219
 #, fuzzy, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "nạp môđun '%s' không thành công.  Đang cho máy khách biết.\n"
 
-#: src/applications/fs/ecrs/upload.c:303
+#: src/applications/fs/ecrs/upload.c:305
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Đánh chỉ mục dữ liệu thất bại tại vị trí %i.\n"
 
-#: src/applications/fs/ecrs/meta.c:851
+#: src/applications/fs/ecrs/meta.c:852
 #, fuzzy, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Đổi tên tập tin '%s' thành '%s' thất bại: %s\n"
 
-#: src/applications/fs/ecrs/meta.c:859
+#: src/applications/fs/ecrs/meta.c:860
 #, fuzzy, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "Không đổi tên được tập tin '%s' thành '%s': tập tin tồn tại\n"
@@ -3010,7 +2869,7 @@
 msgid "Collecting file identifiers disabled.\n"
 msgstr "Tắt bỏ thu thập tên tập tin.\n"
 
-#: src/applications/fs/uritrack/file_info.c:367
+#: src/applications/fs/uritrack/file_info.c:369
 #, c-format
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
@@ -3061,13 +2920,13 @@
 msgstr "Định dạng của tên hiệu '%s' sai.\n"
 
 #: src/applications/bootstrap_http/http.c:121
-#: src/applications/bootstrap_http/http.c:263
-#: src/applications/bootstrap_http/http.c:283
-#: src/applications/bootstrap_http/http.c:317
-#: src/applications/bootstrap_http/http.c:335
-#: src/applications/bootstrap_http/http.c:349
-#: src/applications/bootstrap_http/http.c:361
-#: src/applications/bootstrap_http/http.c:373
+#: src/applications/bootstrap_http/http.c:261
+#: src/applications/bootstrap_http/http.c:281
+#: src/applications/bootstrap_http/http.c:315
+#: src/applications/bootstrap_http/http.c:333
+#: src/applications/bootstrap_http/http.c:347
+#: src/applications/bootstrap_http/http.c:359
+#: src/applications/bootstrap_http/http.c:371
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: '%s'.\n"
@@ -3081,7 +2940,7 @@
 msgid "Trying to download hostlist from `%s'\n"
 msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
 
-#: src/applications/bootstrap_http/http.c:409
+#: src/applications/bootstrap_http/http.c:407
 #, fuzzy
 msgid "# hellos downloaded via http"
 msgstr "# đã tải xuống HELO qua http"
@@ -3384,68 +3243,68 @@
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
 
-#: src/server/connection.c:2420
+#: src/server/connection.c:2419
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bỏ đi thông báo từ '%s': định dạng sai.\n"
 
-#: src/server/connection.c:2492
+#: src/server/connection.c:2491
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Số của chuỗi sai %u <= %u, đang bỏ đi thông báo.\n"
 
-#: src/server/connection.c:2509
+#: src/server/connection.c:2508
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/server/connection.c:2932
+#: src/server/connection.c:2937
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:2936
+#: src/server/connection.c:2941
 msgid "# bytes of outgoing messages dropped"
 msgstr "# byte của các thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:2938
+#: src/server/connection.c:2943
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:2941
+#: src/server/connection.c:2946
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2945
+#: src/server/connection.c:2950
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/server/connection.c:2949
+#: src/server/connection.c:2954
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte nhận được qua TCP"
 
-#: src/server/connection.c:2951
+#: src/server/connection.c:2956
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2952
+#: src/server/connection.c:2957
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/gnunetd.c:80
+#: src/server/gnunetd.c:82
 #, fuzzy, c-format
 msgid "`%s' startup complete.\n"
 msgstr "'%s' khởi động thành công.\n"
 
-#: src/server/gnunetd.c:85
+#: src/server/gnunetd.c:87
 #, fuzzy, c-format
 msgid "`%s' is shutting down.\n"
 msgstr "'%s' đang tắt.\n"
 
-#: src/server/gnunetd.c:168
+#: src/server/gnunetd.c:170
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -3453,20 +3312,24 @@
 "chạy trong chế độ tìm sửa lỗi debug; gnunetd sẽ không tạo daemon và sẽ ghi "
 "thông báo lỗi ra stderr thay vì vào một tập tin bản ghi log"
 
-#: src/server/gnunetd.c:172
+#: src/server/gnunetd.c:174
 msgid "Starts the gnunetd daemon."
 msgstr "Chạy daemon gnunetd."
 
-#: src/server/gnunetd.c:175
+#: src/server/gnunetd.c:177
 msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/gnunetd.c:179
+#: src/server/gnunetd.c:180
+msgid "run in quiet mode"
+msgstr ""
+
+#: src/server/gnunetd.c:184
 #, fuzzy
 msgid "specify username as which gnunetd should run"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/server/gnunetd.c:228
+#: src/server/gnunetd.c:235
 #, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
@@ -3507,7 +3370,7 @@
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "Không tắt đúng được ứng dụng '%s'.\n"
 
-#: src/server/core.c:594
+#: src/server/core.c:597
 #, fuzzy, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "Không hủy nạp đúng được dịch vụ '%s'!\n"
@@ -3689,12 +3552,12 @@
 msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/util/network_client/tcpio.c:251 src/util/network_client/tcpio.c:281
+#: src/util/network_client/tcpio.c:253 src/util/network_client/tcpio.c:283
 #, fuzzy, c-format
 msgid "Cannot connect to %s:%u: %s\n"
 msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/network_client/tcpio.c:403
+#: src/util/network_client/tcpio.c:428
 #, fuzzy, c-format
 msgid "`%s' failed, reply invalid!\n"
 msgstr "'%s' thất bại, câu trả lời sai!\n"
@@ -3726,6 +3589,11 @@
 msgid "Can't create semaphore: %i"
 msgstr "Không tạo được đèn tín hiệu: %i"
 
+#: src/util/os/osconfig.c:349
+#, fuzzy, c-format
+msgid "Command `%s' failed with error code %u\n"
+msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
+
 #: src/util/os/dso.c:56
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -4069,12 +3937,12 @@
 msgid "No interface specified, using default\n"
 msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
 
-#: src/setup/gnunet-setup.c:264
+#: src/setup/gnunet-setup.c:265
 #, fuzzy, c-format
 msgid "`%s' is not available."
 msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/setup/gnunet-setup.c:280
+#: src/setup/gnunet-setup.c:281
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Lỗi không rõ.\n"
@@ -4139,203 +4007,207 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Lỗi: không xóa được dịch vụ: %s\n"
 
-#: src/setup/gtk/gconf.c:363
+#: src/setup/gtk/gconf.c:364
 #, fuzzy
 msgid "Description"
 msgstr "Câu hỏi"
 
-#: src/setup/gtk/gconf.c:381
+#: src/setup/gtk/gconf.c:382
 msgid "Value"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:402
+#: src/setup/gtk/gconf.c:403
 msgid "Default"
 msgstr ""
 
-#: src/setup/gtk/gconf.c:416 src/setup/ncurses/wizard_curs.c:142
+#: src/setup/gtk/gconf.c:417 src/setup/ncurses/wizard_curs.c:142
 #: src/setup/ncurses/wizard_curs.c:195 src/setup/ncurses/wizard_curs.c:232
 #: src/setup/ncurses/wizard_curs.c:287 src/setup/ncurses/wizard_curs.c:319
 #: src/setup/ncurses/wizard_curs.c:379
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: src/setup/gtk/gconf.c:430
+#: src/setup/gtk/gconf.c:431
 #, fuzzy
 msgid "Section"
 msgstr "Câu hỏi"
 
-#: src/setup/gtk/gconf.c:442
+#: src/setup/gtk/gconf.c:443
 #, fuzzy
 msgid "Option"
 msgstr "Tùy _chọn"
 
-#: src/setup/gtk/gconf.c:464
+#: src/setup/gtk/gconf.c:465
 #, fuzzy
 msgid "Configuration saved."
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/gtk/gconf.c:472
+#: src/setup/gtk/gconf.c:473
 #, fuzzy
 msgid "Failed to save configuration."
 msgstr "Không ghi được thiết lập!"
 
-#: src/setup/gtk/gconf.c:495
+#: src/setup/gtk/gconf.c:496
 #, fuzzy
 msgid "Configuration changed. Save?"
 msgstr ""
 "Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
-#: src/setup/gtk/wizard_gtk.c:139
+#: src/setup/gtk/wizard_gtk.c:145
 #, fuzzy
 msgid "(unknown connection)"
 msgstr "Kết nối mạng"
 
-#: src/setup/gtk/wizard_gtk.c:389
+#: src/setup/gtk/wizard_gtk.c:422
 #, fuzzy, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr "Không ghi được tập tin cấu hình %s:"
 
-#: src/setup/gtk/wizard_gtk.c:411
+#: src/setup/gtk/wizard_gtk.c:444
 #, fuzzy
 msgid "Do you want to save the new configuration?"
 msgstr "Ghi thiết lập?"
 
-#: src/setup/gtk/wizard_gtk.c:438 src/setup/ncurses/wizard_curs.c:620
+#: src/setup/gtk/wizard_gtk.c:473 src/setup/ncurses/wizard_curs.c:620
 msgid "Unable to create user account:"
 msgstr "Không tạo được tài khoản người dùng:"
 
-#: src/setup/gtk/wizard_gtk.c:445 src/setup/ncurses/wizard_curs.c:623
+#: src/setup/gtk/wizard_gtk.c:480 src/setup/ncurses/wizard_curs.c:623
 msgid "Unable to change startup process:"
 msgstr "Không thay đổi được tiến trình khởi động:"
 
-#: src/setup/gtk/wizard_gtk.c:454
-msgid "gnunet-update failed. Please run gnunet-update manually."
+#: src/setup/gtk/wizard_gtk.c:496
+msgid ""
+"Running gnunet-update failed.\n"
+"This maybe due to insufficient permissions, please check your "
+"configuration.\n"
+"Finally, run gnunet-update manually."
 msgstr ""
 
-#: src/setup/text/conf.c:74
+#: src/setup/text/conf.c:75
 #, fuzzy
 msgid "yes"
 msgstr "Có"
 
-#: src/setup/text/conf.c:75
+#: src/setup/text/conf.c:76
 msgid "no"
 msgstr ""
 
-#: src/setup/text/conf.c:101
+#: src/setup/text/conf.c:102
 #, c-format
 msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/text/conf.c:110
+#: src/setup/text/conf.c:111
 msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
 msgstr ""
 
-#: src/setup/text/conf.c:112
+#: src/setup/text/conf.c:113
 #, c-format
 msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/text/conf.c:132
+#: src/setup/text/conf.c:133
 #, c-format
 msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/text/conf.c:138
+#: src/setup/text/conf.c:139
 #, c-format
 msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/text/conf.c:144
+#: src/setup/text/conf.c:145
 #, c-format
 msgid ""
 "\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
 "value %llu): "
 msgstr ""
 
-#: src/setup/text/conf.c:177
+#: src/setup/text/conf.c:178
 #, fuzzy, c-format
 msgid "Yes\n"
 msgstr "Có"
 
-#: src/setup/text/conf.c:182
+#: src/setup/text/conf.c:183
 #, fuzzy, c-format
 msgid "No\n"
 msgstr "Không"
 
-#: src/setup/text/conf.c:185 src/setup/text/conf.c:221
-#: src/setup/text/conf.c:246 src/setup/text/conf.c:304
-#: src/setup/text/conf.c:354
+#: src/setup/text/conf.c:186 src/setup/text/conf.c:222
+#: src/setup/text/conf.c:248 src/setup/text/conf.c:306
+#: src/setup/text/conf.c:358
 #, fuzzy, c-format
 msgid "Help\n"
 msgstr "Trợ giúp"
 
-#: src/setup/text/conf.c:188 src/setup/text/conf.c:201
-#: src/setup/text/conf.c:255 src/setup/text/conf.c:285
-#: src/setup/text/conf.c:335
+#: src/setup/text/conf.c:189 src/setup/text/conf.c:202
+#: src/setup/text/conf.c:257 src/setup/text/conf.c:287
+#: src/setup/text/conf.c:339
 #, fuzzy, c-format
 msgid "Abort\n"
 msgstr "_Nói về"
 
-#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#: src/setup/text/conf.c:330 src/setup/text/conf.c:385
 #, c-format
 msgid ""
 "\n"
 "Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/text/conf.c:385
+#: src/setup/text/conf.c:391
 #, c-format
 msgid "Unknown kind %x (internal error).  Skipping option.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:459
+#: src/setup/text/conf.c:465
 msgid "\tDescend? (y/n/?) "
 msgstr ""
 
-#: src/setup/text/conf.c:470
+#: src/setup/text/conf.c:476
 msgid "Aborted.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:492
+#: src/setup/text/conf.c:498
 #, fuzzy
 msgid "Invalid entry.\n"
 msgstr "Tham số sai: '%s'\n"
 
-#: src/setup/text/conf.c:511
+#: src/setup/text/conf.c:517
 #, c-format
 msgid "Unknown kind %x (internal error).  Aborting.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:542
+#: src/setup/text/conf.c:548
 #, c-format
 msgid "You can always press ENTER to keep the current value.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:543
+#: src/setup/text/conf.c:549
 #, c-format
 msgid "Use the '%s' key to abort.\n"
 msgstr ""
 
-#: src/setup/text/conf.c:557 src/setup/ncurses/mconf.c:427
+#: src/setup/text/conf.c:563 src/setup/ncurses/mconf.c:427
 #, fuzzy, c-format
 msgid "Configuration unchanged, no need to save.\n"
 msgstr ""
 "Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
-#: src/setup/text/conf.c:562
+#: src/setup/text/conf.c:568
 #, c-format
 msgid ""
 "Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
 "configuration. "
 msgstr ""
 
-#: src/setup/text/conf.c:572
+#: src/setup/text/conf.c:580
 #, fuzzy, c-format
 msgid "Configuration was unchanged, no need to save.\n"
 msgstr ""
 "Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
-#: src/setup/text/conf.c:577
+#: src/setup/text/conf.c:585
 #, fuzzy, c-format
 msgid "Configuration file `%s' written.\n"
 msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
@@ -4761,7 +4633,125 @@
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "'%s' thất bại trên tập tin'%s' tại %s:%d với lỗi: %s\n"
 
+#~ msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+#~ msgstr "Đang chờ chạy gnunetd (còn %u lần thử)...\n"
+
 #, fuzzy
+#~ msgid "Failed to send `%s'.  Closing connection.\n"
+#~ msgstr "Gửi '%s' không thành công.  Đang đóng kết nối.\n"
+
+#, fuzzy
+#~ msgid "Received invalid `%s' request (size %d)\n"
+#~ msgstr "Nhận được yêu cầu '%s' sai (kích thước %d)\n"
+
+#, fuzzy
+#~ msgid "Received invalid `%s' request (wrong table)\n"
+#~ msgstr "Nhận được yêu cầu '%s' sai (sai bảng)\n"
+
+#~ msgid "Received unknown request type %d at %s:%d\n"
+#~ msgstr "Nhận được yêu cầu không rõ dạng %d tại %s:%d\n"
+
+#~ msgid "This client already participates in the given DHT!\n"
+#~ msgstr "Máy khách này đã tham gia trong DHT đưa ra!\n"
+
+#~ msgid "Cannot leave DHT: table not known!\n"
+#~ msgstr "Không rời bỏ được DHT: bảng không biết!\n"
+
+#, fuzzy
+#~ msgid "gnunetd signaled error in response to `%s' message\n"
+#~ msgstr "gnunetd đưa tín hiệu lỗi trong câu trả lời tới thông báo '%s'\n"
+
+#, fuzzy
+#~ msgid "Failed to receive response to `%s' message from gnunetd\n"
+#~ msgstr "Nhận câu trả lời tới thông báo '%s' không thành công từ gnunetd\n"
+
+#, fuzzy
+#~ msgid "Failed to send `%s' message to gnunetd\n"
+#~ msgstr "Gửi thông báo '%s' tới gnunetd không thành công\n"
+
+#~ msgid "Join a DHT."
+#~ msgstr "Nhập một DHT."
+
+#~ msgid "allow SIZE bytes of memory for the local table"
+#~ msgstr "cho phép SIZE byte bộ nhớ cho bảng nội bộ"
+
+#, fuzzy
+#~ msgid "Call to `%s' returns %d.\n"
+#~ msgstr "Gọi tới '%s' trả lại %d.\n"
+
+#, fuzzy
+#~ msgid "Call to `%s' with key `%s'.\n"
+#~ msgstr "Gọi tới '%s' với chìa khóa '%s'.\n"
+
+#, fuzzy
+#~ msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+#~ msgstr "Gọi tới '%s' với giá trị '%.*s' (%d byte).\n"
+
+#~ msgid "Error joining DHT.\n"
+#~ msgstr "Lỗi nhập DHT.\n"
+
+#~ msgid "Joined DHT.  Press CTRL-C to leave.\n"
+#~ msgstr "Đã nhập DHT.  Nhấn CTRL-C để dời khỏi.\n"
+
+#~ msgid "Error leaving DHT.\n"
+#~ msgstr "Lỗi dời khỏi DHT.\n"
+
+#, fuzzy
+#~ msgid "Malformed optional field `%s' received from peer `%s'.\n"
+#~ msgstr "Nhận được vùng không bắt buộc '%s' bị hỏng từ dầu peer '%s'.\n"
+
+#, fuzzy
+#~ msgid "Could not find peer `%s' in routing table!\n"
+#~ msgstr "Không tìm thấy đầu peer '%s' trong bảng định tuyến!\n"
+
+#, fuzzy
+#~ msgid "Received malformed response to `%s' from peer `%s'.\n"
+#~ msgstr "Nhận được câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
+
+#, fuzzy
+#~ msgid "Invalid response to `%s' from peer `%s'.\n"
+#~ msgstr "Câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
+
+#, fuzzy
+#~ msgid "Invalid response to `%s'.\n"
+#~ msgstr "Câu trả lời không đúng tới '%s'.\n"
+
+#, fuzzy
+#~ msgid "Malformed response to `%s' on master table.\n"
+#~ msgstr "Câu trả lời bị hỏng tới '%s' trên bảng chính.\n"
+
+#, fuzzy
+#~ msgid "Invalid response to `%s' from `%s'\n"
+#~ msgstr "Câu trả lời không đúng tới '%s' từ '%s'\n"
+
+#, fuzzy
+#~ msgid "Received invalid RPC `%s'.\n"
+#~ msgstr "Nhận được RPC sai '%s'.\n"
+
+#, fuzzy
+#~ msgid "RPC for `%s' received for table that we do not participate in!\n"
+#~ msgstr "Nhận được RPC cho '%s' cho bảng chúng ta không có phần trong đó!\n"
+
+#, fuzzy
+#~ msgid "`%s' failed: table not found!\n"
+#~ msgstr "'%s' không thành công: không tìm thấy bảng!\n"
+
+#~ msgid "sendAck failed.  Terminating connection to client.\n"
+#~ msgstr "Gửi sendAck không thành công.  Ngắt kết nối tới máy khách.\n"
+
+#, fuzzy
+#~ msgid "Failed to deliver `%s' message.\n"
+#~ msgstr "Phân phát tin nhắn '%s' không thành công.\n"
+
+#, fuzzy
+#~ msgid "Unindex failed."
+#~ msgstr "Bỏ đánh chỉ mục thất bại.\n"
+
+#, fuzzy
+#~ msgid "Upload failed (consult logs)."
+#~ msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
+
+#, fuzzy
 #~ msgid "Could not resolve name of SMTP server `%s': %s"
 #~ msgstr "Không tìm thấy tên của máy chủ SMTP '%s': %s"
 





reply via email to

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