[GNUnet-SVN] r3364 - in GNUnet: po src/applications/session src/server

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r3364 - in GNUnet: po src/applications/session src/server

From:	grothoff
Subject:	[GNUnet-SVN] r3364 - in GNUnet: po src/applications/session src/server
Date:	Tue, 5 Sep 2006 17:22:10 -0700 (PDT)
Author: grothoff
Date: 2006-09-05 17:21:57 -0700 (Tue, 05 Sep 2006)
New Revision: 3364

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
   GNUnet/src/applications/session/connect.c
   GNUnet/src/server/gnunet-transport-check.c
   GNUnet/src/server/gnunetd.c
Log:
po file update

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2006-09-06 00:19:41 UTC (rev 3363)
+++ GNUnet/po/GNUnet.pot        2006-09-06 00:21:57 UTC (rev 3364)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-07-24 16:55-0700\n"
+"POT-Creation-Date: 2006-09-05 18:18-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"
@@ -16,285 +16,247 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/transports/ip6.c:60
+#: src/transports/ip6.c:65 src/util/network/io.c:68
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:100
+#: src/transports/ip6.c:109
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr ""
-
-#: src/transports/udp6.c:128 src/transports/udp.c:145
+#: src/transports/ip6.c:154 src/transports/ip.c:353
 #, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
+msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:164
+#: src/transports/udp6.c:126 src/transports/udp.c:128
 #, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
+msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
 
-#: src/transports/udp6.c:235
-#, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp6.c:290
-#, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr ""
-
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr ""
-
-#: src/transports/udp6.c:334 src/transports/tcp6.c:657
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr ""
-
-#: src/transports/udp6.c:415
+#: src/transports/udp6.c:223
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:699 src/transports/smtp.c:932
-#: src/transports/udp.c:722
+#: src/transports/udp6.c:443 src/transports/udp.c:443
 #, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/http.c:601
+#: src/transports/http.c:614
 msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr ""
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#: src/transports/http.c:830
 #, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/transports/http.c:1101
+#: src/transports/http.c:1114
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#: src/transports/http.c:1190 src/transports/tcp.c:254
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/http.c:1333
+#: src/transports/http.c:1346
 #, c-format
 msgid ""
 "Could not bind the HTTP listener to port %d. No transport service started.\n"
 msgstr ""
 
-#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
+#: src/transports/http.c:1469 src/applications/testbed/testbed.c:1054
 #, c-format
 msgid "Could not resolve name of HTTP proxy `%s'.\n"
 msgstr ""
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1492
 msgid "# bytes received via HTTP"
 msgstr ""
 
-#: src/transports/http.c:1480
+#: src/transports/http.c:1494
 msgid "# bytes sent via HTTP"
 msgstr ""
 
-#: src/transports/http.c:1482
+#: src/transports/http.c:1496
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/transports/smtp.c:297
+#: src/transports/smtp.c:298
 #, c-format
 msgid "Could not resolve name of SMTP server `%s': %s"
 msgstr ""
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
+#: src/transports/smtp.c:420 src/transports/smtp.c:882
 #, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
 "under `%s'.\n"
 msgstr ""
 
-#: src/transports/smtp.c:489
+#: src/transports/smtp.c:493
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:584
+#: src/transports/smtp.c:588
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
-#: src/transports/smtp.c:591
+#: src/transports/smtp.c:595
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:764
+#: src/transports/smtp.c:769
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr ""
 
-#: src/transports/smtp.c:815
+#: src/transports/smtp.c:820
 #, c-format
 msgid "SMTP server send unexpected response at %s:%d.\n"
 msgstr ""
 
-#: src/transports/smtp.c:838
+#: src/transports/smtp.c:843
 #, c-format
 msgid ""
 "SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
 msgstr ""
 
-#: src/transports/smtp.c:844
+#: src/transports/smtp.c:849
 #, c-format
 msgid "Failed to send `%s' request to SMTP server.\n"
 msgstr ""
 
-#: src/transports/smtp.c:903
+#: src/transports/smtp.c:909
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/transports/tcp.c:465
+#: src/transports/smtp.c:938
 #, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr ""
-
-#: src/transports/tcp.c:1082
+#: src/transports/tcp.c:181
 msgid "Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:324 src/transports/tcp6.c:333
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1449
+#: src/transports/tcp.c:421
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:1451
+#: src/transports/tcp.c:423
 msgid "# bytes sent via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:1453
+#: src/transports/tcp.c:425
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:179
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr ""
-
-#: src/transports/udp.c:250
-#, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp.c:307
-#, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr ""
-
-#: src/transports/udp.c:332
-#, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
-
-#: src/transports/udp.c:417
+#: src/transports/udp.c:217
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:551
+#: src/transports/udp.c:312
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/udp.c:707
+#: src/transports/udp.c:449
 msgid "# bytes received via UDP"
 msgstr ""
 
-#: src/transports/udp.c:709
+#: src/transports/udp.c:451
 msgid "# bytes sent via UDP"
 msgstr ""
 
-#: src/transports/udp.c:711
+#: src/transports/udp.c:453
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/ip.c:124
+#: src/transports/ip.c:92
 #, c-format
+msgid "No interface specified in section `%s' under `%s'!\n"
+msgstr ""
+
+#: src/transports/ip.c:150
+#, c-format
 msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
+"Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr ""
 
-#: src/transports/ip.c:149
+#: src/transports/ip.c:182
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/transports/ip.c:193
+#: src/transports/ip.c:226
 #, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr ""
 
-#: src/transports/ip.c:203
+#: src/transports/ip.c:236
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
 "GNUnet will use %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/transports/ip.c:224
+#: src/transports/ip.c:257
 #, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr ""
 
-#: src/transports/ip.c:256
+#: src/transports/ip.c:289
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
+#: src/transports/tcp6.c:179
+msgid "Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+#: src/transports/tcp6.c:221
+#, c-format
+msgid "`%s': unknown service: %s\n"
 msgstr ""
 
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
+#: src/transports/tcp6.c:430
+msgid "# bytes received via TCP6"
 msgstr ""
 
-#: src/transports/tcp6.c:958
-msgid "Could not determine my public IPv6 address.\n"
+#: src/transports/tcp6.c:432
+msgid "# bytes sent via TCP6"
 msgstr ""
 
-#: src/transports/tcp6.c:1002
-#, c-format
-msgid "`%s': unknown service: %s\n"
+#: src/transports/tcp6.c:434
+msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr ""
 
+#: src/transports/tcp_helper.c:182
+msgid "Received malformed message instead of welcome message. Closing.\n"
+msgstr ""
+
+#: src/transports/tcp_helper.c:193
+msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgstr ""
+
+#: src/transports/udp_helper.c:93
+msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgstr ""
+
 #: src/applications/dht/tools/dhttest2.c:50
-#: src/applications/session/sessiontest.c:48
+#: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:107
 #: src/applications/tbench/tbenchtest_udp.c:107
@@ -303,7 +265,6 @@
 msgstr ""
 
 #: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/session/sessiontest.c:118
 #: src/applications/tbench/tbenchtest.c:199
 #: src/applications/tbench/tbenchtest_udp.c:201
 #: src/applications/gap/gaptest.c:318
@@ -312,7 +273,6 @@
 msgstr ""
 
 #: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/session/sessiontest.c:133
 #: src/applications/tbench/tbenchtest.c:122
 #: src/applications/tbench/tbenchtest_udp.c:122
 #: src/applications/gap/gaptest.c:330
@@ -333,28 +293,8 @@
 msgstr ""
 
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85
-#: src/applications/tbench/gnunet-tbench.c:124
-#: src/applications/tbench/gnunet-tbench.c:134
-#: src/applications/tbench/gnunet-tbench.c:147
-#: src/applications/tbench/gnunet-tbench.c:157
-#: src/applications/tbench/gnunet-tbench.c:167
-#: src/applications/tbench/gnunet-tbench.c:182
-#: src/applications/tracekit/gnunet-tracekit.c:73
-#: src/applications/tracekit/gnunet-tracekit.c:87
-#: src/applications/tracekit/gnunet-tracekit.c:122
-#: src/applications/tracekit/gnunet-tracekit.c:136
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/server/gnunet-transport-check.c:448
-#: src/server/gnunet-transport-check.c:462
-#: src/server/gnunet-transport-check.c:479
-#: src/server/gnunet-transport-check.c:509
+#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
+#: src/util/getopt/setoption.c:149
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
@@ -364,21 +304,8 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
-#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
-#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
-#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
+#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
+#: src/setup/gnunet-setup.c:246
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
@@ -550,7 +477,7 @@
 
 #: src/applications/dht/module/dht.c:1603
 #: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr ""
@@ -632,7 +559,7 @@
 msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:212
+#: src/applications/chat/chat.c:216
 msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
@@ -645,9 +572,6 @@
 msgstr ""
 
 #: src/applications/chat/gnunet-chat.c:151
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363
-#: src/applications/fs/tools/gnunet-delete.c:142
 msgid "Could not connect to gnunetd.\n"
 msgstr ""
 
@@ -664,400 +588,380 @@
 msgid "Could not send message to gnunetd\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:161
+#: src/applications/advertising/advertising.c:162
 #, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:167
+#: src/applications/advertising/advertising.c:168
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:176
+#: src/applications/advertising/advertising.c:177
 #, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:295
+#: src/applications/advertising/advertising.c:297
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:308
+#: src/applications/advertising/advertising.c:310
 #, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:463
+#: src/applications/advertising/advertising.c:467
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:470
+#: src/applications/advertising/advertising.c:474
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:572
+#: src/applications/advertising/advertising.c:580
 #, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:734
+#: src/applications/advertising/advertising.c:760
 msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:735
+#: src/applications/advertising/advertising.c:761
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:736
+#: src/applications/advertising/advertising.c:762
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:738
-#: src/applications/pingpong/pingpong.c:462
+#: src/applications/advertising/advertising.c:764
+#: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:742
-#: src/applications/session/connect.c:752
+#: src/applications/advertising/advertising.c:768
+#: src/applications/session/connect.c:779
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:761
-msgid "Network advertisements disabled by configuration!\n"
-msgstr ""
-
-#: src/applications/advertising/advertising.c:781
+#: src/applications/advertising/advertising.c:785
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:398
+#: src/applications/pingpong/pingpong.c:123
+#: src/applications/pingpong/pingpong.c:191
+#: src/applications/pingpong/pingpong.c:244
+#: src/applications/pingpong/pingpong.c:313
 #, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
-msgstr ""
-
-#: src/applications/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
-#, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:130
+#: src/applications/pingpong/pingpong.c:135
 msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:187
+#: src/applications/pingpong/pingpong.c:201
 msgid "Received PING not destined for us!\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/pingpong/pingpong.c:286
+#: src/applications/pingpong/pingpong.c:349
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:366
+#: src/applications/pingpong/pingpong.c:390
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:452
+#: src/applications/pingpong/pingpong.c:478
 msgid "# encrypted PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:454
+#: src/applications/pingpong/pingpong.c:480
 msgid "# plaintext PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:456
+#: src/applications/pingpong/pingpong.c:482
 msgid "# encrypted PING messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:458
+#: src/applications/pingpong/pingpong.c:484
 msgid "# PING messages created"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:460
+#: src/applications/pingpong/pingpong.c:486
 msgid "# encrypted PONG messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:464
+#: src/applications/pingpong/pingpong.c:490
 msgid "# encrypted PING messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:500
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_sqlite/sqlite.c:45
+#: src/applications/sqstore_sqlite/sqlite.c:52
 #: src/applications/sqstore_mysql/mysql.c:137
 #: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/kvstore_sqlite/kv_sqlite.c:43
-#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/applications/sqstore_mysql/mysql.c:389
+#: src/applications/sqstore_mysql/mysql.c:728
+#: src/applications/sqstore_mysql/mysql.c:743
+#: src/applications/sqstore_mysql/mysql.c:752
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:786
+#: src/applications/sqstore_mysql/mysql.c:840
+#: src/applications/sqstore_mysql/mysql.c:925
+#: src/applications/sqstore_mysql/mysql.c:935
+#: src/applications/sqstore_mysql/mysql.c:1007
+#: src/applications/sqstore_mysql/mysql.c:1016
+#: src/applications/sqstore_mysql/mysql.c:1056
+#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
+#: src/applications/sqstore_sqlite/sqlite.c:158
+#, c-format
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_sqlite/sqlite.c:307
+#: src/applications/sqstore_sqlite/sqlite.c:327
 #: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
+#: src/applications/sqstore_mysql/mysql.c:803
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
+#: src/applications/sqstore_sqlite/sqlite.c:308
+#: src/applications/sqstore_sqlite/sqlite.c:328
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1035
-#, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
-msgstr ""
-
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-#: src/applications/sqstore_mysql/mysql.c:1178
+#: src/applications/sqstore_sqlite/sqlite.c:1177
+#: src/applications/sqstore_mysql/mysql.c:1182
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
-msgid "Could not initialize libgnunetutil!\n"
-msgstr ""
-
-#: src/applications/session/connect.c:209
+#: src/applications/session/connect.c:221
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:246
+#: src/applications/session/connect.c:258
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:523
+#: src/applications/session/connect.c:517
 #, c-format
+msgid "Session key received from peer `%s' has invalid format (discarded).\n"
+msgstr ""
+
+#: src/applications/session/connect.c:540
+#, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:532
+#: src/applications/session/connect.c:550
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:587
+#: src/applications/session/connect.c:608
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:597
+#: src/applications/session/connect.c:619
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:742
+#: src/applications/session/connect.c:768
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:744
+#: src/applications/session/connect.c:770
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:746
+#: src/applications/session/connect.c:772
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:748
+#: src/applications/session/connect.c:774
 msgid "# sessions established"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
 "using this name (%p)\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
 "under that name: %p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:232
+#: src/applications/rpc/rpc.c:233
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/rpc/rpc.c:280
 #, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
+#: src/applications/rpc/rpc.c:1100
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/rpc/rpc.c:945
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1388
+#: src/applications/rpc/rpc.c:1414
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1441
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/rpc/rpc.c:1462
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1491
+#: src/applications/rpc/rpc.c:1519
 msgid "RPC async reply invalid.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1562
+#: src/applications/rpc/rpc.c:1591
 msgid "async RPC reply not received.\n"
 msgstr ""
 
 #: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
+#: src/applications/sqstore_mysql/mysql.c:804
 msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1110
 #, c-format
 msgid "Query `%s' had no results.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1205
+#: src/applications/sqstore_mysql/mysql.c:1212
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1223
+#: src/applications/sqstore_mysql/mysql.c:1230
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
 msgstr ""
 
-#: src/applications/datastore/filter.c:42
+#: src/applications/datastore/datastore.c:119
 #, c-format
-msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
-msgstr ""
-
-#: src/applications/datastore/datastore.c:118
-#, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:142
+#: src/applications/datastore/datastore.c:143
 #, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1086
-#: src/applications/fs/fsui/file_info.c:66
+#: src/applications/datastore/datastore.c:358
+#: src/applications/datastore/datastore.c:454
+msgid "Failed to load state service. Trying to do without.\n"
+msgstr ""
+
+#: src/applications/identity/hostkey.c:109
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s\n"
+msgid "Failed to access GNUnet home directory `%s'\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/identity/hostkey.c:139
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:127
+#: src/applications/identity/hostkey.c:147
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
-msgstr ""
-
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:160
 msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:333
+#: src/applications/identity/identity.c:346
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:366
+#: src/applications/identity/identity.c:359
 #, c-format
-msgid "%s `%s' returned no known hosts!\n"
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:648
-#: src/applications/identity/identity.c:666
+#: src/applications/identity/identity.c:396
 #, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/applications/identity/identity.c:684
+#: src/applications/identity/identity.c:705
+#, c-format
 msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:716
+#: src/applications/identity/identity.c:758
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:724
+#: src/applications/identity/identity.c:767
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
 #: src/applications/testbed/commands.c:1130
-#: src/applications/stats/gnunet-stats.c:61
+#: src/applications/stats/gnunet-stats.c:63
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr ""
 
 #: src/applications/testbed/commands.c:1132
-#: src/applications/stats/gnunet-stats.c:64
+#: src/applications/stats/gnunet-stats.c:66
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr ""
@@ -1087,7 +991,7 @@
 "Trying again in %d seconds...\n"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#: src/applications/testbed/gnunet-testbed.c:415
 #, c-format
 msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr ""
@@ -1209,7 +1113,6 @@
 msgstr ""
 
 #: src/applications/testbed/testbed.c:1079
-#: src/applications/bootstrap_http/http.c:81
 #, c-format
 msgid "Invalid URL `%s' (must begin with `%s')\n"
 msgstr ""
@@ -1238,74 +1141,99 @@
 msgid "Exit register (error: no http response read).\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1361
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/applications/transport/transport.c:136
 #, c-format
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:183
+#, c-format
+msgid "Transport connection attempt failed, transport type %d not supported\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:278
+#, c-format
+msgid "Transmission attempt failed, transport type %d unknown.\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:366
+#, c-format
 msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:676
+#: src/applications/transport/transport.c:423
+msgid "No transport succeeded in creating a hello!\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:596
 #, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgid "Loading transports `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:691
+#: src/applications/transport/transport.c:616
 #, c-format
-msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
+msgid "Could not load transport plugin `%s'\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:717
+#: src/applications/transport/transport.c:626
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:738
+#: src/applications/transport/transport.c:643
 #, c-format
+msgid "Loaded transport `%s'\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:654
+#, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:559
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:560
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:561
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/fragmentation/fragmentation.c:573
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr ""
 
+#: src/applications/stats/gnunet-stats.c:90
+msgid "Print statistics about GNUnet operations."
+msgstr ""
+
 #: src/applications/stats/gnunet-stats.c:94
 msgid "prints supported protocol messages"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
-msgstr ""
-
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/stats/gnunet-stats.c:137
+#: src/applications/tbench/gnunet-tbench.c:136
+#: src/applications/tracekit/gnunet-tracekit.c:319
+#: src/applications/template/gnunet-template.c:101
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/stats/gnunet-stats.c:156
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/clientapi.c:179
+#: src/applications/stats/clientapi.c:180
 msgid "Uptime (seconds)"
 msgstr ""
 
@@ -1328,111 +1256,118 @@
 msgid "# bytes of noise received"
 msgstr ""
 
-#: src/applications/stats/statistics.c:374
+#: src/applications/stats/statistics.c:364
+#, c-format
+msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
+msgstr ""
+
+#: src/applications/stats/statistics.c:385
 msgid "keeps statistics about gnunetd's operation"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:95
+#: src/applications/tbench/gnunet-tbench.c:65
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:67
 msgid "output in gnuplot format"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:98
+#: src/applications/tbench/gnunet-tbench.c:71
 msgid "number of iterations"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:100
+#: src/applications/tbench/gnunet-tbench.c:75
 msgid "number of messages to use per iteration"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:102
+#: src/applications/tbench/gnunet-tbench.c:78
 msgid "receiver host identifier (ENC file name)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:104
+#: src/applications/tbench/gnunet-tbench.c:81
 msgid "message size"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:106
+#: src/applications/tbench/gnunet-tbench.c:84
 msgid "sleep for SPACE ms after each a message block"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:108
+#: src/applications/tbench/gnunet-tbench.c:87
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:111
+#: src/applications/tbench/gnunet-tbench.c:91
 msgid "number of messages in a message block"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
-msgstr ""
-
-#: src/applications/tbench/gnunet-tbench.c:225
+#: src/applications/tbench/gnunet-tbench.c:153
+#, c-format
 msgid "You must specify a receiver!\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/tbench/gnunet-tbench.c:162
 #, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:249
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "Time:\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:250
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:254
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:259
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/tbench/gnunet-tbench.c:200
 #, c-format
 msgid "\tmax      %u\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:262
+#: src/applications/tbench/gnunet-tbench.c:202
 #, c-format
 msgid "\tmin      %u\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:264
+#: src/applications/tbench/gnunet-tbench.c:204
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/tbench/gnunet-tbench.c:206
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/applications/tbench/gnunet-tbench.c:215
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/tbench/gnunet-tbench.c:219
 #, c-format
 msgid ""
 "\n"
@@ -1471,736 +1406,618 @@
 msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:448
+#: src/applications/tbench/tbench.c:460
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
+#: src/applications/tracekit/gnunet-tracekit.c:49
 msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
+#: src/applications/tracekit/gnunet-tracekit.c:52
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
+#: src/applications/tracekit/gnunet-tracekit.c:58
 msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
+#: src/applications/tracekit/gnunet-tracekit.c:62
 msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
-msgstr ""
-
-#: src/applications/tracekit/gnunet-tracekit.c:222
+#: src/applications/tracekit/gnunet-tracekit.c:116
 #, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr ""
-
-#: src/applications/tracekit/gnunet-tracekit.c:233
-#, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
 "vcg.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
+#: src/applications/tracekit/gnunet-tracekit.c:163
 #, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:197
+#, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/applications/tracekit/gnunet-tracekit.c:212
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
+#: src/applications/tracekit/gnunet-tracekit.c:235
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
+#: src/applications/tracekit/gnunet-tracekit.c:350
 msgid "Could not send request to gnunetd.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
+#: src/applications/tracekit/tracekit.c:68
+#: src/applications/tracekit/tracekit.c:201
 #, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:243
+#: src/applications/tracekit/tracekit.c:263
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:331
+#: src/applications/tracekit/tracekit.c:354
 #, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:431
+#: src/applications/tracekit/tracekit.c:461
 msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/gap/gap.c:1635
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1618
+#: src/applications/gap/gap.c:1636
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1791
+#: src/applications/gap/gap.c:1809
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1820 src/applications/fs/module/anonymity.c:66
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
+#: src/applications/gap/gap.c:1826 src/applications/gap/gap.c:1831
+#: src/applications/gap/gap.c:1837
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2077
+#: src/applications/gap/gap.c:2116
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2078
+#: src/applications/gap/gap.c:2117
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2079
+#: src/applications/gap/gap.c:2118
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2080
+#: src/applications/gap/gap.c:2119
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2081
+#: src/applications/gap/gap.c:2120
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2082
+#: src/applications/gap/gap.c:2121
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2083
+#: src/applications/gap/gap.c:2122
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2084
+#: src/applications/gap/gap.c:2123
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2085
+#: src/applications/gap/gap.c:2124
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2086
+#: src/applications/gap/gap.c:2125
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2087
+#: src/applications/gap/gap.c:2126
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2088
+#: src/applications/gap/gap.c:2127
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2089
+#: src/applications/gap/gap.c:2128
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2090
+#: src/applications/gap/gap.c:2129
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2091
+#: src/applications/gap/gap.c:2130
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2092
+#: src/applications/gap/gap.c:2131
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2093
+#: src/applications/gap/gap.c:2132
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2094
+#: src/applications/gap/gap.c:2133
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2095
+#: src/applications/gap/gap.c:2134
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2112
+#: src/applications/gap/gap.c:2150
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/gap/gap.c:2178
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:151
+#: src/applications/gap/pid_table.c:156
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:153
+#: src/applications/gap/pid_table.c:158
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/getoption/getoption.c:74
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:82
+#: src/applications/getoption/getoption.c:84
 msgid "allows clients to determine gnunetd's configuration"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:71
+#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-search.c:129
+#: src/applications/fs/tools/gnunet-download.c:57
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:35
+#: src/applications/fs/tools/gnunet-pseudonym.c:74
 msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
+#: src/applications/fs/tools/gnunet-pseudonym.c:78
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
+#: src/applications/fs/tools/gnunet-pseudonym.c:81
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
+#: src/applications/fs/tools/gnunet-pseudonym.c:84
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
+#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-search.c:132
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
+msgid "specify metadata describing the namespace or collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
+#: src/applications/fs/tools/gnunet-pseudonym.c:95
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
+#: src/applications/fs/tools/gnunet-pseudonym.c:98
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
+#: src/applications/fs/tools/gnunet-pseudonym.c:101
 msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
+#: src/applications/fs/tools/gnunet-pseudonym.c:104
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-msgid "AND"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#: src/applications/fs/tools/gnunet-pseudonym.c:138
 #, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
-#: src/setup/gnunet-setup.c:179
-msgid "Invalid arguments. Exiting.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:142
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#: src/applications/fs/tools/gnunet-pseudonym.c:178
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
 msgid "Collection stopped.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#: src/applications/fs/tools/gnunet-pseudonym.c:223
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#: src/applications/fs/tools/gnunet-pseudonym.c:231
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#: src/applications/fs/tools/gnunet-pseudonym.c:235
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#: src/applications/fs/tools/gnunet-pseudonym.c:254
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#: src/applications/fs/tools/gnunet-pseudonym.c:257
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#: src/applications/fs/tools/gnunet-pseudonym.c:299
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#: src/applications/fs/tools/gnunet-pseudonym.c:304
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#: src/applications/fs/tools/gnunet-pseudonym.c:326
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-delete.c:37
+#: src/applications/fs/tools/gnunet-directory.c:83
 #, c-format
-msgid "%8u of %8u bytes deleted."
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-delete.c:52
-msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-delete.c:61
-msgid ""
-"Remove file from GNUnet.  The specified file is not removed\n"
-"from the filesystem but just from the local GNUnet datastore."
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-delete.c:139
-msgid "You must specify a filename (option -f)\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-delete.c:151
-#, c-format
-msgid ""
-"Error deleting file %s.\n"
-"Probably a few blocks were already missing from the database.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-directory.c:76
-#, c-format
 msgid "==> Directory `%s':\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:81
+#: src/applications/fs/tools/gnunet-directory.c:90
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:111
+#: src/applications/fs/tools/gnunet-directory.c:124
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:113
+#: src/applications/fs/tools/gnunet-directory.c:126
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:141
+msgid "Perform directory related operations."
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-directory.c:143
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:133
+#: src/applications/fs/tools/gnunet-directory.c:147
 msgid "list entries from the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:136
+#: src/applications/fs/tools/gnunet-directory.c:150
 msgid "start tracking entries for the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:140
-msgid "gnunet-directory [OPTIONS] [FILENAMES]"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-directory.c:141
-msgid "Perform directory related operations."
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-directory.c:206
+#: src/applications/fs/tools/gnunet-directory.c:181
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:110
+#: src/applications/fs/tools/gnunet-insert.c:139
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:115
+#: src/applications/fs/tools/gnunet-insert.c:144
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/fs/tools/gnunet-insert.c:166
 #, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
+msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:150
+#: src/applications/fs/tools/gnunet-insert.c:178
 #, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:164
+#: src/applications/fs/tools/gnunet-insert.c:189
 #, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
+msgid "File `%s' has URI: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:174
+#: src/applications/fs/tools/gnunet-insert.c:200
 #, c-format
-msgid "File `%s' has URI: %s\n"
+msgid ""
+"\n"
+"Upload aborted.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:187
+#: src/applications/fs/tools/gnunet-insert.c:206
 #, c-format
 msgid ""
 "\n"
 "Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:209
+#: src/applications/fs/tools/gnunet-insert.c:228
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:232
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:235
 msgid ""
 "use libextractor to add additional direct references to directory entries"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:214
+#: src/applications/fs/tools/gnunet-insert.c:238
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/fs/tools/gnunet-insert.c:240
+msgid "Make files available to GNUnet for sharing."
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:221
+#: src/applications/fs/tools/gnunet-insert.c:247
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-insert.c:251
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:256
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:230
+#: src/applications/fs/tools/gnunet-insert.c:259
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:263
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:236
+#: src/applications/fs/tools/gnunet-insert.c:267
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
-msgid "process directories recursively"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:242
+#: src/applications/fs/tools/gnunet-insert.c:273
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:281
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:250
+#: src/applications/fs/tools/gnunet-insert.c:284
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:257
-msgid "Make files available to GNUnet for sharing."
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:344
+#: src/applications/fs/tools/gnunet-insert.c:326
 #, c-format
-msgid "You must pass a positive number to the `%s' option.\n"
+msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:429
+#: src/applications/fs/tools/gnunet-insert.c:351
 #, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:537
-#: src/applications/fs/tools/gnunet-unindex.c:145
-#, c-format
-msgid "You must specify a list of files to insert.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:541
-#, c-format
-msgid "Only one file or directory can be specified at a time.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:545
-#, c-format
-msgid "You must specify a file or directory to upload.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:595
-#, c-format
 msgid "Keywords for file `%s':\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:617
+#: src/applications/fs/tools/gnunet-insert.c:378
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:636
+#: src/applications/fs/tools/gnunet-insert.c:394
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:649
-#: src/applications/fs/tools/gnunet-insert.c:653
-#: src/applications/fs/tools/gnunet-insert.c:657
-#: src/applications/fs/tools/gnunet-insert.c:661
-#: src/applications/fs/tools/gnunet-insert.c:666
+#: src/applications/fs/tools/gnunet-insert.c:407
+#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:417
+#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:427
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:108
-#: src/applications/fs/tools/gnunet-download.c:42
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:114
+#: src/applications/fs/tools/gnunet-search.c:136
 msgid "exit after receiving LIMIT results"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:116
+#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-download.c:64
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:118
-msgid "wait TIMEOUT seconds for search results before aborting"
+#: src/applications/fs/tools/gnunet-search.c:142
+msgid "wait DELAY seconds for search results before aborting"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:123
-msgid "Search GNUnet for files."
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:227
-msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:278
+#: src/applications/fs/tools/gnunet-search.c:189
 #, c-format
 msgid "Starting search failed. Consult logs.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:353
+#: src/applications/fs/tools/gnunet-search.c:277
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
+#: src/applications/fs/tools/gnunet-download.c:60
+msgid "Download files from GNUnet."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-download.c:50
+#: src/applications/fs/tools/gnunet-download.c:67
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-download.c:159
+#: src/applications/fs/tools/gnunet-download.c:86
 #, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
+#: src/applications/fs/tools/gnunet-download.c:99
+#: src/applications/fs/tools/gnunet-download.c:110
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:191
+#: src/applications/fs/tools/gnunet-download.c:118
 #, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:237
+#: src/applications/fs/tools/gnunet-download.c:175
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-download.c:195
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:288
+#: src/applications/fs/tools/gnunet-download.c:244
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:50
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 "completion)                "
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, c-format
 msgid ""
 "\n"
 "Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:83
 #, c-format
 msgid ""
 "\n"
 "Error unindexing file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:97
+#: src/applications/fs/tools/gnunet-unindex.c:100
 msgid "Unindex files."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:149
-#, c-format
-msgid "You must specify one and only one file to unindex.\n"
+#: src/applications/fs/tools/gnunet-unindex.c:145
+msgid "Not enough arguments. You must specify a filename.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:190
+#: src/applications/fs/tools/gnunet-unindex.c:173
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/fs/module/ondemand.c:317
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:393
+#: src/applications/fs/module/ondemand.c:411
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2208,284 +2025,250 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/fs/module/ondemand.c:438
 #, 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:617
+#: src/applications/fs/module/ondemand.c:655
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1184
+#: src/applications/fs/module/fs.c:1196
 #, 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:1233
+#: src/applications/fs/module/fs.c:1247
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1270
+#: src/applications/fs/module/fs.c:1287
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:224
+#: src/applications/fs/module/migration.c:228
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:225
+#: src/applications/fs/module/migration.c:229
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: 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/namespace_info.c:604
-msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr ""
-
-#: src/applications/fs/fsui/fsui.c:189
+#: src/applications/fs/fsui/fsui.c:195
 msgid "FSUI persistence: error restoring download\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/fs/fsui/fsui.c:666
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:290
+#: src/applications/fs/fsui/download.c:305
 msgid "Download aborted."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:309
 msgid "ECRS download failed (see logs)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:298
+#: src/applications/fs/fsui/download.c:313
 msgid "ECRS download suspending."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:302
+#: src/applications/fs/fsui/download.c:317
 msgid "Unexpected download state."
 msgstr ""
 
-#: src/applications/fs/fsui/unindex.c:85
+#: src/applications/fs/fsui/unindex.c:80
 msgid "Unindex failed."
 msgstr ""
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
-msgstr ""
-
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
+#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
+#: src/applications/fs/fsui/upload.c:413
 msgid "Upload failed."
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:455
+#: src/applications/fs/fsui/upload.c:420
 msgid "Cannot upload directory without using recursion."
 msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/file_info.c:282
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr ""
-
-#: src/applications/fs/ecrs/search.c:160
+#: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:216
+#: src/applications/fs/ecrs/search.c:226
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:128
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:257
+#: src/applications/fs/ecrs/download.c:263
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:935
+#: src/applications/fs/ecrs/download.c:972
 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:1112
+#: src/applications/fs/ecrs/download.c:1153
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/fs/ecrs/upload.c:170
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/fs/ecrs/upload.c:180
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:193
+#: src/applications/fs/ecrs/upload.c:188
 msgid "Failed to connect to gnunetd."
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/fs/ecrs/upload.c:200
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/fs/ecrs/upload.c:219
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:227
+#: src/applications/fs/ecrs/upload.c:226
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:306
+#: src/applications/fs/ecrs/upload.c:312
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:842
+#: src/applications/fs/ecrs/meta.c:847
 #, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:850
+#: src/applications/fs/ecrs/meta.c:855
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/fs/ecrs/namespace.c:153
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
-msgstr ""
-
-#: src/applications/fs/ecrs/namespace.c:133
-#, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/fs/ecrs/namespace.c:338
+#: src/applications/fs/ecrs/namespace.c:419
+#: src/applications/fs/ecrs/namespace.c:573
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/fs/ecrs/namespace.c:350
+#: src/applications/fs/ecrs/namespace.c:430
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/fs/ecrs/namespace.c:587
+#: src/applications/fs/ecrs/namespace.c:598
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:323
-#, c-format
-msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+#: src/applications/fs/ecrs/helper.c:67
+msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/applications/fs/ecrs/parser.c:122
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:358
-msgid "Syntax error in topology specification, skipping bytes.\n"
+#: src/applications/fs/uritrack/file_info.c:123
+msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/applications/fs/uritrack/file_info.c:355
 #, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/template/template.c:61
-#, c-format
-msgid "`%s' registering client handler %d and %d\n"
+#: src/applications/fs/namespace/namespace_info.c:654
+msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:70
-#: src/applications/vpn/gnunet-vpn.c:72
-msgid "helptext for -t"
+#: src/applications/fs/namespace/namespace_info.c:675
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
-msgstr ""
-
-#: src/applications/bootstrap_http/http.c:109
+#: src/applications/topology_f2f/topology.c:354
 #, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:120
-#, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
+#: src/applications/topology_f2f/topology.c:371
+msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:132
+#: src/applications/topology_f2f/topology.c:384
 #, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
+#: src/applications/template/template.c:62
 #, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+msgid "`%s' registering client handler %d and %d\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:217
-#, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
+#: src/applications/template/gnunet-template.c:44
+msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:252
+#: src/applications/bootstrap_http/http.c:92
 #, c-format
-msgid "Parsing hello from `%s' failed.\n"
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:330
-#, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+#: src/applications/bootstrap_http/http.c:144
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:355
+#: src/applications/bootstrap_http/http.c:229
 msgid "# hellos downloaded via http"
 msgstr ""
 
@@ -2499,644 +2282,561 @@
 msgid "# bytes received of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:605
+#: src/applications/traffic/traffic.c:609
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
+#: src/applications/vpn/gnunet-vpn.c:98
+msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr ""
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:181
-#, c-format
-msgid ""
-"Configuration file must specify directory for storing data in section `%s' "
-"under `%s'.\n"
-msgstr ""
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:264
-msgid "Unable to initialize SQLite KVStore.\n"
-msgstr ""
-
-#: src/applications/vpn/gnunet-vpn.c:77
+#: src/applications/vpn/gnunet-vpn.c:103
 msgid "VPN over GNUnet."
 msgstr ""
 
-#: src/applications/vpn/vpn.c:315
+#: src/applications/vpn/vpn.c:351
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:323
+#: src/applications/vpn/vpn.c:359
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:387
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:400
+#: src/applications/vpn/vpn.c:436
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:404
+#: src/applications/vpn/vpn.c:440
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:414
+#: src/applications/vpn/vpn.c:450
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:474
+#: src/applications/vpn/vpn.c:510
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:478
+#: src/applications/vpn/vpn.c:514
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:505
+#: src/applications/vpn/vpn.c:541
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:513
+#: src/applications/vpn/vpn.c:549
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:517
+#: src/applications/vpn/vpn.c:553
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:555
+#: src/applications/vpn/vpn.c:591
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:559
+#: src/applications/vpn/vpn.c:595
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:566
+#: src/applications/vpn/vpn.c:602
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:571
+#: src/applications/vpn/vpn.c:607
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:627
 #, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:638
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/vpn/vpn.c:650
 #, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:646
+#: src/applications/vpn/vpn.c:683
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:692
+#: src/applications/vpn/vpn.c:729
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:754
+#: src/applications/vpn/vpn.c:788
 #, c-format
-msgid "RFC4193 --- whitelist of peer %x\n"
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:772
+#: src/applications/vpn/vpn.c:792
+#, c-format
+msgid "VPN cannot drop connection %x\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:810
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:812
+#: src/applications/vpn/vpn.c:850
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:816
+#: src/applications/vpn/vpn.c:854
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/vpn/vpn.c:860
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:825
+#: src/applications/vpn/vpn.c:863
 #, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:873
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:892
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:869
-#, c-format
-msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
-msgstr ""
-
-#: src/applications/vpn/vpn.c:885
+#: src/applications/vpn/vpn.c:913
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:890
+#: src/applications/vpn/vpn.c:918
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:901
+#: src/applications/vpn/vpn.c:929
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:907
+#: src/applications/vpn/vpn.c:935
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:923
+#: src/applications/vpn/vpn.c:951
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:927
+#: src/applications/vpn/vpn.c:955
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:931
+#: src/applications/vpn/vpn.c:959
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:945
+#: src/applications/vpn/vpn.c:973
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:960
+#: src/applications/vpn/vpn.c:988
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:998
+#: src/applications/vpn/vpn.c:1016
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1013
+#: src/applications/vpn/vpn.c:1031
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1058
+#: src/applications/vpn/vpn.c:1076
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1104
+#: src/applications/vpn/vpn.c:1122
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1148
+msgid "Cannot store client info\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1208
 msgid "Yes"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1208
 msgid "No"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1324
+#: src/applications/vpn/vpn.c:1385
 #, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1325
+#: src/applications/vpn/vpn.c:1386
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1361
+#: src/applications/vpn/vpn.c:1434
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1383
+#: src/applications/vpn/vpn.c:1466
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394
+#: src/applications/vpn/vpn.c:1477
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1405
+#: src/applications/vpn/vpn.c:1490
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/state/state.c:85
+#: src/server/gnunet-update.c:142
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
+msgid "Updating data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
-msgstr ""
-
-#: src/server/gnunet-update.c:55 src/server/startup.c:450
-#: src/server/gnunet-transport-check.c:407
-msgid "run as user LOGIN"
-msgstr ""
-
-#: src/server/gnunet-update.c:58
-msgid "run in client mode (for getting client configuration values)"
-msgstr ""
-
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr ""
-
 #: src/server/gnunet-update.c:147
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'."
+msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
-#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
-#, c-format
-msgid "Invalid arguments: "
+#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
+#: src/server/gnunet-update.c:220
+msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:232 src/server/core.c:476
-msgid "No applications defined in configuration!\n"
+#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
+msgid "run as user LOGIN"
 msgstr ""
 
-#: src/server/gnunet-update.c:249
-#, c-format
-msgid "Updating data for module `%s'\n"
+#: src/server/gnunet-update.c:227
+msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/gnunet-update.c:253
+#: src/server/connection.c:992
 #, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr ""
-
-#: src/server/gnunet-update.c:309
-#, c-format
-msgid "Updated data for %d applications.\n"
-msgstr ""
-
-#: src/server/connection.c:983
-#, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:990
+#: src/server/connection.c:999
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/server/connection.c:2254
+#: src/server/connection.c:2283
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/server/connection.c:2325
+#: src/server/connection.c:2355
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2340
+#: src/server/connection.c:2370
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:2708
+#: src/server/connection.c:2774
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2712
+#: src/server/connection.c:2778
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2714
+#: src/server/connection.c:2780
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2717
+#: src/server/connection.c:2783
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/server/connection.c:2721
+#: src/server/connection.c:2787
 msgid "# bytes transmitted"
 msgstr ""
 
-#: src/server/connection.c:2725
+#: src/server/connection.c:2791
 msgid "# bytes received"
 msgstr ""
 
-#: src/server/connection.c:2727
+#: src/server/connection.c:2793
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/server/connection.c:2728
+#: src/server/connection.c:2794
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/startup.c:196
+#: src/server/gnunetd.c:78
 #, c-format
-msgid "The `%s' request received from client is malformed.\n"
+msgid "`%s' startup complete.\n"
 msgstr ""
 
-#: src/server/startup.c:324
+#: src/server/gnunetd.c:83
 #, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
+msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/startup.c:339
-#, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr ""
-
-#: src/server/startup.c:443
+#: src/server/gnunetd.c:160
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
 msgstr ""
 
-#: src/server/startup.c:456
+#: src/server/gnunetd.c:164
 msgid "Starts the gnunetd daemon."
 msgstr ""
 
-#: src/server/startup.c:470
-#, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
+#: src/server/gnunetd.c:168
+msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/startup.c:479
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
+#: src/server/gnunetd.c:172
+msgid "specify username as which gnunetd should run"
 msgstr ""
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
-msgstr ""
-
-#: src/server/startup.c:583
+#: src/server/gnunetd.c:228
 #, c-format
-msgid "Argument %d: `%s'\n"
-msgstr ""
-
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
-msgstr ""
-
-#: src/server/gnunetd.c:76
-#, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 
-#: src/server/gnunetd.c:84
+#: src/server/core.c:124
 #, c-format
-msgid "`%s' starting\n"
-msgstr ""
-
-#: src/server/gnunetd.c:106
-#, c-format
-msgid "`%s' startup complete.\n"
-msgstr ""
-
-#: src/server/gnunetd.c:111
-#, c-format
-msgid "`%s' is shutting down.\n"
-msgstr ""
-
-#: src/server/core.c:115
-#, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr ""
 
-#: src/server/core.c:168
+#: src/server/core.c:174
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/server/core.c:215
+#: src/server/core.c:217
 #, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr ""
 
-#: src/server/core.c:222
+#: src/server/core.c:225
 #, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
 
-#: src/server/core.c:231 src/server/core.c:420
+#: src/server/core.c:235
 #, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:398
+#: src/server/core.c:374
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/server/core.c:499
+#: src/server/core.c:470
 #, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr ""
-
-#: src/server/core.c:516
-#, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:575
-msgid "FATAL: Identity plugin not found!\n"
-msgstr ""
-
-#: src/server/core.c:633
+#: src/server/core.c:594
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:109
+#: src/server/gnunet-transport-check.c:115
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:124
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:148
+#: src/server/gnunet-transport-check.c:158
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:168
+#: src/server/gnunet-transport-check.c:180
 #, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:182
+#: src/server/gnunet-transport-check.c:194
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:189
+#: src/server/gnunet-transport-check.c:201
 #, c-format
 msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
+"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+"each.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:219
+#: src/server/gnunet-transport-check.c:229
 #, c-format
 msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:230
+#: src/server/gnunet-transport-check.c:245
 #, c-format
 msgid ""
 "\n"
 "Contacting `%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:253
+#: src/server/gnunet-transport-check.c:266
 #, c-format
 msgid " Connection failed\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:259
+#: src/server/gnunet-transport-check.c:272
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:320
+#: src/server/gnunet-transport-check.c:324
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:396
-msgid "ping peers from HOSTLISTURL that match transports"
+#: src/server/gnunet-transport-check.c:350
+msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:357
 msgid "send COUNT messages"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:400
+#: src/server/gnunet-transport-check.c:360
 msgid "send messages with SIZE bytes payload"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:402
+#: src/server/gnunet-transport-check.c:363
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:404
+#: src/server/gnunet-transport-check.c:366
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:414
-msgid "Tool to test if GNUnet transport services are operational."
+#: src/server/gnunet-transport-check.c:374
+msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:565
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr ""
-
-#: src/server/gnunet-transport-check.c:570
+#: src/server/gnunet-transport-check.c:455
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:573
+#: src/server/gnunet-transport-check.c:458
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:617
+#: src/server/gnunet-transport-check.c:518
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/server/tcpserver.c:422
+#: src/server/tcpserver.c:102
 #, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+msgid "The `%s' request received from client is malformed.\n"
 msgstr ""
 
-#: src/server/tcpserver.c:688
+#: src/server/tcpserver.c:316
 #, c-format
+msgid "`%s' failed for port %d. Is gnunetd already running?\n"
+msgstr ""
+
+#: src/server/tcpserver.c:384
+#, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:798
+#: src/server/tcpserver.c:437
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
-#: src/server/handler.c:367
+#: src/server/handler.c:377
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:95
+#: src/server/version.c:157
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
+msgstr ""
+
+#: src/server/gnunet-peer-info.c:52
 msgid "Print information about GNUnet peers."
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:88
 msgid "hello message invalid (signature invalid).\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:164
+#: src/server/gnunet-peer-info.c:99
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr ""
@@ -3148,6 +2848,24 @@
 "want.\n"
 msgstr ""
 
+#: src/util/network_client/tcpio.c:90
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:114
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#, c-format
+msgid "Cannot connect to %s:u: %s\n"
+msgstr ""
+
+#: src/util/network_client/tcpio.c:356
+#, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr ""
+
 #: src/util/crypto/hostkey_gcrypt.c:1031
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
@@ -3158,12 +2876,12 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#: src/util/os/statuscalls.c:171 src/util/os/statuscalls.c:249
 #, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr ""
 
-#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
+#: src/util/os/statuscalls.c:291 src/util/os/statuscalls.c:300
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -3174,24 +2892,17 @@
 msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/util/os/dso.c:75
+#: src/util/os/dso.c:51
 #, c-format
-msgid ""
-"Cannot determine plugin path, application must be installed in directory "
-"ending with `%s'.\n"
-msgstr ""
-
-#: src/util/os/dso.c:97
-#, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/os/dso.c:134
+#: src/util/os/dso.c:90
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/os/dso.c:176
+#: src/util/os/dso.c:132
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
@@ -3204,40 +2915,29 @@
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
-#: src/util/os/installpath.c:172
-msgid ""
-"Cannot determine the path to the executable, your system may be broken or "
-"not supported.\n"
+#: src/util/os/priority.c:78
+#, c-format
+msgid "Invalid process priority `%s'\n"
 msgstr ""
 
-#: src/util/os/installpath.c:211
-msgid ""
-"GNUnet executables are not in a directory named 'bin'. This may signal a "
-"broken installation.\n"
+#: src/util/os/user.c:125
+#, c-format
+msgid "User `%s' not known, cannot change UID to it.\n"
 msgstr ""
 
-#: src/util/os/installpath.c:222
-msgid "Cannot determine the installation prefix. Unknown error.\n"
+#: src/util/os/user.c:136
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/network/tcpio.c:100
-msgid "Could not find valid value for PORT in section NETWORK."
+#: src/util/network/select.c:272
+msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/tcpio.c:124
-msgid "Could not find valid value for HOST in section NETWORK."
+#: src/util/network/select.c:421
+msgid "select listen socket not valid!\n"
 msgstr ""
 
-#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
-#, c-format
-msgid "Cannot connect to %s:u: %s\n"
-msgstr ""
-
-#: src/util/network/tcpio.c:406
-#, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr ""
-
 #: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
 #: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
 #, c-format
@@ -3264,99 +2964,104 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr ""
 
-#: src/util/disk/storage.c:194
+#: src/util/disk/storage.c:201
 #, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr ""
 
-#: src/util/disk/storage.c:240
+#: src/util/disk/storage.c:247
 #, c-format
 msgid "Expected `%s' to be a directory\n"
 msgstr ""
 
-#: src/util/disk/storage.c:279
+#: src/util/disk/storage.c:286
 #, c-format
 msgid "Expected `%s' to be a regular file\n"
 msgstr ""
 
-#: src/util/disk/storage.c:486
+#: src/util/disk/storage.c:493
 #, c-format
 msgid "expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:256
+#: src/util/config_impl/impl.c:260
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:412
+#: src/util/config_impl/impl.c:419
 #, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:424
+#: src/util/config_impl/impl.c:431
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:494
+#: src/util/config_impl/impl.c:511
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:138 src/util/error/error.c:182
+#: src/util/config_impl/impl.c:617
+#, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/error/error.c:156 src/util/error/error.c:200
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:141 src/util/error/error.c:184
+#: src/util/error/error.c:159 src/util/error/error.c:202
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:144 src/util/error/error.c:186
+#: src/util/error/error.c:162 src/util/error/error.c:204
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:147 src/util/error/error.c:188
+#: src/util/error/error.c:165 src/util/error/error.c:206
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:150 src/util/error/error.c:190
+#: src/util/error/error.c:168 src/util/error/error.c:208
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:153 src/util/error/error.c:192
+#: src/util/error/error.c:171 src/util/error/error.c:210
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:194
+#: src/util/error/error.c:174 src/util/error/error.c:212
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:159 src/util/error/error.c:196
+#: src/util/error/error.c:177 src/util/error/error.c:214
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:198
+#: src/util/error/error.c:180 src/util/error/error.c:216
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:165 src/util/error/error.c:200
+#: src/util/error/error.c:183 src/util/error/error.c:218
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:168 src/util/error/error.c:202
+#: src/util/error/error.c:186 src/util/error/error.c:220
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:171
+#: src/util/error/error.c:189
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:203
+#: src/util/error/error.c:221
 msgid "NOTHING"
 msgstr ""
 
@@ -3375,14 +3080,13 @@
 msgid "Permission denied for `%s'.\n"
 msgstr ""
 
-#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
-#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
-#: src/util/threads/pthread.c:275
+#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
+#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
 #, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr ""
 
-#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
 #, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr ""
@@ -3391,258 +3095,365 @@
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:686
+#: src/util/getopt/getopt.c:681
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:705
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:715
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:762
+#: src/util/getopt/getopt.c:757
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:766
+#: src/util/getopt/getopt.c:761
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:792
+#: src/util/getopt/getopt.c:787
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:795
+#: src/util/getopt/getopt.c:790
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:872
+#: src/util/getopt/getopt.c:867
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt/getopt.c:890
+#: src/util/getopt/getopt.c:885
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
+#: src/util/getopt/setoption.c:58
+#, c-format
+msgid ""
+"Setting option `%s' in section `%s' to `%s' when processing command line "
+"option `%s' was denied.\n"
+msgstr ""
+
 #: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/string/string.c:101
+#: src/util/string/string.c:119
 msgid "ms"
 msgstr ""
 
-#: src/util/string/string.c:106
+#: src/util/string/string.c:124
 msgid "s"
 msgstr ""
 
-#: src/util/string/string.c:109
+#: src/util/string/string.c:127
 msgid "m"
 msgstr ""
 
-#: src/util/string/string.c:112
+#: src/util/string/string.c:130
 msgid "h"
 msgstr ""
 
-#: src/util/string/string.c:115
+#: src/util/string/string.c:133
 msgid " days"
 msgstr ""
 
-#: src/util/string/string.c:133
+#: src/util/string/string.c:151
 msgid "b"
 msgstr ""
 
-#: src/util/string/string.c:138
+#: src/util/string/string.c:156
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:141
+#: src/util/string/string.c:159
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:144
+#: src/util/string/string.c:162
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:147
+#: src/util/string/string.c:165
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:267
+#: src/util/string/string.c:285
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:60
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:62
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:91
+#: src/setup/gnunet-setup.c:152
 #, c-format
-msgid "Available MODEs:\n"
+msgid "Too many arguments.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:92
+#: src/setup/gnunet-setup.c:157
+msgid "No interface specified, using default\n"
+msgstr ""
+
+#: src/setup/gnunet-setup.c:227
 #, c-format
-msgid " config\t\ttext-based configuration\n"
+msgid "`%s' is not available."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:94
+#: src/setup/gnunet-setup.c:243
 #, c-format
-msgid " menuconfig\ttext-based menu\n"
+msgid "Unknown operation `%s'\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:96
+#: src/setup/gnunet-win-tool.c:109
 #, c-format
-msgid " wizard-curses\tBasic text-based graphical configuration\n"
+msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:99
+#: src/setup/gnunet-win-tool.c:112 src/setup/gnunet-win-tool.c:139
 #, c-format
-msgid " gconfig\tGTK configuration\n"
+msgid "This version of Windows doesn't support services.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:100
+#: src/setup/gnunet-win-tool.c:116 src/setup/gnunet-win-tool.c:143
 #, c-format
-msgid ""
-" wizard-gtk\tBasic GTK configuration\n"
-"\n"
+msgid "Error: can't open Service Control Manager: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:167
+#: src/setup/gnunet-win-tool.c:121
 #, c-format
-msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
+msgid "Error: can't create service: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:224
-msgid "No interface specified, using default\n"
+#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:155
+#, c-format
+msgid "Unknown error.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
-#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
+#: src/setup/gnunet-win-tool.c:136
 #, c-format
-msgid "`%s' is not available."
+msgid "Service deleted.\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
+#: src/setup/gnunet-win-tool.c:148
 #, c-format
-msgid ""
-"Can only run wizard to configure gnunetd.\n"
-"Did you forget the `%s' option?\n"
+msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:285
+#: src/setup/gnunet-win-tool.c:152
 #, c-format
-msgid "Unknown operation `%s'\n"
+msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/setup/wizard_gtk.c:429
+#: src/setup/gtk/gconf.c:70
+msgid "Sorry, no help is available for this option.\n"
+msgstr ""
+
+#: src/setup/gtk/glade_support.c:89 src/setup/gtk/glade_support.c:120
 #, c-format
+msgid "Failed to open `%s'.\n"
+msgstr ""
+
+#: src/setup/gtk/wizard_gtk.c:429
+#, c-format
 msgid "Unable to save configuration file `%s':"
 msgstr ""
 
-#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
+#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:616
 msgid "Unable to create user account:"
 msgstr ""
 
-#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
+#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:619
 msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:109
+#: src/setup/text/conf.c:74
+msgid "yes"
+msgstr ""
+
+#: src/setup/text/conf.c:75
+msgid "no"
+msgstr ""
+
+#: src/setup/text/conf.c:101
 #, c-format
-msgid "GNUnet service installed successfully.\n"
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:112 src/setup/gnunet-win-tool.c:139
+#: src/setup/text/conf.c:110
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
+msgstr ""
+
+#: src/setup/text/conf.c:112
 #, c-format
-msgid "This version of Windows doesn't support services.\n"
+msgid "\tEnter string (type '%s' for default value `%s'): "
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:116 src/setup/gnunet-win-tool.c:143
+#: src/setup/text/conf.c:132
 #, c-format
-msgid "Error: can't open Service Control Manager: %s\n"
+msgid "\t Enter choice (default is %c): "
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:121
+#: src/setup/text/conf.c:138
 #, c-format
-msgid "Error: can't create service: %s\n"
+msgid "\tEnter floating point (type '%s' for default value %f): "
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:155
+#: src/setup/text/conf.c:144
 #, c-format
-msgid "Unknown error.\n"
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:136
+#: src/setup/text/conf.c:177
 #, c-format
-msgid "Service deleted.\n"
+msgid "Yes\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:148
+#: src/setup/text/conf.c:182
 #, c-format
-msgid "Error: can't access service: %s\n"
+msgid "No\n"
 msgstr ""
 
-#: src/setup/gnunet-win-tool.c:152
+#: 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
 #, c-format
-msgid "Error: can't delete service: %s\n"
+msgid "Help\n"
 msgstr ""
 
-#: src/setup/conf.c:522 src/setup/recreate.c:135
+#: 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
 #, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
+msgid "Abort\n"
 msgstr ""
 
-#: src/setup/conf.c:529
+#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
 #, c-format
-msgid "Configuration file `%s' created.\n"
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
 msgstr ""
 
-#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
-#: src/setup/wizard_util.c:193
+#: src/setup/text/conf.c:385
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:459
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:470
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:492
+msgid "Invalid entry.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:511
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:538
+#, c-format
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:539
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:818
+#, c-format
+msgid "Configuration unchanged, no need to save.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:558
+#, c-format
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
+msgstr ""
+
+#: src/setup/text/conf.c:568
+#, c-format
+msgid "Configuration was unchanged, no need to save.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:573
+#, c-format
+msgid "Configuration file `%s' written.\n"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:793
+msgid "GNUnet Configuration"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:824
+msgid "Do you wish to save your new configuration?"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:834
+#, c-format
+msgid "End of configuration.\n"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:836
+#, c-format
+msgid "Your configuration changes were NOT saved.\n"
+msgstr ""
+
+#: src/setup/ncurses/wizard_curs.c:58
 msgid "Error"
 msgstr ""
 
-#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
-#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
-#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
-#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
-#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
-#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
-#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
-#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
+#: src/setup/ncurses/wizard_curs.c:116 src/setup/ncurses/wizard_curs.c:131
+#: src/setup/ncurses/wizard_curs.c:184 src/setup/ncurses/wizard_curs.c:221
+#: src/setup/ncurses/wizard_curs.c:251 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:310 src/setup/ncurses/wizard_curs.c:337
+#: src/setup/ncurses/wizard_curs.c:369 src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:423 src/setup/ncurses/wizard_curs.c:446
+#: src/setup/ncurses/wizard_curs.c:501 src/setup/ncurses/wizard_curs.c:563
+#: src/setup/ncurses/wizard_curs.c:594 src/setup/ncurses/wizard_curs.c:638
 msgid "GNUnet configuration"
 msgstr ""
 
-#: src/setup/wizard_curs.c:117
+#: src/setup/ncurses/wizard_curs.c:117
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3659,39 +3470,39 @@
 "the GNUnet team"
 msgstr ""
 
-#: src/setup/wizard_curs.c:132
+#: src/setup/ncurses/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
-#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
-#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:191
+#: src/setup/ncurses/wizard_curs.c:228 src/setup/ncurses/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:315 src/setup/ncurses/wizard_curs.c:375
 msgid "Help"
 msgstr ""
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
 "you are using DSL."
 msgstr ""
 
-#: src/setup/wizard_curs.c:185
+#: src/setup/ncurses/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:222
+#: src/setup/ncurses/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
 "If in doubt, leave this empty."
 msgstr ""
 
-#: src/setup/wizard_curs.c:229
+#: src/setup/ncurses/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3702,7 +3513,7 @@
 "IP-Address."
 msgstr ""
 
-#: src/setup/wizard_curs.c:252
+#: src/setup/ncurses/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3713,11 +3524,11 @@
 "forwarding\")."
 msgstr ""
 
-#: src/setup/wizard_curs.c:278
+#: src/setup/ncurses/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3728,11 +3539,11 @@
 "connection."
 msgstr ""
 
-#: src/setup/wizard_curs.c:310
+#: src/setup/ncurses/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:316
+#: src/setup/ncurses/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3743,7 +3554,7 @@
 "connection."
 msgstr ""
 
-#: src/setup/wizard_curs.c:338
+#: src/setup/ncurses/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -3756,18 +3567,18 @@
 "connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 
-#: src/setup/wizard_curs.c:370
+#: src/setup/ncurses/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:376
+#: src/setup/ncurses/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
 "This is the percentage of processor time GNUnet is allowed to use."
 msgstr ""
 
-#: src/setup/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -3780,7 +3591,7 @@
 "availability."
 msgstr ""
 
-#: src/setup/wizard_curs.c:424
+#: src/setup/ncurses/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -3788,7 +3599,7 @@
 "inserted and migrated content)."
 msgstr ""
 
-#: src/setup/wizard_curs.c:447
+#: src/setup/ncurses/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -3797,7 +3608,7 @@
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/setup/wizard_curs.c:502
+#: src/setup/ncurses/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -3813,7 +3624,7 @@
 "GNUnet user:"
 msgstr ""
 
-#: src/setup/wizard_curs.c:564
+#: src/setup/ncurses/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -3828,7 +3639,7 @@
 "GNUnet group:"
 msgstr ""
 
-#: src/setup/wizard_curs.c:595
+#: src/setup/ncurses/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -3836,7 +3647,7 @@
 "Do you want to start it after saving your configuration?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:632
+#: src/setup/ncurses/wizard_curs.c:632
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -3844,90 +3655,19 @@
 "Try again?"
 msgstr ""
 
-#: src/setup/confdata.c:93
+#: src/setup/lib/gns.c:266
 #, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
 
-#: src/setup/wizard_util.c:119
-msgid "Can't open Service Control Manager"
-msgstr ""
-
-#: src/setup/wizard_util.c:124
-msgid "Can't create service"
-msgstr ""
-
-#: src/setup/wizard_util.c:129
-msgid "Error changing the permissions of the GNUnet directory"
-msgstr ""
-
-#: src/setup/wizard_util.c:134
-msgid "Cannot write to the regisitry"
-msgstr ""
-
-#: src/setup/wizard_util.c:137
-msgid "Can't access the service"
-msgstr ""
-
-#: src/setup/wizard_util.c:141
-msgid "Can't delete the service"
-msgstr ""
-
-#: src/setup/wizard_util.c:145
-msgid "Unknown error"
-msgstr ""
-
-#: src/setup/wizard_util.c:176
-msgid "This version of Windows does not support multiple users."
-msgstr ""
-
-#: src/setup/wizard_util.c:180
-msgid "Error creating user"
-msgstr ""
-
-#: src/setup/wizard_util.c:183
-msgid "Error accessing local security policy"
-msgstr ""
-
-#: src/setup/wizard_util.c:186
-msgid "Error granting service right to user"
-msgstr ""
-
-#: src/setup/wizard_util.c:189
-msgid "Unknown error while creating a new user"
-msgstr ""
-
-#: src/setup/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
-msgstr ""
-
-#: src/setup/glade_support.c:75
+#: src/setup/lib/tree.c:181
 #, c-format
-msgid "Failed to find handler for `%s'\n"
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
-#, c-format
-msgid "Failed to open `%s'.\n"
-msgstr ""
-
-#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
-#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
-#, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
-msgstr ""
-
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
-#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
-#, c-format
-msgid "`%s' failed at %s:%d in %s with error: %s\n"
-msgstr ""
-
-#: src/include/gnunet_util_error.h:207
-#, c-format
-msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
-msgstr ""
-
 #: src/include/gnunet_util_getopt.h:145
 msgid "print this help"
 msgstr ""
@@ -3951,3 +3691,20 @@
 #: src/include/gnunet_util_getopt.h:178
 msgid "specify host on which gnunetd is running"
 msgstr ""
+
+#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
+#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr ""
+
+#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr ""
+
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#, c-format
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr ""

Modified: GNUnet/po/POTFILES.in
===================================================================
--- GNUnet/po/POTFILES.in       2006-09-06 00:19:41 UTC (rev 3363)
+++ GNUnet/po/POTFILES.in       2006-09-06 00:21:57 UTC (rev 3364)
@@ -1,4 +1,22 @@
 libltdl/ltdl.c
+libwebserver/src/clientinfo.c
+libwebserver/src/fnmatch.c
+libwebserver/src/utils.c
+libwebserver/src/server.c
+libwebserver/src/client.c
+libwebserver/src/memory.c
+libwebserver/src/outstream.c
+libwebserver/doc/examples/cgi.c
+libwebserver/doc/examples/demo.c
+libwebserver/doc/examples/SoundRecorder/src/soundbuffers.c
+libwebserver/doc/examples/SoundRecorder/src/soundcard.c
+libwebserver/doc/examples/SoundRecorder/src/main.c
+libwebserver/doc/examples/SoundRecorder/src/soundmixer.c
+libwebserver/doc/examples/packetmounter.c
+libwebserver/contrib/help/help.c
+libwebserver/contrib/tools/data2header.c
+libwebserver/contrib/Win32/dirent.c
+libwebserver/contrib/Win32/flock.c
 src/transports/ip6.c
 src/transports/udp6.c
 src/transports/http.c
@@ -8,6 +26,8 @@
 src/transports/udp.c
 src/transports/ip.c
 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
@@ -60,7 +80,6 @@
 src/applications/getoption/clientapi.c
 src/applications/getoption/getoption.c
 src/applications/fs/tools/gnunet-pseudonym.c
-src/applications/fs/tools/gnunet-delete.c
 src/applications/fs/tools/gnunet-directory.c
 src/applications/fs/tools/gnunet-insert.c
 src/applications/fs/tools/gnunet-search.c
@@ -71,20 +90,15 @@
 src/applications/fs/module/anonymity.c
 src/applications/fs/module/fs.c
 src/applications/fs/module/migration.c
-src/applications/fs/fsui/namespace_info.c
 src/applications/fs/fsui/searchtest.c
 src/applications/fs/fsui/search.c
 src/applications/fs/fsui/fsuitest.c
 src/applications/fs/fsui/fsui.c
-src/applications/fs/fsui/namespace_infotest.c
 src/applications/fs/fsui/downloadtest.c
 src/applications/fs/fsui/download.c
 src/applications/fs/fsui/unindex.c
-src/applications/fs/fsui/helper.c
 src/applications/fs/fsui/upload.c
 src/applications/fs/fsui/fsuitest2.c
-src/applications/fs/fsui/file_info.c
-src/applications/fs/fsui/collection.c
 src/applications/fs/fsui/fsui-loader.c
 src/applications/fs/lib/fslibtest.c
 src/applications/fs/lib/fslib.c
@@ -107,7 +121,13 @@
 src/applications/fs/ecrs/namespace.c
 src/applications/fs/ecrs/ecrstest.c
 src/applications/fs/ecrs/ecrs.c
+src/applications/fs/ecrs/helper.c
+src/applications/fs/ecrs/parser.c
 src/applications/fs/ecrs_core.c
+src/applications/fs/uritrack/file_info.c
+src/applications/fs/namespace/namespace_infotest.c
+src/applications/fs/namespace/namespace_info.c
+src/applications/fs/collection/collection.c
 src/applications/topology_f2f/topology.c
 src/applications/template/template.c
 src/applications/template/gnunet-template.c
@@ -133,7 +153,11 @@
 src/util/win/winproc.c
 src/util/cron/crontest.c
 src/util/cron/cron.c
-src/util/initialize.c
+src/util/cron/timertest.c
+src/util/network_client/tcpiotest.c
+src/util/network_client/tcpio.c
+src/util/network_client/daemon.c
+src/util/libgnunetutil.c
 src/util/crypto/symcipher_gcrypt.c
 src/util/crypto/hostkey_gcrypt.c
 src/util/crypto/kblockkey.c
@@ -156,14 +180,16 @@
 src/util/os/osconfig.c
 src/util/os/dso.c
 src/util/os/cpustatus.c
+src/util/os/init.c
 src/util/os/time.c
 src/util/os/installpath.c
-src/util/network/tcpiotest.c
+src/util/os/priority.c
+src/util/os/user.c
+src/util/os/console.c
 src/util/network/endian.c
-src/util/network/tcpio.c
+src/util/network/select.c
 src/util/network/ipcheck.c
 src/util/network/io.c
-src/util/network/daemon.c
 src/util/disk/storagetest.c
 src/util/disk/storage.c
 src/util/config_impl/configtest.c
@@ -177,6 +203,8 @@
 src/util/threads/pthread.c
 src/util/threads/shutdown.c
 src/util/threads/time.c
+src/util/threads/signal.c
+src/util/threads/shutdowntest2.c
 src/util/loggers/file.c
 src/util/loggers/smtp.c
 src/util/loggers/memory.c
@@ -196,32 +224,48 @@
 src/util/string/xmalloc.c
 src/util/string/string.c
 src/setup/gnunet-setup.c
-src/setup/mconf_util.c
-src/setup/wizard_gtk.c
-src/setup/mconf.c
 src/setup/gnunet-win-tool.c
-src/setup/symbol.c
-src/setup/mconf_textbox.c
-src/setup/mconf_yesno.c
-src/setup/conf.c
-src/setup/wizard_curs.c
-src/setup/recreate.c
-src/setup/mconf_checklist.c
-src/setup/mconf_menubox.c
-src/setup/menu.c
-src/setup/images.c
-src/setup/zconf_tab.c
-src/setup/lex.zconf.c
-src/setup/expr.c
-src/setup/confdata.c
-src/setup/mconf_msgbox.c
-src/setup/mconf_inputbox.c
-src/setup/wizard_util.c
-src/setup/gconf.c
-src/setup/glade_support.c
+src/setup/gtk/gconf.c
+src/setup/gtk/glade_support.c
+src/setup/gtk/images.c
+src/setup/gtk/wizard_gtk.c
+src/setup/text/conf.c
+src/setup/ncurses/mconf.c
+src/setup/ncurses/mconf_checklist.c
+src/setup/ncurses/mconf_inputbox.c
+src/setup/ncurses/mconf_menubox.c
+src/setup/ncurses/mconf_msgbox.c
+src/setup/ncurses/mconf_textbox.c
+src/setup/ncurses/mconf_util.c
+src/setup/ncurses/mconf_yesno.c
+src/setup/ncurses/wizard_curs.c
+src/setup/lib/gns.c
+src/setup/lib/tree.c
 config.h
 libltdl/ltdl.h
 libltdl/config.h
+libwebserver/src/socket.h
+libwebserver/src/outstream.h
+libwebserver/src/clientinfo.h
+libwebserver/src/memory.h
+libwebserver/src/utils.h
+libwebserver/src/client.h
+libwebserver/src/fnmatch.h
+libwebserver/src/web_server.h
+libwebserver/doc/examples/SoundRecorder/include/debug.h
+libwebserver/doc/examples/SoundRecorder/include/soundbuffers.h
+libwebserver/doc/examples/SoundRecorder/include/soundcard.h
+libwebserver/doc/examples/SoundRecorder/include/soundmixer.h
+libwebserver/contrib/help/functions.h
+libwebserver/contrib/help/engine.h
+libwebserver/contrib/help/examples.h
+libwebserver/contrib/help/info.h
+libwebserver/contrib/help/security.h
+libwebserver/contrib/Win32/help/resource.h
+libwebserver/contrib/Win32/dirent.h
+libwebserver/contrib/Win32/flock.h
+libwebserver/include/webserver_gnunet.h
+libwebserver/config.h
 src/transports/ip6.h
 src/transports/ip.h
 src/include/gnunet_core.h
@@ -260,21 +304,27 @@
 src/include/gnunet_blockstore.h
 src/include/gnunet_datastore_service.h
 src/include/gnunet_util_config_impl.h
+src/include/gnunet_util_config.h
+src/include/gnunet_util_getopt.h
 src/include/gnunet_kvstore_service.h
+src/include/gnunet_util_network_client.h
+src/include/gnunet_setup_lib.h
+src/include/gnunet_util_os.h
 src/include/gnunet_util_crypto.h
 src/include/gnunet_util_error.h
 src/include/gnunet_util_network.h
 src/include/gnunet_util_cron.h
 src/include/gnunet_util_threads.h
-src/include/gnunet_util_getopt.h
+src/include/gnunet_util_string.h
 src/include/gnunet_state_service.h
-src/include/gnunet_util_config.h
 src/include/gnunet_util_containers.h
-src/include/gnunet_util_string.h
-src/include/gnunet_util_os.h
 src/include/gnunet_util_disk.h
+src/include/gnunet_directories.h
 src/include/gnunet_util_error_loggers.h
 src/include/gnunet_util_common.h
+src/include/gnunet_collection_lib.h
+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
@@ -306,22 +356,13 @@
 src/server/handler.h
 src/server/version.h
 src/util/crypto/locking_gcrypt.h
-src/setup/gconf_callbacks.h
-src/setup/gconf.h
-src/setup/wizard_gtk.h
-src/setup/wizard_util.h
-src/setup/mconf.h
-src/setup/zconf.tab.h
-src/setup/conf.h
-src/setup/recreate.h
-src/setup/bool.h
-src/setup/lkc_proto.h
-src/setup/wizard_curs.h
-src/setup/zconf_tab.h
-src/setup/lkc.h
-src/setup/lkc_defs.h
-src/setup/expr.h
-src/setup/confdata.h
-src/setup/mconf_dialog.h
-src/setup/mconf_colors.h
-src/setup/glade_support.h
+src/util/network/network.h
+src/setup/gtk/glade_support.h
+src/setup/gtk/gconf.h
+src/setup/gtk/wizard_gtk.h
+src/setup/text/conf.h
+src/setup/ncurses/mconf_colors.h
+src/setup/ncurses/mconf_dialog.h
+src/setup/ncurses/mconf.h
+src/setup/ncurses/wizard_curs.h
+src/setup/lib/tree.h

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2006-09-06 00:19:41 UTC (rev 3363)
+++ GNUnet/po/de.po     2006-09-06 00:21:57 UTC (rev 3364)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-07-24 16:55-0700\n"
+"POT-Creation-Date: 2006-09-05 18:18-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"
@@ -16,93 +16,59 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/transports/ip6.c:60
+#: src/transports/ip6.c:65 src/util/network/io.c:68
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/transports/ip6.c:100
+#: src/transports/ip6.c:109
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
-
-#: src/transports/udp6.c:128 src/transports/udp.c:145
-#, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
-msgstr ""
-"Der Port, an dem Verbindungen entgegengenommen werden sollen, konnte nicht "
-"ermittelt werden. Bitte definieren Sie ihn in der Konfigurationsdatei in der "
-"Sektion `%s' unter `%s' oder in `%s' unter %s/%s.\n"
-
-#: src/transports/udp6.c:164
-#, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
-msgstr "Fehler beim Binden an UDP6 Port %d.\n"
-
-#: src/transports/udp6.c:235
+#: src/transports/ip6.c:154 src/transports/ip.c:353
 #, fuzzy, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-"UDP: select kam zurück aber ioctl berichtet, dass 0 Bytes verfügbar sind!\n"
+msgid "Failed to obtain my (external) %s address!\n"
+msgstr "Fehler beim Bestimmen der (externen) IP-Adresse!\n"
 
-#: src/transports/udp6.c:290
+#: src/transports/udp6.c:126 src/transports/udp.c:128
 #, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr ""
-"Ungültige UDP6 Nachricht von %s:%d empfangen, Nachricht wird ignoriert.\n"
+msgid "Failed to bind to UDP port %d.\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr ""
-"Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
-"schlug fehl."
-
-#: src/transports/udp6.c:334 src/transports/tcp6.c:657
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr "%s: Zurückgewiesene Verbindung von schwarzgelisteter Adresse %s.\n"
-
-#: src/transports/udp6.c:415
+#: src/transports/udp6.c:223
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp6.c:699 src/transports/smtp.c:932
-#: src/transports/udp.c:722
-#, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+#: src/transports/udp6.c:443 src/transports/udp.c:443
+#, fuzzy, c-format
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 "MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
 "implementiert!)\n"
 
-#: src/transports/http.c:601
+#: src/transports/http.c:614
 msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr ""
 "Es wurde eine Willkommensnachricht erwartet, tatsächlich wurde jedoch keine "
 "gesendet. HTTP-Verbindung wird geschlossen.\n"
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#: src/transports/http.c:830
 #, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr ""
 "%s: Abgewiesene Verbindung von schwarzgelisteter Adresse %u.%u.%u.%u.\n"
 
-#: src/transports/http.c:1101
+#: src/transports/http.c:1114
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#: src/transports/http.c:1190 src/transports/tcp.c:254
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/transports/http.c:1333
+#: src/transports/http.c:1346
 #, c-format
 msgid ""
 "Could not bind the HTTP listener to port %d. No transport service started.\n"
@@ -110,29 +76,29 @@
 "HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport Dienst "
 "wurde nicht gestartet.\n"
 
-#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
+#: src/transports/http.c:1469 src/applications/testbed/testbed.c:1054
 #, c-format
 msgid "Could not resolve name of HTTP proxy `%s'.\n"
 msgstr "Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden.\n"
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1492
 msgid "# bytes received via HTTP"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/transports/http.c:1480
+#: src/transports/http.c:1494
 msgid "# bytes sent via HTTP"
 msgstr "# Bytes gesendet über HTTP"
 
-#: src/transports/http.c:1482
+#: src/transports/http.c:1496
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# Bytes verworfen von HTTP"
 
-#: src/transports/smtp.c:297
+#: src/transports/smtp.c:298
 #, c-format
 msgid "Could not resolve name of SMTP server `%s': %s"
 msgstr "Der Name des SMTP servers `%s' konnte nicht aufgelöst werden: %s"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
+#: src/transports/smtp.c:420 src/transports/smtp.c:882
 #, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
@@ -141,33 +107,33 @@
 "Für den SMTP Transport müssen Sie den Namen einer Pipe in Sektion `%s', "
 "Eintrag `%s' eintragen.\n"
 
-#: src/transports/smtp.c:489
+#: src/transports/smtp.c:493
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 "Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
 
-#: src/transports/smtp.c:584
+#: src/transports/smtp.c:588
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 "Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
 "werden.\n"
 
-#: src/transports/smtp.c:591
+#: src/transports/smtp.c:595
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transports/smtp.c:764
+#: src/transports/smtp.c:769
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Das Senden einer E-Mail an `%s' schlug fehl.\n"
 
-#: src/transports/smtp.c:815
+#: src/transports/smtp.c:820
 #, c-format
 msgid "SMTP server send unexpected response at %s:%d.\n"
 msgstr "Der SMTP server sendete eine unerwartete Antwort bei %s:%d.\n"
 
-#: src/transports/smtp.c:838
+#: src/transports/smtp.c:843
 #, c-format
 msgid ""
 "SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
@@ -175,121 +141,95 @@
 "SMTP Server antwortete nicht mit einem 250 Bestätigungscode auf eine `%s' "
 "Anfrage.\n"
 
-#: src/transports/smtp.c:844
+#: src/transports/smtp.c:849
 #, c-format
 msgid "Failed to send `%s' request to SMTP server.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/transports/smtp.c:903
+#: src/transports/smtp.c:909
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s filter %s (SMTP)"
 
-#: src/transports/tcp.c:465
+#: src/transports/smtp.c:938
 #, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
-"Es wurde eine Willkommensnachricht erwartet, über die TCP Verbindung wurde "
-"aber keine gesendet (%u, %u). Verbindung wird geschlossen.\n"
+"MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
+"implementiert!)\n"
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr ""
-"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
-"u) empfangen. Verbindung wird geschlossen.\n"
-
-#: src/transports/tcp.c:1082
+#: src/transports/tcp.c:181
 msgid "Could not determine my public IP address.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:324 src/transports/tcp6.c:333
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transports/tcp.c:1449
+#: src/transports/tcp.c:421
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/tcp.c:1451
+#: src/transports/tcp.c:423
 msgid "# bytes sent via TCP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transports/tcp.c:1453
+#: src/transports/tcp.c:425
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transports/udp.c:179
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
-
-#: src/transports/udp.c:250
-#, fuzzy, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-"UDP: select kam zurück aber ioctl berichtet, dass 0 Bytes verfügbar sind!\n"
-
-#: src/transports/udp.c:307
-#, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr ""
-"Es wurde eine ungültige UDP Nachricht von %u.%u.%u.%u:%u empfangen, "
-"Nachricht wird ignoriert.\n"
-
-#: src/transports/udp.c:332
-#, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
-"Ein Paket empfangen von %u.%u.%u.%u:%u (UDP) hat ein ungültiges Format.\n"
-
-#: src/transports/udp.c:417
+#: src/transports/udp.c:217
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp.c:551
+#: src/transports/udp.c:312
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 "Eine Nachricht der Größe %d konnte nicht per UDP an %u.%u.%u.%u:%u versendet "
 "werden: %s\n"
 
-#: src/transports/udp.c:707
+#: src/transports/udp.c:449
 msgid "# bytes received via UDP"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/transports/udp.c:709
+#: src/transports/udp.c:451
 msgid "# bytes sent via UDP"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transports/udp.c:711
+#: src/transports/udp.c:453
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/transports/ip.c:124
-#, c-format
+#: src/transports/ip.c:92
+#, fuzzy, c-format
+msgid "No interface specified in section `%s' under `%s'!\n"
+msgstr ""
+"Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion `%s' "
+"unter `%s' definiert!\n"
+
+#: src/transports/ip.c:150
+#, fuzzy, c-format
 msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
+"Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr ""
 "Gerät `%s' konnte in `%s' nicht gefunden werden, es wird versucht, ein "
 "anderes Gerät zu finden.\n"
 
-#: src/transports/ip.c:149
+#: src/transports/ip.c:182
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 "Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
 "werden.\n"
 
-#: src/transports/ip.c:193
+#: src/transports/ip.c:226
 #, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/transports/ip.c:203
+#: src/transports/ip.c:236
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -298,45 +238,64 @@
 "Es ist mehr als eine IP-Adresse für das Gerät `%s' angegeben.\n"
 "GNUnet wird %u.%u.%u.%u. verwenden.\n"
 
-#: src/transports/ip.c:224
+#: src/transports/ip.c:257
 #, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr ""
 "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/transports/ip.c:256
+#: src/transports/ip.c:289
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
-msgstr "Fehler beim Bestimmen der (externen) IP-Adresse!\n"
-
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr ""
-"Es wurde eine Willkommensnachricht erwartet, über die TCP Verbindung wurde "
-"jedoch keine gesendet. Verbindung wird geschlossen.\n"
-
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr ""
-"über die TCP6-Verbindung zu einem anderen Knoten wurde eine ungültige "
-"Nachricht empfangen. Verbindung wird geschlossen.\n"
-
-#: src/transports/tcp6.c:958
+#: src/transports/tcp6.c:179
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/tcp6.c:1002
+#: src/transports/tcp6.c:221
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
+#: src/transports/tcp6.c:430
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/transports/tcp6.c:432
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "# Bytes gesendet über TCP"
+
+#: src/transports/tcp6.c:434
+#, fuzzy
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
+
+#: src/transports/tcp_helper.c:182
+#, fuzzy
+msgid "Received malformed message instead of welcome message. Closing.\n"
+msgstr ""
+"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
+"u) empfangen. Verbindung wird geschlossen.\n"
+
+#: src/transports/tcp_helper.c:193
+#, fuzzy
+msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgstr ""
+"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
+"u) empfangen. Verbindung wird geschlossen.\n"
+
+#: src/transports/udp_helper.c:93
+#, fuzzy
+msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgstr ""
+"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:50
-#: src/applications/session/sessiontest.c:48
+#: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:107
 #: src/applications/tbench/tbenchtest_udp.c:107
@@ -345,7 +304,6 @@
 msgstr "# verbundener Knoten"
 
 #: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/session/sessiontest.c:118
 #: src/applications/tbench/tbenchtest.c:199
 #: src/applications/tbench/tbenchtest_udp.c:201
 #: src/applications/gap/gaptest.c:318
@@ -354,7 +312,6 @@
 msgstr "Warte auf den Start von gnunetd (%u Iterationen verbleiben)...\n"
 
 #: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/session/sessiontest.c:133
 #: src/applications/tbench/tbenchtest.c:122
 #: src/applications/tbench/tbenchtest_udp.c:122
 #: src/applications/gap/gaptest.c:330
@@ -377,28 +334,8 @@
 msgstr "Eine DHT Tabelle abfragen (get KEY, put KEY VALUE, remove KEY VALUE)."
 
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85
-#: src/applications/tbench/gnunet-tbench.c:124
-#: src/applications/tbench/gnunet-tbench.c:134
-#: src/applications/tbench/gnunet-tbench.c:147
-#: src/applications/tbench/gnunet-tbench.c:157
-#: src/applications/tbench/gnunet-tbench.c:167
-#: src/applications/tbench/gnunet-tbench.c:182
-#: src/applications/tracekit/gnunet-tracekit.c:73
-#: src/applications/tracekit/gnunet-tracekit.c:87
-#: src/applications/tracekit/gnunet-tracekit.c:122
-#: src/applications/tracekit/gnunet-tracekit.c:136
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/server/gnunet-transport-check.c:448
-#: src/server/gnunet-transport-check.c:462
-#: src/server/gnunet-transport-check.c:479
-#: src/server/gnunet-transport-check.c:509
+#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
+#: src/util/getopt/setoption.c:149
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
@@ -408,21 +345,8 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
-#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
-#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
-#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
+#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
+#: src/setup/gnunet-setup.c:246
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
@@ -594,7 +518,7 @@
 
 #: src/applications/dht/module/dht.c:1603
 #: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "`%s' mit einem Timeout von über einer Stunde aufgerufen (Fehler?)\n"
@@ -677,7 +601,7 @@
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "`%s' registriert Handler %d und %d\n"
 
-#: src/applications/chat/chat.c:212
+#: src/applications/chat/chat.c:216
 msgid "enables P2P-chat (incomplete)"
 msgstr "Ermöglicht P2P-Chat"
 
@@ -690,9 +614,6 @@
 msgstr "GNUnet chat client starten"
 
 #: src/applications/chat/gnunet-chat.c:151
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363
-#: src/applications/fs/tools/gnunet-delete.c:142
 msgid "Could not connect to gnunetd.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
@@ -709,110 +630,99 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/applications/advertising/advertising.c:162
 #, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr ""
 "Hello Nachricht von `%s' ist ungültig (Signatur ist ungültig). Nachricht "
 "wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:167
+#: src/applications/advertising/advertising.c:168
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
 "Empfangene Hello Nachricht ist ungültig (Ablaufzeit über Limit). Nachricht "
 "wurde verworfen.\n"
 
-#: src/applications/advertising/advertising.c:176
+#: src/applications/advertising/advertising.c:177
 #, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr "Hello Ankündigung für Protokoll %d empfangen.\n"
 
-#: src/applications/advertising/advertising.c:295
+#: src/applications/advertising/advertising.c:297
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr "Hellos+PING konnten nicht gesendet werden, Ping Puffer ist voll.\n"
 
-#: src/applications/advertising/advertising.c:308
+#: src/applications/advertising/advertising.c:310
 #, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "`%s' fehlgeschlagen (%d, %u). PING wird nicht gesendet.\n"
 
-#: src/applications/advertising/advertising.c:463
+#: src/applications/advertising/advertising.c:467
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
 
-#: src/applications/advertising/advertising.c:470
+#: src/applications/advertising/advertising.c:474
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 "Bekanntmachung von uns zwecklos: bis jetzt sind uns keine anderen Knoten "
 "bekannt.\n"
 
-#: src/applications/advertising/advertising.c:572
+#: src/applications/advertising/advertising.c:580
 #, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr "Hello von Knoten `%s' wird entfernt (lief vor %ds ab).\n"
 
-#: src/applications/advertising/advertising.c:734
+#: src/applications/advertising/advertising.c:760
 msgid "# Peer advertisements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/applications/advertising/advertising.c:735
+#: src/applications/advertising/advertising.c:761
 msgid "# Self advertisments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/applications/advertising/advertising.c:736
+#: src/applications/advertising/advertising.c:762
 msgid "# Foreign advertisements forwarded"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/applications/advertising/advertising.c:738
-#: src/applications/pingpong/pingpong.c:462
+#: src/applications/advertising/advertising.c:764
+#: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/applications/advertising/advertising.c:742
-#: src/applications/session/connect.c:752
+#: src/applications/advertising/advertising.c:768
+#: src/applications/session/connect.c:779
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
 
-#: src/applications/advertising/advertising.c:761
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
-
-#: src/applications/advertising/advertising.c:781
+#: src/applications/advertising/advertising.c:785
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 "Stellt sicher, dass dieser Knoten anderen Knoten bekannt ist und entdeckt "
 "andere Knoten"
 
-#: src/applications/topology_default/topology.c:398
+#: src/applications/pingpong/pingpong.c:123
+#: src/applications/pingpong/pingpong.c:191
+#: src/applications/pingpong/pingpong.c:244
+#: src/applications/pingpong/pingpong.c:313
 #, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
-msgstr ""
-"Versionen stimmen nicht überein (`%s' vs. '%*.s'), lassen Sie gnunet-update "
-"laufen!\n"
-
-#: src/applications/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
-#, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Beschädigte `%s' Nachricht empfangen. Nachricht wird verworfen.\n"
 
-#: src/applications/pingpong/pingpong.c:130
+#: src/applications/pingpong/pingpong.c:135
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Ping für einen anderen Knoten empfangen. Ping wird verworfen.\n"
 
-#: src/applications/pingpong/pingpong.c:187
+#: src/applications/pingpong/pingpong.c:201
 msgid "Received PING not destined for us!\n"
 msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
 
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/pingpong/pingpong.c:286
+#: src/applications/pingpong/pingpong.c:349
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
@@ -820,155 +730,146 @@
 "PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante "
 "MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/pingpong/pingpong.c:366
+#: src/applications/pingpong/pingpong.c:390
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 "PING konnte nicht erstellt werden, da die Tabelle voll ist. Versuchen Sie, "
 "die Konstante MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/pingpong/pingpong.c:452
+#: src/applications/pingpong/pingpong.c:478
 msgid "# encrypted PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:454
+#: src/applications/pingpong/pingpong.c:480
 msgid "# plaintext PONG messages received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:456
+#: src/applications/pingpong/pingpong.c:482
 msgid "# encrypted PING messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:458
+#: src/applications/pingpong/pingpong.c:484
 msgid "# PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/applications/pingpong/pingpong.c:460
+#: src/applications/pingpong/pingpong.c:486
 msgid "# encrypted PONG messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:464
+#: src/applications/pingpong/pingpong.c:490
 msgid "# encrypted PING messages sent"
 msgstr "# verschlüsselter PING Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:500
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "`%s' registriert Handler %d %d (Plaintext und Ciphertext)\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_sqlite/sqlite.c:45
+#: src/applications/sqstore_sqlite/sqlite.c:52
 #: src/applications/sqstore_mysql/mysql.c:137
 #: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/kvstore_sqlite/kv_sqlite.c:43
-#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/applications/sqstore_mysql/mysql.c:389
+#: src/applications/sqstore_mysql/mysql.c:728
+#: src/applications/sqstore_mysql/mysql.c:743
+#: src/applications/sqstore_mysql/mysql.c:752
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:786
+#: src/applications/sqstore_mysql/mysql.c:840
+#: src/applications/sqstore_mysql/mysql.c:925
+#: src/applications/sqstore_mysql/mysql.c:935
+#: src/applications/sqstore_mysql/mysql.c:1007
+#: src/applications/sqstore_mysql/mysql.c:1016
+#: src/applications/sqstore_mysql/mysql.c:1056
+#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
+#: src/applications/sqstore_sqlite/sqlite.c:158
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_sqlite/sqlite.c:307
+#: src/applications/sqstore_sqlite/sqlite.c:327
 #: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
+#: src/applications/sqstore_mysql/mysql.c:803
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
+#: src/applications/sqstore_sqlite/sqlite.c:308
+#: src/applications/sqstore_sqlite/sqlite.c:328
 msgid "sqlite datastore"
 msgstr "sqlite Datenspeicher"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1035
-#, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
-msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
-
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-#: src/applications/sqstore_mysql/mysql.c:1178
+#: src/applications/sqstore_sqlite/sqlite.c:1177
+#: src/applications/sqstore_mysql/mysql.c:1182
 msgid "# bytes in datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "Konnte libgnunetutil nicht initialisieren!\n"
-
-#: src/applications/session/connect.c:209
+#: src/applications/session/connect.c:221
 #, 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:246
+#: src/applications/session/connect.c:258
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr ""
 "Sitzungsschlüssel kann nicht verschlüsselt werden, der andere Knoten ist uns "
 "nicht bekannt!\n"
 
-#: src/applications/session/connect.c:523
+#: src/applications/session/connect.c:517
+#, 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:540
 #, 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:532
+#: src/applications/session/connect.c:550
 #, 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:587
+#: src/applications/session/connect.c:608
 msgid ""
 "Error parsing encrypted session key, 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:597
+#: src/applications/session/connect.c:619
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr "Unbekannter Typ in engebetteter Nachricht: %u (%u bytes)\n"
 
-#: src/applications/session/connect.c:742
+#: src/applications/session/connect.c:768
 msgid "# session keys sent"
 msgstr "# Sitzungsschlüssel gesendet"
 
-#: src/applications/session/connect.c:744
+#: src/applications/session/connect.c:770
 msgid "# session keys rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/applications/session/connect.c:746
+#: src/applications/session/connect.c:772
 msgid "# session keys accepted"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/applications/session/connect.c:748
+#: src/applications/session/connect.c:774
 msgid "# sessions established"
 msgstr "# Sitzungen aufgebaut"
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
@@ -977,7 +878,7 @@
 "%s::%s - RPC %s:%p konnte nicht registriert werden: ein anderer Callback "
 "verwendet bereits diesen Namen (%p)\n"
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
@@ -986,67 +887,67 @@
 "%s::%s - RPC %s:%p konnte nicht unregistriert werden: ein anderer Callback "
 "ist unter diesem Namen registiert: %p\n"
 
-#: src/applications/rpc/rpc.c:232
+#: src/applications/rpc/rpc.c:233
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/rpc/rpc.c:280
 #, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 "%s::%s - async RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
+#: src/applications/rpc/rpc.c:1100
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/rpc/rpc.c:945
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "RPC Anfrage %u wird verworfen: Nachricht ist beschädigt.\n"
 
-#: src/applications/rpc/rpc.c:1388
+#: src/applications/rpc/rpc.c:1414
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "RPC nicht unregistriert: %s:%p\n"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1441
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "`%s' registriert Handler %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/rpc/rpc.c:1462
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/applications/rpc/rpc.c:1491
+#: src/applications/rpc/rpc.c:1519
 msgid "RPC async reply invalid.\n"
 msgstr "RPC async Antwort ungültig.\n"
 
-#: src/applications/rpc/rpc.c:1562
+#: src/applications/rpc/rpc.c:1591
 msgid "async RPC reply not received.\n"
 msgstr "async RPC Antwort nicht empfangen.\n"
 
 #: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
+#: src/applications/sqstore_mysql/mysql.c:804
 msgid "mysql datastore"
 msgstr "mysql Datenspeicher"
 
-#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1110
 #, c-format
 msgid "Query `%s' had no results.\n"
 msgstr "Abfrage `%s' hatte keine Ergebnisse.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1205
+#: src/applications/sqstore_mysql/mysql.c:1212
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1223
+#: src/applications/sqstore_mysql/mysql.c:1230
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -1054,37 +955,28 @@
 "Fehler beim Laden des MySQL Datenbankmoduls. Prüfen Sie, ob MySQL läuft und "
 "richtig eingerichtet ist!\n"
 
-#: src/applications/datastore/filter.c:42
+#: src/applications/datastore/datastore.c:119
 #, c-format
-msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
-msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"für FS Daten angeben.\n"
-
-#: src/applications/datastore/datastore.c:118
-#, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Verfügbarkeitstest für `%s' fehlgeschlagen bei %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:142
+#: src/applications/datastore/datastore.c:143
 #, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
 
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1086
-#: src/applications/fs/fsui/file_info.c:66
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s\n"
-msgstr ""
-"Die Konfigurationsdatei muss unter %s%s ein Verzeichnis angeben, in dem "
-"GNUnet knotenspezifische Daten speichern kann.\n"
+#: src/applications/datastore/datastore.c:358
+#: src/applications/datastore/datastore.c:454
+#, fuzzy
+msgid "Failed to load state service. Trying to do without.\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/identity/hostkey.c:109
+#, fuzzy, c-format
+msgid "Failed to access GNUnet home directory `%s'\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/applications/identity/hostkey.c:139
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -1092,19 +984,15 @@
 "Formatüberprüfung schlug für die existierende Hostkeydatei `%s' fehl, es "
 "wird ein neuer Hostkey erzeugt.\n"
 
-#: src/applications/identity/hostkey.c:127
+#: src/applications/identity/hostkey.c:147
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
-msgstr "Hostkey konnte nicht erzeugt werden!\n"
-
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:160
 msgid "Done creating hostkey.\n"
 msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
-#: src/applications/identity/identity.c:333
+#: src/applications/identity/identity.c:346
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -1112,36 +1000,44 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/applications/identity/identity.c:366
-#, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "%s `%s' ergab keine bekannten Knoten!\n"
+#: src/applications/identity/identity.c:359
+#, fuzzy, c-format
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
+"Datei wurde entfernt.\n"
 
-#: src/applications/identity/identity.c:648
-#: src/applications/identity/identity.c:666
+#: src/applications/identity/identity.c:396
+#, fuzzy, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+
+#: src/applications/identity/identity.c:684
+#: src/applications/identity/identity.c:705
 #, c-format
 msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr "Datei `%s' enthielt ungültige Hello Daten und wurde entfernt.\n"
 
-#: src/applications/identity/identity.c:716
+#: src/applications/identity/identity.c:758
 #, fuzzy, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 "Signatur kann nicht verifiziert werden, der andere Knoten ist uns nicht "
 "bekannt!\n"
 
-#: src/applications/identity/identity.c:724
+#: src/applications/identity/identity.c:767
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Verifikation einer Signatur fehlgeschlagen: Signatur ist ungültig.\n"
 
 #: src/applications/testbed/commands.c:1130
-#: src/applications/stats/gnunet-stats.c:61
+#: src/applications/stats/gnunet-stats.c:63
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr "unterstützte Peer-to-Peer Nachrichten:\n"
 
 #: src/applications/testbed/commands.c:1132
-#: src/applications/stats/gnunet-stats.c:64
+#: src/applications/stats/gnunet-stats.c:66
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr "unterstützte Client-Server Nachrichten:\n"
@@ -1174,7 +1070,7 @@
 "wurde nicht gestartet.\n"
 "Erneuter Versuch in %d Sekunden...\n"
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#: src/applications/testbed/gnunet-testbed.c:415
 #, c-format
 msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr "Unauthorisierte Verbindung von %u.%u.%u.%u. wurde abgewiesen.\n"
@@ -1302,7 +1198,6 @@
 "Keine Testbed URL angegeben, es wurde keine Registrierung vorgenommen.\n"
 
 #: src/applications/testbed/testbed.c:1079
-#: src/applications/bootstrap_http/http.c:81
 #, c-format
 msgid "Invalid URL `%s' (must begin with `%s')\n"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
@@ -1334,80 +1229,101 @@
 msgid "Exit register (error: no http response read).\n"
 msgstr "Abbruch der Registrierung (Fehler: keine HTTP Antwort gelesen).\n"
 
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1361
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr "Ermöglicht die Konstruktion einer P2P-Testumgebung (inkomplett)"
 
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/applications/transport/transport.c:136
 #, c-format
-msgid "No transport of type %d known.\n"
-msgstr "Kein Transport des Typs %d bekannt.\n"
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
+msgstr ""
 
-#: src/applications/transport/transport.c:676
+#: src/applications/transport/transport.c:183
 #, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
-"Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
-"gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: src/applications/transport/transport.c:691
+#: src/applications/transport/transport.c:278
+#, fuzzy, c-format
+msgid "Transmission attempt failed, transport type %d unknown.\n"
+msgstr "Kein Transport des Typs %d bekannt.\n"
+
+#: src/applications/transport/transport.c:366
 #, c-format
-msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
+msgid "No transport of type %d known.\n"
+msgstr "Kein Transport des Typs %d bekannt.\n"
+
+#: src/applications/transport/transport.c:423
+msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
-"Sie sollten mindestens einen Transport Dienst unter der Option `%s' in der "
-"Sektion `%s' angegeben.\n"
 
-#: src/applications/transport/transport.c:717
+#: src/applications/transport/transport.c:596
+#, fuzzy, c-format
+msgid "Loading transports `%s'\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/applications/transport/transport.c:616
+#, fuzzy, c-format
+msgid "Could not load transport plugin `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/applications/transport/transport.c:626
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 "Transport Bibliothek `%s' stellt nicht die benötigte Funktion '%s%s' zur "
 "Verfügung.\n"
 
-#: src/applications/transport/transport.c:738
+#: src/applications/transport/transport.c:643
+#, fuzzy, c-format
+msgid "Loaded transport `%s'\n"
+msgstr "Verfügbare(r) Transport(e): %s\n"
+
+#: src/applications/transport/transport.c:654
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:559
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:560
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:561
 msgid "# fragments discarded"
 msgstr "# verworfener Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/fragmentation/fragmentation.c:573
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "`%s' registriert Handler %d\n"
 
+#: src/applications/stats/gnunet-stats.c:90
+msgid "Print statistics about GNUnet operations."
+msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
+
 #: src/applications/stats/gnunet-stats.c:94
 msgid "prints supported protocol messages"
 msgstr "gibt unterstützte Protokollnachrichten aus"
 
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
-msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
-
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/stats/gnunet-stats.c:137
+#: src/applications/tbench/gnunet-tbench.c:136
+#: src/applications/tracekit/gnunet-tracekit.c:319
+#: src/applications/template/gnunet-template.c:101
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/stats/gnunet-stats.c:156
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/applications/stats/clientapi.c:179
+#: src/applications/stats/clientapi.c:180
 msgid "Uptime (seconds)"
 msgstr "Laufzeit (Sekunden)"
 
@@ -1430,112 +1346,119 @@
 msgid "# bytes of noise received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/applications/stats/statistics.c:374
+#: src/applications/stats/statistics.c:364
+#, fuzzy, c-format
+msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
+msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
+
+#: src/applications/stats/statistics.c:385
 msgid "keeps statistics about gnunetd's operation"
 msgstr "Hält Statistiken über Betrieb von gnunetd"
 
-#: src/applications/tbench/gnunet-tbench.c:95
+#: src/applications/tbench/gnunet-tbench.c:65
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
+msgstr "GNUnet Transport Benchmarking Werkzeug starten."
+
+#: src/applications/tbench/gnunet-tbench.c:67
 msgid "output in gnuplot format"
 msgstr "Ausgabe im gnuplot Format"
 
-#: src/applications/tbench/gnunet-tbench.c:98
+#: src/applications/tbench/gnunet-tbench.c:71
 msgid "number of iterations"
 msgstr "Anzahl an Durchläufen"
 
-#: src/applications/tbench/gnunet-tbench.c:100
+#: src/applications/tbench/gnunet-tbench.c:75
 msgid "number of messages to use per iteration"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/applications/tbench/gnunet-tbench.c:102
+#: src/applications/tbench/gnunet-tbench.c:78
 msgid "receiver host identifier (ENC file name)"
 msgstr "Bezeichner des Empfängerhosts (ENC Dateiname)"
 
-#: src/applications/tbench/gnunet-tbench.c:104
+#: src/applications/tbench/gnunet-tbench.c:81
 msgid "message size"
 msgstr "Nachrichtengröße"
 
-#: src/applications/tbench/gnunet-tbench.c:106
+#: src/applications/tbench/gnunet-tbench.c:84
 msgid "sleep for SPACE ms after each a message block"
 msgstr "Für SPACE ms nach jedem Nachrichtenblock pausieren"
 
-#: src/applications/tbench/gnunet-tbench.c:108
+#: src/applications/tbench/gnunet-tbench.c:87
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/applications/tbench/gnunet-tbench.c:111
+#: src/applications/tbench/gnunet-tbench.c:91
 msgid "number of messages in a message block"
 msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
-msgstr "GNUnet Transport Benchmarking Werkzeug starten."
-
-#: src/applications/tbench/gnunet-tbench.c:225
+#: src/applications/tbench/gnunet-tbench.c:153
+#, c-format
 msgid "You must specify a receiver!\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/tbench/gnunet-tbench.c:162
 #, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 "Ungültige Empfängerknoten ID angegeben (`%s' ist kein gültiger Name).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:249
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "Time:\n"
 msgstr "Zeit:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:250
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tMax      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tMin      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:254
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "\tMittel   %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "\tVarianz  %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:259
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "Loss:\n"
 msgstr "Verlust:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/tbench/gnunet-tbench.c:200
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tMax      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:262
+#: src/applications/tbench/gnunet-tbench.c:202
 #, c-format
 msgid "\tmin      %u\n"
 msgstr "\tMin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:264
+#: src/applications/tbench/gnunet-tbench.c:204
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "\tMittel   %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/tbench/gnunet-tbench.c:206
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "\tVarianz %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/applications/tbench/gnunet-tbench.c:215
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/tbench/gnunet-tbench.c:219
 #, c-format
 msgid ""
 "\n"
@@ -1578,38 +1501,29 @@
 msgid "Running benchmark...\n"
 msgstr "Benchmark läuft...\n"
 
-#: src/applications/tbench/tbench.c:448
+#: src/applications/tbench/tbench.c:460
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr "Ermöglicht das Untersuchen direkter Peer-to-Peer Verbindungen"
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
+#: src/applications/tracekit/gnunet-tracekit.c:49
 msgid "probe network to the given DEPTH"
 msgstr "Netzwerk bis zur angegebenen Tiefe DEPTH sondieren"
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
+#: src/applications/tracekit/gnunet-tracekit.c:52
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr "Gibt das Ausgabeformat an: 0 für menschen-lesbar, 1 für dot, 2 für vcg"
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
+#: src/applications/tracekit/gnunet-tracekit.c:58
 msgid "use PRIO for the priority of the trace request"
 msgstr "PRIO als Priorität für die Trace Anfragen verwenden"
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
+#: src/applications/tracekit/gnunet-tracekit.c:62
 msgid "wait DELAY seconds for replies"
 msgstr "DELAY Sekunden auf Antworten warten"
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
-msgstr "GNUnet Netzwerk Topologie tracen."
-
-#: src/applications/tracekit/gnunet-tracekit.c:222
+#: src/applications/tracekit/gnunet-tracekit.c:116
 #, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "`%s' ist zu keinem Knoten verbunden.\n"
-
-#: src/applications/tracekit/gnunet-tracekit.c:233
-#, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
 "vcg.\n"
@@ -1617,151 +1531,156 @@
 "Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar, 1 für dot und 2 "
 "für vcg.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
+#: src/applications/tracekit/gnunet-tracekit.c:163
 #, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "`%s' ist zu keinem Knoten verbunden.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:197
+#, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/applications/tracekit/gnunet-tracekit.c:212
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 "Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar und 1 für dot\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
+#: src/applications/tracekit/gnunet-tracekit.c:235
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "Knoten `%s' hat sich nicht zurückgemeldet.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
+#: src/applications/tracekit/gnunet-tracekit.c:350
 msgid "Could not send request to gnunetd.\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
+#: src/applications/tracekit/tracekit.c:68
+#: src/applications/tracekit/tracekit.c:201
 #, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/applications/tracekit/tracekit.c:243
+#: src/applications/tracekit/tracekit.c:263
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr "TRACEKIT: Routing-Tabelle ist voll, Trace-Anfrage wird verworfen\n"
 
-#: src/applications/tracekit/tracekit.c:331
+#: src/applications/tracekit/tracekit.c:354
 #, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr "TRACEKIT: ungültige `%s' Nachricht empfangen\n"
 
-#: src/applications/tracekit/tracekit.c:431
+#: src/applications/tracekit/tracekit.c:461
 msgid "allows mapping of the network topology"
 msgstr "Erlaubt die Kartographierung der Netzwerktopologie"
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/gap/gap.c:1635
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/applications/gap/gap.c:1618
+#: src/applications/gap/gap.c:1636
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1791
+#: src/applications/gap/gap.c:1809
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
 "nicht geladen. Anfrage wird abgelehnt.\n"
 
-#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1820 src/applications/fs/module/anonymity.c:66
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
+#: src/applications/gap/gap.c:1826 src/applications/gap/gap.c:1831
+#: src/applications/gap/gap.c:1837
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 "Gewünschter Grad an Anonymität kann nicht erreicht werden, Anfrage wird "
 "ignoriert.\n"
 
-#: src/applications/gap/gap.c:2077
+#: src/applications/gap/gap.c:2116
 msgid "# gap requests total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/applications/gap/gap.c:2078
+#: src/applications/gap/gap.c:2117
 msgid "# gap requests policy: immediate drop"
 msgstr "# gap Anfragen mit taktischer Entscheidung: sofortiges Verwerfen"
 
-#: src/applications/gap/gap.c:2079
+#: src/applications/gap/gap.c:2118
 msgid "# gap requests policy: not routed"
 msgstr "# gap Anfragen mit taktischer Entscheidung: kein Routing"
 
-#: src/applications/gap/gap.c:2080
+#: src/applications/gap/gap.c:2119
 msgid "# gap requests policy: not answered"
 msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
 
-#: src/applications/gap/gap.c:2081
+#: src/applications/gap/gap.c:2120
 msgid "# gap requests processed: attempted add to RT"
 msgstr "# gap Anfragen verarbeitet: versucht, der RT hinzuzufügen"
 
-#: src/applications/gap/gap.c:2082
+#: src/applications/gap/gap.c:2121
 msgid "# gap requests processed: local result"
 msgstr "# gap Anfragen verarbeitet: lokales Ergebnis"
 
-#: src/applications/gap/gap.c:2083
+#: src/applications/gap/gap.c:2122
 msgid "# gap routing successes (total)"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/applications/gap/gap.c:2084
+#: src/applications/gap/gap.c:2123
 msgid "# gap requests dropped: collision in RT"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/applications/gap/gap.c:2085
+#: src/applications/gap/gap.c:2124
 msgid "# gap requests forwarded (counting each peer)"
 msgstr "#gap Anfragen weitergeleitet (jeder Knoten gezählt)"
 
-#: src/applications/gap/gap.c:2086
+#: src/applications/gap/gap.c:2125
 msgid "# gap duplicate requests (pending)"
 msgstr "# gap doppelte Anfragen (unfertig)"
 
-#: src/applications/gap/gap.c:2087
+#: src/applications/gap/gap.c:2126
 msgid "# gap duplicate requests that were re-tried"
 msgstr "# gap doppelte Anfragen, die wiederholt wurden"
 
-#: src/applications/gap/gap.c:2088
+#: src/applications/gap/gap.c:2127
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr "# gap Wiederholungs-TTL-Differenz (kummulativ)"
 
-#: src/applications/gap/gap.c:2089
+#: src/applications/gap/gap.c:2128
 msgid "# gap reply duplicates"
 msgstr "#gap doppelte Antworten"
 
-#: src/applications/gap/gap.c:2090
+#: src/applications/gap/gap.c:2129
 msgid "# gap spurious replies"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/gap/gap.c:2091
+#: src/applications/gap/gap.c:2130
 msgid "# gap routing slots currently in use"
 msgstr "# gap Routingschächte im Moment in Verwendung"
 
-#: src/applications/gap/gap.c:2092
+#: src/applications/gap/gap.c:2131
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2093
+#: src/applications/gap/gap.c:2132
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2094
+#: src/applications/gap/gap.c:2133
 #, fuzzy
 msgid "# gap rewards pending"
 msgstr "# gap doppelte Anfragen (unfertig)"
 
-#: src/applications/gap/gap.c:2095
+#: src/applications/gap/gap.c:2134
 #, fuzzy
 msgid "# gap response weights"
 msgstr "# gap falsche Antworten"
 
-#: src/applications/gap/gap.c:2112
+#: src/applications/gap/gap.c:2150
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
@@ -1769,53 +1688,62 @@
 "Verkehrsdienst konnte nicht geladen werden, GAP kann keinen verdeckenden "
 "Netzwerkverkehr sicherstellen.\n"
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/gap/gap.c:2178
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "`%s' registriert Handler %d %d\n"
 
-#: src/applications/gap/pid_table.c:151
+#: src/applications/gap/pid_table.c:156
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:153
+#: src/applications/gap/pid_table.c:158
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/getoption/getoption.c:74
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr "`%s' registriert Client-Handler %d\n"
 
-#: src/applications/getoption/getoption.c:82
+#: src/applications/getoption/getoption.c:84
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:71
+#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-search.c:129
+#: src/applications/fs/tools/gnunet-download.c:57
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:35
+#: src/applications/fs/tools/gnunet-pseudonym.c:74
 msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 "Erstellung eines Namespaces durch das Anfangen einer Collection "
 "automatisieren"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
+#: src/applications/fs/tools/gnunet-pseudonym.c:78
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "Neues Pseudonym unter dem angegebenen NICKNAME erstellen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
+#: src/applications/fs/tools/gnunet-pseudonym.c:81
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "Pseudonym mit dem angegeben NICKNAME löschen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
+#: src/applications/fs/tools/gnunet-pseudonym.c:84
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 "Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
+#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-search.c:132
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr ""
+"Erstellen von neuen Pseudonymen, Löschen von Pseudonymen und Auflisten von "
+"bestehenden Pseudonymen."
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -1823,15 +1751,13 @@
 "Das angegebene schlüsselwort verwenden, um den Namespace bekanntzumachen (zu "
 "verwenden, wenn ein neues Pseudonym erstellt wird)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
+#, fuzzy
+msgid "specify metadata describing the namespace or collection"
 msgstr ""
-"Angeben, dass die Inhalte des Namespaces vom angegebenen MIMETYOE sind (zu "
-"verwenden, wenn ein neues Pseudonym erstellt wird)"
+"Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
+#: src/applications/fs/tools/gnunet-pseudonym.c:95
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -1839,247 +1765,161 @@
 "Keine Bekanntmachung für diesen Namespace erstellen (zu verwenden, wenn ein "
 "neues Pseudonym erstellt wird)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
+#: src/applications/fs/tools/gnunet-pseudonym.c:98
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr "Keine Ausgabe der Pseudonyme in der Pseudonymdatenbank"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
+#: src/applications/fs/tools/gnunet-pseudonym.c:101
 msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr ""
-"NAME als den Realnamen des Benutzers angeben, der den Namespace verwaltet "
-"(zu verwenden, wenn ein neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
 msgstr ""
 "IDENTIFIER als Adresse angeben, die der Einsprungspunkt zu den Inhalten im "
 "Namespace ist (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
+#: src/applications/fs/tools/gnunet-pseudonym.c:104
 msgid "set the rating of a namespace"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr ""
-"DESCRIPTION als Beschreibung der Inhalte des Namespaces verwenden (zu "
-"verwenden, wenn ein neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"die angegebene URI als die Adresse angeben, die weitere Informationen über "
-"den Namespace enthält (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr ""
-"Erstellen von neuen Pseudonymen, Löschen von Pseudonymen und Auflisten von "
-"bestehenden Pseudonymen."
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-msgid "AND"
-msgstr "UND"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#: src/applications/fs/tools/gnunet-pseudonym.c:138
 #, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
-#: src/setup/gnunet-setup.c:179
-msgid "Invalid arguments. Exiting.\n"
-msgstr "Ungültige Parameter. Abbruch.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:142
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "Namespace `%s' (%s) hat das Rating %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#: src/applications/fs/tools/gnunet-pseudonym.c:178
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "\tRating (nach Update): %d\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Collection beendet.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#: src/applications/fs/tools/gnunet-pseudonym.c:223
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr "Fehler beim Beenden der Collection (nicht aktiv?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#: src/applications/fs/tools/gnunet-pseudonym.c:231
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#: src/applications/fs/tools/gnunet-pseudonym.c:235
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#: src/applications/fs/tools/gnunet-pseudonym.c:254
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#: src/applications/fs/tools/gnunet-pseudonym.c:257
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#: src/applications/fs/tools/gnunet-pseudonym.c:299
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#: src/applications/fs/tools/gnunet-pseudonym.c:304
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Namespace `%s' wurde erstellt (Root: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#: src/applications/fs/tools/gnunet-pseudonym.c:326
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/applications/fs/tools/gnunet-delete.c:37
+#: src/applications/fs/tools/gnunet-directory.c:83
 #, c-format
-msgid "%8u of %8u bytes deleted."
-msgstr "%8u von %8u Bytes gelöscht."
-
-#: src/applications/fs/tools/gnunet-delete.c:52
-msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-msgstr ""
-"vom GNUnet zu löschende Datei angeben (obgligatorisch, Datei muss existieren)"
-
-#: src/applications/fs/tools/gnunet-delete.c:61
-msgid ""
-"Remove file from GNUnet.  The specified file is not removed\n"
-"from the filesystem but just from the local GNUnet datastore."
-msgstr ""
-"Datei auf GNUnet löschen. Die angegebene Datei wird nicht aus dem "
-"Dateisystem gelöscht, sondern aus dem lokalen GNUnet Datenspeicher."
-
-#: src/applications/fs/tools/gnunet-delete.c:139
-msgid "You must specify a filename (option -f)\n"
-msgstr "Sie müssen eine Datei angeben (Option -f)\n"
-
-#: src/applications/fs/tools/gnunet-delete.c:151
-#, c-format
-msgid ""
-"Error deleting file %s.\n"
-"Probably a few blocks were already missing from the database.\n"
-msgstr ""
-"Fehler beim Löschen der Datei %s.\n"
-"Möglicherweise fehlen bereits einige wenige Datenblöcke in der Datenbank.\n"
-
-#: src/applications/fs/tools/gnunet-directory.c:76
-#, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:81
+#: src/applications/fs/tools/gnunet-directory.c:90
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:111
+#: src/applications/fs/tools/gnunet-directory.c:124
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:113
+#: src/applications/fs/tools/gnunet-directory.c:126
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "%d Dateien im Verzeichnis gefunden.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:141
+msgid "Perform directory related operations."
+msgstr "Verzeichnisbezogene Operationen durchführen."
+
+#: src/applications/fs/tools/gnunet-directory.c:143
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 "Alle Einträge aus der Verzeichnis Datenbank löschen und das Verfolgen von "
 "URIs abbrechen"
 
-#: src/applications/fs/tools/gnunet-directory.c:133
+#: src/applications/fs/tools/gnunet-directory.c:147
 msgid "list entries from the directory database"
 msgstr "Einträge aus der Verzeichnis Datenbank auflisten"
 
-#: src/applications/fs/tools/gnunet-directory.c:136
+#: src/applications/fs/tools/gnunet-directory.c:150
 msgid "start tracking entries for the directory database"
 msgstr "Anfangen, Einträge für die Verzeichnis Datenbank zu verfolgen"
 
-#: src/applications/fs/tools/gnunet-directory.c:140
-msgid "gnunet-directory [OPTIONS] [FILENAMES]"
-msgstr "gnunet-directory [OPTIONEN] [DATEINAMEN]"
-
-#: src/applications/fs/tools/gnunet-directory.c:141
-msgid "Perform directory related operations."
-msgstr "Verzeichnisbezogene Operationen durchführen."
-
-#: src/applications/fs/tools/gnunet-directory.c:206
+#: src/applications/fs/tools/gnunet-directory.c:181
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "%d übereinstimmende Einträge aufgelistet.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:110
+#: src/applications/fs/tools/gnunet-insert.c:139
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Eintag `%s' in Namespace `%s' wurde erstellt\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:115
+#: src/applications/fs/tools/gnunet-insert.c:144
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 "er?)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:136
-#, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
+#: src/applications/fs/tools/gnunet-insert.c:166
+#, fuzzy, c-format
+msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu von %16llu Bytes eingefügt (geschätzte %s bis Fertigstellung)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:150
+#: src/applications/fs/tools/gnunet-insert.c:178
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Upload von `%s' komplett, %llu Bytes brauchten %llu Sekunden (%8.3f KB/s).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:164
-#, fuzzy, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
-msgstr ""
-"Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
-"beträgt %8.3f KB/s.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:174
+#: src/applications/fs/tools/gnunet-insert.c:189
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:187
+#: src/applications/fs/tools/gnunet-insert.c:200
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr "Download abgebrochen."
+
+#: src/applications/fs/tools/gnunet-insert.c:206
 #, c-format
 msgid ""
 "\n"
@@ -2088,7 +1928,7 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:209
+#: src/applications/fs/tools/gnunet-insert.c:228
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
@@ -2097,14 +1937,18 @@
 "anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis "
 "erzwingen."
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:232
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:235
 msgid ""
 "use libextractor to add additional direct references to directory entries"
 msgstr ""
 "benutze libextractor um weitere direkte Referenzen zu Dateien in "
 "Verzeichnissen zu erzeugen"
 
-#: src/applications/fs/tools/gnunet-insert.c:214
+#: src/applications/fs/tools/gnunet-insert.c:238
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2112,7 +1956,11 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/fs/tools/gnunet-insert.c:240
+msgid "Make files available to GNUnet for sharing."
+msgstr "Dateien GNUnet zum Filesharing zur Verfügung stellen."
+
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
@@ -2120,7 +1968,7 @@
 "Intervall der Verfügbarkeit von Updates auf SECONDS setzen (nur für das "
 "Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:221
+#: src/applications/fs/tools/gnunet-insert.c:247
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2128,7 +1976,7 @@
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-insert.c:251
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -2136,13 +1984,13 @@
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:256
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/applications/fs/tools/gnunet-insert.c:230
+#: src/applications/fs/tools/gnunet-insert.c:259
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2150,7 +1998,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:263
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2158,21 +2006,17 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:236
+#: src/applications/fs/tools/gnunet-insert.c:267
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/applications/fs/tools/gnunet-insert.c:240
-msgid "process directories recursively"
-msgstr "Verzeichnisse rekursiv bearbeiten"
-
-#: src/applications/fs/tools/gnunet-insert.c:242
+#: src/applications/fs/tools/gnunet-insert.c:273
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -2180,169 +2024,117 @@
 "Dies als unregelmäßige aber aktualisierbare Veröffentlichung kennzeichnen "
 "(nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:281
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr "Erstellungszeit für den SBLOCK angeben (s. Manpage zum Format)"
 
-#: src/applications/fs/tools/gnunet-insert.c:250
+#: src/applications/fs/tools/gnunet-insert.c:284
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "ID der vorherigen Version des Inhalts (nur für das Einfügen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:257
-msgid "Make files available to GNUnet for sharing."
-msgstr "Dateien GNUnet zum Filesharing zur Verfügung stellen."
+#: src/applications/fs/tools/gnunet-insert.c:326
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for insertion.\n"
+msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:344
+#: src/applications/fs/tools/gnunet-insert.c:351
 #, c-format
-msgid "You must pass a positive number to the `%s' option.\n"
-msgstr "Sie müssen eine positive Zahl zu der Option `%s' übergeben.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:429
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:537
-#: src/applications/fs/tools/gnunet-unindex.c:145
-#, c-format
-msgid "You must specify a list of files to insert.\n"
-msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:541
-#, c-format
-msgid "Only one file or directory can be specified at a time.\n"
-msgstr "Nur eine Datei oder Verzeichnis kann auf einmal angegeben werden.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:545
-#, c-format
-msgid "You must specify a file or directory to upload.\n"
-msgstr "Sie müssen eine Datei oder Verzeichnis für den Upload angeben.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:595
-#, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:617
+#: src/applications/fs/tools/gnunet-insert.c:378
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Konnte nicht auf den Namespace `%s' zugreifen (existiert nicht?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:636
+#: src/applications/fs/tools/gnunet-insert.c:394
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Das Parsen der Zeit schlug fehl. Verwenden Sie das `%s' Format.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:649
-#: src/applications/fs/tools/gnunet-insert.c:653
-#: src/applications/fs/tools/gnunet-insert.c:657
-#: src/applications/fs/tools/gnunet-insert.c:661
-#: src/applications/fs/tools/gnunet-insert.c:666
+#: src/applications/fs/tools/gnunet-insert.c:407
+#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:417
+#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:427
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:108
-#: src/applications/fs/tools/gnunet-download.c:42
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
-
-#: src/applications/fs/tools/gnunet-search.c:114
+#: src/applications/fs/tools/gnunet-search.c:136
 msgid "exit after receiving LIMIT results"
 msgstr "Abbrechen, nachdem LIMIT Ergebnisse empfangen wurden"
 
-#: src/applications/fs/tools/gnunet-search.c:116
+#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-download.c:64
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Begegnete (entschlüsselte) Suchergebnisse in FILENAME schreiben"
 
-#: src/applications/fs/tools/gnunet-search.c:118
-msgid "wait TIMEOUT seconds for search results before aborting"
+#: src/applications/fs/tools/gnunet-search.c:142
+#, fuzzy
+msgid "wait DELAY seconds for search results before aborting"
 msgstr "TIMEOUT Sekunden auf Suchergebnisse warten, bevor abgebrochen wird"
 
-#: src/applications/fs/tools/gnunet-search.c:123
-msgid "Search GNUnet for files."
-msgstr "Das GNUnet nach Dateien durchsuchen."
-
-#: src/applications/fs/tools/gnunet-search.c:227
-msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr ""
-"Nicht genügend Parameter. Sie müssen ein Schlüsselwort oder einen Bezeichner "
-"angeben.\n"
-
-#: src/applications/fs/tools/gnunet-search.c:278
+#: src/applications/fs/tools/gnunet-search.c:189
 #, c-format
 msgid "Starting search failed. Consult logs.\n"
 msgstr ""
 "Das Starten der Suche schlug fehl. Bitte ziehen Sie die Protokolldateien zu "
 "Rate.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:353
+#: src/applications/fs/tools/gnunet-search.c:277
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
-msgstr "GRAD"
+#: src/applications/fs/tools/gnunet-download.c:60
+msgid "Download files from GNUnet."
+msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
-msgstr "DATEINAME"
-
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
-msgstr "Schreibe die Datei in DATEINAME"
-
-#: src/applications/fs/tools/gnunet-download.c:50
+#: src/applications/fs/tools/gnunet-download.c:67
 msgid "download a GNUnet directory recursively"
 msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
-msgstr "Dateien aus dem GNUnet herunterladen."
-
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr "Nicht genügend Parameter. Sie müssen eine GNUnet Datei URI angeben\n"
-
-#: src/applications/fs/tools/gnunet-download.c:159
+#: src/applications/fs/tools/gnunet-download.c:86
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "Download der Datei `%s' bei %16llu von %16llu Bytes (%8.3f kbps)\n"
 
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
+#: src/applications/fs/tools/gnunet-download.c:99
+#: src/applications/fs/tools/gnunet-download.c:110
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:191
+#: src/applications/fs/tools/gnunet-download.c:118
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 "Download der Datei `%s' abgeschlossen. Geschwindigkeit war %8.3f KB/s.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:237
+#: src/applications/fs/tools/gnunet-download.c:175
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr "Nicht genügend Parameter. Sie müssen eine GNUnet Datei URI angeben\n"
+
+#: src/applications/fs/tools/gnunet-download.c:195
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "URI `%s' ist ungültig für gnunet-download.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:288
+#: src/applications/fs/tools/gnunet-download.c:244
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:50
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -2351,7 +2143,7 @@
 "%16llu von %16llu Bytes deindiziert (schätze %llu Sekunden bis "
 "Fertigstellung)            "
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2361,7 +2153,7 @@
 "Deindizierung von `%s' abgeschlossen, %llu Bytes benötigten %llu Sekunden (%"
 "8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:83
 #, c-format
 msgid ""
 "\n"
@@ -2370,27 +2162,27 @@
 "\n"
 "Fehler beim Deindizieren der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:97
+#: src/applications/fs/tools/gnunet-unindex.c:100
 msgid "Unindex files."
 msgstr "Dateien deindizieren."
 
-#: src/applications/fs/tools/gnunet-unindex.c:149
-#, c-format
-msgid "You must specify one and only one file to unindex.\n"
-msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
+#: src/applications/fs/tools/gnunet-unindex.c:145
+#, fuzzy
+msgid "Not enough arguments. You must specify a filename.\n"
+msgstr "Nicht genügend Parameter. Sie müssen eine GNUnet Datei URI angeben\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:190
+#: src/applications/fs/tools/gnunet-unindex.c:173
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "`%s' schlug fehl. Ist `%s' eine Datei?\n"
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/fs/module/ondemand.c:317
 #, 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:393
+#: src/applications/fs/module/ondemand.c:411
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2401,7 +2193,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:419
+#: src/applications/fs/module/ondemand.c:438
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2410,7 +2202,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:617
+#: src/applications/fs/module/ondemand.c:655
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -2418,7 +2210,7 @@
 "Deindizierter ODB Block `%s' vom Offset %llu fehlt bereits im "
 "Datenspeicher.\n"
 
-#: src/applications/fs/module/fs.c:1184
+#: src/applications/fs/module/fs.c:1196
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2427,111 +2219,89 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/applications/fs/module/fs.c:1233
+#: src/applications/fs/module/fs.c:1247
 #, 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:1270
+#: src/applications/fs/module/fs.c:1287
 msgid "enables (anonymous) file-sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: src/applications/fs/module/migration.c:224
+#: src/applications/fs/module/migration.c:228
 msgid "# blocks migrated"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/module/migration.c:225
+#: src/applications/fs/module/migration.c:229
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
-msgstr ""
-"Veröffentlichungsintervall für periodische Veröffentlichung wurde geändert."
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: 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/namespace_info.c:604
-msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
-msgstr ""
-"Veröffentlichungsdatum für periodisch aktualisierten Inhalt ist mehr als "
-"eine Woche früher als geplant.\n"
-
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr "Diese Suche läuft bereits!\n"
-
-#: src/applications/fs/fsui/fsui.c:189
+#: src/applications/fs/fsui/fsui.c:195
 msgid "FSUI persistence: error restoring download\n"
 msgstr "FSUI Beständigkeit: Fehler beim Wiederherstellen des Downloads\n"
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/fs/fsui/fsui.c:666
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
 
-#: src/applications/fs/fsui/download.c:290
+#: src/applications/fs/fsui/download.c:305
 msgid "Download aborted."
 msgstr "Download abgebrochen."
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:309
 msgid "ECRS download failed (see logs)."
 msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
 
-#: src/applications/fs/fsui/download.c:298
+#: src/applications/fs/fsui/download.c:313
 msgid "ECRS download suspending."
 msgstr "ECRS download wird eingefroren."
 
-#: src/applications/fs/fsui/download.c:302
+#: src/applications/fs/fsui/download.c:317
 msgid "Unexpected download state."
 msgstr ""
 
-#: src/applications/fs/fsui/unindex.c:85
+#: src/applications/fs/fsui/unindex.c:80
 msgid "Unindex failed."
 msgstr "Deindizierung schlug fehl."
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
-msgstr "Keine Schlüsselwörter angegeben!\n"
-
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
+#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
+#: src/applications/fs/fsui/upload.c:413
 msgid "Upload failed."
 msgstr "Upload fehlgeschlagen."
 
-#: src/applications/fs/fsui/upload.c:455
+#: src/applications/fs/fsui/upload.c:420
 msgid "Cannot upload directory without using recursion."
 msgstr ""
 "Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen werden."
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
-
-#: src/applications/fs/fsui/file_info.c:282
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr ""
-
-#: src/applications/fs/ecrs/search.c:160
+#: 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"
 
-#: src/applications/fs/ecrs/search.c:216
+#: src/applications/fs/ecrs/search.c:226
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:128
 #, 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:257
+#: src/applications/fs/ecrs/download.c:263
 #, 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:935
+#: src/applications/fs/ecrs/download.c:972
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2540,171 +2310,151 @@
 "Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
 "abgebrochen.\n"
 
-#: src/applications/fs/ecrs/download.c:1112
+#: src/applications/fs/ecrs/download.c:1153
 #, 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:180
+#: src/applications/fs/ecrs/upload.c:170
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/fs/ecrs/upload.c:180
 #, 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:193
+#: src/applications/fs/ecrs/upload.c:188
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/fs/ecrs/upload.c:200
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/fs/ecrs/upload.c:219
 #, 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:227
+#: src/applications/fs/ecrs/upload.c:226
 #, 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:306
+#: src/applications/fs/ecrs/upload.c:312
 #, 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:842
+#: src/applications/fs/ecrs/meta.c:847
 #, 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:850
+#: src/applications/fs/ecrs/meta.c:855
 #, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/fs/ecrs/namespace.c:153
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
-msgstr ""
-"Die Konfigurationsdatei muss unter %s%s ein Verzeichnis für GNUnet angeben, "
-"in dem Knotenbezogene Daten gespeichert werden.\n"
-
-#: src/applications/fs/ecrs/namespace.c:133
-#, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
 "Pseudonym `%s' kann nicht erstellt werden, da die Datei `%s' bereits "
 "existiert.\n"
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/fs/ecrs/namespace.c:338
+#: src/applications/fs/ecrs/namespace.c:419
+#: src/applications/fs/ecrs/namespace.c:573
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/fs/ecrs/namespace.c:350
+#: src/applications/fs/ecrs/namespace.c:430
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/fs/ecrs/namespace.c:587
+#: src/applications/fs/ecrs/namespace.c:598
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Format der Datei `%s' ist ungültig.\n"
 
-#: src/applications/topology_f2f/topology.c:323
+#: src/applications/fs/ecrs/helper.c:67
+msgid "No keywords specified!\n"
+msgstr "Keine Schlüsselwörter angegeben!\n"
+
+#: src/applications/fs/ecrs/parser.c:122
 #, c-format
 msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
-"Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
-"Sektion `%s' angegeben werden.\n"
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/applications/fs/uritrack/file_info.c:123
+msgid "Collecting file identifiers disabled.\n"
+msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
+
+#: src/applications/fs/uritrack/file_info.c:355
 #, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr ""
+
+#: src/applications/fs/namespace/namespace_info.c:654
+msgid "Publication interval for periodic publication changed."
+msgstr ""
+"Veröffentlichungsintervall für periodische Veröffentlichung wurde geändert."
+
+#: src/applications/fs/namespace/namespace_info.c:675
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
+msgstr ""
+"Veröffentlichungsdatum für periodisch aktualisierten Inhalt ist mehr als "
+"eine Woche früher als geplant.\n"
+
+#: src/applications/topology_f2f/topology.c:354
+#, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/applications/topology_f2f/topology.c:358
+#: src/applications/topology_f2f/topology.c:371
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/applications/topology_f2f/topology.c:384
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/applications/template/template.c:61
+#: src/applications/template/template.c:62
 #, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "`%s' registriert Client-Handler %d and %d\n"
 
-#: src/applications/template/gnunet-template.c:70
-#: src/applications/vpn/gnunet-vpn.c:72
-msgid "helptext for -t"
-msgstr "Hilfetext für -t"
-
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
-msgstr "Vorlage für gnunet-clients."
-
-#: src/applications/bootstrap_http/http.c:109
-#, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-msgstr "Ungültiger Port \"%s\" in Angabe der Hostlist, versuche Port %d.\n"
-
-#: src/applications/bootstrap_http/http.c:120
-#, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
-
-#: src/applications/bootstrap_http/http.c:132
-#, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+#: src/applications/template/gnunet-template.c:44
+msgid "Template description."
 msgstr ""
-"Die Liste mit Knotenkontakten konnte nicht heruntergeladen werden, Host `%s' "
-"ist unbekannt.\n"
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
-#, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
+#: src/applications/bootstrap_http/http.c:92
+#, fuzzy, c-format
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/applications/bootstrap_http/http.c:217
-#, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "Das Parsen der HTTP Antwort für die URL `%s' schlug fehl.\n"
-
-#: src/applications/bootstrap_http/http.c:252
-#, c-format
-msgid "Parsing hello from `%s' failed.\n"
-msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
-
-#: src/applications/bootstrap_http/http.c:330
-#, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+#: src/applications/bootstrap_http/http.c:144
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
-"Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden. Es wird ohne "
-"Proxy versucht.\n"
 
-#: src/applications/bootstrap_http/http.c:355
+#: src/applications/bootstrap_http/http.c:229
 msgid "# hellos downloaded via http"
 msgstr "# Hellos per HTTP heruntergeladen"
 
@@ -2718,421 +2468,360 @@
 msgid "# bytes received of type %d"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/applications/traffic/traffic.c:605
+#: src/applications/traffic/traffic.c:609
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
-msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
-
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr "Keine Antwort von gnunetd über die Netzwerkverkehrsbedingungen.\n"
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:181
-#, fuzzy, c-format
-msgid ""
-"Configuration file must specify directory for storing data in section `%s' "
-"under `%s'.\n"
+#: src/applications/vpn/gnunet-vpn.c:98
+msgid "Suppress display of asynchronous log messages"
 msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/applications/kvstore_sqlite/kv_sqlite.c:264
-#, fuzzy
-msgid "Unable to initialize SQLite KVStore.\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
-#: src/applications/vpn/gnunet-vpn.c:77
+#: src/applications/vpn/gnunet-vpn.c:103
 msgid "VPN over GNUnet."
 msgstr ""
 
-#: src/applications/vpn/vpn.c:315
+#: src/applications/vpn/vpn.c:351
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:323
+#: src/applications/vpn/vpn.c:359
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:387
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:400
+#: src/applications/vpn/vpn.c:436
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:404
+#: src/applications/vpn/vpn.c:440
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:414
+#: src/applications/vpn/vpn.c:450
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:474
+#: src/applications/vpn/vpn.c:510
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:478
+#: src/applications/vpn/vpn.c:514
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:505
+#: src/applications/vpn/vpn.c:541
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:513
+#: src/applications/vpn/vpn.c:549
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:517
+#: src/applications/vpn/vpn.c:553
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:555
+#: src/applications/vpn/vpn.c:591
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:559
+#: src/applications/vpn/vpn.c:595
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:566
+#: src/applications/vpn/vpn.c:602
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:571
+#: src/applications/vpn/vpn.c:607
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:627
 #, fuzzy, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:638
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/vpn/vpn.c:650
 #, fuzzy, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/applications/vpn/vpn.c:646
+#: src/applications/vpn/vpn.c:683
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:692
+#: src/applications/vpn/vpn.c:729
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:754
+#: src/applications/vpn/vpn.c:788
 #, c-format
-msgid "RFC4193 --- whitelist of peer %x\n"
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:772
+#: src/applications/vpn/vpn.c:792
+#, c-format
+msgid "VPN cannot drop connection %x\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:810
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:812
+#: src/applications/vpn/vpn.c:850
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:816
+#: src/applications/vpn/vpn.c:854
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/vpn/vpn.c:860
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:825
+#: src/applications/vpn/vpn.c:863
 #, fuzzy, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:873
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:892
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:869
-#, c-format
-msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
-msgstr ""
-
-#: src/applications/vpn/vpn.c:885
+#: src/applications/vpn/vpn.c:913
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:890
+#: src/applications/vpn/vpn.c:918
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:901
+#: src/applications/vpn/vpn.c:929
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:907
+#: src/applications/vpn/vpn.c:935
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:923
+#: src/applications/vpn/vpn.c:951
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:927
+#: src/applications/vpn/vpn.c:955
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:931
+#: src/applications/vpn/vpn.c:959
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:945
+#: src/applications/vpn/vpn.c:973
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:960
+#: src/applications/vpn/vpn.c:988
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:998
+#: src/applications/vpn/vpn.c:1016
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1013
+#: src/applications/vpn/vpn.c:1031
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1058
+#: src/applications/vpn/vpn.c:1076
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1104
+#: src/applications/vpn/vpn.c:1122
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1148
+msgid "Cannot store client info\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1208
 msgid "Yes"
 msgstr "Ja"
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1208
 msgid "No"
 msgstr "Nein"
 
-#: src/applications/vpn/vpn.c:1324
+#: src/applications/vpn/vpn.c:1385
 #, fuzzy, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr "`%s' registriert Handler %d und %d\n"
 
-#: src/applications/vpn/vpn.c:1325
+#: src/applications/vpn/vpn.c:1386
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1361
+#: src/applications/vpn/vpn.c:1434
 #, fuzzy
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr "Ermöglicht P2P-Chat"
 
-#: src/applications/vpn/vpn.c:1383
+#: src/applications/vpn/vpn.c:1466
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394
+#: src/applications/vpn/vpn.c:1477
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1405
+#: src/applications/vpn/vpn.c:1490
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/state/state.c:85
+#: src/server/gnunet-update.c:142
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
-msgstr ""
-"Die Konfigurationsdatei muss unter %s\\%s ein Verzeichnis für GNUnet "
-"angeben, in dem knotenbezogene Daten gespeichert werden.\n"
+msgid "Updating data for module `%s'\n"
+msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
-msgstr ""
-"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+#: src/server/gnunet-update.c:147
+#, c-format
+msgid "Failed to update data for module `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/server/gnunet-update.c:55 src/server/startup.c:450
-#: src/server/gnunet-transport-check.c:407
+#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+msgid "ping peers from HOSTLISTURL that match transports"
+msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
+
+#: src/server/gnunet-update.c:220
+msgid "Updates GNUnet datastructures after version change."
+msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
+
+#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
 msgid "run as user LOGIN"
 msgstr "als Benutzer LOGIN ausführen"
 
-#: src/server/gnunet-update.c:58
+#: src/server/gnunet-update.c:227
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 "Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
 "zu holen"
 
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
-
-#: src/server/gnunet-update.c:147
+#: src/server/connection.c:992
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'."
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'."
-
-#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
-#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Ungültige Parameter: "
-
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
-msgstr ""
-"\n"
-"Abbruch.\n"
-
-#: src/server/gnunet-update.c:232 src/server/core.c:476
-msgid "No applications defined in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
-
-#: src/server/gnunet-update.c:249
-#, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Daten des Moduls `%s' werden aktualisiert\n"
-
-#: src/server/gnunet-update.c:253
-#, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/server/gnunet-update.c:309
-#, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Daten für %d Anwendungen wurden aktualisiert.\n"
-
-#: src/server/connection.c:983
-#, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "`%s' wählte %d von %d Nachrichten aus (MTU: %d).\n"
 
-#: src/server/connection.c:990
+#: src/server/connection.c:999
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Nachrichten Details: %u: Länge %d, Priorität: %d\n"
 
-#: src/server/connection.c:2254
+#: src/server/connection.c:2283
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
 
-#: src/server/connection.c:2325
+#: src/server/connection.c:2355
 #, 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:2340
+#: src/server/connection.c:2370
 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:2708
+#: src/server/connection.c:2774
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2712
+#: src/server/connection.c:2778
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2714
+#: src/server/connection.c:2780
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/server/connection.c:2717
+#: src/server/connection.c:2783
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/server/connection.c:2721
+#: src/server/connection.c:2787
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/server/connection.c:2725
+#: src/server/connection.c:2791
 #, fuzzy
 msgid "# bytes received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/server/connection.c:2727
+#: src/server/connection.c:2793
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/server/connection.c:2728
+#: src/server/connection.c:2794
 msgid "# bytes noise sent"
 msgstr "# Bytes Rauschen gesendet"
 
-#: src/server/startup.c:196
+#: src/server/gnunetd.c:78
 #, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
+msgid "`%s' startup complete.\n"
+msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/server/startup.c:324
+#: src/server/gnunetd.c:83
 #, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
-msgstr ""
-"Sie müssen einen Namen für die PID Datei in Sektion `%s' unter `%s' "
-"angeben.\n"
+msgid "`%s' is shutting down.\n"
+msgstr "`%s' fährt herunter.\n"
 
-#: src/server/startup.c:339
-#, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
-
-#: src/server/startup.c:443
+#: src/server/gnunetd.c:160
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -3141,145 +2830,108 @@
 "Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
 "Standardfehlerausgabe (stderr) geschrieben."
 
-#: src/server/startup.c:456
+#: src/server/gnunetd.c:164
 msgid "Starts the gnunetd daemon."
 msgstr "Startet den gnunetd Daemonen."
 
-#: src/server/startup.c:470
-#, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr "Benutzer `%s' ist nicht bekannt, UID kann nicht gewechselt werden.\n"
+#: src/server/gnunetd.c:168
+msgid "disable padding with random data (experimental)"
+msgstr ""
 
-#: src/server/startup.c:479
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
+#: src/server/gnunetd.c:172
+#, fuzzy
+msgid "specify username as which gnunetd should run"
+msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
-msgstr "Ungültige Kommandozeilen Parameter:\n"
-
-#: src/server/startup.c:583
+#: src/server/gnunetd.c:228
 #, c-format
-msgid "Argument %d: `%s'\n"
-msgstr "Parameter %d: `%s'\n"
-
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
-msgstr "Ungültige Kommandozeilen Parameter.\n"
-
-#: src/server/gnunetd.c:76
-#, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 "Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
 "ausführen!\n"
 
-#: src/server/gnunetd.c:84
+#: src/server/core.c:124
 #, c-format
-msgid "`%s' starting\n"
-msgstr "`%s' startet\n"
-
-#: src/server/gnunetd.c:106
-#, c-format
-msgid "`%s' startup complete.\n"
-msgstr "`%s' Startvorgang abgeschlossen.\n"
-
-#: src/server/gnunetd.c:111
-#, c-format
-msgid "`%s' is shutting down.\n"
-msgstr "`%s' fährt herunter.\n"
-
-#: src/server/core.c:115
-#, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr "Anwendungsmodul `%s' ist bereits initialisiert!\n"
 
-#: src/server/core.c:168
+#: src/server/core.c:174
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
 
-#: src/server/core.c:215
+#: src/server/core.c:217
 #, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr "`%s' kann nicht heruntergefahren werden: Anwendung ist nicht geladen\n"
 
-#: src/server/core.c:222
+#: src/server/core.c:225
 #, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
 "Anwendung `%s' kann nicht heruntergefahren werden: sie ist nicht "
 "initialisiert\n"
 
-#: src/server/core.c:231 src/server/core.c:420
+#: src/server/core.c:235
 #, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr "Methode '%s%s' kann in Bibliothek `%s' nicht gefunden werden.\n"
 
-#: src/server/core.c:398
+#: src/server/core.c:374
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr "%p kann nicht freigegeben werden: Dienst ist nicht geladen\n"
 
-#: src/server/core.c:499
+#: src/server/core.c:470
 #, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/server/core.c:516
-#, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "Anwendung `%s' konnte nicht ordentlich heruntergefahren werden.\n"
 
-#: src/server/core.c:575
-msgid "FATAL: Identity plugin not found!\n"
-msgstr "SCHWERWIEGEND: Identity Plugin wurde nicht gefunden!\n"
-
-#: src/server/core.c:633
+#: src/server/core.c:594
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/server/gnunet-transport-check.c:109
+#: src/server/gnunet-transport-check.c:115
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "`%s': Hello konnte nicht erzeugt werden.\n"
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:124
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
 
-#: src/server/gnunet-transport-check.c:148
+#: src/server/gnunet-transport-check.c:158
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "`%s': Kann nicht senden.\n"
 
-#: src/server/gnunet-transport-check.c:168
+#: src/server/gnunet-transport-check.c:180
 #, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
 
-#: src/server/gnunet-transport-check.c:182
+#: src/server/gnunet-transport-check.c:194
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "`%s': Verbindung konnte nicht getrennt werden.\n"
 
-#: src/server/gnunet-transport-check.c:189
-#, c-format
+#: src/server/gnunet-transport-check.c:201
+#, fuzzy, c-format
 msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
+"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+"each.\n"
 msgstr ""
 "`%s' Transport funktioniert. Es dauerte %ums, um %d Nachrichten zu je %d "
 "Bytes zu übertragen.\n"
 
-#: src/server/gnunet-transport-check.c:219
+#: src/server/gnunet-transport-check.c:229
 #, fuzzy, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " Transport %d ist nicht verfügbar\n"
 
-#: src/server/gnunet-transport-check.c:230
+#: src/server/gnunet-transport-check.c:245
 #, c-format
 msgid ""
 "\n"
@@ -3288,63 +2940,58 @@
 "\n"
 "Kontaktiere `%s'."
 
-#: src/server/gnunet-transport-check.c:253
+#: src/server/gnunet-transport-check.c:266
 #, c-format
 msgid " Connection failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/server/gnunet-transport-check.c:259
+#: src/server/gnunet-transport-check.c:272
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/server/gnunet-transport-check.c:320
+#: src/server/gnunet-transport-check.c:324
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr "Keine Antwort innerhalb %llums erhalten.\n"
 
-#: src/server/gnunet-transport-check.c:396
-msgid "ping peers from HOSTLISTURL that match transports"
-msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
+#: src/server/gnunet-transport-check.c:350
+msgid "Tool to test if GNUnet transport services are operational."
+msgstr ""
+"Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport Dienste "
+"funktionsfähig sind."
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:357
 msgid "send COUNT messages"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/server/gnunet-transport-check.c:400
+#: src/server/gnunet-transport-check.c:360
 msgid "send messages with SIZE bytes payload"
 msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
 
-#: src/server/gnunet-transport-check.c:402
+#: src/server/gnunet-transport-check.c:363
 msgid "specifies which TRANSPORT should be tested"
 msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/server/gnunet-transport-check.c:404
+#: src/server/gnunet-transport-check.c:366
 msgid "specifies after how many MS to time-out"
 msgstr "Gibt an, nach wievielen MS die Zeit abgelaufen sein soll"
 
-#: src/server/gnunet-transport-check.c:414
-msgid "Tool to test if GNUnet transport services are operational."
+#: src/server/gnunet-transport-check.c:374
+msgid "repeat each test X times"
 msgstr ""
-"Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport Dienste "
-"funktionsfähig sind."
 
-#: src/server/gnunet-transport-check.c:565
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr ""
-"Sie müssen eine Menge an Transporten angeben, die getestet werden sollen!\n"
-
-#: src/server/gnunet-transport-check.c:570
+#: src/server/gnunet-transport-check.c:455
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/server/gnunet-transport-check.c:573
+#: src/server/gnunet-transport-check.c:458
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/server/gnunet-transport-check.c:617
+#: src/server/gnunet-transport-check.c:518
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
@@ -3352,12 +2999,17 @@
 "%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport nicht "
 "verfügbar).\n"
 
-#: src/server/tcpserver.c:422
+#: src/server/tcpserver.c:102
 #, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+msgid "The `%s' request received from client is malformed.\n"
+msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
+
+#: src/server/tcpserver.c:316
+#, fuzzy, c-format
+msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/server/tcpserver.c:688
+#: src/server/tcpserver.c:384
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
@@ -3366,30 +3018,35 @@
 "Beschädigte Netzwerkangabe in der Konfigurationsdatei in Sektion `%s' für "
 "Eintrag `%s': %s\n"
 
-#: src/server/tcpserver.c:798
+#: src/server/tcpserver.c:437
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
 
-#: src/server/handler.c:367
+#: src/server/handler.c:377
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
 
-#: src/server/gnunet-peer-info.c:95
+#: src/server/version.c:157
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
+msgstr ""
+
+#: src/server/gnunet-peer-info.c:52
 msgid "Print information about GNUnet peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:88
 msgid "hello message invalid (signature invalid).\n"
 msgstr "Hello Nachricht ist ungültig (Signatur ist ungültig).\n"
 
-#: src/server/gnunet-peer-info.c:164
+#: src/server/gnunet-peer-info.c:99
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
@@ -3403,6 +3060,24 @@
 "`%s' aufgerufen wobei Cron Job nicht Warteschlange ist. Er wird hinzugefügt. "
 "Das ist möglicherweise nicht, was Sie wollen.\n"
 
+#: src/util/network_client/tcpio.c:90
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:114
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#, 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:356
+#, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
+
 #: src/util/crypto/hostkey_gcrypt.c:1031
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
@@ -3414,12 +3089,12 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#: src/util/os/statuscalls.c:171 src/util/os/statuscalls.c:249
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
+#: src/util/os/statuscalls.c:291 src/util/os/statuscalls.c:300
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -3432,24 +3107,17 @@
 msgid "Can't create semaphore: %i"
 msgstr "Semaphore konnte nicht angelegt werden: %i"
 
-#: src/util/os/dso.c:75
+#: src/util/os/dso.c:51
 #, c-format
-msgid ""
-"Cannot determine plugin path, application must be installed in directory "
-"ending with `%s'.\n"
-msgstr ""
-
-#: src/util/os/dso.c:97
-#, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/util/os/dso.c:134
+#: src/util/os/dso.c:90
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/os/dso.c:176
+#: src/util/os/dso.c:132
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
@@ -3463,40 +3131,32 @@
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "CPU Nutzung kann nicht ermittelt werden (Win 9x).\n"
 
-#: src/util/os/installpath.c:172
-msgid ""
-"Cannot determine the path to the executable, your system may be broken or "
-"not supported.\n"
-msgstr ""
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/util/os/installpath.c:211
-msgid ""
-"GNUnet executables are not in a directory named 'bin'. This may signal a "
-"broken installation.\n"
-msgstr ""
+#: src/util/os/user.c:125
+#, c-format
+msgid "User `%s' not known, cannot change UID to it.\n"
+msgstr "Benutzer `%s' ist nicht bekannt, UID kann nicht gewechselt werden.\n"
 
-#: src/util/os/installpath.c:222
-msgid "Cannot determine the installation prefix. Unknown error.\n"
-msgstr ""
+#: src/util/os/user.c:136
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/network/tcpio.c:100
-msgid "Could not find valid value for PORT in section NETWORK."
+#: src/util/network/select.c:272
+#, fuzzy
+msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
+"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
+"u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/util/network/tcpio.c:124
-msgid "Could not find valid value for HOST in section NETWORK."
+#: src/util/network/select.c:421
+msgid "select listen socket not valid!\n"
 msgstr ""
 
-#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
-#, 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/tcpio.c:406
-#, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
-
 #: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
 #: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
 #, c-format
@@ -3523,99 +3183,104 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/disk/storage.c:194
+#: src/util/disk/storage.c:201
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk/storage.c:240
+#: src/util/disk/storage.c:247
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk/storage.c:279
+#: src/util/disk/storage.c:286
 #, fuzzy, c-format
 msgid "Expected `%s' to be a regular file\n"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/util/disk/storage.c:486
+#: src/util/disk/storage.c:493
 #, fuzzy, c-format
 msgid "expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/config_impl/impl.c:256
+#: src/util/config_impl/impl.c:260
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/config_impl/impl.c:412
+#: src/util/config_impl/impl.c:419
 #, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:424
+#: src/util/config_impl/impl.c:431
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:494
+#: src/util/config_impl/impl.c:511
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:138 src/util/error/error.c:182
+#: src/util/config_impl/impl.c:617
+#, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/error/error.c:156 src/util/error/error.c:200
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/error/error.c:141 src/util/error/error.c:184
+#: src/util/error/error.c:159 src/util/error/error.c:202
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:144 src/util/error/error.c:186
+#: src/util/error/error.c:162 src/util/error/error.c:204
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/error/error.c:147 src/util/error/error.c:188
+#: src/util/error/error.c:165 src/util/error/error.c:206
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/error/error.c:150 src/util/error/error.c:190
+#: src/util/error/error.c:168 src/util/error/error.c:208
 msgid "FATAL"
 msgstr "SCHWERWIEGEND"
 
-#: src/util/error/error.c:153 src/util/error/error.c:192
+#: src/util/error/error.c:171 src/util/error/error.c:210
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:194
+#: src/util/error/error.c:174 src/util/error/error.c:212
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:159 src/util/error/error.c:196
+#: src/util/error/error.c:177 src/util/error/error.c:214
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:198
+#: src/util/error/error.c:180 src/util/error/error.c:216
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:165 src/util/error/error.c:200
+#: src/util/error/error.c:183 src/util/error/error.c:218
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:168 src/util/error/error.c:202
+#: src/util/error/error.c:186 src/util/error/error.c:220
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:171
+#: src/util/error/error.c:189
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:203
+#: src/util/error/error.c:221
 msgid "NOTHING"
 msgstr "NICHTS"
 
@@ -3634,14 +3299,13 @@
 msgid "Permission denied for `%s'.\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
-#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
-#: src/util/threads/pthread.c:275
+#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
+#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -3650,61 +3314,68 @@
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:686
+#: src/util/getopt/getopt.c:681
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:705
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt/getopt.c:715
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/util/getopt/getopt.c:762
+#: src/util/getopt/getopt.c:757
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/util/getopt/getopt.c:766
+#: src/util/getopt/getopt.c:761
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/util/getopt/getopt.c:792
+#: src/util/getopt/getopt.c:787
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/util/getopt/getopt.c:795
+#: src/util/getopt/getopt.c:790
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/util/getopt/getopt.c:872
+#: src/util/getopt/getopt.c:867
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/util/getopt/getopt.c:890
+#: src/util/getopt/getopt.c:885
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
+#: src/util/getopt/setoption.c:58
+#, c-format
+msgid ""
+"Setting option `%s' in section `%s' to `%s' when processing command line "
+"option `%s' was denied.\n"
+msgstr ""
+
 #: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
@@ -3713,136 +3384,77 @@
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/string/string.c:101
+#: src/util/string/string.c:119
 msgid "ms"
 msgstr "ms"
 
-#: src/util/string/string.c:106
+#: src/util/string/string.c:124
 msgid "s"
 msgstr "s"
 
-#: src/util/string/string.c:109
+#: src/util/string/string.c:127
 msgid "m"
 msgstr "m"
 
-#: src/util/string/string.c:112
+#: src/util/string/string.c:130
 msgid "h"
 msgstr "h"
 
-#: src/util/string/string.c:115
+#: src/util/string/string.c:133
 msgid " days"
 msgstr " Tage"
 
-#: src/util/string/string.c:133
+#: src/util/string/string.c:151
 msgid "b"
 msgstr "b"
 
-#: src/util/string/string.c:138
+#: src/util/string/string.c:156
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:141
+#: src/util/string/string.c:159
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:144
+#: src/util/string/string.c:162
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:147
+#: src/util/string/string.c:165
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:267
+#: src/util/string/string.c:285
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:60
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr "Generiere Konfiguration für gnunetd, den GNUnet Daemon"
 
-#: src/setup/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:62
 msgid "Tool to setup GNUnet."
 msgstr "Werkzeug für die Einrichtung von GNUnet."
 
-#: src/setup/gnunet-setup.c:91
-#, c-format
-msgid "Available MODEs:\n"
-msgstr "Verfügbare MODEs:\n"
+#: src/setup/gnunet-setup.c:152
+#, fuzzy, c-format
+msgid "Too many arguments.\n"
+msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: src/setup/gnunet-setup.c:92
-#, c-format
-msgid " config\t\ttext-based configuration\n"
-msgstr " config\t\ttext-basierte Konfiguration\n"
-
-#: src/setup/gnunet-setup.c:94
-#, c-format
-msgid " menuconfig\ttext-based menu\n"
-msgstr "menuconfig\ttext-basiertes Menü\n"
-
-#: src/setup/gnunet-setup.c:96
-#, c-format
-msgid " wizard-curses\tBasic text-based graphical configuration\n"
-msgstr " wizard-curses\tEinfache text-basierte grafische Konfiguration\n"
-
-#: src/setup/gnunet-setup.c:99
-#, c-format
-msgid " gconfig\tGTK configuration\n"
-msgstr " gconfig\tGTK Konfiguration\n"
-
-#: src/setup/gnunet-setup.c:100
-#, c-format
-msgid ""
-" wizard-gtk\tBasic GTK configuration\n"
-"\n"
-msgstr ""
-" wizard-gtk\tEinfache GTK Konfiguration\n"
-"\n"
-
-#: src/setup/gnunet-setup.c:167
-#, c-format
-msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
-msgstr ""
-"gnunet-setup benötigt Schreibberechtigungen für die Konfigurationsdatei `%"
-"s'\n"
-
-#: src/setup/gnunet-setup.c:224
+#: src/setup/gnunet-setup.c:157
 msgid "No interface specified, using default\n"
 msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
-#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
+#: src/setup/gnunet-setup.c:227
 #, c-format
 msgid "`%s' is not available."
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
+#: src/setup/gnunet-setup.c:243
 #, c-format
-msgid ""
-"Can only run wizard to configure gnunetd.\n"
-"Did you forget the `%s' option?\n"
-msgstr ""
-"Der Assistent kann nur zur Einrichtung von gnunetd gestartet werden.\n"
-"Haben Sie die `%s'-Option vergessen?\n"
-
-#: src/setup/gnunet-setup.c:285
-#, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/setup/wizard_gtk.c:429
-#, c-format
-msgid "Unable to save configuration file `%s':"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
-#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
-msgid "Unable to create user account:"
-msgstr "Fehler beim Anlegen des Benutzerkontos:"
-
-#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
-msgid "Unable to change startup process:"
-msgstr "Startprozeß konnte nicht geändert werden:"
-
 #: src/setup/gnunet-win-tool.c:109
 #, c-format
 msgid "GNUnet service installed successfully.\n"
@@ -3883,33 +3495,194 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Fehler: Dienst konnte nicht gelöscht werden: %s\n"
 
-#: src/setup/conf.c:522 src/setup/recreate.c:135
+#: src/setup/gtk/gconf.c:70
+msgid "Sorry, no help is available for this option.\n"
+msgstr "Sorry, für diese Option steht keine Hilfe zur Verfügung.\n"
+
+#: src/setup/gtk/glade_support.c:89 src/setup/gtk/glade_support.c:120
+#, fuzzy, c-format
+msgid "Failed to open `%s'.\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/setup/gtk/wizard_gtk.c:429
 #, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
+msgid "Unable to save configuration file `%s':"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/setup/conf.c:529
+#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:616
+msgid "Unable to create user account:"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
+
+#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:619
+msgid "Unable to change startup process:"
+msgstr "Startprozeß konnte nicht geändert werden:"
+
+#: src/setup/text/conf.c:74
+#, fuzzy
+msgid "yes"
+msgstr "Ja"
+
+#: src/setup/text/conf.c:75
+msgid "no"
+msgstr ""
+
+#: src/setup/text/conf.c:101
 #, c-format
-msgid "Configuration file `%s' created.\n"
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgstr ""
+
+#: src/setup/text/conf.c:110
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
+msgstr ""
+
+#: src/setup/text/conf.c:112
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
+msgstr ""
+
+#: src/setup/text/conf.c:132
+#, c-format
+msgid "\t Enter choice (default is %c): "
+msgstr ""
+
+#: src/setup/text/conf.c:138
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
+msgstr ""
+
+#: src/setup/text/conf.c:144
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
+msgstr ""
+
+#: src/setup/text/conf.c:177
+#, fuzzy, c-format
+msgid "Yes\n"
+msgstr "Ja"
+
+#: src/setup/text/conf.c:182
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Abort\n"
+msgstr "_über"
+
+#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
+msgstr ""
+
+#: src/setup/text/conf.c:385
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:459
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:470
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:492
+#, fuzzy
+msgid "Invalid entry.\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/setup/text/conf.c:511
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:538
+#, c-format
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:539
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:818
+#, 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:558
+#, c-format
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
+msgstr ""
+
+#: src/setup/text/conf.c:568
+#, 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:573
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
-#: src/setup/wizard_util.c:193
+#: src/setup/ncurses/mconf.c:793
+#, fuzzy
+msgid "GNUnet Configuration"
+msgstr "GNUnet Konfiguration"
+
+#: src/setup/ncurses/mconf.c:824
+#, fuzzy
+msgid "Do you wish to save your new configuration?"
+msgstr "Möchten Sie Ihre Einstellungen speichern?"
+
+#: src/setup/ncurses/mconf.c:834
+#, fuzzy, c-format
+msgid "End of configuration.\n"
+msgstr " gconfig\tGTK Konfiguration\n"
+
+#: src/setup/ncurses/mconf.c:836
+#, fuzzy, c-format
+msgid "Your configuration changes were NOT saved.\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/setup/ncurses/wizard_curs.c:58
 msgid "Error"
 msgstr "Fehler"
 
-#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
-#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
-#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
-#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
-#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
-#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
-#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
-#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
+#: src/setup/ncurses/wizard_curs.c:116 src/setup/ncurses/wizard_curs.c:131
+#: src/setup/ncurses/wizard_curs.c:184 src/setup/ncurses/wizard_curs.c:221
+#: src/setup/ncurses/wizard_curs.c:251 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:310 src/setup/ncurses/wizard_curs.c:337
+#: src/setup/ncurses/wizard_curs.c:369 src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:423 src/setup/ncurses/wizard_curs.c:446
+#: src/setup/ncurses/wizard_curs.c:501 src/setup/ncurses/wizard_curs.c:563
+#: src/setup/ncurses/wizard_curs.c:594 src/setup/ncurses/wizard_curs.c:638
 msgid "GNUnet configuration"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/wizard_curs.c:117
+#: src/setup/ncurses/wizard_curs.c:117
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3939,7 +3712,7 @@
 "\n"
 "das GNUnet-Team"
 
-#: src/setup/wizard_curs.c:132
+#: src/setup/ncurses/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
@@ -3947,13 +3720,13 @@
 "Wählen Sie das Netzwerkgerät, das Ihren Computer mit dem Internet verbindet, "
 "aus unten stehender Liste."
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
-#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
-#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:191
+#: src/setup/ncurses/wizard_curs.c:228 src/setup/ncurses/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:315 src/setup/ncurses/wizard_curs.c:375
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
@@ -3963,7 +3736,7 @@
 "verbindet. Dies ist üblicherweise ein Modem, eine ISDN-Karte oder eine "
 "Netzwerkkarte falls Sie DSL nutzen."
 
-#: src/setup/wizard_curs.c:185
+#: src/setup/ncurses/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
@@ -3971,7 +3744,7 @@
 "Was ist der Name des Netzwerkgerätes, das Ihren Computer mit dem Internet "
 "verbindet?"
 
-#: src/setup/wizard_curs.c:222
+#: src/setup/ncurses/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
@@ -3981,7 +3754,7 @@
 "Computers?\n"
 "Wenn Sie nicht sicher sind, lassen Sie dieses Feld leer."
 
-#: src/setup/wizard_curs.c:229
+#: src/setup/ncurses/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3999,7 +3772,7 @@
 "Wenn Sie nicht sicher sind, so können Sie das Feld leer lassen. GNUnet wird "
 "dann versuchen, Ihre IP-Adresse automatisch zu bestimmen."
 
-#: src/setup/wizard_curs.c:252
+#: src/setup/ncurses/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -4017,11 +3790,11 @@
 "hier \"Ja\". Antworten Sie \"Nein\" bei direkten Verbindungen über Modem, "
 "ISDN-Karten und DNAT (auch bekannt als \"Port forwarding\")."
 
-#: src/setup/wizard_curs.c:278
+#: src/setup/ncurses/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr "Wieviel Upstream (Bytes/s) darf verwendet werden?"
 
-#: src/setup/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -4039,11 +3812,11 @@
 "festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
 "Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/setup/wizard_curs.c:310
+#: src/setup/ncurses/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr "Wieviel Downstream (Bytes/s) darf verwendet werden?"
 
-#: src/setup/wizard_curs.c:316
+#: src/setup/ncurses/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -4061,7 +3834,7 @@
 "festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
 "Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/setup/wizard_curs.c:338
+#: src/setup/ncurses/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -4084,11 +3857,11 @@
 "Netzwerkverkehr über die Internetverbindung einschränken, wann immer Ihre "
 "Hochgeschwindigkeits-LAN-Verbindung verwendet wird (z.B. durch NFS)."
 
-#: src/setup/wizard_curs.c:370
+#: src/setup/ncurses/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr "Wieviel CPU (in %) darf verwendet werden?"
 
-#: src/setup/wizard_curs.c:376
+#: src/setup/ncurses/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -4098,7 +3871,7 @@
 "\n"
 "Dies ist der Prozentsatz an Prozessorzeit, den GNUnet verwenden darf."
 
-#: src/setup/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -4120,7 +3893,7 @@
 "Außerdem hilft es, beliebte Inhalte über verschiedene Netzteilnehmer zu "
 "verteilen, um so die Verfügbarkeit zu erhöhen."
 
-#: src/setup/wizard_curs.c:424
+#: src/setup/ncurses/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -4131,7 +3904,7 @@
 "Der GNUnet Datenspeicher enthält alle Daten, die GNUnet erzeugt (Indexdaten, "
 "eingefügte und migrierte Inhalte)."
 
-#: src/setup/wizard_curs.c:447
+#: src/setup/ncurses/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -4146,7 +3919,7 @@
 "\"Nein\" sagen, so müssen Sie GNUnet jedesmal selbst starten, wenn Sie es "
 "verwenden möchten."
 
-#: src/setup/wizard_curs.c:502
+#: src/setup/ncurses/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -4176,7 +3949,7 @@
 "\n"
 "GNUnet Benutzer:"
 
-#: src/setup/wizard_curs.c:564
+#: src/setup/ncurses/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -4202,7 +3975,7 @@
 "\n"
 "GNUnet Gruppe:"
 
-#: src/setup/wizard_curs.c:595
+#: src/setup/ncurses/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -4214,7 +3987,7 @@
 "\n"
 "Möchten Sie ihn starten, nachdem Ihre Konfiguration gespeichert wurde?"
 
-#: src/setup/wizard_curs.c:632
+#: src/setup/ncurses/wizard_curs.c:632
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -4225,90 +3998,21 @@
 "\n"
 "Soll es nochmals versucht werden?"
 
-#: src/setup/confdata.c:93
-#, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
-msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
-
-#: src/setup/wizard_util.c:119
-msgid "Can't open Service Control Manager"
-msgstr "Der Dienstemanager konnte nicht geöffnet werden"
-
-#: src/setup/wizard_util.c:124
-msgid "Can't create service"
-msgstr "Der Dienst konnte nicht angelegt werden"
-
-#: src/setup/wizard_util.c:129
-msgid "Error changing the permissions of the GNUnet directory"
-msgstr "Fehler beim Ändern der Berechtigungen des GNUnet Verzeichnisses"
-
-#: src/setup/wizard_util.c:134
-msgid "Cannot write to the regisitry"
-msgstr "Konnte nicht in die Registry schreiben"
-
-#: src/setup/wizard_util.c:137
-msgid "Can't access the service"
-msgstr "Auf den Dienst konnte nicht zugegriffen werden"
-
-#: src/setup/wizard_util.c:141
-msgid "Can't delete the service"
-msgstr "Dienst konnte nicht gelöscht werden"
-
-#: src/setup/wizard_util.c:145
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
-#: src/setup/wizard_util.c:176
-msgid "This version of Windows does not support multiple users."
-msgstr "Diese Version von Windows ist nicht Mehrbenutzerfähig."
-
-#: src/setup/wizard_util.c:180
-msgid "Error creating user"
-msgstr "Fehler beim Anlegen des Benutzers"
-
-#: src/setup/wizard_util.c:183
-msgid "Error accessing local security policy"
-msgstr "Fehler beim Zugriff auf die lokale Sicherheitsrichtlinie"
-
-#: src/setup/wizard_util.c:186
-msgid "Error granting service right to user"
-msgstr "Fehler beim Zuweisen des Dienstrechtes dem Benutzer"
-
-#: src/setup/wizard_util.c:189
-msgid "Unknown error while creating a new user"
-msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
-
-#: src/setup/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
-msgstr "Sorry, für diese Option steht keine Hilfe zur Verfügung.\n"
-
-#: src/setup/glade_support.c:75
+#: src/setup/lib/gns.c:266
 #, fuzzy, c-format
-msgid "Failed to find handler for `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"für FS Daten angeben.\n"
 
-#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
-#, fuzzy, c-format
-msgid "Failed to open `%s'.\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+#: src/setup/lib/tree.c:181
+#, c-format
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
+msgstr ""
 
-#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
-#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
-msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
-
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
-#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d in %s with error: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/include/gnunet_util_error.h:207
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
-msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
-
 #: src/include/gnunet_util_getopt.h:145
 msgid "print this help"
 msgstr "Gibt diese Hilfe aus"
@@ -4333,6 +4037,441 @@
 msgid "specify host on which gnunetd is running"
 msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
+#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
+#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#, fuzzy, c-format
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
+
+#~ msgid "Failed to obtain my (external) IPv6 address!\n"
+#~ msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
+
+#~ msgid ""
+#~ "Cannot determine port to bind to.  Define in configuration file in "
+#~ "section `%s' under `%s' or in `%s' under %s/%s.\n"
+#~ msgstr ""
+#~ "Der Port, an dem Verbindungen entgegengenommen werden sollen, konnte "
+#~ "nicht ermittelt werden. Bitte definieren Sie ihn in der "
+#~ "Konfigurationsdatei in der Sektion `%s' unter `%s' oder in `%s' unter %s/%"
+#~ "s.\n"
+
+#~ msgid "Failed to bind to UDP6 port %d.\n"
+#~ msgstr "Fehler beim Binden an UDP6 Port %d.\n"
+
+#, fuzzy
+#~ msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
+#~ msgstr ""
+#~ "UDP: select kam zurück aber ioctl berichtet, dass 0 Bytes verfügbar "
+#~ "sind!\n"
+
+#~ msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+#~ msgstr ""
+#~ "Ungültige UDP6 Nachricht von %s:%d empfangen, Nachricht wird ignoriert.\n"
+
+#~ msgid "Packet received from %s:%d (UDP6) failed format check."
+#~ msgstr ""
+#~ "Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
+#~ "schlug fehl."
+
+#~ msgid "%s: Rejected connection from blacklisted address %s.\n"
+#~ msgstr "%s: Zurückgewiesene Verbindung von schwarzgelisteter Adresse %s.\n"
+
+#~ msgid ""
+#~ "Expected welcome message on tcp connection, got garbage (%u, %u). "
+#~ "Closing.\n"
+#~ msgstr ""
+#~ "Es wurde eine Willkommensnachricht erwartet, über die TCP Verbindung "
+#~ "wurde aber keine gesendet (%u, %u). Verbindung wird geschlossen.\n"
+
+#, fuzzy
+#~ msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
+#~ msgstr ""
+#~ "UDP: select kam zurück aber ioctl berichtet, dass 0 Bytes verfügbar "
+#~ "sind!\n"
+
+#~ msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+#~ msgstr ""
+#~ "Es wurde eine ungültige UDP Nachricht von %u.%u.%u.%u:%u empfangen, "
+#~ "Nachricht wird ignoriert.\n"
+
+#~ msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
+#~ msgstr ""
+#~ "Ein Paket empfangen von %u.%u.%u.%u:%u (UDP) hat ein ungültiges Format.\n"
+
+#~ msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+#~ msgstr ""
+#~ "Es wurde eine Willkommensnachricht erwartet, über die TCP Verbindung "
+#~ "wurde jedoch keine gesendet. Verbindung wird geschlossen.\n"
+
+#~ msgid ""
+#~ "Received malformed message from tcp6-peer connection. Closing "
+#~ "connection.\n"
+#~ msgstr ""
+#~ "über die TCP6-Verbindung zu einem anderen Knoten wurde eine ungültige "
+#~ "Nachricht empfangen. Verbindung wird geschlossen.\n"
+
+#~ msgid "Network advertisements disabled by configuration!\n"
+#~ msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
+
+#~ msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
+#~ msgstr ""
+#~ "Versionen stimmen nicht überein (`%s' vs. '%*.s'), lassen Sie gnunet-"
+#~ "update laufen!\n"
+
+#~ msgid ""
+#~ "Configuration file must specify directory for storing FS data in section `"
+#~ "%s' under `%s'.\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein "
+#~ "Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
+
+#~ msgid "Could not initialize libgnunetutil!\n"
+#~ msgstr "Konnte libgnunetutil nicht initialisieren!\n"
+
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss unter %s%s ein Verzeichnis angeben, in dem "
+#~ "GNUnet knotenspezifische Daten speichern kann.\n"
+
+#~ msgid "Could not create hostkey!\n"
+#~ msgstr "Hostkey konnte nicht erzeugt werden!\n"
+
+#~ msgid "%s `%s' returned no known hosts!\n"
+#~ msgstr "%s `%s' ergab keine bekannten Knoten!\n"
+
+#~ msgid ""
+#~ "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+#~ msgstr ""
+#~ "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
+#~ "gesetzt, sie wird auf %dm gesetzt.\n"
+
+#~ msgid ""
+#~ "You should specify at least one transport service under option `%s' in "
+#~ "section `%s'.\n"
+#~ msgstr ""
+#~ "Sie sollten mindestens einen Transport Dienst unter der Option `%s' in "
+#~ "der Sektion `%s' angegeben.\n"
+
+#~ msgid "Trace GNUnet network topology."
+#~ msgstr "GNUnet Netzwerk Topologie tracen."
+
+#~ msgid ""
+#~ "specify that the contents of the namespace are of the given MIMETYPE (use "
+#~ "when creating a new pseudonym)"
+#~ msgstr ""
+#~ "Angeben, dass die Inhalte des Namespaces vom angegebenen MIMETYOE sind "
+#~ "(zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+
+#~ msgid ""
+#~ "specify NAME to be the realname of the user controlling the namespace "
+#~ "(use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "NAME als den Realnamen des Benutzers angeben, der den Namespace verwaltet "
+#~ "(zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+
+#~ msgid ""
+#~ "use DESCRIPTION to describe the content of the namespace (use when "
+#~ "creating a new pseudonym)"
+#~ msgstr ""
+#~ "DESCRIPTION als Beschreibung der Inhalte des Namespaces verwenden (zu "
+#~ "verwenden, wenn ein neues Pseudonym erstellt wird)"
+
+#~ msgid ""
+#~ "specify the given URI as an address that contains more information about "
+#~ "the namespace (use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "die angegebene URI als die Adresse angeben, die weitere Informationen "
+#~ "über den Namespace enthält (zu verwenden, wenn ein neues Pseudonym "
+#~ "erstellt wird)"
+
+#~ msgid "Invalid argument: `%s'\n"
+#~ msgstr "Ungültiger Parameter: `%s'\n"
+
+#~ msgid "Invalid arguments. Exiting.\n"
+#~ msgstr "Ungültige Parameter. Abbruch.\n"
+
+#~ msgid "%8u of %8u bytes deleted."
+#~ msgstr "%8u von %8u Bytes gelöscht."
+
+#~ msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
+#~ msgstr ""
+#~ "vom GNUnet zu löschende Datei angeben (obgligatorisch, Datei muss "
+#~ "existieren)"
+
+#~ msgid ""
+#~ "Remove file from GNUnet.  The specified file is not removed\n"
+#~ "from the filesystem but just from the local GNUnet datastore."
+#~ msgstr ""
+#~ "Datei auf GNUnet löschen. Die angegebene Datei wird nicht aus dem "
+#~ "Dateisystem gelöscht, sondern aus dem lokalen GNUnet Datenspeicher."
+
+#~ msgid "You must specify a filename (option -f)\n"
+#~ msgstr "Sie müssen eine Datei angeben (Option -f)\n"
+
+#~ msgid ""
+#~ "Error deleting file %s.\n"
+#~ "Probably a few blocks were already missing from the database.\n"
+#~ msgstr ""
+#~ "Fehler beim Löschen der Datei %s.\n"
+#~ "Möglicherweise fehlen bereits einige wenige Datenblöcke in der "
+#~ "Datenbank.\n"
+
+#~ msgid "gnunet-directory [OPTIONS] [FILENAMES]"
+#~ msgstr "gnunet-directory [OPTIONEN] [DATEINAMEN]"
+
+#, fuzzy
+#~ msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
+#~ msgstr ""
+#~ "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
+#~ "beträgt %8.3f KB/s.\n"
+
+#~ msgid "process directories recursively"
+#~ msgstr "Verzeichnisse rekursiv bearbeiten"
+
+#~ msgid "You must pass a positive number to the `%s' option.\n"
+#~ msgstr "Sie müssen eine positive Zahl zu der Option `%s' übergeben.\n"
+
+#~ msgid "You must specify a list of files to insert.\n"
+#~ msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
+
+#~ msgid "Only one file or directory can be specified at a time.\n"
+#~ msgstr "Nur eine Datei oder Verzeichnis kann auf einmal angegeben werden.\n"
+
+#~ msgid "You must specify a file or directory to upload.\n"
+#~ msgstr "Sie müssen eine Datei oder Verzeichnis für den Upload angeben.\n"
+
+#~ msgid "set the desired LEVEL of receiver-anonymity"
+#~ msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
+
+#~ msgid "Search GNUnet for files."
+#~ msgstr "Das GNUnet nach Dateien durchsuchen."
+
+#~ msgid "Not enough arguments. You must specify a keyword or identifier.\n"
+#~ msgstr ""
+#~ "Nicht genügend Parameter. Sie müssen ein Schlüsselwort oder einen "
+#~ "Bezeichner angeben.\n"
+
+#~ msgid "LEVEL"
+#~ msgstr "GRAD"
+
+#~ msgid "FILENAME"
+#~ msgstr "DATEINAME"
+
+#~ msgid "write the file to FILENAME"
+#~ msgstr "Schreibe die Datei in DATEINAME"
+
+#~ msgid "This search is already pending!\n"
+#~ msgstr "Diese Suche läuft bereits!\n"
+
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s.\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss unter %s%s ein Verzeichnis für GNUnet "
+#~ "angeben, in dem Knotenbezogene Daten gespeichert werden.\n"
+
+#~ msgid ""
+#~ "Need to have list of friends in configuration under `%s' in section `%"
+#~ "s'.\n"
+#~ msgstr ""
+#~ "Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in "
+#~ "der Sektion `%s' angegeben werden.\n"
+
+#~ msgid "helptext for -t"
+#~ msgstr "Hilfetext für -t"
+
+#~ msgid "Template for gnunet-clients."
+#~ msgstr "Vorlage für gnunet-clients."
+
+#~ msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+#~ msgstr "Ungültiger Port \"%s\" in Angabe der Hostlist, versuche Port %d.\n"
+
+#~ msgid "`%s' failed at %s:%d with error: `%s'.\n"
+#~ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#~ msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+#~ msgstr ""
+#~ "Die Liste mit Knotenkontakten konnte nicht heruntergeladen werden, Host `%"
+#~ "s' ist unbekannt.\n"
+
+#~ msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+#~ msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
+
+#~ msgid "Parsing HTTP response for URL `%s' failed.\n"
+#~ msgstr "Das Parsen der HTTP Antwort für die URL `%s' schlug fehl.\n"
+
+#~ msgid "Parsing hello from `%s' failed.\n"
+#~ msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
+
+#~ msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+#~ msgstr ""
+#~ "Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden. Es wird "
+#~ "ohne Proxy versucht.\n"
+
+#~ msgid "Failed to query gnunetd about traffic conditions.\n"
+#~ msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
+
+#~ msgid "Did not receive reply from gnunetd about traffic conditions.\n"
+#~ msgstr "Keine Antwort von gnunetd über die Netzwerkverkehrsbedingungen.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file must specify directory for storing data in section `%"
+#~ "s' under `%s'.\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein "
+#~ "Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize SQLite KVStore.\n"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s\\%s.\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss unter %s\\%s ein Verzeichnis für GNUnet "
+#~ "angeben, in dem knotenbezogene Daten gespeichert werden.\n"
+
+#~ msgid "print a value from the configuration file to stdout"
+#~ msgstr ""
+#~ "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+
+#~ msgid "Option `%s' makes no sense without option `%s'."
+#~ msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'."
+
+#~ msgid "Invalid arguments: "
+#~ msgstr "Ungültige Parameter: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Exiting.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Abbruch.\n"
+
+#~ msgid "No applications defined in configuration!\n"
+#~ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#~ msgid "Updated data for %d applications.\n"
+#~ msgstr "Daten für %d Anwendungen wurden aktualisiert.\n"
+
+#~ msgid ""
+#~ "You must specify a name for the PID file in section `%s' under `%s'.\n"
+#~ msgstr ""
+#~ "Sie müssen einen Namen für die PID Datei in Sektion `%s' unter `%s' "
+#~ "angeben.\n"
+
+#~ msgid "Could not write PID to file `%s': %s.\n"
+#~ msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
+
+#~ msgid "Invalid command-line arguments:\n"
+#~ msgstr "Ungültige Kommandozeilen Parameter:\n"
+
+#~ msgid "Argument %d: `%s'\n"
+#~ msgstr "Parameter %d: `%s'\n"
+
+#~ msgid "`%s' starting\n"
+#~ msgstr "`%s' startet\n"
+
+#~ msgid "FATAL: Identity plugin not found!\n"
+#~ msgstr "SCHWERWIEGEND: Identity Plugin wurde nicht gefunden!\n"
+
+#~ msgid "You must specify a non-empty set of transports to test!\n"
+#~ msgstr ""
+#~ "Sie müssen eine Menge an Transporten angeben, die getestet werden "
+#~ "sollen!\n"
+
+#~ msgid "Available MODEs:\n"
+#~ msgstr "Verfügbare MODEs:\n"
+
+#~ msgid " config\t\ttext-based configuration\n"
+#~ msgstr " config\t\ttext-basierte Konfiguration\n"
+
+#~ msgid " menuconfig\ttext-based menu\n"
+#~ msgstr "menuconfig\ttext-basiertes Menü\n"
+
+#~ msgid " wizard-curses\tBasic text-based graphical configuration\n"
+#~ msgstr " wizard-curses\tEinfache text-basierte grafische Konfiguration\n"
+
+#~ msgid ""
+#~ " wizard-gtk\tBasic GTK configuration\n"
+#~ "\n"
+#~ msgstr ""
+#~ " wizard-gtk\tEinfache GTK Konfiguration\n"
+#~ "\n"
+
+#~ msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
+#~ msgstr ""
+#~ "gnunet-setup benötigt Schreibberechtigungen für die Konfigurationsdatei `%"
+#~ "s'\n"
+
+#~ msgid ""
+#~ "Can only run wizard to configure gnunetd.\n"
+#~ "Did you forget the `%s' option?\n"
+#~ msgstr ""
+#~ "Der Assistent kann nur zur Einrichtung von gnunetd gestartet werden.\n"
+#~ "Haben Sie die `%s'-Option vergessen?\n"
+
+#~ msgid "Unable to save configuration file `%s': %s.\n"
+#~ msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
+
+#~ msgid "%s: symbol value `%s' invalid for %s\n"
+#~ msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
+
+#~ msgid "Can't open Service Control Manager"
+#~ msgstr "Der Dienstemanager konnte nicht geöffnet werden"
+
+#~ msgid "Can't create service"
+#~ msgstr "Der Dienst konnte nicht angelegt werden"
+
+#~ msgid "Error changing the permissions of the GNUnet directory"
+#~ msgstr "Fehler beim Ändern der Berechtigungen des GNUnet Verzeichnisses"
+
+#~ msgid "Cannot write to the regisitry"
+#~ msgstr "Konnte nicht in die Registry schreiben"
+
+#~ msgid "Can't access the service"
+#~ msgstr "Auf den Dienst konnte nicht zugegriffen werden"
+
+#~ msgid "Can't delete the service"
+#~ msgstr "Dienst konnte nicht gelöscht werden"
+
+#~ msgid "Unknown error"
+#~ msgstr "Unbekannter Fehler"
+
+#~ msgid "This version of Windows does not support multiple users."
+#~ msgstr "Diese Version von Windows ist nicht Mehrbenutzerfähig."
+
+#~ msgid "Error creating user"
+#~ msgstr "Fehler beim Anlegen des Benutzers"
+
+#~ msgid "Error accessing local security policy"
+#~ msgstr "Fehler beim Zugriff auf die lokale Sicherheitsrichtlinie"
+
+#~ msgid "Error granting service right to user"
+#~ msgstr "Fehler beim Zuweisen des Dienstrechtes dem Benutzer"
+
+#~ msgid "Unknown error while creating a new user"
+#~ msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
+
+#, fuzzy
+#~ msgid "Failed to find handler for `%s'\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
 #~ msgid "GNUnet configuration assistant"
 #~ msgstr "GNUnet Konfigurationsassistent"
 
@@ -4544,9 +4683,6 @@
 #~ msgid "Question"
 #~ msgstr "Frage"
 
-#~ msgid "Do you want to save your settings?"
-#~ msgstr "Möchten Sie Ihre Einstellungen speichern?"
-
 #~ msgid "Unable to save configuration!"
 #~ msgstr "Fehler beim Speichern der Konfiguration!"
 
@@ -4644,9 +4780,6 @@
 #~ msgid "_Introduction"
 #~ msgstr "_Einführung"
 
-#~ msgid "_About"
-#~ msgstr "_über"
-
 #~ msgid "Goes up of one level (single view)"
 #~ msgstr "Bewegt sich eine Ebene nach oben (einfache Ansicht)"
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2006-09-06 00:19:41 UTC (rev 3363)
+++ GNUnet/po/es.po     2006-09-06 00:21:57 UTC (rev 3364)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-07-24 16:55-0700\n"
+"POT-Creation-Date: 2006-09-05 18:18-0700\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -18,250 +18,201 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/transports/ip6.c:60
+#: src/transports/ip6.c:65 src/util/network/io.c:68
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/transports/ip6.c:100
+#: src/transports/ip6.c:109
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr "¡Falló al obtener mi dirección IPv6 (externa)!\n"
+#: src/transports/ip6.c:154 src/transports/ip.c:353
+#, fuzzy, c-format
+msgid "Failed to obtain my (external) %s address!\n"
+msgstr "¡Falló al obtener mi dirección IP (externa)!\n"
 
-#: src/transports/udp6.c:128 src/transports/udp.c:145
+#: src/transports/udp6.c:126 src/transports/udp.c:128
 #, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
+msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
 
-#: src/transports/udp6.c:164
-#, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
-msgstr ""
-
-#: src/transports/udp6.c:235
-#, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp6.c:290
-#, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
-
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr ""
-
-#: src/transports/udp6.c:334 src/transports/tcp6.c:657
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr "%s: Conexión rechazada de una dirección de la \"lista negra\" %s.\n"
-
-#: src/transports/udp6.c:415
+#: src/transports/udp6.c:223
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/transports/udp6.c:699 src/transports/smtp.c:932
-#: src/transports/udp.c:722
+#: src/transports/udp6.c:443 src/transports/udp.c:443
 #, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/http.c:601
+#: src/transports/http.c:614
 msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr ""
 "Esperada bienvenida en la conexión http, encontrada basura. Cerrando la "
 "conexión.\n"
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#: src/transports/http.c:830
 #, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr ""
 "%s: Conexión rechazada de una dirección de la \"lista negra\" %u.%u.%u.%u.\n"
 
-#: src/transports/http.c:1101
+#: src/transports/http.c:1114
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#: src/transports/http.c:1190 src/transports/tcp.c:254
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/transports/http.c:1333
+#: src/transports/http.c:1346
 #, c-format
 msgid ""
 "Could not bind the HTTP listener to port %d. No transport service started.\n"
 msgstr ""
 
-#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
+#: src/transports/http.c:1469 src/applications/testbed/testbed.c:1054
 #, c-format
 msgid "Could not resolve name of HTTP proxy `%s'.\n"
 msgstr "Imposible resolver el nombre del proxy HTTP '%s'.\n"
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1492
 msgid "# bytes received via HTTP"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/transports/http.c:1480
+#: src/transports/http.c:1494
 msgid "# bytes sent via HTTP"
 msgstr "# bytes mandados vía HTTP"
 
-#: src/transports/http.c:1482
+#: src/transports/http.c:1496
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "#bytes omitidos vía HTTP (salientes)"
 
-#: src/transports/smtp.c:297
+#: src/transports/smtp.c:298
 #, c-format
 msgid "Could not resolve name of SMTP server `%s': %s"
 msgstr "Imposible resolver el nombre del servidor de SMTP '%s': %s"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
+#: src/transports/smtp.c:420 src/transports/smtp.c:882
 #, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
 "under `%s'.\n"
 msgstr ""
 
-#: src/transports/smtp.c:489
+#: src/transports/smtp.c:493
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:584
+#: src/transports/smtp.c:588
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
-#: src/transports/smtp.c:591
+#: src/transports/smtp.c:595
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transports/smtp.c:764
+#: src/transports/smtp.c:769
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Enviando un correo electrónico a '%s' se produjo un fallo.\n"
 
-#: src/transports/smtp.c:815
+#: src/transports/smtp.c:820
 #, c-format
 msgid "SMTP server send unexpected response at %s:%d.\n"
 msgstr ""
 
-#: src/transports/smtp.c:838
+#: src/transports/smtp.c:843
 #, c-format
 msgid ""
 "SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
 msgstr ""
 
-#: src/transports/smtp.c:844
+#: src/transports/smtp.c:849
 #, c-format
 msgid "Failed to send `%s' request to SMTP server.\n"
 msgstr ""
 
-#: src/transports/smtp.c:903
+#: src/transports/smtp.c:909
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/transports/tcp.c:465
+#: src/transports/smtp.c:938
 #, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr ""
-
-#: src/transports/tcp.c:1082
+#: src/transports/tcp.c:181
 msgid "Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:324 src/transports/tcp6.c:333
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1449
+#: src/transports/tcp.c:421
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp.c:1451
+#: src/transports/tcp.c:423
 msgid "# bytes sent via TCP"
 msgstr "# bytes enviados por TCP"
 
-#: src/transports/tcp.c:1453
+#: src/transports/tcp.c:425
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transports/udp.c:179
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr ""
-
-#: src/transports/udp.c:250
-#, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp.c:307
-#, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr "Recibido mensaje UDP no válido del %u.%u.%u.%u:%u, omitiendo.\n"
-
-#: src/transports/udp.c:332
-#, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
-
-#: src/transports/udp.c:417
+#: src/transports/udp.c:217
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/transports/udp.c:551
+#: src/transports/udp.c:312
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 "Falló al mandar el mensaje de tamaño %d a través de UDP a %u.%u.%u.%u:%u: %"
 "s\n"
 
-#: src/transports/udp.c:707
+#: src/transports/udp.c:449
 msgid "# bytes received via UDP"
 msgstr "# bytes recibidos vía UDP"
 
-#: src/transports/udp.c:709
+#: src/transports/udp.c:451
 msgid "# bytes sent via UDP"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transports/udp.c:711
+#: src/transports/udp.c:453
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/transports/ip.c:124
-#, c-format
+#: src/transports/ip.c:92
+#, fuzzy, c-format
+msgid "No interface specified in section `%s' under `%s'!\n"
+msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
+
+#: src/transports/ip.c:150
+#, fuzzy, c-format
 msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
-msgstr ""
+"Could not find interface `%s' using `%s', trying to find another interface.\n"
+msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
-#: src/transports/ip.c:149
+#: src/transports/ip.c:182
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
-#: src/transports/ip.c:193
+#: src/transports/ip.c:226
 #, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
 
-#: src/transports/ip.c:203
+#: src/transports/ip.c:236
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -270,40 +221,57 @@
 "Hay más de una dirección IP especificada para la interfaz '%s'.\n"
 "GNUnet usará %u.%u.%u.%u.\n"
 
-#: src/transports/ip.c:224
+#: src/transports/ip.c:257
 #, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr "Imposible resolver '%s' para determinar nuestra dirección IP: %s\n"
 
-#: src/transports/ip.c:256
+#: src/transports/ip.c:289
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
-msgstr "¡Falló al obtener mi dirección IP (externa)!\n"
-
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr ""
-
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr ""
-
-#: src/transports/tcp6.c:958
+#: src/transports/tcp6.c:179
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/transports/tcp6.c:1002
+#: src/transports/tcp6.c:221
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
+#: src/transports/tcp6.c:430
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "# bytes recibidos por TCP"
+
+#: src/transports/tcp6.c:432
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "# bytes enviados por TCP"
+
+#: src/transports/tcp6.c:434
+#, fuzzy
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr "# bytes omitidos por TCP (salientes)"
+
+#: src/transports/tcp_helper.c:182
+#, fuzzy
+msgid "Received malformed message instead of welcome message. Closing.\n"
+msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+
+#: src/transports/tcp_helper.c:193
+#, fuzzy
+msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+
+#: src/transports/udp_helper.c:93
+#, fuzzy
+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:50
-#: src/applications/session/sessiontest.c:48
+#: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:107
 #: src/applications/tbench/tbenchtest_udp.c:107
@@ -312,7 +280,6 @@
 msgstr "# de pares conectados"
 
 #: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/session/sessiontest.c:118
 #: src/applications/tbench/tbenchtest.c:199
 #: src/applications/tbench/tbenchtest_udp.c:201
 #: src/applications/gap/gaptest.c:318
@@ -321,7 +288,6 @@
 msgstr "Esperando a gnunetd para empezar (%u ciclos restantes)...\n"
 
 #: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/session/sessiontest.c:133
 #: src/applications/tbench/tbenchtest.c:122
 #: src/applications/tbench/tbenchtest_udp.c:122
 #: src/applications/gap/gaptest.c:330
@@ -342,28 +308,8 @@
 msgstr "Pregunta (coje KEY, pone KEY VALUE, borra KEY VALUE) a una tabla DHT."
 
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85
-#: src/applications/tbench/gnunet-tbench.c:124
-#: src/applications/tbench/gnunet-tbench.c:134
-#: src/applications/tbench/gnunet-tbench.c:147
-#: src/applications/tbench/gnunet-tbench.c:157
-#: src/applications/tbench/gnunet-tbench.c:167
-#: src/applications/tbench/gnunet-tbench.c:182
-#: src/applications/tracekit/gnunet-tracekit.c:73
-#: src/applications/tracekit/gnunet-tracekit.c:87
-#: src/applications/tracekit/gnunet-tracekit.c:122
-#: src/applications/tracekit/gnunet-tracekit.c:136
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/server/gnunet-transport-check.c:448
-#: src/server/gnunet-transport-check.c:462
-#: src/server/gnunet-transport-check.c:479
-#: src/server/gnunet-transport-check.c:509
+#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
+#: src/util/getopt/setoption.c:149
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción '%s'.\n"
@@ -373,21 +319,8 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
-#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
-#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
-#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
+#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
+#: src/setup/gnunet-setup.c:246
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Usar --help para obtener una lista de opciones.\n"
@@ -559,7 +492,7 @@
 
 #: src/applications/dht/module/dht.c:1603
 #: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "'%s' fue llamada con un retraso de una hora(¿bug?)\n"
@@ -641,7 +574,7 @@
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "'%s' registrando manejadores %d y %d\n"
 
-#: src/applications/chat/chat.c:212
+#: src/applications/chat/chat.c:216
 msgid "enables P2P-chat (incomplete)"
 msgstr "Activa el chat P2P (incompleto)"
 
@@ -654,9 +587,6 @@
 msgstr "Arranca el cliente de chat de GNUnet"
 
 #: src/applications/chat/gnunet-chat.c:151
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363
-#: src/applications/fs/tools/gnunet-delete.c:142
 msgid "Could not connect to gnunetd.\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
@@ -673,252 +603,234 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/applications/advertising/advertising.c:162
 #, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr "mensaje de saludo de '%s' inválido (firma inválida). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:167
+#: src/applications/advertising/advertising.c:168
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
 "mensaje de saludo recibido inválido (tiempo superior al límite). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:176
+#: src/applications/advertising/advertising.c:177
 #, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr "Inicio de comunicación del protocolo %d recibido.\n"
 
-#: src/applications/advertising/advertising.c:295
+#: src/applications/advertising/advertising.c:297
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr "Imposible mandar ahora saludos+PING, buffer del ping lleno.\n"
 
-#: src/applications/advertising/advertising.c:308
+#: src/applications/advertising/advertising.c:310
 #, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "'%s' falló (%d, %u). No se mandará el PING.\n"
 
-#: src/applications/advertising/advertising.c:463
+#: src/applications/advertising/advertising.c:467
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
 
-#: src/applications/advertising/advertising.c:470
+#: src/applications/advertising/advertising.c:474
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr "Es inútil anunciarnos: no hay más pares que nos conozcan más allá.\n"
 
-#: src/applications/advertising/advertising.c:572
+#: src/applications/advertising/advertising.c:580
 #, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr "Eliminando saludo del par '%s' (expiró hace %ds).\n"
 
-#: src/applications/advertising/advertising.c:734
+#: src/applications/advertising/advertising.c:760
 msgid "# Peer advertisements received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/applications/advertising/advertising.c:735
+#: src/applications/advertising/advertising.c:761
 msgid "# Self advertisments transmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/applications/advertising/advertising.c:736
+#: src/applications/advertising/advertising.c:762
 msgid "# Foreign advertisements forwarded"
 msgstr "# Anuncios a extraños mandados"
 
-#: src/applications/advertising/advertising.c:738
-#: src/applications/pingpong/pingpong.c:462
+#: src/applications/advertising/advertising.c:764
+#: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/applications/advertising/advertising.c:742
-#: src/applications/session/connect.c:752
+#: src/applications/advertising/advertising.c:768
+#: src/applications/session/connect.c:779
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "'%s' registrando manejador %d (texto plano e hipertexto)\n"
 
-#: src/applications/advertising/advertising.c:761
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "¡Advertencias de la red desconectadas por configuración!\n"
-
-#: src/applications/advertising/advertising.c:781
+#: src/applications/advertising/advertising.c:785
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 "Asegura que este par es conocido por otros pares y descubre otros pares"
 
-#: src/applications/topology_default/topology.c:398
+#: src/applications/pingpong/pingpong.c:123
+#: src/applications/pingpong/pingpong.c:191
+#: src/applications/pingpong/pingpong.c:244
+#: src/applications/pingpong/pingpong.c:313
 #, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
-msgstr ""
-
-#: src/applications/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
-#, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/applications/pingpong/pingpong.c:130
+#: src/applications/pingpong/pingpong.c:135
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Recibido ping de otro par. Omitiendo.\n"
 
-#: src/applications/pingpong/pingpong.c:187
+#: src/applications/pingpong/pingpong.c:201
 msgid "Received PING not destined for us!\n"
 msgstr "¡Recibido PING no destinado a nosotros!\n"
 
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/pingpong/pingpong.c:286
+#: src/applications/pingpong/pingpong.c:349
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:366
+#: src/applications/pingpong/pingpong.c:390
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:452
+#: src/applications/pingpong/pingpong.c:478
 msgid "# encrypted PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/applications/pingpong/pingpong.c:454
+#: src/applications/pingpong/pingpong.c:480
 msgid "# plaintext PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:456
+#: src/applications/pingpong/pingpong.c:482
 msgid "# encrypted PING messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:458
+#: src/applications/pingpong/pingpong.c:484
 msgid "# PING messages created"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:460
+#: src/applications/pingpong/pingpong.c:486
 msgid "# encrypted PONG messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:464
+#: src/applications/pingpong/pingpong.c:490
 msgid "# encrypted PING messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:500
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "'%s' registrando manejadores %d %d (texto plano e hipertexto)\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_sqlite/sqlite.c:45
+#: src/applications/sqstore_sqlite/sqlite.c:52
 #: src/applications/sqstore_mysql/mysql.c:137
 #: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/kvstore_sqlite/kv_sqlite.c:43
-#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/applications/sqstore_mysql/mysql.c:389
+#: src/applications/sqstore_mysql/mysql.c:728
+#: src/applications/sqstore_mysql/mysql.c:743
+#: src/applications/sqstore_mysql/mysql.c:752
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:786
+#: src/applications/sqstore_mysql/mysql.c:840
+#: src/applications/sqstore_mysql/mysql.c:925
+#: src/applications/sqstore_mysql/mysql.c:935
+#: src/applications/sqstore_mysql/mysql.c:1007
+#: src/applications/sqstore_mysql/mysql.c:1016
+#: src/applications/sqstore_mysql/mysql.c:1056
+#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
+#: src/applications/sqstore_sqlite/sqlite.c:158
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_sqlite/sqlite.c:307
+#: src/applications/sqstore_sqlite/sqlite.c:327
 #: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
+#: src/applications/sqstore_mysql/mysql.c:803
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
+#: src/applications/sqstore_sqlite/sqlite.c:308
+#: src/applications/sqstore_sqlite/sqlite.c:328
 msgid "sqlite datastore"
 msgstr "base de datos sqlite"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1035
-#, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
-msgstr ""
-"El fichero de configuración debe especificar el directorio para almacenar "
-"los datos FS en la sección '%s' bajo '%s'.\n"
-
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-#: src/applications/sqstore_mysql/mysql.c:1178
+#: src/applications/sqstore_sqlite/sqlite.c:1177
+#: src/applications/sqstore_mysql/mysql.c:1182
 msgid "# bytes in datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "¡Imposible inicializar libgnunetutil!\n"
-
-#: src/applications/session/connect.c:209
+#: src/applications/session/connect.c:221
 #, 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:246
+#: src/applications/session/connect.c:258
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
 
-#: src/applications/session/connect.c:523
+#: src/applications/session/connect.c:517
+#, 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:540
 #, 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:532
+#: src/applications/session/connect.c:550
 #, 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:587
+#: src/applications/session/connect.c:608
 msgid ""
 "Error parsing encrypted session key, 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:597
+#: src/applications/session/connect.c:619
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
 
-#: src/applications/session/connect.c:742
+#: src/applications/session/connect.c:768
 msgid "# session keys sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/applications/session/connect.c:744
+#: src/applications/session/connect.c:770
 msgid "# session keys rejected"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/applications/session/connect.c:746
+#: src/applications/session/connect.c:772
 msgid "# session keys accepted"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/applications/session/connect.c:748
+#: src/applications/session/connect.c:774
 msgid "# sessions established"
 msgstr "# sesiones establecidas"
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
@@ -927,7 +839,7 @@
 "%s::%s - RPC %s:%p no pudo ser registrada: otro evento está actualmente "
 "usando este nombre (%p)\n"
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
@@ -936,66 +848,66 @@
 "%s::%s - RPC %s:%p no pudo ser desregistrada: otro evento está actualmente "
 "registrado con este nombre (%p)\n"
 
-#: src/applications/rpc/rpc.c:232
+#: src/applications/rpc/rpc.c:233
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - RPC %s:%p no pudo ser desregistrada: no encontrada\n"
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/rpc/rpc.c:280
 #, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s RPC asíncrona %s:%p no pudo ser desregistrada: no encontrada\n"
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
+#: src/applications/rpc/rpc.c:1100
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/rpc/rpc.c:945
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Omitiendo la petición RPC %u: mensaje mal formado.\n"
 
-#: src/applications/rpc/rpc.c:1388
+#: src/applications/rpc/rpc.c:1414
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "No fue desregistrada RPC: %s:%p\n"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1441
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "'%s' registrando manejadores %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/rpc/rpc.c:1462
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/applications/rpc/rpc.c:1491
+#: src/applications/rpc/rpc.c:1519
 msgid "RPC async reply invalid.\n"
 msgstr "RPC respuesta asíncrona no válida.\n"
 
-#: src/applications/rpc/rpc.c:1562
+#: src/applications/rpc/rpc.c:1591
 msgid "async RPC reply not received.\n"
 msgstr "respuesta RPC asíncrona no recibida.\n"
 
 #: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
+#: src/applications/sqstore_mysql/mysql.c:804
 msgid "mysql datastore"
 msgstr "base de datos mysql"
 
-#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1110
 #, c-format
 msgid "Query `%s' had no results.\n"
 msgstr "La pregunta '%s' no tuvo resultados.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1205
+#: src/applications/sqstore_mysql/mysql.c:1212
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1223
+#: src/applications/sqstore_mysql/mysql.c:1230
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -1003,37 +915,27 @@
 "Falló al cargar el modulo de la base de datos MySQL.  ¡Comprueba que MySQL "
 "esta ejecutandose y esta configurada correctamente!\n"
 
-#: src/applications/datastore/filter.c:42
+#: src/applications/datastore/datastore.c:119
 #, c-format
-msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
-msgstr ""
-"La configuración debe especificar un directorio para los datos FS en la "
-"sección '%s' bajo'%s'.\n"
-
-#: src/applications/datastore/datastore.c:118
-#, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Test de disponibilidad fallido para '%s' en %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:142
+#: src/applications/datastore/datastore.c:143
 #, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Falló al borrar de la base de datos %s.\n"
 
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1086
-#: src/applications/fs/fsui/file_info.c:66
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s\n"
+#: src/applications/datastore/datastore.c:358
+#: src/applications/datastore/datastore.c:454
+msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
-"El fichero de configuración debe especificar un directorio para que GNUnet "
-"almacene la información por-par bajo%s%s\n"
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/identity/hostkey.c:109
+#, fuzzy, c-format
+msgid "Failed to access GNUnet home directory `%s'\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/applications/identity/hostkey.c:139
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -1041,19 +943,15 @@
 "Se produjo un fallo al comprobar la clave local existente en el fichero '%"
 "s', creando nueva clave local.\n"
 
-#: src/applications/identity/hostkey.c:127
+#: src/applications/identity/hostkey.c:147
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
-msgstr "¡Imposible crear la clave local!\n"
-
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:160
 msgid "Done creating hostkey.\n"
 msgstr "Correcto al crear la clave local.\n"
 
-#: src/applications/identity/identity.c:333
+#: src/applications/identity/identity.c:346
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -1061,34 +959,42 @@
 "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
 "Eliminando.\n"
 
-#: src/applications/identity/identity.c:366
-#, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "¡%s '%s' devolvió hosts desconocidos!\n"
+#: src/applications/identity/identity.c:359
+#, fuzzy, c-format
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
+"Eliminando.\n"
 
-#: src/applications/identity/identity.c:648
-#: src/applications/identity/identity.c:666
+#: src/applications/identity/identity.c:396
+#, fuzzy, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
+
+#: src/applications/identity/identity.c:684
+#: src/applications/identity/identity.c:705
 #, c-format
 msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr "Borrando el fichero '%s' que contiene datos de saludo no válidos.\n"
 
-#: src/applications/identity/identity.c:716
+#: src/applications/identity/identity.c:758
 #, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
 
-#: src/applications/identity/identity.c:724
+#: src/applications/identity/identity.c:767
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Falló la verificación de la firma: firma no válida.\n"
 
 #: src/applications/testbed/commands.c:1130
-#: src/applications/stats/gnunet-stats.c:61
+#: src/applications/stats/gnunet-stats.c:63
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr "Mensajes P2P soportados:\n"
 
 #: src/applications/testbed/commands.c:1132
-#: src/applications/stats/gnunet-stats.c:64
+#: src/applications/stats/gnunet-stats.c:66
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr "Mensajes cliente-servidor soportados:\n"
@@ -1120,7 +1026,7 @@
 "Trying again in %d seconds...\n"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#: src/applications/testbed/gnunet-testbed.c:415
 #, c-format
 msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr "Rechazada conexión no autorizada de %u.%u.%u.%u.\n"
@@ -1245,7 +1151,6 @@
 msgstr ""
 
 #: src/applications/testbed/testbed.c:1079
-#: src/applications/bootstrap_http/http.c:81
 #, c-format
 msgid "Invalid URL `%s' (must begin with `%s')\n"
 msgstr "URL invalida '%s' (debe comenzar por '%s')\n"
@@ -1274,75 +1179,100 @@
 msgid "Exit register (error: no http response read).\n"
 msgstr "Saliendo del registro (error: no se leyó una respuesta de http).\n"
 
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1361
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/applications/transport/transport.c:136
 #, c-format
-msgid "No transport of type %d known.\n"
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:676
+#: src/applications/transport/transport.c:183
 #, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:691
+#: src/applications/transport/transport.c:278
 #, c-format
-msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
+msgid "Transmission attempt failed, transport type %d unknown.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:717
+#: src/applications/transport/transport.c:366
 #, c-format
+msgid "No transport of type %d known.\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:423
+msgid "No transport succeeded in creating a hello!\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:596
+#, fuzzy, c-format
+msgid "Loading transports `%s'\n"
+msgstr "Probando transporte(s) %s\n"
+
+#: src/applications/transport/transport.c:616
+#, fuzzy, c-format
+msgid "Could not load transport plugin `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/applications/transport/transport.c:626
+#, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 "La biblioteca de transporte '%s' no provee la función '%s%s' requerida.\n"
 
-#: src/applications/transport/transport.c:738
+#: src/applications/transport/transport.c:643
+#, fuzzy, c-format
+msgid "Loaded transport `%s'\n"
+msgstr "Transporte(s) disponible(s): %s\n"
+
+#: src/applications/transport/transport.c:654
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:559
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:560
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:561
 msgid "# fragments discarded"
 msgstr "# fragmentos descartados"
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/fragmentation/fragmentation.c:573
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "'%s' registrando manejador %d\n"
 
+#: src/applications/stats/gnunet-stats.c:90
+msgid "Print statistics about GNUnet operations."
+msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
+
 #: src/applications/stats/gnunet-stats.c:94
 msgid "prints supported protocol messages"
 msgstr "imprime los mensajes del protocolo"
 
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
-msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
-
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/stats/gnunet-stats.c:137
+#: src/applications/tbench/gnunet-tbench.c:136
+#: src/applications/tracekit/gnunet-tracekit.c:319
+#: src/applications/template/gnunet-template.c:101
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/stats/gnunet-stats.c:156
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/applications/stats/clientapi.c:179
+#: src/applications/stats/clientapi.c:180
 msgid "Uptime (seconds)"
 msgstr ""
 
@@ -1365,112 +1295,119 @@
 msgid "# bytes of noise received"
 msgstr "# bytes de ruido recibidos"
 
-#: src/applications/stats/statistics.c:374
+#: src/applications/stats/statistics.c:364
+#, fuzzy, c-format
+msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
+msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
+
+#: src/applications/stats/statistics.c:385
 msgid "keeps statistics about gnunetd's operation"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:95
+#: src/applications/tbench/gnunet-tbench.c:65
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:67
 msgid "output in gnuplot format"
 msgstr "salida en formato de gnuplot"
 
-#: src/applications/tbench/gnunet-tbench.c:98
+#: src/applications/tbench/gnunet-tbench.c:71
 msgid "number of iterations"
 msgstr "número de repeticiones"
 
-#: src/applications/tbench/gnunet-tbench.c:100
+#: src/applications/tbench/gnunet-tbench.c:75
 msgid "number of messages to use per iteration"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/applications/tbench/gnunet-tbench.c:102
+#: src/applications/tbench/gnunet-tbench.c:78
 msgid "receiver host identifier (ENC file name)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:104
+#: src/applications/tbench/gnunet-tbench.c:81
 msgid "message size"
 msgstr "tamaño del mensaje"
 
-#: src/applications/tbench/gnunet-tbench.c:106
+#: src/applications/tbench/gnunet-tbench.c:84
 msgid "sleep for SPACE ms after each a message block"
 msgstr "duerme durante SPACE ms después de cada bloque de mensajes"
 
-#: src/applications/tbench/gnunet-tbench.c:108
+#: src/applications/tbench/gnunet-tbench.c:87
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/applications/tbench/gnunet-tbench.c:111
+#: src/applications/tbench/gnunet-tbench.c:91
 msgid "number of messages in a message block"
 msgstr "número de mensajes en un bloque de mensajes"
 
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
-msgstr ""
-
-#: src/applications/tbench/gnunet-tbench.c:225
+#: src/applications/tbench/gnunet-tbench.c:153
+#, c-format
 msgid "You must specify a receiver!\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/tbench/gnunet-tbench.c:162
 #, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 "ID del par receptor especificada no válida ('%s' no es un nombre válido).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:249
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "Time:\n"
 msgstr "Tiempo:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:250
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tmax      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tmin      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:254
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "\tmean     %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "\tvariance %8.4fms\n"
 
-#: src/applications/tbench/gnunet-tbench.c:259
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "Loss:\n"
 msgstr "Perdido:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/tbench/gnunet-tbench.c:200
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tmax      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:262
+#: src/applications/tbench/gnunet-tbench.c:202
 #, c-format
 msgid "\tmin      %u\n"
 msgstr "\tmin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:264
+#: src/applications/tbench/gnunet-tbench.c:204
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "\tmean     %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/tbench/gnunet-tbench.c:206
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "\tvariance %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/applications/tbench/gnunet-tbench.c:215
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/tbench/gnunet-tbench.c:219
 #, c-format
 msgid ""
 "\n"
@@ -1513,234 +1450,239 @@
 msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:448
+#: src/applications/tbench/tbench.c:460
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
+#: src/applications/tracekit/gnunet-tracekit.c:49
 msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
+#: src/applications/tracekit/gnunet-tracekit.c:52
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
+#: src/applications/tracekit/gnunet-tracekit.c:58
 msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
+#: src/applications/tracekit/gnunet-tracekit.c:62
 msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
+#: src/applications/tracekit/gnunet-tracekit.c:116
+#, c-format
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:222
+#: src/applications/tracekit/gnunet-tracekit.c:163
 #, c-format
 msgid "`%s' is not connected to any peer.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:233
+#: src/applications/tracekit/gnunet-tracekit.c:197
 #, c-format
-msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
-msgstr ""
-
-#: src/applications/tracekit/gnunet-tracekit.c:260
-#, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/applications/tracekit/gnunet-tracekit.c:212
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
+#: src/applications/tracekit/gnunet-tracekit.c:235
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
+#: src/applications/tracekit/gnunet-tracekit.c:350
 msgid "Could not send request to gnunetd.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
+#: src/applications/tracekit/tracekit.c:68
+#: src/applications/tracekit/tracekit.c:201
 #, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:243
+#: src/applications/tracekit/tracekit.c:263
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:331
+#: src/applications/tracekit/tracekit.c:354
 #, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:431
+#: src/applications/tracekit/tracekit.c:461
 msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/gap/gap.c:1635
 #, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/applications/gap/gap.c:1618
+#: src/applications/gap/gap.c:1636
 msgid "myself"
 msgstr "yo"
 
-#: src/applications/gap/gap.c:1791
+#: src/applications/gap/gap.c:1809
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Solicitada la cobertura de tráfico pero el servicio de tráfico no ha sido "
 "cargado. Rechazando la petición.\n"
 
-#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1820 src/applications/fs/module/anonymity.c:66
 msgid "Failed to get traffic stats.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
+#: src/applications/gap/gap.c:1826 src/applications/gap/gap.c:1831
+#: src/applications/gap/gap.c:1837
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 "Imposible satisfacer el nivel deseado de anonimato, ignorando la petición.\n"
 
-#: src/applications/gap/gap.c:2077
+#: src/applications/gap/gap.c:2116
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2078
+#: src/applications/gap/gap.c:2117
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2079
+#: src/applications/gap/gap.c:2118
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2080
+#: src/applications/gap/gap.c:2119
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2081
+#: src/applications/gap/gap.c:2120
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2082
+#: src/applications/gap/gap.c:2121
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2083
+#: src/applications/gap/gap.c:2122
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2084
+#: src/applications/gap/gap.c:2123
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2085
+#: src/applications/gap/gap.c:2124
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2086
+#: src/applications/gap/gap.c:2125
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2087
+#: src/applications/gap/gap.c:2126
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2088
+#: src/applications/gap/gap.c:2127
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2089
+#: src/applications/gap/gap.c:2128
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2090
+#: src/applications/gap/gap.c:2129
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2091
+#: src/applications/gap/gap.c:2130
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2092
+#: src/applications/gap/gap.c:2131
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2093
+#: src/applications/gap/gap.c:2132
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2094
+#: src/applications/gap/gap.c:2133
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2095
+#: src/applications/gap/gap.c:2134
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2112
+#: src/applications/gap/gap.c:2150
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/gap/gap.c:2178
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "'%s' registrando manejadores %d %d\n"
 
-#: src/applications/gap/pid_table.c:151
+#: src/applications/gap/pid_table.c:156
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:153
+#: src/applications/gap/pid_table.c:158
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/getoption/getoption.c:74
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr "'%s' registrando un manejador de clientes %d\n"
 
-#: src/applications/getoption/getoption.c:82
+#: src/applications/getoption/getoption.c:84
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "permite a los clientes determinar la configuración de gnunetd"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:71
+#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-search.c:129
+#: src/applications/fs/tools/gnunet-download.c:57
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:35
+#: src/applications/fs/tools/gnunet-pseudonym.c:74
 msgid "automate creation of a namespace by starting a collection"
 msgstr "creación automática de un espacio al empezar una colección"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
+#: src/applications/fs/tools/gnunet-pseudonym.c:78
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "crea un nuevo pseudónimo bajo el APODO dado"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
+#: src/applications/fs/tools/gnunet-pseudonym.c:81
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "borra el pseudónimo con el APODO dado"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
+#: src/applications/fs/tools/gnunet-pseudonym.c:84
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 "finaliza la construcción automática de un espacio (finaliza la recolección)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
+#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-search.c:132
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr ""
+"Crea nuevos pseudónimos, borra pseudónimos o lista los pseudónimos "
+"existentes."
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -1748,15 +1690,13 @@
 "usa la clave dada para anunciar el espacio (úsalo cuando crees un nuevo "
 "pseudónimo)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
+#, fuzzy
+msgid "specify metadata describing the namespace or collection"
 msgstr ""
-"especifica que los contenidos del espacio son del MIMETYPE dado (úsalo "
-"cuando crees un nuevo pseudónimo)"
+"finaliza la construcción automática de un espacio (finaliza la recolección)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
+#: src/applications/fs/tools/gnunet-pseudonym.c:95
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -1764,246 +1704,159 @@
 "no genera un anuncio para este espacio (úsalo cuando crees un nuevo "
 "pseudónimo)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
+#: src/applications/fs/tools/gnunet-pseudonym.c:98
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr "no listar los pseudónimos de la base de datos de pseudónimos"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
+#: src/applications/fs/tools/gnunet-pseudonym.c:101
 msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr ""
-"especifica el NAME  para ser el nombre real del usuario que controla el "
-"espacio (úsalo cuando crees un nuevo pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
 msgstr ""
 "especifica el IDENTIFIER para ser la dirección del punto de entrada al "
 "contenido en el espacio (úsalo cuando crees un nuevo pseudónimo)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
+#: src/applications/fs/tools/gnunet-pseudonym.c:104
 msgid "set the rating of a namespace"
 msgstr "cambia la valoración de un espacio"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr ""
-"usa la DESCRIPTION para describir el contenido del espacio (úsalo cuando "
-"crees un nuevo pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"especifica la URI dada como dirección que contiene mas información del "
-"espacio (úsalo cuando crees un nuevo pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr ""
-"Crea nuevos pseudónimos, borra pseudónimos o lista los pseudónimos "
-"existentes."
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-msgid "AND"
-msgstr "Y"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#: src/applications/fs/tools/gnunet-pseudonym.c:138
 #, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr "Argumento no válido: '%s'\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
-#: src/setup/gnunet-setup.c:179
-msgid "Invalid arguments. Exiting.\n"
-msgstr "Argumentos no válidos. Saliendo.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:142
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "El espacio '%s' (%s) ha sido valorado con un %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#: src/applications/fs/tools/gnunet-pseudonym.c:178
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "\tValoración (después de la actualización): %d\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Colección detenida.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#: src/applications/fs/tools/gnunet-pseudonym.c:223
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr "Falló al parar la recolección (¿no está activa?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#: src/applications/fs/tools/gnunet-pseudonym.c:231
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#: src/applications/fs/tools/gnunet-pseudonym.c:235
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr "Error borrando el pseudónimo '%s' (¿no existe?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#: src/applications/fs/tools/gnunet-pseudonym.c:254
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#: src/applications/fs/tools/gnunet-pseudonym.c:257
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#: src/applications/fs/tools/gnunet-pseudonym.c:299
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#: src/applications/fs/tools/gnunet-pseudonym.c:304
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "El espacio '%s' fue creado (root: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#: src/applications/fs/tools/gnunet-pseudonym.c:326
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/applications/fs/tools/gnunet-delete.c:37
+#: src/applications/fs/tools/gnunet-directory.c:83
 #, c-format
-msgid "%8u of %8u bytes deleted."
-msgstr "%8u de %8u bytes borrados."
-
-#: src/applications/fs/tools/gnunet-delete.c:52
-msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-msgstr ""
-"especifica el fichero a borrar de GNUnet (el fichero debe existir "
-"obligatoriamente)"
-
-#: src/applications/fs/tools/gnunet-delete.c:61
-msgid ""
-"Remove file from GNUnet.  The specified file is not removed\n"
-"from the filesystem but just from the local GNUnet datastore."
-msgstr ""
-"Borra el fichero de GNUnet. El fichero especificado no es borrado\n"
-"del sistema de ficheros, solamente de la base de datos local de GNUnet."
-
-#: src/applications/fs/tools/gnunet-delete.c:139
-msgid "You must specify a filename (option -f)\n"
-msgstr "Debes especificar un fichero (opción -f)\n"
-
-#: src/applications/fs/tools/gnunet-delete.c:151
-#, c-format
-msgid ""
-"Error deleting file %s.\n"
-"Probably a few blocks were already missing from the database.\n"
-msgstr ""
-"Error borrando el fichero %s.\n"
-"Probablemente algunos bloques se hayan perdido de la base de datos.\n"
-
-#: src/applications/fs/tools/gnunet-directory.c:76
-#, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==> Directorio '%s':\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:81
+#: src/applications/fs/tools/gnunet-directory.c:90
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:111
+#: src/applications/fs/tools/gnunet-directory.c:124
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:113
+#: src/applications/fs/tools/gnunet-directory.c:126
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "%d ficheros encontrados en el directorio.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:141
+msgid "Perform directory related operations."
+msgstr "Realiza operaciones respecto al directorio."
+
+#: src/applications/fs/tools/gnunet-directory.c:143
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 "borra todas las entradas de la base de datos del directorio y detiene el "
 "seguimiento de URIs"
 
-#: src/applications/fs/tools/gnunet-directory.c:133
+#: src/applications/fs/tools/gnunet-directory.c:147
 msgid "list entries from the directory database"
 msgstr "lista las entradas de la base de datos del directorio"
 
-#: src/applications/fs/tools/gnunet-directory.c:136
+#: src/applications/fs/tools/gnunet-directory.c:150
 msgid "start tracking entries for the directory database"
 msgstr "comienza a seguir las entradas de la base de datos del directorio"
 
-#: src/applications/fs/tools/gnunet-directory.c:140
-msgid "gnunet-directory [OPTIONS] [FILENAMES]"
-msgstr "directorio-de-gnunet [OPCIONES] [FICHEROS]"
-
-#: src/applications/fs/tools/gnunet-directory.c:141
-msgid "Perform directory related operations."
-msgstr "Realiza operaciones respecto al directorio."
-
-#: src/applications/fs/tools/gnunet-directory.c:206
+#: src/applications/fs/tools/gnunet-directory.c:181
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "%d entradas encontradas.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:110
+#: src/applications/fs/tools/gnunet-insert.c:139
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Creada la entrada '%s' en el espacio '%s'\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:115
+#: src/applications/fs/tools/gnunet-insert.c:144
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr "Fallo al añadir la entrada al espacio '%s' (¿existe?)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:136
-#, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
+#: src/applications/fs/tools/gnunet-insert.c:166
+#, fuzzy, c-format
+msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu de %16llu bytes insertados (%s estimado para completar)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:150
+#: src/applications/fs/tools/gnunet-insert.c:178
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Subida de '%s' completada, %llu bytes tomaron %llu segundos (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:164
-#, fuzzy, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
-msgstr ""
-"Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
-"kbps.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:174
+#: src/applications/fs/tools/gnunet-insert.c:189
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:187
+#: src/applications/fs/tools/gnunet-insert.c:200
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr "Descarga abortada"
+
+#: src/applications/fs/tools/gnunet-insert.c:206
 #, c-format
 msgid ""
 "\n"
@@ -2012,7 +1865,7 @@
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:209
+#: src/applications/fs/tools/gnunet-insert.c:228
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
@@ -2020,14 +1873,18 @@
 "aunque gnunetd este corriendo en el ordenador local, fuerza la creación de "
 "una copia en vez de hacer un enlace al directorio para compartir de GNUnet"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:232
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:235
 msgid ""
 "use libextractor to add additional direct references to directory entries"
 msgstr ""
 "usa libextractor para añadir referencias directas adicionales a las entradas "
 "del directorio"
 
-#: src/applications/fs/tools/gnunet-insert.c:214
+#: src/applications/fs/tools/gnunet-insert.c:238
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2035,7 +1892,11 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/fs/tools/gnunet-insert.c:240
+msgid "Make files available to GNUnet for sharing."
+msgstr "Permite a GNUnet disponer de los ficheros para compartirlos."
+
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
@@ -2043,7 +1904,7 @@
 "cambia el intervalo de disponibilidad de las actualizaciones a SEGUNDOS "
 "(para inserciones en el espacio solamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:221
+#: src/applications/fs/tools/gnunet-insert.c:247
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2051,7 +1912,7 @@
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-insert.c:251
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -2059,11 +1920,11 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:256
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
 
-#: src/applications/fs/tools/gnunet-insert.c:230
+#: src/applications/fs/tools/gnunet-insert.c:259
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2071,7 +1932,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:263
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2079,21 +1940,17 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:236
+#: src/applications/fs/tools/gnunet-insert.c:267
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/applications/fs/tools/gnunet-insert.c:240
-msgid "process directories recursively"
-msgstr "procesa los directorios recursivamente"
-
-#: src/applications/fs/tools/gnunet-insert.c:242
+#: src/applications/fs/tools/gnunet-insert.c:273
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -2101,174 +1958,120 @@
 "especifica esto como una aperiódica pero actualizada publicación (para "
 "inserciones en el espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:281
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 "especifica el tiempo para la creación de un Superbloque (vea la página del "
 "manual para el formato)"
 
-#: src/applications/fs/tools/gnunet-insert.c:250
+#: src/applications/fs/tools/gnunet-insert.c:284
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "ID de la versión previa del contenido (para actualizaciones del espacio "
 "únicamente)"
 
-#: src/applications/fs/tools/gnunet-insert.c:257
-msgid "Make files available to GNUnet for sharing."
-msgstr "Permite a GNUnet disponer de los ficheros para compartirlos."
+#: src/applications/fs/tools/gnunet-insert.c:326
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for insertion.\n"
+msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:344
+#: src/applications/fs/tools/gnunet-insert.c:351
 #, c-format
-msgid "You must pass a positive number to the `%s' option.\n"
-msgstr "Debes pasar un número positivo a la opción '%s'.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:429
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
-msgstr ""
-"Tipo de metadatos desconocido en la opción de metadatos '%s'.  Usando el "
-"tipo de metadatos 'desconocido' en su lugar.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:537
-#: src/applications/fs/tools/gnunet-unindex.c:145
-#, c-format
-msgid "You must specify a list of files to insert.\n"
-msgstr "Debes especificar una lista de ficheros a insertar.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:541
-#, c-format
-msgid "Only one file or directory can be specified at a time.\n"
-msgstr "Solo un fichero o un directorio puede ser especificado cada vez.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:545
-#, c-format
-msgid "You must specify a file or directory to upload.\n"
-msgstr "Debes especificar un fichero o directorio para subir.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:595
-#, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:617
+#: src/applications/fs/tools/gnunet-insert.c:378
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Imposible acceder al espacio '%s' (¿no existe?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:636
+#: src/applications/fs/tools/gnunet-insert.c:394
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Se produjo un fallo al analizar el tiempo. Use el formato '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:649
-#: src/applications/fs/tools/gnunet-insert.c:653
-#: src/applications/fs/tools/gnunet-insert.c:657
-#: src/applications/fs/tools/gnunet-insert.c:661
-#: src/applications/fs/tools/gnunet-insert.c:666
+#: src/applications/fs/tools/gnunet-insert.c:407
+#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:417
+#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:427
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:108
-#: src/applications/fs/tools/gnunet-download.c:42
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
-
-#: src/applications/fs/tools/gnunet-search.c:114
+#: src/applications/fs/tools/gnunet-search.c:136
 msgid "exit after receiving LIMIT results"
 msgstr "sale después de recibir LIMIT resultados"
 
-#: src/applications/fs/tools/gnunet-search.c:116
+#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-download.c:64
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "escribe los resultados encontrados (desencriptados) a FILENAME"
 
-#: src/applications/fs/tools/gnunet-search.c:118
-msgid "wait TIMEOUT seconds for search results before aborting"
+#: src/applications/fs/tools/gnunet-search.c:142
+#, fuzzy
+msgid "wait DELAY seconds for search results before aborting"
 msgstr "espera TIMEOUT segundos para buscar resultados después de abortar"
 
-#: src/applications/fs/tools/gnunet-search.c:123
-msgid "Search GNUnet for files."
-msgstr "Buscar GNUnet en busca de ficheros."
-
-#: src/applications/fs/tools/gnunet-search.c:227
-msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr ""
-"No hay suficientes argumentos. Debes especificar una clave o un "
-"identificador.\n"
-
-#: src/applications/fs/tools/gnunet-search.c:278
+#: src/applications/fs/tools/gnunet-search.c:189
 #, c-format
 msgid "Starting search failed. Consult logs.\n"
 msgstr "Se produjo un fallo al comenzar la búsqueda. Consulte los logs.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:353
+#: src/applications/fs/tools/gnunet-search.c:277
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
-msgstr "NIVEL"
+#: src/applications/fs/tools/gnunet-download.c:60
+msgid "Download files from GNUnet."
+msgstr "Descarga los ficheros de GNUnet"
 
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
-msgstr "FICHERO"
-
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
-msgstr "escribe el fichero al FICHERO"
-
-#: src/applications/fs/tools/gnunet-download.c:50
+#: src/applications/fs/tools/gnunet-download.c:67
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
 
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
-msgstr "Descarga los ficheros de GNUnet"
-
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr ""
-"Argumentos insuficientes. Debes especificar una URI de un fichero de GNUnet\n"
-
-#: src/applications/fs/tools/gnunet-download.c:159
+#: src/applications/fs/tools/gnunet-download.c:86
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "Descargado del fichero '%s' el %16llu de %16llu bytes(%8.3f kbps)\n"
 
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
+#: src/applications/fs/tools/gnunet-download.c:99
+#: src/applications/fs/tools/gnunet-download.c:110
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Error descargando: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:191
+#: src/applications/fs/tools/gnunet-download.c:118
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 "Descarga del fichero '%s' completada. La velocidad media fue %8.3fkilobytes "
 "por segundo.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:237
+#: src/applications/fs/tools/gnunet-download.c:175
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr ""
+"Argumentos insuficientes. Debes especificar una URI de un fichero de GNUnet\n"
+
+#: src/applications/fs/tools/gnunet-download.c:195
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "La URI '%s' no es válida para una descarga-de-gnunet.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:288
+#: src/applications/fs/tools/gnunet-download.c:244
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:50
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -2277,7 +2080,7 @@
 "%16llu de %16llu bytes desindexados (estimados %llu segundos para "
 "completar)          "
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2287,7 +2090,7 @@
 "El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos (%8.3f "
 "kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:83
 #, c-format
 msgid ""
 "\n"
@@ -2296,27 +2099,28 @@
 "\n"
 "Error desindexando el fichero: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:97
+#: src/applications/fs/tools/gnunet-unindex.c:100
 msgid "Unindex files."
 msgstr "Desindexar los ficheros."
 
-#: src/applications/fs/tools/gnunet-unindex.c:149
-#, c-format
-msgid "You must specify one and only one file to unindex.\n"
-msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
+#: src/applications/fs/tools/gnunet-unindex.c:145
+#, fuzzy
+msgid "Not enough arguments. You must specify a filename.\n"
+msgstr ""
+"Argumentos insuficientes. Debes especificar una URI de un fichero de GNUnet\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:190
+#: src/applications/fs/tools/gnunet-unindex.c:173
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' falló.  ¿Es '%s' un fichero?\n"
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/fs/module/ondemand.c:317
 #, 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:393
+#: src/applications/fs/module/ondemand.c:411
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2327,7 +2131,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:419
+#: src/applications/fs/module/ondemand.c:438
 #, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2336,14 +2140,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:617
+#: src/applications/fs/module/ondemand.c:655
 #, 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:1184
+#: src/applications/fs/module/fs.c:1196
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2352,111 +2156,90 @@
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/applications/fs/module/fs.c:1233
+#: src/applications/fs/module/fs.c:1247
 #, 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:1270
+#: src/applications/fs/module/fs.c:1287
 msgid "enables (anonymous) file-sharing"
 msgstr "activa la compartición de ficheros anónima"
 
-#: src/applications/fs/module/migration.c:224
+#: src/applications/fs/module/migration.c:228
 msgid "# blocks migrated"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/module/migration.c:225
+#: src/applications/fs/module/migration.c:229
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
-msgstr "Intervalo de publicación periódica cambiado."
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: 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/namespace_info.c:604
-msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
-msgstr ""
-"publicaciones actualizadas para contenido actualizado periódicamente más de "
-"una semana antes de la tarea planificada.\n"
-
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr "¡Esta búsqueda está aún pendiente!\n"
-
-#: src/applications/fs/fsui/fsui.c:189
+#: src/applications/fs/fsui/fsui.c:195
 msgid "FSUI persistence: error restoring download\n"
 msgstr "FSUI persistente: error restableciendo la descarga\n"
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/fs/fsui/fsui.c:666
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 "Fichero del estado de FSUI '%s' tiene un error de sintáxis en la asignación %"
 "u.\n"
 
-#: src/applications/fs/fsui/download.c:290
+#: src/applications/fs/fsui/download.c:305
 msgid "Download aborted."
 msgstr "Descarga abortada"
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:309
 msgid "ECRS download failed (see logs)."
 msgstr "La descarga del ERCS falló (vea los logs)."
 
-#: src/applications/fs/fsui/download.c:298
+#: src/applications/fs/fsui/download.c:313
 msgid "ECRS download suspending."
 msgstr "La descarga del ERCS fue suspendida."
 
-#: src/applications/fs/fsui/download.c:302
+#: src/applications/fs/fsui/download.c:317
 msgid "Unexpected download state."
 msgstr "Estado de descarga inesperado."
 
-#: src/applications/fs/fsui/unindex.c:85
+#: src/applications/fs/fsui/unindex.c:80
 msgid "Unindex failed."
 msgstr "El desindexado falló"
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
-msgstr "¡Ninguna clave especificada!\n"
-
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
+#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
+#: src/applications/fs/fsui/upload.c:413
 msgid "Upload failed."
 msgstr "Subida fallida"
 
-#: src/applications/fs/fsui/upload.c:455
+#: src/applications/fs/fsui/upload.c:420
 msgid "Cannot upload directory without using recursion."
 msgstr "Imposible compartir un directorio sin hacerlo recursivamente."
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr "Recolección de identificadores de fichero desactivada.\n"
-
-#: src/applications/fs/fsui/file_info.c:282
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr "Borrada base de datos de URIs corrupta en '%s'."
-
-#: src/applications/fs/ecrs/search.c:160
+#: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr "CHK URI no autorizado para buscar.\n"
 
-#: src/applications/fs/ecrs/search.c:216
+#: src/applications/fs/ecrs/search.c:226
 msgid "LOC URI not allowed for search.\n"
 msgstr "LOC URI no autorizado para buscar.\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:128
 #, 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:257
+#: src/applications/fs/ecrs/download.c:263
 #, 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:935
+#: src/applications/fs/ecrs/download.c:972
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2464,7 +2247,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:1112
+#: src/applications/fs/ecrs/download.c:1153
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
@@ -2472,160 +2255,143 @@
 "El contenido '%s' parece no estar disponible en la red (intentado %u "
 "veces).\n"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/fs/ecrs/upload.c:170
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s' no es un fichero.\n"
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/fs/ecrs/upload.c:180
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Imposible determinar el tamaño del fichero '%s'"
 
-#: src/applications/fs/ecrs/upload.c:193
+#: src/applications/fs/ecrs/upload.c:188
 msgid "Failed to connect to gnunetd."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/fs/ecrs/upload.c:200
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/fs/ecrs/upload.c:219
 #, 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:227
+#: src/applications/fs/ecrs/upload.c:226
 #, 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:306
+#: src/applications/fs/ecrs/upload.c:312
 #, 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:842
+#: src/applications/fs/ecrs/meta.c:847
 #, 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:850
+#: src/applications/fs/ecrs/meta.c:855
 #, 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"
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/fs/ecrs/namespace.c:153
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
-msgstr ""
-"El fichero de configuración debe especificar un directorio para que GNUnet "
-"almacene la información por-par bajo %s%s.\n"
-
-#: src/applications/fs/ecrs/namespace.c:133
-#, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Imposible crear el pseudónimo '%s', el fichero '%s' ya existe.\n"
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/fs/ecrs/namespace.c:338
+#: src/applications/fs/ecrs/namespace.c:419
+#: src/applications/fs/ecrs/namespace.c:573
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/fs/ecrs/namespace.c:350
+#: src/applications/fs/ecrs/namespace.c:430
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/fs/ecrs/namespace.c:587
+#: src/applications/fs/ecrs/namespace.c:598
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/applications/topology_f2f/topology.c:323
+#: src/applications/fs/ecrs/helper.c:67
+msgid "No keywords specified!\n"
+msgstr "¡Ninguna clave especificada!\n"
+
+#: src/applications/fs/ecrs/parser.c:122
 #, c-format
 msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
+"Tipo de metadatos desconocido en la opción de metadatos '%s'.  Usando el "
+"tipo de metadatos 'desconocido' en su lugar.\n"
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/applications/fs/uritrack/file_info.c:123
+msgid "Collecting file identifiers disabled.\n"
+msgstr "Recolección de identificadores de fichero desactivada.\n"
+
+#: src/applications/fs/uritrack/file_info.c:355
 #, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr "Borrada base de datos de URIs corrupta en '%s'."
+
+#: src/applications/fs/namespace/namespace_info.c:654
+msgid "Publication interval for periodic publication changed."
+msgstr "Intervalo de publicación periódica cambiado."
+
+#: src/applications/fs/namespace/namespace_info.c:675
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
+msgstr ""
+"publicaciones actualizadas para contenido actualizado periódicamente más de "
+"una semana antes de la tarea planificada.\n"
+
+#: src/applications/topology_f2f/topology.c:354
+#, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:358
+#: src/applications/topology_f2f/topology.c:371
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/applications/topology_f2f/topology.c:384
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/applications/template/template.c:61
+#: src/applications/template/template.c:62
 #, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "'%s' registrando manejador de clientes %d y %d\n"
 
-#: src/applications/template/gnunet-template.c:70
-#: src/applications/vpn/gnunet-vpn.c:72
-msgid "helptext for -t"
-msgstr "texto de ayuda para -t"
-
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
-msgstr "Plantilla para clientes-de-gnunet."
-
-#: src/applications/bootstrap_http/http.c:109
-#, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+#: src/applications/template/gnunet-template.c:44
+msgid "Template description."
 msgstr ""
-"Puerto inválido \"%s\" en la especificación de la lista local, probando el "
-"puerto %d.\n"
 
-#: src/applications/bootstrap_http/http.c:120
-#, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+#: src/applications/bootstrap_http/http.c:92
+#, fuzzy, c-format
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/applications/bootstrap_http/http.c:132
-#, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
-msgstr "Imposible descargar lista de contactos, servidor '%s' desconocido.\n"
-
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
-#, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
-
-#: src/applications/bootstrap_http/http.c:217
-#, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "Analizando HTTP de la URL '%s' se produjo un fallo.\n"
-
-#: src/applications/bootstrap_http/http.c:252
-#, c-format
-msgid "Parsing hello from `%s' failed.\n"
-msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
-
-#: src/applications/bootstrap_http/http.c:330
-#, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+#: src/applications/bootstrap_http/http.c:144
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
-"Imposible resolver el nombre del proxy HTTP '%s'. Intentándolo sin un "
-"proxy.\n"
 
-#: src/applications/bootstrap_http/http.c:355
+#: src/applications/bootstrap_http/http.c:229
 msgid "# hellos downloaded via http"
 msgstr "# saludos descargados vía HTTP"
 
@@ -2639,413 +2405,357 @@
 msgid "# bytes received of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:605
+#: src/applications/traffic/traffic.c:609
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
+#: src/applications/vpn/gnunet-vpn.c:98
+msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr ""
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:181
-#, fuzzy, c-format
-msgid ""
-"Configuration file must specify directory for storing data in section `%s' "
-"under `%s'.\n"
-msgstr ""
-"El fichero de configuración debe especificar el directorio para almacenar "
-"los datos FS en la sección '%s' bajo '%s'.\n"
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:264
-#, fuzzy
-msgid "Unable to initialize SQLite KVStore.\n"
-msgstr "Imposible inicializar SQLite.\n"
-
-#: src/applications/vpn/gnunet-vpn.c:77
+#: src/applications/vpn/gnunet-vpn.c:103
 msgid "VPN over GNUnet."
 msgstr ""
 
-#: src/applications/vpn/vpn.c:315
+#: src/applications/vpn/vpn.c:351
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:323
+#: src/applications/vpn/vpn.c:359
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:387
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:400
+#: src/applications/vpn/vpn.c:436
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:404
+#: src/applications/vpn/vpn.c:440
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:414
+#: src/applications/vpn/vpn.c:450
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:474
+#: src/applications/vpn/vpn.c:510
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:478
+#: src/applications/vpn/vpn.c:514
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:505
+#: src/applications/vpn/vpn.c:541
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:513
+#: src/applications/vpn/vpn.c:549
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:517
+#: src/applications/vpn/vpn.c:553
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:555
+#: src/applications/vpn/vpn.c:591
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:559
+#: src/applications/vpn/vpn.c:595
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:566
+#: src/applications/vpn/vpn.c:602
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:571
+#: src/applications/vpn/vpn.c:607
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:627
 #, fuzzy, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:638
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/vpn/vpn.c:650
 #, fuzzy, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
 
-#: src/applications/vpn/vpn.c:646
+#: src/applications/vpn/vpn.c:683
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:692
+#: src/applications/vpn/vpn.c:729
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:754
+#: src/applications/vpn/vpn.c:788
 #, c-format
-msgid "RFC4193 --- whitelist of peer %x\n"
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:772
+#: src/applications/vpn/vpn.c:792
+#, c-format
+msgid "VPN cannot drop connection %x\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:810
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:812
+#: src/applications/vpn/vpn.c:850
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:816
+#: src/applications/vpn/vpn.c:854
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/vpn/vpn.c:860
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:825
+#: src/applications/vpn/vpn.c:863
 #, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:873
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:892
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:869
-#, c-format
-msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
-msgstr ""
-
-#: src/applications/vpn/vpn.c:885
+#: src/applications/vpn/vpn.c:913
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:890
+#: src/applications/vpn/vpn.c:918
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:901
+#: src/applications/vpn/vpn.c:929
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:907
+#: src/applications/vpn/vpn.c:935
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:923
+#: src/applications/vpn/vpn.c:951
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:927
+#: src/applications/vpn/vpn.c:955
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:931
+#: src/applications/vpn/vpn.c:959
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:945
+#: src/applications/vpn/vpn.c:973
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:960
+#: src/applications/vpn/vpn.c:988
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:998
+#: src/applications/vpn/vpn.c:1016
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1013
+#: src/applications/vpn/vpn.c:1031
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1058
+#: src/applications/vpn/vpn.c:1076
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1104
+#: src/applications/vpn/vpn.c:1122
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1148
+msgid "Cannot store client info\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1208
 msgid "Yes"
 msgstr "Sí"
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1208
 msgid "No"
 msgstr "No"
 
-#: src/applications/vpn/vpn.c:1324
+#: src/applications/vpn/vpn.c:1385
 #, fuzzy, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr "'%s' registrando manejadores %d y %d\n"
 
-#: src/applications/vpn/vpn.c:1325
+#: src/applications/vpn/vpn.c:1386
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1361
+#: src/applications/vpn/vpn.c:1434
 #, fuzzy
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr "Activa el chat P2P (incompleto)"
 
-#: src/applications/vpn/vpn.c:1383
+#: src/applications/vpn/vpn.c:1466
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394
+#: src/applications/vpn/vpn.c:1477
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1405
+#: src/applications/vpn/vpn.c:1490
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/state/state.c:85
+#: src/server/gnunet-update.c:142
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
+msgid "Updating data for module `%s'\n"
+msgstr "Actualizando los datos del módulo '%s'\n"
+
+#: src/server/gnunet-update.c:147
+#, c-format
+msgid "Failed to update data for module `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
+#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
+#: src/server/gnunet-update.c:220
+msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/server/gnunet-update.c:55 src/server/startup.c:450
-#: src/server/gnunet-transport-check.c:407
+#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
 msgid "run as user LOGIN"
 msgstr "ejecuta como el usuario LOGIN"
 
-#: src/server/gnunet-update.c:58
+#: src/server/gnunet-update.c:227
 msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr ""
-
-#: src/server/gnunet-update.c:147
+#: src/server/connection.c:992
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'."
-msgstr "La opción '%s' no tiene ningún sentido sin la opción '%s'."
-
-#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
-#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Argumentos inválidos: "
-
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
-msgstr ""
-"\n"
-"Saliendo.\n"
-
-#: src/server/gnunet-update.c:232 src/server/core.c:476
-msgid "No applications defined in configuration!\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
-
-#: src/server/gnunet-update.c:249
-#, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Actualizando los datos del módulo '%s'\n"
-
-#: src/server/gnunet-update.c:253
-#, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
-
-#: src/server/gnunet-update.c:309
-#, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Actualizados los datos para %d aplicaciones.\n"
-
-#: src/server/connection.c:983
-#, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:990
+#: src/server/connection.c:999
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detalles del mensaje: %u: longitud %d, prioridad: %d\n"
 
-#: src/server/connection.c:2254
+#: src/server/connection.c:2283
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Mensaje de '%s' descartado: formato inválido.\n"
 
-#: src/server/connection.c:2325
+#: src/server/connection.c:2355
 #, 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:2340
+#: src/server/connection.c:2370
 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:2708
+#: src/server/connection.c:2774
 msgid "# outgoing messages dropped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/server/connection.c:2712
+#: src/server/connection.c:2778
 msgid "# bytes of outgoing messages dropped"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/server/connection.c:2714
+#: src/server/connection.c:2780
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2717
+#: src/server/connection.c:2783
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/server/connection.c:2721
+#: src/server/connection.c:2787
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:2725
+#: src/server/connection.c:2791
 #, fuzzy
 msgid "# bytes received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/server/connection.c:2727
+#: src/server/connection.c:2793
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/server/connection.c:2728
+#: src/server/connection.c:2794
 msgid "# bytes noise sent"
 msgstr "# \"bytes-ruido\" mandados"
 
-#: src/server/startup.c:196
+#: src/server/gnunetd.c:78
 #, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr "La petición '%s' recibida del cliente esta mal formada.\n"
+msgid "`%s' startup complete.\n"
+msgstr "'%s' comienzo completo.\n"
 
-#: src/server/startup.c:324
+#: src/server/gnunetd.c:83
 #, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
-msgstr ""
+msgid "`%s' is shutting down.\n"
+msgstr "'%s' se esta cerrando.\n"
 
-#: src/server/startup.c:339
-#, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr "Imposible escribir PID al fichero '%s': %s.\n"
-
-#: src/server/startup.c:443
+#: src/server/gnunetd.c:160
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -3053,141 +2763,104 @@
 "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/startup.c:456
+#: src/server/gnunetd.c:164
 msgid "Starts the gnunetd daemon."
 msgstr "Arranca el demonio de gnunetd."
 
-#: src/server/startup.c:470
-#, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr "Usuario '%s' desconocido, imposible cambiar la UID a él.\n"
+#: src/server/gnunetd.c:168
+msgid "disable padding with random data (experimental)"
+msgstr ""
 
-#: src/server/startup.c:479
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
+#: src/server/gnunetd.c:172
+#, fuzzy
+msgid "specify username as which gnunetd should run"
+msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
-msgstr "Argumentos en la linea de comandos inválidos:\n"
-
-#: src/server/startup.c:583
+#: src/server/gnunetd.c:228
 #, c-format
-msgid "Argument %d: `%s'\n"
-msgstr "Argumento %d: '%s'\n"
-
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
-msgstr "Argumentos en la linea de comandos inválidos.\n"
-
-#: src/server/gnunetd.c:76
-#, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/server/gnunetd.c:84
+#: src/server/core.c:124
 #, c-format
-msgid "`%s' starting\n"
-msgstr "'%s' comenzando\n"
-
-#: src/server/gnunetd.c:106
-#, c-format
-msgid "`%s' startup complete.\n"
-msgstr "'%s' comienzo completo.\n"
-
-#: src/server/gnunetd.c:111
-#, c-format
-msgid "`%s' is shutting down.\n"
-msgstr "'%s' se esta cerrando.\n"
-
-#: src/server/core.c:115
-#, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr "¡El módulo de la aplicación '%s' ya esta inicializado!\n"
 
-#: src/server/core.c:168
+#: src/server/core.c:174
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
 
-#: src/server/core.c:215
+#: src/server/core.c:217
 #, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr "Imposible apagar '%s': aplicación no cargada\n"
 
-#: src/server/core.c:222
+#: src/server/core.c:225
 #, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr "Imposible apagar la aplicación '%s': no inicializada\n"
 
-#: src/server/core.c:231 src/server/core.c:420
+#: src/server/core.c:235
 #, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr "Imposible encontrar el método '%s%s' en la biblioteca '%s'.\n"
 
-#: src/server/core.c:398
+#: src/server/core.c:374
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/server/core.c:499
+#: src/server/core.c:470
 #, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/server/core.c:516
-#, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "Imposible apagar la aplicación '%s' adecuadamente.\n"
 
-#: src/server/core.c:575
-msgid "FATAL: Identity plugin not found!\n"
-msgstr "FATAL: ¡Plugin de identidad no encontrado!\n"
-
-#: src/server/core.c:633
+#: src/server/core.c:594
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/server/gnunet-transport-check.c:109
+#: src/server/gnunet-transport-check.c:115
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "'%s': Imposible crear saludo.\n"
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:124
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "'%s': Imposible conectar.\n"
 
-#: src/server/gnunet-transport-check.c:148
+#: src/server/gnunet-transport-check.c:158
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s': Imposible mandar.\n"
 
-#: src/server/gnunet-transport-check.c:168
+#: src/server/gnunet-transport-check.c:180
 #, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
 
-#: src/server/gnunet-transport-check.c:182
+#: src/server/gnunet-transport-check.c:194
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "'%s': Imposible desconectar.\n"
 
-#: src/server/gnunet-transport-check.c:189
-#, c-format
+#: src/server/gnunet-transport-check.c:201
+#, fuzzy, c-format
 msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
+"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+"each.\n"
 msgstr ""
 "Transporte '%s' OK. Tomó %ums transmitir %d mensajes de %d bytes cada uno.\n"
 
-#: src/server/gnunet-transport-check.c:219
+#: src/server/gnunet-transport-check.c:229
 #, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " El transporte %d no esta siendo probado\n"
 
-#: src/server/gnunet-transport-check.c:230
+#: src/server/gnunet-transport-check.c:245
 #, c-format
 msgid ""
 "\n"
@@ -3196,102 +2869,108 @@
 "\n"
 "Contactando '%s'."
 
-#: src/server/gnunet-transport-check.c:253
+#: src/server/gnunet-transport-check.c:266
 #, c-format
 msgid " Connection failed\n"
 msgstr "Conexión fallida\n"
 
-#: src/server/gnunet-transport-check.c:259
+#: src/server/gnunet-transport-check.c:272
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/server/gnunet-transport-check.c:320
+#: src/server/gnunet-transport-check.c:324
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/server/gnunet-transport-check.c:396
-msgid "ping peers from HOSTLISTURL that match transports"
+#: src/server/gnunet-transport-check.c:350
+msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:357
 msgid "send COUNT messages"
 msgstr "envia COUNT mensajes"
 
-#: src/server/gnunet-transport-check.c:400
+#: src/server/gnunet-transport-check.c:360
 msgid "send messages with SIZE bytes payload"
 msgstr "manda mensajes con SIZE bytes payload"
 
-#: src/server/gnunet-transport-check.c:402
+#: src/server/gnunet-transport-check.c:363
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:404
+#: src/server/gnunet-transport-check.c:366
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:414
-msgid "Tool to test if GNUnet transport services are operational."
+#: src/server/gnunet-transport-check.c:374
+msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:565
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr ""
-
-#: src/server/gnunet-transport-check.c:570
+#: src/server/gnunet-transport-check.c:455
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/server/gnunet-transport-check.c:573
+#: src/server/gnunet-transport-check.c:458
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/server/gnunet-transport-check.c:617
+#: src/server/gnunet-transport-check.c:518
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/server/tcpserver.c:422
+#: src/server/tcpserver.c:102
 #, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+msgid "The `%s' request received from client is malformed.\n"
+msgstr "La petición '%s' recibida del cliente esta mal formada.\n"
+
+#: src/server/tcpserver.c:316
+#, fuzzy, c-format
+msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/server/tcpserver.c:688
+#: src/server/tcpserver.c:384
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:798
+#: src/server/tcpserver.c:437
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s falló, el mensaje del tipo %d ya está en uso.\n"
 
-#: src/server/handler.c:367
+#: src/server/handler.c:377
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/server/gnunet-peer-info.c:95
+#: src/server/version.c:157
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
+msgstr ""
+
+#: src/server/gnunet-peer-info.c:52
 msgid "Print information about GNUnet peers."
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "Imposible obtener la dirección del par '%s'.\n"
 
-#: src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:88
 msgid "hello message invalid (signature invalid).\n"
 msgstr "mensaje de saludo inválido (firma no válida).\n"
 
-#: src/server/gnunet-peer-info.c:164
+#: src/server/gnunet-peer-info.c:99
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
@@ -3303,6 +2982,24 @@
 "want.\n"
 msgstr ""
 
+#: src/util/network_client/tcpio.c:90
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:114
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#, 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:356
+#, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "¡'%s' falló, respuesta no válida!\n"
+
 #: src/util/crypto/hostkey_gcrypt.c:1031
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
@@ -3314,12 +3011,12 @@
 msgstr ""
 "libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#: src/util/os/statuscalls.c:171 src/util/os/statuscalls.c:249
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
+#: src/util/os/statuscalls.c:291 src/util/os/statuscalls.c:300
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -3330,24 +3027,17 @@
 msgid "Can't create semaphore: %i"
 msgstr "Imposible crear un semáforo: %i"
 
-#: src/util/os/dso.c:75
+#: src/util/os/dso.c:51
 #, c-format
-msgid ""
-"Cannot determine plugin path, application must be installed in directory "
-"ending with `%s'.\n"
-msgstr ""
-
-#: src/util/os/dso.c:97
-#, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "¡El mecanismo de iniciación de los plugins falló: %s!\n"
 
-#: src/util/os/dso.c:134
+#: src/util/os/dso.c:90
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "'%s' falló en la biblioteca '%s' en %s:%d con un error: %s\n"
 
-#: src/util/os/dso.c:176
+#: src/util/os/dso.c:132
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "'%s' falló al resolver el método '%s%s' en %s:%d con un error: %s\n"
@@ -3360,40 +3050,30 @@
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
-#: src/util/os/installpath.c:172
-msgid ""
-"Cannot determine the path to the executable, your system may be broken or "
-"not supported.\n"
-msgstr ""
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/util/os/installpath.c:211
-msgid ""
-"GNUnet executables are not in a directory named 'bin'. This may signal a "
-"broken installation.\n"
-msgstr ""
+#: src/util/os/user.c:125
+#, c-format
+msgid "User `%s' not known, cannot change UID to it.\n"
+msgstr "Usuario '%s' desconocido, imposible cambiar la UID a él.\n"
 
-#: src/util/os/installpath.c:222
-msgid "Cannot determine the installation prefix. Unknown error.\n"
-msgstr ""
+#: src/util/os/user.c:136
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/util/network/tcpio.c:100
-msgid "Could not find valid value for PORT in section NETWORK."
-msgstr ""
+#: src/util/network/select.c:272
+#, fuzzy
+msgid "Received malformed message (too small) from connection. Closing.\n"
+msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/util/network/tcpio.c:124
-msgid "Could not find valid value for HOST in section NETWORK."
+#: src/util/network/select.c:421
+msgid "select listen socket not valid!\n"
 msgstr ""
 
-#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
-#, 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/tcpio.c:406
-#, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "¡'%s' falló, respuesta no válida!\n"
-
 #: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
 #: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
 #, c-format
@@ -3420,100 +3100,105 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Formato '%s' erróneo para la red: %s\n"
 
-#: src/util/disk/storage.c:194
+#: src/util/disk/storage.c:201
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk/storage.c:240
+#: src/util/disk/storage.c:247
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/disk/storage.c:279
+#: src/util/disk/storage.c:286
 #, fuzzy, c-format
 msgid "Expected `%s' to be a regular file\n"
 msgstr "'%s' no es un fichero regular.\n"
 
-#: src/util/disk/storage.c:486
+#: src/util/disk/storage.c:493
 #, fuzzy, c-format
 msgid "expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/config_impl/impl.c:256
+#: src/util/config_impl/impl.c:260
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/util/config_impl/impl.c:412
+#: src/util/config_impl/impl.c:419
 #, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:424
+#: src/util/config_impl/impl.c:431
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:494
+#: src/util/config_impl/impl.c:511
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:138 src/util/error/error.c:182
+#: src/util/config_impl/impl.c:617
+#, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/error/error.c:156 src/util/error/error.c:200
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/error/error.c:141 src/util/error/error.c:184
+#: src/util/error/error.c:159 src/util/error/error.c:202
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:144 src/util/error/error.c:186
+#: src/util/error/error.c:162 src/util/error/error.c:204
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/error/error.c:147 src/util/error/error.c:188
+#: src/util/error/error.c:165 src/util/error/error.c:206
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/error/error.c:150 src/util/error/error.c:190
+#: src/util/error/error.c:168 src/util/error/error.c:208
 msgid "FATAL"
 msgstr "FATAL"
 
-#: src/util/error/error.c:153 src/util/error/error.c:192
+#: src/util/error/error.c:171 src/util/error/error.c:210
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:194
+#: src/util/error/error.c:174 src/util/error/error.c:212
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:159 src/util/error/error.c:196
+#: src/util/error/error.c:177 src/util/error/error.c:214
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:198
+#: src/util/error/error.c:180 src/util/error/error.c:216
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:165 src/util/error/error.c:200
+#: src/util/error/error.c:183 src/util/error/error.c:218
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:168 src/util/error/error.c:202
+#: src/util/error/error.c:186 src/util/error/error.c:220
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:171
+#: src/util/error/error.c:189
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:203
+#: src/util/error/error.c:221
 msgid "NOTHING"
 msgstr "NADA"
 
@@ -3532,14 +3217,13 @@
 msgid "Permission denied for `%s'.\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
-#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
-#: src/util/threads/pthread.c:275
+#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
+#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
@@ -3548,199 +3232,146 @@
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:686
+#: src/util/getopt/getopt.c:681
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:705
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: la opción '--%s' no permite un argumento\n"
 
-#: src/util/getopt/getopt.c:715
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: la opción '%c%s' no permite un argumento\n"
 
-#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: src/util/getopt/getopt.c:762
+#: src/util/getopt/getopt.c:757
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/util/getopt/getopt.c:766
+#: src/util/getopt/getopt.c:761
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/util/getopt/getopt.c:792
+#: src/util/getopt/getopt.c:787
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: src/util/getopt/getopt.c:795
+#: src/util/getopt/getopt.c:790
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %c\n"
 
-#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un argumento --%c\n"
 
-#: src/util/getopt/getopt.c:872
+#: src/util/getopt/getopt.c:867
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: src/util/getopt/getopt.c:890
+#: src/util/getopt/getopt.c:885
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: la opción '-W %s' no permite un argumento\n"
 
+#: src/util/getopt/setoption.c:58
+#, c-format
+msgid ""
+"Setting option `%s' in section `%s' to `%s' when processing command line "
+"option `%s' was denied.\n"
+msgstr ""
+
 #: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/string/string.c:101
+#: src/util/string/string.c:119
 msgid "ms"
 msgstr "ms"
 
-#: src/util/string/string.c:106
+#: src/util/string/string.c:124
 msgid "s"
 msgstr "s"
 
-#: src/util/string/string.c:109
+#: src/util/string/string.c:127
 msgid "m"
 msgstr "m"
 
-#: src/util/string/string.c:112
+#: src/util/string/string.c:130
 msgid "h"
 msgstr "h"
 
-#: src/util/string/string.c:115
+#: src/util/string/string.c:133
 msgid " days"
 msgstr " días"
 
-#: src/util/string/string.c:133
+#: src/util/string/string.c:151
 msgid "b"
 msgstr "b"
 
-#: src/util/string/string.c:138
+#: src/util/string/string.c:156
 msgid "KiB"
 msgstr "KiB"
 
-#: src/util/string/string.c:141
+#: src/util/string/string.c:159
 msgid "MiB"
 msgstr "MiB"
 
-#: src/util/string/string.c:144
+#: src/util/string/string.c:162
 msgid "GiB"
 msgstr "GiB"
 
-#: src/util/string/string.c:147
+#: src/util/string/string.c:165
 #, fuzzy
 msgid "TiB"
 msgstr "KiB"
 
-#: src/util/string/string.c:267
+#: src/util/string/string.c:285
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:60
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr "genera configuración para gnunetd, el demonio de GNUnet"
 
-#: src/setup/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:62
 msgid "Tool to setup GNUnet."
 msgstr "Herramienta de configuración de GNUnet."
 
-#: src/setup/gnunet-setup.c:91
-#, c-format
-msgid "Available MODEs:\n"
-msgstr "MODOs disponibles:\n"
+#: src/setup/gnunet-setup.c:152
+#, fuzzy, c-format
+msgid "Too many arguments.\n"
+msgstr "Argumentos en la linea de comandos inválidos.\n"
 
-#: src/setup/gnunet-setup.c:92
-#, c-format
-msgid " config\t\ttext-based configuration\n"
-msgstr " configuración\t\tconfiguración basada en texto\n"
-
-#: src/setup/gnunet-setup.c:94
-#, c-format
-msgid " menuconfig\ttext-based menu\n"
-msgstr " menuconfig\tmenú basado en texto\n"
-
-#: src/setup/gnunet-setup.c:96
-#, c-format
-msgid " wizard-curses\tBasic text-based graphical configuration\n"
-msgstr ""
-" wizard-curses\t Configuración básica en modo gráfico pero basado en texto\n"
-
-#: src/setup/gnunet-setup.c:99
-#, c-format
-msgid " gconfig\tGTK configuration\n"
-msgstr " gconfig\tConfiguración GTK\n"
-
-#: src/setup/gnunet-setup.c:100
-#, c-format
-msgid ""
-" wizard-gtk\tBasic GTK configuration\n"
-"\n"
-msgstr ""
-" wizard-gtk\tConfiguración GTK básica\n"
-"\n"
-
-#: src/setup/gnunet-setup.c:167
-#, c-format
-msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
-msgstr ""
-"gnunet-setup debe tener acceso de escritura al fichero de configuración '%"
-"s'\n"
-
-#: src/setup/gnunet-setup.c:224
+#: src/setup/gnunet-setup.c:157
 msgid "No interface specified, using default\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
-#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
+#: src/setup/gnunet-setup.c:227
 #, c-format
 msgid "`%s' is not available."
 msgstr "'%s' no esta disponible."
 
-#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
-#, fuzzy, c-format
-msgid ""
-"Can only run wizard to configure gnunetd.\n"
-"Did you forget the `%s' option?\n"
-msgstr ""
-"Solo se puede arrancar wizard para configurar gnunetd.\n"
-"¿Te olvidaste de la opción %s'?\n"
-
-#: src/setup/gnunet-setup.c:285
+#: src/setup/gnunet-setup.c:243
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/setup/wizard_gtk.c:429
-#, c-format
-msgid "Unable to save configuration file `%s':"
-msgstr "Imposible guardar el fichero de configuración '%s':"
-
-#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
-msgid "Unable to create user account:"
-msgstr "Imposible crear la cuenta de usuario:"
-
-#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
-msgid "Unable to change startup process:"
-msgstr "Imposible cambiar el proceso de arranque:"
-
 #: src/setup/gnunet-win-tool.c:109
 #, c-format
 msgid "GNUnet service installed successfully.\n"
@@ -3781,33 +3412,192 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Error: imposible borrar el servicio: %s\n"
 
-#: src/setup/conf.c:522 src/setup/recreate.c:135
+#: src/setup/gtk/gconf.c:70
+msgid "Sorry, no help is available for this option.\n"
+msgstr "Lo siento, no hay ayuda disponible para esta opción.\n"
+
+#: src/setup/gtk/glade_support.c:89 src/setup/gtk/glade_support.c:120
+#, fuzzy, c-format
+msgid "Failed to open `%s'.\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/setup/gtk/wizard_gtk.c:429
 #, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
-msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
+msgid "Unable to save configuration file `%s':"
+msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/setup/conf.c:529
+#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:616
+msgid "Unable to create user account:"
+msgstr "Imposible crear la cuenta de usuario:"
+
+#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:619
+msgid "Unable to change startup process:"
+msgstr "Imposible cambiar el proceso de arranque:"
+
+#: src/setup/text/conf.c:74
+#, fuzzy
+msgid "yes"
+msgstr "Bytes"
+
+#: src/setup/text/conf.c:75
+msgid "no"
+msgstr ""
+
+#: src/setup/text/conf.c:101
 #, c-format
-msgid "Configuration file `%s' created.\n"
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgstr ""
+
+#: src/setup/text/conf.c:110
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
+msgstr ""
+
+#: src/setup/text/conf.c:112
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
+msgstr ""
+
+#: src/setup/text/conf.c:132
+#, c-format
+msgid "\t Enter choice (default is %c): "
+msgstr ""
+
+#: src/setup/text/conf.c:138
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
+msgstr ""
+
+#: src/setup/text/conf.c:144
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
+msgstr ""
+
+#: src/setup/text/conf.c:177
+#, fuzzy, c-format
+msgid "Yes\n"
+msgstr "Sí"
+
+#: src/setup/text/conf.c:182
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Abort\n"
+msgstr "_Acerca de"
+
+#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
+msgstr ""
+
+#: src/setup/text/conf.c:385
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:459
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:470
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:492
+#, fuzzy
+msgid "Invalid entry.\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/setup/text/conf.c:511
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:538
+#, c-format
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:539
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:818
+#, 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:558
+#, c-format
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
+msgstr ""
+
+#: src/setup/text/conf.c:568
+#, 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:573
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
-#: src/setup/wizard_util.c:193
+#: src/setup/ncurses/mconf.c:793
+#, fuzzy
+msgid "GNUnet Configuration"
+msgstr "Configuración de GNUnet"
+
+#: src/setup/ncurses/mconf.c:824
+#, fuzzy
+msgid "Do you wish to save your new configuration?"
+msgstr "¿Quieres guardar tu configuración?"
+
+#: src/setup/ncurses/mconf.c:834
+#, fuzzy, c-format
+msgid "End of configuration.\n"
+msgstr " gconfig\tConfiguración GTK\n"
+
+#: src/setup/ncurses/mconf.c:836
+#, fuzzy, c-format
+msgid "Your configuration changes were NOT saved.\n"
+msgstr "Fichero de configuración '%s' creado.\n"
+
+#: src/setup/ncurses/wizard_curs.c:58
 msgid "Error"
 msgstr "Error"
 
-#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
-#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
-#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
-#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
-#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
-#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
-#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
-#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
+#: src/setup/ncurses/wizard_curs.c:116 src/setup/ncurses/wizard_curs.c:131
+#: src/setup/ncurses/wizard_curs.c:184 src/setup/ncurses/wizard_curs.c:221
+#: src/setup/ncurses/wizard_curs.c:251 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:310 src/setup/ncurses/wizard_curs.c:337
+#: src/setup/ncurses/wizard_curs.c:369 src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:423 src/setup/ncurses/wizard_curs.c:446
+#: src/setup/ncurses/wizard_curs.c:501 src/setup/ncurses/wizard_curs.c:563
+#: src/setup/ncurses/wizard_curs.c:594 src/setup/ncurses/wizard_curs.c:638
 msgid "GNUnet configuration"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/wizard_curs.c:117
+#: src/setup/ncurses/wizard_curs.c:117
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3837,7 +3627,7 @@
 "\n"
 "el equipo de GNUnet"
 
-#: src/setup/wizard_curs.c:132
+#: src/setup/ncurses/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
@@ -3845,13 +3635,13 @@
 "Escoge la interfaz de red que conecta tu ordenador a Internet de la lista de "
 "abajo."
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
-#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
-#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:191
+#: src/setup/ncurses/wizard_curs.c:228 src/setup/ncurses/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:315 src/setup/ncurses/wizard_curs.c:375
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
@@ -3861,14 +3651,14 @@
 "Internet. Normalmente es un módem, una tarjeta de RDSI o una tarjeta de red "
 "en el caso de los xDSL como el ADSL."
 
-#: src/setup/wizard_curs.c:185
+#: src/setup/ncurses/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 "¿Cuál es el nombre de la interfaz de red que conecta tu ordenador a Internet?"
 
-#: src/setup/wizard_curs.c:222
+#: src/setup/ncurses/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
@@ -3879,7 +3669,7 @@
 "\n"
 "En caso de duda, dejar este campo en blanco."
 
-#: src/setup/wizard_curs.c:229
+#: src/setup/ncurses/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3896,7 +3686,7 @@
 "En caso de duda deja el campo en blanco. GNUnet intentará determinar tu "
 "dirección IP"
 
-#: src/setup/wizard_curs.c:252
+#: src/setup/ncurses/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3914,11 +3704,11 @@
 "Responde \"no\" en conexiones directas a través de módems, tarjetas de RDSI "
 "y DNAT (también conocido como \"seguimiento de puertos\")."
 
-#: src/setup/wizard_curs.c:278
+#: src/setup/ncurses/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr "¿Cuánta subida (Bytes/s) será usada por GNUnet?"
 
-#: src/setup/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3936,11 +3726,11 @@
 "este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
 "máxima velocidad de tu conexión a Internet."
 
-#: src/setup/wizard_curs.c:310
+#: src/setup/ncurses/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr "¿Cuánta bajada (Bytes/s) será usada por GNUnet?"
 
-#: src/setup/wizard_curs.c:316
+#: src/setup/ncurses/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3958,7 +3748,7 @@
 "este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
 "máxima velocidad de tu conexión a Internet."
 
-#: src/setup/wizard_curs.c:338
+#: src/setup/ncurses/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -3980,11 +3770,11 @@
 "limitar el tráfico que GNUnet puede crear en tu conexión a Internet cuando "
 "una LAN de alta velocidad es usada (por ejemplo bajo NFS)."
 
-#: src/setup/wizard_curs.c:370
+#: src/setup/ncurses/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr "¿Cuánta CPU (en %) podrá ser usada?"
 
-#: src/setup/wizard_curs.c:376
+#: src/setup/ncurses/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3994,7 +3784,7 @@
 "\n"
 "Este es el porcentaje del tiempo del procesador que GNUnet puede usar."
 
-#: src/setup/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -4016,7 +3806,7 @@
 "Ésto también ayuda a repartir contenido popular a través de diferentes pares "
 "para aumentar la disponibilidad."
 
-#: src/setup/wizard_curs.c:424
+#: src/setup/ncurses/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -4028,7 +3818,7 @@
 "El almacenamiento de GNUnet contiene todos los datos que GNUnet genera "
 "(datos del índice, contenido insertado y migrado)."
 
-#: src/setup/wizard_curs.c:447
+#: src/setup/ncurses/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -4042,7 +3832,7 @@
 "automáticamente arrancado cuando enciendas tu ordenador. Si dices \"no\" "
 "aquí, tendrás que ejecutar GNUnet tu mismo cada vez que quieras usarlo."
 
-#: src/setup/wizard_curs.c:502
+#: src/setup/ncurses/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -4071,7 +3861,7 @@
 "Deja los campos vacíos para arrancar GNUnet con privilegios de sistema.\n"
 "Usuario de GNUnet:"
 
-#: src/setup/wizard_curs.c:564
+#: src/setup/ncurses/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -4097,7 +3887,7 @@
 "\n"
 "Grupo de GNUnet:"
 
-#: src/setup/wizard_curs.c:595
+#: src/setup/ncurses/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -4109,7 +3899,7 @@
 "\n"
 "¿Quieres arrancarla después de guardar tu configuración?"
 
-#: src/setup/wizard_curs.c:632
+#: src/setup/ncurses/wizard_curs.c:632
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -4120,90 +3910,21 @@
 "\n"
 "¿Intentar de nuevo?"
 
-#: src/setup/confdata.c:93
-#, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
-msgstr "%s: valor del símbolo '%s' no válido para %s\n"
-
-#: src/setup/wizard_util.c:119
-msgid "Can't open Service Control Manager"
-msgstr "Imposible abrir el Service Control Manager"
-
-#: src/setup/wizard_util.c:124
-msgid "Can't create service"
-msgstr "Imposible crear el servicio"
-
-#: src/setup/wizard_util.c:129
-msgid "Error changing the permissions of the GNUnet directory"
-msgstr "Error cambiando los permisos del directorio de GNUnet"
-
-#: src/setup/wizard_util.c:134
-msgid "Cannot write to the regisitry"
-msgstr "Imposible escribir en el registro"
-
-#: src/setup/wizard_util.c:137
-msgid "Can't access the service"
-msgstr "Imposible acceder al servicio"
-
-#: src/setup/wizard_util.c:141
-msgid "Can't delete the service"
-msgstr "Imposible borrar el servicio"
-
-#: src/setup/wizard_util.c:145
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: src/setup/wizard_util.c:176
-msgid "This version of Windows does not support multiple users."
-msgstr "Esta versión de Windows no permite usuarios múltiples"
-
-#: src/setup/wizard_util.c:180
-msgid "Error creating user"
-msgstr "Error creando usuario"
-
-#: src/setup/wizard_util.c:183
-msgid "Error accessing local security policy"
-msgstr "Error accediendo a la política de seguridad local"
-
-#: src/setup/wizard_util.c:186
-msgid "Error granting service right to user"
-msgstr "Error garantizando el servicio correcto al usuario"
-
-#: src/setup/wizard_util.c:189
-msgid "Unknown error while creating a new user"
-msgstr "Error desconocido mientras se creaba un nuevo usuario"
-
-#: src/setup/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
-msgstr "Lo siento, no hay ayuda disponible para esta opción.\n"
-
-#: src/setup/glade_support.c:75
+#: src/setup/lib/gns.c:266
 #, fuzzy, c-format
-msgid "Failed to find handler for `%s'\n"
-msgstr "Falló al actualizar los datos del módulo '%s'\n"
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
+msgstr ""
+"La configuración debe especificar un directorio para los datos FS en la "
+"sección '%s' bajo'%s'.\n"
 
-#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
-#, fuzzy, c-format
-msgid "Failed to open `%s'.\n"
-msgstr "Fichero almacenado en '%s'.\n"
+#: src/setup/lib/tree.c:181
+#, c-format
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
+msgstr ""
 
-#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
-#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
-msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
-
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
-#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d in %s with error: %s\n"
-msgstr "'%s' falló en %s: %d con el error: %s\n"
-
-#: src/include/gnunet_util_error.h:207
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
-msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
-
 #: src/include/gnunet_util_getopt.h:145
 msgid "print this help"
 msgstr "imprime esta ayuda"
@@ -4230,6 +3951,332 @@
 msgid "specify host on which gnunetd is running"
 msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
+#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
+#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
+
+#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
+
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#, fuzzy, c-format
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
+
+#~ msgid "Failed to obtain my (external) IPv6 address!\n"
+#~ msgstr "¡Falló al obtener mi dirección IPv6 (externa)!\n"
+
+#~ msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+#~ msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
+
+#~ msgid "%s: Rejected connection from blacklisted address %s.\n"
+#~ msgstr "%s: Conexión rechazada de una dirección de la \"lista negra\" %s.\n"
+
+#~ msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+#~ msgstr "Recibido mensaje UDP no válido del %u.%u.%u.%u:%u, omitiendo.\n"
+
+#~ msgid "Network advertisements disabled by configuration!\n"
+#~ msgstr "¡Advertencias de la red desconectadas por configuración!\n"
+
+#~ msgid ""
+#~ "Configuration file must specify directory for storing FS data in section `"
+#~ "%s' under `%s'.\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar el directorio para almacenar "
+#~ "los datos FS en la sección '%s' bajo '%s'.\n"
+
+#~ msgid "Could not initialize libgnunetutil!\n"
+#~ msgstr "¡Imposible inicializar libgnunetutil!\n"
+
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar un directorio para que "
+#~ "GNUnet almacene la información por-par bajo%s%s\n"
+
+#~ msgid "Could not create hostkey!\n"
+#~ msgstr "¡Imposible crear la clave local!\n"
+
+#~ msgid "%s `%s' returned no known hosts!\n"
+#~ msgstr "¡%s '%s' devolvió hosts desconocidos!\n"
+
+#~ msgid ""
+#~ "specify that the contents of the namespace are of the given MIMETYPE (use "
+#~ "when creating a new pseudonym)"
+#~ msgstr ""
+#~ "especifica que los contenidos del espacio son del MIMETYPE dado (úsalo "
+#~ "cuando crees un nuevo pseudónimo)"
+
+#~ msgid ""
+#~ "specify NAME to be the realname of the user controlling the namespace "
+#~ "(use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "especifica el NAME  para ser el nombre real del usuario que controla el "
+#~ "espacio (úsalo cuando crees un nuevo pseudónimo)"
+
+#~ msgid ""
+#~ "use DESCRIPTION to describe the content of the namespace (use when "
+#~ "creating a new pseudonym)"
+#~ msgstr ""
+#~ "usa la DESCRIPTION para describir el contenido del espacio (úsalo cuando "
+#~ "crees un nuevo pseudónimo)"
+
+#~ msgid ""
+#~ "specify the given URI as an address that contains more information about "
+#~ "the namespace (use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "especifica la URI dada como dirección que contiene mas información del "
+#~ "espacio (úsalo cuando crees un nuevo pseudónimo)"
+
+#~ msgid "Invalid argument: `%s'\n"
+#~ msgstr "Argumento no válido: '%s'\n"
+
+#~ msgid "Invalid arguments. Exiting.\n"
+#~ msgstr "Argumentos no válidos. Saliendo.\n"
+
+#~ msgid "%8u of %8u bytes deleted."
+#~ msgstr "%8u de %8u bytes borrados."
+
+#~ msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
+#~ msgstr ""
+#~ "especifica el fichero a borrar de GNUnet (el fichero debe existir "
+#~ "obligatoriamente)"
+
+#~ msgid ""
+#~ "Remove file from GNUnet.  The specified file is not removed\n"
+#~ "from the filesystem but just from the local GNUnet datastore."
+#~ msgstr ""
+#~ "Borra el fichero de GNUnet. El fichero especificado no es borrado\n"
+#~ "del sistema de ficheros, solamente de la base de datos local de GNUnet."
+
+#~ msgid "You must specify a filename (option -f)\n"
+#~ msgstr "Debes especificar un fichero (opción -f)\n"
+
+#~ msgid ""
+#~ "Error deleting file %s.\n"
+#~ "Probably a few blocks were already missing from the database.\n"
+#~ msgstr ""
+#~ "Error borrando el fichero %s.\n"
+#~ "Probablemente algunos bloques se hayan perdido de la base de datos.\n"
+
+#~ msgid "gnunet-directory [OPTIONS] [FILENAMES]"
+#~ msgstr "directorio-de-gnunet [OPCIONES] [FICHEROS]"
+
+#, fuzzy
+#~ msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
+#~ msgstr ""
+#~ "Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
+#~ "kbps.\n"
+
+#~ msgid "process directories recursively"
+#~ msgstr "procesa los directorios recursivamente"
+
+#~ msgid "You must pass a positive number to the `%s' option.\n"
+#~ msgstr "Debes pasar un número positivo a la opción '%s'.\n"
+
+#~ msgid "You must specify a list of files to insert.\n"
+#~ msgstr "Debes especificar una lista de ficheros a insertar.\n"
+
+#~ msgid "Only one file or directory can be specified at a time.\n"
+#~ msgstr "Solo un fichero o un directorio puede ser especificado cada vez.\n"
+
+#~ msgid "You must specify a file or directory to upload.\n"
+#~ msgstr "Debes especificar un fichero o directorio para subir.\n"
+
+#~ msgid "set the desired LEVEL of receiver-anonymity"
+#~ msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
+
+#~ msgid "Search GNUnet for files."
+#~ msgstr "Buscar GNUnet en busca de ficheros."
+
+#~ msgid "Not enough arguments. You must specify a keyword or identifier.\n"
+#~ msgstr ""
+#~ "No hay suficientes argumentos. Debes especificar una clave o un "
+#~ "identificador.\n"
+
+#~ msgid "LEVEL"
+#~ msgstr "NIVEL"
+
+#~ msgid "FILENAME"
+#~ msgstr "FICHERO"
+
+#~ msgid "write the file to FILENAME"
+#~ msgstr "escribe el fichero al FICHERO"
+
+#~ msgid "This search is already pending!\n"
+#~ msgstr "¡Esta búsqueda está aún pendiente!\n"
+
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s.\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar un directorio para que "
+#~ "GNUnet almacene la información por-par bajo %s%s.\n"
+
+#~ msgid "helptext for -t"
+#~ msgstr "texto de ayuda para -t"
+
+#~ msgid "Template for gnunet-clients."
+#~ msgstr "Plantilla para clientes-de-gnunet."
+
+#~ msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+#~ msgstr ""
+#~ "Puerto inválido \"%s\" en la especificación de la lista local, probando "
+#~ "el puerto %d.\n"
+
+#~ msgid "`%s' failed at %s:%d with error: `%s'.\n"
+#~ msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+
+#~ msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+#~ msgstr ""
+#~ "Imposible descargar lista de contactos, servidor '%s' desconocido.\n"
+
+#~ msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+#~ msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
+
+#~ msgid "Parsing HTTP response for URL `%s' failed.\n"
+#~ msgstr "Analizando HTTP de la URL '%s' se produjo un fallo.\n"
+
+#~ msgid "Parsing hello from `%s' failed.\n"
+#~ msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
+
+#~ msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+#~ msgstr ""
+#~ "Imposible resolver el nombre del proxy HTTP '%s'. Intentándolo sin un "
+#~ "proxy.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file must specify directory for storing data in section `%"
+#~ "s' under `%s'.\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar el directorio para almacenar "
+#~ "los datos FS en la sección '%s' bajo '%s'.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize SQLite KVStore.\n"
+#~ msgstr "Imposible inicializar SQLite.\n"
+
+#~ msgid "Option `%s' makes no sense without option `%s'."
+#~ msgstr "La opción '%s' no tiene ningún sentido sin la opción '%s'."
+
+#~ msgid "Invalid arguments: "
+#~ msgstr "Argumentos inválidos: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Exiting.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Saliendo.\n"
+
+#~ msgid "No applications defined in configuration!\n"
+#~ msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#~ msgid "Updated data for %d applications.\n"
+#~ msgstr "Actualizados los datos para %d aplicaciones.\n"
+
+#~ msgid "Could not write PID to file `%s': %s.\n"
+#~ msgstr "Imposible escribir PID al fichero '%s': %s.\n"
+
+#~ msgid "Invalid command-line arguments:\n"
+#~ msgstr "Argumentos en la linea de comandos inválidos:\n"
+
+#~ msgid "Argument %d: `%s'\n"
+#~ msgstr "Argumento %d: '%s'\n"
+
+#~ msgid "`%s' starting\n"
+#~ msgstr "'%s' comenzando\n"
+
+#~ msgid "FATAL: Identity plugin not found!\n"
+#~ msgstr "FATAL: ¡Plugin de identidad no encontrado!\n"
+
+#~ msgid "Available MODEs:\n"
+#~ msgstr "MODOs disponibles:\n"
+
+#~ msgid " config\t\ttext-based configuration\n"
+#~ msgstr " configuración\t\tconfiguración basada en texto\n"
+
+#~ msgid " menuconfig\ttext-based menu\n"
+#~ msgstr " menuconfig\tmenú basado en texto\n"
+
+#~ msgid " wizard-curses\tBasic text-based graphical configuration\n"
+#~ msgstr ""
+#~ " wizard-curses\t Configuración básica en modo gráfico pero basado en "
+#~ "texto\n"
+
+#~ msgid ""
+#~ " wizard-gtk\tBasic GTK configuration\n"
+#~ "\n"
+#~ msgstr ""
+#~ " wizard-gtk\tConfiguración GTK básica\n"
+#~ "\n"
+
+#~ msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
+#~ msgstr ""
+#~ "gnunet-setup debe tener acceso de escritura al fichero de configuración '%"
+#~ "s'\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Can only run wizard to configure gnunetd.\n"
+#~ "Did you forget the `%s' option?\n"
+#~ msgstr ""
+#~ "Solo se puede arrancar wizard para configurar gnunetd.\n"
+#~ "¿Te olvidaste de la opción %s'?\n"
+
+#~ msgid "Unable to save configuration file `%s': %s.\n"
+#~ msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
+
+#~ msgid "%s: symbol value `%s' invalid for %s\n"
+#~ msgstr "%s: valor del símbolo '%s' no válido para %s\n"
+
+#~ msgid "Can't open Service Control Manager"
+#~ msgstr "Imposible abrir el Service Control Manager"
+
+#~ msgid "Can't create service"
+#~ msgstr "Imposible crear el servicio"
+
+#~ msgid "Error changing the permissions of the GNUnet directory"
+#~ msgstr "Error cambiando los permisos del directorio de GNUnet"
+
+#~ msgid "Cannot write to the regisitry"
+#~ msgstr "Imposible escribir en el registro"
+
+#~ msgid "Can't access the service"
+#~ msgstr "Imposible acceder al servicio"
+
+#~ msgid "Can't delete the service"
+#~ msgstr "Imposible borrar el servicio"
+
+#~ msgid "Unknown error"
+#~ msgstr "Error desconocido"
+
+#~ msgid "This version of Windows does not support multiple users."
+#~ msgstr "Esta versión de Windows no permite usuarios múltiples"
+
+#~ msgid "Error creating user"
+#~ msgstr "Error creando usuario"
+
+#~ msgid "Error accessing local security policy"
+#~ msgstr "Error accediendo a la política de seguridad local"
+
+#~ msgid "Error granting service right to user"
+#~ msgstr "Error garantizando el servicio correcto al usuario"
+
+#~ msgid "Unknown error while creating a new user"
+#~ msgstr "Error desconocido mientras se creaba un nuevo usuario"
+
+#, fuzzy
+#~ msgid "Failed to find handler for `%s'\n"
+#~ msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
 #~ msgid "GNUnet configuration assistant"
 #~ msgstr "Asistente de configuración de GNUnet"
 
@@ -4432,9 +4479,6 @@
 #~ msgid "Question"
 #~ msgstr "Pregunta"
 
-#~ msgid "Do you want to save your settings?"
-#~ msgstr "¿Quieres guardar tu configuración?"
-
 #~ msgid "Unable to save configuration!"
 #~ msgstr "Imposible guardar la configuración"
 
@@ -4531,9 +4575,6 @@
 #~ msgid "_Introduction"
 #~ msgstr "_Introducción"
 
-#~ msgid "_About"
-#~ msgstr "_Acerca de"
-
 #~ msgid "Goes up of one level (single view)"
 #~ msgstr "Sube un nivel (vista única)"
 
@@ -4734,9 +4775,6 @@
 #~ msgid "unknown"
 #~ msgstr "desconocido"
 
-#~ msgid "Bytes"
-#~ msgstr "Bytes"
-
 #~ msgid "`%s' failed, other side closed connection.\n"
 #~ msgstr "'%s' falló, conexión cerrada en el otro lado.\n"
 

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2006-09-06 00:19:41 UTC (rev 3363)
+++ GNUnet/po/rw.po     2006-09-06 00:21:57 UTC (rev 3364)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-07-24 16:55-0700\n"
+"POT-Creation-Date: 2006-09-05 18:18-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"
@@ -24,70 +24,42 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/transports/ip6.c:60
+#: src/transports/ip6.c:65 src/util/network/io.c:68
 #, fuzzy, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "OYA Gushaka Bya Ubuturo"
 
-#: src/transports/ip6.c:100
+#: src/transports/ip6.c:109
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "OYA"
 
-#: src/transports/ip6.c:138
-#, fuzzy
-msgid "Failed to obtain my (external) IPv6 address!\n"
+#: src/transports/ip6.c:154 src/transports/ip.c:353
+#, fuzzy, c-format
+msgid "Failed to obtain my (external) %s address!\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp6.c:128 src/transports/udp.c:145
+#: src/transports/udp6.c:126 src/transports/udp.c:128
 #, fuzzy, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
-msgstr "Umuyoboro Kuri Kuri in Iboneza IDOSIYE in Icyiciro Cyangwa in"
-
-#: src/transports/udp6.c:164
-#, fuzzy, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
+msgid "Failed to bind to UDP port %d.\n"
 msgstr "Kuri Kuri Umuyoboro"
 
-#: src/transports/udp6.c:235
-#, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp6.c:290
-#, fuzzy, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr "Sibyo Ubutumwa Bivuye"
-
-#: src/transports/udp6.c:321
-#, fuzzy, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr "BYAKIRIWE Bivuye Byanze Imiterere Kugenzura..."
-
-#: src/transports/udp6.c:334 src/transports/tcp6.c:657
-#, fuzzy, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr "Ukwihuza Bivuye Aderesi"
-
-#: src/transports/udp6.c:415
+#: src/transports/udp6.c:223
 #, fuzzy
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp6.c:699 src/transports/smtp.c:932
-#: src/transports/udp.c:722
+#: src/transports/udp6.c:443 src/transports/udp.c:443
 #, fuzzy, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr "kugirango ni Byo hasi OYA"
 
-#: src/transports/http.c:601
+#: src/transports/http.c:614
 #, fuzzy
 msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr "Itegerejwe Urakaza neza ku HTTP Ukwihuza Ukwihuza"
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#: src/transports/http.c:830
 #, fuzzy, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr ""
@@ -114,12 +86,12 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/http.c:1101
+#: src/transports/http.c:1114
 #, fuzzy
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#: src/transports/http.c:1190 src/transports/tcp.c:254
 #, fuzzy, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -139,80 +111,80 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/http.c:1333
+#: src/transports/http.c:1346
 #, fuzzy, c-format
 msgid ""
 "Could not bind the HTTP listener to port %d. No transport service started.\n"
 msgstr "OYA i Kuri Umuyoboro Serivisi"
 
-#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
+#: src/transports/http.c:1469 src/applications/testbed/testbed.c:1054
 #, fuzzy, c-format
 msgid "Could not resolve name of HTTP proxy `%s'.\n"
 msgstr "OYA Izina: Bya Porogisi"
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1492
 #, fuzzy
 msgid "# bytes received via HTTP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/http.c:1480
+#: src/transports/http.c:1494
 #, fuzzy
 msgid "# bytes sent via HTTP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/http.c:1482
+#: src/transports/http.c:1496
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/transports/smtp.c:297
+#: src/transports/smtp.c:298
 #, fuzzy, c-format
 msgid "Could not resolve name of SMTP server `%s': %s"
 msgstr "OYA Izina: Bya Seriveri"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
+#: src/transports/smtp.c:420 src/transports/smtp.c:882
 #, fuzzy, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
 "under `%s'.\n"
 msgstr "i Izina: Bya a kugirango i in Icyiciro"
 
-#: src/transports/smtp.c:489
+#: src/transports/smtp.c:493
 #, fuzzy
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr "Ubutumwa Biturutse Ingano"
 
-#: src/transports/smtp.c:584
+#: src/transports/smtp.c:588
 #, fuzzy
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
 
-#: src/transports/smtp.c:591
+#: src/transports/smtp.c:595
 #, fuzzy, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
 
-#: src/transports/smtp.c:764
+#: src/transports/smtp.c:769
 #, fuzzy, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "E Ubutumwa Kuri Byanze"
 
-#: src/transports/smtp.c:815
+#: src/transports/smtp.c:820
 #, fuzzy, c-format
 msgid "SMTP server send unexpected response at %s:%d.\n"
 msgstr "Seriveri Kohereza ku"
 
-#: src/transports/smtp.c:838
+#: src/transports/smtp.c:843
 #, fuzzy, c-format
 msgid ""
 "SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
 msgstr "OYA Kohereza Iyemeza kugirango Kubaza..."
 
-#: src/transports/smtp.c:844
+#: src/transports/smtp.c:849
 #, fuzzy, c-format
 msgid "Failed to send `%s' request to SMTP server.\n"
 msgstr "Kuri Kohereza Ubutumwa Kuri"
 
-#: src/transports/smtp.c:903
+#: src/transports/smtp.c:909
 #, fuzzy, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
@@ -225,98 +197,41 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/tcp.c:465
+#: src/transports/smtp.c:938
 #, fuzzy, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
-msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgstr "kugirango ni Byo hasi OYA"
 
-#: src/transports/tcp.c:499
-#, fuzzy, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza"
-
-#: src/transports/tcp.c:1082
+#: src/transports/tcp.c:181
 #, fuzzy
 msgid "Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:324 src/transports/tcp6.c:333
 #, fuzzy, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/transports/tcp.c:1449
+#: src/transports/tcp.c:421
 #, fuzzy
 msgid "# bytes received via TCP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp.c:1451
+#: src/transports/tcp.c:423
 #, fuzzy
 msgid "# bytes sent via TCP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp.c:1453
+#: src/transports/tcp.c:425
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:179
-#, fuzzy, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Kuri Kuri Umuyoboro"
-
-#: src/transports/udp.c:250
-#, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp.c:307
-#, fuzzy, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-". Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/transports/udp.c:332
-#, fuzzy, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-". Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/transports/udp.c:417
+#: src/transports/udp.c:217
 #, fuzzy
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp.c:551
+#: src/transports/udp.c:312
 #, fuzzy, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -336,37 +251,42 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/udp.c:707
+#: src/transports/udp.c:449
 #, fuzzy
 msgid "# bytes received via UDP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/udp.c:709
+#: src/transports/udp.c:451
 #, fuzzy
 msgid "# bytes sent via UDP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/udp.c:711
+#: src/transports/udp.c:453
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/ip.c:124
+#: src/transports/ip.c:92
 #, fuzzy, c-format
+msgid "No interface specified in section `%s' under `%s'!\n"
+msgstr "urusobe in Iboneza Icyiciro"
+
+#: src/transports/ip.c:150
+#, fuzzy, c-format
 msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
+"Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr "OYA Gushaka in Kuri Gushaka"
 
-#: src/transports/ip.c:149
+#: src/transports/ip.c:182
 #, fuzzy, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "OYA kugirango ikoresha"
 
-#: src/transports/ip.c:193
+#: src/transports/ip.c:226
 #, fuzzy, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/transports/ip.c:203
+#: src/transports/ip.c:236
 #, fuzzy, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -395,43 +315,57 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/ip.c:224
+#: src/transports/ip.c:257
 #, fuzzy, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr "OYA Kuri Aderesi"
 
-#: src/transports/ip.c:256
+#: src/transports/ip.c:289
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
+#: src/transports/tcp6.c:179
+#, fuzzy
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "OYA Rusange Aderesi"
+
+#: src/transports/tcp6.c:221
+#, fuzzy, c-format
+msgid "`%s': unknown service: %s\n"
+msgstr "`%s':Kitazwi Serivisi"
+
+#: src/transports/tcp6.c:430
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#: src/transports/tcp6.c:432
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "#Bayite Yoherejwe:"
+
+#: src/transports/tcp6.c:434
+msgid "# bytes dropped by TCP6 (outgoing)"
 msgstr ""
 
-#: src/transports/tcp6.c:439
+#: src/transports/tcp_helper.c:182
 #, fuzzy
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
+msgid "Received malformed message instead of welcome message. Closing.\n"
+msgstr "Ubutumwa Bivuye HTTP Ukwihuza"
 
-#: src/transports/tcp6.c:469
+#: src/transports/tcp_helper.c:193
 #, fuzzy
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza Ukwihuza"
+msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgstr "Ubutumwa Bivuye HTTP Ukwihuza"
 
-#: src/transports/tcp6.c:958
+#: src/transports/udp_helper.c:93
 #, fuzzy
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "OYA Rusange Aderesi"
+msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgstr "Ubutumwa Bivuye HTTP Ukwihuza"
 
-#: src/transports/tcp6.c:1002
-#, fuzzy, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "`%s':Kitazwi Serivisi"
-
 #: src/applications/dht/tools/dhttest2.c:50
-#: src/applications/session/sessiontest.c:48
+#: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:107
 #: src/applications/tbench/tbenchtest_udp.c:107
@@ -441,7 +375,6 @@
 msgstr "#Bya"
 
 #: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/session/sessiontest.c:118
 #: src/applications/tbench/tbenchtest.c:199
 #: src/applications/tbench/tbenchtest_udp.c:201
 #: src/applications/gap/gaptest.c:318
@@ -450,7 +383,6 @@
 msgstr ""
 
 #: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/session/sessiontest.c:133
 #: src/applications/tbench/tbenchtest.c:122
 #: src/applications/tbench/tbenchtest_udp.c:122
 #: src/applications/gap/gaptest.c:330
@@ -474,28 +406,8 @@
 msgstr "Kubona Gushyira Gukuraho... a imbonerahamwe#"
 
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85
-#: src/applications/tbench/gnunet-tbench.c:124
-#: src/applications/tbench/gnunet-tbench.c:134
-#: src/applications/tbench/gnunet-tbench.c:147
-#: src/applications/tbench/gnunet-tbench.c:157
-#: src/applications/tbench/gnunet-tbench.c:167
-#: src/applications/tbench/gnunet-tbench.c:182
-#: src/applications/tracekit/gnunet-tracekit.c:73
-#: src/applications/tracekit/gnunet-tracekit.c:87
-#: src/applications/tracekit/gnunet-tracekit.c:122
-#: src/applications/tracekit/gnunet-tracekit.c:136
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/server/gnunet-transport-check.c:448
-#: src/server/gnunet-transport-check.c:462
-#: src/server/gnunet-transport-check.c:479
-#: src/server/gnunet-transport-check.c:509
+#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
+#: src/util/getopt/setoption.c:149
 #, fuzzy, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "a Umubare Kuri i Ihitamo"
@@ -505,21 +417,8 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
-#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
-#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
-#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
+#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
+#: src/setup/gnunet-setup.c:246
 #, fuzzy, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
@@ -698,7 +597,7 @@
 
 #: src/applications/dht/module/dht.c:1603
 #: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
 #, fuzzy, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "`%s'Na: Igihe cyarenze: hejuru 1. ISAHA"
@@ -784,7 +683,7 @@
 msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:212
+#: src/applications/chat/chat.c:216
 msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
@@ -799,9 +698,6 @@
 msgstr "Gutangira Umukiriya"
 
 #: src/applications/chat/gnunet-chat.c:151
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363
-#: src/applications/fs/tools/gnunet-delete.c:142
 #, fuzzy
 msgid "Could not connect to gnunetd.\n"
 msgstr "OYA Kwihuza Kuri"
@@ -821,425 +717,402 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "OYA Kohereza Ubutumwa Kuri"
 
-#: src/applications/advertising/advertising.c:161
+#: src/applications/advertising/advertising.c:162
 #, fuzzy, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr "Ubutumwa Bivuye Sibyo Isinya Sibyo"
 
-#: src/applications/advertising/advertising.c:167
+#: src/applications/advertising/advertising.c:168
 #, fuzzy
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr "Ubutumwa BYAKIRIWE Sibyo Igihe KURI"
 
-#: src/applications/advertising/advertising.c:176
+#: src/applications/advertising/advertising.c:177
 #, fuzzy, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr "kugirango Porotokole BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:295
+#: src/applications/advertising/advertising.c:297
 #, fuzzy
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr "OYA Kohereza"
 
-#: src/applications/advertising/advertising.c:308
+#: src/applications/advertising/advertising.c:310
 #, fuzzy, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "`%s'Byanze kugirango Umuyoboro in amasogonda"
 
-#: src/applications/advertising/advertising.c:463
+#: src/applications/advertising/advertising.c:467
 #, fuzzy, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Kuri Byahiswemo"
 
-#: src/applications/advertising/advertising.c:470
+#: src/applications/advertising/advertising.c:474
 #, fuzzy
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr "Oya Ikindi Kuri RW"
 
-#: src/applications/advertising/advertising.c:572
+#: src/applications/advertising/advertising.c:580
 #, fuzzy, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr "Bivuye Byarengeje igihe"
 
-#: src/applications/advertising/advertising.c:734
+#: src/applications/advertising/advertising.c:760
 #, fuzzy
 msgid "# Peer advertisements received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:735
+#: src/applications/advertising/advertising.c:761
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:736
+#: src/applications/advertising/advertising.c:762
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:738
-#: src/applications/pingpong/pingpong.c:462
+#: src/applications/advertising/advertising.c:764
+#: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:742
-#: src/applications/session/connect.c:752
+#: src/applications/advertising/advertising.c:768
+#: src/applications/session/connect.c:779
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:761
-#, fuzzy
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "Yahagaritswe ku Iboneza"
-
-#: src/applications/advertising/advertising.c:781
+#: src/applications/advertising/advertising.c:785
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:398
-#, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
-msgstr ""
-
-#: src/applications/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
+#: src/applications/pingpong/pingpong.c:123
+#: src/applications/pingpong/pingpong.c:191
+#: src/applications/pingpong/pingpong.c:244
+#: src/applications/pingpong/pingpong.c:313
 #, fuzzy, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Ubutumwa"
 
-#: src/applications/pingpong/pingpong.c:130
+#: src/applications/pingpong/pingpong.c:135
 #, fuzzy
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "kugirango"
 
-#: src/applications/pingpong/pingpong.c:187
+#: src/applications/pingpong/pingpong.c:201
 #, fuzzy
 msgid "Received PING not destined for us!\n"
 msgstr "OYA kugirango RW"
 
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/pingpong/pingpong.c:286
+#: src/applications/pingpong/pingpong.c:349
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:366
+#: src/applications/pingpong/pingpong.c:390
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:452
+#: src/applications/pingpong/pingpong.c:478
 #, fuzzy
 msgid "# encrypted PONG messages received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:454
+#: src/applications/pingpong/pingpong.c:480
 #, fuzzy
 msgid "# plaintext PONG messages received"
 msgstr "#Umukiriya Ibibazo BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:456
+#: src/applications/pingpong/pingpong.c:482
 #, fuzzy
 msgid "# encrypted PING messages received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:458
+#: src/applications/pingpong/pingpong.c:484
 #, fuzzy
 msgid "# PING messages created"
 msgstr "#Ubutumwa"
 
-#: src/applications/pingpong/pingpong.c:460
+#: src/applications/pingpong/pingpong.c:486
 #, fuzzy
 msgid "# encrypted PONG messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
 
-#: src/applications/pingpong/pingpong.c:464
+#: src/applications/pingpong/pingpong.c:490
 #, fuzzy
 msgid "# encrypted PING messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:500
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_sqlite/sqlite.c:45
+#: src/applications/sqstore_sqlite/sqlite.c:52
 #: src/applications/sqstore_mysql/mysql.c:137
 #: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/kvstore_sqlite/kv_sqlite.c:43
-#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/applications/sqstore_mysql/mysql.c:389
+#: src/applications/sqstore_mysql/mysql.c:728
+#: src/applications/sqstore_mysql/mysql.c:743
+#: src/applications/sqstore_mysql/mysql.c:752
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:786
+#: src/applications/sqstore_mysql/mysql.c:840
+#: src/applications/sqstore_mysql/mysql.c:925
+#: src/applications/sqstore_mysql/mysql.c:935
+#: src/applications/sqstore_mysql/mysql.c:1007
+#: src/applications/sqstore_mysql/mysql.c:1016
+#: src/applications/sqstore_mysql/mysql.c:1056
+#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
 
-#: src/applications/sqstore_sqlite/sqlite.c:139
-#, fuzzy
-msgid "Unable to initialize SQLite.\n"
+#: src/applications/sqstore_sqlite/sqlite.c:158
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kuri gutangiza"
 
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_sqlite/sqlite.c:307
+#: src/applications/sqstore_sqlite/sqlite.c:327
 #: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
+#: src/applications/sqstore_mysql/mysql.c:803
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
+#: src/applications/sqstore_sqlite/sqlite.c:308
+#: src/applications/sqstore_sqlite/sqlite.c:328
 #, fuzzy
 msgid "sqlite datastore"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1035
-#, fuzzy, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
-msgstr "IDOSIYE bushyinguro kugirango Ibyatanzwe in Icyiciro"
-
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-#: src/applications/sqstore_mysql/mysql.c:1178
+#: src/applications/sqstore_sqlite/sqlite.c:1177
+#: src/applications/sqstore_mysql/mysql.c:1182
 #, fuzzy
 msgid "# bytes in datastore"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
-#, fuzzy
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "OYA gutangiza Modire"
-
-#: src/applications/session/connect.c:209
+#: src/applications/session/connect.c:221
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
 
-#: src/applications/session/connect.c:246
+#: src/applications/session/connect.c:258
 #, fuzzy
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/session/connect.c:523
+#: src/applications/session/connect.c:517
 #, 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:540
+#, fuzzy, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:532
+#: src/applications/session/connect.c:550
 #, fuzzy, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr "Bivuye Kugenzura..."
 
-#: src/applications/session/connect.c:587
+#: src/applications/session/connect.c:608
 #, fuzzy
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr "Bishunzwe: Umukoro Urufunguzo Ubutumwa Ingano ni Sibyo"
 
-#: src/applications/session/connect.c:597
+#: src/applications/session/connect.c:619
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:742
+#: src/applications/session/connect.c:768
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:744
+#: src/applications/session/connect.c:770
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:746
+#: src/applications/session/connect.c:772
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:748
+#: src/applications/session/connect.c:774
 msgid "# sessions established"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
 #, fuzzy, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
 "using this name (%p)\n"
 msgstr "%s::%s-OYA ni ikoresha iyi Izina:"
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
 #, fuzzy, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
 "under that name: %p\n"
 msgstr "%s::%s-OYA Izina:"
 
-#: src/applications/rpc/rpc.c:232
+#: src/applications/rpc/rpc.c:233
 #, fuzzy, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s-OYA OYA"
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/rpc/rpc.c:280
 #, fuzzy, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s-OYA OYA"
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
+#: src/applications/rpc/rpc.c:1100
 #, fuzzy, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Ubutumwa Bya Ubwoko BYAKIRIWE"
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/rpc/rpc.c:945
 #, fuzzy, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr "Kubaza... Ubutumwa"
 
-#: src/applications/rpc/rpc.c:1388
+#: src/applications/rpc/rpc.c:1414
 #, fuzzy, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "OYA"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1441
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/rpc/rpc.c:1462
 #, fuzzy, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Kuri gutangiza Serivisi"
 
-#: src/applications/rpc/rpc.c:1491
+#: src/applications/rpc/rpc.c:1519
 #, fuzzy
 msgid "RPC async reply invalid.\n"
 msgstr "Subiza Sibyo"
 
-#: src/applications/rpc/rpc.c:1562
+#: src/applications/rpc/rpc.c:1591
 #, fuzzy
 msgid "async RPC reply not received.\n"
 msgstr "Subiza OYA BYAKIRIWE"
 
 #: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
+#: src/applications/sqstore_mysql/mysql.c:804
 #, fuzzy
 msgid "mysql datastore"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1110
 #, fuzzy, c-format
 msgid "Query `%s' had no results.\n"
 msgstr "Oya Ibisubizo ku"
 
-#: src/applications/sqstore_mysql/mysql.c:1205
+#: src/applications/sqstore_mysql/mysql.c:1212
 #, fuzzy, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Kuri Gukoresha IDOSIYE kugirango Iboneza"
 
-#: src/applications/sqstore_mysql/mysql.c:1223
+#: src/applications/sqstore_mysql/mysql.c:1230
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
 msgstr ""
 
-#: src/applications/datastore/filter.c:42
+#: src/applications/datastore/datastore.c:119
 #, fuzzy, c-format
-msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
-msgstr "bushyinguro kugirango Ibyatanzwe in Icyiciro"
-
-#: src/applications/datastore/datastore.c:118
-#, fuzzy, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "kugirango ku"
 
-#: src/applications/datastore/datastore.c:142
+#: src/applications/datastore/datastore.c:143
 #, fuzzy, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Kuri Ibikubiyemo"
 
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1086
-#: src/applications/fs/fsui/file_info.c:66
+#: src/applications/datastore/datastore.c:358
+#: src/applications/datastore/datastore.c:454
+#, fuzzy
+msgid "Failed to load state service. Trying to do without.\n"
+msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
+
+#: src/applications/identity/hostkey.c:109
 #, fuzzy, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s\n"
-msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+msgid "Failed to access GNUnet home directory `%s'\n"
+msgstr "OYA Gufungura bushyinguro"
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/identity/hostkey.c:139
 #, fuzzy, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr "in IDOSIYE Byanze Imiterere Kugenzura... Gishya"
 
-#: src/applications/identity/hostkey.c:127
+#: src/applications/identity/hostkey.c:147
 #, fuzzy
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Gishya iyi Gicurasi a"
 
-#: src/applications/identity/hostkey.c:130
-#, fuzzy
-msgid "Could not create hostkey!\n"
-msgstr "`%s':OYA Kurema"
-
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:160
 msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:333
+#: src/applications/identity/identity.c:346
 #, fuzzy, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr "Idosiye in bushyinguro OYA BIHUYE"
 
-#: src/applications/identity/identity.c:366
+#: src/applications/identity/identity.c:359
 #, fuzzy, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "%s`%s'Oya"
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr "Idosiye in bushyinguro OYA BIHUYE"
 
-#: src/applications/identity/identity.c:648
-#: src/applications/identity/identity.c:666
+#: src/applications/identity/identity.c:396
 #, fuzzy, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "OYA Kureka gufungura Serivisi"
+
+#: src/applications/identity/identity.c:684
+#: src/applications/identity/identity.c:705
+#, fuzzy, c-format
 msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr "IDOSIYE Sibyo Ibyatanzwe"
 
-#: src/applications/identity/identity.c:716
+#: src/applications/identity/identity.c:758
 #, fuzzy, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/identity/identity.c:724
+#: src/applications/identity/identity.c:767
 #, fuzzy
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Ubutumwa Sibyo Isinya Sibyo"
 
 #: src/applications/testbed/commands.c:1130
-#: src/applications/stats/gnunet-stats.c:61
+#: src/applications/stats/gnunet-stats.c:63
 #, fuzzy, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr "Kuri Ubutumwa"
 
 #: src/applications/testbed/commands.c:1132
-#: src/applications/stats/gnunet-stats.c:64
+#: src/applications/stats/gnunet-stats.c:66
 #, fuzzy, c-format
 msgid "Supported client-server messages:\n"
 msgstr "Umukiriya Seriveri Ubutumwa"
@@ -1271,7 +1144,7 @@
 "Trying again in %d seconds...\n"
 msgstr "Bifatanya i Kuri Umuyoboro Porogisi Serivisi in amasogonda"
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#: src/applications/testbed/gnunet-testbed.c:415
 #, fuzzy, c-format
 msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr ""
@@ -1436,7 +1309,6 @@
 msgstr "OYA"
 
 #: src/applications/testbed/testbed.c:1079
-#: src/applications/bootstrap_http/http.c:81
 #, fuzzy, c-format
 msgid "Invalid URL `%s' (must begin with `%s')\n"
 msgstr "Na:"
@@ -1466,78 +1338,103 @@
 msgid "Exit register (error: no http response read).\n"
 msgstr "Kwiyandikisha Ikosa Oya HTTP Gusoma"
 
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1361
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/applications/transport/transport.c:136
+#, c-format
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:183
+#, c-format
+msgid "Transport connection attempt failed, transport type %d not supported\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:278
 #, fuzzy, c-format
+msgid "Transmission attempt failed, transport type %d unknown.\n"
+msgstr "Bya Ubwoko"
+
+#: src/applications/transport/transport.c:366
+#, fuzzy, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Bya Ubwoko"
 
-#: src/applications/transport/transport.c:676
+#: src/applications/transport/transport.c:423
+msgid "No transport succeeded in creating a hello!\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:596
 #, fuzzy, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
-msgstr "OYA Gushyiraho in Iboneza in Icyiciro Igenamiterere Kuri"
+msgid "Loading transports `%s'\n"
+msgstr "S"
 
-#: src/applications/transport/transport.c:691
+#: src/applications/transport/transport.c:616
 #, fuzzy, c-format
-msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
-msgstr "ku Serivisi Ihitamo in Icyiciro"
+msgid "Could not load transport plugin `%s'\n"
+msgstr "OYA gutangiza Porogaramu"
 
-#: src/applications/transport/transport.c:717
+#: src/applications/transport/transport.c:626
 #, fuzzy, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr "Isomero OYA Bya ngombwa Umumaro"
 
-#: src/applications/transport/transport.c:738
+#: src/applications/transport/transport.c:643
+#, fuzzy, c-format
+msgid "Loaded transport `%s'\n"
+msgstr "S"
+
+#: src/applications/transport/transport.c:654
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:559
 #, fuzzy
 msgid "# messages defragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:560
 #, fuzzy
 msgid "# messages fragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:561
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/fragmentation/fragmentation.c:573
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr ""
 
+#: src/applications/stats/gnunet-stats.c:90
+#, fuzzy
+msgid "Print statistics about GNUnet operations."
+msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
+
 #: src/applications/stats/gnunet-stats.c:94
 #, fuzzy
 msgid "prints supported protocol messages"
 msgstr "Porotokole Ubutumwa"
 
-#: src/applications/stats/gnunet-stats.c:99
-#, fuzzy
-msgid "Print statistics about GNUnet operations."
-msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
-
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/stats/gnunet-stats.c:137
+#: src/applications/tbench/gnunet-tbench.c:136
+#: src/applications/tracekit/gnunet-tracekit.c:319
+#: src/applications/template/gnunet-template.c:101
 #, fuzzy, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Zimya Iyemeza Bivuye"
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/stats/gnunet-stats.c:156
 #, fuzzy, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Zimya Iyemeza Bivuye"
 
-#: src/applications/stats/clientapi.c:179
+#: src/applications/stats/clientapi.c:180
 #, fuzzy
 msgid "Uptime (seconds)"
 msgstr "amasogonda"
@@ -1562,85 +1459,91 @@
 msgid "# bytes of noise received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/stats/statistics.c:374
+#: src/applications/stats/statistics.c:364
+#, c-format
+msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
+msgstr ""
+
+#: src/applications/stats/statistics.c:385
 #, fuzzy
 msgid "keeps statistics about gnunetd's operation"
 msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
 
-#: src/applications/tbench/gnunet-tbench.c:95
+#: src/applications/tbench/gnunet-tbench.c:65
+#: src/applications/tracekit/gnunet-tracekit.c:54
 #, fuzzy
+msgid "Start GNUnet transport benchmarking tool."
+msgstr "Gutangira"
+
+#: src/applications/tbench/gnunet-tbench.c:67
+#, fuzzy
 msgid "output in gnuplot format"
 msgstr "Ibisohoka in Imiterere"
 
-#: src/applications/tbench/gnunet-tbench.c:98
+#: src/applications/tbench/gnunet-tbench.c:71
 #, fuzzy
 msgid "number of iterations"
 msgstr "Umubare Bya Amasubiramo"
 
-#: src/applications/tbench/gnunet-tbench.c:100
+#: src/applications/tbench/gnunet-tbench.c:75
 #, fuzzy
 msgid "number of messages to use per iteration"
 msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
 
-#: src/applications/tbench/gnunet-tbench.c:102
+#: src/applications/tbench/gnunet-tbench.c:78
 #, fuzzy
 msgid "receiver host identifier (ENC file name)"
 msgstr "Mwakirizi Ubuturo Ikiranga IDOSIYE Izina:"
 
-#: src/applications/tbench/gnunet-tbench.c:104
+#: src/applications/tbench/gnunet-tbench.c:81
 #, fuzzy
 msgid "message size"
 msgstr "Ubutumwa Ingano"
 
-#: src/applications/tbench/gnunet-tbench.c:106
+#: src/applications/tbench/gnunet-tbench.c:84
 #, fuzzy
 msgid "sleep for SPACE ms after each a message block"
 msgstr "kugirango Nyuma Ubutumwa"
 
-#: src/applications/tbench/gnunet-tbench.c:108
+#: src/applications/tbench/gnunet-tbench.c:87
 #, fuzzy
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr "Igihe Kuri Tegereza kugirango i Bya a"
 
-#: src/applications/tbench/gnunet-tbench.c:111
+#: src/applications/tbench/gnunet-tbench.c:91
 #, fuzzy
 msgid "number of messages in a message block"
 msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
 
-#: src/applications/tbench/gnunet-tbench.c:115
-#, fuzzy
-msgid "Start GNUnet transport benchmarking tool."
-msgstr "Gutangira"
-
-#: src/applications/tbench/gnunet-tbench.c:225
-#, fuzzy
+#: src/applications/tbench/gnunet-tbench.c:153
+#, fuzzy, c-format
 msgid "You must specify a receiver!\n"
 msgstr "a Mwakirizi"
 
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/tbench/gnunet-tbench.c:162
 #, fuzzy, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr "Mwakirizi ni OYA Byemewe Izina:"
 
-#: src/applications/tbench/gnunet-tbench.c:249
+#: src/applications/tbench/gnunet-tbench.c:189
 #, fuzzy, c-format
 msgid "Time:\n"
 msgstr "Igihe:"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
-#: src/applications/tbench/gnunet-tbench.c:250
+#: src/applications/tbench/gnunet-tbench.c:190
 #, fuzzy, c-format
 msgid "\tmax      %llums\n"
 msgstr "Kinini-"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/tbench/gnunet-tbench.c:192
 #, fuzzy, c-format
 msgid "\tmin      %llums\n"
 msgstr "Gito-"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
-#: src/applications/tbench/gnunet-tbench.c:254
+#: src/applications/tbench/gnunet-tbench.c:194
 #, fuzzy, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "Impuzandengo-"
@@ -1649,30 +1552,30 @@
 # sch/source\ui\dlg\attrib4.src:TP_STAT.RBT_VARIANT.text
 # #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
 # sch/source\ui\dlg\datstat.src:DLG_DATA_STAT.RBT_VARIANT.text
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/tbench/gnunet-tbench.c:196
 #, fuzzy, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
 
-#: src/applications/tbench/gnunet-tbench.c:259
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "Loss:\n"
 msgstr ""
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/tbench/gnunet-tbench.c:200
 #, fuzzy, c-format
 msgid "\tmax      %u\n"
 msgstr "Kinini-"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
-#: src/applications/tbench/gnunet-tbench.c:262
+#: src/applications/tbench/gnunet-tbench.c:202
 #, fuzzy, c-format
 msgid "\tmin      %u\n"
 msgstr "Gito-"
 
 # sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
-#: src/applications/tbench/gnunet-tbench.c:264
+#: src/applications/tbench/gnunet-tbench.c:204
 #, fuzzy, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "Impuzandengo-"
@@ -1681,17 +1584,17 @@
 # sch/source\ui\dlg\attrib4.src:TP_STAT.RBT_VARIANT.text
 # #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
 # sch/source\ui\dlg\datstat.src:DLG_DATA_STAT.RBT_VARIANT.text
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/tbench/gnunet-tbench.c:206
 #, fuzzy, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/applications/tbench/gnunet-tbench.c:215
 #, fuzzy, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "Imiterere OYA iyi OYA"
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/tbench/gnunet-tbench.c:219
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -1730,367 +1633,318 @@
 msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:448
+#: src/applications/tbench/tbench.c:460
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
+#: src/applications/tracekit/gnunet-tracekit.c:49
 #, fuzzy
 msgid "probe network to the given DEPTH"
 msgstr "urusobe Kuri i"
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
+#: src/applications/tracekit/gnunet-tracekit.c:52
 #, fuzzy
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 "Ibisohoka Imiterere 0 kugirango Ibisohoka 1. kugirango Akadomo 2. kugirango"
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
+#: src/applications/tracekit/gnunet-tracekit.c:58
 #, fuzzy
 msgid "use PRIO for the priority of the trace request"
 msgstr "Gukoresha kugirango i By'ibanze Bya i Kubaza..."
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
+#: src/applications/tracekit/gnunet-tracekit.c:62
 #, fuzzy
 msgid "wait DELAY seconds for replies"
 msgstr "Tegereza amasogonda kugirango"
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-#, fuzzy
-msgid "Trace GNUnet network topology."
-msgstr "urusobe"
-
-#: src/applications/tracekit/gnunet-tracekit.c:222
+#: src/applications/tracekit/gnunet-tracekit.c:116
 #, fuzzy, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "`%s'ni OYA Kuri"
-
-#: src/applications/tracekit/gnunet-tracekit.c:233
-#, fuzzy, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
 "vcg.\n"
 msgstr "Sibyo 0 kugirango Ukoresha: 1. kugirango Akadomo 2. kugirango"
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
+#: src/applications/tracekit/gnunet-tracekit.c:163
 #, fuzzy, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "`%s'ni OYA Kuri"
+
+#: src/applications/tracekit/gnunet-tracekit.c:197
+#, fuzzy, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "`%s'Kuri"
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/applications/tracekit/gnunet-tracekit.c:212
 #, fuzzy, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr "Sibyo 0 kugirango Ukoresha: 1. kugirango"
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
+#: src/applications/tracekit/gnunet-tracekit.c:235
 #, fuzzy, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "OYA Icyegeranyo Inyuma"
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
+#: src/applications/tracekit/gnunet-tracekit.c:350
 #, fuzzy
 msgid "Could not send request to gnunetd.\n"
 msgstr "OYA Kohereza Kubaza... Kuri"
 
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
+#: src/applications/tracekit/tracekit.c:68
+#: src/applications/tracekit/tracekit.c:201
 #, fuzzy, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/applications/tracekit/tracekit.c:243
+#: src/applications/tracekit/tracekit.c:263
 #, fuzzy
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr "imbonerahamwe# Kubaza..."
 
-#: src/applications/tracekit/tracekit.c:331
+#: src/applications/tracekit/tracekit.c:354
 #, fuzzy, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr "BYAKIRIWE Sibyo"
 
-#: src/applications/tracekit/tracekit.c:431
+#: src/applications/tracekit/tracekit.c:461
 #, fuzzy
 msgid "allows mapping of the network topology"
 msgstr "urusobe"
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/gap/gap.c:1635
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/applications/gap/gap.c:1618
+#: src/applications/gap/gap.c:1636
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1791
+#: src/applications/gap/gap.c:1809
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1820 src/applications/fs/module/anonymity.c:66
 #, fuzzy
 msgid "Failed to get traffic stats.\n"
 msgstr "Kuri Ikibazo# Ibyerekeye"
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
+#: src/applications/gap/gap.c:1826 src/applications/gap/gap.c:1831
+#: src/applications/gap/gap.c:1837
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2077
+#: src/applications/gap/gap.c:2116
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2078
+#: src/applications/gap/gap.c:2117
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2079
+#: src/applications/gap/gap.c:2118
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2080
+#: src/applications/gap/gap.c:2119
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2081
+#: src/applications/gap/gap.c:2120
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2082
+#: src/applications/gap/gap.c:2121
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2083
+#: src/applications/gap/gap.c:2122
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2084
+#: src/applications/gap/gap.c:2123
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2085
+#: src/applications/gap/gap.c:2124
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2086
+#: src/applications/gap/gap.c:2125
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2087
+#: src/applications/gap/gap.c:2126
 #, fuzzy
 msgid "# gap duplicate requests that were re-tried"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2088
+#: src/applications/gap/gap.c:2127
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2089
+#: src/applications/gap/gap.c:2128
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2090
+#: src/applications/gap/gap.c:2129
 #, fuzzy
 msgid "# gap spurious replies"
 msgstr "#hejuru Ibibazo BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2091
+#: src/applications/gap/gap.c:2130
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2092
+#: src/applications/gap/gap.c:2131
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2093
+#: src/applications/gap/gap.c:2132
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2094
+#: src/applications/gap/gap.c:2133
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2095
+#: src/applications/gap/gap.c:2134
 #, fuzzy
 msgid "# gap response weights"
 msgstr "#hejuru Ibibazo BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2112
+#: src/applications/gap/gap.c:2150
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/gap/gap.c:2178
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:151
+#: src/applications/gap/pid_table.c:156
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:153
+#: src/applications/gap/pid_table.c:158
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/getoption/getoption.c:74
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:82
+#: src/applications/getoption/getoption.c:84
 #, fuzzy
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "Porogaramu in Iboneza"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:71
+#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-search.c:129
+#: src/applications/fs/tools/gnunet-download.c:57
 #, fuzzy
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gushyiraho i Bya Mwakirizi"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:35
+#: src/applications/fs/tools/gnunet-pseudonym.c:74
 #, fuzzy
 msgid "automate creation of a namespace by starting a collection"
 msgstr "Bya a ku a"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
+#: src/applications/fs/tools/gnunet-pseudonym.c:78
 #, fuzzy
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "Gusiba i Na: i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
+#: src/applications/fs/tools/gnunet-pseudonym.c:81
 #, fuzzy
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "Gusiba i Na: i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
+#: src/applications/fs/tools/gnunet-pseudonym.c:84
 #, fuzzy
 msgid "end automated building of a namespace (ends collection)"
 msgstr "Impera Bya a"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
+#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-search.c:132
 #, fuzzy
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr "Gishya Gusiba Cyangwa Urutonde"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
+#, fuzzy
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
 msgstr "Gukoresha i Ijambo- banze Kuri i Gukoresha Ryari: a Gishya"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
 #, fuzzy
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
-msgstr "i Ibigize Bya i Bya i Gukoresha Ryari: a Gishya"
+msgid "specify metadata describing the namespace or collection"
+msgstr "Impera Bya a"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
+#: src/applications/fs/tools/gnunet-pseudonym.c:95
 #, fuzzy
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
 msgstr "OYA kugirango iyi Gukoresha Ryari: a Gishya"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
+#: src/applications/fs/tools/gnunet-pseudonym.c:98
 #, fuzzy
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr "OYA Urutonde i Bivuye i Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
+#: src/applications/fs/tools/gnunet-pseudonym.c:101
 #, fuzzy
 msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr "Kuri i Bya i Ukoresha: i Gukoresha Ryari: a Gishya"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-#, fuzzy
-msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
 msgstr "Kuri i Aderesi Bya i Kuri Ibikubiyemo in i Gukoresha Ryari: a Gishya"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
+#: src/applications/fs/tools/gnunet-pseudonym.c:104
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-#, fuzzy
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr "Gukoresha Kuri i Ibikubiyemo Bya i Gukoresha Ryari: a Gishya"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-#, fuzzy
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"i Nka Aderesi Kirimo Birenzeho Ibisobanuro Ibyerekeye i Gukoresha Ryari: a "
-"Gishya"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-#, fuzzy
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr "Gishya Gusiba Cyangwa Urutonde"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-msgid "AND"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#: src/applications/fs/tools/gnunet-pseudonym.c:138
 #, fuzzy, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr "Inkoresha siyo"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
-#: src/setup/gnunet-setup.c:179
-#, fuzzy
-msgid "Invalid arguments. Exiting.\n"
-msgstr "ingingo"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, fuzzy, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Igisubizo ni i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:142
 #, fuzzy, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "Igisubizo ni i"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#: src/applications/fs/tools/gnunet-pseudonym.c:178
 #, fuzzy, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "Nyuma"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, fuzzy, c-format
 msgid "Collection stopped.\n"
 msgstr "Kyahagariswe"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#: src/applications/fs/tools/gnunet-pseudonym.c:223
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#: src/applications/fs/tools/gnunet-pseudonym.c:231
 #, fuzzy, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Cyasibwe"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#: src/applications/fs/tools/gnunet-pseudonym.c:235
 #, fuzzy, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
@@ -2103,17 +1957,17 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#: src/applications/fs/tools/gnunet-pseudonym.c:254
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#: src/applications/fs/tools/gnunet-pseudonym.c:257
 #, fuzzy, c-format
 msgid "Failed to start collection.\n"
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#: src/applications/fs/tools/gnunet-pseudonym.c:299
 #, fuzzy, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
@@ -2126,100 +1980,67 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#: src/applications/fs/tools/gnunet-pseudonym.c:304
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#: src/applications/fs/tools/gnunet-pseudonym.c:326
 #, fuzzy, c-format
 msgid "Could not access namespace information.\n"
 msgstr "OYA bushyinguro"
 
-#: src/applications/fs/tools/gnunet-delete.c:37
+#: src/applications/fs/tools/gnunet-directory.c:83
 #, fuzzy, c-format
-msgid "%8u of %8u bytes deleted."
-msgstr "%8uBya Bayite Cyasibwe"
-
-#: src/applications/fs/tools/gnunet-delete.c:52
-#, fuzzy
-msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-msgstr "i IDOSIYE Kuri Gusiba Bivuye IDOSIYE"
-
-#: src/applications/fs/tools/gnunet-delete.c:61
-#, fuzzy
-msgid ""
-"Remove file from GNUnet.  The specified file is not removed\n"
-"from the filesystem but just from the local GNUnet datastore."
-msgstr "IDOSIYE Bivuye IDOSIYE ni OYA i Bivuye i"
-
-#: src/applications/fs/tools/gnunet-delete.c:139
-#, fuzzy
-msgid "You must specify a filename (option -f)\n"
-msgstr "a Izina ry'idosiye: Ihitamo F"
-
-#: src/applications/fs/tools/gnunet-delete.c:151
-#, fuzzy, c-format
-msgid ""
-"Error deleting file %s.\n"
-"Probably a few blocks were already missing from the database.\n"
-msgstr "IDOSIYE a Ibuze Bivuye i Ububikoshingiro"
-
-#: src/applications/fs/tools/gnunet-directory.c:76
-#, fuzzy, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==>ububiko"
 
-#: src/applications/fs/tools/gnunet-directory.c:81
+#: src/applications/fs/tools/gnunet-directory.c:90
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:111
+#: src/applications/fs/tools/gnunet-directory.c:124
 #, fuzzy, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "IDOSIYE Cyangwa Sibyo Imiterere kugirango bushyinguro"
 
-#: src/applications/fs/tools/gnunet-directory.c:113
+#: src/applications/fs/tools/gnunet-directory.c:126
 #, fuzzy, c-format
 msgid "%d files found in directory.\n"
 msgstr "IDOSIYE Kuri bushyinguro"
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:141
 #, fuzzy
+msgid "Perform directory related operations."
+msgstr "bushyinguro Ibikorwa:"
+
+#: src/applications/fs/tools/gnunet-directory.c:143
+#, fuzzy
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr "Gukuraho... Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-directory.c:133
+#: src/applications/fs/tools/gnunet-directory.c:147
 #, fuzzy
 msgid "list entries from the directory database"
 msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-directory.c:136
+#: src/applications/fs/tools/gnunet-directory.c:150
 #, fuzzy
 msgid "start tracking entries for the directory database"
 msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-directory.c:140
-msgid "gnunet-directory [OPTIONS] [FILENAMES]"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-directory.c:141
-#, fuzzy
-msgid "Perform directory related operations."
-msgstr "bushyinguro Ibikorwa:"
-
-#: src/applications/fs/tools/gnunet-directory.c:206
+#: src/applications/fs/tools/gnunet-directory.c:181
 #, fuzzy, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Ibyinjijwe"
 
-#: src/applications/fs/tools/gnunet-insert.c:110
+#: src/applications/fs/tools/gnunet-insert.c:139
 #, fuzzy, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Ikiranga"
 
-#: src/applications/fs/tools/gnunet-insert.c:115
+#: src/applications/fs/tools/gnunet-insert.c:144
 #, fuzzy, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
@@ -2232,46 +2053,52 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/fs/tools/gnunet-insert.c:166
 #, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
+msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:150
+#: src/applications/fs/tools/gnunet-insert.c:178
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr "ku Inyuma Bya Bayite"
 
-#: src/applications/fs/tools/gnunet-insert.c:164
+#: src/applications/fs/tools/gnunet-insert.c:189
 #, fuzzy, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
-msgstr "ISEGONDA"
-
-#: src/applications/fs/tools/gnunet-insert.c:174
-#, fuzzy, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Idosiye Nka"
 
-#: src/applications/fs/tools/gnunet-insert.c:187
+#: src/applications/fs/tools/gnunet-insert.c:200
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr "/Byahiswemo"
+
+#: src/applications/fs/tools/gnunet-insert.c:206
 #, c-format
 msgid ""
 "\n"
 "Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:209
+#: src/applications/fs/tools/gnunet-insert.c:228
 #, fuzzy
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
 msgstr "NIBA ni ku i Kurema a Ihuza Bya a Gukoporora in i bushyinguro"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:232
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:235
 msgid ""
 "use libextractor to add additional direct references to directory entries"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:214
+#: src/applications/fs/tools/gnunet-insert.c:238
 #, fuzzy
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -2280,14 +2107,19 @@
 "Gucapa Urutonde Bya Amagambo fatizo OYA Iyinjizamo Cyangwa gushyiraho "
 "umugereka"
 
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/fs/tools/gnunet-insert.c:240
 #, fuzzy
+msgid "Make files available to GNUnet for sharing."
+msgstr "Idosiye Bihari Kuri kugirango Bisangiwe"
+
+#: src/applications/fs/tools/gnunet-insert.c:243
+#, fuzzy
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr "Gushyiraho Intera kugirango Ukuboneka Bya Kuri kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:221
+#: src/applications/fs/tools/gnunet-insert.c:247
 #, fuzzy
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
@@ -2296,7 +2128,7 @@
 "Kongeramo Ijambo- banze kugirango i Hejuru: urwego IDOSIYE Cyangwa "
 "bushyinguro iyi Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-insert.c:251
 #, fuzzy
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
@@ -2305,11 +2137,11 @@
 "Kongeramo Ijambo- banze kugirango Byose Idosiye Na ububiko bw'amaderese iyi "
 "Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:256
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:230
+#: src/applications/fs/tools/gnunet-insert.c:259
 #, fuzzy
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
@@ -2317,92 +2149,59 @@
 msgstr ""
 "OYA Umubarendanga Iyinjizamo IDOSIYE in Bishunzwe: Ifishi in Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:263
 #, fuzzy
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr "Bya Verisiyo Kuri in i kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:236
+#: src/applications/fs/tools/gnunet-insert.c:267
 #, fuzzy
 msgid "specify the priority of the content"
 msgstr "i By'ibanze Bya i Ibikubiyemo"
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:270
 #, fuzzy
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr "Tangaza i Idosiye i IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:273
 #, fuzzy
-msgid "process directories recursively"
-msgstr "ububiko bw'amaderese"
-
-#: src/applications/fs/tools/gnunet-insert.c:242
-#, fuzzy
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr "iyi Nka kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:277
 #, fuzzy
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr "Gushyiraho i Bya iyi Verisiyo Bya i kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:281
 #, fuzzy
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr "Igihe kugirango Ipaji kugirango Imiterere"
 
-#: src/applications/fs/tools/gnunet-insert.c:250
+#: src/applications/fs/tools/gnunet-insert.c:284
 #, fuzzy
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "Izina ry'idosiye: Bya i Bya a Ibanjirije Verisiyo Bya i Ibikubiyemo "
 "kugirango Amayongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:257
-#, fuzzy
-msgid "Make files available to GNUnet for sharing."
-msgstr "Idosiye Bihari Kuri kugirango Bisangiwe"
-
-#: src/applications/fs/tools/gnunet-insert.c:344
+#: src/applications/fs/tools/gnunet-insert.c:326
 #, fuzzy, c-format
-msgid "You must pass a positive number to the `%s' option.\n"
-msgstr "a Umubare Kuri i Ihitamo"
-
-#: src/applications/fs/tools/gnunet-insert.c:429
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:537
-#: src/applications/fs/tools/gnunet-unindex.c:145
-#, fuzzy, c-format
-msgid "You must specify a list of files to insert.\n"
+msgid "You must specify one and only one filename for insertion.\n"
 msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:541
-#, c-format
-msgid "Only one file or directory can be specified at a time.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:545
+#: src/applications/fs/tools/gnunet-insert.c:351
 #, fuzzy, c-format
-msgid "You must specify a file or directory to upload.\n"
-msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-
-#: src/applications/fs/tools/gnunet-insert.c:595
-#, fuzzy, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "kugirango IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-insert.c:617
+#: src/applications/fs/tools/gnunet-insert.c:378
 #, fuzzy, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
@@ -2415,180 +2214,130 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-insert.c:636
+#: src/applications/fs/tools/gnunet-insert.c:394
 #, fuzzy, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Igihe Byanze Imiterere"
 
-#: src/applications/fs/tools/gnunet-insert.c:649
-#: src/applications/fs/tools/gnunet-insert.c:653
-#: src/applications/fs/tools/gnunet-insert.c:657
-#: src/applications/fs/tools/gnunet-insert.c:661
-#: src/applications/fs/tools/gnunet-insert.c:666
+#: src/applications/fs/tools/gnunet-insert.c:407
+#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:417
+#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:427
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Oya Ihitamo"
 
-#: src/applications/fs/tools/gnunet-search.c:108
-#: src/applications/fs/tools/gnunet-download.c:42
+#: src/applications/fs/tools/gnunet-search.c:136
 #, fuzzy
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "Gushyiraho i Bya Mwakirizi"
-
-#: src/applications/fs/tools/gnunet-search.c:114
-#, fuzzy
 msgid "exit after receiving LIMIT results"
 msgstr "Gusohoka Nyuma Ibisubizo ku"
 
-#: src/applications/fs/tools/gnunet-search.c:116
+#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-download.c:64
 #, fuzzy
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Kwandika Gushaka Ibisubizo ku Kuri i IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-search.c:118
+#: src/applications/fs/tools/gnunet-search.c:142
 #, fuzzy
-msgid "wait TIMEOUT seconds for search results before aborting"
+msgid "wait DELAY seconds for search results before aborting"
 msgstr "Tegereza amasogonda kugirango Gushaka Ibisubizo ku Mbere"
 
-#: src/applications/fs/tools/gnunet-search.c:123
-#, fuzzy
-msgid "Search GNUnet for files."
-msgstr "kugirango Idosiye"
-
-#: src/applications/fs/tools/gnunet-search.c:227
-#, fuzzy
-msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr "ingingo a Ijambo- banze Cyangwa Ikiranga"
-
-#: src/applications/fs/tools/gnunet-search.c:278
+#: src/applications/fs/tools/gnunet-search.c:189
 #, fuzzy, c-format
 msgid "Starting search failed. Consult logs.\n"
 msgstr "Kuri Kongeramo"
 
-#: src/applications/fs/tools/gnunet-search.c:353
+#: src/applications/fs/tools/gnunet-search.c:277
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Table.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Frame.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Graphic.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Calc.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Draw.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Chart.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Image.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Formula.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Impress.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.OLEMisc.Settings.Level.text
-#: src/applications/fs/tools/gnunet-download.c:41
+#: src/applications/fs/tools/gnunet-download.c:60
 #, fuzzy
-msgid "LEVEL"
-msgstr "urwego"
+msgid "Download files from GNUnet."
+msgstr "Idosiye Bivuye"
 
-#: src/applications/fs/tools/gnunet-download.c:47
+#: src/applications/fs/tools/gnunet-download.c:67
 #, fuzzy
-msgid "FILENAME"
-msgstr "Izina ry'idosiye"
-
-#: src/applications/fs/tools/gnunet-download.c:48
-#, fuzzy
-msgid "write the file to FILENAME"
-msgstr "Kwandika i IDOSIYE Kuri"
-
-#: src/applications/fs/tools/gnunet-download.c:50
-#, fuzzy
 msgid "download a GNUnet directory recursively"
 msgstr "Gufungura a bushyinguro"
 
-#: src/applications/fs/tools/gnunet-download.c:56
-#, fuzzy
-msgid "Download files from GNUnet."
-msgstr "Idosiye Bivuye"
-
-#: src/applications/fs/tools/gnunet-download.c:136
-#, fuzzy
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr "ingingo a"
-
-#: src/applications/fs/tools/gnunet-download.c:159
+#: src/applications/fs/tools/gnunet-download.c:86
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "ku Inyuma Bya Bayite"
 
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
+#: src/applications/fs/tools/gnunet-download.c:99
+#: src/applications/fs/tools/gnunet-download.c:110
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:191
+#: src/applications/fs/tools/gnunet-download.c:118
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr "ISEGONDA"
 
-#: src/applications/fs/tools/gnunet-download.c:237
+#: src/applications/fs/tools/gnunet-download.c:175
+#, fuzzy
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr "ingingo a"
+
+#: src/applications/fs/tools/gnunet-download.c:195
 #, fuzzy, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "Sibyo"
 
-#: src/applications/fs/tools/gnunet-download.c:288
+#: src/applications/fs/tools/gnunet-download.c:244
 #, fuzzy, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Idosiye Nka"
 
-#: src/applications/fs/tools/gnunet-unindex.c:50
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 "completion)                "
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr "ku Inyuma Bya Bayite"
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:83
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Error unindexing file: %s\n"
 msgstr "Kuri IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-unindex.c:97
+#: src/applications/fs/tools/gnunet-unindex.c:100
 #, fuzzy
 msgid "Unindex files."
 msgstr "#Idosiye"
 
-#: src/applications/fs/tools/gnunet-unindex.c:149
-#, fuzzy, c-format
-msgid "You must specify one and only one file to unindex.\n"
-msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
+#: src/applications/fs/tools/gnunet-unindex.c:145
+#, fuzzy
+msgid "Not enough arguments. You must specify a filename.\n"
+msgstr "ingingo a"
 
 # 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
-#: src/applications/fs/tools/gnunet-unindex.c:190
+#: src/applications/fs/tools/gnunet-unindex.c:173
 #, fuzzy, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "`%s'ntabwo ari idosiye"
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/fs/module/ondemand.c:317
 #, c-format
 msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:393
+#: src/applications/fs/module/ondemand.c:411
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2596,295 +2345,260 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/fs/module/ondemand.c:438
 #, 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:617
+#: src/applications/fs/module/ondemand.c:655
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1184
+#: src/applications/fs/module/fs.c:1196
 #, 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:1233
+#: src/applications/fs/module/fs.c:1247
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1270
+#: src/applications/fs/module/fs.c:1287
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:224
+#: src/applications/fs/module/migration.c:228
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:225
+#: src/applications/fs/module/migration.c:229
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: 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/namespace_info.c:604
-msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr ""
-
-#: src/applications/fs/fsui/fsui.c:189
+#: src/applications/fs/fsui/fsui.c:195
 msgid "FSUI persistence: error restoring download\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/fs/fsui/fsui.c:666
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:290
+#: src/applications/fs/fsui/download.c:305
 #, fuzzy
 msgid "Download aborted."
 msgstr "/Byahiswemo"
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:309
 #, fuzzy
 msgid "ECRS download failed (see logs)."
 msgstr "OYA Gufungura IDOSIYE"
 
-#: src/applications/fs/fsui/download.c:298
+#: src/applications/fs/fsui/download.c:313
 #, fuzzy
 msgid "ECRS download suspending."
 msgstr "OYA Gufungura IDOSIYE"
 
-#: src/applications/fs/fsui/download.c:302
+#: src/applications/fs/fsui/download.c:317
 #, fuzzy
 msgid "Unexpected download state."
 msgstr "Ibikubiyemo Ubwoko"
 
-#: src/applications/fs/fsui/unindex.c:85
+#: src/applications/fs/fsui/unindex.c:80
 #, fuzzy
 msgid "Unindex failed."
 msgstr "/Idosiye IDOSIYE"
 
-#: src/applications/fs/fsui/helper.c:67
+#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
+#: src/applications/fs/fsui/upload.c:413
 #, fuzzy
-msgid "No keywords specified!\n"
-msgstr "Amagambo fatizo"
-
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
-#, fuzzy
 msgid "Upload failed."
 msgstr "/Idosiye IDOSIYE"
 
-#: src/applications/fs/fsui/upload.c:455
+#: src/applications/fs/fsui/upload.c:420
 msgid "Cannot upload directory without using recursion."
 msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/file_info.c:282
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr ""
-
-#: src/applications/fs/ecrs/search.c:160
+#: src/applications/fs/ecrs/search.c:167
 msgid "CHK URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:216
+#: src/applications/fs/ecrs/search.c:226
 msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/fs/ecrs/download.c:128
 #, fuzzy, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr "OYA Kwandika Kuri IDOSIYE"
 
-#: src/applications/fs/ecrs/download.c:257
+#: src/applications/fs/ecrs/download.c:263
 #, fuzzy, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "`%s'%sByanze"
 
-#: src/applications/fs/ecrs/download.c:935
+#: src/applications/fs/ecrs/download.c:972
 #, 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:1112
+#: src/applications/fs/ecrs/download.c:1153
 #, 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:180
+#: src/applications/fs/ecrs/upload.c:170
 #, fuzzy, c-format
 msgid "`%s' is not a file.\n"
 msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/fs/ecrs/upload.c:180
 #, fuzzy, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:193
+#: src/applications/fs/ecrs/upload.c:188
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/fs/ecrs/upload.c:200
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Ibirimo"
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/fs/ecrs/upload.c:219
 #, fuzzy, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Bya in IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:227
+#: src/applications/fs/ecrs/upload.c:226
 #, fuzzy, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Itangira... Modire Byanze Umukiriya"
 
-#: src/applications/fs/ecrs/upload.c:306
+#: src/applications/fs/ecrs/upload.c:312
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:842
+#: src/applications/fs/ecrs/meta.c:847
 #, fuzzy, c-format
 msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr "Bya IDOSIYE Kuri Byanze"
 
-#: src/applications/fs/ecrs/meta.c:850
+#: src/applications/fs/ecrs/meta.c:855
 #, fuzzy, c-format
 msgid "Could not rename file `%s' to `%s': file exists\n"
 msgstr "OYA Guhindura izina IDOSIYE Kuri IDOSIYE"
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/fs/ecrs/namespace.c:153
 #, fuzzy, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
-msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
-
-#: src/applications/fs/ecrs/namespace.c:133
-#, fuzzy, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Kurema IDOSIYE"
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/fs/ecrs/namespace.c:338
+#: src/applications/fs/ecrs/namespace.c:419
+#: src/applications/fs/ecrs/namespace.c:573
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Idosiye OYA a"
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/fs/ecrs/namespace.c:350
+#: src/applications/fs/ecrs/namespace.c:430
 #, fuzzy, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/fs/ecrs/namespace.c:587
+#: src/applications/fs/ecrs/namespace.c:598
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/topology_f2f/topology.c:323
-#, fuzzy, c-format
+#: src/applications/fs/ecrs/helper.c:67
+#, fuzzy
+msgid "No keywords specified!\n"
+msgstr "Amagambo fatizo"
+
+#: src/applications/fs/ecrs/parser.c:122
+#, c-format
 msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
-msgstr "Bihari in i Iboneza in Icyiciro"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
+msgstr ""
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/applications/fs/uritrack/file_info.c:123
+msgid "Collecting file identifiers disabled.\n"
+msgstr ""
+
+#: src/applications/fs/uritrack/file_info.c:355
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr ""
+
+#: src/applications/fs/namespace/namespace_info.c:654
+msgid "Publication interval for periodic publication changed."
+msgstr ""
+
+#: src/applications/fs/namespace/namespace_info.c:675
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
+msgstr ""
+
+#: src/applications/topology_f2f/topology.c:354
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
 
-#: src/applications/topology_f2f/topology.c:358
+#: src/applications/topology_f2f/topology.c:371
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/applications/topology_f2f/topology.c:384
 #, fuzzy, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
 
-#: src/applications/template/template.c:61
+#: src/applications/template/template.c:62
 #, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:70
-#: src/applications/vpn/gnunet-vpn.c:72
+#: src/applications/template/gnunet-template.c:44
 #, fuzzy
-msgid "helptext for -t"
-msgstr "kugirango T"
+msgid "Template description."
+msgstr "/ku Isobanuramiterere"
 
-#: src/applications/template/gnunet-template.c:75
-#, fuzzy
-msgid "Template for gnunet-clients."
-msgstr "kugirango"
+#: src/applications/bootstrap_http/http.c:92
+#, fuzzy, c-format
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/bootstrap_http/http.c:109
-#, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+#: src/applications/bootstrap_http/http.c:144
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:120
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "`%s'Byanze ku Na: Ikosa"
-
-#: src/applications/bootstrap_http/http.c:132
-#, fuzzy, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
-msgstr "OYA Gufungura Urutonde Bya Aho kubariza Ubuturo Kitazwi"
-
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
-#, fuzzy, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "`%s'Kuri Byanze ku Na: Ikosa"
-
-#: src/applications/bootstrap_http/http.c:217
-#, fuzzy, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "kugirango Byanze"
-
-#: src/applications/bootstrap_http/http.c:252
-#, fuzzy, c-format
-msgid "Parsing hello from `%s' failed.\n"
-msgstr "Bivuye Byanze"
-
-#: src/applications/bootstrap_http/http.c:330
-#, fuzzy, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
-msgstr "OYA Izina: Bya Porogisi a Porogisi"
-
-#: src/applications/bootstrap_http/http.c:355
+#: src/applications/bootstrap_http/http.c:229
 #, fuzzy
 msgid "# hellos downloaded via http"
 msgstr "#KB Yimuwe ku"
@@ -2899,676 +2613,586 @@
 msgid "# bytes received of type %d"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/applications/traffic/traffic.c:605
+#: src/applications/traffic/traffic.c:609
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:67
-#, fuzzy
-msgid "Failed to query gnunetd about traffic conditions.\n"
-msgstr "Kuri Ikibazo# Ibyerekeye"
+#: src/applications/vpn/gnunet-vpn.c:98
+msgid "Suppress display of asynchronous log messages"
+msgstr ""
 
-#: src/applications/traffic/clientapi.c:74
-#, fuzzy
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr "OYA Akira Subiza Bivuye Ibyerekeye"
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:181
-#, fuzzy, c-format
-msgid ""
-"Configuration file must specify directory for storing data in section `%s' "
-"under `%s'.\n"
-msgstr "IDOSIYE bushyinguro kugirango Ibyatanzwe in Icyiciro"
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:264
-#, fuzzy
-msgid "Unable to initialize SQLite KVStore.\n"
-msgstr "Kuri gutangiza"
-
-#: src/applications/vpn/gnunet-vpn.c:77
+#: src/applications/vpn/gnunet-vpn.c:103
 msgid "VPN over GNUnet."
 msgstr ""
 
-#: src/applications/vpn/vpn.c:315
+#: src/applications/vpn/vpn.c:351
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:323
+#: src/applications/vpn/vpn.c:359
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:387
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:400
+#: src/applications/vpn/vpn.c:436
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:404
+#: src/applications/vpn/vpn.c:440
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:414
+#: src/applications/vpn/vpn.c:450
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:474
+#: src/applications/vpn/vpn.c:510
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:478
+#: src/applications/vpn/vpn.c:514
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:505
+#: src/applications/vpn/vpn.c:541
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:513
+#: src/applications/vpn/vpn.c:549
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:517
+#: src/applications/vpn/vpn.c:553
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:555
+#: src/applications/vpn/vpn.c:591
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:559
+#: src/applications/vpn/vpn.c:595
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:566
+#: src/applications/vpn/vpn.c:602
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:571
+#: src/applications/vpn/vpn.c:607
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:627
 #, fuzzy, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:638
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/vpn/vpn.c:650
 #, fuzzy, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/applications/vpn/vpn.c:646
+#: src/applications/vpn/vpn.c:683
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:692
+#: src/applications/vpn/vpn.c:729
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:754
+#: src/applications/vpn/vpn.c:788
 #, c-format
-msgid "RFC4193 --- whitelist of peer %x\n"
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:772
+#: src/applications/vpn/vpn.c:792
+#, c-format
+msgid "VPN cannot drop connection %x\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:810
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:812
+#: src/applications/vpn/vpn.c:850
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:816
+#: src/applications/vpn/vpn.c:854
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/vpn/vpn.c:860
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:825
+#: src/applications/vpn/vpn.c:863
 #, fuzzy, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr "Subiza Bya Kitazwi Ubwoko"
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:873
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:892
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:869
-#, c-format
-msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
-msgstr ""
-
-#: src/applications/vpn/vpn.c:885
+#: src/applications/vpn/vpn.c:913
 #, fuzzy
 msgid "Receive route request\n"
 msgstr "Gikora"
 
-#: src/applications/vpn/vpn.c:890
+#: src/applications/vpn/vpn.c:918
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:901
+#: src/applications/vpn/vpn.c:929
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:907
+#: src/applications/vpn/vpn.c:935
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:923
+#: src/applications/vpn/vpn.c:951
 #, fuzzy
 msgid "Receive route announce.\n"
 msgstr "Subiza Bya Kitazwi Ubwoko"
 
-#: src/applications/vpn/vpn.c:927
+#: src/applications/vpn/vpn.c:955
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:931
+#: src/applications/vpn/vpn.c:959
 #, fuzzy, c-format
 msgid "Inserting with hops %d\n"
 msgstr "Uburyo"
 
-#: src/applications/vpn/vpn.c:945
+#: src/applications/vpn/vpn.c:973
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:960
+#: src/applications/vpn/vpn.c:988
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:998
+#: src/applications/vpn/vpn.c:1016
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1013
+#: src/applications/vpn/vpn.c:1031
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1058
+#: src/applications/vpn/vpn.c:1076
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1104
+#: src/applications/vpn/vpn.c:1122
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1148
+msgid "Cannot store client info\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1208
 #, fuzzy
 msgid "Yes"
 msgstr "Yego"
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1208
 #, fuzzy
 msgid "No"
 msgstr "Oya."
 
-#: src/applications/vpn/vpn.c:1324
+#: src/applications/vpn/vpn.c:1385
 #, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1325
+#: src/applications/vpn/vpn.c:1386
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1361
+#: src/applications/vpn/vpn.c:1434
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1383
+#: src/applications/vpn/vpn.c:1466
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394
+#: src/applications/vpn/vpn.c:1477
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1405
+#: src/applications/vpn/vpn.c:1490
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/state/state.c:85
+#: src/server/gnunet-update.c:142
 #, fuzzy, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
-msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+msgid "Updating data for module `%s'\n"
+msgstr "Ibyatanzwe kugirango Modire"
 
-#: src/server/gnunet-update.c:50
+#: src/server/gnunet-update.c:147
+#, fuzzy, c-format
+msgid "Failed to update data for module `%s'\n"
+msgstr "Kuri Kuvugurura Ibyatanzwe kugirango Modire"
+
+#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
 #, fuzzy
-msgid "print a value from the configuration file to stdout"
-msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
+msgid "ping peers from HOSTLISTURL that match transports"
+msgstr "Bivuye BIHUYE"
 
-#: src/server/gnunet-update.c:55 src/server/startup.c:450
-#: src/server/gnunet-transport-check.c:407
+#: src/server/gnunet-update.c:220
 #, fuzzy
+msgid "Updates GNUnet datastructures after version change."
+msgstr "Nyuma Verisiyo Guhindura>>"
+
+#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
+#, fuzzy
 msgid "run as user LOGIN"
 msgstr "Gukoresha Nka Ukoresha:"
 
-#: src/server/gnunet-update.c:58
+#: src/server/gnunet-update.c:227
 #, fuzzy
 msgid "run in client mode (for getting client configuration values)"
 msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
 
-#: src/server/gnunet-update.c:64
-#, fuzzy
-msgid "Updates GNUnet datastructures after version change."
-msgstr "Nyuma Verisiyo Guhindura>>"
-
-#: src/server/gnunet-update.c:147
+#: src/server/connection.c:992
 #, fuzzy, c-format
-msgid "Option `%s' makes no sense without option `%s'."
-msgstr "Oya Ihitamo"
-
-#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
-#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
-#, fuzzy, c-format
-msgid "Invalid arguments: "
-msgstr "ingingo"
-
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
-msgstr ""
-
-#: src/server/gnunet-update.c:232 src/server/core.c:476
-#, fuzzy
-msgid "No applications defined in configuration!\n"
-msgstr "Porogaramu in Iboneza"
-
-#: src/server/gnunet-update.c:249
-#, fuzzy, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Ibyatanzwe kugirango Modire"
-
-#: src/server/gnunet-update.c:253
-#, fuzzy, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Kuri Kuvugurura Ibyatanzwe kugirango Modire"
-
-#: src/server/gnunet-update.c:309
-#, fuzzy, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Ibyatanzwe kugirango Porogaramu"
-
-#: src/server/connection.c:983
-#, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "`%s'Byahiswemo Inyuma Bya Ubutumwa"
 
-#: src/server/connection.c:990
+#: src/server/connection.c:999
 #, fuzzy, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2254
+#: src/server/connection.c:2283
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2325
+#: src/server/connection.c:2355
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2340
+#: src/server/connection.c:2370
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:2708
+#: src/server/connection.c:2774
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:2712
+#: src/server/connection.c:2778
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:2714
+#: src/server/connection.c:2780
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2717
+#: src/server/connection.c:2783
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2721
+#: src/server/connection.c:2787
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "#Bayite Bya Ubwoko"
 
-#: src/server/connection.c:2725
+#: src/server/connection.c:2791
 #, fuzzy
 msgid "# bytes received"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/server/connection.c:2727
+#: src/server/connection.c:2793
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2728
+#: src/server/connection.c:2794
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/startup.c:196
+#: src/server/gnunetd.c:78
 #, fuzzy, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr "Kubaza... BYAKIRIWE Bivuye Umukiriya ni"
+msgid "`%s' startup complete.\n"
+msgstr "`%s'Byuzuye"
 
-#: src/server/startup.c:324
+#: src/server/gnunetd.c:83
 #, fuzzy, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
-msgstr "a Izina: kugirango i IDOSIYE in Icyiciro"
+msgid "`%s' is shutting down.\n"
+msgstr "`%s'ni Hasi"
 
-#: src/server/startup.c:339
-#, fuzzy, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr "OYA Kwandika Kuri IDOSIYE"
-
-#: src/server/startup.c:443
+#: src/server/gnunetd.c:160
 #, 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/startup.c:456
+#: src/server/gnunetd.c:164
 #, fuzzy
 msgid "Starts the gnunetd daemon."
 msgstr "i"
 
-#: src/server/startup.c:470
-#, fuzzy, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr "OYA Guhindura>> Kuri"
-
-#: src/server/startup.c:479
-#, fuzzy, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Guhindura>> Ukoresha: Itsinda Kuri"
-
-#: src/server/startup.c:580
-#, fuzzy
-msgid "Invalid command-line arguments:\n"
-msgstr "Komandi: Umurongo ingingo"
-
-#: src/server/startup.c:583
-#, c-format
-msgid "Argument %d: `%s'\n"
+#: src/server/gnunetd.c:168
+msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/startup.c:589
+#: src/server/gnunetd.c:172
 #, fuzzy
-msgid "Invalid command-line arguments.\n"
-msgstr "Komandi: Umurongo ingingo"
+msgid "specify username as which gnunetd should run"
+msgstr "Ubuturo ku ni"
 
-#: src/server/gnunetd.c:76
+#: src/server/gnunetd.c:228
 #, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
 
-#: src/server/gnunetd.c:84
-#, c-format
-msgid "`%s' starting\n"
-msgstr ""
-
-#: src/server/gnunetd.c:106
+#: src/server/core.c:124
 #, fuzzy, c-format
-msgid "`%s' startup complete.\n"
-msgstr "`%s'Byuzuye"
-
-#: src/server/gnunetd.c:111
-#, fuzzy, c-format
-msgid "`%s' is shutting down.\n"
-msgstr "`%s'ni Hasi"
-
-#: src/server/core.c:115
-#, fuzzy, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr "Modire"
 
-#: src/server/core.c:168
+#: src/server/core.c:174
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/server/core.c:215
+#: src/server/core.c:217
 #, fuzzy, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr "OYA Zimya Porogaramu OYA"
 
-#: src/server/core.c:222
+#: src/server/core.c:225
 #, fuzzy, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr "OYA Zimya Porogaramu OYA"
 
-#: src/server/core.c:231 src/server/core.c:420
+#: src/server/core.c:235
 #, fuzzy, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr "OYA Gushaka Uburyo in Isomero"
 
-#: src/server/core.c:398
+#: src/server/core.c:374
 #, fuzzy, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr "OYA Serivisi OYA"
 
-#: src/server/core.c:499
+#: src/server/core.c:470
 #, fuzzy, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr "OYA gutangiza Porogaramu"
-
-#: src/server/core.c:516
-#, fuzzy, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "OYA Zimya Porogaramu"
 
-#: src/server/core.c:575
-msgid "FATAL: Identity plugin not found!\n"
-msgstr ""
-
-#: src/server/core.c:633
+#: src/server/core.c:594
 #, fuzzy, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "OYA Kureka gufungura Serivisi"
 
-#: src/server/gnunet-transport-check.c:109
+#: src/server/gnunet-transport-check.c:115
 #, fuzzy, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "`%s':OYA Kurema"
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:124
 #, fuzzy, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "`%s':OYA Kwihuza"
 
-#: src/server/gnunet-transport-check.c:148
+#: src/server/gnunet-transport-check.c:158
 #, fuzzy, c-format
 msgid "`%s': Could not send.\n"
 msgstr "`%s':OYA Kohereza"
 
-#: src/server/gnunet-transport-check.c:168
+#: src/server/gnunet-transport-check.c:180
 #, fuzzy, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "`%s':OYA Akira Ubutumwa muri"
 
-#: src/server/gnunet-transport-check.c:182
+#: src/server/gnunet-transport-check.c:194
 #, fuzzy, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "`%s':OYA Gucomora"
 
-#: src/server/gnunet-transport-check.c:189
+#: src/server/gnunet-transport-check.c:201
 #, fuzzy, c-format
 msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
+"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+"each.\n"
 msgstr "`%s'Kuri Ubutumwa Bya Bayite"
 
-#: src/server/gnunet-transport-check.c:219
+#: src/server/gnunet-transport-check.c:229
 #, c-format
 msgid " Transport %d is not being tested\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:230
+#: src/server/gnunet-transport-check.c:245
 #, c-format
 msgid ""
 "\n"
 "Contacting `%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:253
+#: src/server/gnunet-transport-check.c:266
 #, fuzzy, c-format
 msgid " Connection failed\n"
 msgstr "OYA Iyinjizamo Byanze"
 
-#: src/server/gnunet-transport-check.c:259
+#: src/server/gnunet-transport-check.c:272
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:320
+#: src/server/gnunet-transport-check.c:324
 #, fuzzy, c-format
 msgid "No reply received within %llums.\n"
 msgstr "Subiza BYAKIRIWE muri"
 
-#: src/server/gnunet-transport-check.c:396
+#: src/server/gnunet-transport-check.c:350
 #, fuzzy
-msgid "ping peers from HOSTLISTURL that match transports"
-msgstr "Bivuye BIHUYE"
+msgid "Tool to test if GNUnet transport services are operational."
+msgstr "Kuri Igerageza NIBA"
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:357
 #, fuzzy
 msgid "send COUNT messages"
 msgstr "Kohereza Ubutumwa"
 
-#: src/server/gnunet-transport-check.c:400
+#: src/server/gnunet-transport-check.c:360
 #, fuzzy
 msgid "send messages with SIZE bytes payload"
 msgstr "Kohereza Ubutumwa Na: Bayite"
 
-#: src/server/gnunet-transport-check.c:402
+#: src/server/gnunet-transport-check.c:363
 msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:404
+#: src/server/gnunet-transport-check.c:366
 #, fuzzy
 msgid "specifies after how many MS to time-out"
 msgstr "Nyuma Kuri Igihe Inyuma"
 
-#: src/server/gnunet-transport-check.c:414
-#, fuzzy
-msgid "Tool to test if GNUnet transport services are operational."
-msgstr "Kuri Igerageza NIBA"
+#: src/server/gnunet-transport-check.c:374
+msgid "repeat each test X times"
+msgstr ""
 
-#: src/server/gnunet-transport-check.c:565
-#, fuzzy
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr "a ubusa Gushyiraho Bya Kuri Igerageza"
-
-#: src/server/gnunet-transport-check.c:570
+#: src/server/gnunet-transport-check.c:455
 #, fuzzy, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:573
+#: src/server/gnunet-transport-check.c:458
 #, fuzzy, c-format
 msgid "Available transport(s): %s\n"
 msgstr "S"
 
-#: src/server/gnunet-transport-check.c:617
+#: src/server/gnunet-transport-check.c:518
 #, fuzzy, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr "%dInyuma Bya Times"
 
-#: src/server/tcpserver.c:422
+#: src/server/tcpserver.c:102
 #, fuzzy, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+msgid "The `%s' request received from client is malformed.\n"
+msgstr "Kubaza... BYAKIRIWE Bivuye Umukiriya ni"
+
+#: src/server/tcpserver.c:316
+#, fuzzy, c-format
+msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "OYA Kuri Umuyoboro"
 
-#: src/server/tcpserver.c:688
+#: src/server/tcpserver.c:384
 #, fuzzy, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr "urusobe in i Iboneza in Icyiciro kugirango Icyinjijwe"
 
-#: src/server/tcpserver.c:798
+#: src/server/tcpserver.c:437
 #, fuzzy, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%sByanze Ubutumwa Ubwoko in Gukoresha"
 
-#: src/server/handler.c:367
+#: src/server/handler.c:377
 #, fuzzy, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Ubutumwa Bivuye in"
 
-#: src/server/gnunet-peer-info.c:95
+#: src/server/version.c:157
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
+msgstr ""
+
+#: src/server/gnunet-peer-info.c:52
 #, fuzzy
 msgid "Print information about GNUnet peers."
 msgstr "Ibisobanuro Ibyerekeye"
 
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
 #, fuzzy, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "OYA Kubona Aderesi Bya"
 
-#: src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:88
 #, fuzzy
 msgid "hello message invalid (signature invalid).\n"
 msgstr "Ubutumwa Sibyo Isinya Sibyo"
 
-#: src/server/gnunet-peer-info.c:164
+#: src/server/gnunet-peer-info.c:99
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Na: Na Aderesi"
@@ -3580,6 +3204,39 @@
 "want.\n"
 msgstr "`%s'Na: OYA in Umurongo Wongera Gicurasi OYA"
 
+#: src/util/network_client/tcpio.c:90
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:114
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#, fuzzy, c-format
+msgid "Cannot connect to %s:u: %s\n"
+msgstr ""
+"Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+". Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
+
+#: src/util/network_client/tcpio.c:356
+#, fuzzy, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "`%s'Byanze Subiza Sibyo"
+
 #: src/util/crypto/hostkey_gcrypt.c:1031
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
@@ -3590,12 +3247,12 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "OYA i Ikitezwe: Verisiyo Verisiyo ni Bya ngombwa"
 
-#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#: src/util/os/statuscalls.c:171 src/util/os/statuscalls.c:249
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Kuri Ibyatanzwe Bivuye ku"
 
-#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
+#: src/util/os/statuscalls.c:291 src/util/os/statuscalls.c:300
 #, fuzzy, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -3606,24 +3263,17 @@
 msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/util/os/dso.c:75
-#, c-format
-msgid ""
-"Cannot determine plugin path, application must be installed in directory "
-"ending with `%s'.\n"
-msgstr ""
-
-#: src/util/os/dso.c:97
+#: src/util/os/dso.c:51
 #, fuzzy, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Bya Byanze"
 
-#: src/util/os/dso.c:134
+#: src/util/os/dso.c:90
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "`%s'Byanze kugirango Isomero ku Na: Ikosa"
 
-#: src/util/os/dso.c:176
+#: src/util/os/dso.c:132
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "`%s'Byanze Kuri Uburyo ku Na: Ikosa"
@@ -3638,55 +3288,30 @@
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Ikibazo# i Ikoresha:"
 
-#: src/util/os/installpath.c:172
-msgid ""
-"Cannot determine the path to the executable, your system may be broken or "
-"not supported.\n"
-msgstr ""
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Kuri"
 
-#: src/util/os/installpath.c:211
-msgid ""
-"GNUnet executables are not in a directory named 'bin'. This may signal a "
-"broken installation.\n"
-msgstr ""
+#: src/util/os/user.c:125
+#, fuzzy, c-format
+msgid "User `%s' not known, cannot change UID to it.\n"
+msgstr "OYA Guhindura>> Kuri"
 
-#: src/util/os/installpath.c:222
-msgid "Cannot determine the installation prefix. Unknown error.\n"
-msgstr ""
+#: src/util/os/user.c:136
+#, fuzzy, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Guhindura>> Ukoresha: Itsinda Kuri"
 
-#: src/util/network/tcpio.c:100
-msgid "Could not find valid value for PORT in section NETWORK."
-msgstr ""
+#: src/util/network/select.c:272
+#, fuzzy
+msgid "Received malformed message (too small) from connection. Closing.\n"
+msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/util/network/tcpio.c:124
-msgid "Could not find valid value for HOST in section NETWORK."
+#: src/util/network/select.c:421
+msgid "select listen socket not valid!\n"
 msgstr ""
 
-#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
-#, fuzzy, c-format
-msgid "Cannot connect to %s:u: %s\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-". Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/util/network/tcpio.c:406
-#, fuzzy, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "`%s'Byanze Subiza Sibyo"
-
 #: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
 #: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
 #, fuzzy, c-format
@@ -3713,100 +3338,105 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Imiterere kugirango urusobe"
 
-#: src/util/disk/storage.c:194
+#: src/util/disk/storage.c:201
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "`%s'Byanze kugirango Porogaramu- shoboza"
 
-#: src/util/disk/storage.c:240
+#: src/util/disk/storage.c:247
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory\n"
 msgstr "`%s'Ikitezwe: Kuri a bushyinguro"
 
-#: src/util/disk/storage.c:279
+#: src/util/disk/storage.c:286
 #, fuzzy, c-format
 msgid "Expected `%s' to be a regular file\n"
 msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
 
-#: src/util/disk/storage.c:486
+#: src/util/disk/storage.c:493
 #, fuzzy, c-format
 msgid "expected `%s' to be a directory!\n"
 msgstr "`%s'Ikitezwe: Kuri a bushyinguro"
 
-#: src/util/config_impl/impl.c:256
+#: src/util/config_impl/impl.c:260
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
 
-#: src/util/config_impl/impl.c:412
+#: src/util/config_impl/impl.c:419
 #, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:424
+#: src/util/config_impl/impl.c:431
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:494
+#: src/util/config_impl/impl.c:511
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:138 src/util/error/error.c:182
+#: src/util/config_impl/impl.c:617
+#, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/error/error.c:156 src/util/error/error.c:200
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/error/error.c:141 src/util/error/error.c:184
+#: src/util/error/error.c:159 src/util/error/error.c:202
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:144 src/util/error/error.c:186
+#: src/util/error/error.c:162 src/util/error/error.c:204
 msgid "WARNING"
 msgstr ""
 
-#: src/util/error/error.c:147 src/util/error/error.c:188
+#: src/util/error/error.c:165 src/util/error/error.c:206
 msgid "ERROR"
 msgstr ""
 
-#: src/util/error/error.c:150 src/util/error/error.c:190
+#: src/util/error/error.c:168 src/util/error/error.c:208
 msgid "FATAL"
 msgstr ""
 
-#: src/util/error/error.c:153 src/util/error/error.c:192
+#: src/util/error/error.c:171 src/util/error/error.c:210
 #, fuzzy
 msgid "USER"
 msgstr "Umubare"
 
-#: src/util/error/error.c:156 src/util/error/error.c:194
+#: src/util/error/error.c:174 src/util/error/error.c:212
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:159 src/util/error/error.c:196
+#: src/util/error/error.c:177 src/util/error/error.c:214
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:198
+#: src/util/error/error.c:180 src/util/error/error.c:216
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:165 src/util/error/error.c:200
+#: src/util/error/error.c:183 src/util/error/error.c:218
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:168 src/util/error/error.c:202
+#: src/util/error/error.c:186 src/util/error/error.c:220
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:171
+#: src/util/error/error.c:189
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:203
+#: src/util/error/error.c:221
 msgid "NOTHING"
 msgstr ""
 
@@ -3825,14 +3455,13 @@
 msgid "Permission denied for `%s'.\n"
 msgstr "kugirango ku"
 
-#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
-#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
-#: src/util/threads/pthread.c:275
+#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
+#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
 
-#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
@@ -3841,193 +3470,147 @@
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:686
+#: src/util/getopt/getopt.c:681
 #, fuzzy, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:705
 #, fuzzy, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s:Ihitamo OYA Kwemerera"
 
-#: src/util/getopt/getopt.c:715
+#: src/util/getopt/getopt.c:710
 #, fuzzy, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s:Ihitamo OYA Kwemerera"
 
-#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
 #, fuzzy, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:762
+#: src/util/getopt/getopt.c:757
 #, fuzzy, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:766
+#: src/util/getopt/getopt.c:761
 #, fuzzy, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:792
+#: src/util/getopt/getopt.c:787
 #, fuzzy, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:795
+#: src/util/getopt/getopt.c:790
 #, fuzzy, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s:Sibyo Ihitamo"
 
-#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt/getopt.c:872
+#: src/util/getopt/getopt.c:867
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: src/util/getopt/getopt.c:890
+#: src/util/getopt/getopt.c:885
 #, fuzzy, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s:Ihitamo OYA Kwemerera"
 
+#: src/util/getopt/setoption.c:58
+#, c-format
+msgid ""
+"Setting option `%s' in section `%s' to `%s' when processing command line "
+"option `%s' was denied.\n"
+msgstr ""
+
 #: src/util/getopt/printhelp.c:49
 #, fuzzy, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "kugirango Amahitamo kugirango Amahitamo"
 
-#: src/util/string/string.c:101
+#: src/util/string/string.c:119
 msgid "ms"
 msgstr ""
 
-#: src/util/string/string.c:106
+#: src/util/string/string.c:124
 msgid "s"
 msgstr ""
 
-#: src/util/string/string.c:109
+#: src/util/string/string.c:127
 msgid "m"
 msgstr ""
 
-#: src/util/string/string.c:112
+#: src/util/string/string.c:130
 msgid "h"
 msgstr ""
 
-#: src/util/string/string.c:115
+#: src/util/string/string.c:133
 #, fuzzy
 msgid " days"
 msgstr "7 Iminsi"
 
-#: src/util/string/string.c:133
+#: src/util/string/string.c:151
 msgid "b"
 msgstr ""
 
-#: src/util/string/string.c:138
+#: src/util/string/string.c:156
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:141
+#: src/util/string/string.c:159
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:144
+#: src/util/string/string.c:162
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:147
+#: src/util/string/string.c:165
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:267
+#: src/util/string/string.c:285
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:60
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:62
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:91
-#, c-format
-msgid "Available MODEs:\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:92
+#: src/setup/gnunet-setup.c:152
 #, fuzzy, c-format
-msgid " config\t\ttext-based configuration\n"
-msgstr "A bushyinguro"
+msgid "Too many arguments.\n"
+msgstr "Komandi: Umurongo ingingo"
 
-#: src/setup/gnunet-setup.c:94
-#, c-format
-msgid " menuconfig\ttext-based menu\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:96
-#, c-format
-msgid " wizard-curses\tBasic text-based graphical configuration\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:99
-#, fuzzy, c-format
-msgid " gconfig\tGTK configuration\n"
-msgstr "A bushyinguro"
-
-#: src/setup/gnunet-setup.c:100
-#, c-format
-msgid ""
-" wizard-gtk\tBasic GTK configuration\n"
-"\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:167
-#, fuzzy, c-format
-msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
-msgstr "OYA Iboneza IDOSIYE"
-
-#: src/setup/gnunet-setup.c:224
+#: src/setup/gnunet-setup.c:157
 #, fuzzy
 msgid "No interface specified, using default\n"
 msgstr "imbonerahamwe# Izina: ikoresha"
 
-#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
-#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
+#: src/setup/gnunet-setup.c:227
 #, fuzzy, c-format
 msgid "`%s' is not available."
 msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
 
-#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
-#, c-format
-msgid ""
-"Can only run wizard to configure gnunetd.\n"
-"Did you forget the `%s' option?\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:285
+#: src/setup/gnunet-setup.c:243
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Imiterere Verisiyo"
 
-#: src/setup/wizard_gtk.c:429
-#, fuzzy, c-format
-msgid "Unable to save configuration file `%s':"
-msgstr "OYA Iboneza IDOSIYE"
-
-#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
-msgid "Unable to create user account:"
-msgstr ""
-
-#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
-msgid "Unable to change startup process:"
-msgstr ""
-
 #: src/setup/gnunet-win-tool.c:109
 #, c-format
 msgid "GNUnet service installed successfully.\n"
@@ -4068,34 +3651,192 @@
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/setup/conf.c:522 src/setup/recreate.c:135
+#: src/setup/gtk/gconf.c:70
+msgid "Sorry, no help is available for this option.\n"
+msgstr ""
+
+#: src/setup/gtk/glade_support.c:89 src/setup/gtk/glade_support.c:120
 #, fuzzy, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
+msgid "Failed to open `%s'.\n"
+msgstr "Idosiye Nka"
+
+#: src/setup/gtk/wizard_gtk.c:429
+#, fuzzy, c-format
+msgid "Unable to save configuration file `%s':"
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/setup/conf.c:529
+#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:616
+msgid "Unable to create user account:"
+msgstr ""
+
+#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:619
+msgid "Unable to change startup process:"
+msgstr ""
+
+#: src/setup/text/conf.c:74
+#, fuzzy
+msgid "yes"
+msgstr "Yego"
+
+#: src/setup/text/conf.c:75
+msgid "no"
+msgstr ""
+
+#: src/setup/text/conf.c:101
+#, c-format
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgstr ""
+
+#: src/setup/text/conf.c:110
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
+msgstr ""
+
+#: src/setup/text/conf.c:112
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
+msgstr ""
+
+#: src/setup/text/conf.c:132
+#, c-format
+msgid "\t Enter choice (default is %c): "
+msgstr ""
+
+#: src/setup/text/conf.c:138
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
+msgstr ""
+
+#: src/setup/text/conf.c:144
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
+msgstr ""
+
+#: src/setup/text/conf.c:177
 #, fuzzy, c-format
-msgid "Configuration file `%s' created.\n"
+msgid "Yes\n"
+msgstr "Yego"
+
+#: src/setup/text/conf.c:182
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Abort\n"
+msgstr "Ibyerekeye"
+
+#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
+msgstr ""
+
+#: src/setup/text/conf.c:385
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:459
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:470
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:492
+#, fuzzy
+msgid "Invalid entry.\n"
+msgstr "Inkoresha siyo"
+
+#: src/setup/text/conf.c:511
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:538
+#, c-format
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:539
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:818
+#, fuzzy, c-format
+msgid "Configuration unchanged, no need to save.\n"
+msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
+
+#: src/setup/text/conf.c:558
+#, c-format
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
+msgstr ""
+
+#: src/setup/text/conf.c:568
+#, fuzzy, c-format
+msgid "Configuration was unchanged, no need to save.\n"
+msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
+
+#: src/setup/text/conf.c:573
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
-#: src/setup/wizard_util.c:193
+#: src/setup/ncurses/mconf.c:793
+#, fuzzy
+msgid "GNUnet Configuration"
+msgstr "A bushyinguro"
+
+#: src/setup/ncurses/mconf.c:824
+msgid "Do you wish to save your new configuration?"
+msgstr ""
+
+#: src/setup/ncurses/mconf.c:834
+#, fuzzy, c-format
+msgid "End of configuration.\n"
+msgstr "A bushyinguro"
+
+#: src/setup/ncurses/mconf.c:836
+#, fuzzy, c-format
+msgid "Your configuration changes were NOT saved.\n"
+msgstr "Gufungura Iboneza IDOSIYE"
+
+#: src/setup/ncurses/wizard_curs.c:58
 msgid "Error"
 msgstr ""
 
-#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
-#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
-#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
-#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
-#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
-#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
-#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
-#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
+#: src/setup/ncurses/wizard_curs.c:116 src/setup/ncurses/wizard_curs.c:131
+#: src/setup/ncurses/wizard_curs.c:184 src/setup/ncurses/wizard_curs.c:221
+#: src/setup/ncurses/wizard_curs.c:251 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:310 src/setup/ncurses/wizard_curs.c:337
+#: src/setup/ncurses/wizard_curs.c:369 src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:423 src/setup/ncurses/wizard_curs.c:446
+#: src/setup/ncurses/wizard_curs.c:501 src/setup/ncurses/wizard_curs.c:563
+#: src/setup/ncurses/wizard_curs.c:594 src/setup/ncurses/wizard_curs.c:638
 #, fuzzy
 msgid "GNUnet configuration"
 msgstr "A bushyinguro"
 
-#: src/setup/wizard_curs.c:117
+#: src/setup/ncurses/wizard_curs.c:117
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -4112,41 +3853,41 @@
 "the GNUnet team"
 msgstr ""
 
-#: src/setup/wizard_curs.c:132
+#: src/setup/ncurses/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 
 # sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
-#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
-#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:191
+#: src/setup/ncurses/wizard_curs.c:228 src/setup/ncurses/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:315 src/setup/ncurses/wizard_curs.c:375
 #, fuzzy
 msgid "Help"
 msgstr "/Kugoboka"
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
 "you are using DSL."
 msgstr ""
 
-#: src/setup/wizard_curs.c:185
+#: src/setup/ncurses/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:222
+#: src/setup/ncurses/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
 "If in doubt, leave this empty."
 msgstr ""
 
-#: src/setup/wizard_curs.c:229
+#: src/setup/ncurses/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -4157,7 +3898,7 @@
 "IP-Address."
 msgstr ""
 
-#: src/setup/wizard_curs.c:252
+#: src/setup/ncurses/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -4168,11 +3909,11 @@
 "forwarding\")."
 msgstr ""
 
-#: src/setup/wizard_curs.c:278
+#: src/setup/ncurses/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -4183,11 +3924,11 @@
 "connection."
 msgstr ""
 
-#: src/setup/wizard_curs.c:310
+#: src/setup/ncurses/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:316
+#: src/setup/ncurses/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -4198,7 +3939,7 @@
 "connection."
 msgstr ""
 
-#: src/setup/wizard_curs.c:338
+#: src/setup/ncurses/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -4211,18 +3952,18 @@
 "connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 
-#: src/setup/wizard_curs.c:370
+#: src/setup/ncurses/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:376
+#: src/setup/ncurses/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
 "This is the percentage of processor time GNUnet is allowed to use."
 msgstr ""
 
-#: src/setup/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -4235,7 +3976,7 @@
 "availability."
 msgstr ""
 
-#: src/setup/wizard_curs.c:424
+#: src/setup/ncurses/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -4243,7 +3984,7 @@
 "inserted and migrated content)."
 msgstr ""
 
-#: src/setup/wizard_curs.c:447
+#: src/setup/ncurses/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -4252,7 +3993,7 @@
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/setup/wizard_curs.c:502
+#: src/setup/ncurses/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -4268,7 +4009,7 @@
 "GNUnet user:"
 msgstr ""
 
-#: src/setup/wizard_curs.c:564
+#: src/setup/ncurses/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -4283,7 +4024,7 @@
 "GNUnet group:"
 msgstr ""
 
-#: src/setup/wizard_curs.c:595
+#: src/setup/ncurses/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -4291,7 +4032,7 @@
 "Do you want to start it after saving your configuration?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:632
+#: src/setup/ncurses/wizard_curs.c:632
 #, fuzzy, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -4299,121 +4040,435 @@
 "Try again?"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/setup/confdata.c:93
+#: src/setup/lib/gns.c:266
+#, fuzzy, c-format
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
+msgstr "bushyinguro kugirango Ibyatanzwe in Icyiciro"
+
+#: src/setup/lib/tree.c:181
 #, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/wizard_util.c:119
-msgid "Can't open Service Control Manager"
-msgstr ""
+#: src/include/gnunet_util_getopt.h:145
+#, fuzzy
+msgid "print this help"
+msgstr "Gucapa iyi Ifashayobora"
 
-#: src/setup/wizard_util.c:124
-msgid "Can't create service"
-msgstr ""
+#: src/include/gnunet_util_getopt.h:154
+#, fuzzy
+msgid "print the version number"
+msgstr "Gucapa i Verisiyo Umubare"
 
-#: src/setup/wizard_util.c:129
-msgid "Error changing the permissions of the GNUnet directory"
+#: src/include/gnunet_util_getopt.h:160
+msgid "configure logging to use LOGRULES"
 msgstr ""
 
-#: src/setup/wizard_util.c:134
-msgid "Cannot write to the regisitry"
+#: src/include/gnunet_util_getopt.h:166
+msgid "be verbose"
 msgstr ""
 
-#: src/setup/wizard_util.c:137
-msgid "Can't access the service"
-msgstr ""
-
-#: src/setup/wizard_util.c:141
-msgid "Can't delete the service"
-msgstr ""
-
-#: src/setup/wizard_util.c:145
+#: src/include/gnunet_util_getopt.h:172
 #, fuzzy
-msgid "Unknown error"
-msgstr "Verisiyo"
+msgid "use configuration file FILENAME"
+msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/setup/wizard_util.c:176
-msgid "This version of Windows does not support multiple users."
-msgstr ""
-
-#: src/setup/wizard_util.c:180
+#: src/include/gnunet_util_getopt.h:178
 #, fuzzy
-msgid "Error creating user"
-msgstr "Ivugurura Verisiyo"
+msgid "specify host on which gnunetd is running"
+msgstr "Ubuturo ku ni"
 
-#: src/setup/wizard_util.c:183
-msgid "Error accessing local security policy"
-msgstr ""
-
-#: src/setup/wizard_util.c:186
-msgid "Error granting service right to user"
-msgstr ""
-
-#: src/setup/wizard_util.c:189
-msgid "Unknown error while creating a new user"
-msgstr ""
-
-#: src/setup/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
-msgstr ""
-
-#: src/setup/glade_support.c:75
+#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
+#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
 #, fuzzy, c-format
-msgid "Failed to find handler for `%s'\n"
-msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
-
-#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
-#, fuzzy, c-format
-msgid "Failed to open `%s'.\n"
-msgstr "Idosiye Nka"
-
-#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
-#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
-#, fuzzy, c-format
 msgid "Assertion failed at %s:%d in %s.\n"
 msgstr "Byanze ku"
 
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
-#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
+#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr "`%s'Byanze ku Na: Ikosa"
 
-#: src/include/gnunet_util_error.h:207
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr "`%s'Byanze ku IDOSIYE ku Na: Ikosa"
 
-#: src/include/gnunet_util_getopt.h:145
 #, fuzzy
-msgid "print this help"
-msgstr "Gucapa iyi Ifashayobora"
+#~ msgid ""
+#~ "Cannot determine port to bind to.  Define in configuration file in "
+#~ "section `%s' under `%s' or in `%s' under %s/%s.\n"
+#~ msgstr "Umuyoboro Kuri Kuri in Iboneza IDOSIYE in Icyiciro Cyangwa in"
 
-#: src/include/gnunet_util_getopt.h:154
 #, fuzzy
-msgid "print the version number"
-msgstr "Gucapa i Verisiyo Umubare"
+#~ msgid "Failed to bind to UDP6 port %d.\n"
+#~ msgstr "Kuri Kuri Umuyoboro"
 
-#: src/include/gnunet_util_getopt.h:160
-msgid "configure logging to use LOGRULES"
-msgstr ""
+#, fuzzy
+#~ msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+#~ msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/include/gnunet_util_getopt.h:166
-msgid "be verbose"
-msgstr ""
+#, fuzzy
+#~ msgid "Packet received from %s:%d (UDP6) failed format check."
+#~ msgstr "BYAKIRIWE Bivuye Byanze Imiterere Kugenzura..."
 
-#: src/include/gnunet_util_getopt.h:172
 #, fuzzy
-msgid "use configuration file FILENAME"
-msgstr "Gukoresha Iboneza IDOSIYE"
+#~ msgid "%s: Rejected connection from blacklisted address %s.\n"
+#~ msgstr "Ukwihuza Bivuye Aderesi"
 
-#: src/include/gnunet_util_getopt.h:178
 #, fuzzy
-msgid "specify host on which gnunetd is running"
-msgstr "Ubuturo ku ni"
+#~ msgid ""
+#~ "Expected welcome message on tcp connection, got garbage (%u, %u). "
+#~ "Closing.\n"
+#~ msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
 
 #, fuzzy
+#~ msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+#~ msgstr ""
+#~ "Project- Id- Version: basctl\n"
+#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+#~ "Content- Type: text/ plain; charset= UTF- 8\n"
+#~ "Content- Transfer- Encoding: 8bit\n"
+#~ "X- Generator: KBabel 1. 0\n"
+#~ ". Project- Id- Version: basctl\n"
+#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+#~ "Content- Type: text/ plain; charset= UTF- 8\n"
+#~ "Content- Transfer- Encoding: 8bit\n"
+#~ "X- Generator: KBabel 1. 0\n"
+#~ "."
+
+#, fuzzy
+#~ msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
+#~ msgstr ""
+#~ "Project- Id- Version: basctl\n"
+#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+#~ "Content- Type: text/ plain; charset= UTF- 8\n"
+#~ "Content- Transfer- Encoding: 8bit\n"
+#~ "X- Generator: KBabel 1. 0\n"
+#~ ". Project- Id- Version: basctl\n"
+#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+#~ "Content- Type: text/ plain; charset= UTF- 8\n"
+#~ "Content- Transfer- Encoding: 8bit\n"
+#~ "X- Generator: KBabel 1. 0\n"
+#~ "."
+
+#, fuzzy
+#~ msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+#~ msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
+
+#, fuzzy
+#~ msgid ""
+#~ "Received malformed message from tcp6-peer connection. Closing "
+#~ "connection.\n"
+#~ msgstr "Ubutumwa Bivuye Ukwihuza Ukwihuza"
+
+#, fuzzy
+#~ msgid "Network advertisements disabled by configuration!\n"
+#~ msgstr "Yahagaritswe ku Iboneza"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file must specify directory for storing FS data in section `"
+#~ "%s' under `%s'.\n"
+#~ msgstr "IDOSIYE bushyinguro kugirango Ibyatanzwe in Icyiciro"
+
+#, fuzzy
+#~ msgid "Could not initialize libgnunetutil!\n"
+#~ msgstr "OYA gutangiza Modire"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s\n"
+#~ msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+
+#, fuzzy
+#~ msgid "Could not create hostkey!\n"
+#~ msgstr "`%s':OYA Kurema"
+
+#, fuzzy
+#~ msgid "%s `%s' returned no known hosts!\n"
+#~ msgstr "%s`%s'Oya"
+
+#, fuzzy
+#~ msgid ""
+#~ "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+#~ msgstr "OYA Gushyiraho in Iboneza in Icyiciro Igenamiterere Kuri"
+
+#, fuzzy
+#~ msgid ""
+#~ "You should specify at least one transport service under option `%s' in "
+#~ "section `%s'.\n"
+#~ msgstr "ku Serivisi Ihitamo in Icyiciro"
+
+#, fuzzy
+#~ msgid "Trace GNUnet network topology."
+#~ msgstr "urusobe"
+
+#, fuzzy
+#~ msgid ""
+#~ "specify that the contents of the namespace are of the given MIMETYPE (use "
+#~ "when creating a new pseudonym)"
+#~ msgstr "i Ibigize Bya i Bya i Gukoresha Ryari: a Gishya"
+
+#, fuzzy
+#~ msgid ""
+#~ "specify NAME to be the realname of the user controlling the namespace "
+#~ "(use when creating a new pseudonym)"
+#~ msgstr "Kuri i Bya i Ukoresha: i Gukoresha Ryari: a Gishya"
+
+#, fuzzy
+#~ msgid ""
+#~ "use DESCRIPTION to describe the content of the namespace (use when "
+#~ "creating a new pseudonym)"
+#~ msgstr "Gukoresha Kuri i Ibikubiyemo Bya i Gukoresha Ryari: a Gishya"
+
+#, fuzzy
+#~ msgid ""
+#~ "specify the given URI as an address that contains more information about "
+#~ "the namespace (use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "i Nka Aderesi Kirimo Birenzeho Ibisobanuro Ibyerekeye i Gukoresha Ryari: "
+#~ "a Gishya"
+
+#, fuzzy
+#~ msgid "Invalid argument: `%s'\n"
+#~ msgstr "Inkoresha siyo"
+
+#, fuzzy
+#~ msgid "Invalid arguments. Exiting.\n"
+#~ msgstr "ingingo"
+
+#, fuzzy
+#~ msgid "%8u of %8u bytes deleted."
+#~ msgstr "%8uBya Bayite Cyasibwe"
+
+#, fuzzy
+#~ msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
+#~ msgstr "i IDOSIYE Kuri Gusiba Bivuye IDOSIYE"
+
+#, fuzzy
+#~ msgid ""
+#~ "Remove file from GNUnet.  The specified file is not removed\n"
+#~ "from the filesystem but just from the local GNUnet datastore."
+#~ msgstr "IDOSIYE Bivuye IDOSIYE ni OYA i Bivuye i"
+
+#, fuzzy
+#~ msgid "You must specify a filename (option -f)\n"
+#~ msgstr "a Izina ry'idosiye: Ihitamo F"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error deleting file %s.\n"
+#~ "Probably a few blocks were already missing from the database.\n"
+#~ msgstr "IDOSIYE a Ibuze Bivuye i Ububikoshingiro"
+
+#, fuzzy
+#~ msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
+#~ msgstr "ISEGONDA"
+
+#, fuzzy
+#~ msgid "process directories recursively"
+#~ msgstr "ububiko bw'amaderese"
+
+#, fuzzy
+#~ msgid "You must pass a positive number to the `%s' option.\n"
+#~ msgstr "a Umubare Kuri i Ihitamo"
+
+#, fuzzy
+#~ msgid "You must specify a list of files to insert.\n"
+#~ msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
+
+#, fuzzy
+#~ msgid "You must specify a file or directory to upload.\n"
+#~ msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
+
+#, fuzzy
+#~ msgid "set the desired LEVEL of receiver-anonymity"
+#~ msgstr "Gushyiraho i Bya Mwakirizi"
+
+#, fuzzy
+#~ msgid "Search GNUnet for files."
+#~ msgstr "kugirango Idosiye"
+
+#, fuzzy
+#~ msgid "Not enough arguments. You must specify a keyword or identifier.\n"
+#~ msgstr "ingingo a Ijambo- banze Cyangwa Ikiranga"
+
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Table.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Frame.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Graphic.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Calc.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Draw.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Chart.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Image.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Formula.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Impress.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.OLEMisc.Settings.Level.text
+#, fuzzy
+#~ msgid "LEVEL"
+#~ msgstr "urwego"
+
+#, fuzzy
+#~ msgid "FILENAME"
+#~ msgstr "Izina ry'idosiye"
+
+#, fuzzy
+#~ msgid "write the file to FILENAME"
+#~ msgstr "Kwandika i IDOSIYE Kuri"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s.\n"
+#~ msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+
+#, fuzzy
+#~ msgid ""
+#~ "Need to have list of friends in configuration under `%s' in section `%"
+#~ "s'.\n"
+#~ msgstr "Bihari in i Iboneza in Icyiciro"
+
+#, fuzzy
+#~ msgid "helptext for -t"
+#~ msgstr "kugirango T"
+
+#, fuzzy
+#~ msgid "Template for gnunet-clients."
+#~ msgstr "kugirango"
+
+#, fuzzy
+#~ msgid "`%s' failed at %s:%d with error: `%s'.\n"
+#~ msgstr "`%s'Byanze ku Na: Ikosa"
+
+#, fuzzy
+#~ msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+#~ msgstr "OYA Gufungura Urutonde Bya Aho kubariza Ubuturo Kitazwi"
+
+#, fuzzy
+#~ msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+#~ msgstr "`%s'Kuri Byanze ku Na: Ikosa"
+
+#, fuzzy
+#~ msgid "Parsing HTTP response for URL `%s' failed.\n"
+#~ msgstr "kugirango Byanze"
+
+#, fuzzy
+#~ msgid "Parsing hello from `%s' failed.\n"
+#~ msgstr "Bivuye Byanze"
+
+#, fuzzy
+#~ msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+#~ msgstr "OYA Izina: Bya Porogisi a Porogisi"
+
+#, fuzzy
+#~ msgid "Failed to query gnunetd about traffic conditions.\n"
+#~ msgstr "Kuri Ikibazo# Ibyerekeye"
+
+#, fuzzy
+#~ msgid "Did not receive reply from gnunetd about traffic conditions.\n"
+#~ msgstr "OYA Akira Subiza Bivuye Ibyerekeye"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file must specify directory for storing data in section `%"
+#~ "s' under `%s'.\n"
+#~ msgstr "IDOSIYE bushyinguro kugirango Ibyatanzwe in Icyiciro"
+
+#, fuzzy
+#~ msgid "Unable to initialize SQLite KVStore.\n"
+#~ msgstr "Kuri gutangiza"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s\\%s.\n"
+#~ msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+
+#, fuzzy
+#~ msgid "print a value from the configuration file to stdout"
+#~ msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
+
+#, fuzzy
+#~ msgid "Option `%s' makes no sense without option `%s'."
+#~ msgstr "Oya Ihitamo"
+
+#, fuzzy
+#~ msgid "Invalid arguments: "
+#~ msgstr "ingingo"
+
+#, fuzzy
+#~ msgid "No applications defined in configuration!\n"
+#~ msgstr "Porogaramu in Iboneza"
+
+#, fuzzy
+#~ msgid "Updated data for %d applications.\n"
+#~ msgstr "Ibyatanzwe kugirango Porogaramu"
+
+#, fuzzy
+#~ msgid ""
+#~ "You must specify a name for the PID file in section `%s' under `%s'.\n"
+#~ msgstr "a Izina: kugirango i IDOSIYE in Icyiciro"
+
+#, fuzzy
+#~ msgid "Could not write PID to file `%s': %s.\n"
+#~ msgstr "OYA Kwandika Kuri IDOSIYE"
+
+#, fuzzy
+#~ msgid "Invalid command-line arguments:\n"
+#~ msgstr "Komandi: Umurongo ingingo"
+
+#, fuzzy
+#~ msgid "You must specify a non-empty set of transports to test!\n"
+#~ msgstr "a ubusa Gushyiraho Bya Kuri Igerageza"
+
+#, fuzzy
+#~ msgid " config\t\ttext-based configuration\n"
+#~ msgstr "A bushyinguro"
+
+#, fuzzy
+#~ msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
+#~ msgstr "OYA Iboneza IDOSIYE"
+
+#, fuzzy
+#~ msgid "Unable to save configuration file `%s': %s.\n"
+#~ msgstr "OYA Iboneza IDOSIYE"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "Verisiyo"
+
+#, fuzzy
+#~ msgid "Error creating user"
+#~ msgstr "Ivugurura Verisiyo"
+
+#, fuzzy
+#~ msgid "Failed to find handler for `%s'\n"
+#~ msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
+
+#, fuzzy
 #~ msgid "GNUnet configuration assistant"
 #~ msgstr "A bushyinguro"
 
@@ -4457,12 +4512,7 @@
 #~ msgid "_Help"
 #~ msgstr "/Kugoboka"
 
-# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
 #, fuzzy
-#~ msgid "_About"
-#~ msgstr "Ibyerekeye"
-
-#, fuzzy
 #~ msgid "Single"
 #~ msgstr "Idosiye "
 
@@ -5551,10 +5601,6 @@
 #~ msgstr "/ku Izina ry'idosiye:"
 
 #, fuzzy
-#~ msgid "/Select by description"
-#~ msgstr "/ku Isobanuramiterere"
-
-#, fuzzy
 #~ msgid "/Select by mimetype"
 #~ msgstr "/ku"
 
@@ -6003,10 +6049,6 @@
 #~ msgstr "#BYAKIRIWE"
 
 #, fuzzy
-#~ msgid "`%s' message received from peer `%s' was malformed.\n"
-#~ msgstr "`%s'Ubutumwa BYAKIRIWE Bivuye"
-
-#, fuzzy
 #~ msgid "Received malformed `%s' request from client.\n"
 #~ msgstr "Kubaza... Bivuye Umukiriya"
 
@@ -6045,10 +6087,6 @@
 #~ msgstr "Ububikoshingiro IDOSIYE Uburebure Kuri"
 
 #, fuzzy
-#~ msgid "Could not open directory `%s'!\n"
-#~ msgstr "OYA Gufungura bushyinguro"
-
-#, fuzzy
 #~ msgid "lfs: could not remove entry `%s': %s\n"
 #~ msgstr "OYA Gukuraho... Icyinjijwe"
 
@@ -6583,10 +6621,6 @@
 #~ msgstr "Byanze Kuri Kwihuza Kuri"
 
 #, fuzzy
-#~ msgid "Received malformed message from http-peer connection. Closing.\n"
-#~ msgstr "Ubutumwa Bivuye HTTP Ukwihuza"
-
-#, fuzzy
 #~ msgid ""
 #~ "Received plaintext not in pkcs-1 block type 2 format (size=%d, *tmp=%d)!\n"
 #~ msgstr "OYA in 1. Funga Ubwoko 2. Imiterere Ingano"

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2006-09-06 00:19:41 UTC (rev 3363)
+++ GNUnet/po/sv.po     2006-09-06 00:21:57 UTC (rev 3364)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-07-24 16:55-0700\n"
+"POT-Creation-Date: 2006-09-05 18:18-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"
@@ -15,109 +15,82 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/transports/ip6.c:60
+#: src/transports/ip6.c:65 src/util/network/io.c:68
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:100
+#: src/transports/ip6.c:109
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr ""
-
-#: src/transports/udp6.c:128 src/transports/udp.c:145
+#: src/transports/ip6.c:154 src/transports/ip.c:353
 #, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
+msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/udp6.c:164
+#: src/transports/udp6.c:126 src/transports/udp.c:128
 #, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
-msgstr "Misslyckades att binda till UDP6-port %d.\n"
+msgid "Failed to bind to UDP port %d.\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transports/udp6.c:235
-#, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp6.c:290
-#, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr ""
-
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr ""
-
-#: src/transports/udp6.c:334 src/transports/tcp6.c:657
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr ""
-
-#: src/transports/udp6.c:415
+#: src/transports/udp6.c:223
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/udp6.c:699 src/transports/smtp.c:932
-#: src/transports/udp.c:722
+#: src/transports/udp6.c:443 src/transports/udp.c:443
 #, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/http.c:601
+#: src/transports/http.c:614
 msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr ""
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#: src/transports/http.c:830
 #, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr "%s: Vägrade anslutning från svartlistad adress %u.%u.%u.%u.\n"
 
-#: src/transports/http.c:1101
+#: src/transports/http.c:1114
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#: src/transports/http.c:1190 src/transports/tcp.c:254
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/transports/http.c:1333
+#: src/transports/http.c:1346
 #, c-format
 msgid ""
 "Could not bind the HTTP listener to port %d. No transport service started.\n"
 msgstr ""
 
-#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
+#: src/transports/http.c:1469 src/applications/testbed/testbed.c:1054
 #, c-format
 msgid "Could not resolve name of HTTP proxy `%s'.\n"
 msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\".\n"
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1492
 msgid "# bytes received via HTTP"
 msgstr "# byte mottagna via HTTP"
 
-#: src/transports/http.c:1480
+#: src/transports/http.c:1494
 msgid "# bytes sent via HTTP"
 msgstr "# byte skickade via HTTP"
 
-#: src/transports/http.c:1482
+#: src/transports/http.c:1496
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte kastade via HTTP (utgående)"
 
-#: src/transports/smtp.c:297
+#: src/transports/smtp.c:298
 #, c-format
 msgid "Could not resolve name of SMTP server `%s': %s"
 msgstr "Kunde inte slå upp namnet för SMTP-server \"%s\": %s"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
+#: src/transports/smtp.c:420 src/transports/smtp.c:882
 #, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
@@ -126,177 +99,173 @@
 "Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" under "
 "\"%s\".\n"
 
-#: src/transports/smtp.c:489
+#: src/transports/smtp.c:493
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:584
+#: src/transports/smtp.c:588
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
 # capped är inte ett bra ord IMHO
-#: src/transports/smtp.c:591
+#: src/transports/smtp.c:595
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
-#: src/transports/smtp.c:764
+#: src/transports/smtp.c:769
 #, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Sändning av e-post till \"%s\" misslyckades.\n"
 
-#: src/transports/smtp.c:815
+#: src/transports/smtp.c:820
 #, c-format
 msgid "SMTP server send unexpected response at %s:%d.\n"
 msgstr ""
 
-#: src/transports/smtp.c:838
+#: src/transports/smtp.c:843
 #, c-format
 msgid ""
 "SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
 msgstr ""
 
-#: src/transports/smtp.c:844
+#: src/transports/smtp.c:849
 #, c-format
 msgid "Failed to send `%s' request to SMTP server.\n"
 msgstr ""
 
-#: src/transports/smtp.c:903
+#: src/transports/smtp.c:909
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s filter %s (SMTP)"
 
-#: src/transports/tcp.c:465
+#: src/transports/smtp.c:938
 #, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr ""
-
-#: src/transports/tcp.c:1082
+#: src/transports/tcp.c:181
 msgid "Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:324 src/transports/tcp6.c:333
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1449
+#: src/transports/tcp.c:421
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/tcp.c:1451
+#: src/transports/tcp.c:423
 msgid "# bytes sent via TCP"
 msgstr "# byte skickades via TCP"
 
-#: src/transports/tcp.c:1453
+#: src/transports/tcp.c:425
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transports/udp.c:179
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/transports/udp.c:250
-#, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp.c:307
-#, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr ""
-
-#: src/transports/udp.c:332
-#, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
-
-#: src/transports/udp.c:417
+#: src/transports/udp.c:217
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:551
+#: src/transports/udp.c:312
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/udp.c:707
+#: src/transports/udp.c:449
 msgid "# bytes received via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/transports/udp.c:709
+#: src/transports/udp.c:451
 msgid "# bytes sent via UDP"
 msgstr "# byte skickade via UDP"
 
-#: src/transports/udp.c:711
+#: src/transports/udp.c:453
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/transports/ip.c:124
+#: src/transports/ip.c:92
+#, fuzzy, c-format
+msgid "No interface specified in section `%s' under `%s'!\n"
+msgstr ""
+"Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
+"\"!\n"
+
+#: src/transports/ip.c:150
 #, c-format
 msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
+"Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr ""
 
-#: src/transports/ip.c:149
+#: src/transports/ip.c:182
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/transports/ip.c:193
+#: src/transports/ip.c:226
 #, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr ""
 
-#: src/transports/ip.c:203
+#: src/transports/ip.c:236
 #, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
 "GNUnet will use %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/transports/ip.c:224
+#: src/transports/ip.c:257
 #, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr ""
 
-#: src/transports/ip.c:256
+#: src/transports/ip.c:289
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
-msgstr ""
-
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr ""
-
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr ""
-
-#: src/transports/tcp6.c:958
+#: src/transports/tcp6.c:179
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/transports/tcp6.c:1002
+#: src/transports/tcp6.c:221
 #, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
+#: src/transports/tcp6.c:430
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "# byte mottogs via TCP"
+
+#: src/transports/tcp6.c:432
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "# byte skickades via TCP"
+
+#: src/transports/tcp6.c:434
+#, fuzzy
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr "# byte kastade via TCP (utgående)"
+
+#: src/transports/tcp_helper.c:182
+msgid "Received malformed message instead of welcome message. Closing.\n"
+msgstr ""
+
+#: src/transports/tcp_helper.c:193
+#, fuzzy
+msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+
+#: src/transports/udp_helper.c:93
+#, fuzzy
+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:50
-#: src/applications/session/sessiontest.c:48
+#: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:107
 #: src/applications/tbench/tbenchtest_udp.c:107
@@ -305,7 +274,6 @@
 msgstr "# av anslutna parter"
 
 #: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/session/sessiontest.c:118
 #: src/applications/tbench/tbenchtest.c:199
 #: src/applications/tbench/tbenchtest_udp.c:201
 #: src/applications/gap/gaptest.c:318
@@ -314,7 +282,6 @@
 msgstr "Väntar på att gnunetd ska starta (%u iterationer kvar)...\n"
 
 #: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/session/sessiontest.c:133
 #: src/applications/tbench/tbenchtest.c:122
 #: src/applications/tbench/tbenchtest_udp.c:122
 #: src/applications/gap/gaptest.c:330
@@ -335,28 +302,8 @@
 msgstr ""
 
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/dht/tools/dht-join.c:85
-#: src/applications/tbench/gnunet-tbench.c:124
-#: src/applications/tbench/gnunet-tbench.c:134
-#: src/applications/tbench/gnunet-tbench.c:147
-#: src/applications/tbench/gnunet-tbench.c:157
-#: src/applications/tbench/gnunet-tbench.c:167
-#: src/applications/tbench/gnunet-tbench.c:182
-#: src/applications/tracekit/gnunet-tracekit.c:73
-#: src/applications/tracekit/gnunet-tracekit.c:87
-#: src/applications/tracekit/gnunet-tracekit.c:122
-#: src/applications/tracekit/gnunet-tracekit.c:136
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/server/gnunet-transport-check.c:448
-#: src/server/gnunet-transport-check.c:462
-#: src/server/gnunet-transport-check.c:479
-#: src/server/gnunet-transport-check.c:509
+#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
+#: src/util/getopt/setoption.c:149
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
@@ -366,21 +313,8 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
-#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
-#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
-#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
+#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
+#: src/setup/gnunet-setup.c:246
 #, 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"
@@ -552,7 +486,7 @@
 
 #: src/applications/dht/module/dht.c:1603
 #: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
 #, c-format
 msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
@@ -634,7 +568,7 @@
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "\"%s\" registrerar handtagen %d och %d\n"
 
-#: src/applications/chat/chat.c:212
+#: src/applications/chat/chat.c:216
 msgid "enables P2P-chat (incomplete)"
 msgstr "aktiverar P2P-chatt (ej komplett)"
 
@@ -647,9 +581,6 @@
 msgstr "Starta GNUnets chattklient."
 
 #: src/applications/chat/gnunet-chat.c:151
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363
-#: src/applications/fs/tools/gnunet-delete.c:142
 msgid "Could not connect to gnunetd.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
@@ -666,351 +597,327 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/applications/advertising/advertising.c:162
 #, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:167
+#: src/applications/advertising/advertising.c:168
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:176
+#: src/applications/advertising/advertising.c:177
 #, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:295
+#: src/applications/advertising/advertising.c:297
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:308
+#: src/applications/advertising/advertising.c:310
 #, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "\"%s\" misslyckades (%d, %u). Kommer inte skicka PING.\n"
 
-#: src/applications/advertising/advertising.c:463
+#: src/applications/advertising/advertising.c:467
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Annonserar min transport %d till valda ändpunkter.\n"
 
-#: src/applications/advertising/advertising.c:470
+#: src/applications/advertising/advertising.c:474
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:572
+#: src/applications/advertising/advertising.c:580
 #, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:734
+#: src/applications/advertising/advertising.c:760
 msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:735
+#: src/applications/advertising/advertising.c:761
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:736
+#: src/applications/advertising/advertising.c:762
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:738
-#: src/applications/pingpong/pingpong.c:462
+#: src/applications/advertising/advertising.c:764
+#: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/applications/advertising/advertising.c:742
-#: src/applications/session/connect.c:752
+#: src/applications/advertising/advertising.c:768
+#: src/applications/session/connect.c:779
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "\"%s\" registrerar handtag %d (klartext och kryptotext)\n"
 
-#: src/applications/advertising/advertising.c:761
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/applications/advertising/advertising.c:781
+#: src/applications/advertising/advertising.c:785
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:398
+#: src/applications/pingpong/pingpong.c:123
+#: src/applications/pingpong/pingpong.c:191
+#: src/applications/pingpong/pingpong.c:244
+#: src/applications/pingpong/pingpong.c:313
 #, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
-msgstr ""
-
-#: src/applications/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
-#, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:130
+#: src/applications/pingpong/pingpong.c:135
 msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:187
+#: src/applications/pingpong/pingpong.c:201
 msgid "Received PING not destined for us!\n"
 msgstr "Mottog PING som ej var ämnat för oss!\n"
 
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/pingpong/pingpong.c:286
+#: src/applications/pingpong/pingpong.c:349
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:366
+#: src/applications/pingpong/pingpong.c:390
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr "Kan inte skapa PING, tabell är full. Försök att öka MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c:452
+#: src/applications/pingpong/pingpong.c:478
 msgid "# encrypted PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:454
+#: src/applications/pingpong/pingpong.c:480
 msgid "# plaintext PONG messages received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:456
+#: src/applications/pingpong/pingpong.c:482
 msgid "# encrypted PING messages received"
 msgstr "# krypterade PING-meddelanden mottagna"
 
-#: src/applications/pingpong/pingpong.c:458
+#: src/applications/pingpong/pingpong.c:484
 msgid "# PING messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/applications/pingpong/pingpong.c:460
+#: src/applications/pingpong/pingpong.c:486
 msgid "# encrypted PONG messages sent"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/applications/pingpong/pingpong.c:464
+#: src/applications/pingpong/pingpong.c:490
 msgid "# encrypted PING messages sent"
 msgstr "# krypterade PING-meddelanden skickade"
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:500
 #, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "\"%s\" registrerar handtag %d %d (klartext och kryptotext)\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_sqlite/sqlite.c:45
+#: src/applications/sqstore_sqlite/sqlite.c:52
 #: src/applications/sqstore_mysql/mysql.c:137
 #: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/kvstore_sqlite/kv_sqlite.c:43
-#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/applications/sqstore_mysql/mysql.c:389
+#: src/applications/sqstore_mysql/mysql.c:728
+#: src/applications/sqstore_mysql/mysql.c:743
+#: src/applications/sqstore_mysql/mysql.c:752
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:786
+#: src/applications/sqstore_mysql/mysql.c:840
+#: src/applications/sqstore_mysql/mysql.c:925
+#: src/applications/sqstore_mysql/mysql.c:935
+#: src/applications/sqstore_mysql/mysql.c:1007
+#: src/applications/sqstore_mysql/mysql.c:1016
+#: src/applications/sqstore_mysql/mysql.c:1056
+#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
+#: src/applications/sqstore_sqlite/sqlite.c:158
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_sqlite/sqlite.c:307
+#: src/applications/sqstore_sqlite/sqlite.c:327
 #: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
+#: src/applications/sqstore_mysql/mysql.c:803
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
+#: src/applications/sqstore_sqlite/sqlite.c:308
+#: src/applications/sqstore_sqlite/sqlite.c:328
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1035
-#, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
-msgstr ""
-
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-#: src/applications/sqstore_mysql/mysql.c:1178
+#: src/applications/sqstore_sqlite/sqlite.c:1177
+#: src/applications/sqstore_mysql/mysql.c:1182
 msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "Kunde inte initiera libgnunetutil!\n"
-
-#: src/applications/session/connect.c:209
+#: src/applications/session/connect.c:221
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:246
+#: src/applications/session/connect.c:258
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
 
-#: src/applications/session/connect.c:523
+#: src/applications/session/connect.c:517
+#, 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:540
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:532
+#: src/applications/session/connect.c:550
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:587
+#: src/applications/session/connect.c:608
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:597
+#: src/applications/session/connect.c:619
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:742
+#: src/applications/session/connect.c:768
 msgid "# session keys sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/applications/session/connect.c:744
+#: src/applications/session/connect.c:770
 msgid "# session keys rejected"
 msgstr "# sessionnycklar vägrade"
 
-#: src/applications/session/connect.c:746
+#: src/applications/session/connect.c:772
 msgid "# session keys accepted"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/applications/session/connect.c:748
+#: src/applications/session/connect.c:774
 msgid "# sessions established"
 msgstr "# sessioner etablerade"
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
 "using this name (%p)\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
 "under that name: %p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:232
+#: src/applications/rpc/rpc.c:233
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - RPC %s:%p kunde inte avregistreras: hittades inte\n"
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/rpc/rpc.c:280
 #, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
+#: src/applications/rpc/rpc.c:1100
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/rpc/rpc.c:945
 #, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1388
+#: src/applications/rpc/rpc.c:1414
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1441
 #, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/rpc/rpc.c:1462
 #, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/applications/rpc/rpc.c:1491
+#: src/applications/rpc/rpc.c:1519
 msgid "RPC async reply invalid.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1562
+#: src/applications/rpc/rpc.c:1591
 msgid "async RPC reply not received.\n"
 msgstr ""
 
 #: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
+#: src/applications/sqstore_mysql/mysql.c:804
 msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1110
 #, c-format
 msgid "Query `%s' had no results.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1205
+#: src/applications/sqstore_mysql/mysql.c:1212
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1223
+#: src/applications/sqstore_mysql/mysql.c:1230
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
 msgstr ""
 
-#: src/applications/datastore/filter.c:42
+#: src/applications/datastore/datastore.c:119
 #, c-format
-msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
-msgstr ""
-
-#: src/applications/datastore/datastore.c:118
-#, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Tillgänglighetstest misslyckades för \"%s\" vid %s:%d.\n"
 
-#: src/applications/datastore/datastore.c:142
+#: src/applications/datastore/datastore.c:143
 #, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Databas misslyckades att ta bort \"%s\".\n"
 
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1086
-#: src/applications/fs/fsui/file_info.c:66
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s\n"
+#: src/applications/datastore/datastore.c:358
+#: src/applications/datastore/datastore.c:454
+msgid "Failed to load state service. Trying to do without.\n"
 msgstr ""
-"Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
-"under %s%s\n"
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/identity/hostkey.c:109
+#, fuzzy, c-format
+msgid "Failed to access GNUnet home directory `%s'\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/applications/identity/hostkey.c:139
 #, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
@@ -1018,52 +925,54 @@
 "Existerande värdnyckel i filen \"%s\" felade vid formatkontroll, skapar en "
 "ny värdnyckel.\n"
 
-#: src/applications/identity/hostkey.c:127
+#: src/applications/identity/hostkey.c:147
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:160
 msgid "Done creating hostkey.\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/applications/identity/identity.c:333
+#: src/applications/identity/identity.c:346
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:366
+#: src/applications/identity/identity.c:359
 #, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "%s \"%s\" returnerade inga kända värdar!\n"
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
 
-#: src/applications/identity/identity.c:648
-#: src/applications/identity/identity.c:666
+#: src/applications/identity/identity.c:396
 #, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/applications/identity/identity.c:684
+#: src/applications/identity/identity.c:705
+#, c-format
 msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:716
+#: src/applications/identity/identity.c:758
 #, fuzzy, c-format
 msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
 
-#: src/applications/identity/identity.c:724
+#: src/applications/identity/identity.c:767
 msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
 #: src/applications/testbed/commands.c:1130
-#: src/applications/stats/gnunet-stats.c:61
+#: src/applications/stats/gnunet-stats.c:63
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr ""
 
 #: src/applications/testbed/commands.c:1132
-#: src/applications/stats/gnunet-stats.c:64
+#: src/applications/stats/gnunet-stats.c:66
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr ""
@@ -1093,7 +1002,7 @@
 "Trying again in %d seconds...\n"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#: src/applications/testbed/gnunet-testbed.c:415
 #, c-format
 msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr ""
@@ -1215,7 +1124,6 @@
 msgstr ""
 
 #: src/applications/testbed/testbed.c:1079
-#: src/applications/bootstrap_http/http.c:81
 #, c-format
 msgid "Invalid URL `%s' (must begin with `%s')\n"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
@@ -1244,74 +1152,99 @@
 msgid "Exit register (error: no http response read).\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1361
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/applications/transport/transport.c:136
 #, c-format
-msgid "No transport of type %d known.\n"
-msgstr "Ingen transport av typ %d är känd.\n"
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
+msgstr ""
 
-#: src/applications/transport/transport.c:676
+#: src/applications/transport/transport.c:183
 #, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgid "Transport connection attempt failed, transport type %d not supported\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:691
+#: src/applications/transport/transport.c:278
+#, fuzzy, c-format
+msgid "Transmission attempt failed, transport type %d unknown.\n"
+msgstr "Ingen transport av typ %d är känd.\n"
+
+#: src/applications/transport/transport.c:366
 #, c-format
-msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
+msgid "No transport of type %d known.\n"
+msgstr "Ingen transport av typ %d är känd.\n"
+
+#: src/applications/transport/transport.c:423
+msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:717
+#: src/applications/transport/transport.c:596
+#, fuzzy, c-format
+msgid "Loading transports `%s'\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/applications/transport/transport.c:616
+#, fuzzy, c-format
+msgid "Could not load transport plugin `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/applications/transport/transport.c:626
 #, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:738
+#: src/applications/transport/transport.c:643
+#, fuzzy, c-format
+msgid "Loaded transport `%s'\n"
+msgstr "Tillgängliga transport(er): %s\n"
+
+#: src/applications/transport/transport.c:654
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:559
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:560
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:561
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/fragmentation/fragmentation.c:573
 #, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "\"%s\" registrerar handtag %d\n"
 
+#: src/applications/stats/gnunet-stats.c:90
+msgid "Print statistics about GNUnet operations."
+msgstr "Skriv ut statistik om GNUnet-operationer."
+
 #: src/applications/stats/gnunet-stats.c:94
 msgid "prints supported protocol messages"
 msgstr "skriver ut stödda protokollmeddelanden"
 
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
-msgstr "Skriv ut statistik om GNUnet-operationer."
-
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/stats/gnunet-stats.c:137
+#: src/applications/tbench/gnunet-tbench.c:136
+#: src/applications/tracekit/gnunet-tracekit.c:319
+#: src/applications/template/gnunet-template.c:101
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/stats/gnunet-stats.c:156
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr ""
 
-#: src/applications/stats/clientapi.c:179
+#: src/applications/stats/clientapi.c:180
 msgid "Uptime (seconds)"
 msgstr "Upptid (sekunder)"
 
@@ -1334,111 +1267,118 @@
 msgid "# bytes of noise received"
 msgstr ""
 
-#: src/applications/stats/statistics.c:374
+#: src/applications/stats/statistics.c:364
+#, fuzzy, c-format
+msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
+msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
+
+#: src/applications/stats/statistics.c:385
 msgid "keeps statistics about gnunetd's operation"
 msgstr "behåller statistik om gnunetds operation"
 
-#: src/applications/tbench/gnunet-tbench.c:95
+#: src/applications/tbench/gnunet-tbench.c:65
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:67
 msgid "output in gnuplot format"
 msgstr "utdata i gnuplot-format"
 
-#: src/applications/tbench/gnunet-tbench.c:98
+#: src/applications/tbench/gnunet-tbench.c:71
 msgid "number of iterations"
 msgstr "antal iterationer"
 
-#: src/applications/tbench/gnunet-tbench.c:100
+#: src/applications/tbench/gnunet-tbench.c:75
 msgid "number of messages to use per iteration"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/applications/tbench/gnunet-tbench.c:102
+#: src/applications/tbench/gnunet-tbench.c:78
 msgid "receiver host identifier (ENC file name)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:104
+#: src/applications/tbench/gnunet-tbench.c:81
 msgid "message size"
 msgstr "meddelandestorlek"
 
-#: src/applications/tbench/gnunet-tbench.c:106
+#: src/applications/tbench/gnunet-tbench.c:84
 msgid "sleep for SPACE ms after each a message block"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:108
+#: src/applications/tbench/gnunet-tbench.c:87
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:111
+#: src/applications/tbench/gnunet-tbench.c:91
 msgid "number of messages in a message block"
 msgstr "antal meddelanden i ett meddelandeblock"
 
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
-msgstr ""
-
-#: src/applications/tbench/gnunet-tbench.c:225
+#: src/applications/tbench/gnunet-tbench.c:153
+#, c-format
 msgid "You must specify a receiver!\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/tbench/gnunet-tbench.c:162
 #, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:249
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "Time:\n"
 msgstr "Tid:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:250
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tmax      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tmin      %llums\n"
 
-#: src/applications/tbench/gnunet-tbench.c:254
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:259
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/tbench/gnunet-tbench.c:200
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tmax      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:262
+#: src/applications/tbench/gnunet-tbench.c:202
 #, c-format
 msgid "\tmin      %u\n"
 msgstr "\tmin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:264
+#: src/applications/tbench/gnunet-tbench.c:204
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/tbench/gnunet-tbench.c:206
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/applications/tbench/gnunet-tbench.c:215
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/tbench/gnunet-tbench.c:219
 #, c-format
 msgid ""
 "\n"
@@ -1477,473 +1417,399 @@
 msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:448
+#: src/applications/tbench/tbench.c:460
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
+#: src/applications/tracekit/gnunet-tracekit.c:49
 msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
+#: src/applications/tracekit/gnunet-tracekit.c:52
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
+#: src/applications/tracekit/gnunet-tracekit.c:58
 msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
+#: src/applications/tracekit/gnunet-tracekit.c:62
 msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
-msgstr "Spåra GNUnets nätverkstopologi."
-
-#: src/applications/tracekit/gnunet-tracekit.c:222
+#: src/applications/tracekit/gnunet-tracekit.c:116
 #, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
-
-#: src/applications/tracekit/gnunet-tracekit.c:233
-#, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
 "vcg.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
+#: src/applications/tracekit/gnunet-tracekit.c:163
 #, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:197
+#, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/applications/tracekit/gnunet-tracekit.c:212
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
+#: src/applications/tracekit/gnunet-tracekit.c:235
 #, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "Motpart \"%s\" rapporterade inte tillbaka.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
+#: src/applications/tracekit/gnunet-tracekit.c:350
 msgid "Could not send request to gnunetd.\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
+#: src/applications/tracekit/tracekit.c:68
+#: src/applications/tracekit/tracekit.c:201
 #, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/applications/tracekit/tracekit.c:243
+#: src/applications/tracekit/tracekit.c:263
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:331
+#: src/applications/tracekit/tracekit.c:354
 #, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:431
+#: src/applications/tracekit/tracekit.c:461
 msgid "allows mapping of the network topology"
 msgstr "tillåter kartläggning av nätverkstopologin"
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/gap/gap.c:1635
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/applications/gap/gap.c:1618
+#: src/applications/gap/gap.c:1636
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1791
+#: src/applications/gap/gap.c:1809
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1820 src/applications/fs/module/anonymity.c:66
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
+#: src/applications/gap/gap.c:1826 src/applications/gap/gap.c:1831
+#: src/applications/gap/gap.c:1837
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2077
+#: src/applications/gap/gap.c:2116
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2078
+#: src/applications/gap/gap.c:2117
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2079
+#: src/applications/gap/gap.c:2118
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2080
+#: src/applications/gap/gap.c:2119
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2081
+#: src/applications/gap/gap.c:2120
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2082
+#: src/applications/gap/gap.c:2121
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2083
+#: src/applications/gap/gap.c:2122
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2084
+#: src/applications/gap/gap.c:2123
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2085
+#: src/applications/gap/gap.c:2124
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2086
+#: src/applications/gap/gap.c:2125
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2087
+#: src/applications/gap/gap.c:2126
 msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/gap/gap.c:2088
+#: src/applications/gap/gap.c:2127
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2089
+#: src/applications/gap/gap.c:2128
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2090
+#: src/applications/gap/gap.c:2129
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2091
+#: src/applications/gap/gap.c:2130
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2092
+#: src/applications/gap/gap.c:2131
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2093
+#: src/applications/gap/gap.c:2132
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2094
+#: src/applications/gap/gap.c:2133
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2095
+#: src/applications/gap/gap.c:2134
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2112
+#: src/applications/gap/gap.c:2150
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/gap/gap.c:2178
 #, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d\n"
 
-#: src/applications/gap/pid_table.c:151
+#: src/applications/gap/pid_table.c:156
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:153
+#: src/applications/gap/pid_table.c:158
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/getoption/getoption.c:74
 #, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr "\"%s\" registrerar klienthandtag %d\n"
 
-#: src/applications/getoption/getoption.c:82
+#: src/applications/getoption/getoption.c:84
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:71
+#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-search.c:129
+#: src/applications/fs/tools/gnunet-download.c:57
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:35
+#: src/applications/fs/tools/gnunet-pseudonym.c:74
 msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
+#: src/applications/fs/tools/gnunet-pseudonym.c:78
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "skapa en ny pseudonym under angivet SMEKNAMN"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
+#: src/applications/fs/tools/gnunet-pseudonym.c:81
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "ta bort pseudonymen med angivet SMEKNAMN"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
+#: src/applications/fs/tools/gnunet-pseudonym.c:84
 msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
+#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-search.c:132
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr ""
+"Skapa nya pseudonymer, ta bort pseudonymer eller lista existerande "
+"pseudonymer."
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
+msgid "specify metadata describing the namespace or collection"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
+#: src/applications/fs/tools/gnunet-pseudonym.c:95
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
+#: src/applications/fs/tools/gnunet-pseudonym.c:98
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
+#: src/applications/fs/tools/gnunet-pseudonym.c:101
 msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
+#: src/applications/fs/tools/gnunet-pseudonym.c:104
 msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr ""
-"Skapa nya pseudonymer, ta bort pseudonymer eller lista existerande "
-"pseudonymer."
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-msgid "AND"
-msgstr "OCH"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#: src/applications/fs/tools/gnunet-pseudonym.c:138
 #, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
-#: src/setup/gnunet-setup.c:179
-msgid "Invalid arguments. Exiting.\n"
-msgstr "Ogiltiga argument. Avslutar.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:142
 #, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#: src/applications/fs/tools/gnunet-pseudonym.c:178
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Samling stoppad.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#: src/applications/fs/tools/gnunet-pseudonym.c:223
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr "Misslyckades att stoppa samling (inte aktiv?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#: src/applications/fs/tools/gnunet-pseudonym.c:231
 #, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#: src/applications/fs/tools/gnunet-pseudonym.c:235
 #, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr "Fel vid borttagning av pseudonym \"%s\" (existerar den?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#: src/applications/fs/tools/gnunet-pseudonym.c:254
 #, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#: src/applications/fs/tools/gnunet-pseudonym.c:257
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#: src/applications/fs/tools/gnunet-pseudonym.c:299
 #, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#: src/applications/fs/tools/gnunet-pseudonym.c:304
 #, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#: src/applications/fs/tools/gnunet-pseudonym.c:326
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/applications/fs/tools/gnunet-delete.c:37
+#: src/applications/fs/tools/gnunet-directory.c:83
 #, c-format
-msgid "%8u of %8u bytes deleted."
-msgstr "%8u av %8u byte togs bort."
-
-#: src/applications/fs/tools/gnunet-delete.c:52
-msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-msgstr ""
-"ange filen att ta bort från GNUnet (obligatorisk, filen måste existera)"
-
-#: src/applications/fs/tools/gnunet-delete.c:61
-msgid ""
-"Remove file from GNUnet.  The specified file is not removed\n"
-"from the filesystem but just from the local GNUnet datastore."
-msgstr ""
-"Ta bort fil från GNUnet.  Den angivna filen tas inte bort från\n"
-"filsystemet utan bara från det lokala GNUnet-datalagret."
-
-#: src/applications/fs/tools/gnunet-delete.c:139
-msgid "You must specify a filename (option -f)\n"
-msgstr "Du måste ange ett filnamn (flagga -f)\n"
-
-#: src/applications/fs/tools/gnunet-delete.c:151
-#, c-format
-msgid ""
-"Error deleting file %s.\n"
-"Probably a few blocks were already missing from the database.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-directory.c:76
-#, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==> Katalog \"%s\":\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:81
+#: src/applications/fs/tools/gnunet-directory.c:90
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:111
+#: src/applications/fs/tools/gnunet-directory.c:124
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:113
+#: src/applications/fs/tools/gnunet-directory.c:126
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:141
+msgid "Perform directory related operations."
+msgstr "Genomför katalogrelaterade operationer."
+
+#: src/applications/fs/tools/gnunet-directory.c:143
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:133
+#: src/applications/fs/tools/gnunet-directory.c:147
 msgid "list entries from the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:136
+#: src/applications/fs/tools/gnunet-directory.c:150
 msgid "start tracking entries for the directory database"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:140
-msgid "gnunet-directory [OPTIONS] [FILENAMES]"
-msgstr "gnunet-directory [FLAGGOR] [FILNAMN]"
-
-#: src/applications/fs/tools/gnunet-directory.c:141
-msgid "Perform directory related operations."
-msgstr "Genomför katalogrelaterade operationer."
-
-#: src/applications/fs/tools/gnunet-directory.c:206
+#: src/applications/fs/tools/gnunet-directory.c:181
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Listade %d matchande poster.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:110
+#: src/applications/fs/tools/gnunet-insert.c:139
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Skapade post \"%s\" i namnrymd \"%s\"\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:115
+#: src/applications/fs/tools/gnunet-insert.c:144
 #, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:136
-#, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
+#: src/applications/fs/tools/gnunet-insert.c:166
+#, fuzzy, c-format
+msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "%16llu av %16llu byte inlagda (uppskattar %s till färdigställd)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:150
+#: src/applications/fs/tools/gnunet-insert.c:178
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:164
-#, fuzzy, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
-msgstr ""
-"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:174
+#: src/applications/fs/tools/gnunet-insert.c:189
 #, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:187
+#: src/applications/fs/tools/gnunet-insert.c:200
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr "Nedladdning avbruten."
+
+#: src/applications/fs/tools/gnunet-insert.c:206
 #, c-format
 msgid ""
 "\n"
@@ -1952,7 +1818,7 @@
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:209
+#: src/applications/fs/tools/gnunet-insert.c:228
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
@@ -1960,230 +1826,181 @@
 "även om gnunetd körs på den lokala maskinen, tvinga fram skapandet av en "
 "kopia istället för att göra en länk till GNUnets utdelade katalog"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:232
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:235
 msgid ""
 "use libextractor to add additional direct references to directory entries"
 msgstr ""
 "använd libextractor för att lägga till ytterligare direktreferenser till "
 "katalogposter"
 
-#: src/applications/fs/tools/gnunet-insert.c:214
+#: src/applications/fs/tools/gnunet-insert.c:238
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/fs/tools/gnunet-insert.c:240
+msgid "Make files available to GNUnet for sharing."
+msgstr "Gör filer tillgängliga via utdelning till GNUnet."
+
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:221
+#: src/applications/fs/tools/gnunet-insert.c:247
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-insert.c:251
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:256
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:230
+#: src/applications/fs/tools/gnunet-insert.c:259
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:263
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:236
+#: src/applications/fs/tools/gnunet-insert.c:267
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
-msgid "process directories recursively"
-msgstr "bearbeta kataloger rekursivt"
-
-#: src/applications/fs/tools/gnunet-insert.c:242
+#: src/applications/fs/tools/gnunet-insert.c:273
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:281
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:250
+#: src/applications/fs/tools/gnunet-insert.c:284
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:257
-msgid "Make files available to GNUnet for sharing."
-msgstr "Gör filer tillgängliga via utdelning till GNUnet."
+#: src/applications/fs/tools/gnunet-insert.c:326
+#, fuzzy, c-format
+msgid "You must specify one and only one filename for insertion.\n"
+msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:344
+#: src/applications/fs/tools/gnunet-insert.c:351
 #, c-format
-msgid "You must pass a positive number to the `%s' option.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:429
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:537
-#: src/applications/fs/tools/gnunet-unindex.c:145
-#, c-format
-msgid "You must specify a list of files to insert.\n"
-msgstr "Du måste ange en lista av filer att lägga in.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:541
-#, c-format
-msgid "Only one file or directory can be specified at a time.\n"
-msgstr "Endast en fil eller katalog kan anges samtidigt.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:545
-#, c-format
-msgid "You must specify a file or directory to upload.\n"
-msgstr "Du måste ange en fil eller katalog att ladda upp.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:595
-#, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:617
+#: src/applications/fs/tools/gnunet-insert.c:378
 #, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:636
+#: src/applications/fs/tools/gnunet-insert.c:394
 #, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:649
-#: src/applications/fs/tools/gnunet-insert.c:653
-#: src/applications/fs/tools/gnunet-insert.c:657
-#: src/applications/fs/tools/gnunet-insert.c:661
-#: src/applications/fs/tools/gnunet-insert.c:666
+#: src/applications/fs/tools/gnunet-insert.c:407
+#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:417
+#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:427
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:108
-#: src/applications/fs/tools/gnunet-download.c:42
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:114
+#: src/applications/fs/tools/gnunet-search.c:136
 msgid "exit after receiving LIMIT results"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:116
+#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-download.c:64
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:118
-msgid "wait TIMEOUT seconds for search results before aborting"
+#: src/applications/fs/tools/gnunet-search.c:142
+msgid "wait DELAY seconds for search results before aborting"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:123
-msgid "Search GNUnet for files."
-msgstr "Sök GNUnet efter filer."
-
-#: src/applications/fs/tools/gnunet-search.c:227
-msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr ""
-"Inte tillräckligt med argument. Du måste ange ett nyckelord eller "
-"identifierare.\n"
-
-#: src/applications/fs/tools/gnunet-search.c:278
+#: src/applications/fs/tools/gnunet-search.c:189
 #, c-format
 msgid "Starting search failed. Consult logs.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:353
+#: src/applications/fs/tools/gnunet-search.c:277
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
-msgstr "NIVÅ"
+#: src/applications/fs/tools/gnunet-download.c:60
+msgid "Download files from GNUnet."
+msgstr "Ladda ner filer från GNUnet."
 
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
-msgstr "FILNAMN"
-
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
-msgstr "skriv filen till FILNAMN"
-
-#: src/applications/fs/tools/gnunet-download.c:50
+#: src/applications/fs/tools/gnunet-download.c:67
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
-msgstr "Ladda ner filer från GNUnet."
-
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr ""
-"Inte tillräckligt med argument. Du måste ange en URI till en GNUnet-fil\n"
-
-#: src/applications/fs/tools/gnunet-download.c:159
+#: src/applications/fs/tools/gnunet-download.c:86
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "Hämtning av fil \"%s\" vid %16llu av %16llu byte (%8.3f kbps)\n"
 
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
+#: src/applications/fs/tools/gnunet-download.c:99
+#: src/applications/fs/tools/gnunet-download.c:110
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:191
+#: src/applications/fs/tools/gnunet-download.c:118
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 "Hämtning av fil \"%s\" färdig.  Hastigheten var %8.3f kilobyte per sekund.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:237
+#: src/applications/fs/tools/gnunet-download.c:175
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr ""
+"Inte tillräckligt med argument. Du måste ange en URI till en GNUnet-fil\n"
+
+#: src/applications/fs/tools/gnunet-download.c:195
 #, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "URI \"%s\" ogiltig för gnunet-download.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:288
+#: src/applications/fs/tools/gnunet-download.c:244
 #, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Fil lagrad som \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:50
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -2192,7 +2009,7 @@
 "%16llu av %16llu byte avindexerat (uppskattar %llu sekunder till "
 "färdigställd)                "
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2201,7 +2018,7 @@
 "\n"
 "Avindexering av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:83
 #, c-format
 msgid ""
 "\n"
@@ -2210,26 +2027,27 @@
 "\n"
 "Fel vid avindexering av fil: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:97
+#: src/applications/fs/tools/gnunet-unindex.c:100
 msgid "Unindex files."
 msgstr "Avindexera filer."
 
-#: src/applications/fs/tools/gnunet-unindex.c:149
-#, c-format
-msgid "You must specify one and only one file to unindex.\n"
-msgstr "Du måste ange en och endast en fil att avindexera.\n"
+#: src/applications/fs/tools/gnunet-unindex.c:145
+#, fuzzy
+msgid "Not enough arguments. You must specify a filename.\n"
+msgstr ""
+"Inte tillräckligt med argument. Du måste ange en URI till en GNUnet-fil\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:190
+#: src/applications/fs/tools/gnunet-unindex.c:173
 #, c-format
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "\"%s\" misslyckades.  Är \"%s\" en fil?\n"
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/fs/module/ondemand.c:317
 #, 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:393
+#: src/applications/fs/module/ondemand.c:411
 #, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2237,20 +2055,20 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/fs/module/ondemand.c:438
 #, 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:617
+#: src/applications/fs/module/ondemand.c:655
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1184
+#: src/applications/fs/module/fs.c:1196
 #, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2259,108 +2077,89 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/applications/fs/module/fs.c:1233
+#: src/applications/fs/module/fs.c:1247
 #, c-format
 msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1270
+#: src/applications/fs/module/fs.c:1287
 msgid "enables (anonymous) file-sharing"
 msgstr "aktiverar (anonym) fildelning"
 
-#: src/applications/fs/module/migration.c:224
+#: src/applications/fs/module/migration.c:228
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:225
+#: src/applications/fs/module/migration.c:229
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
-msgstr "Publiseringsintervall för periodisk publisering har ändrats."
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: 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/namespace_info.c:604
-msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr ""
-
-#: src/applications/fs/fsui/fsui.c:189
+#: src/applications/fs/fsui/fsui.c:195
 msgid "FSUI persistence: error restoring download\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/fs/fsui/fsui.c:666
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:290
+#: src/applications/fs/fsui/download.c:305
 msgid "Download aborted."
 msgstr "Nedladdning avbruten."
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:309
 msgid "ECRS download failed (see logs)."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:298
+#: src/applications/fs/fsui/download.c:313
 msgid "ECRS download suspending."
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:302
+#: src/applications/fs/fsui/download.c:317
 msgid "Unexpected download state."
 msgstr ""
 
-#: src/applications/fs/fsui/unindex.c:85
+#: src/applications/fs/fsui/unindex.c:80
 msgid "Unindex failed."
 msgstr "Avindexering misslyckades."
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
-msgstr "Inga nyckelord angivna!\n"
-
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
+#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
+#: src/applications/fs/fsui/upload.c:413
 #, fuzzy
 msgid "Upload failed."
 msgstr "Uppladdning misslyckades.\n"
 
-#: src/applications/fs/fsui/upload.c:455
+#: src/applications/fs/fsui/upload.c:420
 msgid "Cannot upload directory without using recursion."
 msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/file_info.c:282
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr ""
-
-#: src/applications/fs/ecrs/search.c:160
+#: 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"
 
-#: src/applications/fs/ecrs/search.c:216
+#: src/applications/fs/ecrs/search.c:226
 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:125
+#: src/applications/fs/ecrs/download.c:128
 #, c-format
 msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:257
+#: src/applications/fs/ecrs/download.c:263
 #, c-format
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/download.c:935
+#: src/applications/fs/ecrs/download.c:972
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2368,159 +2167,144 @@
 "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:1112
+#: src/applications/fs/ecrs/download.c:1153
 #, c-format
 msgid ""
 "Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/fs/ecrs/upload.c:170
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/fs/ecrs/upload.c:180
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Kan inte hämta storlek på fil \"%s\""
 
-#: src/applications/fs/ecrs/upload.c:193
+#: src/applications/fs/ecrs/upload.c:188
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/fs/ecrs/upload.c:200
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/fs/ecrs/upload.c:219
 #, 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:227
+#: src/applications/fs/ecrs/upload.c:226
 #, 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:306
+#: src/applications/fs/ecrs/upload.c:312
 #, 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:842
+#: src/applications/fs/ecrs/meta.c:847
 #, 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:850
+#: src/applications/fs/ecrs/meta.c:855
 #, 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"
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/fs/ecrs/namespace.c:153
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
-msgstr ""
-
-#: src/applications/fs/ecrs/namespace.c:133
-#, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Kan inte skapa pseudonym \"%s\", filen \"%s\" existerar.\n"
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/fs/ecrs/namespace.c:338
+#: src/applications/fs/ecrs/namespace.c:419
+#: src/applications/fs/ecrs/namespace.c:573
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/fs/ecrs/namespace.c:350
+#: src/applications/fs/ecrs/namespace.c:430
 #, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/fs/ecrs/namespace.c:587
+#: src/applications/fs/ecrs/namespace.c:598
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Formatet på filen \"%s\" är ogiltig.\n"
 
-#: src/applications/topology_f2f/topology.c:323
+#: src/applications/fs/ecrs/helper.c:67
+msgid "No keywords specified!\n"
+msgstr "Inga nyckelord angivna!\n"
+
+#: src/applications/fs/ecrs/parser.c:122
 #, c-format
 msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/applications/fs/uritrack/file_info.c:123
+msgid "Collecting file identifiers disabled.\n"
+msgstr ""
+
+#: src/applications/fs/uritrack/file_info.c:355
 #, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr ""
+
+#: src/applications/fs/namespace/namespace_info.c:654
+msgid "Publication interval for periodic publication changed."
+msgstr "Publiseringsintervall för periodisk publisering har ändrats."
+
+#: src/applications/fs/namespace/namespace_info.c:675
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
+msgstr ""
+
+#: src/applications/topology_f2f/topology.c:354
+#, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/applications/topology_f2f/topology.c:358
+#: src/applications/topology_f2f/topology.c:371
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/applications/topology_f2f/topology.c:384
 #, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/applications/template/template.c:61
+#: src/applications/template/template.c:62
 #, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
 
-#: src/applications/template/gnunet-template.c:70
-#: src/applications/vpn/gnunet-vpn.c:72
-msgid "helptext for -t"
-msgstr "hjälptext för -t"
-
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
-msgstr "Mall för gnunet-clients."
-
-#: src/applications/bootstrap_http/http.c:109
-#, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+#: src/applications/template/gnunet-template.c:44
+msgid "Template description."
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:120
-#, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+#: src/applications/bootstrap_http/http.c:92
+#, fuzzy, c-format
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/bootstrap_http/http.c:132
-#, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+#: src/applications/bootstrap_http/http.c:144
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
-#, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/applications/bootstrap_http/http.c:217
-#, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
-
-#: src/applications/bootstrap_http/http.c:252
-#, c-format
-msgid "Parsing hello from `%s' failed.\n"
-msgstr ""
-
-#: src/applications/bootstrap_http/http.c:330
-#, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
-msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\". Försöker utan proxy.\n"
-
-#: src/applications/bootstrap_http/http.c:355
+#: src/applications/bootstrap_http/http.c:229
 msgid "# hellos downloaded via http"
 msgstr ""
 
@@ -2534,556 +2318,461 @@
 msgid "# bytes received of type %d"
 msgstr "# byte mottagna av typen %d"
 
-#: src/applications/traffic/traffic.c:605
+#: src/applications/traffic/traffic.c:609
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
+#: src/applications/vpn/gnunet-vpn.c:98
+msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr ""
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:181
-#, fuzzy, c-format
-msgid ""
-"Configuration file must specify directory for storing data in section `%s' "
-"under `%s'.\n"
-msgstr ""
-"Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
-"under %s\\%s.\n"
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:264
-#, fuzzy
-msgid "Unable to initialize SQLite KVStore.\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/applications/vpn/gnunet-vpn.c:77
+#: src/applications/vpn/gnunet-vpn.c:103
 msgid "VPN over GNUnet."
 msgstr ""
 
-#: src/applications/vpn/vpn.c:315
+#: src/applications/vpn/vpn.c:351
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:323
+#: src/applications/vpn/vpn.c:359
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:387
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:400
+#: src/applications/vpn/vpn.c:436
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:404
+#: src/applications/vpn/vpn.c:440
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:414
+#: src/applications/vpn/vpn.c:450
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:474
+#: src/applications/vpn/vpn.c:510
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:478
+#: src/applications/vpn/vpn.c:514
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:505
+#: src/applications/vpn/vpn.c:541
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:513
+#: src/applications/vpn/vpn.c:549
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:517
+#: src/applications/vpn/vpn.c:553
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:555
+#: src/applications/vpn/vpn.c:591
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:559
+#: src/applications/vpn/vpn.c:595
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:566
+#: src/applications/vpn/vpn.c:602
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:571
+#: src/applications/vpn/vpn.c:607
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:627
 #, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:638
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/vpn/vpn.c:650
 #, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:646
+#: src/applications/vpn/vpn.c:683
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:692
+#: src/applications/vpn/vpn.c:729
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:754
+#: src/applications/vpn/vpn.c:788
 #, c-format
-msgid "RFC4193 --- whitelist of peer %x\n"
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:772
+#: src/applications/vpn/vpn.c:792
+#, c-format
+msgid "VPN cannot drop connection %x\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:810
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:812
+#: src/applications/vpn/vpn.c:850
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:816
+#: src/applications/vpn/vpn.c:854
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/vpn/vpn.c:860
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:825
+#: src/applications/vpn/vpn.c:863
 #, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:873
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:892
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:869
-#, c-format
-msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
-msgstr ""
-
-#: src/applications/vpn/vpn.c:885
+#: src/applications/vpn/vpn.c:913
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:890
+#: src/applications/vpn/vpn.c:918
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:901
+#: src/applications/vpn/vpn.c:929
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:907
+#: src/applications/vpn/vpn.c:935
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:923
+#: src/applications/vpn/vpn.c:951
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:927
+#: src/applications/vpn/vpn.c:955
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:931
+#: src/applications/vpn/vpn.c:959
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:945
+#: src/applications/vpn/vpn.c:973
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:960
+#: src/applications/vpn/vpn.c:988
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:998
+#: src/applications/vpn/vpn.c:1016
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1013
+#: src/applications/vpn/vpn.c:1031
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1058
+#: src/applications/vpn/vpn.c:1076
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1104
+#: src/applications/vpn/vpn.c:1122
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1148
+msgid "Cannot store client info\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1208
 msgid "Yes"
 msgstr "Ja"
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1208
 msgid "No"
 msgstr "Nej"
 
-#: src/applications/vpn/vpn.c:1324
+#: src/applications/vpn/vpn.c:1385
 #, fuzzy, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr "\"%s\" registrerar handtagen %d och %d\n"
 
-#: src/applications/vpn/vpn.c:1325
+#: src/applications/vpn/vpn.c:1386
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1361
+#: src/applications/vpn/vpn.c:1434
 #, fuzzy
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr "aktiverar P2P-chatt (ej komplett)"
 
-#: src/applications/vpn/vpn.c:1383
+#: src/applications/vpn/vpn.c:1466
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394
+#: src/applications/vpn/vpn.c:1477
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1405
+#: src/applications/vpn/vpn.c:1490
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/state/state.c:85
+#: src/server/gnunet-update.c:142
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
-msgstr ""
-"Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
-"under %s\\%s.\n"
+msgid "Updating data for module `%s'\n"
+msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#: src/server/gnunet-update.c:55 src/server/startup.c:450
-#: src/server/gnunet-transport-check.c:407
-msgid "run as user LOGIN"
-msgstr "kör som användare LOGIN"
-
-#: src/server/gnunet-update.c:58
-msgid "run in client mode (for getting client configuration values)"
-msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
-
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
-
 #: src/server/gnunet-update.c:147
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'."
+msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
-#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Ogiltiga argument: "
-
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
+#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
-"\n"
-"Avslutar.\n"
 
-#: src/server/gnunet-update.c:232 src/server/core.c:476
-msgid "No applications defined in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+#: src/server/gnunet-update.c:220
+msgid "Updates GNUnet datastructures after version change."
+msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
 
-#: src/server/gnunet-update.c:249
-#, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Uppdaterar data för modul \"%s\"\n"
+#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
+msgid "run as user LOGIN"
+msgstr "kör som användare LOGIN"
 
-#: src/server/gnunet-update.c:253
-#, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr ""
+#: src/server/gnunet-update.c:227
+msgid "run in client mode (for getting client configuration values)"
+msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
 
-#: src/server/gnunet-update.c:309
+#: src/server/connection.c:992
 #, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Uppdaterade data för %d program.\n"
-
-#: src/server/connection.c:983
-#, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "\"%s\" valda %d av %d meddelanden (MTU: %d).\n"
 
-#: src/server/connection.c:990
+#: src/server/connection.c:999
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
 
-#: src/server/connection.c:2254
+#: src/server/connection.c:2283
 #, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/server/connection.c:2325
+#: src/server/connection.c:2355
 #, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2340
+#: src/server/connection.c:2370
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:2708
+#: src/server/connection.c:2774
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2712
+#: src/server/connection.c:2778
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2714
+#: src/server/connection.c:2780
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2717
+#: src/server/connection.c:2783
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/server/connection.c:2721
+#: src/server/connection.c:2787
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/server/connection.c:2725
+#: src/server/connection.c:2791
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/server/connection.c:2727
+#: src/server/connection.c:2793
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/server/connection.c:2728
+#: src/server/connection.c:2794
 msgid "# bytes noise sent"
 msgstr ""
 
-#: src/server/startup.c:196
+#: src/server/gnunetd.c:78
 #, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr ""
+msgid "`%s' startup complete.\n"
+msgstr "\"%s\" uppstart klar.\n"
 
-#: src/server/startup.c:324
+#: src/server/gnunetd.c:83
 #, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
-msgstr "Du måste ange ett namn för PID-filen i sektion \"%s\" under \"%s\".\n"
-
-#: src/server/startup.c:339
-#, c-format
-msgid "Could not write PID to file `%s': %s.\n"
+msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/startup.c:443
+#: src/server/gnunetd.c:160
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
 msgstr ""
 
-#: src/server/startup.c:456
+#: src/server/gnunetd.c:164
 msgid "Starts the gnunetd daemon."
 msgstr "Startar gnunetd-demonen."
 
-#: src/server/startup.c:470
-#, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
+#: src/server/gnunetd.c:168
+msgid "disable padding with random data (experimental)"
 msgstr ""
 
-#: src/server/startup.c:479
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+#: src/server/gnunetd.c:172
+#, fuzzy
+msgid "specify username as which gnunetd should run"
+msgstr "ange värd på vilken gnunetd körs"
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
-msgstr "Ogiltiga kommandoradsargument:\n"
-
-#: src/server/startup.c:583
+#: src/server/gnunetd.c:228
 #, c-format
-msgid "Argument %d: `%s'\n"
-msgstr "Argument %d: \"%s\"\n"
-
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
-msgstr "Ogiltiga kommandoradsargument.\n"
-
-#: src/server/gnunetd.c:76
-#, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 "Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
-#: src/server/gnunetd.c:84
+#: src/server/core.c:124
 #, c-format
-msgid "`%s' starting\n"
-msgstr "\"%s\" startar\n"
-
-#: src/server/gnunetd.c:106
-#, c-format
-msgid "`%s' startup complete.\n"
-msgstr "\"%s\" uppstart klar.\n"
-
-#: src/server/gnunetd.c:111
-#, c-format
-msgid "`%s' is shutting down.\n"
-msgstr ""
-
-#: src/server/core.c:115
-#, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr ""
 
-#: src/server/core.c:168
+#: src/server/core.c:174
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/server/core.c:215
+#: src/server/core.c:217
 #, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr ""
 
-#: src/server/core.c:222
+#: src/server/core.c:225
 #, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
 
-#: src/server/core.c:231 src/server/core.c:420
+#: src/server/core.c:235
 #, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:398
+#: src/server/core.c:374
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/server/core.c:499
+#: src/server/core.c:470
 #, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr ""
-
-#: src/server/core.c:516
-#, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:575
-msgid "FATAL: Identity plugin not found!\n"
-msgstr ""
-
-#: src/server/core.c:633
+#: src/server/core.c:594
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:109
+#: src/server/gnunet-transport-check.c:115
 #, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:124
 #, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "\"%s\": Kunde inte ansluta.\n"
 
-#: src/server/gnunet-transport-check.c:148
+#: src/server/gnunet-transport-check.c:158
 #, c-format
 msgid "`%s': Could not send.\n"
 msgstr "\"%s\": Kunde inte skicka.\n"
 
-#: src/server/gnunet-transport-check.c:168
+#: src/server/gnunet-transport-check.c:180
 #, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
-#: src/server/gnunet-transport-check.c:182
+#: src/server/gnunet-transport-check.c:194
 #, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "\"%s\": Kunde inte koppla ned.\n"
 
-#: src/server/gnunet-transport-check.c:189
-#, c-format
+#: src/server/gnunet-transport-check.c:201
+#, fuzzy, c-format
 msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
+"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+"each.\n"
 msgstr ""
 "\"%s\" transport OK.  Det tog %ums att överföra %d meddelanden på %d byte "
 "styck.\n"
 
-#: src/server/gnunet-transport-check.c:219
+#: src/server/gnunet-transport-check.c:229
 #, fuzzy, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " Transport %d ej tillgänglig\n"
 
-#: src/server/gnunet-transport-check.c:230
+#: src/server/gnunet-transport-check.c:245
 #, c-format
 msgid ""
 "\n"
@@ -3092,101 +2781,107 @@
 "\n"
 "Kontaktar \"%s\"."
 
-#: src/server/gnunet-transport-check.c:253
+#: src/server/gnunet-transport-check.c:266
 #, c-format
 msgid " Connection failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/server/gnunet-transport-check.c:259
+#: src/server/gnunet-transport-check.c:272
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/server/gnunet-transport-check.c:320
+#: src/server/gnunet-transport-check.c:324
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/server/gnunet-transport-check.c:396
-msgid "ping peers from HOSTLISTURL that match transports"
+#: src/server/gnunet-transport-check.c:350
+msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:357
 msgid "send COUNT messages"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/server/gnunet-transport-check.c:400
+#: src/server/gnunet-transport-check.c:360
 msgid "send messages with SIZE bytes payload"
 msgstr "skicka meddelanden med STORLEK bytes nyttolast"
 
-#: src/server/gnunet-transport-check.c:402
+#: src/server/gnunet-transport-check.c:363
 msgid "specifies which TRANSPORT should be tested"
 msgstr "anger vilken TRANSPORT som ska testas"
 
-#: src/server/gnunet-transport-check.c:404
+#: src/server/gnunet-transport-check.c:366
 msgid "specifies after how many MS to time-out"
 msgstr "anger timeout efter antal MS"
 
-#: src/server/gnunet-transport-check.c:414
-msgid "Tool to test if GNUnet transport services are operational."
+#: src/server/gnunet-transport-check.c:374
+msgid "repeat each test X times"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:565
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr "Du måste ange en icke-tom uppsättning av transporter att testa!\n"
-
-#: src/server/gnunet-transport-check.c:570
+#: src/server/gnunet-transport-check.c:455
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/server/gnunet-transport-check.c:573
+#: src/server/gnunet-transport-check.c:458
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/server/gnunet-transport-check.c:617
+#: src/server/gnunet-transport-check.c:518
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/server/tcpserver.c:422
+#: src/server/tcpserver.c:102
 #, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+msgid "The `%s' request received from client is malformed.\n"
+msgstr ""
+
+#: src/server/tcpserver.c:316
+#, fuzzy, c-format
+msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/server/tcpserver.c:688
+#: src/server/tcpserver.c:384
 #, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
 "entry `%s': %s\n"
 msgstr ""
 
-#: src/server/tcpserver.c:798
+#: src/server/tcpserver.c:437
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
-#: src/server/handler.c:367
+#: src/server/handler.c:377
 #, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/server/gnunet-peer-info.c:95
+#: src/server/version.c:157
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
+msgstr ""
+
+#: src/server/gnunet-peer-info.c:52
 msgid "Print information about GNUnet peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
 #, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:88
 msgid "hello message invalid (signature invalid).\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:164
+#: src/server/gnunet-peer-info.c:99
 #, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
@@ -3198,6 +2893,24 @@
 "want.\n"
 msgstr ""
 
+#: src/util/network_client/tcpio.c:90
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:114
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#, 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:356
+#, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
+
 #: src/util/crypto/hostkey_gcrypt.c:1031
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
@@ -3208,12 +2921,12 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#: src/util/os/statuscalls.c:171 src/util/os/statuscalls.c:249
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
+#: src/util/os/statuscalls.c:291 src/util/os/statuscalls.c:300
 #, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -3226,24 +2939,17 @@
 msgid "Can't create semaphore: %i"
 msgstr "Kan inte skapa semafor: %i"
 
-#: src/util/os/dso.c:75
+#: src/util/os/dso.c:51
 #, c-format
-msgid ""
-"Cannot determine plugin path, application must be installed in directory "
-"ending with `%s'.\n"
-msgstr ""
-
-#: src/util/os/dso.c:97
-#, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/os/dso.c:134
+#: src/util/os/dso.c:90
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/os/dso.c:176
+#: src/util/os/dso.c:132
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
@@ -3256,40 +2962,29 @@
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Kan inte fråga efter CPU-användning (Win 9x).\n"
 
-#: src/util/os/installpath.c:172
-msgid ""
-"Cannot determine the path to the executable, your system may be broken or "
-"not supported.\n"
-msgstr ""
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/os/installpath.c:211
-msgid ""
-"GNUnet executables are not in a directory named 'bin'. This may signal a "
-"broken installation.\n"
+#: src/util/os/user.c:125
+#, c-format
+msgid "User `%s' not known, cannot change UID to it.\n"
 msgstr ""
 
-#: src/util/os/installpath.c:222
-msgid "Cannot determine the installation prefix. Unknown error.\n"
-msgstr ""
+#: src/util/os/user.c:136
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/network/tcpio.c:100
-msgid "Could not find valid value for PORT in section NETWORK."
+#: src/util/network/select.c:272
+msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/tcpio.c:124
-msgid "Could not find valid value for HOST in section NETWORK."
+#: src/util/network/select.c:421
+msgid "select listen socket not valid!\n"
 msgstr ""
 
-#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
-#, 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/tcpio.c:406
-#, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
-
 #: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
 #: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
 #, c-format
@@ -3317,99 +3012,104 @@
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
 # drive = hard drive ?
-#: src/util/disk/storage.c:194
+#: src/util/disk/storage.c:201
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk/storage.c:240
+#: src/util/disk/storage.c:247
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk/storage.c:279
+#: src/util/disk/storage.c:286
 #, fuzzy, c-format
 msgid "Expected `%s' to be a regular file\n"
 msgstr "\"%s\" är inte en vanlig fil.\n"
 
-#: src/util/disk/storage.c:486
+#: src/util/disk/storage.c:493
 #, fuzzy, c-format
 msgid "expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/config_impl/impl.c:256
+#: src/util/config_impl/impl.c:260
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/config_impl/impl.c:412
+#: src/util/config_impl/impl.c:419
 #, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:424
+#: src/util/config_impl/impl.c:431
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:494
+#: src/util/config_impl/impl.c:511
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:138 src/util/error/error.c:182
+#: src/util/config_impl/impl.c:617
+#, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/error/error.c:156 src/util/error/error.c:200
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/error/error.c:141 src/util/error/error.c:184
+#: src/util/error/error.c:159 src/util/error/error.c:202
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:144 src/util/error/error.c:186
+#: src/util/error/error.c:162 src/util/error/error.c:204
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/error/error.c:147 src/util/error/error.c:188
+#: src/util/error/error.c:165 src/util/error/error.c:206
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/error/error.c:150 src/util/error/error.c:190
+#: src/util/error/error.c:168 src/util/error/error.c:208
 msgid "FATAL"
 msgstr "ÖDESDIGER"
 
-#: src/util/error/error.c:153 src/util/error/error.c:192
+#: src/util/error/error.c:171 src/util/error/error.c:210
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:194
+#: src/util/error/error.c:174 src/util/error/error.c:212
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:159 src/util/error/error.c:196
+#: src/util/error/error.c:177 src/util/error/error.c:214
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:198
+#: src/util/error/error.c:180 src/util/error/error.c:216
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:165 src/util/error/error.c:200
+#: src/util/error/error.c:183 src/util/error/error.c:218
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:168 src/util/error/error.c:202
+#: src/util/error/error.c:186 src/util/error/error.c:220
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:171
+#: src/util/error/error.c:189
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:203
+#: src/util/error/error.c:221
 msgid "NOTHING"
 msgstr "INGET"
 
@@ -3428,14 +3128,13 @@
 msgid "Permission denied for `%s'.\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
-#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
-#: src/util/threads/pthread.c:275
+#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
+#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -3444,61 +3143,68 @@
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:686
+#: src/util/getopt/getopt.c:681
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:705
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt/getopt.c:715
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/util/getopt/getopt.c:762
+#: src/util/getopt/getopt.c:757
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/util/getopt/getopt.c:766
+#: src/util/getopt/getopt.c:761
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/util/getopt/getopt.c:792
+#: src/util/getopt/getopt.c:787
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/util/getopt/getopt.c:795
+#: src/util/getopt/getopt.c:790
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/util/getopt/getopt.c:872
+#: src/util/getopt/getopt.c:867
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/util/getopt/getopt.c:890
+#: src/util/getopt/getopt.c:885
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
+#: src/util/getopt/setoption.c:58
+#, c-format
+msgid ""
+"Setting option `%s' in section `%s' to `%s' when processing command line "
+"option `%s' was denied.\n"
+msgstr ""
+
 #: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
@@ -3507,134 +3213,77 @@
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/string/string.c:101
+#: src/util/string/string.c:119
 msgid "ms"
 msgstr "ms"
 
-#: src/util/string/string.c:106
+#: src/util/string/string.c:124
 msgid "s"
 msgstr "s"
 
-#: src/util/string/string.c:109
+#: src/util/string/string.c:127
 msgid "m"
 msgstr "m"
 
-#: src/util/string/string.c:112
+#: src/util/string/string.c:130
 msgid "h"
 msgstr "h"
 
-#: src/util/string/string.c:115
+#: src/util/string/string.c:133
 msgid " days"
 msgstr " dagar"
 
-#: src/util/string/string.c:133
+#: src/util/string/string.c:151
 msgid "b"
 msgstr "b"
 
-#: src/util/string/string.c:138
+#: src/util/string/string.c:156
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:141
+#: src/util/string/string.c:159
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:144
+#: src/util/string/string.c:162
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:147
+#: src/util/string/string.c:165
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:267
+#: src/util/string/string.c:285
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:60
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:62
 msgid "Tool to setup GNUnet."
 msgstr "Verktyg för att ställa in GNUnet."
 
-#: src/setup/gnunet-setup.c:91
-#, c-format
-msgid "Available MODEs:\n"
-msgstr "Tillgängliga lägen:\n"
+#: src/setup/gnunet-setup.c:152
+#, fuzzy, c-format
+msgid "Too many arguments.\n"
+msgstr "Ogiltiga kommandoradsargument.\n"
 
-#: src/setup/gnunet-setup.c:92
-#, c-format
-msgid " config\t\ttext-based configuration\n"
-msgstr " config\t\ttextbaserad konfiguration\n"
-
-#: src/setup/gnunet-setup.c:94
-#, c-format
-msgid " menuconfig\ttext-based menu\n"
-msgstr " menuconfig\ttextbaserad meny\n"
-
-#: src/setup/gnunet-setup.c:96
-#, c-format
-msgid " wizard-curses\tBasic text-based graphical configuration\n"
-msgstr " wizard-curses\tEnkel textbaserad grafisk konfiguration\n"
-
-#: src/setup/gnunet-setup.c:99
-#, c-format
-msgid " gconfig\tGTK configuration\n"
-msgstr " gconfig\tGTK-konfiguration\n"
-
-#: src/setup/gnunet-setup.c:100
-#, c-format
-msgid ""
-" wizard-gtk\tBasic GTK configuration\n"
-"\n"
-msgstr ""
-" wizard-gtk\tEnkel GTK-konfiguration\n"
-"\n"
-
-#: src/setup/gnunet-setup.c:167
-#, c-format
-msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
-msgstr "gnunet-setup måste ha skrivrättighet till konfigurationsfilen \"%s\"\n"
-
-#: src/setup/gnunet-setup.c:224
+#: src/setup/gnunet-setup.c:157
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
-#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
+#: src/setup/gnunet-setup.c:227
 #, c-format
 msgid "`%s' is not available."
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
+#: src/setup/gnunet-setup.c:243
 #, c-format
-msgid ""
-"Can only run wizard to configure gnunetd.\n"
-"Did you forget the `%s' option?\n"
-msgstr ""
-"Kan endast köra vägvisaren för att konfigurera gnunetd.\n"
-"Glömde du flaggan \"%s\"?\n"
-
-#: src/setup/gnunet-setup.c:285
-#, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/setup/wizard_gtk.c:429
-#, c-format
-msgid "Unable to save configuration file `%s':"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
-msgid "Unable to create user account:"
-msgstr "Kunde inte skapa användarkonto:"
-
-#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
-msgid "Unable to change startup process:"
-msgstr ""
-
 #: src/setup/gnunet-win-tool.c:109
 #, c-format
 msgid "GNUnet service installed successfully.\n"
@@ -3675,33 +3324,192 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
-#: src/setup/conf.c:522 src/setup/recreate.c:135
+#: src/setup/gtk/gconf.c:70
+msgid "Sorry, no help is available for this option.\n"
+msgstr "Tyvärr, ingen hjälp är tillgänglig för den här flaggan.\n"
+
+#: src/setup/gtk/glade_support.c:89 src/setup/gtk/glade_support.c:120
+#, fuzzy, c-format
+msgid "Failed to open `%s'.\n"
+msgstr "Fil lagrad som \"%s\".\n"
+
+#: src/setup/gtk/wizard_gtk.c:429
 #, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
+msgid "Unable to save configuration file `%s':"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/setup/gtk/wizard_gtk.c:475 src/setup/ncurses/wizard_curs.c:616
+msgid "Unable to create user account:"
+msgstr "Kunde inte skapa användarkonto:"
+
+#: src/setup/gtk/wizard_gtk.c:482 src/setup/ncurses/wizard_curs.c:619
+msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/setup/conf.c:529
+#: src/setup/text/conf.c:74
+#, fuzzy
+msgid "yes"
+msgstr "Ja"
+
+#: src/setup/text/conf.c:75
+msgid "no"
+msgstr ""
+
+#: src/setup/text/conf.c:101
 #, c-format
-msgid "Configuration file `%s' created.\n"
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgstr ""
+
+#: src/setup/text/conf.c:110
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
+msgstr ""
+
+#: src/setup/text/conf.c:112
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
+msgstr ""
+
+#: src/setup/text/conf.c:132
+#, c-format
+msgid "\t Enter choice (default is %c): "
+msgstr ""
+
+#: src/setup/text/conf.c:138
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
+msgstr ""
+
+#: src/setup/text/conf.c:144
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
+msgstr ""
+
+#: src/setup/text/conf.c:177
+#, fuzzy, c-format
+msgid "Yes\n"
+msgstr "Ja"
+
+#: src/setup/text/conf.c:182
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Abort\n"
+msgstr "_Om"
+
+#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
+msgstr ""
+
+#: src/setup/text/conf.c:385
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:459
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:470
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:492
+#, fuzzy
+msgid "Invalid entry.\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/setup/text/conf.c:511
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:538
+#, c-format
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:539
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:818
+#, 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:558
+#, c-format
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
+msgstr ""
+
+#: src/setup/text/conf.c:568
+#, 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:573
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
-#: src/setup/wizard_util.c:193
+#: src/setup/ncurses/mconf.c:793
+#, fuzzy
+msgid "GNUnet Configuration"
+msgstr "GNUnet-konfiguration"
+
+#: src/setup/ncurses/mconf.c:824
+#, fuzzy
+msgid "Do you wish to save your new configuration?"
+msgstr "Vill du spara dina inställningar?"
+
+#: src/setup/ncurses/mconf.c:834
+#, fuzzy, c-format
+msgid "End of configuration.\n"
+msgstr " gconfig\tGTK-konfiguration\n"
+
+#: src/setup/ncurses/mconf.c:836
+#, fuzzy, c-format
+msgid "Your configuration changes were NOT saved.\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/setup/ncurses/wizard_curs.c:58
 msgid "Error"
 msgstr "Fel"
 
-#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
-#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
-#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
-#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
-#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
-#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
-#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
-#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
+#: src/setup/ncurses/wizard_curs.c:116 src/setup/ncurses/wizard_curs.c:131
+#: src/setup/ncurses/wizard_curs.c:184 src/setup/ncurses/wizard_curs.c:221
+#: src/setup/ncurses/wizard_curs.c:251 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:310 src/setup/ncurses/wizard_curs.c:337
+#: src/setup/ncurses/wizard_curs.c:369 src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:423 src/setup/ncurses/wizard_curs.c:446
+#: src/setup/ncurses/wizard_curs.c:501 src/setup/ncurses/wizard_curs.c:563
+#: src/setup/ncurses/wizard_curs.c:594 src/setup/ncurses/wizard_curs.c:638
 msgid "GNUnet configuration"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/wizard_curs.c:117
+#: src/setup/ncurses/wizard_curs.c:117
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3731,39 +3539,39 @@
 "\n"
 "the GNUnet team"
 
-#: src/setup/wizard_curs.c:132
+#: src/setup/ncurses/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
-#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
-#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:191
+#: src/setup/ncurses/wizard_curs.c:228 src/setup/ncurses/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:315 src/setup/ncurses/wizard_curs.c:375
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
 "you are using DSL."
 msgstr ""
 
-#: src/setup/wizard_curs.c:185
+#: src/setup/ncurses/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:222
+#: src/setup/ncurses/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
 "If in doubt, leave this empty."
 msgstr ""
 
-#: src/setup/wizard_curs.c:229
+#: src/setup/ncurses/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3774,7 +3582,7 @@
 "IP-Address."
 msgstr ""
 
-#: src/setup/wizard_curs.c:252
+#: src/setup/ncurses/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3785,11 +3593,11 @@
 "forwarding\")."
 msgstr ""
 
-#: src/setup/wizard_curs.c:278
+#: src/setup/ncurses/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3800,11 +3608,11 @@
 "connection."
 msgstr ""
 
-#: src/setup/wizard_curs.c:310
+#: src/setup/ncurses/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:316
+#: src/setup/ncurses/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3815,7 +3623,7 @@
 "connection."
 msgstr ""
 
-#: src/setup/wizard_curs.c:338
+#: src/setup/ncurses/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -3828,11 +3636,11 @@
 "connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 
-#: src/setup/wizard_curs.c:370
+#: src/setup/ncurses/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr "Hur mycket CPU (i %) får användas?"
 
-#: src/setup/wizard_curs.c:376
+#: src/setup/ncurses/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3842,7 +3650,7 @@
 "\n"
 "Det här är det procenttal som GNUnet tillåts använda av processortiden."
 
-#: src/setup/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -3855,7 +3663,7 @@
 "availability."
 msgstr ""
 
-#: src/setup/wizard_curs.c:424
+#: src/setup/ncurses/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -3863,7 +3671,7 @@
 "inserted and migrated content)."
 msgstr ""
 
-#: src/setup/wizard_curs.c:447
+#: src/setup/ncurses/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -3872,7 +3680,7 @@
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/setup/wizard_curs.c:502
+#: src/setup/ncurses/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -3888,7 +3696,7 @@
 "GNUnet user:"
 msgstr ""
 
-#: src/setup/wizard_curs.c:564
+#: src/setup/ncurses/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -3903,7 +3711,7 @@
 "GNUnet group:"
 msgstr ""
 
-#: src/setup/wizard_curs.c:595
+#: src/setup/ncurses/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -3911,7 +3719,7 @@
 "Do you want to start it after saving your configuration?"
 msgstr ""
 
-#: src/setup/wizard_curs.c:632
+#: src/setup/ncurses/wizard_curs.c:632
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -3919,90 +3727,21 @@
 "Try again?"
 msgstr ""
 
-#: src/setup/confdata.c:93
-#, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
-msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
-
-#: src/setup/wizard_util.c:119
-msgid "Can't open Service Control Manager"
+#: src/setup/lib/gns.c:266
+#, fuzzy, c-format
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
 msgstr ""
+"Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
+"under %s\\%s.\n"
 
-#: src/setup/wizard_util.c:124
-msgid "Can't create service"
-msgstr "Kan inte skapa tjänst"
-
-#: src/setup/wizard_util.c:129
-msgid "Error changing the permissions of the GNUnet directory"
-msgstr "Fel vid ändring av rättigheterna på GNUnet-katalogen"
-
-#: src/setup/wizard_util.c:134
-msgid "Cannot write to the regisitry"
-msgstr "Kan inte skriva till registret"
-
-#: src/setup/wizard_util.c:137
-msgid "Can't access the service"
-msgstr "Kan inte tillgå tjänsten"
-
-#: src/setup/wizard_util.c:141
-msgid "Can't delete the service"
-msgstr "Kan inte ta bort tjänsten"
-
-#: src/setup/wizard_util.c:145
-msgid "Unknown error"
-msgstr "Okänt fel"
-
-#: src/setup/wizard_util.c:176
-msgid "This version of Windows does not support multiple users."
-msgstr "Denna version för Windows har inte stöd för flera användare."
-
-#: src/setup/wizard_util.c:180
-msgid "Error creating user"
-msgstr "Fel vid skapandet av användare"
-
-#: src/setup/wizard_util.c:183
-msgid "Error accessing local security policy"
-msgstr "Fel vid åtkomst av lokal säkerhetspolicy"
-
-#: src/setup/wizard_util.c:186
-msgid "Error granting service right to user"
+#: src/setup/lib/tree.c:181
+#, c-format
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/wizard_util.c:189
-msgid "Unknown error while creating a new user"
-msgstr "Okänt fel vid skapandet av ny användare"
-
-#: src/setup/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
-msgstr "Tyvärr, ingen hjälp är tillgänglig för den här flaggan.\n"
-
-#: src/setup/glade_support.c:75
-#, fuzzy, c-format
-msgid "Failed to find handler for `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
-#, fuzzy, c-format
-msgid "Failed to open `%s'.\n"
-msgstr "Fil lagrad som \"%s\".\n"
-
-#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
-#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
-#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d in %s with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/include/gnunet_util_error.h:207
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
-msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
-
 #: src/include/gnunet_util_getopt.h:145
 msgid "print this help"
 msgstr "skriv ut denna hjälp"
@@ -4027,8 +3766,243 @@
 msgid "specify host on which gnunetd is running"
 msgstr "ange värd på vilken gnunetd körs"
 
+#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
+#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#, fuzzy, c-format
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
+
+#~ msgid "Failed to bind to UDP6 port %d.\n"
+#~ msgstr "Misslyckades att binda till UDP6-port %d.\n"
+
+#~ msgid "Network advertisements disabled by configuration!\n"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#~ msgid "Could not initialize libgnunetutil!\n"
+#~ msgstr "Kunde inte initiera libgnunetutil!\n"
+
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s\n"
+#~ msgstr ""
+#~ "Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
+#~ "under %s%s\n"
+
+#~ msgid "Could not create hostkey!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#~ msgid "%s `%s' returned no known hosts!\n"
+#~ msgstr "%s \"%s\" returnerade inga kända värdar!\n"
+
+#~ msgid "Trace GNUnet network topology."
+#~ msgstr "Spåra GNUnets nätverkstopologi."
+
+#~ msgid "Invalid argument: `%s'\n"
+#~ msgstr "Ogiltigt argument: \"%s\"\n"
+
+#~ msgid "Invalid arguments. Exiting.\n"
+#~ msgstr "Ogiltiga argument. Avslutar.\n"
+
+#~ msgid "%8u of %8u bytes deleted."
+#~ msgstr "%8u av %8u byte togs bort."
+
+#~ msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
+#~ msgstr ""
+#~ "ange filen att ta bort från GNUnet (obligatorisk, filen måste existera)"
+
+#~ msgid ""
+#~ "Remove file from GNUnet.  The specified file is not removed\n"
+#~ "from the filesystem but just from the local GNUnet datastore."
+#~ msgstr ""
+#~ "Ta bort fil från GNUnet.  Den angivna filen tas inte bort från\n"
+#~ "filsystemet utan bara från det lokala GNUnet-datalagret."
+
+#~ msgid "You must specify a filename (option -f)\n"
+#~ msgstr "Du måste ange ett filnamn (flagga -f)\n"
+
+#~ msgid "gnunet-directory [OPTIONS] [FILENAMES]"
+#~ msgstr "gnunet-directory [FLAGGOR] [FILNAMN]"
+
 #, fuzzy
+#~ msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
+#~ msgstr ""
+#~ "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
+
+#~ msgid "process directories recursively"
+#~ msgstr "bearbeta kataloger rekursivt"
+
+#~ msgid "You must specify a list of files to insert.\n"
+#~ msgstr "Du måste ange en lista av filer att lägga in.\n"
+
+#~ msgid "Only one file or directory can be specified at a time.\n"
+#~ msgstr "Endast en fil eller katalog kan anges samtidigt.\n"
+
+#~ msgid "You must specify a file or directory to upload.\n"
+#~ msgstr "Du måste ange en fil eller katalog att ladda upp.\n"
+
+#~ msgid "Search GNUnet for files."
+#~ msgstr "Sök GNUnet efter filer."
+
+#~ msgid "Not enough arguments. You must specify a keyword or identifier.\n"
+#~ msgstr ""
+#~ "Inte tillräckligt med argument. Du måste ange ett nyckelord eller "
+#~ "identifierare.\n"
+
+#~ msgid "LEVEL"
+#~ msgstr "NIVÅ"
+
+#~ msgid "FILENAME"
+#~ msgstr "FILNAMN"
+
+#~ msgid "write the file to FILENAME"
+#~ msgstr "skriv filen till FILNAMN"
+
+#~ msgid "helptext for -t"
+#~ msgstr "hjälptext för -t"
+
+#~ msgid "Template for gnunet-clients."
+#~ msgstr "Mall för gnunet-clients."
+
+#~ msgid "`%s' failed at %s:%d with error: `%s'.\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#~ msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+#~ msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#~ msgid "Parsing HTTP response for URL `%s' failed.\n"
+#~ msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
+
+#~ msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+#~ msgstr ""
+#~ "Kunde inte slå upp namn för HTTP-proxy \"%s\". Försöker utan proxy.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize SQLite KVStore.\n"
+#~ msgstr "Kunde inte initiera SQLite.\n"
+
 #~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s\\%s.\n"
+#~ msgstr ""
+#~ "Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
+#~ "under %s\\%s.\n"
+
+#~ msgid "print a value from the configuration file to stdout"
+#~ msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#~ msgid "Invalid arguments: "
+#~ msgstr "Ogiltiga argument: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Exiting.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Avslutar.\n"
+
+#~ msgid "No applications defined in configuration!\n"
+#~ msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#~ msgid "Updated data for %d applications.\n"
+#~ msgstr "Uppdaterade data för %d program.\n"
+
+#~ msgid ""
+#~ "You must specify a name for the PID file in section `%s' under `%s'.\n"
+#~ msgstr ""
+#~ "Du måste ange ett namn för PID-filen i sektion \"%s\" under \"%s\".\n"
+
+#~ msgid "Invalid command-line arguments:\n"
+#~ msgstr "Ogiltiga kommandoradsargument:\n"
+
+#~ msgid "Argument %d: `%s'\n"
+#~ msgstr "Argument %d: \"%s\"\n"
+
+#~ msgid "`%s' starting\n"
+#~ msgstr "\"%s\" startar\n"
+
+#~ msgid "You must specify a non-empty set of transports to test!\n"
+#~ msgstr "Du måste ange en icke-tom uppsättning av transporter att testa!\n"
+
+#~ msgid "Available MODEs:\n"
+#~ msgstr "Tillgängliga lägen:\n"
+
+#~ msgid " config\t\ttext-based configuration\n"
+#~ msgstr " config\t\ttextbaserad konfiguration\n"
+
+#~ msgid " menuconfig\ttext-based menu\n"
+#~ msgstr " menuconfig\ttextbaserad meny\n"
+
+#~ msgid " wizard-curses\tBasic text-based graphical configuration\n"
+#~ msgstr " wizard-curses\tEnkel textbaserad grafisk konfiguration\n"
+
+#~ msgid ""
+#~ " wizard-gtk\tBasic GTK configuration\n"
+#~ "\n"
+#~ msgstr ""
+#~ " wizard-gtk\tEnkel GTK-konfiguration\n"
+#~ "\n"
+
+#~ msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
+#~ msgstr ""
+#~ "gnunet-setup måste ha skrivrättighet till konfigurationsfilen \"%s\"\n"
+
+#~ msgid ""
+#~ "Can only run wizard to configure gnunetd.\n"
+#~ "Did you forget the `%s' option?\n"
+#~ msgstr ""
+#~ "Kan endast köra vägvisaren för att konfigurera gnunetd.\n"
+#~ "Glömde du flaggan \"%s\"?\n"
+
+#~ msgid "%s: symbol value `%s' invalid for %s\n"
+#~ msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
+
+#~ msgid "Can't create service"
+#~ msgstr "Kan inte skapa tjänst"
+
+#~ msgid "Error changing the permissions of the GNUnet directory"
+#~ msgstr "Fel vid ändring av rättigheterna på GNUnet-katalogen"
+
+#~ msgid "Cannot write to the regisitry"
+#~ msgstr "Kan inte skriva till registret"
+
+#~ msgid "Can't access the service"
+#~ msgstr "Kan inte tillgå tjänsten"
+
+#~ msgid "Can't delete the service"
+#~ msgstr "Kan inte ta bort tjänsten"
+
+#~ msgid "Unknown error"
+#~ msgstr "Okänt fel"
+
+#~ msgid "This version of Windows does not support multiple users."
+#~ msgstr "Denna version för Windows har inte stöd för flera användare."
+
+#~ msgid "Error creating user"
+#~ msgstr "Fel vid skapandet av användare"
+
+#~ msgid "Error accessing local security policy"
+#~ msgstr "Fel vid åtkomst av lokal säkerhetspolicy"
+
+#~ msgid "Unknown error while creating a new user"
+#~ msgstr "Okänt fel vid skapandet av ny användare"
+
+#, fuzzy
+#~ msgid "Failed to find handler for `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
 #~ "This assistant will ask you a few basic questions in order to configure "
@@ -4099,9 +4073,6 @@
 #~ msgid "Question"
 #~ msgstr "Fråga"
 
-#~ msgid "Do you want to save your settings?"
-#~ msgstr "Vill du spara dina inställningar?"
-
 #~ msgid "Unable to save configuration!"
 #~ msgstr "Kunde inte spara konfiguration!"
 
@@ -4168,9 +4139,6 @@
 #~ msgid "_Introduction"
 #~ msgstr "_Introduktion"
 
-#~ msgid "_About"
-#~ msgstr "_Om"
-
 #~ msgid "Goes up of one level (single view)"
 #~ msgstr "Går upp en nivå (enkel vy)"
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2006-09-06 00:19:41 UTC (rev 3363)
+++ GNUnet/po/vi.po     2006-09-06 00:21:57 UTC (rev 3364)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-07-24 16:55-0700\n"
+"POT-Creation-Date: 2006-09-05 18:18-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"
@@ -15,83 +15,54 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: src/transports/ip6.c:60
+#: src/transports/ip6.c:65 src/util/network/io.c:68
 #, fuzzy, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy IP của máy '%s': %s\n"
 
-#: src/transports/ip6.c:100
+#: src/transports/ip6.c:109
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Không tìm thấy '%s': %s\n"
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr "Không lấy được địa chỉ IPv6 (ngoài) của tôi!\n"
-
-#: src/transports/udp6.c:128 src/transports/udp.c:145
+#: src/transports/ip6.c:154 src/transports/ip.c:353
 #, fuzzy, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
-msgstr ""
-"Không nhận ra cổng để kết gắn tới.  Hãy xác định trong tập tin cấu hình phần "
-"'%s' dưới '%s' hoặc phần '%s' dưới %s/%s.\n"
+msgid "Failed to obtain my (external) %s address!\n"
+msgstr "Lấy địa chỉ IP (ngoài) của tôi không thành công!\n"
 
-#: src/transports/udp6.c:164
+#: src/transports/udp6.c:126 src/transports/udp.c:128
 #, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
-msgstr "Kết gắn bind tới cổng UDP6 %d không thành công.\n"
+msgid "Failed to bind to UDP port %d.\n"
+msgstr "Không kết gắn được tới cổng UDP %d.\n"
 
-#: src/transports/udp6.c:235
-#, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp6.c:290
-#, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr "Nhận được thông báo UDP6 sai từ %s: %d, đang loại bỏ.\n"
-
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr "Kiểm tra định dạng gói nhận được từ %s:%d (UDP6) thất bại."
-
-#: src/transports/udp6.c:334 src/transports/tcp6.c:657
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr "%s: Nhả ra kết nối có trong danh sách đen từ địa chỉ %s.\n"
-
-#: src/transports/udp6.c:415
+#: src/transports/udp6.c:223
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/udp6.c:699 src/transports/smtp.c:932
-#: src/transports/udp.c:722
+#: src/transports/udp6.c:443 src/transports/udp.c:443
 #, fuzzy, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
 
-#: src/transports/http.c:601
+#: src/transports/http.c:614
 msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr "Mong chào mừng từ kết nối http, nhận được rác. Đang đóng kết nối.\n"
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#: src/transports/http.c:830
 #, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr "%s: Nhả ra kết nối có trong danh sách đen từ %u.%u.%u.%u.\n"
 
-#: src/transports/http.c:1101
+#: src/transports/http.c:1114
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#: src/transports/http.c:1190 src/transports/tcp.c:254
 #, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
 
-#: src/transports/http.c:1333
+#: src/transports/http.c:1346
 #, c-format
 msgid ""
 "Could not bind the HTTP listener to port %d. No transport service started.\n"
@@ -99,29 +70,29 @@
 "Không kết gắn được trình nghe HTTP tới cổng %d. Dịch vụ truyền tải chưa "
 "chạy.\n"
 
-#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
+#: src/transports/http.c:1469 src/applications/testbed/testbed.c:1054
 #, fuzzy, c-format
 msgid "Could not resolve name of HTTP proxy `%s'.\n"
 msgstr "Không tìm được tên của proxy HTTP '%s'.\n"
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1492
 msgid "# bytes received via HTTP"
 msgstr "# byte nhận được qua HTTP"
 
-#: src/transports/http.c:1480
+#: src/transports/http.c:1494
 msgid "# bytes sent via HTTP"
 msgstr "# byte gửi qua HTTP"
 
-#: src/transports/http.c:1482
+#: src/transports/http.c:1496
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte loại bỏ bởi HTTP (đi ra)"
 
-#: src/transports/smtp.c:297
+#: src/transports/smtp.c:298
 #, fuzzy, c-format
 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"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
+#: src/transports/smtp.c:420 src/transports/smtp.c:882
 #, fuzzy, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section `%s' "
@@ -130,144 +101,119 @@
 "Người dùng phải chỉ ra tên của ống pipe cho truyền tải SMTP trong phần '%s' "
 "dưới '%s'.\n"
 
-#: src/transports/smtp.c:489
+#: src/transports/smtp.c:493
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr "Nhận được thông báo bị hỏng qua SMTP (kích thước không tương ứng).\n"
 
-#: src/transports/smtp.c:584
+#: src/transports/smtp.c:588
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr "Không chỉ ra đầu lọc cho E-mail, không tạo được quảng cáo SMTP.\n"
 
-#: src/transports/smtp.c:591
+#: src/transports/smtp.c:595
 #, fuzzy, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Đầu lọc SMTP quá dài, đổi thành '%s'\n"
 
-#: src/transports/smtp.c:764
+#: src/transports/smtp.c:769
 #, fuzzy, c-format
 msgid "Sending E-mail to `%s' failed.\n"
 msgstr "Gửi E-mail tới '%s' thất bại.\n"
 
-#: src/transports/smtp.c:815
+#: src/transports/smtp.c:820
 #, c-format
 msgid "SMTP server send unexpected response at %s:%d.\n"
 msgstr "Máy chủ SMTP gửi cầu trả lời không mong đợi tại %s: %d.\n"
 
-#: src/transports/smtp.c:838
+#: src/transports/smtp.c:843
 #, c-format
 msgid ""
 "SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
 msgstr ""
 
-#: src/transports/smtp.c:844
+#: src/transports/smtp.c:849
 #, fuzzy, c-format
 msgid "Failed to send `%s' request to SMTP server.\n"
 msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
 
-#: src/transports/smtp.c:903
+#: src/transports/smtp.c:909
 #, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s đầu lọc %s (SMTP)"
 
-#: src/transports/tcp.c:465
-#, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
-msgstr ""
-"Mong đợi chào mừng trên kết nối tcp, nhận được rác (%u, %u). Đang đóng.\n"
+#: src/transports/smtp.c:938
+#, fuzzy, c-format
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr ""
-"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/transports/tcp.c:1082
+#: src/transports/tcp.c:181
 msgid "Could not determine my public IP address.\n"
 msgstr "Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
+#: src/transports/tcp.c:324 src/transports/tcp6.c:333
 #, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Chạy dịch vụ truyền tải trên cổng %d thất bại.\n"
 
-#: src/transports/tcp.c:1449
+#: src/transports/tcp.c:421
 msgid "# bytes received via TCP"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp.c:1451
+#: src/transports/tcp.c:423
 msgid "# bytes sent via TCP"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp.c:1453
+#: src/transports/tcp.c:425
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/transports/udp.c:179
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Không kết gắn được tới cổng UDP %d.\n"
-
-#: src/transports/udp.c:250
-#, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp.c:307
-#, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr "Nhận được thông báo UDP sai từ %u.%u.%u.%u:%u, đang loại bỏ.\n"
-
-#: src/transports/udp.c:332
-#, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
-"Kiểm tra định dạng gói nhận được từ %u.%u.%u.%u:%u (UDP) không thành công.\n"
-
-#: src/transports/udp.c:417
+#: src/transports/udp.c:217
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/transports/udp.c:551
+#: src/transports/udp.c:312
 #, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 "Gửi thông báo với kích thước %d qua UDP tới %u.%u.%u.%u:%u không thành công: "
 "%s\n"
 
-#: src/transports/udp.c:707
+#: src/transports/udp.c:449
 msgid "# bytes received via UDP"
 msgstr "# byte nhận được qua UDP"
 
-#: src/transports/udp.c:709
+#: src/transports/udp.c:451
 msgid "# bytes sent via UDP"
 msgstr "# byte gửi qua UDP"
 
-#: src/transports/udp.c:711
+#: src/transports/udp.c:453
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte loại bỏ bởi UDP (đi ra)"
 
-#: src/transports/ip.c:124
+#: src/transports/ip.c:92
 #, fuzzy, c-format
+msgid "No interface specified in section `%s' under `%s'!\n"
+msgstr ""
+"Không có giao diện mạng được xác định trong cấu hình phần '%s' dưới '%s'!\n"
+
+#: src/transports/ip.c:150
+#, fuzzy, c-format
 msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
+"Could not find interface `%s' using `%s', trying to find another interface.\n"
 msgstr ""
 "Không tìm thấy giao diện '%s' trong '%s', đang thử kết gắn tới giao diện "
 "khác.\n"
 
-#: src/transports/ip.c:149
+#: src/transports/ip.c:182
 #, fuzzy, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "Không lấy được IP cho giao diện '%s' đang dùng '%s'.\n"
 
-#: src/transports/ip.c:193
+#: src/transports/ip.c:226
 #, fuzzy, c-format
 msgid "Could not find an IP address for interface `%s'.\n"
 msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
-#: src/transports/ip.c:203
+#: src/transports/ip.c:236
 #, fuzzy, c-format
 msgid ""
 "There is more than one IP address specified for interface `%s'.\n"
@@ -276,41 +222,63 @@
 "Có vài địa chỉ IP chỉ ra cho giao diện '%s'.\n"
 "GNUnet sẽ dùng %u.%u.%u.%u.\n"
 
-#: src/transports/ip.c:224
+#: src/transports/ip.c:257
 #, fuzzy, c-format
 msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr "Không tìm thấy '%s' để nhận ra địa chỉ IP của chúng ta: %s\n"
 
-#: src/transports/ip.c:256
+#: src/transports/ip.c:289
 #, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %u.%u.%u.%u.\n"
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
-msgstr "Lấy địa chỉ IP (ngoài) của tôi không thành công!\n"
-
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr "Mong chào mừng từ kết nối tcp, nhận được rác. Đang đóng.\n"
-
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr ""
-"Nhận được thông báo bị hỏng từ kết nối tcp6-đầu peer. Đang đóng kết nối.\n"
-
-#: src/transports/tcp6.c:958
+#: src/transports/tcp6.c:179
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Không nhận ra địa chỉ IPv6 của tôi.\n"
 
-#: src/transports/tcp6.c:1002
+#: src/transports/tcp6.c:221
 #, fuzzy, c-format
 msgid "`%s': unknown service: %s\n"
 msgstr "'%s': không rõ dịch vụ: %s\n"
 
+#: src/transports/tcp6.c:430
+#, fuzzy
+msgid "# bytes received via TCP6"
+msgstr "# byte nhận được qua TCP"
+
+#: src/transports/tcp6.c:432
+#, fuzzy
+msgid "# bytes sent via TCP6"
+msgstr "# Byte gửi qua TCP"
+
+#: src/transports/tcp6.c:434
+#, fuzzy
+msgid "# bytes dropped by TCP6 (outgoing)"
+msgstr "# byte loại đi bởi TCP (đi ra)"
+
+#: src/transports/tcp_helper.c:182
+#, fuzzy
+msgid "Received malformed message instead of welcome message. Closing.\n"
+msgstr ""
+"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/transports/tcp_helper.c:193
+#, fuzzy
+msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgstr ""
+"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/transports/udp_helper.c:93
+#, fuzzy
+msgid "Received malformed message from udp-peer connection. Closing.\n"
+msgstr ""
+"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:50
-#: src/applications/session/sessiontest.c:48
+#: src/applications/session/sessiontest.c:42
 #: src/applications/stats/statistics.c:212
 #: src/applications/tbench/tbenchtest.c:107
 #: src/applications/tbench/tbenchtest_udp.c:107
@@ -319,7 +287,6 @@
 msgstr "# của các đầu đã kết nối"
 
 #: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/session/sessiontest.c:118
 #: src/applications/tbench/tbenchtest.c:199
 #: src/applications/tbench/tbenchtest_udp.c:201
 #: src/applications/gap/gaptest.c:318
@@ -328,7 +295,6 @@
 msgstr "Đang chờ chạy gnunetd (còn %u lần thử)...\n"
 
 #: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/session/sessiontest.c:133
 #: src/applications/tbench/tbenchtest.c:122
 #: src/applications/tbench/tbenchtest_udp.c:122
 #: src/applications/gap/gaptest.c:330
@@ -349,28 +315,8 @@
 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:84
-#: src/applications/dht/tools/dht-join.c:85
-#: src/applications/tbench/gnunet-tbench.c:124
-#: src/applications/tbench/gnunet-tbench.c:134
-#: src/applications/tbench/gnunet-tbench.c:147
-#: src/applications/tbench/gnunet-tbench.c:157
-#: src/applications/tbench/gnunet-tbench.c:167
-#: src/applications/tbench/gnunet-tbench.c:182
-#: src/applications/tracekit/gnunet-tracekit.c:73
-#: src/applications/tracekit/gnunet-tracekit.c:87
-#: src/applications/tracekit/gnunet-tracekit.c:122
-#: src/applications/tracekit/gnunet-tracekit.c:136
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/server/gnunet-transport-check.c:448
-#: src/server/gnunet-transport-check.c:462
-#: src/server/gnunet-transport-check.c:479
-#: src/server/gnunet-transport-check.c:509
+#: src/applications/dht/tools/dht-join.c:85 src/util/getopt/setoption.c:133
+#: src/util/getopt/setoption.c:149
 #, fuzzy, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Người dùng phải đưa một số vào tùy chọn '%s'.\n"
@@ -380,21 +326,8 @@
 #: src/applications/chat/gnunet-chat.c:93
 #: src/applications/testbed/gnunet-testbed.c:125
 #: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/tracekit/gnunet-tracekit.c:153
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
-#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
-#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
-#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
+#: src/applications/vpn/gnunet-vpn.c:118 src/util/getopt/getopt.c:1066
+#: src/setup/gnunet-setup.c:246
 #, 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"
@@ -566,7 +499,7 @@
 
 #: src/applications/dht/module/dht.c:1603
 #: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1290
 #, 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"
@@ -648,7 +581,7 @@
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d và %d\n"
 
-#: src/applications/chat/chat.c:212
+#: src/applications/chat/chat.c:216
 msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
@@ -661,9 +594,6 @@
 msgstr "Chạy máy khách chát của GNUnet."
 
 #: src/applications/chat/gnunet-chat.c:151
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363
-#: src/applications/fs/tools/gnunet-delete.c:142
 msgid "Could not connect to gnunetd.\n"
 msgstr "Không kết nối được tới gnunetd.\n"
 
@@ -680,105 +610,96 @@
 msgid "Could not send message to gnunetd\n"
 msgstr "Không gửi được thông báo tới gnunetd\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/applications/advertising/advertising.c:162
 #, fuzzy, c-format
 msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr "Thông báo HELO từ '%s' bị sai (sai chữ ký). Đang bỏ đi.\n"
 
-#: src/applications/advertising/advertising.c:167
+#: src/applications/advertising/advertising.c:168
 #, fuzzy
 msgid ""
 "hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr "Thông báo HELO nhận được bị sai (vượt quá thời hạn). Đang bỏ đi.\n"
 
-#: src/applications/advertising/advertising.c:176
+#: src/applications/advertising/advertising.c:177
 #, fuzzy, c-format
 msgid "hello advertisement for protocol %d received.\n"
 msgstr "Nhận được quảng cáo HELO cho giao thức %d.\n"
 
-#: src/applications/advertising/advertising.c:295
+#: src/applications/advertising/advertising.c:297
 #, fuzzy
 msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr "Không gửi được các HELO+PING, đầy bộ đệm ping.\n"
 
-#: src/applications/advertising/advertising.c:308
+#: src/applications/advertising/advertising.c:310
 #, fuzzy, c-format
 msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr "'%s' thất bại (%d, %u). Sẽ không gửi PING.\n"
 
-#: src/applications/advertising/advertising.c:463
+#: src/applications/advertising/advertising.c:467
 #, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Đang quảng cáo giao thông %d tới các đầu peer đã chọn.\n"
 
-#: src/applications/advertising/advertising.c:470
+#: src/applications/advertising/advertising.c:474
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 "Đang tự thông báo sự vô nghĩa: chúng ta không còn biết đến một đầu peer "
 "nào.\n"
 
-#: src/applications/advertising/advertising.c:572
+#: src/applications/advertising/advertising.c:580
 #, fuzzy, c-format
 msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr "Đang xóa bỏ HELO từ đầu peer '%s' (đã hết hạn %dgiây).\n"
 
-#: src/applications/advertising/advertising.c:734
+#: src/applications/advertising/advertising.c:760
 msgid "# Peer advertisements received"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:735
+#: src/applications/advertising/advertising.c:761
 msgid "# Self advertisments transmitted"
 msgstr "# Đã truyền tải tự quảng cáo"
 
-#: src/applications/advertising/advertising.c:736
+#: src/applications/advertising/advertising.c:762
 msgid "# Foreign advertisements forwarded"
 msgstr "# Đã chuyển tiếp quàng cáo ngoài"
 
-#: src/applications/advertising/advertising.c:738
-#: src/applications/pingpong/pingpong.c:462
+#: src/applications/advertising/advertising.c:764
+#: src/applications/pingpong/pingpong.c:488
 msgid "# plaintext PING messages sent"
 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:742
-#: src/applications/session/connect.c:752
+#: src/applications/advertising/advertising.c:768
+#: src/applications/session/connect.c:779
 #, fuzzy, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 "'%s' đăng ký trình điều khiển %d (văn bản thông thường và văn bản mã hóa)\n"
 
-#: src/applications/advertising/advertising.c:761
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "Tắt quàng cáo trong mạng bằng cấu hình!\n"
-
-#: src/applications/advertising/advertising.c:781
+#: src/applications/advertising/advertising.c:785
 msgid ""
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:398
+#: src/applications/pingpong/pingpong.c:123
+#: src/applications/pingpong/pingpong.c:191
+#: src/applications/pingpong/pingpong.c:244
+#: src/applications/pingpong/pingpong.c:313
 #, fuzzy, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
-msgstr "Phiên bản không tương ứng ('%s' và '%s'), hãy chạy gnunet-update!\n"
-
-#: src/applications/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
-#, fuzzy, c-format
 msgid "Received malformed `%s' message. Dropping.\n"
 msgstr "Nhận được thông báo '%s' hỏng. Đang bỏ đi.\n"
 
-#: src/applications/pingpong/pingpong.c:130
+#: src/applications/pingpong/pingpong.c:135
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Nhận được ping cho đầu peer khác. Đang bỏ đi.\n"
 
-#: src/applications/pingpong/pingpong.c:187
+#: src/applications/pingpong/pingpong.c:201
 msgid "Received PING not destined for us!\n"
 msgstr "Nhận được PING không dành cho chúng ta!\n"
 
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/pingpong/pingpong.c:286
+#: src/applications/pingpong/pingpong.c:349
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
@@ -786,153 +707,144 @@
 "Không tương ứng được PONG đối với bất kỳ PING. Hãy thử tăng hằng số "
 "MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c:366
+#: src/applications/pingpong/pingpong.c:390
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr "Không tạo được PING, bảng đầy. Hãy thử tăng MAX_PING_PONG.\n"
 
-#: src/applications/pingpong/pingpong.c:452
+#: src/applications/pingpong/pingpong.c:478
 msgid "# encrypted PONG messages received"
 msgstr "# nhận được thông báo PONG đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:454
+#: src/applications/pingpong/pingpong.c:480
 msgid "# plaintext PONG messages received"
 msgstr "# nhận được thông báo PONG dạng văn bản thường"
 
-#: src/applications/pingpong/pingpong.c:456
+#: src/applications/pingpong/pingpong.c:482
 msgid "# encrypted PING messages received"
 msgstr "# nhận được thông báo PING đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:458
+#: src/applications/pingpong/pingpong.c:484
 msgid "# PING messages created"
 msgstr "# đã tạo tin nhắn PING"
 
-#: src/applications/pingpong/pingpong.c:460
+#: src/applications/pingpong/pingpong.c:486
 msgid "# encrypted PONG messages sent"
 msgstr "# đã gửi thông báo PONG đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:464
+#: src/applications/pingpong/pingpong.c:490
 msgid "# encrypted PING messages sent"
 msgstr "# đã gửi các thông báo PING mã hóa"
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:500
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 "'%s' đăng ký trình điều khiển %d %d (văn bản thông thường và văn bản mã "
 "hóa)\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_sqlite/sqlite.c:45
+#: src/applications/sqstore_sqlite/sqlite.c:52
 #: src/applications/sqstore_mysql/mysql.c:137
 #: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/kvstore_sqlite/kv_sqlite.c:43
-#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/applications/sqstore_mysql/mysql.c:389
+#: src/applications/sqstore_mysql/mysql.c:728
+#: src/applications/sqstore_mysql/mysql.c:743
+#: src/applications/sqstore_mysql/mysql.c:752
+#: src/applications/sqstore_mysql/mysql.c:776
+#: src/applications/sqstore_mysql/mysql.c:786
+#: src/applications/sqstore_mysql/mysql.c:840
+#: src/applications/sqstore_mysql/mysql.c:925
+#: src/applications/sqstore_mysql/mysql.c:935
+#: src/applications/sqstore_mysql/mysql.c:1007
+#: src/applications/sqstore_mysql/mysql.c:1016
+#: src/applications/sqstore_mysql/mysql.c:1056
+#: src/applications/sqstore_mysql/mysql.c:1070
+#: src/applications/kvstore_sqlite/kv_sqlite.c:44
+#: src/applications/kvstore_sqlite/kv_sqlite.c:51
 #: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
 #: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
+#: src/applications/sqstore_sqlite/sqlite.c:158
+#, fuzzy, c-format
+msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không chạy được SQLite.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_sqlite/sqlite.c:307
+#: src/applications/sqstore_sqlite/sqlite.c:327
 #: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
+#: src/applications/sqstore_mysql/mysql.c:803
 #, c-format
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
+#: src/applications/sqstore_sqlite/sqlite.c:308
+#: src/applications/sqstore_sqlite/sqlite.c:328
 msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1035
-#, fuzzy, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
-msgstr ""
-"Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần '%s' dưới "
-"'%s'.\n"
-
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-#: src/applications/sqstore_mysql/mysql.c:1178
+#: src/applications/sqstore_sqlite/sqlite.c:1177
+#: src/applications/sqstore_mysql/mysql.c:1182
 #, fuzzy
 msgid "# bytes in datastore"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "Không chạy được libgnunetutil!\n"
-
-#: src/applications/session/connect.c:209
+#: src/applications/session/connect.c:221
 #, 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:246
+#: src/applications/session/connect.c:258
 msgid "Cannot encrypt sessionkey, other peer 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:523
+#: src/applications/session/connect.c:517
 #, 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:540
+#, 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:532
+#: src/applications/session/connect.c:550
 #, 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:587
+#: src/applications/session/connect.c:608
 msgid ""
 "Error parsing encrypted session key, 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:597
+#: src/applications/session/connect.c:619
 #, c-format
 msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:742
+#: src/applications/session/connect.c:768
 msgid "# session keys sent"
 msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/session/connect.c:744
+#: src/applications/session/connect.c:770
 msgid "# session keys rejected"
 msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/session/connect.c:746
+#: src/applications/session/connect.c:772
 msgid "# session keys accepted"
 msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/session/connect.c:748
+#: src/applications/session/connect.c:774
 msgid "# sessions established"
 msgstr "# đã thiết lập buổi làm việc"
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/rpc/rpc.c:130 src/applications/rpc/rpc.c:170
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be registered: another callback is already "
@@ -941,7 +853,7 @@
 "%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã dùng tên này (%"
 "p)\n"
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/rpc/rpc.c:212 src/applications/rpc/rpc.c:259
 #, c-format
 msgid ""
 "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
@@ -950,157 +862,152 @@
 "%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã đăng ký dưới tên "
 "đó (%p)\n"
 
-#: src/applications/rpc/rpc.c:232
+#: src/applications/rpc/rpc.c:233
 #, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - RPC %s:%p không đăng ký được: không tìm thấy\n"
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/rpc/rpc.c:280
 #, c-format
 msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr "%s::%s - async RPC %s:%p không đăng ký được: không tìm thấy\n"
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
+#: src/applications/rpc/rpc.c:878 src/applications/rpc/rpc.c:1011
+#: src/applications/rpc/rpc.c:1100
 #, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr "Nhận được thông báo sai của dạng %u.  Đang bỏ đi.\n"
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/rpc/rpc.c:945
 #, c-format
 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:1388
+#: src/applications/rpc/rpc.c:1414
 #, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr "Chưa bỏ đăng ký RPC: %s: %p\n"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/rpc/rpc.c:1441
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d %d\n"
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/rpc/rpc.c:1462
 #, fuzzy, c-format
 msgid "Failed to initialize `%s' service.\n"
 msgstr "Chạy dịch vụ '%s' không thành công.\n"
 
-#: src/applications/rpc/rpc.c:1491
+#: src/applications/rpc/rpc.c:1519
 msgid "RPC async reply invalid.\n"
 msgstr "Câu trả lời async của RPC sai.\n"
 
-#: src/applications/rpc/rpc.c:1562
+#: src/applications/rpc/rpc.c:1591
 msgid "async RPC reply not received.\n"
 msgstr "Không nhận được câu trả lời async của RPC.\n"
 
 #: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
+#: src/applications/sqstore_mysql/mysql.c:804
 msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/sqstore_mysql/mysql.c:1110
 #, fuzzy, c-format
 msgid "Query `%s' had no results.\n"
 msgstr "Câu hỏi '%s' không có kết quả.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1205
+#: src/applications/sqstore_mysql/mysql.c:1212
 #, fuzzy, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Đang thử dùng tập tin '%s' cho cấu hình MySQL.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1223
+#: src/applications/sqstore_mysql/mysql.c:1230
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
 msgstr ""
 
-#: src/applications/datastore/filter.c:42
+#: src/applications/datastore/datastore.c:119
 #, fuzzy, c-format
-msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
-msgstr ""
-"Trong phần '%s' dưới '%s' của cấu hình phải chỉ ra thư mục cho dữ liệu FS.\n"
-
-#: src/applications/datastore/datastore.c:118
-#, fuzzy, c-format
 msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr "Thử khả năng cho '%s' không thành công tại %s: %d.\n"
 
-#: src/applications/datastore/datastore.c:142
+#: src/applications/datastore/datastore.c:143
 #, fuzzy, c-format
 msgid "Database failed to delete `%s'.\n"
 msgstr "Cơ sở dữ liệu xóa %s không thành công.\n"
 
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1086
-#: src/applications/fs/fsui/file_info.c:66
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s\n"
-msgstr ""
-"Tập tin cấu hình phải chỉ ra thư mục cho GNUnet để chứa dữ liệu per-peer "
-"dưới %s%s\n"
+#: src/applications/datastore/datastore.c:358
+#: src/applications/datastore/datastore.c:454
+#, fuzzy
+msgid "Failed to load state service. Trying to do without.\n"
+msgstr "Chạy dịch vụ truyền tải trên cổng %d thất bại.\n"
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/identity/hostkey.c:109
 #, fuzzy, c-format
+msgid "Failed to access GNUnet home directory `%s'\n"
+msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
+
+#: src/applications/identity/hostkey.c:139
+#, fuzzy, c-format
 msgid ""
 "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
 "Kiểm tra chìa khóa máy có trong '%s' không thành công, đang tạo chìa khóa "
 "máy mới.\n"
 
-#: src/applications/identity/hostkey.c:127
+#: src/applications/identity/hostkey.c:147
 msgid "Creating new hostkey (this may take a while).\n"
 msgstr "Đang tạo chìa khóa máy mới (có thể cần một chút thời gian).\n"
 
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
-msgstr "Không tạo được chìa khóa máy!\n"
-
-#: src/applications/identity/hostkey.c:139
+#: src/applications/identity/hostkey.c:160
 msgid "Done creating hostkey.\n"
 msgstr "Đã tạo xong chìa khóa máy.\n"
 
-#: src/applications/identity/identity.c:333
+#: src/applications/identity/identity.c:346
 #, fuzzy, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 "Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
 
-#: src/applications/identity/identity.c:366
+#: src/applications/identity/identity.c:359
 #, fuzzy, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "%s '%s' không trả lại máy biết đến!\n"
+msgid ""
+"Directory `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
 
-#: src/applications/identity/identity.c:648
-#: src/applications/identity/identity.c:666
+#: src/applications/identity/identity.c:396
 #, fuzzy, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "Không hủy nạp đúng được dịch vụ '%s'!\n"
+
+#: src/applications/identity/identity.c:684
+#: src/applications/identity/identity.c:705
+#, fuzzy, c-format
 msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr "Xóa bỏ tập tin '%s' chứa dữ liệu HELO sai.\n"
 
-#: src/applications/identity/identity.c:716
+#: src/applications/identity/identity.c:758
 #, fuzzy, c-format
 msgid "Signature failed verification: 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/identity/identity.c:724
+#: src/applications/identity/identity.c:767
 #, fuzzy
 msgid "Signature failed verification: signature invalid.\n"
 msgstr "Thông báo HELO sai (sai chữ ký).\n"
 
 #: src/applications/testbed/commands.c:1130
-#: src/applications/stats/gnunet-stats.c:61
+#: src/applications/stats/gnunet-stats.c:63
 #, c-format
 msgid "Supported peer-to-peer messages:\n"
 msgstr "Thông báo Peer to Peer được hỗ trợ:\n"
 
 #: src/applications/testbed/commands.c:1132
-#: src/applications/stats/gnunet-stats.c:64
+#: src/applications/stats/gnunet-stats.c:66
 #, c-format
 msgid "Supported client-server messages:\n"
 msgstr "Thông báo máy khách-máy chủ hỗ trợ:\n"
@@ -1132,7 +1039,7 @@
 "Lỗi (%s) kết gắn bind trình nghe TCP vào cổng %d. Chưa chạy dịch vụ proxy.\n"
 "Hãy thử lại sau %d giây...\n"
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#: src/applications/testbed/gnunet-testbed.c:415
 #, c-format
 msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr "Đã nhả ra kết nối chưa xác thực từ %u.%u.%u.%u.\n"
@@ -1257,7 +1164,6 @@
 msgstr "Chưa đưa ra URL của testbed, không đăng ký.\n"
 
 #: src/applications/testbed/testbed.c:1079
-#: src/applications/bootstrap_http/http.c:81
 #, fuzzy, c-format
 msgid "Invalid URL `%s' (must begin with `%s')\n"
 msgstr "URL sai '%s' (phải bắt đầu với '%s')\n"
@@ -1286,77 +1192,99 @@
 msgid "Exit register (error: no http response read).\n"
 msgstr "Thoát trình đăng ký (lỗi: không đọc được câu trả lời http).\n"
 
-#: src/applications/testbed/testbed.c:1357
+#: src/applications/testbed/testbed.c:1361
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/applications/transport/transport.c:136
 #, c-format
+msgid ""
+"Converting peer address to string failed, transport type %d not supported\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:183
+#, c-format
+msgid "Transport connection attempt failed, transport type %d not supported\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:278
+#, fuzzy, c-format
+msgid "Transmission attempt failed, transport type %d unknown.\n"
+msgstr "Không biết đến giao thông dạng %d.\n"
+
+#: src/applications/transport/transport.c:366
+#, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Không biết đến giao thông dạng %d.\n"
 
-#: src/applications/transport/transport.c:676
-#, fuzzy, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+#: src/applications/transport/transport.c:423
+msgid "No transport succeeded in creating a hello!\n"
 msgstr ""
-"Chưa đặt tùy chọn '%s' trong phần '%s' của cấu hình, đang đặt thành %dm.\n"
 
-#: src/applications/transport/transport.c:691
+#: src/applications/transport/transport.c:596
 #, fuzzy, c-format
-msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
-msgstr ""
-"Người dùng phải chỉ ra ít nhất một dịch vụ giao thông dưới tùy chọn '%s' "
-"trong phần '%s'.\n"
+msgid "Loading transports `%s'\n"
+msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/applications/transport/transport.c:717
+#: src/applications/transport/transport.c:616
 #, fuzzy, c-format
+msgid "Could not load transport plugin `%s'\n"
+msgstr "Không chạy được ứng dụng '%s'\n"
+
+#: src/applications/transport/transport.c:626
+#, fuzzy, c-format
 msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr "Thư viện giao thông '%s' không cung cấp chức năng yêu cầu '%s%s'.\n"
 
-#: src/applications/transport/transport.c:738
+#: src/applications/transport/transport.c:643
 #, fuzzy, c-format
+msgid "Loaded transport `%s'\n"
+msgstr "(Các) truyền tải có: %s\n"
+
+#: src/applications/transport/transport.c:654
+#, fuzzy, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là một đầu peer '%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/fragmentation/fragmentation.c:559
 msgid "# messages defragmented"
 msgstr "# thông báo đã gom lại"
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/fragmentation/fragmentation.c:560
 msgid "# messages fragmented"
 msgstr "# thông báo đã phân mảnh"
 
-#: src/applications/fragmentation/fragmentation.c:559
+#: src/applications/fragmentation/fragmentation.c:561
 msgid "# fragments discarded"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/fragmentation/fragmentation.c:573
 #, fuzzy, c-format
 msgid "`%s' registering handler %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d\n"
 
+#: src/applications/stats/gnunet-stats.c:90
+msgid "Print statistics about GNUnet operations."
+msgstr "In thống kê về các thao tác của GNUnet."
+
 #: src/applications/stats/gnunet-stats.c:94
 msgid "prints supported protocol messages"
 msgstr "in các thông báo giao thức hỗ trợ"
 
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
-msgstr "In thống kê về các thao tác của GNUnet."
-
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/stats/gnunet-stats.c:137
+#: src/applications/tbench/gnunet-tbench.c:136
+#: src/applications/tracekit/gnunet-tracekit.c:319
+#: src/applications/template/gnunet-template.c:101
 #, c-format
 msgid "Error establishing connection with gnunetd.\n"
 msgstr "Lỗi thiết lập kết nối với gnunetd.\n"
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/stats/gnunet-stats.c:156
 #, c-format
 msgid "Error reading information from gnunetd.\n"
 msgstr "Lỗi đọc thông tin từ gnunetd.\n"
 
-#: src/applications/stats/clientapi.c:179
+#: src/applications/stats/clientapi.c:180
 msgid "Uptime (seconds)"
 msgstr "Đã chạy (giây)"
 
@@ -1379,112 +1307,119 @@
 msgid "# bytes of noise received"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/applications/stats/statistics.c:374
+#: src/applications/stats/statistics.c:364
+#, fuzzy, c-format
+msgid "`%s' registering client handlers %d %d %d and p2p handler %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/stats/statistics.c:385
 #, fuzzy
 msgid "keeps statistics about gnunetd's operation"
 msgstr "In thống kê về các thao tác của GNUnet."
 
-#: src/applications/tbench/gnunet-tbench.c:95
+#: src/applications/tbench/gnunet-tbench.c:65
+#: src/applications/tracekit/gnunet-tracekit.c:54
+msgid "Start GNUnet transport benchmarking tool."
+msgstr "Chạy công cụ kiểm tra truyền tải của GNUnet."
+
+#: src/applications/tbench/gnunet-tbench.c:67
 msgid "output in gnuplot format"
 msgstr "kết quả ở dạng gnuplot"
 
-#: src/applications/tbench/gnunet-tbench.c:98
+#: src/applications/tbench/gnunet-tbench.c:71
 msgid "number of iterations"
 msgstr "số lần làm lại"
 
-#: src/applications/tbench/gnunet-tbench.c:100
+#: src/applications/tbench/gnunet-tbench.c:75
 msgid "number of messages to use per iteration"
 msgstr "số thông báo dùng cho mỗi lần làm lại"
 
-#: src/applications/tbench/gnunet-tbench.c:102
+#: src/applications/tbench/gnunet-tbench.c:78
 msgid "receiver host identifier (ENC file name)"
 msgstr "trình nhận tên máy (tên tập tin ENC)"
 
-#: src/applications/tbench/gnunet-tbench.c:104
+#: src/applications/tbench/gnunet-tbench.c:81
 msgid "message size"
 msgstr "kích thước thông báo"
 
-#: src/applications/tbench/gnunet-tbench.c:106
+#: src/applications/tbench/gnunet-tbench.c:84
 msgid "sleep for SPACE ms after each a message block"
 msgstr "ngủ SPACE miligiây sau mỗi khối tin nhắn"
 
-#: src/applications/tbench/gnunet-tbench.c:108
+#: src/applications/tbench/gnunet-tbench.c:87
 msgid "time to wait for the completion of an iteration (in ms)"
 msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
-#: src/applications/tbench/gnunet-tbench.c:111
+#: src/applications/tbench/gnunet-tbench.c:91
 msgid "number of messages in a message block"
 msgstr "số thông báo trong một khối tin nhắn"
 
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
-msgstr "Chạy công cụ kiểm tra truyền tải của GNUnet."
-
-#: src/applications/tbench/gnunet-tbench.c:225
+#: src/applications/tbench/gnunet-tbench.c:153
+#, c-format
 msgid "You must specify a receiver!\n"
 msgstr "Người dùng phải chỉ ra một trình nhận!\n"
 
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/tbench/gnunet-tbench.c:162
 #, fuzzy, c-format
 msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr "Chỉ ra ID của trình nhận sai ('%s' không phải là một tên đúng).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:249
+#: src/applications/tbench/gnunet-tbench.c:189
 #, c-format
 msgid "Time:\n"
 msgstr "Thời gian:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:250
+#: src/applications/tbench/gnunet-tbench.c:190
 #, c-format
 msgid "\tmax      %llums\n"
 msgstr "\tmax      %llu miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/tbench/gnunet-tbench.c:192
 #, c-format
 msgid "\tmin      %llums\n"
 msgstr "\tmin      %llu miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:254
+#: src/applications/tbench/gnunet-tbench.c:194
 #, c-format
 msgid "\tmean     %8.4fms\n"
 msgstr "\tý nghĩa   %8.4f miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/tbench/gnunet-tbench.c:196
 #, c-format
 msgid "\tvariance %8.4fms\n"
 msgstr "\tkhác nhau %8.4f miligiây\n"
 
-#: src/applications/tbench/gnunet-tbench.c:259
+#: src/applications/tbench/gnunet-tbench.c:199
 #, c-format
 msgid "Loss:\n"
 msgstr "Mất:\n"
 
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/tbench/gnunet-tbench.c:200
 #, c-format
 msgid "\tmax      %u\n"
 msgstr "\tmax      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:262
+#: src/applications/tbench/gnunet-tbench.c:202
 #, c-format
 msgid "\tmin      %u\n"
 msgstr "\tmin      %u\n"
 
-#: src/applications/tbench/gnunet-tbench.c:264
+#: src/applications/tbench/gnunet-tbench.c:204
 #, c-format
 msgid "\tmean     %8.4f\n"
 msgstr "\tý nghĩa   %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/tbench/gnunet-tbench.c:206
 #, c-format
 msgid "\tvariance %8.4f\n"
 msgstr "\tkhác nhau %8.4f\n"
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/applications/tbench/gnunet-tbench.c:215
 #, c-format
 msgid "Output format not known, this should not happen.\n"
 msgstr "Định dạng kết quả không rõ, điều này không nên xảy ra.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/tbench/gnunet-tbench.c:219
 #, c-format
 msgid ""
 "\n"
@@ -1527,38 +1462,29 @@
 msgid "Running benchmark...\n"
 msgstr "Đang chạy thử mức độ (benchmark)...\n"
 
-#: src/applications/tbench/tbench.c:448
+#: src/applications/tbench/tbench.c:460
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
+#: src/applications/tracekit/gnunet-tracekit.c:49
 msgid "probe network to the given DEPTH"
 msgstr "thử mạng tới độ sâu DEPTH đưa ra"
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
+#: src/applications/tracekit/gnunet-tracekit.c:52
 msgid ""
 "specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 "chỉ ra định dạng kết quả; 0 - dạng người dùng dễ đọc, 1 - dấu chấm, 2 - vcg"
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
+#: src/applications/tracekit/gnunet-tracekit.c:58
 msgid "use PRIO for the priority of the trace request"
 msgstr "dùng PRIO làm ưu tiên của yêu cầu theo dấu vết trace"
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
+#: src/applications/tracekit/gnunet-tracekit.c:62
 msgid "wait DELAY seconds for replies"
 msgstr "chờ các câu trả lời DELAY giây"
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
-msgstr "Theo dấu vết trace hình học của mạng GNUnet."
-
-#: src/applications/tracekit/gnunet-tracekit.c:222
-#, fuzzy, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "'%s' chưa kết nối tới bất kỳ đầu peer nào.\n"
-
-#: src/applications/tracekit/gnunet-tracekit.c:233
+#: src/applications/tracekit/gnunet-tracekit.c:116
 #, c-format
 msgid ""
 "Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
@@ -1566,149 +1492,154 @@
 msgstr ""
 "Định dạng bị sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm, 2 cho vcg.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
+#: src/applications/tracekit/gnunet-tracekit.c:163
 #, fuzzy, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "'%s' chưa kết nối tới bất kỳ đầu peer nào.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:197
+#, fuzzy, c-format
 msgid "`%s' connected to `%s'.\n"
 msgstr "'%s' kết nối tới '%s'.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/applications/tracekit/gnunet-tracekit.c:212
 #, c-format
 msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr "Định dạng sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
+#: src/applications/tracekit/gnunet-tracekit.c:235
 #, fuzzy, c-format
 msgid "Peer `%s' did not report back.\n"
 msgstr "Đầu peer '%s' chưa báo cáo lại.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
+#: src/applications/tracekit/gnunet-tracekit.c:350
 msgid "Could not send request to gnunetd.\n"
 msgstr "Không gửi được yêu cầu tới gnunetd.\n"
 
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
+#: src/applications/tracekit/tracekit.c:68
+#: src/applications/tracekit/tracekit.c:201
 #, fuzzy, c-format
 msgid "Received invalid `%s' message from `%s'.\n"
 msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
 
-#: src/applications/tracekit/tracekit.c:243
+#: src/applications/tracekit/tracekit.c:263
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr "TRACEKIT: bảng định tuyến đầy, bỏ đi yêu cầu theo vết trace\n"
 
-#: src/applications/tracekit/tracekit.c:331
+#: src/applications/tracekit/tracekit.c:354
 #, fuzzy, c-format
 msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr "TRACEKIT: nhận được thông báo sai '%s'\n"
 
-#: src/applications/tracekit/tracekit.c:431
+#: src/applications/tracekit/tracekit.c:461
 #, fuzzy
 msgid "allows mapping of the network topology"
 msgstr "Theo dấu vết trace hình học của mạng GNUnet."
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/gap/gap.c:1635
 #, fuzzy, c-format
 msgid "GAP received invalid content from `%s'\n"
 msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
 
-#: src/applications/gap/gap.c:1618
+#: src/applications/gap/gap.c:1636
 msgid "myself"
 msgstr ""
 
-#: src/applications/gap/gap.c:1791
+#: src/applications/gap/gap.c:1809
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 "Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải.  Đang nhả ra "
 "yêu cầu.\n"
 
-#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
+#: src/applications/gap/gap.c:1820 src/applications/fs/module/anonymity.c:66
 msgid "Failed to get traffic stats.\n"
 msgstr "Lấy các thông tin truyền tải không thành công.\n"
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
+#: src/applications/gap/gap.c:1826 src/applications/gap/gap.c:1831
+#: src/applications/gap/gap.c:1837
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr "Không thể thỏa mãn mức độ dấu tên mong muốn, đang lờ đi yêu cầu.\n"
 
-#: src/applications/gap/gap.c:2077
+#: src/applications/gap/gap.c:2116
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2078
+#: src/applications/gap/gap.c:2117
 msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/gap/gap.c:2079
+#: src/applications/gap/gap.c:2118
 msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/gap/gap.c:2080
+#: src/applications/gap/gap.c:2119
 msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/gap/gap.c:2081
+#: src/applications/gap/gap.c:2120
 msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2082
+#: src/applications/gap/gap.c:2121
 msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/gap/gap.c:2083
+#: src/applications/gap/gap.c:2122
 msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2084
+#: src/applications/gap/gap.c:2123
 msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/gap/gap.c:2085
+#: src/applications/gap/gap.c:2124
 msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2086
+#: src/applications/gap/gap.c:2125
 msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2087
+#: src/applications/gap/gap.c:2126
 #, fuzzy
 msgid "# gap duplicate requests that were re-tried"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/gap/gap.c:2088
+#: src/applications/gap/gap.c:2127
 msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2089
+#: src/applications/gap/gap.c:2128
 msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/gap/gap.c:2090
+#: src/applications/gap/gap.c:2129
 msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/gap/gap.c:2091
+#: src/applications/gap/gap.c:2130
 msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/gap/gap.c:2092
+#: src/applications/gap/gap.c:2131
 msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/gap/gap.c:2093
+#: src/applications/gap/gap.c:2132
 msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2094
+#: src/applications/gap/gap.c:2133
 msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/gap/gap.c:2095
+#: src/applications/gap/gap.c:2134
 msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/gap/gap.c:2112
+#: src/applications/gap/gap.c:2150
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
@@ -1716,51 +1647,58 @@
 "Nạp dịch vụ truyền tải không thành công; lỗ hổng không thể chắc chắn khả "
 "năng truyền tải.\n"
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/gap/gap.c:2178
 #, fuzzy, c-format
 msgid "`%s' registering handlers %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d\n"
 
-#: src/applications/gap/pid_table.c:151
+#: src/applications/gap/pid_table.c:156
 msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/gap/pid_table.c:153
+#: src/applications/gap/pid_table.c:158
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/getoption/getoption.c:74
 #, fuzzy, c-format
 msgid "`%s' registering client handler %d\n"
 msgstr "'%s' đăng ký trình điều khiển máy khách %d\n"
 
-#: src/applications/getoption/getoption.c:82
+#: src/applications/getoption/getoption.c:84
 #, fuzzy
 msgid "allows clients to determine gnunetd's configuration"
 msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-#: src/applications/fs/tools/gnunet-insert.c:206
+#: src/applications/fs/tools/gnunet-pseudonym.c:71
+#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-search.c:129
+#: src/applications/fs/tools/gnunet-download.c:57
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt LEVEL (CẤPĐỘ) mong muốn của người gửi giấu tên"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:35
+#: src/applications/fs/tools/gnunet-pseudonym.c:74
 msgid "automate creation of a namespace by starting a collection"
 msgstr "tự động tạo một không gian tên bằng cách bắt đầu một thu thập"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
+#: src/applications/fs/tools/gnunet-pseudonym.c:78
 msgid "create a new pseudonym under the given NICKNAME"
 msgstr "tạo một tên hiệu mới dưới NICKNAME đưa ra"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
+#: src/applications/fs/tools/gnunet-pseudonym.c:81
 msgid "delete the pseudonym with the given NICKNAME"
 msgstr "xóa tên hiệu với TÊNNICK đưa ra"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
+#: src/applications/fs/tools/gnunet-pseudonym.c:84
 msgid "end automated building of a namespace (ends collection)"
 msgstr "kết thúc việc tự động xây dựng một không gian tên (kết thúc thu thập)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
+#: src/applications/fs/tools/gnunet-pseudonym.c:86
+#: src/applications/fs/tools/gnunet-search.c:132
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr "Tạo tên hiệu mới, xóa tên hiệu hoặc liệt kê các tên hiệu có."
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:89
 msgid ""
 "use the given keyword to advertise the namespace (use when creating a new "
 "pseudonym)"
@@ -1768,15 +1706,12 @@
 "sử dụng từ khóa đưa ra để quảng cáo không gian tên (dùng khi tạo một tên "
 "hiệu mới)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
-msgstr ""
-"cho biết rằng nội dung của không gian tên có dạng MIMETYPE (dùng khi tạo một "
-"tên hiệu mới)"
+#: src/applications/fs/tools/gnunet-pseudonym.c:92
+#, fuzzy
+msgid "specify metadata describing the namespace or collection"
+msgstr "kết thúc việc tự động xây dựng một không gian tên (kết thúc thu thập)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
+#: src/applications/fs/tools/gnunet-pseudonym.c:95
 msgid ""
 "do not generate an advertisement for this namespace (use when creating a new "
 "pseudonym)"
@@ -1784,237 +1719,156 @@
 "không tạo một quảng cáo cho không gian tên này (dùng khi tạo một tên hiệu "
 "mới)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
+#: src/applications/fs/tools/gnunet-pseudonym.c:98
 msgid "do not list the pseudonyms from the pseudonym database"
 msgstr "không liệt kê tên hiệu từ cơ sở dữ liệu tên hiệu"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
+#: src/applications/fs/tools/gnunet-pseudonym.c:101
 msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr ""
-"dùng NAME làm tên thật của điều khiển không gian tên của người dùng (dùng "
-"khi tạo một tên hiệu mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid ""
 "specify IDENTIFIER to be the address of the entrypoint to content in the "
 "namespace (use when creating a new pseudonym)"
 msgstr ""
 "dùng IDENTIFIER làm địa chỉ của điểm chỉ tới nội dung trong không gian tên "
 "(dùng khi tạo một tên hiệu mới)"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
+#: src/applications/fs/tools/gnunet-pseudonym.c:104
 msgid "set the rating of a namespace"
 msgstr "đặt xếp hạng của một không gian tên"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr ""
-"dùng DESCRIPTION để mô tả nội dung của không gian tên (dùng khi tạo một tên "
-"hiệu mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"dùng URI đưa ra làm địa chỉ chứa thêm thông tin về không gian tên (dùng khi "
-"tạo một tên hiệu mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr "Tạo tên hiệu mới, xóa tên hiệu hoặc liệt kê các tên hiệu có."
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-msgid "AND"
-msgstr "VÀ"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#: src/applications/fs/tools/gnunet-pseudonym.c:138
 #, fuzzy, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr "Tham số sai: '%s'\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
-#: src/setup/gnunet-setup.c:179
-msgid "Invalid arguments. Exiting.\n"
-msgstr "Tham số sai. Đang thoát.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, fuzzy, c-format
 msgid "Namespace `%s' has rating %d.\n"
 msgstr "Không gian tên '%s' có xếp hạng %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/fs/tools/gnunet-pseudonym.c:142
 #, fuzzy, c-format
 msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr "Không gian tên '%s' (%s) có xếp hạng %d.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#: src/applications/fs/tools/gnunet-pseudonym.c:178
 #, c-format
 msgid "\tRating (after update): %d\n"
 msgstr "\tXếp hạng (sau cập nhật): %d\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
 msgid "Collection stopped.\n"
 msgstr "Dừng thu thập.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#: src/applications/fs/tools/gnunet-pseudonym.c:223
 #, c-format
 msgid "Failed to stop collection (not active?).\n"
 msgstr "Dừng thu thập không thành công (không hoạt động?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#: src/applications/fs/tools/gnunet-pseudonym.c:231
 #, fuzzy, c-format
 msgid "Pseudonym `%s' deleted.\n"
 msgstr "Đã xóa tên hiệu '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#: src/applications/fs/tools/gnunet-pseudonym.c:235
 #, fuzzy, c-format
 msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr "Lỗi xóa tên hiệu '%s' (không tồn tại?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#: src/applications/fs/tools/gnunet-pseudonym.c:254
 #, fuzzy, c-format
 msgid "Started collection `%s'.\n"
 msgstr "Bắt đầu thu thập '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#: src/applications/fs/tools/gnunet-pseudonym.c:257
 #, c-format
 msgid "Failed to start collection.\n"
 msgstr "Bắt đầu thu thập không thành công.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#: src/applications/fs/tools/gnunet-pseudonym.c:299
 #, fuzzy, c-format
 msgid "Could not create namespace `%s' (exists?).\n"
 msgstr "Không tạo được không gian tên '%s' (đã có?).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#: src/applications/fs/tools/gnunet-pseudonym.c:304
 #, fuzzy, c-format
 msgid "Namespace `%s' created (root: %s).\n"
 msgstr "Đã tạo không gian tên '%s' (gốc: %s).\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#: src/applications/fs/tools/gnunet-pseudonym.c:326
 #, c-format
 msgid "Could not access namespace information.\n"
 msgstr "Không truy cập được thông tin của không gian tên.\n"
 
-#: src/applications/fs/tools/gnunet-delete.c:37
-#, c-format
-msgid "%8u of %8u bytes deleted."
-msgstr "Đã xóa %8u của %8u byte."
-
-#: src/applications/fs/tools/gnunet-delete.c:52
-msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-msgstr "chỉ ra tập tin để xóa khỏi GNUnet (bắt buộc, tập tin phải tồn tại)"
-
-#: src/applications/fs/tools/gnunet-delete.c:61
-msgid ""
-"Remove file from GNUnet.  The specified file is not removed\n"
-"from the filesystem but just from the local GNUnet datastore."
-msgstr ""
-"Xóa tập tin khỏi GNUnet.  Chưa xóa bỏ tập tin chỉ ra khỏi hệ\n"
-"thống tập tin nhưng đã xoá khỏi kho dữ liệu GNUnet nội bộ."
-
-#: src/applications/fs/tools/gnunet-delete.c:139
-msgid "You must specify a filename (option -f)\n"
-msgstr "Người dùng phải chỉ ra một tên tập tin (tùy chọn -f)\n"
-
-#: src/applications/fs/tools/gnunet-delete.c:151
-#, c-format
-msgid ""
-"Error deleting file %s.\n"
-"Probably a few blocks were already missing from the database.\n"
-msgstr ""
-"Lỗi xóa tập tin %s.\n"
-"Có thể đã mất vài khối trong cơ sở dữ liệu.\n"
-
-#: src/applications/fs/tools/gnunet-directory.c:76
+#: src/applications/fs/tools/gnunet-directory.c:83
 #, fuzzy, c-format
 msgid "==> Directory `%s':\n"
 msgstr "==> Thư mục '%s':\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:81
+#: src/applications/fs/tools/gnunet-directory.c:90
 #, c-format
 msgid "=\tError reading directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:111
+#: src/applications/fs/tools/gnunet-directory.c:124
 #, c-format
 msgid "File format error (not a GNUnet directory?)\n"
 msgstr "Lỗi định dạng tập tin (không phải một thư mục GNUnet?)\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:113
+#: src/applications/fs/tools/gnunet-directory.c:126
 #, c-format
 msgid "%d files found in directory.\n"
 msgstr "Tìm thấy %d tập tin trong thư mục.\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/fs/tools/gnunet-directory.c:141
+msgid "Perform directory related operations."
+msgstr "Thực hiện các thao tác có liên quan đến thư mục."
+
+#: src/applications/fs/tools/gnunet-directory.c:143
 msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr "xóa bỏ mọi mục từ cơ sở dữ liệu thư mục và dừng theo dấu vết các URI"
 
-#: src/applications/fs/tools/gnunet-directory.c:133
+#: src/applications/fs/tools/gnunet-directory.c:147
 msgid "list entries from the directory database"
 msgstr "liệt kê tất cả các mục từ cơ sở dữ liệu thư mục"
 
-#: src/applications/fs/tools/gnunet-directory.c:136
+#: src/applications/fs/tools/gnunet-directory.c:150
 msgid "start tracking entries for the directory database"
 msgstr "bắt đầu theo dõi các mục cho cơ sở dữ liệu thư mục"
 
-#: src/applications/fs/tools/gnunet-directory.c:140
-msgid "gnunet-directory [OPTIONS] [FILENAMES]"
-msgstr "gnunet-directory [TÙYCHỌN] [TÊNTẬPTIN]"
-
-#: src/applications/fs/tools/gnunet-directory.c:141
-msgid "Perform directory related operations."
-msgstr "Thực hiện các thao tác có liên quan đến thư mục."
-
-#: src/applications/fs/tools/gnunet-directory.c:206
+#: src/applications/fs/tools/gnunet-directory.c:181
 #, c-format
 msgid "Listed %d matching entries.\n"
 msgstr "Đã liệt kê %d mục tương ứng.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:110
+#: src/applications/fs/tools/gnunet-insert.c:139
 #, fuzzy, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
 msgstr "Đã tạo mục không gian tên '%s'\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:115
+#: src/applications/fs/tools/gnunet-insert.c:144
 #, fuzzy, c-format
 msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr "Không truy cập được không gian tên '%s' (đã có rồi?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/fs/tools/gnunet-insert.c:166
 #, fuzzy, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
+msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 msgstr "đã chèn %16llu từ %16llu byte (sẽ hoàn thành trong %llu%s giây)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:150
+#: src/applications/fs/tools/gnunet-insert.c:178
 #, fuzzy, c-format
 msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr "Hoàn thành tải lên '%s', %llu byte trong %llu giây (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:164
+#: src/applications/fs/tools/gnunet-insert.c:189
 #, fuzzy, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
-msgstr "Hoàn thành tải lên '%s', tốc độ trung bình hiện thời là %8.3f kbps.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:174
-#, fuzzy, c-format
 msgid "File `%s' has URI: %s\n"
 msgstr "Tập tin '%s' có URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:187
+#: src/applications/fs/tools/gnunet-insert.c:200
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Upload aborted.\n"
+msgstr "Dừng tải xuống."
+
+#: src/applications/fs/tools/gnunet-insert.c:206
 #, c-format
 msgid ""
 "\n"
@@ -2023,7 +1877,7 @@
 "\n"
 "Lỗi tải lên tập tin: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:209
+#: src/applications/fs/tools/gnunet-insert.c:228
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
@@ -2031,12 +1885,16 @@
 "thậm chí nếu gnunetd đang chạy trên máy nội bộ, bắt buộc tạo một bản sao "
 "thay vì tạo một liên kết đến thư mục chia sẻ của GNUnet"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/fs/tools/gnunet-insert.c:232
+msgid "disable adding the creation time to the metadata of the uploaded file"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:235
 msgid ""
 "use libextractor to add additional direct references to directory entries"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:214
+#: src/applications/fs/tools/gnunet-insert.c:238
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2044,14 +1902,18 @@
 "in ra danh sách của các từ khóa đã giải phóng cần sử dụng, nhưng không thực "
 "hiện tải lên"
 
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/fs/tools/gnunet-insert.c:240
+msgid "Make files available to GNUnet for sharing."
+msgstr "Cho phép GNUnet chia sẻ các tập tin."
+
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 "đặt khoảng thời gian cho cập nhật thành GIÂY (chỉ cho sự chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:221
+#: src/applications/fs/tools/gnunet-insert.c:247
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2059,7 +1921,7 @@
 "thêm một từ khóa phụ cho tập tin hoặc thư mục cao nhất (có thể chỉ ra tùy "
 "chọn này nhiều lần)"
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/fs/tools/gnunet-insert.c:251
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
@@ -2067,11 +1929,11 @@
 "thêm một từ khóa phụ cho tất cả tập tin và thư mục (có thể chỉ ra tùy chọn "
 "này nhiều lần)"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:256
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt dữ liệu meta cho TYPE đưa ra tới VALUE chỉ ra"
 
-#: src/applications/fs/tools/gnunet-insert.c:230
+#: src/applications/fs/tools/gnunet-insert.c:259
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2079,7 +1941,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/fs/tools/gnunet-insert.c:263
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2087,21 +1949,17 @@
 "chỉ ra ID của một phiên bản đã cập nhật để chia sẻ trong tương lai (chỉ cho "
 "sự chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:236
+#: src/applications/fs/tools/gnunet-insert.c:267
 msgid "specify the priority of the content"
 msgstr "chỉ ra ưu tiên của nội dung"
 
-#: src/applications/fs/tools/gnunet-insert.c:238
+#: src/applications/fs/tools/gnunet-insert.c:270
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "đưa ra dùng chung các tập tin dưới tên hiệu TÊN (đặt tập tin vào không gian "
 "tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:240
-msgid "process directories recursively"
-msgstr "tiến hành đệ qui trên các thư mục"
-
-#: src/applications/fs/tools/gnunet-insert.c:242
+#: src/applications/fs/tools/gnunet-insert.c:273
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
@@ -2109,163 +1967,113 @@
 "chỉ ra sự chia sẻ này không theo chu kỳ nhưng đã cập nhật (chỉ cho chèn "
 "không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:277
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr "đặt ID của phiên bản này của sự chia sẻ (chỉ cho chèn không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:248
+#: src/applications/fs/tools/gnunet-insert.c:281
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr "chỉ ra thời gian tạo SBlock (xem trang man để biết định dạng)"
 
-#: src/applications/fs/tools/gnunet-insert.c:250
+#: src/applications/fs/tools/gnunet-insert.c:284
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 "ID của phiên bản trước của nội dung (chỉ cho sự cập nhật không gian tên)"
 
-#: src/applications/fs/tools/gnunet-insert.c:257
-msgid "Make files available to GNUnet for sharing."
-msgstr "Cho phép GNUnet chia sẻ các tập tin."
-
-#: src/applications/fs/tools/gnunet-insert.c:344
+#: src/applications/fs/tools/gnunet-insert.c:326
 #, fuzzy, c-format
-msgid "You must pass a positive number to the `%s' option.\n"
-msgstr "Người dùng phải đưa một số dương vào tùy chọn '%s'.\n"
+msgid "You must specify one and only one filename for insertion.\n"
+msgstr "Người dùng phải chỉ ra một  và chỉ một tập tin để bỏ đánh chỉ mục.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:429
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:537
-#: src/applications/fs/tools/gnunet-unindex.c:145
-#, c-format
-msgid "You must specify a list of files to insert.\n"
-msgstr "Người dùng phải chỉ ra một danh sách tập tin để chèn.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:541
-#, c-format
-msgid "Only one file or directory can be specified at a time.\n"
-msgstr "Chỉ có thể đưa ra một tập tin hay thư mục mỗi lần.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:545
-#, c-format
-msgid "You must specify a file or directory to upload.\n"
-msgstr "Người dùng phải chỉ ra một tập tin hay thư mục để tải lên.\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:595
+#: src/applications/fs/tools/gnunet-insert.c:351
 #, fuzzy, c-format
 msgid "Keywords for file `%s':\n"
 msgstr "Từ khóa cho tập tin '%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:617
+#: src/applications/fs/tools/gnunet-insert.c:378
 #, fuzzy, c-format
 msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr "Không truy cập được không gian tên '%s' (đã có rồi?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:636
+#: src/applications/fs/tools/gnunet-insert.c:394
 #, fuzzy, c-format
 msgid "Parsing time failed. Use `%s' format.\n"
 msgstr "Phân tích thời gian thất bại. Hãy dùng định dạng '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:649
-#: src/applications/fs/tools/gnunet-insert.c:653
-#: src/applications/fs/tools/gnunet-insert.c:657
-#: src/applications/fs/tools/gnunet-insert.c:661
-#: src/applications/fs/tools/gnunet-insert.c:666
+#: src/applications/fs/tools/gnunet-insert.c:407
+#: src/applications/fs/tools/gnunet-insert.c:412
+#: src/applications/fs/tools/gnunet-insert.c:417
+#: src/applications/fs/tools/gnunet-insert.c:422
+#: src/applications/fs/tools/gnunet-insert.c:427
 #, fuzzy, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:108
-#: src/applications/fs/tools/gnunet-download.c:42
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "đặt CẤPĐỘ mong muốn của người nhận giấu tên"
-
-#: src/applications/fs/tools/gnunet-search.c:114
+#: src/applications/fs/tools/gnunet-search.c:136
 msgid "exit after receiving LIMIT results"
 msgstr "thoát sau khi nhận được kết quả GIỚIHẠN"
 
-#: src/applications/fs/tools/gnunet-search.c:116
+#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-download.c:64
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "ghi kết quả tìm kiếm tìm thấy (đã giải mã) vào tập tin FILENAME"
 
-#: src/applications/fs/tools/gnunet-search.c:118
-msgid "wait TIMEOUT seconds for search results before aborting"
+#: src/applications/fs/tools/gnunet-search.c:142
+#, fuzzy
+msgid "wait DELAY seconds for search results before aborting"
 msgstr "chờ kết quả tìm kiếm TIMEOUT giây trước khi thoát"
 
-#: src/applications/fs/tools/gnunet-search.c:123
-msgid "Search GNUnet for files."
-msgstr "Tìm kiếm tập tin trong GNUnet."
-
-#: src/applications/fs/tools/gnunet-search.c:227
-msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr "Không đủ tham số. Người dùng phải chỉ ra một từ khóa hoặc một tên.\n"
-
-#: src/applications/fs/tools/gnunet-search.c:278
+#: src/applications/fs/tools/gnunet-search.c:189
 #, c-format
 msgid "Starting search failed. Consult logs.\n"
 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/tools/gnunet-search.c:353
+#: src/applications/fs/tools/gnunet-search.c:277
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "Lỗi chuyển đổi tham số tới URI!\n"
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
-msgstr "CẤPĐỘ"
+#: src/applications/fs/tools/gnunet-download.c:60
+msgid "Download files from GNUnet."
+msgstr "Tải tập tin từ GNUnet."
 
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
-msgstr "TÊNTẬPTIN"
-
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
-msgstr "ghi tập tin vào TÊNTẬPTIN"
-
-#: src/applications/fs/tools/gnunet-download.c:50
+#: src/applications/fs/tools/gnunet-download.c:67
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
-msgstr "Tải tập tin từ GNUnet."
-
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr "Không đủ tham số. Người dùng phải chỉ ra một URI tập tin của GNUnet\n"
-
-#: src/applications/fs/tools/gnunet-download.c:159
+#: src/applications/fs/tools/gnunet-download.c:86
 #, fuzzy, c-format
 msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr "Tải xuống tập tin '%s' tại %16llu vượt quá %16llu byte (%8.3f kbps)\n"
 
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
+#: src/applications/fs/tools/gnunet-download.c:99
+#: src/applications/fs/tools/gnunet-download.c:110
 #, c-format
 msgid "Error downloading: %s\n"
 msgstr "Lỗi tải xuống: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:191
+#: src/applications/fs/tools/gnunet-download.c:118
 #, fuzzy, c-format
 msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 "Hoàn thành tải xuống tập tin '%s'.  Tốc độ là %8.3f kilô byte một giây.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:237
+#: src/applications/fs/tools/gnunet-download.c:175
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr "Không đủ tham số. Người dùng phải chỉ ra một URI tập tin của GNUnet\n"
+
+#: src/applications/fs/tools/gnunet-download.c:195
 #, fuzzy, c-format
 msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr "Sai URI '%s' cho gnunet-download.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:288
+#: src/applications/fs/tools/gnunet-download.c:244
 #, fuzzy, c-format
 msgid "File stored as `%s'.\n"
 msgstr "Tập tin chứa với tên '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:50
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
@@ -2274,7 +2082,7 @@
 "Đã bỏ chỉ mục %16llu từ %16llu byte (sẽ hoàn thành sau %llu "
 "giây)                "
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2283,7 +2091,7 @@
 "\n"
 "Hoàn thành bỏ chỉ mục của '%s', %llu byte sau %llu giây (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/fs/tools/gnunet-unindex.c:83
 #, c-format
 msgid ""
 "\n"
@@ -2292,26 +2100,26 @@
 "\n"
 "Lỗi bỏ đánh chỉ mục tập tin: %s\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:97
+#: src/applications/fs/tools/gnunet-unindex.c:100
 msgid "Unindex files."
 msgstr "Tập tin đã bỏ đánh chỉ mục."
 
-#: src/applications/fs/tools/gnunet-unindex.c:149
-#, c-format
-msgid "You must specify one and only one file to unindex.\n"
-msgstr "Người dùng phải chỉ ra một  và chỉ một tập tin để bỏ đánh chỉ mục.\n"
+#: src/applications/fs/tools/gnunet-unindex.c:145
+#, fuzzy
+msgid "Not enough arguments. You must specify a filename.\n"
+msgstr "Không đủ tham số. Người dùng phải chỉ ra một URI tập tin của GNUnet\n"
 
-#: src/applications/fs/tools/gnunet-unindex.c:190
+#: src/applications/fs/tools/gnunet-unindex.c:173
 #, fuzzy, c-format
 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:305
+#: src/applications/fs/module/ondemand.c:317
 #, 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:393
+#: src/applications/fs/module/ondemand.c:411
 #, fuzzy, c-format
 msgid ""
 "Because the file `%s' has been unavailable for 3 days it got removed from "
@@ -2322,7 +2130,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:419
+#: src/applications/fs/module/ondemand.c:438
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify directory for storage of FS data in section `"
@@ -2331,13 +2139,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:617
+#: src/applications/fs/module/ondemand.c:655
 #, 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:1184
+#: src/applications/fs/module/fs.c:1196
 #, fuzzy, c-format
 msgid ""
 "You must specify a postive number for `%s' in the configuration in section `%"
@@ -2345,114 +2153,92 @@
 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:1233
+#: src/applications/fs/module/fs.c:1247
 #, 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:1270
+#: src/applications/fs/module/fs.c:1287
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:224
+#: src/applications/fs/module/migration.c:228
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:225
+#: src/applications/fs/module/migration.c:229
 msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
-msgstr ""
-"Đã thay đổi khoảng thời gian giữa các lần đưa ra chia sẻ cho chia sẻ định kỳ."
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: 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/namespace_info.c:604
-msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
-msgstr ""
-"Đang đưa ra các cập nhật cho nội dung cập nhật thường xuyên trước một tuần "
-"so với lịch.\n"
-
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr "Tìm kiếm này đang chờ đợi!\n"
-
-#: src/applications/fs/fsui/fsui.c:189
+#: src/applications/fs/fsui/fsui.c:195
 msgid "FSUI persistence: error restoring download\n"
 msgstr "FSUI: lỗi phục hồi tải xuống\n"
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/fs/fsui/fsui.c:666
 #, fuzzy, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr "Tập tin trạng thái FSUI '%s' có lỗi cú pháp tại vùng %u.\n"
 
-#: src/applications/fs/fsui/download.c:290
+#: src/applications/fs/fsui/download.c:305
 msgid "Download aborted."
 msgstr "Dừng tải xuống."
 
-#: src/applications/fs/fsui/download.c:294
+#: src/applications/fs/fsui/download.c:309
 msgid "ECRS download failed (see logs)."
 msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
 
-#: src/applications/fs/fsui/download.c:298
+#: src/applications/fs/fsui/download.c:313
 #, fuzzy
 msgid "ECRS download suspending."
 msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
 
-#: src/applications/fs/fsui/download.c:302
+#: src/applications/fs/fsui/download.c:317
 msgid "Unexpected download state."
 msgstr ""
 
-#: src/applications/fs/fsui/unindex.c:85
+#: src/applications/fs/fsui/unindex.c:80
 #, fuzzy
 msgid "Unindex failed."
 msgstr "Bỏ đánh chỉ mục thất bại.\n"
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
-msgstr "Chưa chỉ ra từ khóa!\n"
-
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
+#: src/applications/fs/fsui/upload.c:229 src/applications/fs/fsui/upload.c:374
+#: src/applications/fs/fsui/upload.c:413
 #, fuzzy
 msgid "Upload failed."
 msgstr "Tải lên thất bại.\n"
 
-#: src/applications/fs/fsui/upload.c:455
+#: src/applications/fs/fsui/upload.c:420
 #, fuzzy
 msgid "Cannot upload directory without using recursion."
 msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr "Tắt bỏ thu thập tên tập tin.\n"
-
-#: src/applications/fs/fsui/file_info.c:282
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr ""
-
-#: src/applications/fs/ecrs/search.c:160
+#: 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"
 
-#: src/applications/fs/ecrs/search.c:216
+#: src/applications/fs/ecrs/search.c:226
 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:125
+#: src/applications/fs/ecrs/download.c:128
 #, 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:257
+#: src/applications/fs/ecrs/download.c:263
 #, 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:935
+#: src/applications/fs/ecrs/download.c:972
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2460,162 +2246,147 @@
 "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:1112
+#: src/applications/fs/ecrs/download.c:1153
 #, 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:180
+#: src/applications/fs/ecrs/upload.c:170
 #, 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:186
+#: src/applications/fs/ecrs/upload.c:180
 #, 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:193
+#: src/applications/fs/ecrs/upload.c:188
 #, 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:203
+#: src/applications/fs/ecrs/upload.c:200
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Không hash được '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/fs/ecrs/upload.c:219
 #, 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:227
+#: src/applications/fs/ecrs/upload.c:226
 #, 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:306
+#: src/applications/fs/ecrs/upload.c:312
 #, 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:842
+#: src/applications/fs/ecrs/meta.c:847
 #, 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:850
+#: src/applications/fs/ecrs/meta.c:855
 #, 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"
 
-#: src/applications/fs/ecrs/namespace.c:45
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
-msgstr ""
-"Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-peer "
-"dưới %s%s.\n"
-
-#: src/applications/fs/ecrs/namespace.c:133
+#: src/applications/fs/ecrs/namespace.c:153
 #, fuzzy, c-format
 msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr "Không tạo được tên hiệu '%s', tập tin '%s' tồn tại.\n"
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/fs/ecrs/namespace.c:338
+#: src/applications/fs/ecrs/namespace.c:419
+#: src/applications/fs/ecrs/namespace.c:573
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Tập tin '%s' không chứa một tên hiệu.\n"
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/fs/ecrs/namespace.c:350
+#: src/applications/fs/ecrs/namespace.c:430
 #, fuzzy, c-format
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Định dạng của tên hiệu '%s' sai.\n"
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/fs/ecrs/namespace.c:587
+#: src/applications/fs/ecrs/namespace.c:598
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Định dạng của tập tin '%s' sai.\n"
 
-#: src/applications/topology_f2f/topology.c:323
-#, fuzzy, c-format
+#: src/applications/fs/ecrs/helper.c:67
+msgid "No keywords specified!\n"
+msgstr "Chưa chỉ ra từ khóa!\n"
+
+#: src/applications/fs/ecrs/parser.c:122
+#, c-format
 msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
-msgstr "Cần có danh sách bạn bè dưới '%s' của phần '%s' trong cấu hình.\n"
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
+msgstr ""
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/applications/fs/uritrack/file_info.c:123
+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:355
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
+msgstr ""
+
+#: src/applications/fs/namespace/namespace_info.c:654
+msgid "Publication interval for periodic publication changed."
+msgstr ""
+"Đã thay đổi khoảng thời gian giữa các lần đưa ra chia sẻ cho chia sẻ định kỳ."
+
+#: src/applications/fs/namespace/namespace_info.c:675
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
+msgstr ""
+"Đang đưa ra các cập nhật cho nội dung cập nhật thường xuyên trước một tuần "
+"so với lịch.\n"
+
+#: src/applications/topology_f2f/topology.c:354
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
 
-#: src/applications/topology_f2f/topology.c:358
+#: src/applications/topology_f2f/topology.c:371
 msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, bỏ qua byte.\n"
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/applications/topology_f2f/topology.c:384
 #, fuzzy, c-format
 msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình, bỏ qua các byte '%s'.\n"
 
-#: src/applications/template/template.c:61
+#: src/applications/template/template.c:62
 #, fuzzy, c-format
 msgid "`%s' registering client handler %d and %d\n"
 msgstr "'%s' đang đăng ký trình điều khiển máy khách %d và %d\n"
 
-#: src/applications/template/gnunet-template.c:70
-#: src/applications/vpn/gnunet-vpn.c:72
-msgid "helptext for -t"
-msgstr "trợ giúp cho -t"
+#: src/applications/template/gnunet-template.c:44
+msgid "Template description."
+msgstr ""
 
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
-msgstr "Biểu mẫu cho gnunet-clients."
-
-#: src/applications/bootstrap_http/http.c:109
-#, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-msgstr "Cổng sai \"%s\" nằm trong xác định danh sách máy, đang thử cổng %d.\n"
-
-#: src/applications/bootstrap_http/http.c:120
+#: src/applications/bootstrap_http/http.c:92
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "'%s' thất bại tại %s:%d với lỗi: '%s'.\n"
+msgid "Bootstrap data obtained from `%s' is invalid.\n"
+msgstr "Định dạng của tên hiệu '%s' sai.\n"
 
-#: src/applications/bootstrap_http/http.c:132
-#, fuzzy, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+#: src/applications/bootstrap_http/http.c:144
+msgid "No hostlist URL specified in configuration, will not bootstrap.\n"
 msgstr ""
-"Không tải xuống được danh sách liên hệ các đầu peer, máy '%s' không rõ.\n"
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
-#, fuzzy, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "'%s' tới '%s' thất bại tại %s:%d với lỗi: %s\n"
-
-#: src/applications/bootstrap_http/http.c:217
-#, fuzzy, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "Phân tích câu trả lời HTTP cho URL '%s' không thành công.\n"
-
-#: src/applications/bootstrap_http/http.c:252
-#, fuzzy, c-format
-msgid "Parsing hello from `%s' failed.\n"
-msgstr "Phân tích HELO từ '%s' không thành công.\n"
-
-#: src/applications/bootstrap_http/http.c:330
-#, fuzzy, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
-msgstr "Không tìm thấy tên của HTTP proxy '%s'. Đang thử không dùng proxy.\n"
-
-#: src/applications/bootstrap_http/http.c:355
+#: src/applications/bootstrap_http/http.c:229
 #, fuzzy
 msgid "# hellos downloaded via http"
 msgstr "# đã tải xuống HELO qua http"
@@ -2630,419 +2401,360 @@
 msgid "# bytes received of type %d"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/applications/traffic/traffic.c:605
+#: src/applications/traffic/traffic.c:609
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
-msgstr "Lỗi khi hỏi gnunetd về các điều khoản truyền tải.\n"
-
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr "Không nhận được câu trả lời từ gnunetd về các điều khoản truyền tải.\n"
-
-#: src/applications/kvstore_sqlite/kv_sqlite.c:181
-#, fuzzy, c-format
-msgid ""
-"Configuration file must specify directory for storing data in section `%s' "
-"under `%s'.\n"
+#: src/applications/vpn/gnunet-vpn.c:98
+msgid "Suppress display of asynchronous log messages"
 msgstr ""
-"Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần '%s' dưới "
-"'%s'.\n"
 
-#: src/applications/kvstore_sqlite/kv_sqlite.c:264
-#, fuzzy
-msgid "Unable to initialize SQLite KVStore.\n"
-msgstr "Không chạy được SQLite.\n"
-
-#: src/applications/vpn/gnunet-vpn.c:77
+#: src/applications/vpn/gnunet-vpn.c:103
 msgid "VPN over GNUnet."
 msgstr ""
 
-#: src/applications/vpn/vpn.c:315
+#: src/applications/vpn/vpn.c:351
 #, c-format
 msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:323
+#: src/applications/vpn/vpn.c:359
 #, c-format
 msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:351
+#: src/applications/vpn/vpn.c:387
 #, c-format
 msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:400
+#: src/applications/vpn/vpn.c:436
 #, c-format
 msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:404
+#: src/applications/vpn/vpn.c:440
 #, c-format
 msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:414
+#: src/applications/vpn/vpn.c:450
 #, c-format
 msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:474
+#: src/applications/vpn/vpn.c:510
 #, c-format
 msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:478
+#: src/applications/vpn/vpn.c:514
 #, c-format
 msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:505
+#: src/applications/vpn/vpn.c:541
 #, c-format
 msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:513
+#: src/applications/vpn/vpn.c:549
 #, c-format
 msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:517
+#: src/applications/vpn/vpn.c:553
 #, c-format
 msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:555
+#: src/applications/vpn/vpn.c:591
 #, c-format
 msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:559
+#: src/applications/vpn/vpn.c:595
 #, c-format
 msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:566
+#: src/applications/vpn/vpn.c:602
 #, c-format
 msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:571
+#: src/applications/vpn/vpn.c:607
 #, c-format
 msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:579
+#: src/applications/vpn/vpn.c:615
 #, c-format
 msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:591
+#: src/applications/vpn/vpn.c:627
 #, fuzzy, c-format
 msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
-#: src/applications/vpn/vpn.c:602
+#: src/applications/vpn/vpn.c:638
 #, c-format
 msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:614
+#: src/applications/vpn/vpn.c:650
 #, fuzzy, c-format
 msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
-#: src/applications/vpn/vpn.c:646
+#: src/applications/vpn/vpn.c:683
 msgid ""
 "RFC4193 We have run out of memory and so I can't store a tunnel for this "
 "peer.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:692
+#: src/applications/vpn/vpn.c:729
 #, c-format
 msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:754
+#: src/applications/vpn/vpn.c:788
 #, c-format
-msgid "RFC4193 --- whitelist of peer %x\n"
+msgid "VPN dropping connection %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:772
+#: src/applications/vpn/vpn.c:792
+#, c-format
+msgid "VPN cannot drop connection %x\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:810
 msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:812
+#: src/applications/vpn/vpn.c:850
 msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:816
+#: src/applications/vpn/vpn.c:854
 msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:822
+#: src/applications/vpn/vpn.c:860
 msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:825
+#: src/applications/vpn/vpn.c:863
 #, fuzzy, c-format
 msgid "VPN Received unknown IP version %d...\n"
 msgstr "Nhận được thông báo testbed không rõ dạng %u.\n"
 
-#: src/applications/vpn/vpn.c:835
+#: src/applications/vpn/vpn.c:873
 #, c-format
 msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:854
+#: src/applications/vpn/vpn.c:892
 msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:869
-#, c-format
-msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
-msgstr ""
-
-#: src/applications/vpn/vpn.c:885
+#: src/applications/vpn/vpn.c:913
 msgid "Receive route request\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:890
+#: src/applications/vpn/vpn.c:918
 #, c-format
 msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:901
+#: src/applications/vpn/vpn.c:929
 #, c-format
 msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:907
+#: src/applications/vpn/vpn.c:935
 #, c-format
 msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:923
+#: src/applications/vpn/vpn.c:951
 msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:927
+#: src/applications/vpn/vpn.c:955
 msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:931
+#: src/applications/vpn/vpn.c:959
 #, c-format
 msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:945
+#: src/applications/vpn/vpn.c:973
 #, c-format
 msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:960
+#: src/applications/vpn/vpn.c:988
 #, c-format
 msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:998
+#: src/applications/vpn/vpn.c:1016
 msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1013
+#: src/applications/vpn/vpn.c:1031
 msgid "realise add routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1058
+#: src/applications/vpn/vpn.c:1076
 msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1104
+#: src/applications/vpn/vpn.c:1122
 msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1148
+msgid "Cannot store client info\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1208
 msgid "Yes"
 msgstr "Có"
 
-#: src/applications/vpn/vpn.c:1161
+#: src/applications/vpn/vpn.c:1208
 msgid "No"
 msgstr "Không"
 
-#: src/applications/vpn/vpn.c:1324
+#: src/applications/vpn/vpn.c:1385
 #, fuzzy, c-format
 msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d và %d\n"
 
-#: src/applications/vpn/vpn.c:1325
+#: src/applications/vpn/vpn.c:1386
 #, c-format
 msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1361
+#: src/applications/vpn/vpn.c:1434
 msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1383
+#: src/applications/vpn/vpn.c:1466
 msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1394
+#: src/applications/vpn/vpn.c:1477
 msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/vpn/vpn.c:1405
+#: src/applications/vpn/vpn.c:1490
 #, c-format
 msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/state/state.c:85
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
-msgstr ""
-"Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-peer "
-"dưới %s\\%s.\n"
+#: src/server/gnunet-update.c:142
+#, fuzzy, c-format
+msgid "Updating data for module `%s'\n"
+msgstr "Đang cập nhật dữ liệu cho môđun '%s'\n"
 
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
-msgstr "in một giá trị từ tập tin cấu hình ra stdout"
+#: src/server/gnunet-update.c:147
+#, fuzzy, c-format
+msgid "Failed to update data for module `%s'\n"
+msgstr "Cập nhật dữ liệu cho môđun '%s' không thành công\n"
 
-#: src/server/gnunet-update.c:55 src/server/startup.c:450
-#: src/server/gnunet-transport-check.c:407
+#: src/server/gnunet-update.c:218 src/server/gnunet-transport-check.c:354
+msgid "ping peers from HOSTLISTURL that match transports"
+msgstr "ping các đầu peer từ HOSTLISTURL tương ứng với truyền tải"
+
+#: src/server/gnunet-update.c:220
+msgid "Updates GNUnet datastructures after version change."
+msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
+
+#: src/server/gnunet-update.c:224 src/server/gnunet-transport-check.c:369
 msgid "run as user LOGIN"
 msgstr "chạy dưới người dùng LOGIN"
 
-#: src/server/gnunet-update.c:58
+#: src/server/gnunet-update.c:227
 #, fuzzy
 msgid "run in client mode (for getting client configuration values)"
 msgstr "chạy trong chế độ người dùng (để lấy giá trị cấu hình của người dùng)"
 
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
-
-#: src/server/gnunet-update.c:147
+#: src/server/connection.c:992
 #, fuzzy, c-format
-msgid "Option `%s' makes no sense without option `%s'."
-msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'."
-
-#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
-#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Tham số sai: "
-
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
-msgstr ""
-"\n"
-"Đang thoát.\n"
-
-#: src/server/gnunet-update.c:232 src/server/core.c:476
-msgid "No applications defined in configuration!\n"
-msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
-
-#: src/server/gnunet-update.c:249
-#, fuzzy, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Đang cập nhật dữ liệu cho môđun '%s'\n"
-
-#: src/server/gnunet-update.c:253
-#, fuzzy, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Cập nhật dữ liệu cho môđun '%s' không thành công\n"
-
-#: src/server/gnunet-update.c:309
-#, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Cập nhật dữ liệu cho %d ứng dụng.\n"
-
-#: src/server/connection.c:983
-#, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "'%s' đã chọn %d vượt quá %d thông báo (MTU: %d).\n"
 
-#: src/server/connection.c:990
+#: src/server/connection.c:999
 #, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
 
-#: src/server/connection.c:2254
+#: src/server/connection.c:2283
 #, 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:2325
+#: src/server/connection.c:2355
 #, 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:2340
+#: src/server/connection.c:2370
 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:2708
+#: src/server/connection.c:2774
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:2712
+#: src/server/connection.c:2778
 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:2714
+#: src/server/connection.c:2780
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/server/connection.c:2717
+#: src/server/connection.c:2783
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2721
+#: src/server/connection.c:2787
 #, fuzzy
 msgid "# bytes transmitted"
 msgstr "# byte đã truyền của dạng %d"
 
-#: src/server/connection.c:2725
+#: src/server/connection.c:2791
 #, fuzzy
 msgid "# bytes received"
 msgstr "# byte nhận được qua TCP"
 
-#: src/server/connection.c:2727
+#: src/server/connection.c:2793
 #, fuzzy
 msgid "# bytes decrypted"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/server/connection.c:2728
+#: src/server/connection.c:2794
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/server/startup.c:196
+#: src/server/gnunetd.c:78
 #, fuzzy, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr "Yêu cầu '%s' nhận được từ máy khác là hỏng.\n"
+msgid "`%s' startup complete.\n"
+msgstr "'%s' khởi động thành công.\n"
 
-#: src/server/startup.c:324
+#: src/server/gnunetd.c:83
 #, fuzzy, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
-msgstr ""
-"Người dùng phải chỉ ra một tên cho tập tin PID trong phần '%s' dưới '%s'.\n"
+msgid "`%s' is shutting down.\n"
+msgstr "'%s' đang tắt.\n"
 
-#: src/server/startup.c:339
-#, fuzzy, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
-
-#: src/server/startup.c:443
+#: src/server/gnunetd.c:160
 msgid ""
 "run in debug mode; gnunetd will not daemonize and error messages will be "
 "written to stderr instead of a logfile"
@@ -3050,142 +2762,105 @@
 "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/startup.c:456
+#: src/server/gnunetd.c:164
 msgid "Starts the gnunetd daemon."
 msgstr "Chạy daemon gnunetd."
 
-#: src/server/startup.c:470
-#, fuzzy, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr "Người dùng '%s' không rõ, không thay đổi được UID thành nó."
+#: src/server/gnunetd.c:168
+msgid "disable padding with random data (experimental)"
+msgstr ""
 
-#: src/server/startup.c:479
-#, fuzzy, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Không thay đổi được người dùng/nhóm thành '%s': %s"
+#: src/server/gnunetd.c:172
+#, fuzzy
+msgid "specify username as which gnunetd should run"
+msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
-msgstr "Sai tham số dòng lệnh:\n"
-
-#: src/server/startup.c:583
+#: src/server/gnunetd.c:228
 #, fuzzy, c-format
-msgid "Argument %d: `%s'\n"
-msgstr "Tham số %d: '%s'\n"
-
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
-msgstr "Sai tham số dòng lệnh.\n"
-
-#: src/server/gnunetd.c:76
-#, fuzzy, c-format
 msgid "Configuration or GNUnet version changed.  You need to run `%s'!\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/server/gnunetd.c:84
+#: src/server/core.c:124
 #, fuzzy, c-format
-msgid "`%s' starting\n"
-msgstr "'%s' đang khởi động\n"
-
-#: src/server/gnunetd.c:106
-#, fuzzy, c-format
-msgid "`%s' startup complete.\n"
-msgstr "'%s' khởi động thành công.\n"
-
-#: src/server/gnunetd.c:111
-#, fuzzy, c-format
-msgid "`%s' is shutting down.\n"
-msgstr "'%s' đang tắt.\n"
-
-#: src/server/core.c:115
-#, fuzzy, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr "Đã chạy môđun ứng dụng '%s'!\n"
 
-#: src/server/core.c:168
+#: src/server/core.c:174
 #, fuzzy, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr "Nạp plugin '%s' không thành công tại %s: %d.  Đang bỏ nạp plugin.\n"
 
-#: src/server/core.c:215
+#: src/server/core.c:217
 #, fuzzy, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr "Không tắt được '%s': chưa nạp ứng dụng\n"
 
-#: src/server/core.c:222
+#: src/server/core.c:225
 #, fuzzy, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr "Không tắt được ứng dụng '%s': chưa chạy\n"
 
-#: src/server/core.c:231 src/server/core.c:420
+#: src/server/core.c:235
 #, fuzzy, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr "Không tìm thấy phương pháp '%s%s' trong thư viện '%s'.\n"
 
-#: src/server/core.c:398
+#: src/server/core.c:374
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr "Không phát hành được %p: chưa nạp dịch vụ\n"
 
-#: src/server/core.c:499
+#: src/server/core.c:470
 #, fuzzy, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr "Không chạy được ứng dụng '%s'\n"
-
-#: src/server/core.c:516
-#, fuzzy, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "Không tắt đúng được ứng dụng '%s'.\n"
 
-#: src/server/core.c:575
-msgid "FATAL: Identity plugin not found!\n"
-msgstr "LỖI NẶNG: Không tìm thấy plugin đồng nhất!\n"
-
-#: src/server/core.c:633
+#: src/server/core.c:594
 #, 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"
 
-#: src/server/gnunet-transport-check.c:109
+#: src/server/gnunet-transport-check.c:115
 #, fuzzy, c-format
 msgid "`%s': Could not create hello.\n"
 msgstr "'%s': Không tạo được HELO.\n"
 
-#: src/server/gnunet-transport-check.c:118
+#: src/server/gnunet-transport-check.c:124
 #, fuzzy, c-format
 msgid "`%s': Could not connect.\n"
 msgstr "'%s': Không kết nối được.\n"
 
-#: src/server/gnunet-transport-check.c:148
+#: src/server/gnunet-transport-check.c:158
 #, fuzzy, c-format
 msgid "`%s': Could not send.\n"
 msgstr "'%s': Không gửi được.\n"
 
-#: src/server/gnunet-transport-check.c:168
+#: src/server/gnunet-transport-check.c:180
 #, fuzzy, c-format
 msgid "`%s': Did not receive message within %llu ms.\n"
 msgstr "'%s': Không nhận được thông báo trong %llu mili giây.\n"
 
-#: src/server/gnunet-transport-check.c:182
+#: src/server/gnunet-transport-check.c:194
 #, fuzzy, c-format
 msgid "`%s': Could not disconnect.\n"
 msgstr "'%s': Không ngắt kết nối được.\n"
 
-#: src/server/gnunet-transport-check.c:189
+#: src/server/gnunet-transport-check.c:201
 #, fuzzy, c-format
 msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
+"`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+"each.\n"
 msgstr ""
 "'%s' truyền tải OK.  Cần %umiligiây để truyền đi %d thông báo với %d byte "
 "mỗi cái.\n"
 
-#: src/server/gnunet-transport-check.c:219
+#: src/server/gnunet-transport-check.c:229
 #, fuzzy, c-format
 msgid " Transport %d is not being tested\n"
 msgstr " Giao thông %d là không thể\n"
 
-#: src/server/gnunet-transport-check.c:230
+#: src/server/gnunet-transport-check.c:245
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -3194,73 +2869,73 @@
 "\n"
 "Đang liên hệ '%s'."
 
-#: src/server/gnunet-transport-check.c:253
+#: src/server/gnunet-transport-check.c:266
 #, c-format
 msgid " Connection failed\n"
 msgstr " Kết nối không thành công\n"
 
-#: src/server/gnunet-transport-check.c:259
+#: src/server/gnunet-transport-check.c:272
 #, c-format
 msgid " Connection failed (bug?)\n"
 msgstr " Kết nối thất bại (lỗi bug?)\n"
 
-#: src/server/gnunet-transport-check.c:320
+#: src/server/gnunet-transport-check.c:324
 #, c-format
 msgid "No reply received within %llums.\n"
 msgstr "Không nhận được trả lời trong %llu miligiây.\n"
 
-#: src/server/gnunet-transport-check.c:396
-msgid "ping peers from HOSTLISTURL that match transports"
-msgstr "ping các đầu peer từ HOSTLISTURL tương ứng với truyền tải"
+#: src/server/gnunet-transport-check.c:350
+msgid "Tool to test if GNUnet transport services are operational."
+msgstr ""
+"Công cụ để thử nghiệm xem dịch vụ truyền tải GNUnet có hoạt động không."
 
-#: src/server/gnunet-transport-check.c:398
+#: src/server/gnunet-transport-check.c:357
 msgid "send COUNT messages"
 msgstr "gửi COUNT thông báo"
 
-#: src/server/gnunet-transport-check.c:400
+#: src/server/gnunet-transport-check.c:360
 msgid "send messages with SIZE bytes payload"
 msgstr "gửi các thông báo với SIZE byte nạp trả"
 
-#: src/server/gnunet-transport-check.c:402
+#: src/server/gnunet-transport-check.c:363
 msgid "specifies which TRANSPORT should be tested"
 msgstr "chỉ ra TRANSPORT cần được thử nghiệm"
 
-#: src/server/gnunet-transport-check.c:404
+#: src/server/gnunet-transport-check.c:366
 msgid "specifies after how many MS to time-out"
 msgstr "chỉ ra hết thời gian chờ sau bao nhiên MS"
 
-#: src/server/gnunet-transport-check.c:414
-msgid "Tool to test if GNUnet transport services are operational."
+#: src/server/gnunet-transport-check.c:374
+msgid "repeat each test X times"
 msgstr ""
-"Công cụ để thử nghiệm xem dịch vụ truyền tải GNUnet có hoạt động không."
 
-#: src/server/gnunet-transport-check.c:565
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr ""
-"Người dùng phải chỉ ra một bộ không rỗng của truyền tải để thử nghiệm!\n"
-
-#: src/server/gnunet-transport-check.c:570
+#: src/server/gnunet-transport-check.c:455
 #, c-format
 msgid "Testing transport(s) %s\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/server/gnunet-transport-check.c:573
+#: src/server/gnunet-transport-check.c:458
 #, c-format
 msgid "Available transport(s): %s\n"
 msgstr "(Các) truyền tải có: %s\n"
 
-#: src/server/gnunet-transport-check.c:617
+#: src/server/gnunet-transport-check.c:518
 #, c-format
 msgid ""
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr "đã kết nối thành công %d từ %d đầu peer (có %d lần truyền tải).\n"
 
-#: src/server/tcpserver.c:422
+#: src/server/tcpserver.c:102
 #, fuzzy, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+msgid "The `%s' request received from client is malformed.\n"
+msgstr "Yêu cầu '%s' nhận được từ máy khác là hỏng.\n"
+
+#: src/server/tcpserver.c:316
+#, fuzzy, c-format
+msgid "`%s' failed for port %d. Is gnunetd already running?\n"
 msgstr "'%s' thất bại cho cổng %d: %s. Sẽ thử lại trong %d giây.\n"
 
-#: src/server/tcpserver.c:688
+#: src/server/tcpserver.c:384
 #, fuzzy, c-format
 msgid ""
 "Malformed network specification in the configuration in section `%s' for "
@@ -3268,31 +2943,36 @@
 msgstr ""
 "Sự xác định mạng không đúng trong phần '%s' của cấu hình cho mục '%s': %s\n"
 
-#: src/server/tcpserver.c:798
+#: src/server/tcpserver.c:437
 #, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%s thất bại, dạng thông báo %d đã sử dụng.\n"
 
-#: src/server/handler.c:367
+#: src/server/handler.c:377
 #, fuzzy, c-format
 msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr "Nhận được thông báo không đúng từ đầu peer '%s' trong '%s': %d.\n"
 
-#: src/server/gnunet-peer-info.c:95
+#: src/server/version.c:157
+msgid ""
+"Failed to determine filename used to store GNUnet version information!\n"
+msgstr ""
+
+#: src/server/gnunet-peer-info.c:52
 msgid "Print information about GNUnet peers."
 msgstr "In thông tin về các đầu peer của GNUnet."
 
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
+#: src/server/gnunet-peer-info.c:79 src/server/gnunet-peer-info.c:94
 #, fuzzy, c-format
 msgid "Could not get address of peer `%s'.\n"
 msgstr "Không nhận được địa chỉ của đầu peer '%s'.\n"
 
-#: src/server/gnunet-peer-info.c:153
+#: src/server/gnunet-peer-info.c:88
 #, fuzzy
 msgid "hello message invalid (signature invalid).\n"
 msgstr "Thông báo HELO sai (sai chữ ký).\n"
 
-#: src/server/gnunet-peer-info.c:164
+#: src/server/gnunet-peer-info.c:99
 #, fuzzy, c-format
 msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr "Đầu peer '%s' với tin tưởng %8u và địa chỉ '%s'\n"
@@ -3306,6 +2986,24 @@
 "'%s' gọi với công việc cron không trong hàng đợi, đang thêm.  Đây có thể "
 "không phải cái người dùng muốn.\n"
 
+#: src/util/network_client/tcpio.c:90
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:114
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
+
+#: src/util/network_client/tcpio.c:209 src/util/network_client/tcpio.c:237
+#, 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:356
+#, fuzzy, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "'%s' thất bại, câu trả lời sai!\n"
+
 #: src/util/crypto/hostkey_gcrypt.c:1031
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
@@ -3316,12 +3014,12 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#: src/util/os/statuscalls.c:171 src/util/os/statuscalls.c:249
 #, fuzzy, c-format
 msgid "Failed to parse interface data from `%s'.\n"
 msgstr "Thất bại khi phân tích dữ liệu giao diện từ '%s' tại %s:%d.\n"
 
-#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
+#: src/util/os/statuscalls.c:291 src/util/os/statuscalls.c:300
 #, fuzzy, c-format
 msgid ""
 "No network interfaces defined in configuration section `%s' under `%s'!\n"
@@ -3333,24 +3031,17 @@
 msgid "Can't create semaphore: %i"
 msgstr "Không tạo được đèn tín hiệu: %i"
 
-#: src/util/os/dso.c:75
+#: src/util/os/dso.c:51
 #, c-format
-msgid ""
-"Cannot determine plugin path, application must be installed in directory "
-"ending with `%s'.\n"
-msgstr ""
-
-#: src/util/os/dso.c:97
-#, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Chạy cơ chế plugin không thành công: %s!\n"
 
-#: src/util/os/dso.c:134
+#: src/util/os/dso.c:90
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "'%s' thất bại cho thư viện '%s' tại %s:%d với lỗi: %s\n"
 
-#: src/util/os/dso.c:176
+#: src/util/os/dso.c:132
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
@@ -3364,40 +3055,32 @@
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Không hỏi được sự sử dụng CPU (Windows 9x).\n"
 
-#: src/util/os/installpath.c:172
-msgid ""
-"Cannot determine the path to the executable, your system may be broken or "
-"not supported.\n"
-msgstr ""
+#: src/util/os/priority.c:78
+#, fuzzy, c-format
+msgid "Invalid process priority `%s'\n"
+msgstr "Câu trả lời không đúng tới '%s'.\n"
 
-#: src/util/os/installpath.c:211
-msgid ""
-"GNUnet executables are not in a directory named 'bin'. This may signal a "
-"broken installation.\n"
-msgstr ""
+#: src/util/os/user.c:125
+#, fuzzy, c-format
+msgid "User `%s' not known, cannot change UID to it.\n"
+msgstr "Người dùng '%s' không rõ, không thay đổi được UID thành nó."
 
-#: src/util/os/installpath.c:222
-msgid "Cannot determine the installation prefix. Unknown error.\n"
-msgstr ""
+#: src/util/os/user.c:136
+#, fuzzy, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Không thay đổi được người dùng/nhóm thành '%s': %s"
 
-#: src/util/network/tcpio.c:100
-msgid "Could not find valid value for PORT in section NETWORK."
+#: src/util/network/select.c:272
+#, fuzzy
+msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
+"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/util/network/tcpio.c:124
-msgid "Could not find valid value for HOST in section NETWORK."
+#: src/util/network/select.c:421
+msgid "select listen socket not valid!\n"
 msgstr ""
 
-#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
-#, 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/tcpio.c:406
-#, fuzzy, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "'%s' thất bại, câu trả lời sai!\n"
-
 #: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
 #: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
 #, fuzzy, c-format
@@ -3424,99 +3107,104 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Định dạng sai '%s' cho mạng: %s\n"
 
-#: src/util/disk/storage.c:194
+#: src/util/disk/storage.c:201
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' thất bại cho ổ %s: %u\n"
 
-#: src/util/disk/storage.c:240
+#: src/util/disk/storage.c:247
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory\n"
 msgstr "'%s' mong đợi '%s' là một thư mục!\n"
 
-#: src/util/disk/storage.c:279
+#: src/util/disk/storage.c:286
 #, fuzzy, c-format
 msgid "Expected `%s' to be a regular file\n"
 msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/util/disk/storage.c:486
+#: src/util/disk/storage.c:493
 #, fuzzy, c-format
 msgid "expected `%s' to be a directory!\n"
 msgstr "'%s' mong đợi '%s' là một thư mục!\n"
 
-#: src/util/config_impl/impl.c:256
+#: src/util/config_impl/impl.c:260
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr "Lỗi cú pháp trong tập tin cấu hình '%s' trên dòng %d.\n"
 
-#: src/util/config_impl/impl.c:412
+#: src/util/config_impl/impl.c:419
 #, c-format
 msgid ""
 "Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
 "llu,%llu]\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:424
+#: src/util/config_impl/impl.c:431
 #, c-format
 msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/util/config_impl/impl.c:494
+#: src/util/config_impl/impl.c:511
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/error/error.c:138 src/util/error/error.c:182
+#: src/util/config_impl/impl.c:617
+#, c-format
+msgid "Setting option `%s' in section `%s' to value `%s' was refused.\n"
+msgstr ""
+
+#: src/util/error/error.c:156 src/util/error/error.c:200
 msgid "DEBUG"
 msgstr "TÌMLỖI"
 
-#: src/util/error/error.c:141 src/util/error/error.c:184
+#: src/util/error/error.c:159 src/util/error/error.c:202
 msgid "STATUS"
 msgstr ""
 
-#: src/util/error/error.c:144 src/util/error/error.c:186
+#: src/util/error/error.c:162 src/util/error/error.c:204
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/error/error.c:147 src/util/error/error.c:188
+#: src/util/error/error.c:165 src/util/error/error.c:206
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/error/error.c:150 src/util/error/error.c:190
+#: src/util/error/error.c:168 src/util/error/error.c:208
 msgid "FATAL"
 msgstr "LỖI NẶNG"
 
-#: src/util/error/error.c:153 src/util/error/error.c:192
+#: src/util/error/error.c:171 src/util/error/error.c:210
 msgid "USER"
 msgstr ""
 
-#: src/util/error/error.c:156 src/util/error/error.c:194
+#: src/util/error/error.c:174 src/util/error/error.c:212
 msgid "ADMIN"
 msgstr ""
 
-#: src/util/error/error.c:159 src/util/error/error.c:196
+#: src/util/error/error.c:177 src/util/error/error.c:214
 msgid "DEVELOPER"
 msgstr ""
 
-#: src/util/error/error.c:162 src/util/error/error.c:198
+#: src/util/error/error.c:180 src/util/error/error.c:216
 msgid "REQUEST"
 msgstr ""
 
-#: src/util/error/error.c:165 src/util/error/error.c:200
+#: src/util/error/error.c:183 src/util/error/error.c:218
 msgid "BULK"
 msgstr ""
 
-#: src/util/error/error.c:168 src/util/error/error.c:202
+#: src/util/error/error.c:186 src/util/error/error.c:220
 msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/error/error.c:171
+#: src/util/error/error.c:189
 msgid "ALL"
 msgstr ""
 
-#: src/util/error/error.c:203
+#: src/util/error/error.c:221
 msgid "NOTHING"
 msgstr "KHÔNGCÓGÌ"
 
@@ -3535,14 +3223,13 @@
 msgid "Permission denied for `%s'.\n"
 msgstr "Không đủ quyền hạn cho '%s' tại %s:%d.\n"
 
-#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
-#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
-#: src/util/threads/pthread.c:275
+#: src/util/threads/pthread.c:139 src/util/threads/pthread.c:147
+#: src/util/threads/pthread.c:154 src/util/threads/pthread.c:245
 #, fuzzy, c-format
 msgid "`%s' failed with error code %s: %s\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#: src/util/threads/pthread.c:161 src/util/threads/pthread.c:256
 #, fuzzy, c-format
 msgid "`%s' failed with error code %d: %s\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
@@ -3551,192 +3238,146 @@
 msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/util/getopt/getopt.c:686
+#: src/util/getopt/getopt.c:681
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn '%s' không rõ ràng\n"
 
-#: src/util/getopt/getopt.c:710
+#: src/util/getopt/getopt.c:705
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: tùy chọn `--%s' không cho phép một tham số\n"
 
-#: src/util/getopt/getopt.c:715
+#: src/util/getopt/getopt.c:710
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: tùy chọn `%c%s' không cho phép một tham số\n"
 
-#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#: src/util/getopt/getopt.c:727 src/util/getopt/getopt.c:901
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn `%s' cần một tham số\n"
 
-#: src/util/getopt/getopt.c:762
+#: src/util/getopt/getopt.c:757
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: tùy chọn không nhận ra `--%s'\n"
 
-#: src/util/getopt/getopt.c:766
+#: src/util/getopt/getopt.c:761
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: tùy chọn không nhận ra `%c%s'\n"
 
-#: src/util/getopt/getopt.c:792
+#: src/util/getopt/getopt.c:787
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/util/getopt/getopt.c:795
+#: src/util/getopt/getopt.c:790
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn sai -- %c\n"
 
-#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#: src/util/getopt/getopt.c:820 src/util/getopt/getopt.c:950
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần một tham số -- %c\n"
 
-#: src/util/getopt/getopt.c:872
+#: src/util/getopt/getopt.c:867
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn `-W %s' không rõ ràng\n"
 
-#: src/util/getopt/getopt.c:890
+#: src/util/getopt/getopt.c:885
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: tùy chọn `-W %s' không cho phép một tham số\n"
 
+#: src/util/getopt/setoption.c:58
+#, c-format
+msgid ""
+"Setting option `%s' in section `%s' to `%s' when processing command line "
+"option `%s' was denied.\n"
+msgstr ""
+
 #: src/util/getopt/printhelp.c:49
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "Tham số cho tùy chọn dài cũng là tham số cho tùy chọn ngắn.\n"
 
-#: src/util/string/string.c:101
+#: src/util/string/string.c:119
 msgid "ms"
 msgstr "mili giây"
 
-#: src/util/string/string.c:106
+#: src/util/string/string.c:124
 msgid "s"
 msgstr "giây"
 
-#: src/util/string/string.c:109
+#: src/util/string/string.c:127
 msgid "m"
 msgstr "phút"
 
-#: src/util/string/string.c:112
+#: src/util/string/string.c:130
 msgid "h"
 msgstr "giờ"
 
-#: src/util/string/string.c:115
+#: src/util/string/string.c:133
 msgid " days"
 msgstr " ngày"
 
-#: src/util/string/string.c:133
+#: src/util/string/string.c:151
 msgid "b"
 msgstr ""
 
-#: src/util/string/string.c:138
+#: src/util/string/string.c:156
 msgid "KiB"
 msgstr ""
 
-#: src/util/string/string.c:141
+#: src/util/string/string.c:159
 msgid "MiB"
 msgstr ""
 
-#: src/util/string/string.c:144
+#: src/util/string/string.c:162
 msgid "GiB"
 msgstr ""
 
-#: src/util/string/string.c:147
+#: src/util/string/string.c:165
 msgid "TiB"
 msgstr ""
 
-#: src/util/string/string.c:267
+#: src/util/string/string.c:285
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:60
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/setup/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:62
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/setup/gnunet-setup.c:91
-#, c-format
-msgid "Available MODEs:\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:92
+#: src/setup/gnunet-setup.c:152
 #, fuzzy, c-format
-msgid " config\t\ttext-based configuration\n"
-msgstr "Cấu hình GNUnet"
+msgid "Too many arguments.\n"
+msgstr "Sai tham số dòng lệnh.\n"
 
-#: src/setup/gnunet-setup.c:94
-#, c-format
-msgid " menuconfig\ttext-based menu\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:96
-#, c-format
-msgid " wizard-curses\tBasic text-based graphical configuration\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:99
-#, fuzzy, c-format
-msgid " gconfig\tGTK configuration\n"
-msgstr "Cấu hình GNUnet"
-
-#: src/setup/gnunet-setup.c:100
-#, c-format
-msgid ""
-" wizard-gtk\tBasic GTK configuration\n"
-"\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:167
-#, c-format
-msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:224
+#: src/setup/gnunet-setup.c:157
 #, fuzzy
 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:237 src/setup/gnunet-setup.c:251
-#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
+#: src/setup/gnunet-setup.c:227
 #, 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:264 src/setup/gnunet-setup.c:275
-#, c-format
-msgid ""
-"Can only run wizard to configure gnunetd.\n"
-"Did you forget the `%s' option?\n"
-msgstr ""
-
-#: src/setup/gnunet-setup.c:285
+#: src/setup/gnunet-setup.c:243
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Lỗi không rõ.\n"
 
-#: src/setup/wizard_gtk.c:429
-#, 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/wizard_gtk.c:475 src/setup/wizard_curs.c:616
-msgid "Unable to create user account:"
-msgstr "Không tạo được tài khoản người dùng:"
-
-#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
-msgid "Unable to change startup process:"
-msgstr "Không thay đổi được tiến trình khởi động:"
-
 #: src/setup/gnunet-win-tool.c:109
 #, c-format
 msgid "GNUnet service installed successfully.\n"
@@ -3777,33 +3418,193 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Lỗi: không xóa được dịch vụ: %s\n"
 
-#: src/setup/conf.c:522 src/setup/recreate.c:135
+#: src/setup/gtk/gconf.c:70
+#, fuzzy
+msgid "Sorry, no help is available for this option.\n"
+msgstr "Rất tiếc, chưa có trợ giúp cho tùy chọn này."
+
+#: src/setup/gtk/glade_support.c:89 src/setup/gtk/glade_support.c:120
 #, fuzzy, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
-msgstr "Không ghi được các tập tin cấu hình: %s.\n"
+msgid "Failed to open `%s'.\n"
+msgstr "Tập tin chứa với tên '%s'.\n"
 
-#: src/setup/conf.c:529
+#: src/setup/gtk/wizard_gtk.c:429
 #, fuzzy, c-format
-msgid "Configuration file `%s' created.\n"
+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:475 src/setup/ncurses/wizard_curs.c:616
+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:482 src/setup/ncurses/wizard_curs.c:619
+msgid "Unable to change startup process:"
+msgstr "Không thay đổi được tiến trình khởi động:"
+
+#: src/setup/text/conf.c:74
+#, fuzzy
+msgid "yes"
+msgstr "Có"
+
+#: src/setup/text/conf.c:75
+msgid "no"
+msgstr ""
+
+#: src/setup/text/conf.c:101
+#, c-format
+msgid "\tEnter yes (%s), no (%s) or help (%s): "
+msgstr ""
+
+#: src/setup/text/conf.c:110
+msgid "\tUse single space prefix to avoid conflicts with hotkeys!\n"
+msgstr ""
+
+#: src/setup/text/conf.c:112
+#, c-format
+msgid "\tEnter string (type '%s' for default value `%s'): "
+msgstr ""
+
+#: src/setup/text/conf.c:132
+#, c-format
+msgid "\t Enter choice (default is %c): "
+msgstr ""
+
+#: src/setup/text/conf.c:138
+#, c-format
+msgid "\tEnter floating point (type '%s' for default value %f): "
+msgstr ""
+
+#: src/setup/text/conf.c:144
+#, c-format
+msgid ""
+"\tEnter unsigned integer in interval [%llu,%llu] (type '%s' for default "
+"value %llu): "
+msgstr ""
+
+#: src/setup/text/conf.c:177
+#, fuzzy, c-format
+msgid "Yes\n"
+msgstr "Có"
+
+#: src/setup/text/conf.c:182
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Abort\n"
+msgstr "_Nói về"
+
+#: src/setup/text/conf.c:327 src/setup/text/conf.c:380
+#, c-format
+msgid ""
+"\n"
+"Invalid entry, try again (use '?' for help): "
+msgstr ""
+
+#: src/setup/text/conf.c:385
+#, c-format
+msgid "Unknown kind %x (internal error).  Skipping option.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:459
+msgid "\tDescend? (y/n/?) "
+msgstr ""
+
+#: src/setup/text/conf.c:470
+msgid "Aborted.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:492
+#, fuzzy
+msgid "Invalid entry.\n"
+msgstr "Tham số sai: '%s'\n"
+
+#: src/setup/text/conf.c:511
+#, c-format
+msgid "Unknown kind %x (internal error).  Aborting.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:538
+#, c-format
+msgid "You can always press ENTER to keep the current value.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:539
+#, c-format
+msgid "Use the '%s' key to abort.\n"
+msgstr ""
+
+#: src/setup/text/conf.c:553 src/setup/ncurses/mconf.c:818
+#, 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:558
+#, c-format
+msgid ""
+"Save configuration?  Answer 'y' for yes, 'n' for no, 'r' to repeat "
+"configuration. "
+msgstr ""
+
+#: src/setup/text/conf.c:568
+#, 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:573
+#, fuzzy, c-format
+msgid "Configuration file `%s' written.\n"
 msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
 
-#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
-#: src/setup/wizard_util.c:193
+#: src/setup/ncurses/mconf.c:793
+#, fuzzy
+msgid "GNUnet Configuration"
+msgstr "Cấu hình GNUnet"
+
+#: src/setup/ncurses/mconf.c:824
+#, fuzzy
+msgid "Do you wish to save your new configuration?"
+msgstr "Ghi thiết lập?"
+
+#: src/setup/ncurses/mconf.c:834
+#, fuzzy, c-format
+msgid "End of configuration.\n"
+msgstr "Cấu hình GNUnet"
+
+#: src/setup/ncurses/mconf.c:836
+#, fuzzy, c-format
+msgid "Your configuration changes were NOT saved.\n"
+msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
+
+#: src/setup/ncurses/wizard_curs.c:58
 msgid "Error"
 msgstr "Lỗi"
 
-#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
-#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
-#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
-#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
-#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
-#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
-#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
-#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
+#: src/setup/ncurses/wizard_curs.c:116 src/setup/ncurses/wizard_curs.c:131
+#: src/setup/ncurses/wizard_curs.c:184 src/setup/ncurses/wizard_curs.c:221
+#: src/setup/ncurses/wizard_curs.c:251 src/setup/ncurses/wizard_curs.c:277
+#: src/setup/ncurses/wizard_curs.c:310 src/setup/ncurses/wizard_curs.c:337
+#: src/setup/ncurses/wizard_curs.c:369 src/setup/ncurses/wizard_curs.c:394
+#: src/setup/ncurses/wizard_curs.c:423 src/setup/ncurses/wizard_curs.c:446
+#: src/setup/ncurses/wizard_curs.c:501 src/setup/ncurses/wizard_curs.c:563
+#: src/setup/ncurses/wizard_curs.c:594 src/setup/ncurses/wizard_curs.c:638
 msgid "GNUnet configuration"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/wizard_curs.c:117
+#: src/setup/ncurses/wizard_curs.c:117
 #, fuzzy
 msgid ""
 "Welcome to GNUnet!\n"
@@ -3833,20 +3634,20 @@
 "\n"
 "đội GNUnet"
 
-#: src/setup/wizard_curs.c:132
+#: src/setup/ncurses/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 "Chọn giao diện mạng kết nối máy tính tới internet từ danh sách dưới đây."
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
-#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
-#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:191
+#: src/setup/ncurses/wizard_curs.c:228 src/setup/ncurses/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:315 src/setup/ncurses/wizard_curs.c:375
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
+#: src/setup/ncurses/wizard_curs.c:138 src/setup/ncurses/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
@@ -3855,13 +3656,13 @@
 "\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là "
 "một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL."
 
-#: src/setup/wizard_curs.c:185
+#: src/setup/ncurses/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr "Tên của giao diện mạng kết nối máy tính tới Internet là gì?"
 
-#: src/setup/wizard_curs.c:222
+#: src/setup/ncurses/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
@@ -3871,7 +3672,7 @@
 "\n"
 "Nếu không biết, hãy để trống."
 
-#: src/setup/wizard_curs.c:229
+#: src/setup/ncurses/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3889,7 +3690,7 @@
 "Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
 "chỉ IP."
 
-#: src/setup/wizard_curs.c:252
+#: src/setup/ncurses/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3906,11 +3707,11 @@
 "thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối "
 "thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
 
-#: src/setup/wizard_curs.c:278
+#: src/setup/ncurses/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr "Tốc độ ra giới hạn là bao nhiêu (Byte/giây)?"
 
-#: src/setup/wizard_curs.c:283
+#: src/setup/ncurses/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3927,11 +3728,11 @@
 "chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
 "internet lớn nhất."
 
-#: src/setup/wizard_curs.c:310
+#: src/setup/ncurses/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr "Dùng bao nhiêu (Byte/giây) cho dòng vào?"
 
-#: src/setup/wizard_curs.c:316
+#: src/setup/ncurses/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3948,7 +3749,7 @@
 "chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
 "internet lớn nhất."
 
-#: src/setup/wizard_curs.c:338
+#: src/setup/ncurses/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -3970,11 +3771,11 @@
 "người dùng không nên giới hạn truyền tải GNUnet phải chịu trên kết nối "
 "internet mỗi khi sử dụng LAN tốc độ cao (ví dụ bởi NFS)."
 
-#: src/setup/wizard_curs.c:370
+#: src/setup/ncurses/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr "Sử dụng bao nhiêu CPU (tính theo %)?"
 
-#: src/setup/wizard_curs.c:376
+#: src/setup/ncurses/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3984,7 +3785,7 @@
 "\n"
 "Đây là phần trăm thời gian của bộ xử lý cho phép GNUnet sử dụng."
 
-#: src/setup/wizard_curs.c:395
+#: src/setup/ncurses/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -4006,7 +3807,7 @@
 "Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để dễ "
 "dàng truy cập."
 
-#: src/setup/wizard_curs.c:424
+#: src/setup/ncurses/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -4018,7 +3819,7 @@
 "Kho dữ liệu GNUnet chứa tất cả các dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, "
 "nội dung chèn và nhập vào)."
 
-#: src/setup/wizard_curs.c:447
+#: src/setup/ncurses/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -4031,7 +3832,7 @@
 "Nếu chọn \"yes\", tiến trình nền sau GNUnet sẽ tự động chạy khi bật máy "
 "tính. Nếu chọn \"no\", thì cần chạy GNUnet mỗi khi muốn sử dụng."
 
-#: src/setup/wizard_curs.c:502
+#: src/setup/ncurses/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -4058,7 +3859,7 @@
 "Để trống để chạy GNUnet với quyền hệ thống.\n"
 "Người dùng GNUnet:"
 
-#: src/setup/wizard_curs.c:564
+#: src/setup/ncurses/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -4084,7 +3885,7 @@
 "\n"
 "Nhóm GNUnet:"
 
-#: src/setup/wizard_curs.c:595
+#: src/setup/ncurses/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -4096,7 +3897,7 @@
 "\n"
 "Chạy nó sau khi ghi cấu hình?"
 
-#: src/setup/wizard_curs.c:632
+#: src/setup/ncurses/wizard_curs.c:632
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -4107,115 +3908,435 @@
 "\n"
 "Thử lại?"
 
-#: src/setup/confdata.c:93
+#: src/setup/lib/gns.c:266
+#, fuzzy, c-format
+msgid ""
+"Configuration does not satisfy constraints of configuration specification "
+"file `%s'!\n"
+msgstr ""
+"Trong phần '%s' dưới '%s' của cấu hình phải chỉ ra thư mục cho dữ liệu FS.\n"
+
+#: src/setup/lib/tree.c:181
 #, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
+msgid ""
+"Internal error: entry `%s' in section `%s' not found for visibility change!\n"
 msgstr ""
 
-#: src/setup/wizard_util.c:119
-msgid "Can't open Service Control Manager"
-msgstr "Không mở được Trình Quản Lý Điều Khiển Dịch Vụ"
+#: src/include/gnunet_util_getopt.h:145
+msgid "print this help"
+msgstr "in trợ giúp này"
 
-#: src/setup/wizard_util.c:124
-msgid "Can't create service"
-msgstr "Không tạo được dịch vụ"
+#: src/include/gnunet_util_getopt.h:154
+msgid "print the version number"
+msgstr "in số của phiên bản"
 
-#: src/setup/wizard_util.c:129
-msgid "Error changing the permissions of the GNUnet directory"
-msgstr "Lỗi thay đổi quyền hạn của thư mục GNUnet"
+#: src/include/gnunet_util_getopt.h:160
+msgid "configure logging to use LOGRULES"
+msgstr ""
 
-#: src/setup/wizard_util.c:134
-msgid "Cannot write to the regisitry"
-msgstr "Không ghi được tới bản ghi"
+#: src/include/gnunet_util_getopt.h:166
+msgid "be verbose"
+msgstr "thông báo chi tiết"
 
-#: src/setup/wizard_util.c:137
-msgid "Can't access the service"
-msgstr "Không truy cập được dịch vụ"
+#: src/include/gnunet_util_getopt.h:172
+msgid "use configuration file FILENAME"
+msgstr "dùng tập tin cấu hình FILENAME"
 
-#: src/setup/wizard_util.c:141
-msgid "Can't delete the service"
-msgstr "Không xóa được dịch vụ"
+#: src/include/gnunet_util_getopt.h:178
+msgid "specify host on which gnunetd is running"
+msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/setup/wizard_util.c:145
-msgid "Unknown error"
-msgstr "Lỗi không rõ"
+#: src/include/gnunet_util_error.h:163 src/include/gnunet_util_error.h:165
+#: src/include/gnunet_util_error.h:167 src/include/gnunet_util_error.h:169
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr "Xác nhận thất bại tại %s:%d.\n"
 
-#: src/setup/wizard_util.c:176
-msgid "This version of Windows does not support multiple users."
-msgstr "Phiên bản này của Windows không hỗ trợ nhiều người dùng."
+#: src/include/gnunet_util_error.h:176 src/include/gnunet_util_error.h:183
+#: src/include/gnunet_util_error.h:190 src/include/gnunet_util_error.h:197
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/setup/wizard_util.c:180
-msgid "Error creating user"
-msgstr "Lỗi tạo người dùng"
+#: src/include/gnunet_util_error.h:204 src/include/gnunet_util_error.h:211
+#, fuzzy, c-format
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr "'%s' thất bại trên tập tin'%s' tại %s:%d với lỗi: %s\n"
 
-#: src/setup/wizard_util.c:183
-msgid "Error accessing local security policy"
-msgstr "Lỗi truy cập chính sách bảo mật nội bộ"
+#~ msgid "Failed to obtain my (external) IPv6 address!\n"
+#~ msgstr "Không lấy được địa chỉ IPv6 (ngoài) của tôi!\n"
 
-#: src/setup/wizard_util.c:186
-msgid "Error granting service right to user"
-msgstr "Lỗi chuyển quyền hạn dịch vụ tới cho người dùng"
+#, fuzzy
+#~ msgid ""
+#~ "Cannot determine port to bind to.  Define in configuration file in "
+#~ "section `%s' under `%s' or in `%s' under %s/%s.\n"
+#~ msgstr ""
+#~ "Không nhận ra cổng để kết gắn tới.  Hãy xác định trong tập tin cấu hình "
+#~ "phần '%s' dưới '%s' hoặc phần '%s' dưới %s/%s.\n"
 
-#: src/setup/wizard_util.c:189
-msgid "Unknown error while creating a new user"
-msgstr "Lỗi không rõ khi tạo một người dùng mới"
+#~ msgid "Failed to bind to UDP6 port %d.\n"
+#~ msgstr "Kết gắn bind tới cổng UDP6 %d không thành công.\n"
 
-#: src/setup/gconf.c:73
+#~ msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+#~ msgstr "Nhận được thông báo UDP6 sai từ %s: %d, đang loại bỏ.\n"
+
+#~ msgid "Packet received from %s:%d (UDP6) failed format check."
+#~ msgstr "Kiểm tra định dạng gói nhận được từ %s:%d (UDP6) thất bại."
+
+#~ msgid "%s: Rejected connection from blacklisted address %s.\n"
+#~ msgstr "%s: Nhả ra kết nối có trong danh sách đen từ địa chỉ %s.\n"
+
+#~ msgid ""
+#~ "Expected welcome message on tcp connection, got garbage (%u, %u). "
+#~ "Closing.\n"
+#~ msgstr ""
+#~ "Mong đợi chào mừng trên kết nối tcp, nhận được rác (%u, %u). Đang đóng.\n"
+
+#~ msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+#~ msgstr "Nhận được thông báo UDP sai từ %u.%u.%u.%u:%u, đang loại bỏ.\n"
+
+#~ msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
+#~ msgstr ""
+#~ "Kiểm tra định dạng gói nhận được từ %u.%u.%u.%u:%u (UDP) không thành "
+#~ "công.\n"
+
+#~ msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+#~ msgstr "Mong chào mừng từ kết nối tcp, nhận được rác. Đang đóng.\n"
+
+#~ msgid ""
+#~ "Received malformed message from tcp6-peer connection. Closing "
+#~ "connection.\n"
+#~ msgstr ""
+#~ "Nhận được thông báo bị hỏng từ kết nối tcp6-đầu peer. Đang đóng kết nối.\n"
+
+#~ msgid "Network advertisements disabled by configuration!\n"
+#~ msgstr "Tắt quàng cáo trong mạng bằng cấu hình!\n"
+
 #, fuzzy
-msgid "Sorry, no help is available for this option.\n"
-msgstr "Rất tiếc, chưa có trợ giúp cho tùy chọn này."
+#~ msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
+#~ msgstr "Phiên bản không tương ứng ('%s' và '%s'), hãy chạy gnunet-update!\n"
 
-#: src/setup/glade_support.c:75
-#, fuzzy, c-format
-msgid "Failed to find handler for `%s'\n"
-msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file must specify directory for storing FS data in section `"
+#~ "%s' under `%s'.\n"
+#~ msgstr ""
+#~ "Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần '%s' "
+#~ "dưới '%s'.\n"
 
-#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
-#, fuzzy, c-format
-msgid "Failed to open `%s'.\n"
-msgstr "Tập tin chứa với tên '%s'.\n"
+#~ msgid "Could not initialize libgnunetutil!\n"
+#~ msgstr "Không chạy được libgnunetutil!\n"
 
-#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
-#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d in %s.\n"
-msgstr "Xác nhận thất bại tại %s:%d.\n"
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s\n"
+#~ msgstr ""
+#~ "Tập tin cấu hình phải chỉ ra thư mục cho GNUnet để chứa dữ liệu per-peer "
+#~ "dưới %s%s\n"
 
-#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
-#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
-#, fuzzy, c-format
-msgid "`%s' failed at %s:%d in %s with error: %s\n"
-msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
+#~ msgid "Could not create hostkey!\n"
+#~ msgstr "Không tạo được chìa khóa máy!\n"
 
-#: src/include/gnunet_util_error.h:207
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
-msgstr "'%s' thất bại trên tập tin'%s' tại %s:%d với lỗi: %s\n"
+#, fuzzy
+#~ msgid "%s `%s' returned no known hosts!\n"
+#~ msgstr "%s '%s' không trả lại máy biết đến!\n"
 
-#: src/include/gnunet_util_getopt.h:145
-msgid "print this help"
-msgstr "in trợ giúp này"
+#, fuzzy
+#~ msgid ""
+#~ "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+#~ msgstr ""
+#~ "Chưa đặt tùy chọn '%s' trong phần '%s' của cấu hình, đang đặt thành %dm.\n"
 
-#: src/include/gnunet_util_getopt.h:154
-msgid "print the version number"
-msgstr "in số của phiên bản"
+#, fuzzy
+#~ msgid ""
+#~ "You should specify at least one transport service under option `%s' in "
+#~ "section `%s'.\n"
+#~ msgstr ""
+#~ "Người dùng phải chỉ ra ít nhất một dịch vụ giao thông dưới tùy chọn '%s' "
+#~ "trong phần '%s'.\n"
 
-#: src/include/gnunet_util_getopt.h:160
-msgid "configure logging to use LOGRULES"
-msgstr ""
+#~ msgid "Trace GNUnet network topology."
+#~ msgstr "Theo dấu vết trace hình học của mạng GNUnet."
 
-#: src/include/gnunet_util_getopt.h:166
-msgid "be verbose"
-msgstr "thông báo chi tiết"
+#~ msgid ""
+#~ "specify that the contents of the namespace are of the given MIMETYPE (use "
+#~ "when creating a new pseudonym)"
+#~ msgstr ""
+#~ "cho biết rằng nội dung của không gian tên có dạng MIMETYPE (dùng khi tạo "
+#~ "một tên hiệu mới)"
 
-#: src/include/gnunet_util_getopt.h:172
-msgid "use configuration file FILENAME"
-msgstr "dùng tập tin cấu hình FILENAME"
+#~ msgid ""
+#~ "specify NAME to be the realname of the user controlling the namespace "
+#~ "(use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "dùng NAME làm tên thật của điều khiển không gian tên của người dùng (dùng "
+#~ "khi tạo một tên hiệu mới)"
 
-#: src/include/gnunet_util_getopt.h:178
-msgid "specify host on which gnunetd is running"
-msgstr "chỉ ra máy đang chạy gnunetd"
+#~ msgid ""
+#~ "use DESCRIPTION to describe the content of the namespace (use when "
+#~ "creating a new pseudonym)"
+#~ msgstr ""
+#~ "dùng DESCRIPTION để mô tả nội dung của không gian tên (dùng khi tạo một "
+#~ "tên hiệu mới)"
 
+#~ msgid ""
+#~ "specify the given URI as an address that contains more information about "
+#~ "the namespace (use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "dùng URI đưa ra làm địa chỉ chứa thêm thông tin về không gian tên (dùng "
+#~ "khi tạo một tên hiệu mới)"
+
+#, fuzzy
+#~ msgid "Invalid argument: `%s'\n"
+#~ msgstr "Tham số sai: '%s'\n"
+
+#~ msgid "Invalid arguments. Exiting.\n"
+#~ msgstr "Tham số sai. Đang thoát.\n"
+
+#~ msgid "%8u of %8u bytes deleted."
+#~ msgstr "Đã xóa %8u của %8u byte."
+
+#~ msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
+#~ msgstr "chỉ ra tập tin để xóa khỏi GNUnet (bắt buộc, tập tin phải tồn tại)"
+
+#~ msgid ""
+#~ "Remove file from GNUnet.  The specified file is not removed\n"
+#~ "from the filesystem but just from the local GNUnet datastore."
+#~ msgstr ""
+#~ "Xóa tập tin khỏi GNUnet.  Chưa xóa bỏ tập tin chỉ ra khỏi hệ\n"
+#~ "thống tập tin nhưng đã xoá khỏi kho dữ liệu GNUnet nội bộ."
+
+#~ msgid "You must specify a filename (option -f)\n"
+#~ msgstr "Người dùng phải chỉ ra một tên tập tin (tùy chọn -f)\n"
+
+#~ msgid ""
+#~ "Error deleting file %s.\n"
+#~ "Probably a few blocks were already missing from the database.\n"
+#~ msgstr ""
+#~ "Lỗi xóa tập tin %s.\n"
+#~ "Có thể đã mất vài khối trong cơ sở dữ liệu.\n"
+
+#~ msgid "gnunet-directory [OPTIONS] [FILENAMES]"
+#~ msgstr "gnunet-directory [TÙYCHỌN] [TÊNTẬPTIN]"
+
+#, fuzzy
+#~ msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
+#~ msgstr ""
+#~ "Hoàn thành tải lên '%s', tốc độ trung bình hiện thời là %8.3f kbps.\n"
+
+#~ msgid "process directories recursively"
+#~ msgstr "tiến hành đệ qui trên các thư mục"
+
+#, fuzzy
+#~ msgid "You must pass a positive number to the `%s' option.\n"
+#~ msgstr "Người dùng phải đưa một số dương vào tùy chọn '%s'.\n"
+
+#~ msgid "You must specify a list of files to insert.\n"
+#~ msgstr "Người dùng phải chỉ ra một danh sách tập tin để chèn.\n"
+
+#~ msgid "Only one file or directory can be specified at a time.\n"
+#~ msgstr "Chỉ có thể đưa ra một tập tin hay thư mục mỗi lần.\n"
+
+#~ msgid "You must specify a file or directory to upload.\n"
+#~ msgstr "Người dùng phải chỉ ra một tập tin hay thư mục để tải lên.\n"
+
+#~ msgid "set the desired LEVEL of receiver-anonymity"
+#~ msgstr "đặt CẤPĐỘ mong muốn của người nhận giấu tên"
+
+#~ msgid "Search GNUnet for files."
+#~ msgstr "Tìm kiếm tập tin trong GNUnet."
+
+#~ msgid "Not enough arguments. You must specify a keyword or identifier.\n"
+#~ msgstr ""
+#~ "Không đủ tham số. Người dùng phải chỉ ra một từ khóa hoặc một tên.\n"
+
+#~ msgid "LEVEL"
+#~ msgstr "CẤPĐỘ"
+
+#~ msgid "FILENAME"
+#~ msgstr "TÊNTẬPTIN"
+
+#~ msgid "write the file to FILENAME"
+#~ msgstr "ghi tập tin vào TÊNTẬPTIN"
+
+#~ msgid "This search is already pending!\n"
+#~ msgstr "Tìm kiếm này đang chờ đợi!\n"
+
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s.\n"
+#~ msgstr ""
+#~ "Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-"
+#~ "peer dưới %s%s.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Need to have list of friends in configuration under `%s' in section `%"
+#~ "s'.\n"
+#~ msgstr "Cần có danh sách bạn bè dưới '%s' của phần '%s' trong cấu hình.\n"
+
+#~ msgid "helptext for -t"
+#~ msgstr "trợ giúp cho -t"
+
+#~ msgid "Template for gnunet-clients."
+#~ msgstr "Biểu mẫu cho gnunet-clients."
+
+#~ msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+#~ msgstr ""
+#~ "Cổng sai \"%s\" nằm trong xác định danh sách máy, đang thử cổng %d.\n"
+
+#, fuzzy
+#~ msgid "`%s' failed at %s:%d with error: `%s'.\n"
+#~ msgstr "'%s' thất bại tại %s:%d với lỗi: '%s'.\n"
+
+#, fuzzy
+#~ msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+#~ msgstr ""
+#~ "Không tải xuống được danh sách liên hệ các đầu peer, máy '%s' không rõ.\n"
+
+#, fuzzy
+#~ msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+#~ msgstr "'%s' tới '%s' thất bại tại %s:%d với lỗi: %s\n"
+
+#, fuzzy
+#~ msgid "Parsing HTTP response for URL `%s' failed.\n"
+#~ msgstr "Phân tích câu trả lời HTTP cho URL '%s' không thành công.\n"
+
+#, fuzzy
+#~ msgid "Parsing hello from `%s' failed.\n"
+#~ msgstr "Phân tích HELO từ '%s' không thành công.\n"
+
+#, fuzzy
+#~ msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+#~ msgstr ""
+#~ "Không tìm thấy tên của HTTP proxy '%s'. Đang thử không dùng proxy.\n"
+
+#~ msgid "Failed to query gnunetd about traffic conditions.\n"
+#~ msgstr "Lỗi khi hỏi gnunetd về các điều khoản truyền tải.\n"
+
+#~ msgid "Did not receive reply from gnunetd about traffic conditions.\n"
+#~ msgstr ""
+#~ "Không nhận được câu trả lời từ gnunetd về các điều khoản truyền tải.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file must specify directory for storing data in section `%"
+#~ "s' under `%s'.\n"
+#~ msgstr ""
+#~ "Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần '%s' "
+#~ "dưới '%s'.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize SQLite KVStore.\n"
+#~ msgstr "Không chạy được SQLite.\n"
+
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s\\%s.\n"
+#~ msgstr ""
+#~ "Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-"
+#~ "peer dưới %s\\%s.\n"
+
+#~ msgid "print a value from the configuration file to stdout"
+#~ msgstr "in một giá trị từ tập tin cấu hình ra stdout"
+
+#, fuzzy
+#~ msgid "Option `%s' makes no sense without option `%s'."
+#~ msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'."
+
+#~ msgid "Invalid arguments: "
+#~ msgstr "Tham số sai: "
+
+#~ msgid ""
+#~ "\n"
+#~ "Exiting.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Đang thoát.\n"
+
+#~ msgid "No applications defined in configuration!\n"
+#~ msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
+
+#~ msgid "Updated data for %d applications.\n"
+#~ msgstr "Cập nhật dữ liệu cho %d ứng dụng.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "You must specify a name for the PID file in section `%s' under `%s'.\n"
+#~ msgstr ""
+#~ "Người dùng phải chỉ ra một tên cho tập tin PID trong phần '%s' dưới '%"
+#~ "s'.\n"
+
+#, fuzzy
+#~ msgid "Could not write PID to file `%s': %s.\n"
+#~ msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
+
+#~ msgid "Invalid command-line arguments:\n"
+#~ msgstr "Sai tham số dòng lệnh:\n"
+
+#, fuzzy
+#~ msgid "Argument %d: `%s'\n"
+#~ msgstr "Tham số %d: '%s'\n"
+
+#, fuzzy
+#~ msgid "`%s' starting\n"
+#~ msgstr "'%s' đang khởi động\n"
+
+#~ msgid "FATAL: Identity plugin not found!\n"
+#~ msgstr "LỖI NẶNG: Không tìm thấy plugin đồng nhất!\n"
+
+#~ msgid "You must specify a non-empty set of transports to test!\n"
+#~ msgstr ""
+#~ "Người dùng phải chỉ ra một bộ không rỗng của truyền tải để thử nghiệm!\n"
+
+#, fuzzy
+#~ msgid " config\t\ttext-based configuration\n"
+#~ msgstr "Cấu hình GNUnet"
+
+#, fuzzy
+#~ msgid "Unable to save configuration file `%s': %s.\n"
+#~ msgstr "Không ghi được các tập tin cấu hình: %s.\n"
+
+#~ msgid "Can't open Service Control Manager"
+#~ msgstr "Không mở được Trình Quản Lý Điều Khiển Dịch Vụ"
+
+#~ msgid "Can't create service"
+#~ msgstr "Không tạo được dịch vụ"
+
+#~ msgid "Error changing the permissions of the GNUnet directory"
+#~ msgstr "Lỗi thay đổi quyền hạn của thư mục GNUnet"
+
+#~ msgid "Cannot write to the regisitry"
+#~ msgstr "Không ghi được tới bản ghi"
+
+#~ msgid "Can't access the service"
+#~ msgstr "Không truy cập được dịch vụ"
+
+#~ msgid "Can't delete the service"
+#~ msgstr "Không xóa được dịch vụ"
+
+#~ msgid "Unknown error"
+#~ msgstr "Lỗi không rõ"
+
+#~ msgid "This version of Windows does not support multiple users."
+#~ msgstr "Phiên bản này của Windows không hỗ trợ nhiều người dùng."
+
+#~ msgid "Error creating user"
+#~ msgstr "Lỗi tạo người dùng"
+
+#~ msgid "Error accessing local security policy"
+#~ msgstr "Lỗi truy cập chính sách bảo mật nội bộ"
+
+#~ msgid "Error granting service right to user"
+#~ msgstr "Lỗi chuyển quyền hạn dịch vụ tới cho người dùng"
+
+#~ msgid "Unknown error while creating a new user"
+#~ msgstr "Lỗi không rõ khi tạo một người dùng mới"
+
+#, fuzzy
+#~ msgid "Failed to find handler for `%s'\n"
+#~ msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
+
 #~ msgid "GNUnet configuration assistant"
 #~ msgstr "Trình giúp cấu hình GNUnet"
 
@@ -4408,9 +4529,6 @@
 #~ msgid "Question"
 #~ msgstr "Câu hỏi"
 
-#~ msgid "Do you want to save your settings?"
-#~ msgstr "Ghi thiết lập?"
-
 #~ msgid "Unable to save configuration!"
 #~ msgstr "Không ghi được thiết lập!"
 
@@ -4501,9 +4619,6 @@
 #~ msgid "_Introduction"
 #~ msgstr "_Giới thiệu"
 
-#~ msgid "_About"
-#~ msgstr "_Nói về"
-
 #~ msgid "Goes up of one level (single view)"
 #~ msgstr "Đi lên một mức độ (xem đơn)"
 

Modified: GNUnet/src/applications/session/connect.c
===================================================================
--- GNUnet/src/applications/session/connect.c   2006-09-06 00:19:41 UTC (rev 
3363)
+++ GNUnet/src/applications/session/connect.c   2006-09-06 00:21:57 UTC (rev 
3364)
@@ -508,8 +508,8 @@
 #if DEBUG_SESSION
   GE_LOG(ectx,
         GE_DEBUG | GE_USER | GE_REQUEST,
-      "Received session key from peer `%s'.\n",
-      &enc);
+        "Received session key from peer `%s'.\n",
+        &enc);
 #endif
   if (ntohs(msg->size) < sizeof(P2P_setkey_MESSAGE)) {
     GE_LOG(ectx,

Modified: GNUnet/src/server/gnunet-transport-check.c
===================================================================
--- GNUnet/src/server/gnunet-transport-check.c  2006-09-06 00:19:41 UTC (rev 
3363)
+++ GNUnet/src/server/gnunet-transport-check.c  2006-09-06 00:21:57 UTC (rev 
3364)
@@ -353,11 +353,6 @@
   { 'p', "ping", NULL, 
     gettext_noop("ping peers from HOSTLISTURL that match transports"), 
     0, &gnunet_getopt_configure_set_option, "TRANSPORT-CHECK:PING=YES" },
-#if 0
-  { 'P', "Xport", "PORT", 
-    gettext_noop(""), 
-    0, &gnunet_getopt_configure_set_option, "TRANSPORT-CHECK:PORT" },
-#endif
   { 'r', "repeat", "COUNT",
     gettext_noop("send COUNT messages"),
     1, &gnunet_getopt_configure_set_option, "TRANSPORT-CHECK:REPEAT" },

Modified: GNUnet/src/server/gnunetd.c
===================================================================
--- GNUnet/src/server/gnunetd.c 2006-09-06 00:19:41 UTC (rev 3363)
+++ GNUnet/src/server/gnunetd.c 2006-09-06 00:21:57 UTC (rev 3364)
@@ -154,7 +154,7 @@
  */
 static struct CommandLineOption gnunetdOptions[] = {
   COMMAND_LINE_OPTION_CFG_FILE(&cfgFilename), /* -c */
-  { '@', "win-service", NULL, gettext_noop(""), 0, 
+  { '@', "win-service", NULL, "", 0, 
     &gnunet_getopt_configure_set_option, "GNUNETD:WINSERVICE" },
   { 'd', "debug", NULL, 
     gettext_noop("run in debug mode; gnunetd will "
@@ -168,7 +168,8 @@
     gettext_noop("disable padding with random data (experimental)"), 0,
     &gnunet_getopt_configure_set_option, "GNUNETD-EXPERIMENTAL:PADDING" },
 #ifndef MINGW
-  { 'u', "user", "USERNAME", gettext_noop(""), 1, 
+  { 'u', "user", "USERNAME", 
+    gettext_noop("specify username as which gnunetd should run"), 1, 
     &gnunet_getopt_configure_set_option, "GNUNETD:USERNAME" },
 #endif
   COMMAND_LINE_OPTION_VERSION(PACKAGE_VERSION), /* -v */
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r3364 - in GNUnet: po src/applications/session src/server, grothoff <=
Prev by Date: [GNUnet-SVN] r3363 - in GNUnet/src/applications: fs/lib fs/module gap tbench
Next by Date: [GNUnet-SVN] r3365 - GNUnet
Previous by thread: [GNUnet-SVN] r3363 - in GNUnet/src/applications: fs/lib fs/module gap tbench
Next by thread: [GNUnet-SVN] r3365 - GNUnet
Index(es):
- Date
- Thread