gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r1561 - GNUnet/po


From: grothoff
Subject: [GNUnet-SVN] r1561 - GNUnet/po
Date: Sat, 16 Jul 2005 12:34:08 -0700 (PDT)

Author: grothoff
Date: 2005-07-16 12:33:59 -0700 (Sat, 16 Jul 2005)
New Revision: 1561

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

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2005-07-16 19:29:31 UTC (rev 1560)
+++ GNUnet/po/GNUnet.pot        2005-07-16 19:33:59 UTC (rev 1561)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-03 00:36+0200\n"
+"POT-Creation-Date: 2005-07-16 21:36+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -17,7 +17,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/applications/advertising/advertising.c:156
-#, possible-c-format
+#, c-format
 msgid "HELO message from '%s' invalid (signature invalid). Dropping.\n"
 msgstr ""
 
@@ -26,99 +26,104 @@
 msgstr ""
 
 #: src/applications/advertising/advertising.c:171
-#, possible-c-format
+#, c-format
 msgid "HELO advertisement for protocol %d received.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:286
+#: src/applications/advertising/advertising.c:290
 msgid "Could not send HELOs+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:299
-#, possible-c-format
+#: src/applications/advertising/advertising.c:303
+#, c-format
 msgid "'%s' failed (%d, %u). Will not send PING.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:442
-#, possible-c-format
+#: src/applications/advertising/advertising.c:451
+#, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:449
+#: src/applications/advertising/advertising.c:458
 msgid ""
 "Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:542
-#, possible-c-format
+#: src/applications/advertising/advertising.c:560
+#, c-format
 msgid "Removing HELO from peer '%s' (expired %ds ago).\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:700
+#: src/applications/advertising/advertising.c:720
 msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:701
+#: src/applications/advertising/advertising.c:721
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:702
+#: src/applications/advertising/advertising.c:722
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:706
-#: src/applications/session/connect.c:726
-#, possible-c-format
+#: src/applications/advertising/advertising.c:726
+#: src/applications/session/connect.c:735
+#, c-format
 msgid "'%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:725
+#: src/applications/advertising/advertising.c:745
 msgid "Network advertisements disabled by configuration!\n"
 msgstr ""
 
+#: src/applications/advertising/advertising.c:765
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
+msgstr ""
+
 #: src/applications/bootstrap_http/http.c:79
 #: src/applications/testbed/testbed.c:1080
-#, possible-c-format
+#, c-format
 msgid "Invalid URL '%s' (must begin with '%s')\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:107
-#, possible-c-format
+#, c-format
 msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:118
-#, possible-c-format
+#, c-format
 msgid "'%s' failed at %s:%d with error: '%s'.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:131
-#, possible-c-format
+#, c-format
 msgid "Could not download list of peer contacts, host '%s' unknown.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:153
 #: src/applications/bootstrap_http/http.c:179
-#, possible-c-format
+#, c-format
 msgid "'%s' to '%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:215
-#, possible-c-format
+#, c-format
 msgid "Parsing HTTP response for URL '%s' failed.\n"
 msgstr ""
 
 #: src/applications/bootstrap_http/http.c:250
-#, possible-c-format
+#, c-format
 msgid "Parsing HELO from '%s' failed.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:325
-#, possible-c-format
+#: src/applications/bootstrap_http/http.c:326
+#, c-format
 msgid "Could not resolve name of HTTP proxy '%s'. Trying without a proxy.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:349
+#: src/applications/bootstrap_http/http.c:350
 msgid "# HELOs downloaded via http"
 msgstr ""
 
@@ -135,15 +140,19 @@
 msgstr ""
 
 #: src/applications/chat/chat.c:159
-#, possible-c-format
+#, c-format
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr ""
 
 #: src/applications/chat/chat.c:195
-#, possible-c-format
+#, c-format
 msgid "'%s' registering handlers %d and %d\n"
 msgstr ""
 
+#: src/applications/chat/chat.c:210
+msgid "enables P2P-chat (incomplete)"
+msgstr ""
+
 #: src/applications/chat/gnunet-chat.c:82
 msgid "specify nickname"
 msgstr ""
@@ -158,7 +167,7 @@
 #: src/applications/fs/tools/gnunet-delete.c:111
 #: src/applications/fs/tools/gnunet-directory.c:183
 #: src/applications/fs/tools/gnunet-download.c:128
-#: src/applications/fs/tools/gnunet-insert.c:508
+#: src/applications/fs/tools/gnunet-insert.c:499
 #: src/applications/fs/tools/gnunet-pseudonym.c:214
 #: src/applications/fs/tools/gnunet-search.c:213
 #: src/applications/fs/tools/gnunet-unindex.c:139
@@ -182,7 +191,7 @@
 msgstr ""
 
 #: src/applications/chat/gnunet-chat.c:153
-#, possible-c-format
+#, c-format
 msgid "You must specify a nickname (use option '%s').\n"
 msgstr ""
 
@@ -195,29 +204,29 @@
 msgstr ""
 
 #: src/applications/datastore/datastore.c:107
-#, possible-c-format
+#, c-format
 msgid "Availability test failed for '%s' at %s:%d.\n"
 msgstr ""
 
 #: src/applications/datastore/datastore.c:129
-#, possible-c-format
+#, c-format
 msgid "Database failed to delete %s.\n"
 msgstr ""
 
 #: src/applications/datastore/filter.c:42
-#, possible-c-format
+#, c-format
 msgid ""
 "Configuration must specify directory for FS data in section '%s' under '%"
 "s'.\n"
 msgstr ""
 
 #: src/applications/dht/module/cs.c:440
-#, possible-c-format
+#, c-format
 msgid "'%s' failed: table not found!\n"
 msgstr ""
 
 #: src/applications/dht/module/cs.c:456
-#, possible-c-format
+#, c-format
 msgid "'%s' failed.  Terminating connection to client.\n"
 msgstr ""
 
@@ -227,56 +236,56 @@
 
 #: src/applications/dht/module/cs.c:644 src/applications/dht/module/cs.c:661
 #: src/applications/dht/module/cs.c:670
-#, possible-c-format
+#, c-format
 msgid "'%s' failed. Terminating connection to client.\n"
 msgstr ""
 
 #: src/applications/dht/module/cs.c:786 src/applications/dht/module/cs.c:839
-#, possible-c-format
+#, c-format
 msgid "Failed to deliver '%s' message.\n"
 msgstr ""
 
 #: src/applications/dht/module/dht.c:942
-#, possible-c-format
+#, c-format
 msgid "Malformed optional field '%s' received from peer '%s'.\n"
 msgstr ""
 
 #: src/applications/dht/module/dht.c:969
-#, possible-c-format
+#, c-format
 msgid "Could not find peer '%s' in routing table!\n"
 msgstr ""
 
 #: src/applications/dht/module/dht.c:1116
 #: src/applications/dht/module/dht.c:1131
-#, possible-c-format
+#, c-format
 msgid "Received malformed response to '%s' from peer '%s'.\n"
 msgstr ""
 
 #: src/applications/dht/module/dht.c:1440
-#, possible-c-format
+#, c-format
 msgid "Invalid response to '%s' from peer '%s'.\n"
 msgstr ""
 
 #: src/applications/dht/module/dht.c:1593
 #: src/applications/dht/module/dht.c:2314
 #: src/applications/dht/module/dht.c:2573 src/applications/rpc/rpc.c:1267
-#, possible-c-format
+#, c-format
 msgid "'%s' called with timeout above 1 hour (bug?)\n"
 msgstr ""
 
 #: src/applications/dht/module/dht.c:1782
-#, possible-c-format
+#, c-format
 msgid "Invalid response to '%s'.\n"
 msgstr ""
 
 #: src/applications/dht/module/dht.c:1980
-#, possible-c-format
+#, c-format
 msgid "Malformed response to '%s' on master table.\n"
 msgstr ""
 
 #: src/applications/dht/module/dht.c:2191
 #: src/applications/dht/module/dht.c:2470
-#, possible-c-format
+#, c-format
 msgid "Invalid response to '%s' from '%s'\n"
 msgstr ""
 
@@ -284,13 +293,13 @@
 #: src/applications/dht/module/dht.c:2970
 #: src/applications/dht/module/dht.c:3086
 #: src/applications/dht/module/dht.c:3212
-#, possible-c-format
+#, c-format
 msgid "Received invalid RPC '%s'.\n"
 msgstr ""
 
 #: src/applications/dht/module/dht.c:3098
 #: src/applications/dht/module/dht.c:3226
-#, possible-c-format
+#, c-format
 msgid "RPC for '%s' received for table that we do not participate in!\n"
 msgstr ""
 
@@ -309,8 +318,8 @@
 #: src/applications/dht/tools/dht-join.c:85
 #: src/applications/dht/tools/dht-query.c:84
 #: src/applications/fs/tools/gnunet-download.c:94
-#: src/applications/fs/tools/gnunet-insert.c:321
-#: src/applications/fs/tools/gnunet-insert.c:437
+#: src/applications/fs/tools/gnunet-insert.c:312
+#: src/applications/fs/tools/gnunet-insert.c:428
 #: src/applications/fs/tools/gnunet-pseudonym.c:120
 #: src/applications/fs/tools/gnunet-search.c:159
 #: src/applications/fs/tools/gnunet-search.c:175
@@ -329,7 +338,7 @@
 #: src/server/gnunet-transport-check.c:427
 #: src/server/gnunet-transport-check.c:441
 #: src/server/gnunet-transport-check.c:454
-#, possible-c-format
+#, c-format
 msgid "You must pass a number to the '%s' option.\n"
 msgstr ""
 
@@ -338,17 +347,17 @@
 msgstr ""
 
 #: src/applications/dht/tools/dht-join.c:131
-#, possible-c-format
+#, c-format
 msgid "Call to '%s' returns %d.\n"
 msgstr ""
 
 #: src/applications/dht/tools/dht-join.c:132
-#, possible-c-format
+#, c-format
 msgid "Call to '%s' with key '%s'.\n"
 msgstr ""
 
 #: src/applications/dht/tools/dht-join.c:133
-#, possible-c-format
+#, c-format
 msgid "Call to '%s' with value '%.*s' (%d bytes).\n"
 msgstr ""
 
@@ -405,13 +414,13 @@
 msgstr ""
 
 #: src/applications/dht/tools/dht-query.c:253
-#, possible-c-format
+#, c-format
 msgid "Command '%s' requires an argument ('%s').\n"
 msgstr ""
 
 #: src/applications/dht/tools/dht-query.c:261
 #: src/applications/dht/tools/dht-query.c:271
-#, possible-c-format
+#, c-format
 msgid "Command '%s' requires two arguments ('%s' and '%s').\n"
 msgstr ""
 
@@ -425,7 +434,7 @@
 #: src/applications/dht/tools/dht_api.c:289
 #: src/applications/dht/tools/dht_api.c:343
 #: src/applications/dht/tools/dht_api.c:377
-#, possible-c-format
+#, c-format
 msgid "Failed to send '%s'.  Closing connection.\n"
 msgstr ""
 
@@ -433,19 +442,19 @@
 #: src/applications/dht/tools/dht_api.c:253
 #: src/applications/dht/tools/dht_api.c:307
 #: src/applications/dht/tools/dht_api.c:360
-#, possible-c-format
+#, c-format
 msgid "Received invalid '%s' request (size %d)\n"
 msgstr ""
 
 #: src/applications/dht/tools/dht_api.c:214
 #: src/applications/dht/tools/dht_api.c:266
 #: src/applications/dht/tools/dht_api.c:320
-#, possible-c-format
+#, c-format
 msgid "Received invalid '%s' request (wrong table)\n"
 msgstr ""
 
 #: src/applications/dht/tools/dht_api.c:390
-#, possible-c-format
+#, c-format
 msgid "Received unknown request type %d at %s:%d\n"
 msgstr ""
 
@@ -458,22 +467,22 @@
 msgstr ""
 
 #: src/applications/dht/tools/dht_api.c:520
-#, possible-c-format
+#, c-format
 msgid "gnunetd signaled error in response to '%s' message\n"
 msgstr ""
 
 #: src/applications/dht/tools/dht_api.c:525
-#, possible-c-format
+#, c-format
 msgid "Failed to receive response to '%s' message from gnunetd\n"
 msgstr ""
 
 #: src/applications/dht/tools/dht_api.c:530
-#, possible-c-format
+#, c-format
 msgid "Failed to send '%s' message to gnunetd\n"
 msgstr ""
 
 #: src/applications/dht/tools/dht_api.c:622
-#, possible-c-format
+#, c-format
 msgid "Unexpected reply to '%s' operation.\n"
 msgstr ""
 
@@ -500,20 +509,20 @@
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:565
+#: src/applications/fragmentation/fragmentation.c:556
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:557
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:558
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:577
-#, possible-c-format
+#: src/applications/fragmentation/fragmentation.c:568
+#, c-format
 msgid "'%s' registering handler %d\n"
 msgstr ""
 
@@ -524,48 +533,48 @@
 msgstr ""
 
 #: src/applications/fs/ecrs/download.c:1054
-#, possible-c-format
+#, c-format
 msgid "Content '%s' seems to be not available on the network.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:772
-#, possible-c-format
+#: src/applications/fs/ecrs/meta.c:779
+#, c-format
 msgid "Renaming of file '%s' to '%s' failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:778
-#, possible-c-format
+#: src/applications/fs/ecrs/meta.c:785
+#, c-format
 msgid "Could not rename file '%s' to '%s': file exists\n"
 msgstr ""
 
 #: src/applications/fs/ecrs/namespace.c:45
-#, possible-c-format
+#, 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
-#, possible-c-format
+#, c-format
 msgid "Cannot create pseudonym '%s', file '%s' exists.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:295
-#: src/applications/fs/ecrs/namespace.c:371
-#: src/applications/fs/ecrs/namespace.c:516
-#, possible-c-format
+#: src/applications/fs/ecrs/namespace.c:304
+#: src/applications/fs/ecrs/namespace.c:380
+#: src/applications/fs/ecrs/namespace.c:524
+#, c-format
 msgid "File '%s' does not contain a pseudonym.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:306
-#: src/applications/fs/ecrs/namespace.c:382
-#, possible-c-format
+#: src/applications/fs/ecrs/namespace.c:315
+#: src/applications/fs/ecrs/namespace.c:391
+#, c-format
 msgid "Format of pseudonym '%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:526
-#: src/applications/fs/ecrs/namespace.c:536
-#, possible-c-format
+#: src/applications/fs/ecrs/namespace.c:534
+#: src/applications/fs/ecrs/namespace.c:544
+#, c-format
 msgid "Format of file '%s' is invalid.\n"
 msgstr ""
 
@@ -578,24 +587,24 @@
 msgstr ""
 
 #: src/applications/fs/ecrs/upload.c:182
-#, possible-c-format
+#, c-format
 msgid "Cannot hash '%s'.\n"
 msgstr ""
 
 #: src/applications/fs/ecrs/upload.c:200
-#, possible-c-format
+#, c-format
 msgid "Initialization for indexing file '%s' failed.\n"
 msgstr ""
 
 #: src/applications/fs/ecrs/upload.c:206
-#, possible-c-format
+#, c-format
 msgid ""
 "Indexing file '%s' failed. Check file permissions and consult your GNUnet "
 "server's logs.\n"
 msgstr ""
 
 #: src/applications/fs/ecrs/upload.c:289
-#, possible-c-format
+#, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
@@ -624,7 +633,7 @@
 msgstr ""
 
 #: src/applications/fs/fsui/fsui.c:597
-#, possible-c-format
+#, c-format
 msgid "FSUI state file '%s' had syntax error at offset %u.\n"
 msgstr ""
 
@@ -632,11 +641,11 @@
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:526
+#: src/applications/fs/fsui/namespace_info.c:523
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:547
+#: src/applications/fs/fsui/namespace_info.c:544
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -658,32 +667,36 @@
 msgid "Cannot upload directory without using recursion.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:949
-#, possible-c-format
+#: src/applications/fs/module/fs.c:964
+#, 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:990
-#, possible-c-format
+#: src/applications/fs/module/fs.c:1005
+#, c-format
 msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
+#: src/applications/fs/module/fs.c:1042
+msgid "enables (anonymous) file-sharing"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:71
-#, possible-c-format
+#, c-format
 msgid ""
 "You must specify a directory for FS files in the configuration in section '%"
 "s' under '%s'."
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:327
-#, possible-c-format
+#: src/applications/fs/module/ondemand.c:326
+#, c-format
 msgid "Indexed file disappeared, deleting block for query '%s'\n"
 msgstr ""
 
 #: src/applications/fs/module/ondemand.c:408
-#, possible-c-format
+#, c-format
 msgid ""
 "Because the file '%s' has been unavailable for 3 days it got removed from "
 "your share.  Please unindex files before deleting them as the index now "
@@ -691,19 +704,19 @@
 msgstr ""
 
 #: src/applications/fs/module/ondemand.c:434
-#, possible-c-format
+#, 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:629
-#, possible-c-format
+#, c-format
 msgid ""
 "Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1875
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1880
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
@@ -808,7 +821,7 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-download.c:159
-#, possible-c-format
+#, c-format
 msgid "Download of file '%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
 msgstr ""
 
@@ -824,12 +837,12 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-download.c:203
-#, possible-c-format
+#, c-format
 msgid "Recursive download of directory '%s' at %llu of %llu bytes.\n"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-download.c:242
-#, possible-c-format
+#, c-format
 msgid "URI '%s' invalid for gnunet-download.\n"
 msgstr ""
 
@@ -840,184 +853,169 @@
 
 #: src/applications/fs/tools/gnunet-insert.c:110
 #, c-format
-msgid "Created namespace entry '%s'\n"
+msgid "Created entry '%s' in namespace '%s'\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:126
-msgid "ms"
+#: src/applications/fs/tools/gnunet-insert.c:115
+#, c-format
+msgid "Failed to add entry to namespace '%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:131
-msgid "s"
+#: src/applications/fs/tools/gnunet-insert.c:136
+#, c-format
+msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:134
-msgid "m"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:137
-msgid "h"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:140
-msgid " days"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:145
-#, possible-c-format
-msgid "%16llu of %16llu bytes inserted (estimating %llu%s to completion)\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:159
-#, possible-c-format
+#: src/applications/fs/tools/gnunet-insert.c:150
+#, c-format
 msgid "Upload of '%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:173
-#, possible-c-format
+#: src/applications/fs/tools/gnunet-insert.c:164
+#, c-format
 msgid "Upload of '%s' complete, current average speed is %8.3f kbps.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:183
+#: src/applications/fs/tools/gnunet-insert.c:174
 #, c-format
 msgid "File '%s' has URI: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:196
+#: src/applications/fs/tools/gnunet-insert.c:187
 #, c-format
 msgid ""
 "\n"
 "Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:215
+#: src/applications/fs/tools/gnunet-insert.c:206
 #: src/applications/fs/tools/gnunet-pseudonym.c:33
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/fs/tools/gnunet-insert.c:209
 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:221
+#: src/applications/fs/tools/gnunet-insert.c:212
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:225
+#: src/applications/fs/tools/gnunet-insert.c:216
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:228
+#: src/applications/fs/tools/gnunet-insert.c:219
 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:231
+#: src/applications/fs/tools/gnunet-insert.c:222
 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:235
+#: src/applications/fs/tools/gnunet-insert.c:226
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-insert.c:228
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:231
 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:243
+#: src/applications/fs/tools/gnunet-insert.c:234
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:236
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:247
+#: src/applications/fs/tools/gnunet-insert.c:238
 msgid "process directories recursively"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:249
+#: src/applications/fs/tools/gnunet-insert.c:240
 msgid ""
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:252
+#: src/applications/fs/tools/gnunet-insert.c:243
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:255
+#: src/applications/fs/tools/gnunet-insert.c:246
 msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:257
+#: src/applications/fs/tools/gnunet-insert.c:248
 msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:264
+#: src/applications/fs/tools/gnunet-insert.c:255
 msgid "Make files available to GNUnet for sharing."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:345
-#, possible-c-format
+#: src/applications/fs/tools/gnunet-insert.c:336
+#, c-format
 msgid "You must pass a positive number to the '%s' option.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:513
+#: src/applications/fs/tools/gnunet-insert.c:504
 #: src/applications/fs/tools/gnunet-unindex.c:144
 #, c-format
 msgid "You must specify a list of files to insert.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:517
+#: src/applications/fs/tools/gnunet-insert.c:508
 #, c-format
 msgid "Only one file or directory can be specified at a time.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:521
+#: src/applications/fs/tools/gnunet-insert.c:512
 #, c-format
 msgid "You must specify a file or directory to upload.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:570
+#: src/applications/fs/tools/gnunet-insert.c:561
 #, c-format
 msgid "Keywords for file '%s':\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:592
+#: src/applications/fs/tools/gnunet-insert.c:583
 #, c-format
 msgid "Could not access namespace '%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:607
-#, possible-c-format
+#: src/applications/fs/tools/gnunet-insert.c:598
+#, c-format
 msgid "Parsing time failed. Use '%s' format.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:616
-#: src/applications/fs/tools/gnunet-insert.c:620
+#: src/applications/fs/tools/gnunet-insert.c:607
+#: src/applications/fs/tools/gnunet-insert.c:611
+#: src/applications/fs/tools/gnunet-insert.c:615
+#: src/applications/fs/tools/gnunet-insert.c:619
 #: src/applications/fs/tools/gnunet-insert.c:624
-#: src/applications/fs/tools/gnunet-insert.c:628
-#: src/applications/fs/tools/gnunet-insert.c:633
-#, possible-c-format
+#, c-format
 msgid "Option '%s' makes no sense without option '%s'.\n"
 msgstr ""
 
@@ -1092,7 +1090,7 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:221
-#, possible-c-format
+#, c-format
 msgid "Invalid argument: '%s'\n"
 msgstr ""
 
@@ -1192,14 +1190,14 @@
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-unindex.c:50
-#, possible-c-format
+#, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 "completion)                "
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-unindex.c:61
-#, possible-c-format
+#, c-format
 msgid ""
 "\n"
 "Unindexing of '%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
@@ -1226,42 +1224,46 @@
 msgid "'%s' failed.  Is '%s' a file?\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1864
+#: src/applications/gap/gap.c:1869
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1881 src/applications/gap/gap.c:1886
-#: src/applications/gap/gap.c:1892
+#: src/applications/gap/gap.c:1886 src/applications/gap/gap.c:1891
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2103
+#: src/applications/gap/gap.c:2113
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2134
-#, possible-c-format
+#: src/applications/gap/gap.c:2144
+#, c-format
 msgid "'%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:74
-#, possible-c-format
+#: src/applications/getoption/getoption.c:75
+#, c-format
 msgid "'%s' registering client handler %d\n"
 msgstr ""
 
+#: src/applications/getoption/getoption.c:82
+msgid "allows clients to determine gnunetd's configuration"
+msgstr ""
+
 #: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:966
-#, possible-c-format
+#: src/applications/identity/identity.c:976
+#, c-format
 msgid ""
 "Configuration file must specify a directory for GNUnet to store per-peer "
 "data under %s%s\n"
 msgstr ""
 
 #: src/applications/identity/hostkey.c:119
-#, possible-c-format
+#, c-format
 msgid ""
 "Existing hostkey in file '%s' failed format check, creating new hostkey.\n"
 msgstr ""
@@ -1278,130 +1280,130 @@
 msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:327
-#, possible-c-format
+#: src/applications/identity/identity.c:330
+#, c-format
 msgid ""
 "File '%s' in directory '%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:360
-#, possible-c-format
+#: src/applications/identity/identity.c:363
+#, c-format
 msgid "%s '%s' returned no known hosts!\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:606
-#: src/applications/identity/identity.c:625
-#, possible-c-format
+#: src/applications/identity/identity.c:614
+#: src/applications/identity/identity.c:632
+#, c-format
 msgid "Removed file '%s' containing invalid HELO data.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:119
-#: src/applications/pingpong/pingpong.c:170
-#: src/applications/pingpong/pingpong.c:210
-#: src/applications/pingpong/pingpong.c:275
-#, possible-c-format
+#: src/applications/pingpong/pingpong.c:120
+#: src/applications/pingpong/pingpong.c:171
+#: src/applications/pingpong/pingpong.c:211
+#: src/applications/pingpong/pingpong.c:276
+#, c-format
 msgid "Received malformed '%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:129
+#: src/applications/pingpong/pingpong.c:130
 msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:178
+#: src/applications/pingpong/pingpong.c:179
 msgid "Received PING not destined for us!\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:250
-#: src/applications/pingpong/pingpong.c:308
+#: src/applications/pingpong/pingpong.c:251
+#: src/applications/pingpong/pingpong.c:309
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:349
+#: src/applications/pingpong/pingpong.c:350
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:465
+#: src/applications/pingpong/pingpong.c:467
 msgid "# encrypted PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:467
+#: src/applications/pingpong/pingpong.c:469
 msgid "# plaintext PONG messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:469
+#: src/applications/pingpong/pingpong.c:471
 msgid "# encrypted PING messages received"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:471
+#: src/applications/pingpong/pingpong.c:473
 msgid "# PING messages created"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:475
 msgid "# encrypted PONG messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:475
+#: src/applications/pingpong/pingpong.c:477
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:477
+#: src/applications/pingpong/pingpong.c:479
 msgid "# encrypted PING messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:486
-#, possible-c-format
+#: src/applications/pingpong/pingpong.c:488
+#, c-format
 msgid "'%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
 #: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
-#, possible-c-format
+#, 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
-#, possible-c-format
+#, 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
-#, possible-c-format
+#, c-format
 msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
 #: src/applications/rpc/rpc.c:279
-#, possible-c-format
+#, 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
-#, possible-c-format
+#, c-format
 msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
 #: src/applications/rpc/rpc.c:936
-#, possible-c-format
+#, c-format
 msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
 #: src/applications/rpc/rpc.c:1388
-#, possible-c-format
+#, c-format
 msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
 #: src/applications/rpc/rpc.c:1414
-#, possible-c-format
+#, c-format
 msgid "'%s' registering handlers %d %d %d\n"
 msgstr ""
 
 #: src/applications/rpc/rpc.c:1435
-#, possible-c-format
+#, c-format
 msgid "Failed to initialize '%s' service.\n"
 msgstr ""
 
@@ -1413,43 +1415,43 @@
 msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:207
-#, possible-c-format
+#: src/applications/session/connect.c:208
+#, c-format
 msgid "Session key from peer '%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:244
+#: src/applications/session/connect.c:245
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:510
-#, possible-c-format
+#: src/applications/session/connect.c:518
+#, c-format
 msgid "Invalid '%s' message received from peer '%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:518
-#, possible-c-format
+#: src/applications/session/connect.c:526
+#, c-format
 msgid "SKEY from '%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:570
+#: src/applications/session/connect.c:578
 msgid ""
 "Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:716
+#: src/applications/session/connect.c:725
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:718
+#: src/applications/session/connect.c:727
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:720
+#: src/applications/session/connect.c:729
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:722
+#: src/applications/session/connect.c:731
 msgid "# sessions established"
 msgstr ""
 
@@ -1468,9 +1470,9 @@
 #: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
 #: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
 #: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:993 src/include/gnunet_util.h:1000
-#: src/include/gnunet_util.h:1002
-#, possible-c-format
+#: src/include/gnunet_util.h:1002 src/include/gnunet_util.h:1009
+#: src/include/gnunet_util.h:1011
+#, c-format
 msgid "'%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
@@ -1483,12 +1485,12 @@
 msgstr ""
 
 #: src/applications/sqstore_mysql/mysql.c:1108
-#, possible-c-format
+#, c-format
 msgid "Query '%s' had no results.\n"
 msgstr ""
 
 #: src/applications/sqstore_mysql/mysql.c:1199
-#, possible-c-format
+#, c-format
 msgid "Trying to use file '%s' for MySQL configuration.\n"
 msgstr ""
 
@@ -1508,7 +1510,7 @@
 msgstr ""
 
 #: src/applications/sqstore_sqlite/sqlite.c:915
-#, possible-c-format
+#, c-format
 msgid ""
 "Configuration file must specify directory for storing FS data in section '%"
 "s' under '%s'.\n"
@@ -1553,17 +1555,17 @@
 msgstr ""
 
 #: src/applications/stats/statistics.c:206
-#, possible-c-format
+#, c-format
 msgid "% of allowed network load (up)"
 msgstr ""
 
 #: src/applications/stats/statistics.c:208
-#, possible-c-format
+#, c-format
 msgid "% of allowed network load (down)"
 msgstr ""
 
 #: src/applications/stats/statistics.c:210
-#, possible-c-format
+#, c-format
 msgid "% of allowed cpu load"
 msgstr ""
 
@@ -1571,6 +1573,10 @@
 msgid "# bytes of noise received"
 msgstr ""
 
+#: src/applications/stats/statistics.c:372
+msgid "keeps statistics about gnunetd's operation"
+msgstr ""
+
 #: src/applications/tbench/gnunet-tbench.c:95
 msgid "output in gnuplot format"
 msgstr ""
@@ -1612,7 +1618,7 @@
 msgstr ""
 
 #: src/applications/tbench/gnunet-tbench.c:228
-#, possible-c-format
+#, c-format
 msgid "Invalid receiver peer ID specified ('%s' is not valid name).\n"
 msgstr ""
 
@@ -1622,12 +1628,12 @@
 msgstr ""
 
 #: src/applications/tbench/gnunet-tbench.c:250
-#, possible-c-format
+#, c-format
 msgid "\tmax      %llums\n"
 msgstr ""
 
 #: src/applications/tbench/gnunet-tbench.c:252
-#, possible-c-format
+#, c-format
 msgid "\tmin      %llums\n"
 msgstr ""
 
@@ -1678,6 +1684,10 @@
 "Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
+#: src/applications/tbench/tbench.c:447
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr ""
+
 #: src/applications/tbench/tbenchtest.c:57
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
@@ -1714,7 +1724,7 @@
 msgstr ""
 
 #: src/applications/template/template.c:59
-#, possible-c-format
+#, c-format
 msgid "'%s' registering client handler %d and %d\n"
 msgstr ""
 
@@ -1723,7 +1733,7 @@
 msgstr ""
 
 #: src/applications/testbed/gnunet-testbed.c:180
-#, possible-c-format
+#, c-format
 msgid "Cannot connect to LOOPBACK port %d: %s\n"
 msgstr ""
 
@@ -1737,14 +1747,14 @@
 msgstr ""
 
 #: src/applications/testbed/gnunet-testbed.c:344
-#, possible-c-format
+#, c-format
 msgid ""
 "Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
 "Trying again in %d seconds...\n"
 msgstr ""
 
 #: src/applications/testbed/gnunet-testbed.c:411 src/server/tcpserver.c:523
-#, possible-c-format
+#, c-format
 msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr ""
 
@@ -1754,7 +1764,7 @@
 msgstr ""
 
 #: src/applications/testbed/gnunet-testbed.c:463
-#, possible-c-format
+#, c-format
 msgid "Command '%s' not found!\n"
 msgstr ""
 
@@ -1763,7 +1773,7 @@
 msgstr ""
 
 #: src/applications/testbed/gnunet-testbed.c:590
-#, possible-c-format
+#, c-format
 msgid "Malformed entry in the configuration in section %s under %s: %s\n"
 msgstr ""
 
@@ -1772,23 +1782,23 @@
 msgstr ""
 
 #: src/applications/testbed/testbed.c:60
-#, possible-c-format
+#, c-format
 msgid "Received unknown testbed message of type %u.\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:78
 #: src/applications/testbed/testbed.c:807
-#, possible-c-format
+#, c-format
 msgid "size of '%s' message is too short. Ignoring.\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:85
-#, possible-c-format
+#, c-format
 msgid "size of '%s' message is wrong. Ignoring.\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:137
-#, possible-c-format
+#, c-format
 msgid "TESTBED could not generate HELO message for protocol %u\n"
 msgstr ""
 
@@ -1798,18 +1808,18 @@
 #: src/applications/testbed/testbed.c:366
 #: src/applications/testbed/testbed.c:403
 #: src/applications/testbed/testbed.c:410
-#, possible-c-format
+#, c-format
 msgid "received invalid '%s' message\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:231
 #: src/applications/testbed/testbed.c:271
-#, possible-c-format
+#, c-format
 msgid "received invalid '%s' message (empty module name)\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:238
-#, possible-c-format
+#, c-format
 msgid "loading module '%s' failed.  Notifying client.\n"
 msgstr ""
 
@@ -1823,12 +1833,12 @@
 msgstr ""
 
 #: src/applications/testbed/testbed.c:625
-#, possible-c-format
+#, c-format
 msgid "received invalid '%s' message: %s.\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:817
-#, possible-c-format
+#, c-format
 msgid "'..' is not allowed in file name (%s).\n"
 msgstr ""
 
@@ -1845,17 +1855,17 @@
 msgstr ""
 
 #: src/applications/testbed/testbed.c:867
-#, possible-c-format
+#, c-format
 msgid "Invalid message received at %s:%d."
 msgstr ""
 
 #: src/applications/testbed/testbed.c:985
-#, possible-c-format
+#, c-format
 msgid "received invalid testbed message of size %u\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:1002
-#, possible-c-format
+#, c-format
 msgid ""
 "Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
@@ -1864,28 +1874,28 @@
 msgid "No testbed URL given, not registered.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1453
-#, possible-c-format
+#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1449
+#, c-format
 msgid "Could not resolve name of HTTP proxy '%s'.\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:1119
-#, possible-c-format
+#, c-format
 msgid "Malformed http URL: '%s' at '%s'.  Testbed-client not registered.\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:1155
-#, possible-c-format
+#, c-format
 msgid "Could not register testbed, host '%s' unknown\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:1177
-#, possible-c-format
+#, c-format
 msgid "Failed to send HTTP request to host '%s': %s\n"
 msgstr ""
 
 #: src/applications/testbed/testbed.c:1230
-#, possible-c-format
+#, c-format
 msgid "Failed so send HTTP request '%s' to host '%s': %s\n"
 msgstr ""
 
@@ -1893,19 +1903,23 @@
 msgid "Exit register (error: no http response read).\n"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:377
-#, possible-c-format
-msgid "Version mismatch ('%s' vs. '%s'), run gnunet-update!\n"
+#: src/applications/testbed/testbed.c:1357
+msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
+#: src/applications/topology_default/topology.c:388
+#, c-format
+msgid "Version mismatch ('%s' vs. '%*.s'), run gnunet-update!\n"
+msgstr ""
+
 #: src/applications/topology_f2f/topology.c:301
-#, possible-c-format
+#, c-format
 msgid ""
 "Need to have list of friends in configuration under '%s' in section '%s'.\n"
 msgstr ""
 
 #: src/applications/topology_f2f/topology.c:320
-#, possible-c-format
+#, c-format
 msgid "Failed to read friends list from '%s'\n"
 msgstr ""
 
@@ -1914,7 +1928,7 @@
 msgstr ""
 
 #: src/applications/topology_f2f/topology.c:348
-#, possible-c-format
+#, c-format
 msgid "Syntax error in topology specification, skipping bytes '%s'.\n"
 msgstr ""
 
@@ -1970,37 +1984,25 @@
 msgid "Could not send request to gnunetd.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:69
-#: src/applications/tracekit/tracekit.c:195
-#, possible-c-format
+#: src/applications/tracekit/tracekit.c:62
+#: src/applications/tracekit/tracekit.c:179
+#, c-format
 msgid "Received invalid '%s' message from '%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:255
+#: src/applications/tracekit/tracekit.c:236
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:363
-#, possible-c-format
+#: src/applications/tracekit/tracekit.c:334
+#, c-format
 msgid "TRACEKIT: received invalid '%s' message\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:448
-msgid "# client trace requests received"
+#: src/applications/tracekit/tracekit.c:434
+msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:450
-msgid "# client trace replies sent"
-msgstr ""
-
-#: src/applications/tracekit/tracekit.c:452
-msgid "# p2p trace requests received"
-msgstr ""
-
-#: src/applications/tracekit/tracekit.c:454
-msgid "# p2p trace replies sent"
-msgstr ""
-
 #: src/applications/traffic/clientapi.c:67
 msgid "Failed to query gnunetd about traffic conditions.\n"
 msgstr ""
@@ -2010,40 +2012,44 @@
 msgstr ""
 
 #: src/applications/traffic/traffic.c:445
-#, possible-c-format
+#, c-format
 msgid "# bytes transmitted of type %d"
 msgstr ""
 
 #: src/applications/traffic/traffic.c:465
-#, possible-c-format
+#, c-format
 msgid "# bytes received of type %d"
 msgstr ""
 
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
+
+#: src/applications/transport/transport.c:469
 #: src/applications/transport/transport.c:477
-#: src/applications/transport/transport.c:485
-#, possible-c-format
+#, c-format
 msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:642
-#, possible-c-format
+#: src/applications/transport/transport.c:635
+#, c-format
 msgid "Option '%s' not set in configuration in section '%s', setting to %dm.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:657
-#, possible-c-format
+#: src/applications/transport/transport.c:650
+#, c-format
 msgid ""
 "You should specify at least one transport service under option '%s' in "
 "section '%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:683
-#, possible-c-format
+#: src/applications/transport/transport.c:676
+#, c-format
 msgid "Transport library '%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:704
-#, possible-c-format
+#: src/applications/transport/transport.c:697
+#, c-format
 msgid "I am peer '%s'.\n"
 msgstr ""
 
@@ -2209,7 +2215,7 @@
 msgstr ""
 
 #: src/conf/gconf_support.c:90 src/conf/gconf_support.c:114
-#, possible-c-format
+#, c-format
 msgid "Couldn't find pixmap file: %s"
 msgstr ""
 
@@ -2218,7 +2224,7 @@
 "USAGE: gnunet-setup MODULE\n"
 "\n"
 "MODULE\n"
-" recreate\t\trecreate configuration files\n"
+" recreate\trecreate configuration files\n"
 " config\t\ttext-based configuration\n"
 " menuconfig\ttext-based menu\n"
 " gconfig\tGTK configuration\n"
@@ -2272,7 +2278,7 @@
 msgstr ""
 
 #: src/conf/wizard_callbacks.c:213
-#, possible-c-format
+#, c-format
 msgid "Unable to save configuration file %s:"
 msgstr ""
 
@@ -2285,9 +2291,7 @@
 msgstr ""
 
 #: src/conf/wizard_curs.c:47 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:205 src/conf/wizard_util.c:220
-#: src/conf/wizard_util.c:248 src/conf/wizard_util.c:254
-#: src/conf/wizard_util.c:411 src/conf/wizard_util.c:429
+#: src/conf/wizard_util.c:116 src/conf/wizard_util.c:157
 msgid "Error"
 msgstr ""
 
@@ -2497,7 +2501,7 @@
 msgstr ""
 
 #: src/conf/wizard_curs.c:568
-#, possible-c-format
+#, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
 "\n"
@@ -2701,136 +2705,143 @@
 msgid "User account:"
 msgstr ""
 
-#: src/conf/wizard_util.c:174 src/conf/wizard_util.c:236
+#: src/conf/wizard_util.c:89
 msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/conf/wizard_util.c:180
+#: src/conf/wizard_util.c:94
 msgid "Can't create service"
 msgstr ""
 
-#: src/conf/wizard_util.c:185 src/conf/wizard_util.c:248
-msgid "Unknown error"
-msgstr ""
-
-#: src/conf/wizard_util.c:198
+#: src/conf/wizard_util.c:99
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr ""
 
-#: src/conf/wizard_util.c:219
+#: src/conf/wizard_util.c:103
 msgid "Cannot write to the regisitry"
 msgstr ""
 
-#: src/conf/wizard_util.c:240
+#: src/conf/wizard_util.c:106
 msgid "Can't access the service"
 msgstr ""
 
-#: src/conf/wizard_util.c:244
+#: src/conf/wizard_util.c:109
 msgid "Can't delete the service"
 msgstr ""
 
-#: src/conf/wizard_util.c:410
+#: src/conf/wizard_util.c:112
+msgid "Unknown error"
+msgstr ""
+
+#: src/conf/wizard_util.c:140
 msgid "This version of Windows does not support multiple users."
 msgstr ""
 
-#: src/conf/wizard_util.c:414
+#: src/conf/wizard_util.c:144
 msgid "Error creating user"
 msgstr ""
 
-#: src/conf/wizard_util.c:417
+#: src/conf/wizard_util.c:147
 msgid "Error accessing local security policy"
 msgstr ""
 
-#: src/conf/wizard_util.c:420
+#: src/conf/wizard_util.c:150
 msgid "Error granting service right to user"
 msgstr ""
 
-#: src/conf/wizard_util.c:423
+#: src/conf/wizard_util.c:153
 msgid "Unknown error while creating a new user"
 msgstr ""
 
-#: src/server/connection.c:993
-#, possible-c-format
+#: src/server/connection.c:971
+#, c-format
 msgid "'%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/server/connection.c:1001
-#, possible-c-format
+#: src/server/connection.c:979
+#, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/server/connection.c:1970
-#, possible-c-format
+#: src/server/connection.c:2155
+#, c-format
 msgid "Message from '%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/server/connection.c:2044
-#, possible-c-format
+#: src/server/connection.c:2232
+#, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/server/connection.c:2060
+#: src/server/connection.c:2248
 msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/server/connection.c:2193
-#, possible-c-format
-msgid "Session with peer '%s' confirmed, but I cannot connect! (bug?)\n"
-msgstr ""
-
-#: src/server/connection.c:2470
+#: src/server/connection.c:2641
 msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2472
+#: src/server/connection.c:2643
 msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/server/connection.c:2474
+#: src/server/connection.c:2645
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
+#: src/server/connection.c:2647
+msgid "# bytes encrypted"
+msgstr ""
+
+#: src/server/connection.c:2649
+msgid "# bytes decrypted"
+msgstr ""
+
+#: src/server/connection.c:2651
+msgid "# bytes noise sent"
+msgstr ""
+
 #: src/server/core.c:114
-#, possible-c-format
+#, c-format
 msgid "Application module '%s' already initialized!\n"
 msgstr ""
 
 #: src/server/core.c:167
-#, possible-c-format
+#, c-format
 msgid "Failed to load plugin '%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
 #: src/server/core.c:214
-#, possible-c-format
+#, c-format
 msgid "Could not shutdown '%s': application not loaded\n"
 msgstr ""
 
 #: src/server/core.c:221
-#, possible-c-format
+#, c-format
 msgid "Could not shutdown application '%s': not initialized\n"
 msgstr ""
 
 #: src/server/core.c:230 src/server/core.c:419
-#, possible-c-format
+#, c-format
 msgid "Could not find '%s%s' method in library '%s'.\n"
 msgstr ""
 
 #: src/server/core.c:397
-#, possible-c-format
+#, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/server/core.c:475 src/server/gnunet-update.c:218
+#: src/server/core.c:475 src/server/gnunet-update.c:219
 msgid "No applications defined in configuration!\n"
 msgstr ""
 
 #: src/server/core.c:498
-#, possible-c-format
+#, c-format
 msgid "Could not initialize application '%s'\n"
 msgstr ""
 
 #: src/server/core.c:515
-#, possible-c-format
+#, c-format
 msgid "Could not properly shutdown application '%s'.\n"
 msgstr ""
 
@@ -2839,7 +2850,7 @@
 msgstr ""
 
 #: src/server/core.c:632
-#, possible-c-format
+#, c-format
 msgid "Could not properly unload service '%s'!\n"
 msgstr ""
 
@@ -2854,7 +2865,7 @@
 msgstr ""
 
 #: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
-#, possible-c-format
+#, c-format
 msgid "Could not get address of peer '%s'.\n"
 msgstr ""
 
@@ -2877,35 +2888,35 @@
 msgid "'%s': Could not connect.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:146
+#: src/server/gnunet-transport-check.c:147
 #, c-format
 msgid "'%s': Could not send.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:166
-#, possible-c-format
+#: src/server/gnunet-transport-check.c:167
+#, c-format
 msgid "'%s': Did not receive message within %llu ms.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:180
+#: src/server/gnunet-transport-check.c:181
 #, c-format
 msgid "'%s': Could not disconnect.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:187
+#: src/server/gnunet-transport-check.c:188
 #, c-format
 msgid ""
 "'%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:220
+#: src/server/gnunet-transport-check.c:221
 #, c-format
 msgid ""
 "\n"
 "Contacting '%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:231
+#: src/server/gnunet-transport-check.c:232
 #, c-format
 msgid " Transport %d not available\n"
 msgstr ""
@@ -2921,7 +2932,7 @@
 msgstr ""
 
 #: src/server/gnunet-transport-check.c:321
-#, possible-c-format
+#, c-format
 msgid "No reply received within %llums.\n"
 msgstr ""
 
@@ -2993,58 +3004,58 @@
 "Exiting.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:235
-#, possible-c-format
+#: src/server/gnunet-update.c:236
+#, c-format
 msgid "Updating data for module '%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:239
-#, possible-c-format
+#: src/server/gnunet-update.c:240
+#, c-format
 msgid "Failed to update data for module '%s'\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:294
+#: src/server/gnunet-update.c:296
 #, c-format
 msgid "Updated data for %d applications.\n"
 msgstr ""
 
 #: src/server/gnunetd.c:108
-#, possible-c-format
+#, c-format
 msgid "Configuration or GNUnet version changed.  You need to run '%s'!\n"
 msgstr ""
 
 #: src/server/gnunetd.c:116
-#, possible-c-format
+#, c-format
 msgid "'%s' starting\n"
 msgstr ""
 
 #: src/server/gnunetd.c:138
-#, possible-c-format
+#, c-format
 msgid "'%s' startup complete.\n"
 msgstr ""
 
 #: src/server/gnunetd.c:143
-#, possible-c-format
+#, c-format
 msgid "'%s' is shutting down.\n"
 msgstr ""
 
 #: src/server/handler.c:366
-#, possible-c-format
+#, c-format
 msgid "Received corrupt message from peer '%s'in %s:%d.\n"
 msgstr ""
 
 #: src/server/startup.c:123
-#, possible-c-format
+#, c-format
 msgid "The '%s' request received from client is malformed.\n"
 msgstr ""
 
 #: src/server/startup.c:268
-#, possible-c-format
+#, c-format
 msgid "You must specify a name for the PID file in section '%s' under '%s'.\n"
 msgstr ""
 
 #: src/server/startup.c:283
-#, possible-c-format
+#, c-format
 msgid "Could not write PID to file '%s': %s.\n"
 msgstr ""
 
@@ -3063,12 +3074,12 @@
 msgstr ""
 
 #: src/server/startup.c:488
-#, possible-c-format
+#, c-format
 msgid "User '%s' not known, cannot change UID to it."
 msgstr ""
 
 #: src/server/startup.c:499
-#, possible-c-format
+#, c-format
 msgid "Cannot change user/group to '%s': %s"
 msgstr ""
 
@@ -3077,7 +3088,7 @@
 msgstr ""
 
 #: src/server/startup.c:521
-#, possible-c-format
+#, c-format
 msgid "Argument %d: '%s'\n"
 msgstr ""
 
@@ -3086,29 +3097,29 @@
 msgstr ""
 
 #: src/server/tcpserver.c:425
-#, possible-c-format
+#, c-format
 msgid "'%s' failed for port %d: %s. Will try again in %d seconds.\n"
 msgstr ""
 
 #: src/server/tcpserver.c:696
-#, possible-c-format
+#, c-format
 msgid ""
 "Malformed network specification in the configuration in section '%s' for "
 "entry '%s': %s\n"
 msgstr ""
 
 #: src/server/tcpserver.c:802
-#, possible-c-format
+#, c-format
 msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
 #: src/transports/ip6.c:60 src/transports/ip.c:67 src/util/tcpio.c:87
-#, possible-c-format
+#, c-format
 msgid "Could not find IP of host '%s': %s\n"
 msgstr ""
 
 #: src/transports/ip6.c:100 src/transports/ip.c:309
-#, possible-c-format
+#, c-format
 msgid "Could not resolve '%s': %s\n"
 msgstr ""
 
@@ -3121,45 +3132,45 @@
 msgstr ""
 
 #: src/transports/http.c:816 src/transports/tcp.c:688 src/transports/udp.c:285
-#, possible-c-format
+#, c-format
 msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/transports/http.c:1099
+#: src/transports/http.c:1097
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/http.c:1174 src/transports/tcp.c:1127 src/util/tcpio.c:166
+#: src/transports/http.c:1171 src/transports/tcp.c:1124 src/util/tcpio.c:166
 #: src/util/tcpio.c:196
-#, possible-c-format
+#, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/transports/http.c:1331
-#, possible-c-format
+#: src/transports/http.c:1327
+#, c-format
 msgid ""
 "Could not bind the HTTP listener to port %d. No transport service started.\n"
 msgstr ""
 
-#: src/transports/http.c:1474
+#: src/transports/http.c:1470
 msgid "# bytes received via HTTP"
 msgstr ""
 
-#: src/transports/http.c:1476
+#: src/transports/http.c:1472
 msgid "# bytes sent via HTTP"
 msgstr ""
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1474
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
 #: src/transports/smtp.c:295
-#, possible-c-format
+#, c-format
 msgid "Could not resolve name of SMTP server '%s': %s"
 msgstr ""
 
 #: src/transports/smtp.c:413
-#, possible-c-format
+#, c-format
 msgid ""
 "You must specify the name of a pipe for the SMTP transport in section '%s' "
 "under '%s'.\n"
@@ -3169,66 +3180,66 @@
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/transports/smtp.c:571
+#: src/transports/smtp.c:569
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
-#: src/transports/smtp.c:578
-#, possible-c-format
+#: src/transports/smtp.c:576
+#, c-format
 msgid "SMTP filter string to long, capped to '%s'\n"
 msgstr ""
 
 #: src/transports/smtp.c:746
-#, possible-c-format
+#, c-format
 msgid "Sending E-mail to '%s' failed.\n"
 msgstr ""
 
 #: src/transports/smtp.c:795
-#, possible-c-format
+#, c-format
 msgid "SMTP server send unexpected response at %s:%d.\n"
 msgstr ""
 
 #: src/transports/smtp.c:862
-#, possible-c-format
+#, c-format
 msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/transports/smtp.c:891 src/transports/udp.c:655
-#: src/transports/udp6.c:634
-#, possible-c-format
+#: src/transports/smtp.c:891 src/transports/udp.c:657
+#: src/transports/udp6.c:635
+#, c-format
 msgid "MTU for '%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
 #: src/transports/tcp.c:464
-#, possible-c-format
+#, c-format
 msgid ""
 "Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
 msgstr ""
 
 #: src/transports/tcp.c:498
-#, possible-c-format
+#, c-format
 msgid ""
 "Received malformed message (size %u) from tcp-peer connection. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1058
+#: src/transports/tcp.c:1056
 msgid "Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1310 src/transports/tcp6.c:1203
-#, possible-c-format
+#: src/transports/tcp.c:1306 src/transports/tcp6.c:1199
+#, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:1425
+#: src/transports/tcp.c:1423
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:1427
+#: src/transports/tcp.c:1425
 msgid "# bytes sent via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:1429
+#: src/transports/tcp.c:1427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
@@ -3242,92 +3253,92 @@
 msgstr ""
 
 #: src/transports/tcp6.c:656 src/transports/udp6.c:273
-#, possible-c-format
+#, c-format
 msgid "%s: Rejected connection from blacklisted address %s.\n"
 msgstr ""
 
-#: src/transports/tcp6.c:959
+#: src/transports/tcp6.c:957
 msgid "Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/transports/tcp6.c:1004
-#, possible-c-format
+#: src/transports/tcp6.c:1001
+#, c-format
 msgid "'%s': unknown service: %s\n"
 msgstr ""
 
 #: src/transports/udp.c:144 src/transports/udp6.c:127
-#, possible-c-format
+#, 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 ""
 
 #: src/transports/udp.c:178
-#, possible-c-format
+#, c-format
 msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
 
 #: src/transports/udp.c:251
-#, possible-c-format
+#, c-format
 msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
 msgstr ""
 
 #: src/transports/udp.c:274
-#, possible-c-format
+#, c-format
 msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
 msgstr ""
 
-#: src/transports/udp.c:356
+#: src/transports/udp.c:355
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/udp.c:486
-#, possible-c-format
+#: src/transports/udp.c:487
+#, 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:640
+#: src/transports/udp.c:642
 msgid "# bytes received via UDP"
 msgstr ""
 
-#: src/transports/udp.c:642
+#: src/transports/udp.c:644
 msgid "# bytes sent via UDP"
 msgstr ""
 
-#: src/transports/udp.c:644
+#: src/transports/udp.c:646
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
 #: src/transports/ip.c:141
-#, possible-c-format
+#, c-format
 msgid ""
 "Could not find interface '%s' in '%s', trying to find another interface.\n"
 msgstr ""
 
 #: src/transports/ip.c:166
-#, possible-c-format
+#, c-format
 msgid "Could not obtain IP for interface '%s' using '%s'.\n"
 msgstr ""
 
 #: src/transports/ip.c:210
-#, possible-c-format
+#, c-format
 msgid "Could not find an IP address for interface '%s'.\n"
 msgstr ""
 
 #: src/transports/ip.c:220
-#, possible-c-format
+#, 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:241
-#, possible-c-format
+#, c-format
 msgid "Could not resolve '%s' to determine our IP address: %s\n"
 msgstr ""
 
 #: src/transports/ip.c:274
-#, possible-c-format
+#, c-format
 msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
@@ -3336,48 +3347,48 @@
 msgstr ""
 
 #: src/transports/udp6.c:163
-#, possible-c-format
+#, c-format
 msgid "Failed to bind to UDP6 port %d.\n"
 msgstr ""
 
 #: src/transports/udp6.c:233
-#, possible-c-format
+#, c-format
 msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
 msgstr ""
 
 #: src/transports/udp6.c:262
-#, possible-c-format
+#, c-format
 msgid "Packet received from %s:%d (UDP6) failed format check."
 msgstr ""
 
-#: src/transports/udp6.c:353
+#: src/transports/udp6.c:352
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
 #: src/util/configuration.c:180
-#, possible-c-format
+#, c-format
 msgid "inlining configration file '%s'\n"
 msgstr ""
 
 #: src/util/configuration.c:184
-#, possible-c-format
+#, c-format
 msgid "Could not parse configuration file '%s'.\n"
 msgstr ""
 
 #: src/util/configuration.c:220
-#, possible-c-format
+#, c-format
 msgid "Syntax error in configuration file '%s' at line %d.\n"
 msgstr ""
 
 #: src/util/configuration.c:471
-#, possible-c-format
+#, c-format
 msgid ""
 "Configuration file '%s' not found. I will try to create the default "
 "configuration file at that location.\n"
 msgstr ""
 
 #: src/util/configuration.c:488
-#, possible-c-format
+#, c-format
 msgid "Cannot open configuration file '%s'\n"
 msgstr ""
 
@@ -3386,24 +3397,24 @@
 msgstr ""
 
 #: src/util/cron.c:366
-#, possible-c-format
+#, c-format
 msgid ""
 "'%s' called with cron job not in queue, adding.  This may not be what you "
 "want.\n"
 msgstr ""
 
-#: src/util/dso.c:41
+#: src/util/dso.c:42
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/dso.c:93
-#, possible-c-format
+#: src/util/dso.c:94
+#, c-format
 msgid "'%s' failed for library '%s' at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/util/dso.c:143
-#, possible-c-format
+#: src/util/dso.c:144
+#, c-format
 msgid "'%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
 msgstr ""
 
@@ -3463,7 +3474,7 @@
 msgstr ""
 
 #: src/util/hostkey_gcrypt.c:936
-#, possible-c-format
+#, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
@@ -3472,42 +3483,42 @@
 msgstr ""
 
 #: src/util/io.c:35
-#, possible-c-format
+#, c-format
 msgid "Caught signal %d.\n"
 msgstr ""
 
 #: src/util/random.c:38
-#, possible-c-format
+#, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
 #: src/util/ipcheck.c:100
-#, possible-c-format
+#, c-format
 msgid "Invalid format for IP: '%s'\n"
 msgstr ""
 
 #: src/util/ipcheck.c:150
-#, possible-c-format
+#, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
 #: src/util/ipcheck.c:164
-#, possible-c-format
+#, c-format
 msgid "Invalid network notation (additional characters: '%s')."
 msgstr ""
 
 #: src/util/ipcheck.c:235
-#, possible-c-format
+#, c-format
 msgid "Invalid network notation (does not end with ';': '%s')\n"
 msgstr ""
 
 #: src/util/ipcheck.c:267
-#, possible-c-format
+#, c-format
 msgid "Wrong format '%s' for netmask: %s\n"
 msgstr ""
 
 #: src/util/ipcheck.c:281
-#, possible-c-format
+#, c-format
 msgid "Wrong format '%s' for network: %s\n"
 msgstr ""
 
@@ -3551,22 +3562,18 @@
 msgid "EVERYTHING"
 msgstr ""
 
-#: src/util/logging.c:251
-msgid "LOGLEVEL not specified, that is not ok.\n"
-msgstr ""
-
-#: src/util/logging.c:262
-#, possible-c-format
+#: src/util/logging.c:261
+#, c-format
 msgid "Invalid LOGLEVEL '%s' specified.\n"
 msgstr ""
 
-#: src/util/logging.c:367 src/util/logging.c:373
-#, possible-c-format
+#: src/util/logging.c:353 src/util/logging.c:359
+#, c-format
 msgid "Failure at %s:%d.\n"
 msgstr ""
 
 #: src/util/port.c:45
-#, possible-c-format
+#, c-format
 msgid ""
 "Cannot determine port of gnunetd server. Define in configuration file in "
 "section '%s' under '%s'.\n"
@@ -3587,141 +3594,137 @@
 msgstr ""
 
 #: src/util/semaphore.c:172 src/util/semaphore.c:198
-#, possible-c-format
+#, c-format
 msgid "Invalid argument for '%s' at %s:%d.\n"
 msgstr ""
 
 #: src/util/semaphore.c:176
-#, possible-c-format
+#, c-format
 msgid "Deadlock due to '%s' at %s:%d.\n"
 msgstr ""
 
 #: src/util/semaphore.c:202
-#, possible-c-format
+#, c-format
 msgid "Permission denied for '%s' at %s:%d.\n"
 msgstr ""
 
 #: src/util/semaphore.c:577
-#, possible-c-format
+#, c-format
 msgid "Can't create semaphore: %i"
 msgstr ""
 
 #: src/util/state.c:86
-#, possible-c-format
+#, c-format
 msgid ""
 "Configuration file must specify a directory for GNUnet to store per-peer "
 "data under %s\\%s.\n"
 msgstr ""
 
-#: src/util/statuscalls.c:138
-#, possible-c-format
-msgid ""
-"No network interfaces defined in configuration section '%s' under '%s'!\n"
-msgstr ""
-
-#: src/util/statuscalls.c:163
-#, possible-c-format
-msgid ""
-"Interfaces string (%s) in configuration section '%s' under '%s' is "
-"malformed.\n"
-msgstr ""
-
-#: src/util/statuscalls.c:176
-#, possible-c-format
-msgid ""
-"No network interfaces specified in the configuration file in section '%s' "
-"under '%s'.\n"
-msgstr ""
-
-#: src/util/statuscalls.c:398 src/util/statuscalls.c:618
-#, possible-c-format
+#: src/util/statuscalls.c:185
+#, c-format
 msgid "Failed to parse interface data from '%s' at %s:%d.\n"
 msgstr ""
 
-#: src/util/statuscalls.c:500
-#, possible-c-format
-msgid "Failed to parse interface data '%s' output at %s:%d.\n"
+#: src/util/statuscalls.c:487
+msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr ""
 
-#: src/util/statuscalls.c:827
-#, possible-c-format
-msgid "Could not decoding file '%s' at %s:%d.\n"
+#: src/util/statuscalls.c:505
+msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
-#: src/util/statuscalls.c:1002
-msgid "Cannot query the CPU usage (Windows NT).\n"
+#: src/util/statuscalls.c:598
+#, c-format
+msgid ""
+"No network interfaces defined in configuration section '%s' under '%s'!\n"
 msgstr ""
 
-#: src/util/statuscalls.c:1022
-msgid "Cannot query the CPU usage (Win 9x)\n"
-msgstr ""
-
 #: src/util/storage.c:196
-#, possible-c-format
+#, c-format
 msgid "'%s' failed for drive %s: %u\n"
 msgstr ""
 
 #: src/util/storage.c:294
-#, possible-c-format
+#, c-format
 msgid "'%s' is not a regular file.\n"
 msgstr ""
 
 #: src/util/storage.c:548
-#, possible-c-format
+#, c-format
 msgid "'%s' expected '%s' to be a directory!\n"
 msgstr ""
 
 #: src/util/tcp_return.c:51
-#, possible-c-format
+#, c-format
 msgid "'%s' failed, other side closed connection.\n"
 msgstr ""
 
 #: src/util/tcp_return.c:58
-#, possible-c-format
+#, c-format
 msgid "'%s' failed, reply invalid!\n"
 msgstr ""
 
+#: src/util/timer.c:188
+msgid "ms"
+msgstr ""
+
+#: src/util/timer.c:193
+msgid "s"
+msgstr ""
+
+#: src/util/timer.c:196
+msgid "m"
+msgstr ""
+
+#: src/util/timer.c:199
+msgid "h"
+msgstr ""
+
+#: src/util/timer.c:202
+msgid " days"
+msgstr ""
+
 #: src/util/daemon.c:142
-#, possible-c-format
+#, c-format
 msgid "Attempted path to '%s' was '%s'.\n"
 msgstr ""
 
 #: src/util/xmalloc.c:71
-#, possible-c-format
+#, c-format
 msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
 msgstr ""
 
-#: src/include/gnunet_util.h:147
+#: src/include/gnunet_util.h:155
 msgid "print this help"
 msgstr ""
 
-#: src/include/gnunet_util.h:150
+#: src/include/gnunet_util.h:158
 msgid "set verbosity to LEVEL"
 msgstr ""
 
-#: src/include/gnunet_util.h:153
+#: src/include/gnunet_util.h:161
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/include/gnunet_util.h:156
+#: src/include/gnunet_util.h:164
 msgid "specify host on which gnunetd is running"
 msgstr ""
 
-#: src/include/gnunet_util.h:159
+#: src/include/gnunet_util.h:167
 msgid "print the version number"
 msgstr ""
 
-#: src/include/gnunet_util.h:162
+#: src/include/gnunet_util.h:170
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util.h:602 src/include/gnunet_util.h:604
-#, possible-c-format
+#: src/include/gnunet_util.h:611 src/include/gnunet_util.h:613
+#, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_util.h:1009 src/include/gnunet_util.h:1011
-#: src/include/gnunet_util.h:1018
-#, possible-c-format
+#: src/include/gnunet_util.h:1018 src/include/gnunet_util.h:1020
+#: src/include/gnunet_util.h:1027
+#, c-format
 msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
 msgstr ""

Modified: GNUnet/po/POTFILES.in
===================================================================
--- GNUnet/po/POTFILES.in       2005-07-16 19:29:31 UTC (rev 1560)
+++ GNUnet/po/POTFILES.in       2005-07-16 19:33:59 UTC (rev 1561)
@@ -262,7 +262,6 @@
 src/include/gnunet_fsui_lib.h
 src/include/gnunet_gap_service.h
 src/include/gnunet_getoption_lib.h
-src/include/gnunet_gnunetd_lib.h
 src/include/gnunet_identity_service.h
 src/include/gnunet_pingpong_service.h
 src/include/gnunet_protocols.h

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2005-07-16 19:29:31 UTC (rev 1560)
+++ GNUnet/po/de.po     2005-07-16 19:33:59 UTC (rev 1561)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-02 17:50+0200\n"
+"POT-Creation-Date: 2005-07-16 21:36+0200\n"
 "PO-Revision-Date: 2005-07-03 00:56+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -20,62 +20,74 @@
 #: src/applications/advertising/advertising.c:156
 #, c-format
 msgid "HELO message from '%s' invalid (signature invalid). Dropping.\n"
-msgstr "HELO Nachricht von '%s' ist ung�ltig (Signatur ist ung�ltig). 
Nachricht wurde verworfen.\n"
+msgstr ""
+"HELO Nachricht von '%s' ist ung�ltig (Signatur ist ung�ltig). Nachricht "
+"wurde verworfen.\n"
 
 #: src/applications/advertising/advertising.c:162
 msgid "HELO message received invalid (expiration time over limit). Dropping.\n"
-msgstr "Empfangene HELO Nachricht ist ung�ltig (Ablaufzeit �ber Limit). 
Nachricht wurde verworfen.\n"
+msgstr ""
+"Empfangene HELO Nachricht ist ung�ltig (Ablaufzeit �ber Limit). Nachricht "
+"wurde verworfen.\n"
 
 #: src/applications/advertising/advertising.c:171
 #, c-format
 msgid "HELO advertisement for protocol %d received.\n"
 msgstr "HELO Ank�ndigung f�r Protokoll %d empfangen.\n"
 
-#: src/applications/advertising/advertising.c:286
+#: src/applications/advertising/advertising.c:290
 msgid "Could not send HELOs+PING, ping buffer full.\n"
 msgstr "HELOs+PING konnten nicht gesendet werden, Ping Puffer ist voll.\n"
 
-#: src/applications/advertising/advertising.c:299
+#: src/applications/advertising/advertising.c:303
 #, 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:442
+#: src/applications/advertising/advertising.c:451
 #, 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:449
-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:458
+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:542
+#: src/applications/advertising/advertising.c:560
 #, c-format
 msgid "Removing HELO from peer '%s' (expired %ds ago).\n"
 msgstr "HELO von Knoten '%s' wird entfernt (lief vor %ds ab).\n"
 
-#: src/applications/advertising/advertising.c:700
+#: src/applications/advertising/advertising.c:720
 msgid "# Peer advertisements received"
 msgstr "# Knotenank�ndigungen empfangen"
 
-#: src/applications/advertising/advertising.c:701
+#: src/applications/advertising/advertising.c:721
 msgid "# Self advertisments transmitted"
 msgstr "# Selbstbekanntmachungen �bertragen"
 
-#: src/applications/advertising/advertising.c:702
+#: src/applications/advertising/advertising.c:722
 msgid "# Foreign advertisements forwarded"
 msgstr "# Bekanntmachungen von anderen �bertragen"
 
-#: src/applications/advertising/advertising.c:706
-#: src/applications/session/connect.c:726
+#: src/applications/advertising/advertising.c:726
+#: src/applications/session/connect.c:735
 #, 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:725
+#: src/applications/advertising/advertising.c:745
 msgid "Network advertisements disabled by configuration!\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
+#: src/applications/advertising/advertising.c:765
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
+msgstr ""
+
 #: src/applications/bootstrap_http/http.c:79
 #: src/applications/testbed/testbed.c:1080
 #, c-format
@@ -95,7 +107,9 @@
 #: src/applications/bootstrap_http/http.c:131
 #, c-format
 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"
+msgstr ""
+"Die Liste mit Knotenkontakten konnte nicht heruntergeladen werden, Host '%s' "
+"ist unbekannt.\n"
 
 #: src/applications/bootstrap_http/http.c:153
 #: src/applications/bootstrap_http/http.c:179
@@ -113,12 +127,14 @@
 msgid "Parsing HELO from '%s' failed.\n"
 msgstr "Das Parsen des HELO von '%s' schlug fehl.\n"
 
-#: src/applications/bootstrap_http/http.c:325
+#: src/applications/bootstrap_http/http.c:326
 #, c-format
 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"
+msgstr ""
+"Der Name des HTTP Proxies '%s' konnte nicht aufgel�st werden. Es wird ohne "
+"Proxy versucht.\n"
 
-#: src/applications/bootstrap_http/http.c:349
+#: src/applications/bootstrap_http/http.c:350
 msgid "# HELOs downloaded via http"
 msgstr "# HELOs per HTTP heruntergeladen"
 
@@ -144,6 +160,10 @@
 msgid "'%s' registering handlers %d and %d\n"
 msgstr "'%s' registriert Handler %d und %d\n"
 
+#: src/applications/chat/chat.c:210
+msgid "enables P2P-chat (incomplete)"
+msgstr ""
+
 #: src/applications/chat/gnunet-chat.c:82
 msgid "specify nickname"
 msgstr "Spitznamen angeben"
@@ -158,7 +178,7 @@
 #: src/applications/fs/tools/gnunet-delete.c:111
 #: src/applications/fs/tools/gnunet-directory.c:183
 #: src/applications/fs/tools/gnunet-download.c:128
-#: src/applications/fs/tools/gnunet-insert.c:508
+#: src/applications/fs/tools/gnunet-insert.c:499
 #: src/applications/fs/tools/gnunet-pseudonym.c:214
 #: src/applications/fs/tools/gnunet-search.c:213
 #: src/applications/fs/tools/gnunet-unindex.c:139
@@ -206,8 +226,12 @@
 
 #: src/applications/datastore/filter.c:42
 #, 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"
+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/dht/module/cs.c:440
 #, c-format
@@ -290,7 +314,8 @@
 #: src/applications/dht/module/dht.c:3226
 #, c-format
 msgid "RPC for '%s' received for table that we do not participate in!\n"
-msgstr "RPC f�r '%s' empfangen f�r eine Tabelle, an der wir nicht beteiligt 
sind!\n"
+msgstr ""
+"RPC f�r '%s' empfangen f�r eine Tabelle, an der wir nicht beteiligt sind!\n"
 
 #: src/applications/dht/tools/dht-join.c:43
 msgid "allow SIZE bytes of memory for the local table"
@@ -307,8 +332,8 @@
 #: src/applications/dht/tools/dht-join.c:85
 #: src/applications/dht/tools/dht-query.c:84
 #: src/applications/fs/tools/gnunet-download.c:94
-#: src/applications/fs/tools/gnunet-insert.c:321
-#: src/applications/fs/tools/gnunet-insert.c:437
+#: src/applications/fs/tools/gnunet-insert.c:312
+#: src/applications/fs/tools/gnunet-insert.c:428
 #: src/applications/fs/tools/gnunet-pseudonym.c:120
 #: src/applications/fs/tools/gnunet-search.c:159
 #: src/applications/fs/tools/gnunet-search.c:175
@@ -496,69 +521,83 @@
 #: src/applications/tbench/tbenchtest.c:122
 #, c-format
 msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen 
verbleiben)...\n"
+msgstr ""
+"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
+"verbleiben)...\n"
 
-#: src/applications/fragmentation/fragmentation.c:565
+#: src/applications/fragmentation/fragmentation.c:556
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:557
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:558
 msgid "# fragments discarded"
 msgstr "# verworfener Nachrichten"
 
-#: src/applications/fragmentation/fragmentation.c:577
+#: src/applications/fragmentation/fragmentation.c:568
 #, c-format
 msgid "'%s' registering handler %d\n"
 msgstr "'%s' registriert Handler %d\n"
 
 #: src/applications/fs/ecrs/download.c:889
-msgid "Decrypted content does not match key. This is either a bug or a 
maliciously inserted file. Download aborted.\n"
-msgstr "Entschl�sselter Inhalt entspricht nicht dem Schl�ssel. Dies ist 
entweder ein Bug oder eine mit b�sen Absichten eingef�gte Datei. Download wurde 
abgebrochen.\n"
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
+msgstr ""
+"Entschl�sselter Inhalt entspricht nicht dem Schl�ssel. Dies ist entweder ein "
+"Bug oder eine mit b�sen Absichten eingef�gte Datei. Download wurde "
+"abgebrochen.\n"
 
 #: src/applications/fs/ecrs/download.c:1054
 #, c-format
 msgid "Content '%s' seems to be not available on the network.\n"
 msgstr "Inhalt '%s' scheint im Netzwerk nicht verf�gbar zu sein.\n"
 
-#: src/applications/fs/ecrs/meta.c:772
+#: src/applications/fs/ecrs/meta.c:779
 #, 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:778
+#: src/applications/fs/ecrs/meta.c:785
 #, 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"
+msgstr ""
+"Datei '%s' konnte nicht zu '%s' umbenannt werden: Datei existiert bereits\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 "Die Konfigurationsdatei muss unter %s%s ein Verzeichnis f�r GNUnet 
angeben, in dem Knotenbezogene Daten gespeichert 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"
 
 #: 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"
+msgstr ""
+"Pseudonym '%s' kann nicht erstellt werden, da die Datei '%s' bereits "
+"existiert.\n"
 
-#: src/applications/fs/ecrs/namespace.c:295
-#: src/applications/fs/ecrs/namespace.c:371
-#: src/applications/fs/ecrs/namespace.c:516
+#: src/applications/fs/ecrs/namespace.c:304
+#: src/applications/fs/ecrs/namespace.c:380
+#: src/applications/fs/ecrs/namespace.c:524
 #, 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:306
-#: src/applications/fs/ecrs/namespace.c:382
+#: src/applications/fs/ecrs/namespace.c:315
+#: src/applications/fs/ecrs/namespace.c:391
 #, 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:526
-#: src/applications/fs/ecrs/namespace.c:536
+#: src/applications/fs/ecrs/namespace.c:534
+#: src/applications/fs/ecrs/namespace.c:544
 #, c-format
 msgid "Format of file '%s' is invalid.\n"
 msgstr "Format der Datei '%s' ist ung�ltig.\n"
@@ -583,8 +622,13 @@
 
 #: src/applications/fs/ecrs/upload.c:206
 #, c-format
-msgid "Indexing file '%s' failed. Check file permissions and consult your 
GNUnet server's logs.\n"
-msgstr "Indizierung der Datei '%s' schlug fehl. Bitte pr�fen Sie die 
Dateiberechtigungen und ziehen Sie die Protokolldateien des GNUnet-Servers zu 
Rate.\n"
+msgid ""
+"Indexing file '%s' failed. Check file permissions and consult your GNUnet "
+"server's logs.\n"
+msgstr ""
+"Indizierung der Datei '%s' schlug fehl. Bitte pr�fen Sie die "
+"Dateiberechtigungen und ziehen Sie die Protokolldateien des GNUnet-Servers "
+"zu Rate.\n"
 
 #: src/applications/fs/ecrs/upload.c:289
 #, c-format
@@ -624,13 +668,18 @@
 msgid "No keywords specified!\n"
 msgstr "Keine Schl�sselw�rter angegeben!\n"
 
-#: src/applications/fs/fsui/namespace_info.c:526
+#: src/applications/fs/fsui/namespace_info.c:523
 msgid "Publication interval for periodic publication changed."
-msgstr "Ver�ffentlichungsintervall f�r periodische Ver�ffentlichung wurde 
ge�ndert."
+msgstr ""
+"Ver�ffentlichungsintervall f�r periodische Ver�ffentlichung wurde ge�ndert."
 
-#: src/applications/fs/fsui/namespace_info.c:547
-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/namespace_info.c:544
+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:164
 msgid "This search is already pending!\n"
@@ -646,44 +695,72 @@
 
 #: src/applications/fs/fsui/upload.c:411
 msgid "Cannot upload directory without using recursion.\n"
-msgstr "Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen 
werden.\n"
+msgstr ""
+"Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen "
+"werden.\n"
 
-#: src/applications/fs/module/fs.c:949
+#: src/applications/fs/module/fs.c:964
 #, c-format
-msgid "You must specify a postive number for '%s' in the configuration in 
section '%s'.\n"
-msgstr "Sie m�ssen f�r '%s' in der Sektion '%s' der Konfigurationsdatei eine 
positive Zahl angeben.\n"
+msgid ""
+"You must specify a postive number for '%s' in the configuration in section '%"
+"s'.\n"
+msgstr ""
+"Sie m�ssen f�r '%s' in der Sektion '%s' der Konfigurationsdatei eine "
+"positive Zahl angeben.\n"
 
-#: src/applications/fs/module/fs.c:990
+#: src/applications/fs/module/fs.c:1005
 #, 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:1042
+msgid "enables (anonymous) file-sharing"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:71
 #, c-format
-msgid "You must specify a directory for FS files in the configuration in 
section '%s' under '%s'."
-msgstr "Sie m�ssen ein Verzeichnis f�r FS Dateien in der Konfigurationsdatei 
in der Sektion '%s' unter '%s' angeben."
+msgid ""
+"You must specify a directory for FS files in the configuration in section '%"
+"s' under '%s'."
+msgstr ""
+"Sie m�ssen ein Verzeichnis f�r FS Dateien in der Konfigurationsdatei in der "
+"Sektion '%s' unter '%s' angeben."
 
-#: src/applications/fs/module/ondemand.c:327
+#: src/applications/fs/module/ondemand.c:326
 #, 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"
+msgstr ""
+"Indizierte Datei ist verschwunden, Block f�r Anfrage '%s' wird gel�scht\n"
 
 #: src/applications/fs/module/ondemand.c:408
 #, c-format
-msgid "Because the file '%s' has been unavailable for 3 days it got removed 
from your share.  Please unindex files before deleting them as the index now 
contains invalid references!"
-msgstr "Weil die Datei '%s' nun seit 3 Tagen nicht zur Verf�gung steht, wurde 
Sie aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie 
l�schen, da Ihr Index nun ung�ltige Referenzen enth�lt!"
+msgid ""
+"Because the file '%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!"
+msgstr ""
+"Weil die Datei '%s' nun seit 3 Tagen nicht zur Verf�gung steht, wurde Sie "
+"aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
+"l�schen, da Ihr Index nun ung�ltige Referenzen enth�lt!"
 
 #: src/applications/fs/module/ondemand.c:434
 #, c-format
-msgid "Configuration file must specify directory for storage of FS data in 
section '%s' under '%s'.\n"
-msgstr "Die Konfigurationsdatei muss ein Verzeichnis f�r die Speicherung von 
FS Daten in der Sektion '%s' unter '%s' angeben.\n"
+msgid ""
+"Configuration file must specify directory for storage of FS data in section "
+"'%s' under '%s'.\n"
+msgstr ""
+"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:629
 #, c-format
-msgid "Unindexed ODB block '%s' from offset %llu already missing from 
datastore.\n"
-msgstr "Deindizierter ODB Block '%s' vom Offset %llu fehlt bereits im 
Datenspeicher.\n"
+msgid ""
+"Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
+msgstr ""
+"Deindizierter ODB Block '%s' vom Offset %llu fehlt bereits im "
+"Datenspeicher.\n"
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1875
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1880
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken �ber den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
@@ -694,13 +771,16 @@
 
 #: 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)"
+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."
+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"
@@ -737,7 +817,9 @@
 
 #: src/applications/fs/tools/gnunet-directory.c:124
 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"
+msgstr ""
+"Alle Eintr�ge aus der Verzeichnis Datenbank l�schen und das Verfolgen von "
+"URIs abbrechen"
 
 #: src/applications/fs/tools/gnunet-directory.c:126
 msgid "list entries from the directory database"
@@ -803,7 +885,8 @@
 #: src/applications/fs/tools/gnunet-download.c:191
 #, c-format
 msgid "Download of file '%s' complete.  Speed was %8.3f kilobyte per second.\n"
-msgstr "Download der Datei '%s' abgeschlossen. Geschwindigkeit war %8.3f 
KB/s.\n"
+msgstr ""
+"Download der Datei '%s' abgeschlossen. Geschwindigkeit war %8.3f KB/s.\n"
 
 #: src/applications/fs/tools/gnunet-download.c:203
 #, c-format
@@ -821,51 +904,40 @@
 msgstr "Datei wurde als '%s' gespeichert.\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:110
-#, c-format
-msgid "Created namespace entry '%s'\n"
+#, fuzzy, c-format
+msgid "Created entry '%s' in namespace '%s'\n"
 msgstr "Namespace Eintrag '%s' erstellt\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:126
-msgid "ms"
-msgstr "ms"
+#: src/applications/fs/tools/gnunet-insert.c:115
+#, fuzzy, c-format
+msgid "Failed to add entry to namespace '%s' (does it exist?)\n"
+msgstr "Konnte nicht auf den Namespace '%s' zugreifen (existiert nicht?).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:131
-msgid "s"
-msgstr "s"
+#: src/applications/fs/tools/gnunet-insert.c:136
+#, fuzzy, c-format
+msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
+msgstr ""
+"%16llu von %16llu Bytes eingef�gt (gesch�tzte %llu%s bis Fertigstellung)\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:134
-msgid "m"
-msgstr "m"
-
-#: src/applications/fs/tools/gnunet-insert.c:137
-msgid "h"
-msgstr "h"
-
-#: src/applications/fs/tools/gnunet-insert.c:140
-msgid " days"
-msgstr " Tage"
-
-#: src/applications/fs/tools/gnunet-insert.c:145
+#: src/applications/fs/tools/gnunet-insert.c:150
 #, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %llu%s to completion)\n"
-msgstr "%16llu von %16llu Bytes eingef�gt (gesch�tzte %llu%s bis 
Fertigstellung)\n"
-
-#: src/applications/fs/tools/gnunet-insert.c:159
-#, c-format
 msgid "Upload of '%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
-msgstr "Upload von '%s' komplett, %llu Bytes brauchten %llu Sekunden (%8.3f 
KB/s).\n"
+msgstr ""
+"Upload von '%s' komplett, %llu Bytes brauchten %llu Sekunden (%8.3f KB/s).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:173
+#: src/applications/fs/tools/gnunet-insert.c:164
 #, c-format
 msgid "Upload of '%s' complete, current average speed is %8.3f kbps.\n"
-msgstr "Upload con '%s' komplett, derzeitige durchschnittliche Geschwindigkeit 
betr�gt %8.3f KB/s.\n"
+msgstr ""
+"Upload con '%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
+"betr�gt %8.3f KB/s.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:183
+#: src/applications/fs/tools/gnunet-insert.c:174
 #, c-format
 msgid "File '%s' has URI: %s\n"
 msgstr "Datei '%s' hat URI: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:196
+#: src/applications/fs/tools/gnunet-insert.c:187
 #, c-format
 msgid ""
 "\n"
@@ -874,123 +946,166 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:215
+#: src/applications/fs/tools/gnunet-insert.c:206
 #: src/applications/fs/tools/gnunet-pseudonym.c:33
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gew�nschten Grad an Sender-Anonymit�t festlegen"
 
-#: src/applications/fs/tools/gnunet-insert.c:218
-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 "Obwohl gnunetd auf der lokalen Maschiene l�uft die Erstellung einer 
Kopie anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis 
erzwingen."
+#: src/applications/fs/tools/gnunet-insert.c:209
+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 ""
+"Obwohl gnunetd auf der lokalen Maschiene l�uft die Erstellung einer Kopie "
+"anstelle der Erzeugung eines Links auf das GNUnet Share-Verzeichnis "
+"erzwingen."
 
-#: src/applications/fs/tools/gnunet-insert.c:221
-msgid "print list of extracted keywords that would be used, but do not perform 
upload"
-msgstr "Liste der extrahierten Schl�sselworte, die verwendet werden w�rden, 
ausgeben, aber keinen Upload durchf�hren"
+#: src/applications/fs/tools/gnunet-insert.c:212
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+"Liste der extrahierten Schl�sselworte, die verwendet werden w�rden, "
+"ausgeben, aber keinen Upload durchf�hren"
 
-#: src/applications/fs/tools/gnunet-insert.c:225
-msgid "set interval for availability of updates to SECONDS (for namespace 
insertions only)"
-msgstr "Intervall der Verf�gbarkeit von Updates auf SECONDS setzen (nur f�r 
das Einf�gen in Namespaces)"
+#: src/applications/fs/tools/gnunet-insert.c:216
+msgid ""
+"set interval for availability of updates to SECONDS (for namespace "
+"insertions only)"
+msgstr ""
+"Intervall der Verf�gbarkeit von Updates auf SECONDS setzen (nur f�r das "
+"Einf�gen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
-msgid "add an additional keyword for the top-level file or directory (this 
option can be specified multiple times)"
-msgstr "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:219
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+"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:231
-msgid "add an additional keyword for all files and directories (this option 
can be specified multiple times)"
-msgstr "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:222
+msgid ""
+"add an additional keyword for all files and directories (this option can be "
+"specified multiple times)"
+msgstr ""
+"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:235
+#: src/applications/fs/tools/gnunet-insert.c:226
 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"
+msgstr ""
+"Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
+"setzen"
 
-#: src/applications/fs/tools/gnunet-insert.c:237
-msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
-msgstr "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:228
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+"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:240
-msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
-msgstr "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:231
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+"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:243
+#: src/applications/fs/tools/gnunet-insert.c:234
 msgid "specify the priority of the content"
 msgstr "Die Priorit�t des Inhalts angeben"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:236
 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)"
+msgstr ""
+"Die Datei unter dem Pseudonym NAME ver�ffentlichen (platziert die Datei in "
+"einem Namespace)"
 
-#: src/applications/fs/tools/gnunet-insert.c:247
+#: src/applications/fs/tools/gnunet-insert.c:238
 msgid "process directories recursively"
 msgstr "Verzeichnisse rekursiv bearbeiten"
 
-#: src/applications/fs/tools/gnunet-insert.c:249
-msgid "specifies this as an aperiodic but updated publication (for namespace 
insertions only)"
-msgstr "Dies als unregelm��ige aber aktualisierbare Ver�ffentlichung 
kennzeichnen (nur f�r das Einf�gen in Namespaces)"
+#: src/applications/fs/tools/gnunet-insert.c:240
+msgid ""
+"specifies this as an aperiodic but updated publication (for namespace "
+"insertions only)"
+msgstr ""
+"Dies als unregelm��ige aber aktualisierbare Ver�ffentlichung kennzeichnen "
+"(nur f�r das Einf�gen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:252
-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:243
+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:255
+#: src/applications/fs/tools/gnunet-insert.c:246
 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:257
+#: src/applications/fs/tools/gnunet-insert.c:248
 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)"
+msgstr ""
+"ID der vorherigen Version des Inhalts (nur f�r das Einf�gen in Namespaces)"
 
-#: src/applications/fs/tools/gnunet-insert.c:264
+#: src/applications/fs/tools/gnunet-insert.c:255
 msgid "Make files available to GNUnet for sharing."
 msgstr "Dateien GNUnet zum Filesharing zur Verf�gung stellen."
 
-#: src/applications/fs/tools/gnunet-insert.c:345
+#: src/applications/fs/tools/gnunet-insert.c:336
 #, 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:513
+#: src/applications/fs/tools/gnunet-insert.c:504
 #: src/applications/fs/tools/gnunet-unindex.c:144
 #, 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:517
+#: src/applications/fs/tools/gnunet-insert.c:508
 #, 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:521
+#: src/applications/fs/tools/gnunet-insert.c:512
 #, 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:570
+#: src/applications/fs/tools/gnunet-insert.c:561
 #, c-format
 msgid "Keywords for file '%s':\n"
 msgstr "Schl�sselw�rter f�r Datei '%s':\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:592
+#: src/applications/fs/tools/gnunet-insert.c:583
 #, 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:607
+#: src/applications/fs/tools/gnunet-insert.c:598
 #, 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:616
-#: src/applications/fs/tools/gnunet-insert.c:620
+#: src/applications/fs/tools/gnunet-insert.c:607
+#: src/applications/fs/tools/gnunet-insert.c:611
+#: src/applications/fs/tools/gnunet-insert.c:615
+#: src/applications/fs/tools/gnunet-insert.c:619
 #: src/applications/fs/tools/gnunet-insert.c:624
-#: src/applications/fs/tools/gnunet-insert.c:628
-#: src/applications/fs/tools/gnunet-insert.c:633
 #, 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-pseudonym.c:35
 msgid "automate creation of a namespace by starting a collection"
-msgstr "Erstellung eines Namespaces durch das Anfangen einer Collection 
automatisieren"
+msgstr ""
+"Erstellung eines Namespaces durch das Anfangen einer Collection "
+"automatisieren"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:38
 msgid "create a new pseudonym under the given NICKNAME"
@@ -1002,47 +1117,78 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:42
 msgid "end automated building of a namespace (ends collection)"
-msgstr "Automatisierte Erstellung eines Namespaces beenden (beendet 
Collection)"
+msgstr ""
+"Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:46
-msgid "use the given keyword to advertise the namespace (use when creating a 
new pseudonym)"
-msgstr "Das angegebene schl�sselwort verwenden, um den Namespace 
bekanntzumachen (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+msgid ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"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)"
-msgstr "Angeben, dass die Inhalte des Namespaces vom angegebenen MIMETYOE sind 
(zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+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)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:50
-msgid "do not generate an advertisement for this namespace (use when creating 
a new pseudonym)"
-msgstr "Keine Bekanntmachung f�r diesen Namespace erstellen (zu verwenden, 
wenn ein neues Pseudonym erstellt wird)"
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"Keine Bekanntmachung f�r diesen Namespace erstellen (zu verwenden, wenn ein "
+"neues Pseudonym erstellt wird)"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:52
 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
-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 ""
+"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)"
+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
 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)"
+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)"
+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."
+msgstr ""
+"Erstellen von neuen Pseudonymen, L�schen von Pseudonymen und Auflisten von "
+"bestehenden Pseudonymen."
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:221
 #, c-format
@@ -1132,12 +1278,16 @@
 
 #: src/applications/fs/tools/gnunet-search.c:219
 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"
+msgstr ""
+"Nicht gen�gend Parameter. Sie m�ssen ein Schl�sselwort oder einen Bezeichner "
+"angeben.\n"
 
 #: src/applications/fs/tools/gnunet-search.c:270
 #, c-format
 msgid "Starting search failed. Consult logs.\n"
-msgstr "Das Starten der Suche schlug fehl. Bitte ziehen Sie die 
Protokolldateien zu Rate.\n"
+msgstr ""
+"Das Starten der Suche schlug fehl. Bitte ziehen Sie die Protokolldateien zu "
+"Rate.\n"
 
 #: src/applications/fs/tools/gnunet-search.c:345
 #, c-format
@@ -1146,8 +1296,12 @@
 
 #: src/applications/fs/tools/gnunet-unindex.c:50
 #, c-format
-msgid "%16llu of %16llu bytes unindexed (estimating %llu seconds to 
completion)                "
-msgstr "%16llu von %16llu Bytes deindiziert (sch�tze %llu Sekunden bis 
Fertigstellung)            "
+msgid ""
+"%16llu of %16llu bytes unindexed (estimating %llu seconds to "
+"completion)                "
+msgstr ""
+"%16llu von %16llu Bytes deindiziert (sch�tze %llu Sekunden bis "
+"Fertigstellung)            "
 
 #: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
@@ -1156,7 +1310,8 @@
 "Unindexing of '%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
 msgstr ""
 "\n"
-"Deindizierung von '%s' abgeschlossen, %llu Bytes ben�tigten %llu Sekunden 
(%8.3f kbps).\n"
+"Deindizierung von '%s' abgeschlossen, %llu Bytes ben�tigten %llu Sekunden (%"
+"8.3f kbps).\n"
 
 #: src/applications/fs/tools/gnunet-unindex.c:71
 #, c-format
@@ -1181,39 +1336,60 @@
 msgid "'%s' failed.  Is '%s' a file?\n"
 msgstr "'%s' schlug fehl. Ist '%s' eine Datei?\n"
 
-#: src/applications/gap/gap.c:1864
-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:1869
+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:1881 src/applications/gap/gap.c:1886
-#: src/applications/gap/gap.c:1892
+#: src/applications/gap/gap.c:1886 src/applications/gap/gap.c:1891
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
-msgstr "Gew�nschter Grad an Anonymit�t kann nicht erreicht werden, Anfrage 
wird ignoriert.\n"
+msgstr ""
+"Gew�nschter Grad an Anonymit�t kann nicht erreicht werden, Anfrage wird "
+"ignoriert.\n"
 
-#: src/applications/gap/gap.c:2103
-msgid "Traffic service failed to load; gap cannot ensure cover-traffic 
availability.\n"
-msgstr "Verkehrsdienst konnte nicht geladen werden, GAP kann keinen 
verdeckenden Netzwerkverkehr sicherstellen.\n"
+#: src/applications/gap/gap.c:2113
+msgid ""
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
+msgstr ""
+"Verkehrsdienst konnte nicht geladen werden, GAP kann keinen verdeckenden "
+"Netzwerkverkehr sicherstellen.\n"
 
-#: src/applications/gap/gap.c:2134
+#: src/applications/gap/gap.c:2144
 #, c-format
 msgid "'%s' registering handlers %d %d\n"
 msgstr "'%s' registriert Handler %d %d\n"
 
-#: src/applications/getoption/getoption.c:74
+#: src/applications/getoption/getoption.c:75
 #, c-format
 msgid "'%s' registering client handler %d\n"
 msgstr "'%s' registriert Client-Handler %d\n"
 
+#: src/applications/getoption/getoption.c:82
+#, fuzzy
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
 #: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:966
+#: src/applications/identity/identity.c:976
 #, 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"
+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/identity/hostkey.c:119
 #, c-format
-msgid "Existing hostkey in file '%s' failed format check, creating new 
hostkey.\n"
-msgstr "Format�berpr�fung schlug f�r die existierende Hostkeydatei '%s' fehl, 
es wird ein neuer Hostkey erzeugt.\n"
+msgid ""
+"Existing hostkey in file '%s' failed format check, creating new hostkey.\n"
+msgstr ""
+"Format�berpr�fung schlug f�r die existierende Hostkeydatei '%s' fehl, es "
+"wird ein neuer Hostkey erzeugt.\n"
 
 #: src/applications/identity/hostkey.c:127
 msgid "Creating new hostkey (this may take a while).\n"
@@ -1227,89 +1403,106 @@
 msgid "Done creating hostkey.\n"
 msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
-#: src/applications/identity/identity.c:327
+#: src/applications/identity/identity.c:330
 #, c-format
-msgid "File '%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"
+msgid ""
+"File '%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:360
+#: src/applications/identity/identity.c:363
 #, c-format
 msgid "%s '%s' returned no known hosts!\n"
 msgstr "%s '%s' ergab keine bekannten Knoten!\n"
 
-#: src/applications/identity/identity.c:606
-#: src/applications/identity/identity.c:625
+#: src/applications/identity/identity.c:614
+#: src/applications/identity/identity.c:632
 #, c-format
 msgid "Removed file '%s' containing invalid HELO data.\n"
 msgstr "Datei '%s' enthielt ung�ltige HELO Daten und wurde entfernt.\n"
 
-#: src/applications/pingpong/pingpong.c:119
-#: src/applications/pingpong/pingpong.c:170
-#: src/applications/pingpong/pingpong.c:210
-#: src/applications/pingpong/pingpong.c:275
+#: src/applications/pingpong/pingpong.c:120
+#: src/applications/pingpong/pingpong.c:171
+#: src/applications/pingpong/pingpong.c:211
+#: src/applications/pingpong/pingpong.c:276
 #, c-format
 msgid "Received malformed '%s' message. Dropping.\n"
 msgstr "Besch�digte '%s' Nachricht empfangen. Nachricht wird verworfen.\n"
 
-#: src/applications/pingpong/pingpong.c:129
+#: src/applications/pingpong/pingpong.c:130
 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:178
+#: src/applications/pingpong/pingpong.c:179
 msgid "Received PING not destined for us!\n"
 msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
 
-#: src/applications/pingpong/pingpong.c:250
-#: src/applications/pingpong/pingpong.c:308
-msgid "Could not match PONG against any PING. Try increasing MAX_PING_PONG 
constant.\n"
-msgstr "PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante 
MAX_PING_PONG hochzusetzen.\n"
+#: src/applications/pingpong/pingpong.c:251
+#: src/applications/pingpong/pingpong.c:309
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
+msgstr ""
+"PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante "
+"MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/pingpong/pingpong.c:349
+#: src/applications/pingpong/pingpong.c:350
 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"
+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:465
+#: src/applications/pingpong/pingpong.c:467
 msgid "# encrypted PONG messages received"
 msgstr "# verschl�sselter PONG Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:467
+#: src/applications/pingpong/pingpong.c:469
 msgid "# plaintext PONG messages received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:469
+#: src/applications/pingpong/pingpong.c:471
 msgid "# encrypted PING messages received"
 msgstr "# verschl�sselter PING Nachrichten empfangen"
 
-#: src/applications/pingpong/pingpong.c:471
+#: src/applications/pingpong/pingpong.c:473
 msgid "# PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:475
 msgid "# encrypted PONG messages sent"
 msgstr "# verschl�sselter PONG Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:475
+#: src/applications/pingpong/pingpong.c:477
 msgid "# plaintext PING messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:477
+#: src/applications/pingpong/pingpong.c:479
 msgid "# encrypted PING messages sent"
 msgstr "# verschl�sselter PING Nachrichten gesendet"
 
-#: src/applications/pingpong/pingpong.c:486
+#: src/applications/pingpong/pingpong.c:488
 #, c-format
 msgid "'%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "'%s' registriert Handler %d %d (Plaintext und Ciphertext)\n"
 
 #: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be registered: another callback is already 
using this name (%p)\n"
-msgstr "%s::%s - RPC %s:%p konnte nicht registriert werden: ein anderer 
Callback verwendet bereits diesen Namen (%p)\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
+msgstr ""
+"%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
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: another callback 
registered under that name: %p\n"
-msgstr "%s::%s - RPC %s:%p konnte nicht unregistriert werden: ein anderer 
Callback ist unter diesem Namen registiert: %p\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
+msgstr ""
+"%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
 #, c-format
@@ -1319,7 +1512,8 @@
 #: src/applications/rpc/rpc.c:279
 #, 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"
+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
@@ -1355,42 +1549,49 @@
 msgid "async RPC reply not received.\n"
 msgstr "async RPC Antwort nicht empfangen.\n"
 
-#: src/applications/session/connect.c:207
+#: src/applications/session/connect.c:208
 #, 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:244
+#: src/applications/session/connect.c:245
 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"
+msgstr ""
+"Sitzungsschl�ssel kann nicht verschl�sselt werden, der andere Knoten ist uns "
+"nicht bekannt!\n"
 
-#: src/applications/session/connect.c:510
+#: src/applications/session/connect.c:518
 #, 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:518
+#: src/applications/session/connect.c:526
 #, c-format
 msgid "SKEY from '%s' fails CRC check (have: %u, want %u).\n"
-msgstr "SKEY von '%s' hat eine ung�ltige CRC Pr�fsumme (tats�chlich: %u, 
erwartet: %u).\n"
+msgstr ""
+"SKEY von '%s' hat eine ung�ltige CRC Pr�fsumme (tats�chlich: %u, erwartet: %"
+"u).\n"
 
-#: src/applications/session/connect.c:570
-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:578
+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:716
+#: src/applications/session/connect.c:725
 msgid "# session keys sent"
 msgstr "# Sitzungsschl�ssel gesendet"
 
-#: src/applications/session/connect.c:718
+#: src/applications/session/connect.c:727
 msgid "# session keys rejected"
 msgstr "# Sitzungsschl�ssel abgelehnt"
 
-#: src/applications/session/connect.c:720
+#: src/applications/session/connect.c:729
 msgid "# session keys accepted"
 msgstr "# Sitzungsschl�ssel akzeptiert"
 
-#: src/applications/session/connect.c:722
+#: src/applications/session/connect.c:731
 msgid "# sessions established"
 msgstr "# Sitzungen aufgebaut"
 
@@ -1409,8 +1610,8 @@
 #: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
 #: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
 #: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:993 src/include/gnunet_util.h:1000
-#: src/include/gnunet_util.h:1002
+#: src/include/gnunet_util.h:1002 src/include/gnunet_util.h:1009
+#: src/include/gnunet_util.h:1011
 #, c-format
 msgid "'%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1421,7 +1622,9 @@
 #: src/applications/sqstore_mysql/mysql.c:802
 #: src/applications/sqstore_mysql/mysql.c:816
 msgid "Invalid data in MySQL database.  Please verify integrity!\n"
-msgstr "Ung�ltige Daten in der MySQL Datenbank. Bitte �berpr�fen Sie die 
Integrit�t!\n"
+msgstr ""
+"Ung�ltige Daten in der MySQL Datenbank. Bitte �berpr�fen Sie die "
+"Integrit�t!\n"
 
 #: src/applications/sqstore_mysql/mysql.c:1108
 #, c-format
@@ -1446,12 +1649,18 @@
 #: src/applications/sqstore_sqlite/sqlite.c:406
 #: src/applications/sqstore_sqlite/sqlite.c:601
 msgid "Invalid data in database.  Please verify integrity!\n"
-msgstr "Es befinden sich ung�ltige Daten in Datenbank. Bitte �berpr�fen Sie 
die Integrit�t!\n"
+msgstr ""
+"Es befinden sich ung�ltige Daten in Datenbank. Bitte �berpr�fen Sie die "
+"Integrit�t!\n"
 
 #: src/applications/sqstore_sqlite/sqlite.c:915
 #, 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"
+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:929
 msgid "Unable to initialize SQLite.\n"
@@ -1510,6 +1719,11 @@
 msgid "# bytes of noise received"
 msgstr "# Bytes Rauschen empfangen"
 
+#: src/applications/stats/statistics.c:372
+#, fuzzy
+msgid "keeps statistics about gnunetd's operation"
+msgstr "Statistiken der GNUnet Aktivit�ten ausgeben."
+
 #: src/applications/tbench/gnunet-tbench.c:95
 msgid "output in gnuplot format"
 msgstr "Ausgabe im gnuplot Format"
@@ -1553,7 +1767,8 @@
 #: src/applications/tbench/gnunet-tbench.c:228
 #, 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"
+msgstr ""
+"Ung�ltige Empf�ngerknoten ID angegeben ('%s' ist kein g�ltiger Name).\n"
 
 #: src/applications/tbench/gnunet-tbench.c:249
 #, c-format
@@ -1619,6 +1834,10 @@
 "\n"
 "Es wurde keine Nachricht von gnunetd empfangen. L�uft gnunetd?\n"
 
+#: src/applications/tbench/tbench.c:447
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr ""
+
 #: src/applications/tbench/tbenchtest.c:57
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
@@ -1685,7 +1904,8 @@
 "Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
 "Trying again in %d seconds...\n"
 msgstr ""
-"Fehler (%s) beim Binden des TCP Listeners an den Port %d. Der Proxy Dienst 
wurde nicht gestartet.\n"
+"Fehler (%s) beim Binden des TCP Listeners an den Port %d. Der Proxy Dienst "
+"wurde nicht gestartet.\n"
 "Erneuter Versuch in %d Sekunden...\n"
 
 #: src/applications/testbed/gnunet-testbed.c:411 src/server/tcpserver.c:523
@@ -1710,7 +1930,8 @@
 #: src/applications/testbed/gnunet-testbed.c:590
 #, c-format
 msgid "Malformed entry in the configuration in section %s under %s: %s\n"
-msgstr "Besch�digter Eintrag in der Konfigurationsdatei in Sektion %s unter 
%s: %s\n"
+msgstr ""
+"Besch�digter Eintrag in der Konfigurationsdatei in Sektion %s unter %s: %s\n"
 
 #: src/applications/testbed/testbed.c:50
 msgid "Could not send acknowledgement back to client.\n"
@@ -1735,7 +1956,8 @@
 #: src/applications/testbed/testbed.c:137
 #, c-format
 msgid "TESTBED could not generate HELO message for protocol %u\n"
-msgstr "Das TESTBED konnte keine HELO Nachricht f�r das Protokoll %u 
erzeugen\n"
+msgstr ""
+"Das TESTBED konnte keine HELO Nachricht f�r das Protokoll %u erzeugen\n"
 
 #: src/applications/testbed/testbed.c:215
 #: src/applications/testbed/testbed.c:256
@@ -1783,7 +2005,8 @@
 
 #: src/applications/testbed/testbed.c:833
 msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
-msgstr "Dateiname f�r UPLOAD_FILE Nachricht ist nicht Null-terminiert 
(ung�ltig!)\n"
+msgstr ""
+"Dateiname f�r UPLOAD_FILE Nachricht ist nicht Null-terminiert (ung�ltig!)\n"
 
 #: src/applications/testbed/testbed.c:841
 msgid "Upload refused!"
@@ -1801,14 +2024,18 @@
 
 #: src/applications/testbed/testbed.c:1002
 #, c-format
-msgid "Received testbed message of type %u but unexpected size %u, expected 
%u\n"
-msgstr "Empfangene Testbed Nachricht des Typs %u hat die unerwartete Gr��e %u, 
es wurde %u erwartet\n"
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
+msgstr ""
+"Empfangene Testbed Nachricht des Typs %u hat die unerwartete Gr��e %u, es "
+"wurde %u erwartet\n"
 
 #: src/applications/testbed/testbed.c:1046
 msgid "No testbed URL given, not registered.\n"
-msgstr "Keine Testbed URL angegeben, es wurde keine Registrierung 
vorgenommen.\n"
+msgstr ""
+"Keine Testbed URL angegeben, es wurde keine Registrierung vorgenommen.\n"
 
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1453
+#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1449
 #, 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"
@@ -1816,12 +2043,15 @@
 #: src/applications/testbed/testbed.c:1119
 #, c-format
 msgid "Malformed http URL: '%s' at '%s'.  Testbed-client not registered.\n"
-msgstr "Besch�digte HTTP URL: '%s' bei '%s'. Testbed-Client wurde nicht 
registriert.\n"
+msgstr ""
+"Besch�digte HTTP URL: '%s' bei '%s'. Testbed-Client wurde nicht "
+"registriert.\n"
 
 #: src/applications/testbed/testbed.c:1155
 #, c-format
 msgid "Could not register testbed, host '%s' unknown\n"
-msgstr "Testbed konnte nicht registriert werden, Host '%s' ist nicht 
bekannt.\n"
+msgstr ""
+"Testbed konnte nicht registriert werden, Host '%s' ist nicht bekannt.\n"
 
 #: src/applications/testbed/testbed.c:1177
 #, c-format
@@ -1837,15 +2067,24 @@
 msgid "Exit register (error: no http response read).\n"
 msgstr "Abbruch der Registrierung (Fehler: keine HTTP Antwort gelesen).\n"
 
-#: src/applications/topology_default/topology.c:377
-#, 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/testbed/testbed.c:1357
+msgid "allows construction of a P2P-testbed (incomplete)"
+msgstr ""
 
+#: src/applications/topology_default/topology.c:388
+#, fuzzy, 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/topology_f2f/topology.c:301
 #, c-format
-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 ""
+"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"
 
 #: src/applications/topology_f2f/topology.c:320
 #, c-format
@@ -1866,7 +2105,8 @@
 msgstr "Netzwerk bis zur angegebenen Tiefe DEPTH sondieren"
 
 #: src/applications/tracekit/gnunet-tracekit.c:103
-msgid "specify output format; 0 for human readable output, 1 for dot, 2 for 
vcg"
+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
@@ -1888,8 +2128,12 @@
 
 #: 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 "Formatangabe ung�ltig. Verwenden Sie 0 f�r menschen-lesbar, 1 f�r dot 
und 2 f�r vcg.\n"
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
+msgstr ""
+"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
 #, c-format
@@ -1899,7 +2143,8 @@
 #: src/applications/tracekit/gnunet-tracekit.c:275
 #, 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"
+msgstr ""
+"Formatangabe ung�ltig. Verwenden Sie 0 f�r menschen-lesbar und 1 f�r dot\n"
 
 #: src/applications/tracekit/gnunet-tracekit.c:298
 #, c-format
@@ -1910,37 +2155,26 @@
 msgid "Could not send request to gnunetd.\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/applications/tracekit/tracekit.c:69
-#: src/applications/tracekit/tracekit.c:195
+#: src/applications/tracekit/tracekit.c:62
+#: src/applications/tracekit/tracekit.c:179
 #, c-format
 msgid "Received invalid '%s' message from '%s'.\n"
 msgstr "Ung�ltige '%s' Anfrage von '%s' empfangen.\n"
 
-#: src/applications/tracekit/tracekit.c:255
+#: src/applications/tracekit/tracekit.c:236
 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:363
+#: src/applications/tracekit/tracekit.c:334
 #, c-format
 msgid "TRACEKIT: received invalid '%s' message\n"
 msgstr "TRACEKIT: ung�ltige '%s' Nachricht empfangen\n"
 
-#: src/applications/tracekit/tracekit.c:448
-msgid "# client trace requests received"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/applications/tracekit/tracekit.c:434
+#, fuzzy
+msgid "allows mapping of the network topology"
+msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/applications/tracekit/tracekit.c:450
-msgid "# client trace replies sent"
-msgstr "# Client Trace-Antworten gesendet"
-
-#: src/applications/tracekit/tracekit.c:452
-msgid "# p2p trace requests received"
-msgstr "# p2p Trace-Anfragen empfangen"
-
-#: src/applications/tracekit/tracekit.c:454
-msgid "# p2p trace replies sent"
-msgstr "# p2p Trace-Antworten gesendet"
-
 #: src/applications/traffic/clientapi.c:67
 msgid "Failed to query gnunetd about traffic conditions.\n"
 msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
@@ -1959,28 +2193,40 @@
 msgid "# bytes received of type %d"
 msgstr "# Bytes des Typs %d empfangen"
 
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
+
+#: src/applications/transport/transport.c:469
 #: src/applications/transport/transport.c:477
-#: src/applications/transport/transport.c:485
 #, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/applications/transport/transport.c:642
+#: src/applications/transport/transport.c:635
 #, c-format
 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"
+msgstr ""
+"Option '%s' ist in der Konfigurationsdatei in der Sektion '%s' nicht "
+"gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: src/applications/transport/transport.c:657
+#: src/applications/transport/transport.c:650
 #, c-format
-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 ""
+"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"
 
-#: src/applications/transport/transport.c:683
+#: src/applications/transport/transport.c:676
 #, 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"
+msgstr ""
+"Transport Bibliothek '%s' stellt nicht die ben�tigte Funktion '%s%s' zur "
+"Verf�gung.\n"
 
-#: src/applications/transport/transport.c:704
+#: src/applications/transport/transport.c:697
 #, c-format
 msgid "I am peer '%s'.\n"
 msgstr "Ich bin Peer '%s'.\n"
@@ -2152,11 +2398,12 @@
 msgstr "Pixmapdatei %s konnte nicht gefunden werden"
 
 #: src/conf/gnunet-setup.c:33
+#, fuzzy
 msgid ""
 "USAGE: gnunet-setup MODULE\n"
 "\n"
 "MODULE\n"
-" recreate\t\trecreate configuration files\n"
+" recreate\trecreate configuration files\n"
 " config\t\ttext-based configuration\n"
 " menuconfig\ttext-based menu\n"
 " gconfig\tGTK configuration\n"
@@ -2177,7 +2424,9 @@
 
 #: src/conf/gnunet-setup.c:97
 msgid "Please specify a path where the configuration files will be stored."
-msgstr "Bitte geben Sie den Pfad an, wohin die Konfigurationsdateien 
gespeichert werden."
+msgstr ""
+"Bitte geben Sie den Pfad an, wohin die Konfigurationsdateien gespeichert "
+"werden."
 
 #: src/conf/gnunet-win-tool.c:108
 #, c-format
@@ -2233,9 +2482,7 @@
 msgstr "Startproze� konnte nicht ge�ndert werden:"
 
 #: src/conf/wizard_curs.c:47 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:205 src/conf/wizard_util.c:220
-#: src/conf/wizard_util.c:248 src/conf/wizard_util.c:254
-#: src/conf/wizard_util.c:411 src/conf/wizard_util.c:429
+#: src/conf/wizard_util.c:116 src/conf/wizard_util.c:157
 msgid "Error"
 msgstr "Fehler"
 
@@ -2254,7 +2501,8 @@
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
-"This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
 "\thttp://www.gnunet.org\n";
@@ -2267,7 +2515,8 @@
 msgstr ""
 "Willkommen bei GNUnet!\n"
 "\n"
-"Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet zu 
konfigurieren.\n"
+"Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet zu "
+"konfigurieren.\n"
 "\n"
 "Bitte besuchen Sie unsere Homepage\n"
 "\thttp://www.gnunet.org\n";
@@ -2279,8 +2528,12 @@
 "das GNUnet-Team"
 
 #: src/conf/wizard_curs.c:109
-msgid "Choose the network interface that connects your computer to the 
internet from the list below."
-msgstr "W�hlen Sie das Netzwerkger�t, das Ihren Computer mit dem Internet 
verbindet, aus unten stehender Liste."
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
+msgstr ""
+"W�hlen Sie das Netzwerkger�t, das Ihren Computer mit dem Internet verbindet, "
+"aus unten stehender Liste."
 
 #: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
 #: src/conf/wizard_curs.c:202 src/conf/wizard_curs.c:254
@@ -2289,12 +2542,22 @@
 msgstr "Hilfe"
 
 #: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
-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 "Das \"Netzwerkger�t\" ist das Ger�t, das Ihren Computer mit dem 
Internet verbindet. Dies ist �blicherweise ein Modem, eine ISDN-Karte oder eine 
Netzwerkkarte falls Sie DSL nutzen."
+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 ""
+"Das \"Netzwerkger�t\" ist das Ger�t, das Ihren Computer mit dem Internet "
+"verbindet. Dies ist �blicherweise ein Modem, eine ISDN-Karte oder eine "
+"Netzwerkkarte falls Sie DSL nutzen."
 
 #: src/conf/wizard_curs.c:161
-msgid "What is the name of the network interface that connects your computer 
to the Internet?"
-msgstr "Was ist der Name des Netzwerkger�tes, das Ihren Computer mit dem 
Internet verbindet?"
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
+msgstr ""
+"Was ist der Name des Netzwerkger�tes, das Ihren Computer mit dem Internet "
+"verbindet?"
 
 #: src/conf/wizard_curs.c:196
 msgid ""
@@ -2302,26 +2565,45 @@
 "\n"
 "If in doubt, leave this empty."
 msgstr ""
-"Wie hei�t die �ffentliche IP-Adresse oder der �ffentliche Name dieses 
Computers?\n"
+"Wie hei�t die �ffentliche IP-Adresse oder der �ffentliche Name dieses "
+"Computers?\n"
 "Wenn Sie nicht sicher sind, lassen Sie dieses Feld leer."
 
 #: src/conf/wizard_curs.c:202
 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 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address."
+"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 "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address."
 msgstr ""
-"Wenn Ihr Provider Ihnen immer die gleiche IP-Adresse zuweist (eine 
\"statische\" IP-Adresse), so geben Sie diese in das \"IP-Adresse\"-Feld ein. 
Wenn sich Ihre IP-Adresse immer wieder �ndert (\"dynamische\" IP-Adresse), es 
jedoch einen Rechnernamen gibt, der immer auf Ihre aktuelle IP-Adresse 
verweist, so k�nnen Sie diesen ebenfalls eintragen.\n"
-"Wenn Sie nicht sicher sind, so k�nnen Sie das Feld leer lassen. GNUnet wird 
dann versuchen, Ihre IP-Adresse automatisch zu bestimmen."
+"Wenn Ihr Provider Ihnen immer die gleiche IP-Adresse zuweist (eine "
+"\"statische\" IP-Adresse), so geben Sie diese in das \"IP-Adresse\"-Feld "
+"ein. Wenn sich Ihre IP-Adresse immer wieder �ndert (\"dynamische\" IP-"
+"Adresse), es jedoch einen Rechnernamen gibt, der immer auf Ihre aktuelle IP-"
+"Adresse verweist, so k�nnen Sie diesen ebenfalls eintragen.\n"
+"Wenn Sie nicht sicher sind, so k�nnen Sie das Feld leer lassen. GNUnet wird "
+"dann versuchen, Ihre IP-Adresse automatisch zu bestimmen."
 
 #: src/conf/wizard_curs.c:224
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, say \"yes\" here. Answer \"no\" on direct connections 
through modems, ISDN cards and DNAT (also known as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
+"connections through modems, ISDN cards and DNAT (also known as \"port "
+"forwarding\")."
 msgstr ""
 "Ist diese Maschine hinter NAT?\n"
 "\n"
-"Wenn Sie mit dem Internet �ber einen anderen Computer per SNAT, einem Router 
oder einer \"Hardware Firewall\" verbunden sind und andere Computer im Internet 
keine Verbindung zu diesem Computer herstellen k�nnen, so sagen Sie hier 
\"Ja\". Antworten Sie \"Nein\" bei direkten Verbindungen �ber Modem, 
ISDN-Karten und DNAT (auch bekannt als \"Port forwarding\")."
+"Wenn Sie mit dem Internet �ber einen anderen Computer per SNAT, einem Router "
+"oder einer \"Hardware Firewall\" verbunden sind und andere Computer im "
+"Internet keine Verbindung zu diesem Computer herstellen k�nnen, so sagen Sie "
+"hier \"Ja\". Antworten Sie \"Nein\" bei direkten Verbindungen �ber Modem, "
+"ISDN-Karten und DNAT (auch bekannt als \"Port forwarding\")."
 
 #: src/conf/wizard_curs.c:249
 msgid "How much upstream (Bytes/s) may be used?"
@@ -2331,11 +2613,19 @@
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"upstream\" is the data channel through which data is *sent* to the 
internet. The limit is either the total maximum for this computer or how much 
GNUnet itself is allowed to use. You can specify that later. If you have a 
flatrate, you can set it to the maximum speed of your internet connection."
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate, you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 "Hier k�nnen Sie GNUnets Ressourcenverwendung einschr�nken.\n"
 "\n"
-"Der \"Upstream\" ist der Datenkanal, durch den Daten an das Internet 
*gesendet* werden. Das Limit ist entweder das gesamte Maximum f�r diesem 
Computer oder wieviel GNUnet selbst verwenden darf. Dies k�nnen Sie sp�ter 
festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale 
Geschwindigkeit Ihrer Internetverbindung angeben."
+"Der \"Upstream\" ist der Datenkanal, durch den Daten an das Internet "
+"*gesendet* werden. Das Limit ist entweder das gesamte Maximum f�r diesem "
+"Computer oder wieviel GNUnet selbst verwenden darf. Dies k�nnen Sie sp�ter "
+"festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale "
+"Geschwindigkeit Ihrer Internetverbindung angeben."
 
 #: src/conf/wizard_curs.c:281
 msgid "How much downstream (Bytes/s) may be used?"
@@ -2345,21 +2635,42 @@
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"downstream\" is the data channel through which data is *received* from 
the internet. The limit is either the total maximum for this computer or how 
much GNUnet itself is allowed to use. You can specify that later. If you have a 
flatrate you can set it to the maximum speed of your internet connection."
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 "Hier k�nnen Sie GNUnets Ressourcenverwendung einschr�nken.\n"
 "\n"
-"Der \"Downstream\" ist der Datenkanal, durch den Daten vom Internet 
*empfangen* werden. Das Limit ist entweder das gesamte Maximum f�r diesem 
Computer oder wieviel GNUnet selbst verwenden darf. Dies k�nnen Sie sp�ter 
festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale 
Geschwindigkeit Ihrer Internetverbindung angeben."
+"Der \"Downstream\" ist der Datenkanal, durch den Daten vom Internet "
+"*empfangen* werden. Das Limit ist entweder das gesamte Maximum f�r diesem "
+"Computer oder wieviel GNUnet selbst verwenden darf. Dies k�nnen Sie sp�ter "
+"festlegen. Wenn Sie eine Flatrate haben, k�nnen Sie die maximale "
+"Geschwindigkeit Ihrer Internetverbindung angeben."
 
 #: src/conf/wizard_curs.c:307
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
-"Say \"yes\" here, if you don't want other network traffic to interfere with 
GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to 
values entered in the previous steps, or if you can't reliably measure the 
maximum capabilities of your connection. \"No\" can be very useful if other 
applications are causing a lot of traffic on your LAN.  In this case, you do 
not want to limit the traffic that GNUnet can inflict on your internet 
connection whenever your high-speed LAN gets used (e.g. by NFS)."
+"Say \"yes\" here, if you don't want other network traffic to interfere with "
+"GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to "
+"values entered in the previous steps, or if you can't reliably measure the "
+"maximum capabilities of your connection. \"No\" can be very useful if other "
+"applications are causing a lot of traffic on your LAN.  In this case, you do "
+"not want to limit the traffic that GNUnet can inflict on your internet "
+"connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 "Angegebene Bandbreite mit anderen Anwendungen teilen?\n"
 "\n"
-"Sagen Sie hier \"Ja\", wenn Sie nicht m�chten, dass anderer Netzwerkverkehr 
GNUnets Funktion st�rt aber dennoch GNUnets Bandbreite gem�� den Angaben in den 
vorherigen Schritten einschr�nken m�chten oder Sie die maximalen M�glichkeiten 
Ihrer Internetverbindung nicht zuverl�ssig messen k�nnen. \"Nein\" kann 
n�tzlich sein, wenn andere Anwendungen viel Netzwerkverkehr in Ihrem LAN 
verursachen. In diesem Fall m�chten Sie nicht GNUnets Netzwerkverkehr �ber die 
Internetverbindung einschr�nken, wann immer Ihre 
Hochgeschwindigkeits-LAN-Verbindung verwendet wird (z.B. durch NFS)."
+"Sagen Sie hier \"Ja\", wenn Sie nicht m�chten, dass anderer Netzwerkverkehr "
+"GNUnets Funktion st�rt aber dennoch GNUnets Bandbreite gem�� den Angaben in "
+"den vorherigen Schritten einschr�nken m�chten oder Sie die maximalen "
+"M�glichkeiten Ihrer Internetverbindung nicht zuverl�ssig messen k�nnen. "
+"\"Nein\" kann n�tzlich sein, wenn andere Anwendungen viel Netzwerkverkehr in "
+"Ihrem LAN verursachen. In diesem Fall m�chten Sie nicht GNUnets "
+"Netzwerkverkehr �ber die Internetverbindung einschr�nken, wann immer Ihre "
+"Hochgeschwindigkeits-LAN-Verbindung verwendet wird (z.B. durch NFS)."
 
 #: src/conf/wizard_curs.c:338
 msgid "How much CPU (in %) may be used?"
@@ -2379,39 +2690,60 @@
 msgid ""
 "Store migrated content?\n"
 "\n"
-"GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-"It also helps to spread popular content over different peers to enhance 
availability."
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability."
 msgstr ""
 "Sollen migrierte Inhalte gespeichert werden?\n"
-"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu 
speichern. Das ist n�tzlich, wenn ein Widersacher Zugriff auf Ihre eingef�gten 
Inhalte erlangt und Sie abstreiten m�ssen, dass diese Daten Ihnen geh�ren. Ist 
die \"Inhaltsmigration\" angeschaltet, so k�nnen die Inhalte �ber das Internet 
von einem anderen Knoten zu Ihrem Rechner ohne Ihr Wissen \"gewandert\" sein.\n"
-"Au�erdem hilft es, beliebte Inhalte �ber verschiedene Netzteilnehmer zu 
verteilen, um so die Verf�gbarkeit zu erh�hen."
+"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu "
+"speichern. Das ist n�tzlich, wenn ein Widersacher Zugriff auf Ihre "
+"eingef�gten Inhalte erlangt und Sie abstreiten m�ssen, dass diese Daten "
+"Ihnen geh�ren. Ist die \"Inhaltsmigration\" angeschaltet, so k�nnen die "
+"Inhalte �ber das Internet von einem anderen Knoten zu Ihrem Rechner ohne Ihr "
+"Wissen \"gewandert\" sein.\n"
+"Au�erdem hilft es, beliebte Inhalte �ber verschiedene Netzteilnehmer zu "
+"verteilen, um so die Verf�gbarkeit zu erh�hen."
 
 #: src/conf/wizard_curs.c:389
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content)."
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content)."
 msgstr ""
 "Was ist die maximale Gr��e des GNUnet Datenspeichers (in MB)?\n"
-"Der GNUnet Datenspeicher enth�lt alle Daten, die GNUnet erzeugt (Indexdaten, 
eingef�gte und migrierte Inhalte)."
+"Der GNUnet Datenspeicher enth�lt alle Daten, die GNUnet erzeugt (Indexdaten, "
+"eingef�gte und migrierte Inhalte)."
 
 #: src/conf/wizard_curs.c:411
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
-"If you say \"yes\" here, the GNUnet background process will be automatically 
started when you turn on your computer. If you say \"no\" here, you have to 
launch GNUnet yourself each time you want to use it."
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
 msgstr ""
 "M�chten Sie GNUnet als Systemdienst starten?\n"
 "\n"
-"Wenn Sie hier \"Ja\" sagen, so wird der GNUnet Hintergrundprozess jedesmal 
automatisch gestartet, wenn Sie Ihren Computer einschalten. Wenn Sie hier 
\"Nein\" sagen, so m�ssen Sie GNUnet jedesmal selbst starten, wenn Sie es 
verwenden m�chten."
+"Wenn Sie hier \"Ja\" sagen, so wird der GNUnet Hintergrundprozess jedesmal "
+"automatisch gestartet, wenn Sie Ihren Computer einschalten. Wenn Sie hier "
+"\"Nein\" sagen, so m�ssen Sie GNUnet jedesmal selbst starten, wenn Sie es "
+"verwenden m�chten."
 
 #: src/conf/wizard_curs.c:434
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new user 
account under which the GNUnet service is started at system startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account under which the GNUnet service is started at system startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the fields empty to run GNUnet with system privileges.\n"
 "\n"
@@ -2419,11 +2751,16 @@
 msgstr ""
 "Geben Sie den Benutzer an, dem der GNUnet Dienst geh�ren soll.\n"
 "\n"
-"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup ein neues 
Benutzerkonto anlegen zu lassen, unter dem der GNUnet Dienst beim Systemstart 
l�uft.\n"
+"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup ein neues "
+"Benutzerkonto anlegen zu lassen, unter dem der GNUnet Dienst beim "
+"Systemstart l�uft.\n"
 "\n"
-"Nat�rlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies 
betrifft auch Dateien, die Sie im GNUnet ver�ffentlichen m�chten. Sie m�ssen 
dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
+"Nat�rlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
+"betrifft auch Dateien, die Sie im GNUnet ver�ffentlichen m�chten. Sie m�ssen "
+"dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
 "\n"
-"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen 
lassen m�chten.\n"
+"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
+"lassen m�chten.\n"
 "\n"
 "GNUnet Benutzer:"
 
@@ -2431,31 +2768,37 @@
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new group 
for the chosen user account.\n"
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
 "\n"
 "You can also specify a already existant group here.\n"
 "\n"
-"Only members of this group will be allowed to start and stop the the GNUnet 
server and have access to GNUnet server data.\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 "\n"
 "GNUnet group:"
 msgstr ""
 "Definieren Sie eine Gruppe, der der GNUnet Dienst geh�rt.\n"
 "\n"
-"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup eine neue Gruppe 
f�r das gew�hlte Benutzerkonto anlegen zu lassen.\n"
+"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup eine neue Gruppe "
+"f�r das gew�hlte Benutzerkonto anlegen zu lassen.\n"
 "\n"
 "Sie k�nnen hier auch eine bestehende Gruppe angeben.\n"
 "\n"
-"Nur Mitglieder dieser Gruppe d�rfen den GNUnet Server starten und anhalten 
und haben Zugriff auf die Daten des GNUnet Servers.\n"
+"Nur Mitglieder dieser Gruppe d�rfen den GNUnet Server starten und anhalten "
+"und haben Zugriff auf die Daten des GNUnet Servers.\n"
 "\n"
 "GNUnet Gruppe:"
 
 #: src/conf/wizard_curs.c:491
 msgid ""
-"If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator.\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
 "\n"
 "Do you want to start it after saving your configuration?"
 msgstr ""
-"Wenn Sie ein erfahrener Benutzer sind, so m�chten Sie vielleicht Ihre GNUnet 
Installation �ber den erweiterten Konfigurator optimieren.\n"
+"Wenn Sie ein erfahrener Benutzer sind, so m�chten Sie vielleicht Ihre GNUnet "
+"Installation �ber den erweiterten Konfigurator optimieren.\n"
 "\n"
 "M�chten Sie ihn starten, nachdem Ihre Konfiguration gespeichert wurde?"
 
@@ -2491,21 +2834,45 @@
 msgid ""
 "Enter information about your network connection here.\n"
 "\n"
-"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.\n"
+"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.\n"
 "\n"
-"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 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address.\n"
+"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 "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, check the last option on this page. Leave it 
unchecked on direct connections through modems, ISDN cards and DNAT (also known 
as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
 msgstr ""
 "Geben Sie hier Ihre Netzwerkinformationen ein.\n"
 "\n"
-"Das \"Netzwerkger�t\" ist das Ger�t, das Ihren Computer mit dem Internet 
verbindet. Dies ist normalerweise ein Modem, eine ISDN-Karte oder eine 
Netzwerkkarte f�r den Fall, dass Sie DSL benutzen.\n"
+"Das \"Netzwerkger�t\" ist das Ger�t, das Ihren Computer mit dem Internet "
+"verbindet. Dies ist normalerweise ein Modem, eine ISDN-Karte oder eine "
+"Netzwerkkarte f�r den Fall, dass Sie DSL benutzen.\n"
 "\n"
-"Wenn Ihnen Ihr Provider immer die gleiche IP-Adresse zuweist (eine 
\"statische\" IP-Adresse), geben Sie diese in das \"IP-Adresse\"-Feld ein. Wenn 
Ihre IP-Adresse sich hin und wieder �ndert (\"dynamische\" IP-Adresse), es 
jedoch einen Hostnamen gibt, der immer auf Ihre aktuelle IP-Adresse zeigt 
(\"Dynamisches DNS\"), so k�nnen Sie ihn auch eingeben.\n"
-"Im Zweifel lassen Sie das Feld leer. GNUnet wird dann versuchen, die 
IP-Adresse automatisch zu bestimmen.\n"
+"Wenn Ihnen Ihr Provider immer die gleiche IP-Adresse zuweist (eine "
+"\"statische\" IP-Adresse), geben Sie diese in das \"IP-Adresse\"-Feld ein. "
+"Wenn Ihre IP-Adresse sich hin und wieder �ndert (\"dynamische\" IP-Adresse), "
+"es jedoch einen Hostnamen gibt, der immer auf Ihre aktuelle IP-Adresse zeigt "
+"(\"Dynamisches DNS\"), so k�nnen Sie ihn auch eingeben.\n"
+"Im Zweifel lassen Sie das Feld leer. GNUnet wird dann versuchen, die IP-"
+"Adresse automatisch zu bestimmen.\n"
 "\n"
-"Wenn Sie nicht direkt mit dem Internet verbunden sind, sondern dies �ber 
einen anderen Rechner mit SNAT, einem Router oder einer \"Hardware Firewall\" 
geschieht und andere Computer im Internet keine Verbindung mit diesem Computer 
herstellen k�nnen, so aktivieren Sie die letzte Option auf dieser Seite. Lassen 
Sie sie jedoch deaktiviert, wenn Sie eine direkte Verbindung �ber ein Modem, 
eine ISDN-Karte oder einen anderen Rechner mit DNAT (auch bekannt als \"Port 
forwarding\") zum Internet haben."
+"Wenn Sie nicht direkt mit dem Internet verbunden sind, sondern dies �ber "
+"einen anderen Rechner mit SNAT, einem Router oder einer \"Hardware Firewall"
+"\" geschieht und andere Computer im Internet keine Verbindung mit diesem "
+"Computer herstellen k�nnen, so aktivieren Sie die letzte Option auf dieser "
+"Seite. Lassen Sie sie jedoch deaktiviert, wenn Sie eine direkte Verbindung "
+"�ber ein Modem, eine ISDN-Karte oder einen anderen Rechner mit DNAT (auch "
+"bekannt als \"Port forwarding\") zum Internet haben."
 
 #: src/conf/wizard_interface.c:251
 msgid "Network interface:"
@@ -2517,7 +2884,8 @@
 
 #: src/conf/wizard_interface.c:273
 msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
-msgstr "Computer kann keine ankommenden Verbindungen akzeptieren 
(SNAT/Firewall)"
+msgstr ""
+"Computer kann keine ankommenden Verbindungen akzeptieren (SNAT/Firewall)"
 
 #: src/conf/wizard_interface.c:285
 msgid "Network connection"
@@ -2532,15 +2900,22 @@
 msgid ""
 "You can limit GNUnet's ressource usage here.\n"
 "\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you have 
a flatrate you can set it to the maximum speed of your internet connection.\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
 "\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed 
to use."
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
 msgstr ""
 "Hier k�nnen Sie GNUnet's Ressourcennutzung einschr�nken.\n"
 "\n"
-"\"Bandbreitenbeschr�nkung\" gibt an, wieviele Daten maximal pro Sekunde 
�betragen werden d�rfen. Wenn Sie eine Flatrate haben, k�nnen Sie diese Werte 
auf die maximal erreichbare Geschwindigkeit Ihrer Internetverbindung setzen.\n"
+"\"Bandbreitenbeschr�nkung\" gibt an, wieviele Daten maximal pro Sekunde "
+"�betragen werden d�rfen. Wenn Sie eine Flatrate haben, k�nnen Sie diese "
+"Werte auf die maximal erreichbare Geschwindigkeit Ihrer Internetverbindung "
+"setzen.\n"
 "\n"
-"Die \"Max. CPU Nutzung\" gibt den Prozentsatz an CPU-Zeit an, den GNUnet f�r 
sich verwenden darf."
+"Die \"Max. CPU Nutzung\" gibt den Prozentsatz an CPU-Zeit an, den GNUnet f�r "
+"sich verwenden darf."
 
 #: src/conf/wizard_interface.c:521
 msgid "Upstream (Bytes/s):"
@@ -2580,19 +2955,35 @@
 
 #: src/conf/wizard_interface.c:814
 msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-"It also helps to spread popular content over different peers to enhance 
availability.\n"
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
 "\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content). Its maximum size can be specified below.\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
 "\n"
-"If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator."
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator."
 msgstr ""
-"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu 
speichern. Das ist n�tzlich, wenn ein Widersacher Zugriff auf Ihre eingef�gten 
Inhalte erlangt und Sie abstreiten m�ssen, dass diese Daten Ihnen geh�ren. Mit 
\"Inhaltsmigration\" angeschaltet k�nnen die Inhalte �ber das Internet von 
einem anderen Knoten zu Ihrem Rechner ohne Ihr Wissen \"gewandert\" sein.\n"
-"Au�erdem hilft es, beliebte Inhalte �ber verschiedene Netzteilnehmer zu 
verteilen, um so die Verf�gbarkeit zu erh�hen.\n"
+"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu "
+"speichern. Das ist n�tzlich, wenn ein Widersacher Zugriff auf Ihre "
+"eingef�gten Inhalte erlangt und Sie abstreiten m�ssen, dass diese Daten "
+"Ihnen geh�ren. Mit \"Inhaltsmigration\" angeschaltet k�nnen die Inhalte �ber "
+"das Internet von einem anderen Knoten zu Ihrem Rechner ohne Ihr Wissen "
+"\"gewandert\" sein.\n"
+"Au�erdem hilft es, beliebte Inhalte �ber verschiedene Netzteilnehmer zu "
+"verteilen, um so die Verf�gbarkeit zu erh�hen.\n"
 "\n"
-"Der GNUnet Datenspeicher enth�lt alle Daten, die GNUnet erzeugt (Indexdaten, 
eingef�gte und migrierte Inhalte). Seine maximale Gr��e kann unten angegeben 
werden.\n"
+"Der GNUnet Datenspeicher enth�lt alle Daten, die GNUnet erzeugt (Indexdaten, "
+"eingef�gte und migrierte Inhalte). Seine maximale Gr��e kann unten angegeben "
+"werden.\n"
 "\n"
-"Wenn Sie ein fortgeschrittener Benutzer sind, m�chten Sie vielleicht weitere 
Feinjustierungen an GNUnet �ber den \"erweiterten Konfigurator\" vornehmen."
+"Wenn Sie ein fortgeschrittener Benutzer sind, m�chten Sie vielleicht weitere "
+"Feinjustierungen an GNUnet �ber den \"erweiterten Konfigurator\" vornehmen."
 
 #: src/conf/wizard_interface.c:829
 msgid "Store migrated content"
@@ -2604,7 +2995,8 @@
 
 #: src/conf/wizard_interface.c:849
 msgid "Start the GNUnet background process on computer startup"
-msgstr "GNUnet Hintergrundproze� beim Starten des Computers automatisch 
starten"
+msgstr ""
+"GNUnet Hintergrundproze� beim Starten des Computers automatisch starten"
 
 #: src/conf/wizard_interface.c:856
 msgid "Open the enhanced configurator"
@@ -2646,19 +3038,29 @@
 msgid ""
 "Define the user and the group owning the GNUnet service here.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new user 
account and a new group under which the GNUnet service is started at system 
startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the fields empty to run GNUnet with system privileges."
 msgstr ""
-"Geben Sie den Benutzer und die Gruppe an, der der GNUnet Dienst geh�ren 
soll.\n"
+"Geben Sie den Benutzer und die Gruppe an, der der GNUnet Dienst geh�ren "
+"soll.\n"
 "\n"
-"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup ein neues 
Benutzerkonto und eine neue Gruppe anlegen zu lassen, unter der der GNUnet 
Dienst beim Systemstart l�uft.\n"
+"Aus Sicherheitsgr�nden ist es eine gute Idee, dieses Setup ein neues "
+"Benutzerkonto und eine neue Gruppe anlegen zu lassen, unter der der GNUnet "
+"Dienst beim Systemstart l�uft.\n"
 "\n"
-"Nat�rlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies 
betrifft auch Dateien, die Sie im GNUnet ver�ffentlichen m�chten. Sie m�ssen 
dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
+"Nat�rlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
+"betrifft auch Dateien, die Sie im GNUnet ver�ffentlichen m�chten. Sie m�ssen "
+"dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
 "\n"
-"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen 
lassen m�chten."
+"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
+"lassen m�chten."
 
 #: src/conf/wizard_interface.c:1209
 msgid "Group:"
@@ -2668,95 +3070,106 @@
 msgid "User account:"
 msgstr "Benutzerkonto:"
 
-#: src/conf/wizard_util.c:174 src/conf/wizard_util.c:236
+#: src/conf/wizard_util.c:89
 msgid "Can't open Service Control Manager"
 msgstr "Der Dienstemanager konnte nicht ge�ffnet werden"
 
-#: src/conf/wizard_util.c:180
+#: src/conf/wizard_util.c:94
 msgid "Can't create service"
 msgstr "Der Dienst konnte nicht angelegt werden"
 
-#: src/conf/wizard_util.c:185 src/conf/wizard_util.c:248
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
-#: src/conf/wizard_util.c:198
+#: src/conf/wizard_util.c:99
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr "Fehler beim �ndern der Berechtigungen des GNUnet Verzeichnisses"
 
-#: src/conf/wizard_util.c:219
+#: src/conf/wizard_util.c:103
 msgid "Cannot write to the regisitry"
 msgstr "Konnte nicht in die Registry schreiben"
 
-#: src/conf/wizard_util.c:240
+#: src/conf/wizard_util.c:106
 msgid "Can't access the service"
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/conf/wizard_util.c:244
+#: src/conf/wizard_util.c:109
 msgid "Can't delete the service"
 msgstr "Dienst konnte nicht gel�scht werden"
 
-#: src/conf/wizard_util.c:410
+#: src/conf/wizard_util.c:112
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+#: src/conf/wizard_util.c:140
 msgid "This version of Windows does not support multiple users."
 msgstr "Diese Version von Windows ist nicht Mehrbenutzerf�hig."
 
-#: src/conf/wizard_util.c:414
+#: src/conf/wizard_util.c:144
 msgid "Error creating user"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/conf/wizard_util.c:417
+#: src/conf/wizard_util.c:147
 msgid "Error accessing local security policy"
 msgstr "Fehler beim Zugriff auf die lokale Sicherheitsrichtlinie"
 
-#: src/conf/wizard_util.c:420
+#: src/conf/wizard_util.c:150
 msgid "Error granting service right to user"
 msgstr "Fehler beim Zuweisen des Dienstrechtes dem Benutzer"
 
-#: src/conf/wizard_util.c:423
+#: src/conf/wizard_util.c:153
 msgid "Unknown error while creating a new user"
 msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
 
-#: src/server/connection.c:993
+#: src/server/connection.c:971
 #, 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:1001
+#: src/server/connection.c:979
 #, 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:1970
+#: src/server/connection.c:2155
 #, c-format
 msgid "Message from '%s' discarded: invalid format.\n"
 msgstr "Nachricht von '%s' verworfen: ung�ltiges Format.\n"
 
-#: src/server/connection.c:2044
+#: src/server/connection.c:2232
 #, 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:2060
+#: src/server/connection.c:2248
 msgid "Message received more than one day old. Dropped.\n"
-msgstr "Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird 
verworfen.\n"
+msgstr ""
+"Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
 
-#: src/server/connection.c:2193
-#, c-format
-msgid "Session with peer '%s' confirmed, but I cannot connect! (bug?)\n"
-msgstr "Sitzung mit Knoten '%s' ist best�tigt es kann jedoch nicht verbunden 
werden! (Bug?)\n"
-
-#: src/server/connection.c:2470
+#: src/server/connection.c:2641
 msgid "# outgoing messages dropped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2472
+#: src/server/connection.c:2643
 msgid "# bytes of outgoing messages dropped"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/server/connection.c:2474
+#: src/server/connection.c:2645
 msgid "# connections closed (HANGUP sent)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
+#: src/server/connection.c:2647
+#, fuzzy
+msgid "# bytes encrypted"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/server/connection.c:2649
+#, fuzzy
+msgid "# bytes decrypted"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/server/connection.c:2651
+#, fuzzy
+msgid "# bytes noise sent"
+msgstr "# Bytes Rauschen empfangen"
+
 #: src/server/core.c:114
 #, c-format
 msgid "Application module '%s' already initialized!\n"
@@ -2775,7 +3188,9 @@
 #: src/server/core.c:221
 #, c-format
 msgid "Could not shutdown application '%s': not initialized\n"
-msgstr "Anwendung '%s' kann nicht heruntergefahren werden: sie ist nicht 
initialisiert\n"
+msgstr ""
+"Anwendung '%s' kann nicht heruntergefahren werden: sie ist nicht "
+"initialisiert\n"
 
 #: src/server/core.c:230 src/server/core.c:419
 #, c-format
@@ -2787,7 +3202,7 @@
 msgid "Could not release %p: service not loaded\n"
 msgstr "%p kann nicht freigegeben werden: Dienst ist nicht geladen\n"
 
-#: src/server/core.c:475 src/server/gnunet-update.c:218
+#: src/server/core.c:475 src/server/gnunet-update.c:219
 msgid "No applications defined in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
@@ -2844,27 +3259,30 @@
 msgid "'%s': Could not connect.\n"
 msgstr "'%s': Verbindung konnte nicht hergestellt werden.\n"
 
-#: src/server/gnunet-transport-check.c:146
+#: src/server/gnunet-transport-check.c:147
 #, c-format
 msgid "'%s': Could not send.\n"
 msgstr "'%s': Kann nicht senden.\n"
 
-#: src/server/gnunet-transport-check.c:166
+#: src/server/gnunet-transport-check.c:167
 #, 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:180
+#: src/server/gnunet-transport-check.c:181
 #, c-format
 msgid "'%s': Could not disconnect.\n"
 msgstr "'%s': Verbindung konnte nicht getrennt werden.\n"
 
-#: src/server/gnunet-transport-check.c:187
+#: src/server/gnunet-transport-check.c:188
 #, c-format
-msgid "'%s' transport OK.  It took %ums to transmit %d messages of %d bytes 
each.\n"
-msgstr "'%s' Transport funktioniert. Es dauerte %ums, um %d Nachrichten zu je 
%d Bytes zu �bertragen.\n"
+msgid ""
+"'%s' transport OK.  It took %ums to transmit %d messages of %d 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:220
+#: src/server/gnunet-transport-check.c:221
 #, c-format
 msgid ""
 "\n"
@@ -2873,7 +3291,7 @@
 "\n"
 "Kontaktiere '%s'."
 
-#: src/server/gnunet-transport-check.c:231
+#: src/server/gnunet-transport-check.c:232
 #, c-format
 msgid " Transport %d not available\n"
 msgstr " Transport %d ist nicht verf�gbar\n"
@@ -2915,11 +3333,14 @@
 
 #: src/server/gnunet-transport-check.c:500
 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."
+msgstr ""
+"Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport Dienste "
+"funktionsf�hig sind."
 
 #: src/server/gnunet-transport-check.c:548
 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"
+msgstr ""
+"Sie m�ssen eine Menge an Transporten angeben, die getestet werden sollen!\n"
 
 #: src/server/gnunet-transport-check.c:553
 #, c-format
@@ -2933,16 +3354,22 @@
 
 #: src/server/gnunet-transport-check.c:600
 #, c-format
-msgid "%d out of %d peers contacted successfully (%d times transport 
unavailable).\n"
-msgstr "%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport 
nicht verf�gbar).\n"
+msgid ""
+"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
+msgstr ""
+"%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport nicht "
+"verf�gbar).\n"
 
 #: src/server/gnunet-update.c:49
 msgid "print a value from the configuration file to stdout"
-msgstr "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe 
ausgeben"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
 #: src/server/gnunet-update.c:53
 msgid "run in user mode (for getting user configuration values)"
-msgstr "Im Benuter-Modus laufen (um benutzerspezifische 
Konfigurationseinstellungen zu bekommen)"
+msgstr ""
+"Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
+"zu bekommen)"
 
 #: src/server/gnunet-update.c:59
 msgid "Updates GNUnet datastructures after version change."
@@ -2962,17 +3389,17 @@
 "\n"
 "Abbruch.\n"
 
-#: src/server/gnunet-update.c:235
+#: src/server/gnunet-update.c:236
 #, c-format
 msgid "Updating data for module '%s'\n"
 msgstr "Daten des Moduls '%s' werden aktualisiert\n"
 
-#: src/server/gnunet-update.c:239
+#: src/server/gnunet-update.c:240
 #, 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:294
+#: src/server/gnunet-update.c:296
 #, c-format
 msgid "Updated data for %d applications.\n"
 msgstr "Daten f�r %d Anwendungen wurden aktualisiert.\n"
@@ -2980,7 +3407,9 @@
 #: src/server/gnunetd.c:108
 #, 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"
+msgstr ""
+"Konfiguration oder die GNUnet Version hat sich ge�ndert. Sie m�ssen '%s' "
+"ausf�hren!\n"
 
 #: src/server/gnunetd.c:116
 #, c-format
@@ -3010,7 +3439,9 @@
 #: src/server/startup.c:268
 #, 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"
+msgstr ""
+"Sie m�ssen einen Namen f�r die PID Datei in Sektion '%s' unter '%s' "
+"angeben.\n"
 
 #: src/server/startup.c:283
 #, c-format
@@ -3018,8 +3449,13 @@
 msgstr "PID konnte nicht in Datei '%s' geschrieben werden: %s.\n"
 
 #: src/server/startup.c:387
-msgid "run in debug mode; gnunetd will not daemonize and error messages will 
be written to stderr instead of a logfile"
-msgstr "Im Debug-Modus ausf�hren. gnunetd wird nicht im Hintergrund laufen und 
Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die 
Standardfehlerausgabe (stderr) geschrieben."
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
+msgstr ""
+"Im Debug-Modus ausf�hren. gnunetd wird nicht im Hintergrund laufen und "
+"Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
+"Standardfehlerausgabe (stderr) geschrieben."
 
 #: src/server/startup.c:393
 msgid "run as user LOGIN"
@@ -3059,8 +3495,12 @@
 
 #: src/server/tcpserver.c:696
 #, c-format
-msgid "Malformed network specification in the configuration in section '%s' 
for entry '%s': %s\n"
-msgstr "Besch�digte Netzwerkangabe in der Konfigurationsdatei in Sektion '%s' 
f�r Eintrag '%s': %s\n"
+msgid ""
+"Malformed network specification in the configuration in section '%s' for "
+"entry '%s': %s\n"
+msgstr ""
+"Besch�digte Netzwerkangabe in der Konfigurationsdatei in Sektion '%s' f�r "
+"Eintrag '%s': %s\n"
 
 #: src/server/tcpserver.c:802
 #, c-format
@@ -3083,37 +3523,43 @@
 
 #: src/transports/http.c:600
 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"
+msgstr ""
+"Es wurde eine Willkommensnachricht erwartet, tats�chlich wurde jedoch keine "
+"gesendet. HTTP-Verbindung wird geschlossen.\n"
 
 #: src/transports/http.c:816 src/transports/tcp.c:688 src/transports/udp.c:285
 #, 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"
+msgstr ""
+"%s: Abgewiesene Verbindung von schwarzgelisteter Adresse %u.%u.%u.%u.\n"
 
-#: src/transports/http.c:1099
+#: src/transports/http.c:1097
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: �ffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/http.c:1174 src/transports/tcp.c:1127 src/util/tcpio.c:166
+#: src/transports/http.c:1171 src/transports/tcp.c:1124 src/util/tcpio.c:166
 #: src/util/tcpio.c:196
 #, 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:1331
+#: src/transports/http.c:1327
 #, c-format
-msgid "Could not bind the HTTP listener to port %d. No transport service 
started.\n"
-msgstr "HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport 
Dienst wurde nicht gestartet.\n"
+msgid ""
+"Could not bind the HTTP listener to port %d. No transport service started.\n"
+msgstr ""
+"HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport Dienst "
+"wurde nicht gestartet.\n"
 
-#: src/transports/http.c:1474
+#: src/transports/http.c:1470
 msgid "# bytes received via HTTP"
 msgstr "# Bytes empfangen �ber HTTP"
 
-#: src/transports/http.c:1476
+#: src/transports/http.c:1472
 msgid "# bytes sent via HTTP"
 msgstr "# Bytes gesendet �ber HTTP"
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1474
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# Bytes verworfen von HTTP"
 
@@ -3124,18 +3570,25 @@
 
 #: src/transports/smtp.c:413
 #, c-format
-msgid "You must specify the name of a pipe for the SMTP transport in section 
'%s' under '%s'.\n"
-msgstr "F�r den SMTP Transport m�ssen Sie den Namen einer Pipe in Sektion 
'%s', Eintrag '%s' eintragen.\n"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section '%s' "
+"under '%s'.\n"
+msgstr ""
+"F�r den SMTP Transport m�ssen Sie den Namen einer Pipe in Sektion '%s', "
+"Eintrag '%s' eintragen.\n"
 
 #: src/transports/smtp.c:482
 msgid "Received malformed message via SMTP (size mismatch).\n"
-msgstr "Es wurde eine ung�ltige Nachricht per SMTP empfangen (ung�ltige 
Gr��e).\n"
+msgstr ""
+"Es wurde eine ung�ltige Nachricht per SMTP empfangen (ung�ltige Gr��e).\n"
 
-#: src/transports/smtp.c:571
+#: src/transports/smtp.c:569
 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"
+msgstr ""
+"Kein Filter f�r E-Mail angegeben, es kann keine Bekanntmachung erstellt "
+"werden.\n"
 
-#: src/transports/smtp.c:578
+#: src/transports/smtp.c:576
 #, c-format
 msgid "SMTP filter string to long, capped to '%s'\n"
 msgstr "SMTP Filterstring zu lang, wurde auf '%s' abgeschnitten\n"
@@ -3155,69 +3608,87 @@
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s filter %s (SMTP)"
 
-#: src/transports/smtp.c:891 src/transports/udp.c:655
-#: src/transports/udp6.c:634
+#: src/transports/smtp.c:891 src/transports/udp.c:657
+#: src/transports/udp6.c:635
 #, c-format
 msgid "MTU for '%s' is probably too low (fragmentation not implemented!)\n"
-msgstr "MTU f�r '%s' ist m�glicherweise zu gering (Fragmentierung ist nicht 
implementiert!)\n"
+msgstr ""
+"MTU f�r '%s' ist m�glicherweise zu gering (Fragmentierung ist nicht "
+"implementiert!)\n"
 
 #: src/transports/tcp.c:464
 #, c-format
-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"
+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"
 
 #: src/transports/tcp.c:498
 #, 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"
+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:1058
+#: src/transports/tcp.c:1056
 msgid "Could not determine my public IP address.\n"
 msgstr "�ffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/tcp.c:1310 src/transports/tcp6.c:1203
+#: src/transports/tcp.c:1306 src/transports/tcp6.c:1199
 #, 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:1425
+#: src/transports/tcp.c:1423
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen �ber TCP"
 
-#: src/transports/tcp.c:1427
+#: src/transports/tcp.c:1425
 msgid "# bytes sent via TCP"
 msgstr "# Bytes gesendet �ber TCP"
 
-#: src/transports/tcp.c:1429
+#: src/transports/tcp.c:1427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
 #: src/transports/tcp6.c:438
 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"
+msgstr ""
+"Es wurde eine Willkommensnachricht erwartet, �ber die TCP Verbindung wurde "
+"jedoch keine gesendet. Verbindung wird geschlossen.\n"
 
 #: src/transports/tcp6.c:468
-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 ""
+"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:656 src/transports/udp6.c:273
 #, c-format
 msgid "%s: Rejected connection from blacklisted address %s.\n"
 msgstr "%s: Zur�ckgewiesene Verbindung von schwarzgelisteter Adresse %s.\n"
 
-#: src/transports/tcp6.c:959
+#: src/transports/tcp6.c:957
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "Die �ffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/tcp6.c:1004
+#: src/transports/tcp6.c:1001
 #, c-format
 msgid "'%s': unknown service: %s\n"
 msgstr "'%s': unbekannter Dienst: %s\n"
 
 #: src/transports/udp.c:144 src/transports/udp6.c:127
 #, 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 "Port 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 ""
+"Cannot determine port to bind to.  Define in configuration file in section '%"
+"s' under '%s' or in '%s' under %s/%s.\n"
+msgstr ""
+"Port 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/udp.c:178
 #, c-format
@@ -3227,43 +3698,53 @@
 #: src/transports/udp.c:251
 #, 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"
+msgstr ""
+"Es wurde eine ung�ltige UDP Nachricht von %u.%u.%u.%u:%u empfangen, "
+"Nachricht wird ignoriert.\n"
 
 #: src/transports/udp.c:274
 #, 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"
+msgstr ""
+"Ein Paket empfangen von %u.%u.%u.%u:%u (UDP) hat ein ung�ltiges Format.\n"
 
-#: src/transports/udp.c:356
+#: src/transports/udp.c:355
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "UDP: �ffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/udp.c:486
+#: src/transports/udp.c:487
 #, 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"
+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:640
+#: src/transports/udp.c:642
 msgid "# bytes received via UDP"
 msgstr "# Bytes empfangen �ber UDP"
 
-#: src/transports/udp.c:642
+#: src/transports/udp.c:644
 msgid "# bytes sent via UDP"
 msgstr "# Bytes gesendet �ber UDP"
 
-#: src/transports/udp.c:644
+#: src/transports/udp.c:646
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
 #: src/transports/ip.c:141
 #, c-format
-msgid "Could not find interface '%s' in '%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"
+msgid ""
+"Could not find interface '%s' in '%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:166
 #, 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"
+msgstr ""
+"Es konnte keine IP f�r das Ger�t '%s' unter Verwendung von '%s' ermittelt "
+"werden.\n"
 
 #: src/transports/ip.c:210
 #, c-format
@@ -3282,7 +3763,8 @@
 #: src/transports/ip.c:241
 #, 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"
+msgstr ""
+"'%s' konnte nicht aufgel�st werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
 #: src/transports/ip.c:274
 #, c-format
@@ -3301,14 +3783,17 @@
 #: src/transports/udp6.c:233
 #, 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"
+msgstr ""
+"Ung�ltige UDP6 Nachricht von %s:%d empfangen, Nachricht wird ignoriert.\n"
 
 #: src/transports/udp6.c:262
 #, 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."
+msgstr ""
+"Die Format�berpr�fung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
+"schlug fehl."
 
-#: src/transports/udp6.c:353
+#: src/transports/udp6.c:352
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "UDP6: �ffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
@@ -3329,8 +3814,12 @@
 
 #: src/util/configuration.c:471
 #, c-format
-msgid "Configuration file '%s' not found. I will try to create the default 
configuration file at that location.\n"
-msgstr "Konfigurationsdatei '%s' wurde nicht gefunden. Es wird versucht, an 
dieser Stelle eine Standardkonfigurationsdatei anzulegen.\n"
+msgid ""
+"Configuration file '%s' not found. I will try to create the default "
+"configuration file at that location.\n"
+msgstr ""
+"Konfigurationsdatei '%s' wurde nicht gefunden. Es wird versucht, an dieser "
+"Stelle eine Standardkonfigurationsdatei anzulegen.\n"
 
 #: src/util/configuration.c:488
 #, c-format
@@ -3343,23 +3832,28 @@
 
 #: src/util/cron.c:366
 #, c-format
-msgid "'%s' called with cron job not in queue, adding.  This may not be what 
you want.\n"
-msgstr "'%s' aufgerufen wobei Cron Job nicht Warteschlange ist. Er wird 
hinzugef�gt. Das ist m�glicherweise nicht, was Sie wollen.\n"
+msgid ""
+"'%s' called with cron job not in queue, adding.  This may not be what you "
+"want.\n"
+msgstr ""
+"'%s' aufgerufen wobei Cron Job nicht Warteschlange ist. Er wird hinzugef�gt. "
+"Das ist m�glicherweise nicht, was Sie wollen.\n"
 
-#: src/util/dso.c:41
+#: src/util/dso.c:42
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/util/dso.c:93
+#: src/util/dso.c:94
 #, c-format
 msgid "'%s' failed for library '%s' at %s:%d with error: %s\n"
 msgstr "'%s' fehlgeschlagen f�r die Bibliothek '%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/dso.c:143
+#: src/util/dso.c:144
 #, c-format
 msgid "'%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
-msgstr "'%s' konnte die Methode '%s%s' nicht aufl�sen. Ort: %s:%d. Fehler: 
%s\n"
+msgstr ""
+"'%s' konnte die Methode '%s%s' nicht aufl�sen. Ort: %s:%d. Fehler: %s\n"
 
 #: src/util/getopt.c:641
 #, c-format
@@ -3433,7 +3927,8 @@
 #: src/util/random.c:38
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt hat nicht die erwartete Version (Version %s wird 
vorausgesetzt).\n"
+msgstr ""
+"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
 #: src/util/ipcheck.c:100
 #, c-format
@@ -3505,24 +4000,24 @@
 msgid "EVERYTHING"
 msgstr "ALLES"
 
-#: src/util/logging.c:251
-msgid "LOGLEVEL not specified, that is not ok.\n"
-msgstr "LOGLEVEL wurde nicht angegeben, das ist nicht in Ordnung.\n"
-
-#: src/util/logging.c:262
+#: src/util/logging.c:261
 #, c-format
 msgid "Invalid LOGLEVEL '%s' specified.\n"
 msgstr "Ung�ltiger LOGLEVEL '%s' angegeben.\n"
 
-#: src/util/logging.c:367 src/util/logging.c:373
+#: src/util/logging.c:353 src/util/logging.c:359
 #, c-format
 msgid "Failure at %s:%d.\n"
 msgstr "Fehler bei %s:%d.\n"
 
 #: src/util/port.c:45
 #, c-format
-msgid "Cannot determine port of gnunetd server. Define in configuration file 
in section '%s' under '%s'.\n"
-msgstr "Der Port des gnunetd Servers konnte nicht ermittelt werden. Definieren 
Sie ihn in der Sektion '%s' unter '%s'.\n"
+msgid ""
+"Cannot determine port of gnunetd server. Define in configuration file in "
+"section '%s' under '%s'.\n"
+msgstr ""
+"Der Port des gnunetd Servers konnte nicht ermittelt werden. Definieren Sie "
+"ihn in der Sektion '%s' unter '%s'.\n"
 
 #: src/util/printhelp.c:42
 #, c-format
@@ -3537,8 +4032,11 @@
 
 #: src/util/printhelp.c:45
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
-msgstr "Parameter, die f�r lange Optionen zwingend sind, sind auch f�r kurze 
Optionen zwingend.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Parameter, die f�r lange Optionen zwingend sind, sind auch f�r kurze "
+"Optionen zwingend.\n"
 
 #: src/util/semaphore.c:172 src/util/semaphore.c:198
 #, c-format
@@ -3562,47 +4060,34 @@
 
 #: src/util/state.c:86
 #, 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 ""
+"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/util/statuscalls.c:138
+#: src/util/statuscalls.c:185
 #, c-format
-msgid "No network interfaces defined in configuration section '%s' under 
'%s'!\n"
-msgstr "Es sind keine Netzwerkger�te in der Konfigurationsdatei in der Sektion 
'%s' unter '%s' definiert!\n"
-
-#: src/util/statuscalls.c:163
-#, c-format
-msgid "Interfaces string (%s) in configuration section '%s' under '%s' is 
malformed.\n"
-msgstr "Ger�teangabe (%s) in der Konfigurationssektion '%s' unter '%s' ist 
besch�digt.\n"
-
-#: src/util/statuscalls.c:176
-#, c-format
-msgid "No network interfaces specified in the configuration file in section 
'%s' under '%s'.\n"
-msgstr "Es sind keine Netzwerkger�te in der Konfigurationsdatei in der Sektion 
'%s' unter '%s' definiert.\n"
-
-#: src/util/statuscalls.c:398 src/util/statuscalls.c:618
-#, c-format
 msgid "Failed to parse interface data from '%s' at %s:%d.\n"
 msgstr "Fehler beim Parsen der Ger�tedaten von '%s' bei %s:%d.\n"
 
-#: src/util/statuscalls.c:500
-#, c-format
-msgid "Failed to parse interface data '%s' output at %s:%d.\n"
-msgstr "Fehler beim Parsen der Ger�tedaten '%s' Ausgabe bei %s:%d.\n"
-
-#: src/util/statuscalls.c:827
-#, c-format
-msgid "Could not decoding file '%s' at %s:%d.\n"
-msgstr "Datei '%s' konnte nicht dekodiert werden bei %s:%d.\n"
-
-#: src/util/statuscalls.c:1002
+#: src/util/statuscalls.c:487
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "CPU Nutzung kann nicht ermittelt werden (Windows NT).\n"
 
-#: src/util/statuscalls.c:1022
+#: src/util/statuscalls.c:505
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "CPU Nutzung kann nicht ermittelt werden (Win 9x).\n"
 
+#: src/util/statuscalls.c:598
+#, c-format
+msgid ""
+"No network interfaces defined in configuration section '%s' under '%s'!\n"
+msgstr ""
+"Es sind keine Netzwerkger�te in der Konfigurationsdatei in der Sektion '%s' "
+"unter '%s' definiert!\n"
+
 #: src/util/storage.c:196
 #, c-format
 msgid "'%s' failed for drive %s: %u\n"
@@ -3628,6 +4113,26 @@
 msgid "'%s' failed, reply invalid!\n"
 msgstr "'%s' fehlgeschlagen, Antwort ist ung�ltig!\n"
 
+#: src/util/timer.c:188
+msgid "ms"
+msgstr "ms"
+
+#: src/util/timer.c:193
+msgid "s"
+msgstr "s"
+
+#: src/util/timer.c:196
+msgid "m"
+msgstr "m"
+
+#: src/util/timer.c:199
+msgid "h"
+msgstr "h"
+
+#: src/util/timer.c:202
+msgid " days"
+msgstr " Tage"
+
 #: src/util/daemon.c:142
 #, c-format
 msgid "Attempted path to '%s' was '%s'.\n"
@@ -3638,52 +4143,99 @@
 msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
 msgstr "Unerwartete sehr gro�e Allokierung (%u Bytes) bei %s:%d!\n"
 
-#: src/include/gnunet_util.h:147
+#: src/include/gnunet_util.h:155
 msgid "print this help"
 msgstr "Gibt diese Hilfe aus"
 
-#: src/include/gnunet_util.h:150
+#: src/include/gnunet_util.h:158
 msgid "set verbosity to LEVEL"
 msgstr "Umfang der Meldungen auf LEVEL setzen"
 
-#: src/include/gnunet_util.h:153
+#: src/include/gnunet_util.h:161
 msgid "use configuration file FILENAME"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/include/gnunet_util.h:156
+#: src/include/gnunet_util.h:164
 msgid "specify host on which gnunetd is running"
 msgstr "Gibt an, auf welchem Host gnunetd l�uft"
 
-#: src/include/gnunet_util.h:159
+#: src/include/gnunet_util.h:167
 msgid "print the version number"
 msgstr "Versionsnummer ausgeben"
 
-#: src/include/gnunet_util.h:162
+#: src/include/gnunet_util.h:170
 msgid "be verbose"
 msgstr "umfangreiche Meldungen ausgeben"
 
-#: src/include/gnunet_util.h:602 src/include/gnunet_util.h:604
+#: src/include/gnunet_util.h:611 src/include/gnunet_util.h:613
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_util.h:1009 src/include/gnunet_util.h:1011
-#: src/include/gnunet_util.h:1018
+#: src/include/gnunet_util.h:1018 src/include/gnunet_util.h:1020
+#: src/include/gnunet_util.h:1027
 #, c-format
 msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
 msgstr "'%s' schlug bei Datei '%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
-#~ msgid "Configuration file must specify directory for network identities in 
section %s under %s.\n"
-#~ msgstr "Die Konfigurationsdatei muss in Sektion %s unter %s ein Verzeichnis 
f�r Identit�ten angeben.\n"
+#~ msgid "# client trace requests received"
+#~ msgstr "# Client Trace-Anfragen empfangen"
 
+#~ msgid "# client trace replies sent"
+#~ msgstr "# Client Trace-Antworten gesendet"
+
+#~ msgid "# p2p trace requests received"
+#~ msgstr "# p2p Trace-Anfragen empfangen"
+
+#~ msgid "# p2p trace replies sent"
+#~ msgstr "# p2p Trace-Antworten gesendet"
+
+#~ msgid "Session with peer '%s' confirmed, but I cannot connect! (bug?)\n"
+#~ msgstr ""
+#~ "Sitzung mit Knoten '%s' ist best�tigt es kann jedoch nicht verbunden "
+#~ "werden! (Bug?)\n"
+
+#~ msgid "LOGLEVEL not specified, that is not ok.\n"
+#~ msgstr "LOGLEVEL wurde nicht angegeben, das ist nicht in Ordnung.\n"
+
+#~ msgid ""
+#~ "Interfaces string (%s) in configuration section '%s' under '%s' is "
+#~ "malformed.\n"
+#~ msgstr ""
+#~ "Ger�teangabe (%s) in der Konfigurationssektion '%s' unter '%s' ist "
+#~ "besch�digt.\n"
+
+#~ msgid ""
+#~ "No network interfaces specified in the configuration file in section '%s' "
+#~ "under '%s'.\n"
+#~ msgstr ""
+#~ "Es sind keine Netzwerkger�te in der Konfigurationsdatei in der Sektion '%"
+#~ "s' unter '%s' definiert.\n"
+
+#~ msgid "Failed to parse interface data '%s' output at %s:%d.\n"
+#~ msgstr "Fehler beim Parsen der Ger�tedaten '%s' Ausgabe bei %s:%d.\n"
+
+#~ msgid "Could not decoding file '%s' at %s:%d.\n"
+#~ msgstr "Datei '%s' konnte nicht dekodiert werden bei %s:%d.\n"
+
+#~ msgid ""
+#~ "Configuration file must specify directory for network identities in "
+#~ "section %s under %s.\n"
+#~ msgstr ""
+#~ "Die Konfigurationsdatei muss in Sektion %s unter %s ein Verzeichnis f�r "
+#~ "Identit�ten angeben.\n"
+
 #~ msgid "Sender %u.%u.%u.%u is blacklisted, dropping message.\n"
-#~ msgstr "Sender %u.%u.%u.%u steht auf schwarzer Liste, Nachricht wird 
ignoriert.\n"
+#~ msgstr ""
+#~ "Sender %u.%u.%u.%u steht auf schwarzer Liste, Nachricht wird ignoriert.\n"
 
 #~ msgid "Sender %s is blacklisted, dropping message.\n"
 #~ msgstr "Sender %s steht auf schwarzer Liste, Nachricht wird ignoriert.\n"
 
 #~ msgid "Removed file '%s' containing invalid peer advertisement.\n"
-#~ msgstr "Datei '%s' enthielt eine ung�ltige Knotenbekanntmachung und wurde 
entfernt.\n"
+#~ msgstr ""
+#~ "Datei '%s' enthielt eine ung�ltige Knotenbekanntmachung und wurde "
+#~ "entfernt.\n"
 
 #~ msgid "Removed invalid HELO file '%s'\n"
 #~ msgstr "Ung�ltige HELO Datei '%s' wurde entfernt.\n"
@@ -3692,13 +4244,22 @@
 #~ msgstr "IP-Adresse der lokalen Maschiene konnte nicht ermittelt werden!\n"
 
 #~ msgid "Could not determine IP(v6) address of the local machine!\n"
-#~ msgstr "IP(v6)-Adresse der lokalen Maschiene konnte nicht ermittelt 
werden!\n"
+#~ msgstr ""
+#~ "IP(v6)-Adresse der lokalen Maschiene konnte nicht ermittelt werden!\n"
 
-#~ msgid "Could not find IP(v4) for this host. Please provide the IP in the 
configuration file.\n"
-#~ msgstr "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie 
die IP in der Konfigurationsdatei an.\n"
+#~ msgid ""
+#~ "Could not find IP(v4) for this host. Please provide the IP in the "
+#~ "configuration file.\n"
+#~ msgstr ""
+#~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
+#~ "in der Konfigurationsdatei an.\n"
 
-#~ msgid "Could not find IP(v6) for this host. Please provide the IP in the 
configuration file.\n"
-#~ msgstr "IP(v6) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie 
die IP in der Konfigurationsdatei an.\n"
+#~ msgid ""
+#~ "Could not find IP(v6) for this host. Please provide the IP in the "
+#~ "configuration file.\n"
+#~ msgstr ""
+#~ "IP(v6) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
+#~ "in der Konfigurationsdatei an.\n"
 
 #~ msgid "'%s' failed: %s\n"
 #~ msgstr "'%s' schlug fehl: %s\n"

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2005-07-16 19:29:31 UTC (rev 1560)
+++ GNUnet/po/rw.po     2005-07-16 19:33:59 UTC (rev 1561)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-03 00:36+0200\n"
+"POT-Creation-Date: 2005-07-16 21:36+0200\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"
@@ -39,56 +39,61 @@
 msgid "HELO advertisement for protocol %d received.\n"
 msgstr "kugirango Porotokole BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:286
+#: src/applications/advertising/advertising.c:290
 #, fuzzy
 msgid "Could not send HELOs+PING, ping buffer full.\n"
 msgstr "OYA Kohereza"
 
-#: src/applications/advertising/advertising.c:299
+#: src/applications/advertising/advertising.c:303
 #, 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:442
+#: src/applications/advertising/advertising.c:451
 #, fuzzy, c-format
 msgid "Advertising my transport %d to selected peers.\n"
 msgstr "Kuri Byahiswemo"
 
-#: src/applications/advertising/advertising.c:449
+#: src/applications/advertising/advertising.c:458
 #, 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:542
+#: src/applications/advertising/advertising.c:560
 #, fuzzy, c-format
 msgid "Removing HELO from peer '%s' (expired %ds ago).\n"
 msgstr "Bivuye Byarengeje igihe"
 
-#: src/applications/advertising/advertising.c:700
+#: src/applications/advertising/advertising.c:720
 #, fuzzy
 msgid "# Peer advertisements received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/advertising/advertising.c:701
+#: src/applications/advertising/advertising.c:721
 msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:702
+#: src/applications/advertising/advertising.c:722
 msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:706
-#: src/applications/session/connect.c:726
+#: src/applications/advertising/advertising.c:726
+#: src/applications/session/connect.c:735
 #, c-format
 msgid "'%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:725
+#: src/applications/advertising/advertising.c:745
 #, fuzzy
 msgid "Network advertisements disabled by configuration!\n"
 msgstr "Yahagaritswe ku Iboneza"
 
+#: src/applications/advertising/advertising.c:765
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
+msgstr ""
+
 #: src/applications/bootstrap_http/http.c:79
 #: src/applications/testbed/testbed.c:1080
 #, fuzzy, c-format
@@ -126,12 +131,12 @@
 msgid "Parsing HELO from '%s' failed.\n"
 msgstr "Bivuye Byanze"
 
-#: src/applications/bootstrap_http/http.c:325
+#: src/applications/bootstrap_http/http.c:326
 #, 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:349
+#: src/applications/bootstrap_http/http.c:350
 #, fuzzy
 msgid "# HELOs downloaded via http"
 msgstr "#KB Yimuwe ku"
@@ -161,6 +166,10 @@
 msgid "'%s' registering handlers %d and %d\n"
 msgstr ""
 
+#: src/applications/chat/chat.c:210
+msgid "enables P2P-chat (incomplete)"
+msgstr ""
+
 #: src/applications/chat/gnunet-chat.c:82
 #, fuzzy
 msgid "specify nickname"
@@ -177,7 +186,7 @@
 #: src/applications/fs/tools/gnunet-delete.c:111
 #: src/applications/fs/tools/gnunet-directory.c:183
 #: src/applications/fs/tools/gnunet-download.c:128
-#: src/applications/fs/tools/gnunet-insert.c:508
+#: src/applications/fs/tools/gnunet-insert.c:499
 #: src/applications/fs/tools/gnunet-pseudonym.c:214
 #: src/applications/fs/tools/gnunet-search.c:213
 #: src/applications/fs/tools/gnunet-unindex.c:139
@@ -335,8 +344,8 @@
 #: src/applications/dht/tools/dht-join.c:85
 #: src/applications/dht/tools/dht-query.c:84
 #: src/applications/fs/tools/gnunet-download.c:94
-#: src/applications/fs/tools/gnunet-insert.c:321
-#: src/applications/fs/tools/gnunet-insert.c:437
+#: src/applications/fs/tools/gnunet-insert.c:312
+#: src/applications/fs/tools/gnunet-insert.c:428
 #: src/applications/fs/tools/gnunet-pseudonym.c:120
 #: src/applications/fs/tools/gnunet-search.c:159
 #: src/applications/fs/tools/gnunet-search.c:175
@@ -534,21 +543,21 @@
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:565
+#: src/applications/fragmentation/fragmentation.c:556
 #, fuzzy
 msgid "# messages defragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:557
 #, fuzzy
 msgid "# messages fragmented"
 msgstr "#Ubutumwa"
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:558
 msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:577
+#: src/applications/fragmentation/fragmentation.c:568
 #, c-format
 msgid "'%s' registering handler %d\n"
 msgstr ""
@@ -565,12 +574,12 @@
 msgid "Content '%s' seems to be not available on the network.\n"
 msgstr "Kuri OYA Bihari ku i urusobe"
 
-#: src/applications/fs/ecrs/meta.c:772
+#: src/applications/fs/ecrs/meta.c:779
 #, fuzzy, c-format
 msgid "Renaming of file '%s' to '%s' failed: %s\n"
 msgstr "Bya IDOSIYE Kuri Byanze"
 
-#: src/applications/fs/ecrs/meta.c:778
+#: src/applications/fs/ecrs/meta.c:785
 #, fuzzy, c-format
 msgid "Could not rename file '%s' to '%s': file exists\n"
 msgstr "OYA Guhindura izina IDOSIYE Kuri IDOSIYE"
@@ -587,21 +596,21 @@
 msgid "Cannot create pseudonym '%s', file '%s' exists.\n"
 msgstr "Kurema IDOSIYE"
 
-#: src/applications/fs/ecrs/namespace.c:295
-#: src/applications/fs/ecrs/namespace.c:371
-#: src/applications/fs/ecrs/namespace.c:516
+#: src/applications/fs/ecrs/namespace.c:304
+#: src/applications/fs/ecrs/namespace.c:380
+#: src/applications/fs/ecrs/namespace.c:524
 #, fuzzy, c-format
 msgid "File '%s' does not contain a pseudonym.\n"
 msgstr "Idosiye OYA a"
 
-#: src/applications/fs/ecrs/namespace.c:306
-#: src/applications/fs/ecrs/namespace.c:382
+#: src/applications/fs/ecrs/namespace.c:315
+#: src/applications/fs/ecrs/namespace.c:391
 #, fuzzy, c-format
 msgid "Format of pseudonym '%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/namespace.c:526
-#: src/applications/fs/ecrs/namespace.c:536
+#: src/applications/fs/ecrs/namespace.c:534
+#: src/applications/fs/ecrs/namespace.c:544
 #, fuzzy, c-format
 msgid "Format of file '%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
@@ -672,11 +681,11 @@
 msgid "No keywords specified!\n"
 msgstr "Amagambo fatizo"
 
-#: src/applications/fs/fsui/namespace_info.c:526
+#: src/applications/fs/fsui/namespace_info.c:523
 msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:547
+#: src/applications/fs/fsui/namespace_info.c:544
 msgid ""
 "Publishing update for periodically updated content more than a week ahead of "
 "schedule.\n"
@@ -699,18 +708,22 @@
 msgid "Cannot upload directory without using recursion.\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:949
+#: src/applications/fs/module/fs.c:964
 #, 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:990
+#: src/applications/fs/module/fs.c:1005
 #, c-format
 msgid "'%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
+#: src/applications/fs/module/fs.c:1042
+msgid "enables (anonymous) file-sharing"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:71
 #, fuzzy, c-format
 msgid ""
@@ -718,7 +731,7 @@
 "s' under '%s'."
 msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
 
-#: src/applications/fs/module/ondemand.c:327
+#: src/applications/fs/module/ondemand.c:326
 #, c-format
 msgid "Indexed file disappeared, deleting block for query '%s'\n"
 msgstr ""
@@ -744,7 +757,7 @@
 "Unindexed ODB block '%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1875
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1880
 #, fuzzy
 msgid "Failed to get traffic stats.\n"
 msgstr "Kuri Ikibazo# Ibyerekeye"
@@ -916,71 +929,63 @@
 
 #: src/applications/fs/tools/gnunet-insert.c:110
 #, fuzzy, c-format
-msgid "Created namespace entry '%s'\n"
+msgid "Created entry '%s' in namespace '%s'\n"
 msgstr "Ikiranga"
 
-#: src/applications/fs/tools/gnunet-insert.c:126
-msgid "ms"
+#: src/applications/fs/tools/gnunet-insert.c:115
+#, fuzzy, c-format
+msgid "Failed to add entry to namespace '%s' (does it exist?)\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"
+"."
 
-#: src/applications/fs/tools/gnunet-insert.c:131
-msgid "s"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:134
-msgid "m"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:137
-msgid "h"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:140
-#, fuzzy
-msgid " days"
-msgstr "7 Iminsi"
-
-#: src/applications/fs/tools/gnunet-insert.c:145
+#: src/applications/fs/tools/gnunet-insert.c:136
 #, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %llu%s to completion)\n"
+msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:159
+#: src/applications/fs/tools/gnunet-insert.c:150
 #, fuzzy, c-format
 msgid "Upload of '%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
 msgstr "ku Inyuma Bya Bayite"
 
-#: src/applications/fs/tools/gnunet-insert.c:173
+#: src/applications/fs/tools/gnunet-insert.c:164
 #, fuzzy, c-format
 msgid "Upload of '%s' complete, current average speed is %8.3f kbps.\n"
 msgstr "ISEGONDA"
 
-#: src/applications/fs/tools/gnunet-insert.c:183
+#: 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:196
+#: src/applications/fs/tools/gnunet-insert.c:187
 #, c-format
 msgid ""
 "\n"
 "Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:215
+#: src/applications/fs/tools/gnunet-insert.c:206
 #: src/applications/fs/tools/gnunet-pseudonym.c:33
 #, fuzzy
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gushyiraho i Bya Mwakirizi"
 
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/fs/tools/gnunet-insert.c:209
 #, 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:221
+#: src/applications/fs/tools/gnunet-insert.c:212
 #, fuzzy
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
@@ -989,14 +994,14 @@
 "Gucapa Urutonde Bya Amagambo fatizo OYA Iyinjizamo Cyangwa gushyiraho "
 "umugereka"
 
-#: src/applications/fs/tools/gnunet-insert.c:225
+#: src/applications/fs/tools/gnunet-insert.c:216
 #, 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:228
+#: src/applications/fs/tools/gnunet-insert.c:219
 #, fuzzy
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
@@ -1005,7 +1010,7 @@
 "Kongeramo Ijambo- banze kugirango i Hejuru: urwego IDOSIYE Cyangwa "
 "bushyinguro iyi Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:231
+#: src/applications/fs/tools/gnunet-insert.c:222
 #, fuzzy
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
@@ -1014,11 +1019,11 @@
 "Kongeramo Ijambo- banze kugirango Byose Idosiye Na ububiko bw'amaderese iyi "
 "Ihitamo Igikubo Times"
 
-#: src/applications/fs/tools/gnunet-insert.c:235
+#: src/applications/fs/tools/gnunet-insert.c:226
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:237
+#: src/applications/fs/tools/gnunet-insert.c:228
 #, fuzzy
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
@@ -1026,85 +1031,85 @@
 msgstr ""
 "OYA Umubarendanga Iyinjizamo IDOSIYE in Bishunzwe: Ifishi in Ububikoshingiro"
 
-#: src/applications/fs/tools/gnunet-insert.c:240
+#: src/applications/fs/tools/gnunet-insert.c:231
 #, 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:243
+#: src/applications/fs/tools/gnunet-insert.c:234
 #, fuzzy
 msgid "specify the priority of the content"
 msgstr "i By'ibanze Bya i Ibikubiyemo"
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/fs/tools/gnunet-insert.c:236
 #, 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:247
+#: src/applications/fs/tools/gnunet-insert.c:238
 #, fuzzy
 msgid "process directories recursively"
 msgstr "ububiko bw'amaderese"
 
-#: src/applications/fs/tools/gnunet-insert.c:249
+#: src/applications/fs/tools/gnunet-insert.c:240
 #, 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:252
+#: src/applications/fs/tools/gnunet-insert.c:243
 #, 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:255
+#: src/applications/fs/tools/gnunet-insert.c:246
 #, 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:257
+#: src/applications/fs/tools/gnunet-insert.c:248
 #, 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:264
+#: src/applications/fs/tools/gnunet-insert.c:255
 #, fuzzy
 msgid "Make files available to GNUnet for sharing."
 msgstr "Idosiye Bihari Kuri kugirango Bisangiwe"
 
-#: src/applications/fs/tools/gnunet-insert.c:345
+#: src/applications/fs/tools/gnunet-insert.c:336
 #, 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:513
+#: src/applications/fs/tools/gnunet-insert.c:504
 #: src/applications/fs/tools/gnunet-unindex.c:144
 #, fuzzy, c-format
 msgid "You must specify a list of files to insert.\n"
 msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
 
-#: src/applications/fs/tools/gnunet-insert.c:517
+#: src/applications/fs/tools/gnunet-insert.c:508
 #, c-format
 msgid "Only one file or directory can be specified at a time.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:521
+#: src/applications/fs/tools/gnunet-insert.c:512
 #, 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:570
+#: src/applications/fs/tools/gnunet-insert.c:561
 #, fuzzy, c-format
 msgid "Keywords for file '%s':\n"
 msgstr "kugirango IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-insert.c:592
+#: src/applications/fs/tools/gnunet-insert.c:583
 #, fuzzy, c-format
 msgid "Could not access namespace '%s' (does not exist?).\n"
 msgstr ""
@@ -1117,16 +1122,16 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/applications/fs/tools/gnunet-insert.c:607
+#: src/applications/fs/tools/gnunet-insert.c:598
 #, fuzzy, c-format
 msgid "Parsing time failed. Use '%s' format.\n"
 msgstr "Igihe Byanze Imiterere"
 
-#: src/applications/fs/tools/gnunet-insert.c:616
-#: src/applications/fs/tools/gnunet-insert.c:620
+#: src/applications/fs/tools/gnunet-insert.c:607
+#: src/applications/fs/tools/gnunet-insert.c:611
+#: src/applications/fs/tools/gnunet-insert.c:615
+#: src/applications/fs/tools/gnunet-insert.c:619
 #: src/applications/fs/tools/gnunet-insert.c:624
-#: src/applications/fs/tools/gnunet-insert.c:628
-#: src/applications/fs/tools/gnunet-insert.c:633
 #, fuzzy, c-format
 msgid "Option '%s' makes no sense without option '%s'.\n"
 msgstr "Oya Ihitamo"
@@ -1375,34 +1380,39 @@
 msgid "'%s' failed.  Is '%s' a file?\n"
 msgstr "'%s'ntabwo ari idosiye"
 
-#: src/applications/gap/gap.c:1864
+#: src/applications/gap/gap.c:1869
 msgid ""
 "Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1881 src/applications/gap/gap.c:1886
-#: src/applications/gap/gap.c:1892
+#: src/applications/gap/gap.c:1886 src/applications/gap/gap.c:1891
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2103
+#: src/applications/gap/gap.c:2113
 msgid ""
 "Traffic service failed to load; gap cannot ensure cover-traffic "
 "availability.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2134
+#: src/applications/gap/gap.c:2144
 #, c-format
 msgid "'%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:74
+#: src/applications/getoption/getoption.c:75
 #, c-format
 msgid "'%s' registering client handler %d\n"
 msgstr ""
 
+#: src/applications/getoption/getoption.c:82
+#, fuzzy
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "Porogaramu in Iboneza"
+
 #: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:966
+#: src/applications/identity/identity.c:976
 #, fuzzy, c-format
 msgid ""
 "Configuration file must specify a directory for GNUnet to store per-peer "
@@ -1429,87 +1439,87 @@
 msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:327
+#: src/applications/identity/identity.c:330
 #, 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:360
+#: src/applications/identity/identity.c:363
 #, fuzzy, c-format
 msgid "%s '%s' returned no known hosts!\n"
 msgstr "%s'%s'Oya"
 
-#: src/applications/identity/identity.c:606
-#: src/applications/identity/identity.c:625
+#: src/applications/identity/identity.c:614
+#: src/applications/identity/identity.c:632
 #, fuzzy, c-format
 msgid "Removed file '%s' containing invalid HELO data.\n"
 msgstr "IDOSIYE Sibyo Ibyatanzwe"
 
-#: src/applications/pingpong/pingpong.c:119
-#: src/applications/pingpong/pingpong.c:170
-#: src/applications/pingpong/pingpong.c:210
-#: src/applications/pingpong/pingpong.c:275
+#: src/applications/pingpong/pingpong.c:120
+#: src/applications/pingpong/pingpong.c:171
+#: src/applications/pingpong/pingpong.c:211
+#: src/applications/pingpong/pingpong.c:276
 #, fuzzy, c-format
 msgid "Received malformed '%s' message. Dropping.\n"
 msgstr "Ubutumwa"
 
-#: src/applications/pingpong/pingpong.c:129
+#: src/applications/pingpong/pingpong.c:130
 #, fuzzy
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "kugirango"
 
-#: src/applications/pingpong/pingpong.c:178
+#: src/applications/pingpong/pingpong.c:179
 #, fuzzy
 msgid "Received PING not destined for us!\n"
 msgstr "OYA kugirango RW"
 
-#: src/applications/pingpong/pingpong.c:250
-#: src/applications/pingpong/pingpong.c:308
+#: src/applications/pingpong/pingpong.c:251
+#: src/applications/pingpong/pingpong.c:309
 msgid ""
 "Could not match PONG against any PING. Try increasing MAX_PING_PONG "
 "constant.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:349
+#: src/applications/pingpong/pingpong.c:350
 msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:465
+#: src/applications/pingpong/pingpong.c:467
 #, fuzzy
 msgid "# encrypted PONG messages received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:467
+#: src/applications/pingpong/pingpong.c:469
 #, fuzzy
 msgid "# plaintext PONG messages received"
 msgstr "#Umukiriya Ibibazo BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:469
+#: src/applications/pingpong/pingpong.c:471
 #, fuzzy
 msgid "# encrypted PING messages received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/pingpong/pingpong.c:471
+#: src/applications/pingpong/pingpong.c:473
 #, fuzzy
 msgid "# PING messages created"
 msgstr "#Ubutumwa"
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:475
 #, fuzzy
 msgid "# encrypted PONG messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
 
-#: src/applications/pingpong/pingpong.c:475
+#: src/applications/pingpong/pingpong.c:477
 msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:477
+#: src/applications/pingpong/pingpong.c:479
 #, fuzzy
 msgid "# encrypted PING messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
 
-#: src/applications/pingpong/pingpong.c:486
+#: src/applications/pingpong/pingpong.c:488
 #, c-format
 msgid "'%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -1574,45 +1584,45 @@
 msgid "async RPC reply not received.\n"
 msgstr "Subiza OYA BYAKIRIWE"
 
-#: src/applications/session/connect.c:207
+#: src/applications/session/connect.c:208
 #, fuzzy, c-format
 msgid "Session key from peer '%s' could not be verified.\n"
 msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
 
-#: src/applications/session/connect.c:244
+#: src/applications/session/connect.c:245
 #, fuzzy
 msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/session/connect.c:510
+#: src/applications/session/connect.c:518
 #, fuzzy, c-format
 msgid "Invalid '%s' message received from peer '%s'.\n"
 msgstr "Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:518
+#: src/applications/session/connect.c:526
 #, fuzzy, c-format
 msgid "SKEY from '%s' fails CRC check (have: %u, want %u).\n"
 msgstr "Bivuye Kugenzura..."
 
-#: src/applications/session/connect.c:570
+#: src/applications/session/connect.c:578
 #, 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:716
+#: src/applications/session/connect.c:725
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:718
+#: src/applications/session/connect.c:727
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:720
+#: src/applications/session/connect.c:729
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:722
+#: src/applications/session/connect.c:731
 msgid "# sessions established"
 msgstr ""
 
@@ -1631,8 +1641,8 @@
 #: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
 #: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
 #: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:993 src/include/gnunet_util.h:1000
-#: src/include/gnunet_util.h:1002
+#: src/include/gnunet_util.h:1002 src/include/gnunet_util.h:1009
+#: src/include/gnunet_util.h:1011
 #, fuzzy, c-format
 msgid "'%s' failed at %s:%d with error: %s\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
@@ -1741,6 +1751,11 @@
 msgid "# bytes of noise received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
+#: src/applications/stats/statistics.c:372
+#, fuzzy
+msgid "keeps statistics about gnunetd's operation"
+msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
+
 #: src/applications/tbench/gnunet-tbench.c:95
 #, fuzzy
 msgid "output in gnuplot format"
@@ -1872,6 +1887,10 @@
 "Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr "OYA Akira i Ubutumwa Bivuye"
 
+#: src/applications/tbench/tbench.c:447
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr ""
+
 #: src/applications/tbench/tbenchtest.c:57
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
@@ -2105,7 +2124,7 @@
 msgid "No testbed URL given, not registered.\n"
 msgstr "OYA"
 
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1453
+#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1449
 #, fuzzy, c-format
 msgid "Could not resolve name of HTTP proxy '%s'.\n"
 msgstr "OYA Izina: Bya Porogisi"
@@ -2135,9 +2154,13 @@
 msgid "Exit register (error: no http response read).\n"
 msgstr "Kwiyandikisha Ikosa Oya HTTP Gusoma"
 
-#: src/applications/topology_default/topology.c:377
+#: src/applications/testbed/testbed.c:1357
+msgid "allows construction of a P2P-testbed (incomplete)"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:388
 #, c-format
-msgid "Version mismatch ('%s' vs. '%s'), run gnunet-update!\n"
+msgid "Version mismatch ('%s' vs. '%*.s'), run gnunet-update!\n"
 msgstr ""
 
 #: src/applications/topology_f2f/topology.c:301
@@ -2219,42 +2242,27 @@
 msgid "Could not send request to gnunetd.\n"
 msgstr "OYA Kohereza Kubaza... Kuri"
 
-#: src/applications/tracekit/tracekit.c:69
-#: src/applications/tracekit/tracekit.c:195
+#: src/applications/tracekit/tracekit.c:62
+#: src/applications/tracekit/tracekit.c:179
 #, fuzzy, c-format
 msgid "Received invalid '%s' message from '%s'.\n"
 msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/applications/tracekit/tracekit.c:255
+#: src/applications/tracekit/tracekit.c:236
 #, fuzzy
 msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr "imbonerahamwe# Kubaza..."
 
-#: src/applications/tracekit/tracekit.c:363
+#: src/applications/tracekit/tracekit.c:334
 #, fuzzy, c-format
 msgid "TRACEKIT: received invalid '%s' message\n"
 msgstr "BYAKIRIWE Sibyo"
 
-#: src/applications/tracekit/tracekit.c:448
+#: src/applications/tracekit/tracekit.c:434
 #, fuzzy
-msgid "# client trace requests received"
-msgstr "#Umukiriya BYAKIRIWE"
+msgid "allows mapping of the network topology"
+msgstr "urusobe"
 
-#: src/applications/tracekit/tracekit.c:450
-#, fuzzy
-msgid "# client trace replies sent"
-msgstr "#Umukiriya Yoherejwe:"
-
-#: src/applications/tracekit/tracekit.c:452
-#, fuzzy
-msgid "# p2p trace requests received"
-msgstr "#BYAKIRIWE"
-
-#: src/applications/tracekit/tracekit.c:454
-#, fuzzy
-msgid "# p2p trace replies sent"
-msgstr "#Yoherejwe:"
-
 #: src/applications/traffic/clientapi.c:67
 #, fuzzy
 msgid "Failed to query gnunetd about traffic conditions.\n"
@@ -2275,30 +2283,34 @@
 msgid "# bytes received of type %d"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
+
+#: src/applications/transport/transport.c:469
 #: src/applications/transport/transport.c:477
-#: src/applications/transport/transport.c:485
 #, fuzzy, c-format
 msgid "No transport of type %d known.\n"
 msgstr "Bya Ubwoko"
 
-#: src/applications/transport/transport.c:642
+#: src/applications/transport/transport.c:635
 #, 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"
 
-#: src/applications/transport/transport.c:657
+#: src/applications/transport/transport.c:650
 #, 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"
 
-#: src/applications/transport/transport.c:683
+#: src/applications/transport/transport.c:676
 #, 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:704
+#: src/applications/transport/transport.c:697
 #, c-format
 msgid "I am peer '%s'.\n"
 msgstr ""
@@ -2485,7 +2497,7 @@
 "USAGE: gnunet-setup MODULE\n"
 "\n"
 "MODULE\n"
-" recreate\t\trecreate configuration files\n"
+" recreate\trecreate configuration files\n"
 " config\t\ttext-based configuration\n"
 " menuconfig\ttext-based menu\n"
 " gconfig\tGTK configuration\n"
@@ -2553,9 +2565,7 @@
 msgstr ""
 
 #: src/conf/wizard_curs.c:47 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:205 src/conf/wizard_util.c:220
-#: src/conf/wizard_util.c:248 src/conf/wizard_util.c:254
-#: src/conf/wizard_util.c:411 src/conf/wizard_util.c:429
+#: src/conf/wizard_util.c:116 src/conf/wizard_util.c:157
 msgid "Error"
 msgstr ""
 
@@ -2978,100 +2988,110 @@
 msgid "User account:"
 msgstr ""
 
-#: src/conf/wizard_util.c:174 src/conf/wizard_util.c:236
+#: src/conf/wizard_util.c:89
 msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/conf/wizard_util.c:180
+#: src/conf/wizard_util.c:94
 msgid "Can't create service"
 msgstr ""
 
-#: src/conf/wizard_util.c:185 src/conf/wizard_util.c:248
-#, fuzzy
-msgid "Unknown error"
-msgstr "Verisiyo"
-
-#: src/conf/wizard_util.c:198
+#: src/conf/wizard_util.c:99
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr ""
 
-#: src/conf/wizard_util.c:219
+#: src/conf/wizard_util.c:103
 msgid "Cannot write to the regisitry"
 msgstr ""
 
-#: src/conf/wizard_util.c:240
+#: src/conf/wizard_util.c:106
 msgid "Can't access the service"
 msgstr ""
 
-#: src/conf/wizard_util.c:244
+#: src/conf/wizard_util.c:109
 msgid "Can't delete the service"
 msgstr ""
 
-#: src/conf/wizard_util.c:410
+#: src/conf/wizard_util.c:112
+#, fuzzy
+msgid "Unknown error"
+msgstr "Verisiyo"
+
+#: src/conf/wizard_util.c:140
 msgid "This version of Windows does not support multiple users."
 msgstr ""
 
-#: src/conf/wizard_util.c:414
+#: src/conf/wizard_util.c:144
 #, fuzzy
 msgid "Error creating user"
 msgstr "Ivugurura Verisiyo"
 
-#: src/conf/wizard_util.c:417
+#: src/conf/wizard_util.c:147
 msgid "Error accessing local security policy"
 msgstr ""
 
-#: src/conf/wizard_util.c:420
+#: src/conf/wizard_util.c:150
 msgid "Error granting service right to user"
 msgstr ""
 
-#: src/conf/wizard_util.c:423
+#: src/conf/wizard_util.c:153
 msgid "Unknown error while creating a new user"
 msgstr ""
 
-#: src/server/connection.c:993
+#: src/server/connection.c:971
 #, fuzzy, c-format
 msgid "'%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "'%s'Byahiswemo Inyuma Bya Ubutumwa"
 
-#: src/server/connection.c:1001
+#: src/server/connection.c:979
 #, fuzzy, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:1970
+#: src/server/connection.c:2155
 #, fuzzy, c-format
 msgid "Message from '%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2044
+#: src/server/connection.c:2232
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2060
+#: src/server/connection.c:2248
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:2193
-#, fuzzy, c-format
-msgid "Session with peer '%s' confirmed, but I cannot connect! (bug?)\n"
-msgstr "Kwihuza"
-
-#: src/server/connection.c:2470
+#: src/server/connection.c:2641
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:2472
+#: src/server/connection.c:2643
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:2474
+#: src/server/connection.c:2645
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
+#: src/server/connection.c:2647
+#, fuzzy
+msgid "# bytes encrypted"
+msgstr "#Bayite"
+
+#: src/server/connection.c:2649
+#, fuzzy
+msgid "# bytes decrypted"
+msgstr "#Bayite"
+
+#: src/server/connection.c:2651
+#, fuzzy
+msgid "# bytes noise sent"
+msgstr "#Bayite Bya BYAKIRIWE"
+
 #: src/server/core.c:114
 #, fuzzy, c-format
 msgid "Application module '%s' already initialized!\n"
@@ -3102,7 +3122,7 @@
 msgid "Could not release %p: service not loaded\n"
 msgstr "OYA Serivisi OYA"
 
-#: src/server/core.c:475 src/server/gnunet-update.c:218
+#: src/server/core.c:475 src/server/gnunet-update.c:219
 #, fuzzy
 msgid "No applications defined in configuration!\n"
 msgstr "Porogaramu in Iboneza"
@@ -3162,35 +3182,35 @@
 msgid "'%s': Could not connect.\n"
 msgstr "'%s':OYA Kwihuza"
 
-#: src/server/gnunet-transport-check.c:146
+#: src/server/gnunet-transport-check.c:147
 #, fuzzy, c-format
 msgid "'%s': Could not send.\n"
 msgstr "'%s':OYA Kohereza"
 
-#: src/server/gnunet-transport-check.c:166
+#: src/server/gnunet-transport-check.c:167
 #, 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:180
+#: src/server/gnunet-transport-check.c:181
 #, fuzzy, c-format
 msgid "'%s': Could not disconnect.\n"
 msgstr "'%s':OYA Gucomora"
 
-#: src/server/gnunet-transport-check.c:187
+#: src/server/gnunet-transport-check.c:188
 #, fuzzy, c-format
 msgid ""
 "'%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
 msgstr "'%s'Kuri Ubutumwa Bya Bayite"
 
-#: src/server/gnunet-transport-check.c:220
+#: src/server/gnunet-transport-check.c:221
 #, c-format
 msgid ""
 "\n"
 "Contacting '%s'."
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:231
+#: src/server/gnunet-transport-check.c:232
 #, c-format
 msgid " Transport %d not available\n"
 msgstr ""
@@ -3287,17 +3307,17 @@
 "Exiting.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:235
+#: src/server/gnunet-update.c:236
 #, fuzzy, c-format
 msgid "Updating data for module '%s'\n"
 msgstr "Ibyatanzwe kugirango Modire"
 
-#: src/server/gnunet-update.c:239
+#: src/server/gnunet-update.c:240
 #, fuzzy, c-format
 msgid "Failed to update data for module '%s'\n"
 msgstr "Kuri Kuvugurura Ibyatanzwe kugirango Modire"
 
-#: src/server/gnunet-update.c:294
+#: src/server/gnunet-update.c:296
 #, fuzzy, c-format
 msgid "Updated data for %d applications.\n"
 msgstr "Ibyatanzwe kugirango Porogaramu"
@@ -3448,12 +3468,12 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/http.c:1099
+#: src/transports/http.c:1097
 #, fuzzy
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/http.c:1174 src/transports/tcp.c:1127 src/util/tcpio.c:166
+#: src/transports/http.c:1171 src/transports/tcp.c:1124 src/util/tcpio.c:166
 #: src/util/tcpio.c:196
 #, fuzzy, c-format
 msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
@@ -3474,23 +3494,23 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/http.c:1331
+#: src/transports/http.c:1327
 #, 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:1474
+#: src/transports/http.c:1470
 #, fuzzy
 msgid "# bytes received via HTTP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/http.c:1476
+#: src/transports/http.c:1472
 #, fuzzy
 msgid "# bytes sent via HTTP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1474
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
@@ -3511,12 +3531,12 @@
 msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr "Ubutumwa Biturutse Ingano"
 
-#: src/transports/smtp.c:571
+#: src/transports/smtp.c:569
 #, fuzzy
 msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
 
-#: src/transports/smtp.c:578
+#: src/transports/smtp.c:576
 #, fuzzy, c-format
 msgid "SMTP filter string to long, capped to '%s'\n"
 msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
@@ -3544,8 +3564,8 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/smtp.c:891 src/transports/udp.c:655
-#: src/transports/udp6.c:634
+#: src/transports/smtp.c:891 src/transports/udp.c:657
+#: src/transports/udp6.c:635
 #, fuzzy, c-format
 msgid "MTU for '%s' is probably too low (fragmentation not implemented!)\n"
 msgstr "kugirango ni Byo hasi OYA"
@@ -3562,27 +3582,27 @@
 "Received malformed message (size %u) from tcp-peer connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/transports/tcp.c:1058
+#: src/transports/tcp.c:1056
 #, fuzzy
 msgid "Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/tcp.c:1310 src/transports/tcp6.c:1203
+#: src/transports/tcp.c:1306 src/transports/tcp6.c:1199
 #, fuzzy, c-format
 msgid "Failed to start transport service on port %d.\n"
 msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
 
-#: src/transports/tcp.c:1425
+#: src/transports/tcp.c:1423
 #, fuzzy
 msgid "# bytes received via TCP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp.c:1427
+#: src/transports/tcp.c:1425
 #, fuzzy
 msgid "# bytes sent via TCP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp.c:1429
+#: src/transports/tcp.c:1427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
@@ -3602,12 +3622,12 @@
 msgid "%s: Rejected connection from blacklisted address %s.\n"
 msgstr "Ukwihuza Bivuye Aderesi"
 
-#: src/transports/tcp6.c:959
+#: src/transports/tcp6.c:957
 #, fuzzy
 msgid "Could not determine my public IPv6 address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/tcp6.c:1004
+#: src/transports/tcp6.c:1001
 #, fuzzy, c-format
 msgid "'%s': unknown service: %s\n"
 msgstr "'%s':Kitazwi Serivisi"
@@ -3664,12 +3684,12 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/udp.c:356
+#: src/transports/udp.c:355
 #, fuzzy
 msgid "UDP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/udp.c:486
+#: src/transports/udp.c:487
 #, fuzzy, c-format
 msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
@@ -3689,17 +3709,17 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/udp.c:640
+#: src/transports/udp.c:642
 #, fuzzy
 msgid "# bytes received via UDP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/udp.c:642
+#: src/transports/udp.c:644
 #, fuzzy
 msgid "# bytes sent via UDP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/udp.c:644
+#: src/transports/udp.c:646
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
@@ -3777,7 +3797,7 @@
 msgid "Packet received from %s:%d (UDP6) failed format check."
 msgstr "BYAKIRIWE Bivuye Byanze Imiterere Kugenzura..."
 
-#: src/transports/udp6.c:353
+#: src/transports/udp6.c:352
 #, fuzzy
 msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr "OYA Rusange Aderesi"
@@ -3821,17 +3841,17 @@
 "want.\n"
 msgstr "'%s'Na: OYA in Umurongo Wongera Gicurasi OYA"
 
-#: src/util/dso.c:41
+#: src/util/dso.c:42
 #, fuzzy, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Bya Byanze"
 
-#: src/util/dso.c:93
+#: src/util/dso.c:94
 #, fuzzy, c-format
 msgid "'%s' failed for library '%s' at %s:%d with error: %s\n"
 msgstr "'%s'Byanze kugirango Isomero ku Na: Ikosa"
 
-#: src/util/dso.c:143
+#: src/util/dso.c:144
 #, fuzzy, c-format
 msgid "'%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
 msgstr "'%s'Byanze Kuri Uburyo ku Na: Ikosa"
@@ -3981,17 +4001,12 @@
 msgid "EVERYTHING"
 msgstr ""
 
-#: src/util/logging.c:251
-#, fuzzy
-msgid "LOGLEVEL not specified, that is not ok.\n"
-msgstr "OYA ni OYA YEGO"
-
-#: src/util/logging.c:262
+#: src/util/logging.c:261
 #, c-format
 msgid "Invalid LOGLEVEL '%s' specified.\n"
 msgstr ""
 
-#: src/util/logging.c:367 src/util/logging.c:373
+#: src/util/logging.c:353 src/util/logging.c:359
 #, fuzzy, c-format
 msgid "Failure at %s:%d.\n"
 msgstr "ku"
@@ -4044,51 +4059,27 @@
 "data under %s\\%s.\n"
 msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
 
-#: src/util/statuscalls.c:138
+#: src/util/statuscalls.c:185
 #, fuzzy, c-format
-msgid ""
-"No network interfaces defined in configuration section '%s' under '%s'!\n"
-msgstr "urusobe in Iboneza Icyiciro"
-
-#: src/util/statuscalls.c:163
-#, fuzzy, c-format
-msgid ""
-"Interfaces string (%s) in configuration section '%s' under '%s' is "
-"malformed.\n"
-msgstr "Ikurikiranyanyuguti in Iboneza Icyiciro ni"
-
-#: src/util/statuscalls.c:176
-#, fuzzy, c-format
-msgid ""
-"No network interfaces specified in the configuration file in section '%s' "
-"under '%s'.\n"
-msgstr "urusobe in i Iboneza IDOSIYE in Icyiciro"
-
-#: src/util/statuscalls.c:398 src/util/statuscalls.c:618
-#, fuzzy, c-format
 msgid "Failed to parse interface data from '%s' at %s:%d.\n"
 msgstr "Kuri Ibyatanzwe Bivuye ku"
 
-#: src/util/statuscalls.c:500
-#, fuzzy, c-format
-msgid "Failed to parse interface data '%s' output at %s:%d.\n"
-msgstr "Kuri Ibyatanzwe Ibisohoka ku"
-
-#: src/util/statuscalls.c:827
-#, fuzzy, c-format
-msgid "Could not decoding file '%s' at %s:%d.\n"
-msgstr "OYA IDOSIYE ku"
-
-#: src/util/statuscalls.c:1002
+#: src/util/statuscalls.c:487
 #, fuzzy
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "Ikibazo# i Ikoresha:"
 
-#: src/util/statuscalls.c:1022
+#: src/util/statuscalls.c:505
 #, fuzzy
 msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr "Ikibazo# i Ikoresha:"
 
+#: src/util/statuscalls.c:598
+#, fuzzy, c-format
+msgid ""
+"No network interfaces defined in configuration section '%s' under '%s'!\n"
+msgstr "urusobe in Iboneza Icyiciro"
+
 #: src/util/storage.c:196
 #, fuzzy, c-format
 msgid "'%s' failed for drive %s: %u\n"
@@ -4114,6 +4105,27 @@
 msgid "'%s' failed, reply invalid!\n"
 msgstr "'%s'Byanze Subiza Sibyo"
 
+#: src/util/timer.c:188
+msgid "ms"
+msgstr ""
+
+#: src/util/timer.c:193
+msgid "s"
+msgstr ""
+
+#: src/util/timer.c:196
+msgid "m"
+msgstr ""
+
+#: src/util/timer.c:199
+msgid "h"
+msgstr ""
+
+#: src/util/timer.c:202
+#, fuzzy
+msgid " days"
+msgstr "7 Iminsi"
+
 #: src/util/daemon.c:142
 #, fuzzy, c-format
 msgid "Attempted path to '%s' was '%s'.\n"
@@ -4124,48 +4136,92 @@
 msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
 msgstr "Binini Bayite ku"
 
-#: src/include/gnunet_util.h:147
+#: src/include/gnunet_util.h:155
 #, fuzzy
 msgid "print this help"
 msgstr "Gucapa iyi Ifashayobora"
 
-#: src/include/gnunet_util.h:150
+#: src/include/gnunet_util.h:158
 #, fuzzy
 msgid "set verbosity to LEVEL"
 msgstr "Gushyiraho Kuri"
 
-#: src/include/gnunet_util.h:153
+#: src/include/gnunet_util.h:161
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/include/gnunet_util.h:156
+#: src/include/gnunet_util.h:164
 #, fuzzy
 msgid "specify host on which gnunetd is running"
 msgstr "Ubuturo ku ni"
 
-#: src/include/gnunet_util.h:159
+#: src/include/gnunet_util.h:167
 #, fuzzy
 msgid "print the version number"
 msgstr "Gucapa i Verisiyo Umubare"
 
-#: src/include/gnunet_util.h:162
+#: src/include/gnunet_util.h:170
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util.h:602 src/include/gnunet_util.h:604
+#: src/include/gnunet_util.h:611 src/include/gnunet_util.h:613
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Byanze ku"
 
-#: src/include/gnunet_util.h:1009 src/include/gnunet_util.h:1011
-#: src/include/gnunet_util.h:1018
+#: src/include/gnunet_util.h:1018 src/include/gnunet_util.h:1020
+#: src/include/gnunet_util.h:1027
 #, fuzzy, c-format
 msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
 msgstr "'%s'Byanze ku IDOSIYE ku Na: Ikosa"
 
 #, fuzzy
+#~ msgid "# client trace requests received"
+#~ msgstr "#Umukiriya BYAKIRIWE"
+
+#, fuzzy
+#~ msgid "# client trace replies sent"
+#~ msgstr "#Umukiriya Yoherejwe:"
+
+#, fuzzy
+#~ msgid "# p2p trace requests received"
+#~ msgstr "#BYAKIRIWE"
+
+#, fuzzy
+#~ msgid "# p2p trace replies sent"
+#~ msgstr "#Yoherejwe:"
+
+#, fuzzy
+#~ msgid "Session with peer '%s' confirmed, but I cannot connect! (bug?)\n"
+#~ msgstr "Kwihuza"
+
+#, fuzzy
+#~ msgid "LOGLEVEL not specified, that is not ok.\n"
+#~ msgstr "OYA ni OYA YEGO"
+
+#, fuzzy
 #~ msgid ""
+#~ "Interfaces string (%s) in configuration section '%s' under '%s' is "
+#~ "malformed.\n"
+#~ msgstr "Ikurikiranyanyuguti in Iboneza Icyiciro ni"
+
+#, fuzzy
+#~ msgid ""
+#~ "No network interfaces specified in the configuration file in section '%s' "
+#~ "under '%s'.\n"
+#~ msgstr "urusobe in i Iboneza IDOSIYE in Icyiciro"
+
+#, fuzzy
+#~ msgid "Failed to parse interface data '%s' output at %s:%d.\n"
+#~ msgstr "Kuri Ibyatanzwe Ibisohoka ku"
+
+#, fuzzy
+#~ msgid "Could not decoding file '%s' at %s:%d.\n"
+#~ msgstr "OYA IDOSIYE ku"
+
+#, fuzzy
+#~ msgid ""
 #~ "Configuration file must specify directory for network identities in "
 #~ "section %s under %s.\n"
 #~ msgstr "IDOSIYE bushyinguro kugirango urusobe in Icyiciro"
@@ -5161,10 +5217,6 @@
 #~ msgstr "Iyimura"
 
 #, fuzzy
-#~ msgid "# bytes decrypted"
-#~ msgstr "#Bayite"
-
-#, fuzzy
 #~ msgid "# connected nodes (100% = connection table size)"
 #~ msgstr "#100 Ukwihuza imbonerahamwe# Ingano"
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2005-07-16 19:29:31 UTC (rev 1560)
+++ GNUnet/po/vi.po     2005-07-16 19:33:59 UTC (rev 1561)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2005-07-02 17:50+0200\n"
+"POT-Creation-Date: 2005-07-16 21:36+0200\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"
@@ -29,51 +29,60 @@
 msgid "HELO 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:286
+#: src/applications/advertising/advertising.c:290
 msgid "Could not send HELOs+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:299
+#: src/applications/advertising/advertising.c:303
 #, 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:442
+#: src/applications/advertising/advertising.c:451
 #, 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:449
-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:458
+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:542
+#: src/applications/advertising/advertising.c:560
 #, c-format
 msgid "Removing HELO 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:700
+#: src/applications/advertising/advertising.c:720
 msgid "# Peer advertisements received"
 msgstr "# Nhận được quảng cáo của đầu peer"
 
-#: src/applications/advertising/advertising.c:701
+#: src/applications/advertising/advertising.c:721
 msgid "# Self advertisments transmitted"
 msgstr "# Đã truyền tải tự quảng cáo"
 
-#: src/applications/advertising/advertising.c:702
+#: src/applications/advertising/advertising.c:722
 msgid "# Foreign advertisements forwarded"
 msgstr "# Đã chuyển tiếp quàng cáo ngoài"
 
-#: src/applications/advertising/advertising.c:706
-#: src/applications/session/connect.c:726
+#: src/applications/advertising/advertising.c:726
+#: src/applications/session/connect.c:735
 #, 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"
+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:725
+#: src/applications/advertising/advertising.c:745
 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:765
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
+msgstr ""
+
 #: src/applications/bootstrap_http/http.c:79
 #: src/applications/testbed/testbed.c:1080
 #, c-format
@@ -93,7 +102,8 @@
 #: src/applications/bootstrap_http/http.c:131
 #, c-format
 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"
+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:153
 #: src/applications/bootstrap_http/http.c:179
@@ -111,12 +121,12 @@
 msgid "Parsing HELO 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:325
+#: src/applications/bootstrap_http/http.c:326
 #, 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:349
+#: src/applications/bootstrap_http/http.c:350
 msgid "# HELOs downloaded via http"
 msgstr "# đã tải xuống HELO qua http"
 
@@ -142,6 +152,10 @@
 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:210
+msgid "enables P2P-chat (incomplete)"
+msgstr ""
+
 #: src/applications/chat/gnunet-chat.c:82
 msgid "specify nickname"
 msgstr "chỉ ra tên nick"
@@ -156,7 +170,7 @@
 #: src/applications/fs/tools/gnunet-delete.c:111
 #: src/applications/fs/tools/gnunet-directory.c:183
 #: src/applications/fs/tools/gnunet-download.c:128
-#: src/applications/fs/tools/gnunet-insert.c:508
+#: src/applications/fs/tools/gnunet-insert.c:499
 #: src/applications/fs/tools/gnunet-pseudonym.c:214
 #: src/applications/fs/tools/gnunet-search.c:213
 #: src/applications/fs/tools/gnunet-unindex.c:139
@@ -204,8 +218,11 @@
 
 #: src/applications/datastore/filter.c:42
 #, 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"
+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/dht/module/cs.c:440
 #, c-format
@@ -305,8 +322,8 @@
 #: src/applications/dht/tools/dht-join.c:85
 #: src/applications/dht/tools/dht-query.c:84
 #: src/applications/fs/tools/gnunet-download.c:94
-#: src/applications/fs/tools/gnunet-insert.c:321
-#: src/applications/fs/tools/gnunet-insert.c:437
+#: src/applications/fs/tools/gnunet-insert.c:312
+#: src/applications/fs/tools/gnunet-insert.c:428
 #: src/applications/fs/tools/gnunet-pseudonym.c:120
 #: src/applications/fs/tools/gnunet-search.c:159
 #: src/applications/fs/tools/gnunet-search.c:175
@@ -496,67 +513,75 @@
 msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
 
-#: src/applications/fragmentation/fragmentation.c:565
+#: src/applications/fragmentation/fragmentation.c:556
 msgid "# messages defragmented"
 msgstr "# thông báo đã gom lại"
 
-#: src/applications/fragmentation/fragmentation.c:566
+#: src/applications/fragmentation/fragmentation.c:557
 msgid "# messages fragmented"
 msgstr "# thông báo đã phân mảnh"
 
-#: src/applications/fragmentation/fragmentation.c:567
+#: src/applications/fragmentation/fragmentation.c:558
 msgid "# fragments discarded"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/applications/fragmentation/fragmentation.c:577
+#: src/applications/fragmentation/fragmentation.c:568
 #, c-format
 msgid "'%s' registering handler %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d\n"
 
 #: src/applications/fs/ecrs/download.c:889
-msgid "Decrypted content does not match key. This is either a bug or a 
maliciously inserted file. Download aborted.\n"
-msgstr "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"
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
+msgstr ""
+"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:1054
 #, c-format
 msgid "Content '%s' seems to be not available on the network.\n"
 msgstr "Nội dung '%s' có vẻ không có trên mạng.\n"
 
-#: src/applications/fs/ecrs/meta.c:772
+#: src/applications/fs/ecrs/meta.c:779
 #, 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:778
+#: src/applications/fs/ecrs/meta.c:785
 #, 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"
+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
 #, 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:295
-#: src/applications/fs/ecrs/namespace.c:371
-#: src/applications/fs/ecrs/namespace.c:516
+#: src/applications/fs/ecrs/namespace.c:304
+#: src/applications/fs/ecrs/namespace.c:380
+#: src/applications/fs/ecrs/namespace.c:524
 #, 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:306
-#: src/applications/fs/ecrs/namespace.c:382
+#: src/applications/fs/ecrs/namespace.c:315
+#: src/applications/fs/ecrs/namespace.c:391
 #, 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:526
-#: src/applications/fs/ecrs/namespace.c:536
+#: src/applications/fs/ecrs/namespace.c:534
+#: src/applications/fs/ecrs/namespace.c:544
 #, c-format
 msgid "Format of file '%s' is invalid.\n"
 msgstr "Định dạng của tập tin '%s' sai.\n"
@@ -581,8 +606,12 @@
 
 #: src/applications/fs/ecrs/upload.c:206
 #, c-format
-msgid "Indexing file '%s' failed. Check file permissions and consult your 
GNUnet server's logs.\n"
-msgstr "Đánh chỉ mục tập tin '%s' thất bại. Hãy kiểm tra quyền hạn và xem các 
bản ghi log của máy chủ GNUnet.\n"
+msgid ""
+"Indexing file '%s' failed. Check file permissions and consult your GNUnet "
+"server's logs.\n"
+msgstr ""
+"Đánh chỉ mục tập tin '%s' thất bại. Hãy kiểm tra quyền hạn và xem các bản "
+"ghi log của máy chủ GNUnet.\n"
 
 #: src/applications/fs/ecrs/upload.c:289
 #, c-format
@@ -622,13 +651,18 @@
 msgid "No keywords specified!\n"
 msgstr "Chưa chỉ ra từ khóa!\n"
 
-#: src/applications/fs/fsui/namespace_info.c:526
+#: src/applications/fs/fsui/namespace_info.c:523
 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ỳ."
+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/namespace_info.c:547
-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/namespace_info.c:544
+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:164
 msgid "This search is already pending!\n"
@@ -646,42 +680,64 @@
 msgid "Cannot upload directory without using recursion.\n"
 msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
 
-#: src/applications/fs/module/fs.c:949
+#: src/applications/fs/module/fs.c:964
 #, c-format
-msgid "You must specify a postive number for '%s' in the configuration in 
section '%s'.\n"
-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"
+msgid ""
+"You must specify a postive number for '%s' in the configuration in section '%"
+"s'.\n"
+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:990
+#: src/applications/fs/module/fs.c:1005
 #, 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:1042
+msgid "enables (anonymous) file-sharing"
+msgstr ""
+
 #: src/applications/fs/module/ondemand.c:71
 #, c-format
-msgid "You must specify a directory for FS files in the configuration in 
section '%s' under '%s'."
-msgstr "Người dùng phải chỉ ra một thư mục cho các tập tin FS trong phần '%s' 
dưới '%s' của cấu hình."
+msgid ""
+"You must specify a directory for FS files in the configuration in section '%"
+"s' under '%s'."
+msgstr ""
+"Người dùng phải chỉ ra một thư mục cho các tập tin FS trong phần '%s' dưới '%"
+"s' của cấu hình."
 
-#: src/applications/fs/module/ondemand.c:327
+#: src/applications/fs/module/ondemand.c:326
 #, 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:408
 #, c-format
-msgid "Because the file '%s' has been unavailable for 3 days it got removed 
from your share.  Please unindex files before deleting them as the index now 
contains invalid references!"
-msgstr "Vì không có tập tin '%s' trong 3 ngày nên đã xóa bỏ nó khỏi chia sẻ.  
Xin 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!"
+msgid ""
+"Because the file '%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!"
+msgstr ""
+"Vì không có tập tin '%s' trong 3 ngày nên đã xóa bỏ nó khỏi chia sẻ.  Xin "
+"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:434
 #, c-format
-msgid "Configuration file must specify directory for storage of 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 FS trong phần 
'%s' dưới '%s'.\n"
+msgid ""
+"Configuration file must specify directory for storage of 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 FS trong phần '%s' dưới "
+"'%s'.\n"
 
 #: src/applications/fs/module/ondemand.c:629
 #, c-format
-msgid "Unindexed ODB block '%s' from offset %llu already missing from 
datastore.\n"
+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/anonymity.c:65 src/applications/gap/gap.c:1875
+#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1880
 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"
 
@@ -803,7 +859,8 @@
 #: src/applications/fs/tools/gnunet-download.c:191
 #, c-format
 msgid "Download of file '%s' complete.  Speed was %8.3f kilobyte 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"
+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:203
 #, c-format
@@ -821,51 +878,36 @@
 msgstr "Tập tin chứa với tên '%s'.\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:110
-#, c-format
-msgid "Created namespace entry '%s'\n"
+#, 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:126
-msgid "ms"
-msgstr "mili giây"
+#: src/applications/fs/tools/gnunet-insert.c:115
+#, 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:131
-msgid "s"
-msgstr "giây"
-
-#: src/applications/fs/tools/gnunet-insert.c:134
-msgid "m"
-msgstr "phút"
-
-#: src/applications/fs/tools/gnunet-insert.c:137
-msgid "h"
-msgstr "giờ"
-
-#: src/applications/fs/tools/gnunet-insert.c:140
-msgid " days"
-msgstr " ngày"
-
-#: src/applications/fs/tools/gnunet-insert.c:145
-#, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %llu%s to completion)\n"
+#: src/applications/fs/tools/gnunet-insert.c:136
+#, fuzzy, c-format
+msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\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:159
+#: src/applications/fs/tools/gnunet-insert.c:150
 #, c-format
 msgid "Upload of '%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\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:173
+#: src/applications/fs/tools/gnunet-insert.c:164
 #, c-format
 msgid "Upload of '%s' complete, current average speed is %8.3f kbps.\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:183
+#: src/applications/fs/tools/gnunet-insert.c:174
 #, 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:196
+#: src/applications/fs/tools/gnunet-insert.c:187
 #, c-format
 msgid ""
 "\n"
@@ -874,116 +916,151 @@
 "\n"
 "Lỗi tải lên tập tin: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:215
+#: src/applications/fs/tools/gnunet-insert.c:206
 #: src/applications/fs/tools/gnunet-pseudonym.c:33
 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-insert.c:218
-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 "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:209
+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 ""
+"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:221
-msgid "print list of extracted keywords that would be used, but do not perform 
upload"
-msgstr "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:212
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+"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:225
-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:216
+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:228
-msgid "add an additional keyword for the top-level file or directory (this 
option can be specified multiple times)"
-msgstr "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:219
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+"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:231
-msgid "add an additional keyword for all files and directories (this option 
can be specified multiple times)"
-msgstr "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:222
+msgid ""
+"add an additional keyword for all files and directories (this option can be "
+"specified multiple times)"
+msgstr ""
+"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:235
+#: src/applications/fs/tools/gnunet-insert.c:226
 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:237
-msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
-msgstr "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:228
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+"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:240
-msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
-msgstr "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:231
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+"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:243
+#: src/applications/fs/tools/gnunet-insert.c:234
 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:245
+#: src/applications/fs/tools/gnunet-insert.c:236
 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)"
+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:247
+#: src/applications/fs/tools/gnunet-insert.c:238
 msgid "process directories recursively"
 msgstr "tiến hành đệ qui trên các thư mục"
 
-#: src/applications/fs/tools/gnunet-insert.c:249
-msgid "specifies this as an aperiodic but updated publication (for namespace 
insertions only)"
-msgstr "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:240
+msgid ""
+"specifies this as an aperiodic but updated publication (for namespace "
+"insertions only)"
+msgstr ""
+"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:252
-msgid "set the ID of this version of the publication (for namespace insertions 
only)"
+#: src/applications/fs/tools/gnunet-insert.c:243
+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:255
+#: src/applications/fs/tools/gnunet-insert.c:246
 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:257
+#: src/applications/fs/tools/gnunet-insert.c:248
 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)"
+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:264
+#: src/applications/fs/tools/gnunet-insert.c:255
 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:345
+#: src/applications/fs/tools/gnunet-insert.c:336
 #, 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"
 
-#: src/applications/fs/tools/gnunet-insert.c:513
+#: src/applications/fs/tools/gnunet-insert.c:504
 #: src/applications/fs/tools/gnunet-unindex.c:144
 #, 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:517
+#: src/applications/fs/tools/gnunet-insert.c:508
 #, 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:521
+#: src/applications/fs/tools/gnunet-insert.c:512
 #, 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:570
+#: src/applications/fs/tools/gnunet-insert.c:561
 #, 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:592
+#: src/applications/fs/tools/gnunet-insert.c:583
 #, 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:607
+#: src/applications/fs/tools/gnunet-insert.c:598
 #, 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:616
-#: src/applications/fs/tools/gnunet-insert.c:620
+#: src/applications/fs/tools/gnunet-insert.c:607
+#: src/applications/fs/tools/gnunet-insert.c:611
+#: src/applications/fs/tools/gnunet-insert.c:615
+#: src/applications/fs/tools/gnunet-insert.c:619
 #: src/applications/fs/tools/gnunet-insert.c:624
-#: src/applications/fs/tools/gnunet-insert.c:628
-#: src/applications/fs/tools/gnunet-insert.c:633
 #, 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"
@@ -1005,40 +1082,68 @@
 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
-msgid "use the given keyword to advertise the namespace (use when creating a 
new pseudonym)"
-msgstr "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)"
+msgid ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"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)"
+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:50
-msgid "do not generate an advertisement for this namespace (use when creating 
a new pseudonym)"
-msgstr "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)"
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"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
 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
-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)"
+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)"
+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
 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)"
+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)"
+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."
@@ -1146,8 +1251,12 @@
 
 #: src/applications/fs/tools/gnunet-unindex.c:50
 #, c-format
-msgid "%16llu of %16llu bytes unindexed (estimating %llu seconds to 
completion)                "
-msgstr "Đã bỏ chỉ mục %16llu từ %16llu byte (sẽ hoàn thành sau %llu giây)      
          "
+msgid ""
+"%16llu of %16llu bytes unindexed (estimating %llu seconds to "
+"completion)                "
+msgstr ""
+"Đã 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
 #, c-format
@@ -1181,39 +1290,58 @@
 msgid "'%s' failed.  Is '%s' a file?\n"
 msgstr "'%s' thất bại.  '%s' là một tập tin?\n"
 
-#: src/applications/gap/gap.c:1864
-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:1869
+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:1881 src/applications/gap/gap.c:1886
-#: src/applications/gap/gap.c:1892
+#: src/applications/gap/gap.c:1886 src/applications/gap/gap.c:1891
+#: src/applications/gap/gap.c:1897
 msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr "Không thể thỏa mãn mức độ dấu tên mong muốn, đang lờ đi yêu cầu.\n"
 
-#: src/applications/gap/gap.c:2103
-msgid "Traffic service failed to load; gap cannot ensure cover-traffic 
availability.\n"
-msgstr "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:2113
+msgid ""
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
+msgstr ""
+"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:2134
+#: src/applications/gap/gap.c:2144
 #, c-format
 msgid "'%s' registering handlers %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d\n"
 
-#: src/applications/getoption/getoption.c:74
+#: src/applications/getoption/getoption.c:75
 #, 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
+#, 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/identity/hostkey.c:98
-#: src/applications/identity/identity.c:966
+#: src/applications/identity/identity.c:976
 #, 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"
+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/identity/hostkey.c:119
 #, 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"
+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
 msgid "Creating new hostkey (this may take a while).\n"
@@ -1227,89 +1355,105 @@
 msgid "Done creating hostkey.\n"
 msgstr "Đã tạo xong chìa khóa máy.\n"
 
-#: src/applications/identity/identity.c:327
+#: src/applications/identity/identity.c:330
 #, 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"
+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:360
+#: src/applications/identity/identity.c:363
 #, c-format
 msgid "%s '%s' returned no known hosts!\n"
 msgstr "%s '%s' không trả lại máy biết đến!\n"
 
-#: src/applications/identity/identity.c:606
-#: src/applications/identity/identity.c:625
+#: src/applications/identity/identity.c:614
+#: src/applications/identity/identity.c:632
 #, c-format
 msgid "Removed file '%s' containing invalid HELO data.\n"
 msgstr "Xóa bỏ tập tin '%s' chứa dữ liệu HELO sai.\n"
 
-#: src/applications/pingpong/pingpong.c:119
-#: src/applications/pingpong/pingpong.c:170
-#: src/applications/pingpong/pingpong.c:210
-#: src/applications/pingpong/pingpong.c:275
+#: src/applications/pingpong/pingpong.c:120
+#: src/applications/pingpong/pingpong.c:171
+#: src/applications/pingpong/pingpong.c:211
+#: src/applications/pingpong/pingpong.c:276
 #, 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:129
+#: src/applications/pingpong/pingpong.c:130
 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:178
+#: src/applications/pingpong/pingpong.c:179
 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:250
-#: src/applications/pingpong/pingpong.c:308
-msgid "Could not match PONG against any PING. Try increasing MAX_PING_PONG 
constant.\n"
-msgstr "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:251
+#: src/applications/pingpong/pingpong.c:309
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
+msgstr ""
+"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:349
+#: src/applications/pingpong/pingpong.c:350
 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:465
+#: src/applications/pingpong/pingpong.c:467
 msgid "# encrypted PONG messages received"
 msgstr "# nhận được thông báo PONG đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:467
+#: src/applications/pingpong/pingpong.c:469
 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:469
+#: src/applications/pingpong/pingpong.c:471
 msgid "# encrypted PING messages received"
 msgstr "# nhận được thông báo PING đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:471
+#: src/applications/pingpong/pingpong.c:473
 msgid "# PING messages created"
 msgstr "# đã tạo tin nhắn PING"
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/pingpong/pingpong.c:475
 msgid "# encrypted PONG messages sent"
 msgstr "# đã gửi thông báo PONG đã mã hóa"
 
-#: src/applications/pingpong/pingpong.c:475
+#: src/applications/pingpong/pingpong.c:477
 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/pingpong/pingpong.c:477
+#: src/applications/pingpong/pingpong.c:479
 msgid "# encrypted PING messages sent"
 msgstr "# đã gửi các thông báo PING mã hóa"
 
-#: src/applications/pingpong/pingpong.c:486
+#: src/applications/pingpong/pingpong.c:488
 #, 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"
+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/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be registered: another callback is already 
using this name (%p)\n"
-msgstr "%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"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
+msgstr ""
+"%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
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: another callback 
registered under that name: %p\n"
-msgstr "%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"
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
+msgstr ""
+"%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
 #, c-format
@@ -1355,42 +1499,46 @@
 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/session/connect.c:207
+#: src/applications/session/connect.c:208
 #, 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:244
+#: src/applications/session/connect.c:245
 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"
+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:510
+#: src/applications/session/connect.c:518
 #, 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:518
+#: src/applications/session/connect.c:526
 #, c-format
 msgid "SKEY 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:570
-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:578
+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:716
+#: src/applications/session/connect.c:725
 msgid "# session keys sent"
 msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/session/connect.c:718
+#: src/applications/session/connect.c:727
 msgid "# session keys rejected"
 msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/session/connect.c:720
+#: src/applications/session/connect.c:729
 msgid "# session keys accepted"
 msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/session/connect.c:722
+#: src/applications/session/connect.c:731
 msgid "# sessions established"
 msgstr "# đã thiết lập buổi làm việc"
 
@@ -1409,8 +1557,8 @@
 #: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:56
 #: src/util/hostkey_gcrypt.c:63 src/util/storage.c:643
 #: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:993 src/include/gnunet_util.h:1000
-#: src/include/gnunet_util.h:1002
+#: src/include/gnunet_util.h:1002 src/include/gnunet_util.h:1009
+#: src/include/gnunet_util.h:1011
 #, 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"
@@ -1421,7 +1569,8 @@
 #: src/applications/sqstore_mysql/mysql.c:802
 #: src/applications/sqstore_mysql/mysql.c:816
 msgid "Invalid data in MySQL database.  Please verify integrity!\n"
-msgstr "Dữ liệu sai trong cơ sở dữ liệu MySQL.  Xin hãy kiểm tra tính trọn 
vẹn!\n"
+msgstr ""
+"Dữ liệu sai trong cơ sở dữ liệu MySQL.  Xin hãy kiểm tra tính trọn vẹn!\n"
 
 #: src/applications/sqstore_mysql/mysql.c:1108
 #, c-format
@@ -1450,8 +1599,12 @@
 
 #: src/applications/sqstore_sqlite/sqlite.c:915
 #, 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"
+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:929
 msgid "Unable to initialize SQLite.\n"
@@ -1510,6 +1663,11 @@
 msgid "# bytes of noise received"
 msgstr "# byte nhận được do nhiễu đường truyền"
 
+#: src/applications/stats/statistics.c:372
+#, 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
 msgid "output in gnuplot format"
 msgstr "kết quả ở dạng gnuplot"
@@ -1619,6 +1777,10 @@
 "\n"
 "Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
+#: src/applications/tbench/tbench.c:447
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr ""
+
 #: src/applications/tbench/tbenchtest.c:57
 #, c-format
 msgid "Using %u messages of size %u for %u times.\n"
@@ -1783,7 +1945,8 @@
 
 #: src/applications/testbed/testbed.c:833
 msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
-msgstr "Tên tập tin cho thông báo UPLOAD_FILE không phải là kết thúc rỗng 
(sai)!\n"
+msgstr ""
+"Tên tập tin cho thông báo UPLOAD_FILE không phải là kết thúc rỗng (sai)!\n"
 
 #: src/applications/testbed/testbed.c:841
 msgid "Upload refused!"
@@ -1801,14 +1964,17 @@
 
 #: src/applications/testbed/testbed.c:1002
 #, c-format
-msgid "Received testbed message of type %u but unexpected size %u, expected 
%u\n"
-msgstr "Nhận được thông báo testbed dạng %u nhưng kích thước không mong đợi 
%u, mong đợi %u\n"
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
+msgstr ""
+"Nhận được thông báo testbed dạng %u nhưng kích thước không mong đợi %u, mong "
+"đợi %u\n"
 
 #: src/applications/testbed/testbed.c:1046
 msgid "No testbed URL given, not registered.\n"
 msgstr "Chưa đưa ra URL của testbed, không đăng ký.\n"
 
-#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1453
+#: src/applications/testbed/testbed.c:1056 src/transports/http.c:1449
 #, 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"
@@ -1837,14 +2003,19 @@
 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/topology_default/topology.c:377
-#, c-format
-msgid "Version mismatch ('%s' vs. '%s'), run gnunet-update!\n"
+#: src/applications/testbed/testbed.c:1357
+msgid "allows construction of a P2P-testbed (incomplete)"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:388
+#, 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/topology_f2f/topology.c:301
 #, c-format
-msgid "Need to have list of friends in configuration under '%s' in section 
'%s'.\n"
+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"
 
 #: src/applications/topology_f2f/topology.c:320
@@ -1866,8 +2037,10 @@
 msgstr "thử mạng tới độ sâu DEPTH đưa ra"
 
 #: src/applications/tracekit/gnunet-tracekit.c:103
-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"
+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
 msgid "use PRIO for the priority of the trace request"
@@ -1888,8 +2061,11 @@
 
 #: 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 "Định dạng bị sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm, 2 cho 
vcg.\n"
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
+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
 #, c-format
@@ -1910,37 +2086,26 @@
 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:69
-#: src/applications/tracekit/tracekit.c:195
+#: src/applications/tracekit/tracekit.c:62
+#: src/applications/tracekit/tracekit.c:179
 #, 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:255
+#: src/applications/tracekit/tracekit.c:236
 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:363
+#: src/applications/tracekit/tracekit.c:334
 #, 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:448
-msgid "# client trace requests received"
-msgstr "# nhận được yêu cầu theo vết trace của máy khách"
+#: src/applications/tracekit/tracekit.c:434
+#, 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/tracekit/tracekit.c:450
-msgid "# client trace replies sent"
-msgstr "# đã gửi câu trả lời theo vết trace đến máy khách"
-
-#: src/applications/tracekit/tracekit.c:452
-msgid "# p2p trace requests received"
-msgstr "# nhận được yêu cầu theo vết trace p2p"
-
-#: src/applications/tracekit/tracekit.c:454
-msgid "# p2p trace replies sent"
-msgstr "# đã gửi câu trả lời theo vết trace p2p"
-
 #: 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"
@@ -1959,28 +2124,37 @@
 msgid "# bytes received of type %d"
 msgstr "# byte nhận được của dạng %d"
 
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
+
+#: src/applications/transport/transport.c:469
 #: src/applications/transport/transport.c:477
-#: src/applications/transport/transport.c:485
 #, 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:642
+#: src/applications/transport/transport.c:635
 #, c-format
 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"
+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:657
+#: src/applications/transport/transport.c:650
 #, 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 ""
+"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/applications/transport/transport.c:683
+#: src/applications/transport/transport.c:676
 #, 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:704
+#: src/applications/transport/transport.c:697
 #, c-format
 msgid "I am peer '%s'.\n"
 msgstr "Tôi là một đầu peer '%s'.\n"
@@ -2152,11 +2326,12 @@
 msgstr "Không tìm thấy tập tin ảnh pixmap: %s"
 
 #: src/conf/gnunet-setup.c:33
+#, fuzzy
 msgid ""
 "USAGE: gnunet-setup MODULE\n"
 "\n"
 "MODULE\n"
-" recreate\t\trecreate configuration files\n"
+" recreate\trecreate configuration files\n"
 " config\t\ttext-based configuration\n"
 " menuconfig\ttext-based menu\n"
 " gconfig\tGTK configuration\n"
@@ -2233,9 +2408,7 @@
 msgstr "Không thay đổi được tiến trình khởi động:"
 
 #: src/conf/wizard_curs.c:47 src/conf/wizard_interface.c:1075
-#: src/conf/wizard_util.c:205 src/conf/wizard_util.c:220
-#: src/conf/wizard_util.c:248 src/conf/wizard_util.c:254
-#: src/conf/wizard_util.c:411 src/conf/wizard_util.c:429
+#: src/conf/wizard_util.c:116 src/conf/wizard_util.c:157
 msgid "Error"
 msgstr "Lỗi"
 
@@ -2254,7 +2427,8 @@
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
-"This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
 "\n"
 "Please visit our homepage at\n"
 "\thttp://www.gnunet.org\n";
@@ -2279,8 +2453,11 @@
 "đội GNUnet"
 
 #: src/conf/wizard_curs.c:109
-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."
+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/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
 #: src/conf/wizard_curs.c:202 src/conf/wizard_curs.c:254
@@ -2289,11 +2466,18 @@
 msgstr "Trợ giúp"
 
 #: src/conf/wizard_curs.c:115 src/conf/wizard_curs.c:167
-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 "\"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."
+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 ""
+"\"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/conf/wizard_curs.c:161
-msgid "What is the name of the network interface that connects your computer 
to the Internet?"
+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/conf/wizard_curs.c:196
@@ -2308,21 +2492,38 @@
 
 #: src/conf/wizard_curs.c:202
 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 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address."
+"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 "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address."
 msgstr ""
-"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh\"), 
thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay đổi sau 
mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn chỉ tới 
địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở đây.\n"
-"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."
+"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
+"\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
+"đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn "
+"chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở "
+"đây.\n"
+"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/conf/wizard_curs.c:224
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, say \"yes\" here. Answer \"no\" on direct connections 
through modems, ISDN cards and DNAT (also known as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
+"connections through modems, ISDN cards and DNAT (also known as \"port "
+"forwarding\")."
 msgstr ""
 "Máy này nằm dưới NAT?\n"
 "\n"
-"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến 
router hay một \"phần cứng tường lửa\" và các máy khác trong internet không 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\")."
+"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
+"router hay một \"phần cứng tường lửa\" và các máy khác trong internet không "
+"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/conf/wizard_curs.c:249
 msgid "How much upstream (Bytes/s) may be used?"
@@ -2332,11 +2533,18 @@
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"upstream\" is the data channel through which data is *sent* to the 
internet. The limit is either the total maximum for this computer or how much 
GNUnet itself is allowed to use. You can specify that later. If you have a 
flatrate, you can set it to the maximum speed of your internet connection."
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate, you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 "Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
 "\n"
-"\"Dòng ra\" là kênh dữ liệu qua đó *gửi* dữ liệu tới internet. Có thể giới 
hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể 
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."
+"\"Dòng ra\" là kênh dữ liệu qua đó *gửi* dữ liệu tới internet. Có thể giới "
+"hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể "
+"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/conf/wizard_curs.c:281
 msgid "How much downstream (Bytes/s) may be used?"
@@ -2346,21 +2554,40 @@
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
-"The \"downstream\" is the data channel through which data is *received* from 
the internet. The limit is either the total maximum for this computer or how 
much GNUnet itself is allowed to use. You can specify that later. If you have a 
flatrate you can set it to the maximum speed of your internet connection."
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 "Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
 "\n"
-"\"Dòng vào\" là kênh dữ liệu qua đó *nhận* dữ liệu từ internet. Có thể giới 
hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể 
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."
+"\"Dòng vào\" là kênh dữ liệu qua đó *nhận* dữ liệu từ internet. Có thể giới "
+"hạn hoặc cho cả máy tính này hoặc chỉ giới hạn cho GNUnet. Người dùng có thể "
+"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/conf/wizard_curs.c:307
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
-"Say \"yes\" here, if you don't want other network traffic to interfere with 
GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to 
values entered in the previous steps, or if you can't reliably measure the 
maximum capabilities of your connection. \"No\" can be very useful if other 
applications are causing a lot of traffic on your LAN.  In this case, you do 
not want to limit the traffic that GNUnet can inflict on your internet 
connection whenever your high-speed LAN gets used (e.g. by NFS)."
+"Say \"yes\" here, if you don't want other network traffic to interfere with "
+"GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to "
+"values entered in the previous steps, or if you can't reliably measure the "
+"maximum capabilities of your connection. \"No\" can be very useful if other "
+"applications are causing a lot of traffic on your LAN.  In this case, you do "
+"not want to limit the traffic that GNUnet can inflict on your internet "
+"connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 "Chia sẻ băng thông chỉ ra với các ứng dụng khác?\n"
 "\n"
-"Chọn \"yes\", nếu không muốn các truyền tải mạng khác gây trở ngại đối với 
các thao tác của GNUnet, nhưng vẫn muốn bắt buộc dùng giá trị đã nhập trong các 
bước trước đây làm sử dụng băng thông của GNUnet, hoặc nếu người dùng không thể 
đo được khả năng lớn nhất của kết nối mạng. \"No\" có ích khi các ứng dụng khác 
dùng nhiều truyền tải trong mạng LAN.  Trong trường hợp này, 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)."
+"Chọn \"yes\", nếu không muốn các truyền tải mạng khác gây trở ngại đối với "
+"các thao tác của GNUnet, nhưng vẫn muốn bắt buộc dùng giá trị đã nhập trong "
+"các bước trước đây làm sử dụng băng thông của GNUnet, hoặc nếu người dùng "
+"không thể đo được khả năng lớn nhất của kết nối mạng. \"No\" có ích khi các "
+"ứng dụng khác dùng nhiều truyền tải trong mạng LAN.  Trong trường hợp này, "
+"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/conf/wizard_curs.c:338
 msgid "How much CPU (in %) may be used?"
@@ -2380,41 +2607,59 @@
 msgid ""
 "Store migrated content?\n"
 "\n"
-"GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-"It also helps to spread popular content over different peers to enhance 
availability."
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability."
 msgstr ""
 "Giữ nội dung nhập vào?\n"
 "\n"
-"GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ liệu. 
Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã chèn và 
người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật dùng, nội dung có 
thể \"nhập\" qua internet tới nút của người dùng mà người dùng không biết.\n"
-"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."
+"GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ liệu. "
+"Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã chèn và "
+"người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật dùng, nội dung "
+"có thể \"nhập\" qua internet tới nút của người dùng mà người dùng không "
+"biết.\n"
+"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/conf/wizard_curs.c:389
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content)."
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content)."
 msgstr ""
 "Kích thước lớn nhất của kho dữ liệu tính theo MB?\n"
 "\n"
-"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)."
+"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/conf/wizard_curs.c:411
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
-"If you say \"yes\" here, the GNUnet background process will be automatically 
started when you turn on your computer. If you say \"no\" here, you have to 
launch GNUnet yourself each time you want to use it."
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
 msgstr ""
 "Chạy GNUnet như một dịch vụ hệ thống?\n"
 "\n"
-"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."
+"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/conf/wizard_curs.c:434
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new user 
account under which the GNUnet service is started at system startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account under which the GNUnet service is started at system startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the fields empty to run GNUnet with system privileges.\n"
 "\n"
@@ -2422,9 +2667,12 @@
 msgstr ""
 "Xác định người dùng sở hữu dịch vụ GNUnet.\n"
 "\n"
-"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng mới sở hữu dịch 
vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
+"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng mới sở hữu dịch "
+"vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
 "\n"
-"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm 
các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép người 
dùng chỉ ra dưới đây quyền đọc chúng.\n"
+"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm "
+"các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép "
+"người dùng chỉ ra dưới đây quyền đọc chúng.\n"
 "\n"
 "Để trống để chạy GNUnet với quyền hệ thống.\n"
 "Người dùng GNUnet:"
@@ -2433,31 +2681,37 @@
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new group 
for the chosen user account.\n"
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
 "\n"
 "You can also specify a already existant group here.\n"
 "\n"
-"Only members of this group will be allowed to start and stop the the GNUnet 
server and have access to GNUnet server data.\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
 "\n"
 "GNUnet group:"
 msgstr ""
 "Xác định nhóm sở hữu dịch vụ GNUnet.\n"
 "\n"
-"Vì lý do bảo mật, nên để cài đặt này tạo một nhóm mới cho tài khoản người 
dùng đã chọn\n"
+"Vì lý do bảo mật, nên để cài đặt này tạo một nhóm mới cho tài khoản người "
+"dùng đã chọn\n"
 "\n"
 "Cũng có thể chỉ ra một nhóm đã có.\n"
 "\n"
-"Chỉ thành viên của nhóm này mới có quyền chạy và dừng máy chủ GNUnet và có 
truy cập tới dữ liệu máy chủ GNUnet.\n"
+"Chỉ thành viên của nhóm này mới có quyền chạy và dừng máy chủ GNUnet và có "
+"truy cập tới dữ liệu máy chủ GNUnet.\n"
 "\n"
 "Nhóm GNUnet:"
 
 #: src/conf/wizard_curs.c:491
 msgid ""
-"If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator.\n"
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
 "\n"
 "Do you want to start it after saving your configuration?"
 msgstr ""
-"Nếu là một người dùng có kinh nghiệm, bạn có thể sửa đổi cấu hình của GNUnet 
bẳng trình cấu hình nâng cấp.\n"
+"Nếu là một người dùng có kinh nghiệm, bạn có thể sửa đổi cấu hình của GNUnet "
+"bẳng trình cấu hình nâng cấp.\n"
 "\n"
 "Chạy nó sau khi ghi cấu hình?"
 
@@ -2493,20 +2747,40 @@
 msgid ""
 "Enter information about your network connection here.\n"
 "\n"
-"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.\n"
+"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.\n"
 "\n"
-"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 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address.\n"
+"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 "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address.\n"
 "\n"
-"If you are connected to the internet through another computer doing SNAT, a 
router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, check the last option on this page. Leave it 
unchecked on direct connections through modems, ISDN cards and DNAT (also known 
as \"port forwarding\")."
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, check the last option on this page. Leave it "
+"unchecked on direct connections through modems, ISDN cards and DNAT (also "
+"known as \"port forwarding\")."
 msgstr ""
 "Nhập thông tin về kết nối mạng tại đây.\n"
 "\n"
-"\"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.\n"
+"\"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.\n"
 "\n"
-"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh\"), 
thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay đổi sau 
mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn chỉ tới 
địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở đây.\n"
-"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. \n"
-"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến 
router hay một \"phần cứng tường lửa\" và các máy khác trong internet không 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\")."
+"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
+"\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
+"đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn "
+"chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở "
+"đây.\n"
+"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. \n"
+"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
+"router hay một \"phần cứng tường lửa\" và các máy khác trong internet không "
+"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/conf/wizard_interface.c:251
 msgid "Network interface:"
@@ -2533,15 +2807,21 @@
 msgid ""
 "You can limit GNUnet's ressource usage here.\n"
 "\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you have 
a flatrate you can set it to the maximum speed of your internet connection.\n"
+"\"Bandwidth limitation\" is how much data may be sent per second. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection.\n"
 "\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed 
to use."
+"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
+"to use."
 msgstr ""
 "Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
 "\n"
-"\"Giới hạn băng thông\" cho biết bao nhiêu dữ liệu có thể gửi mỗi giây. Nếu 
có một tốc độ đều thì có thể đặt thành tốc độ lớn nhất của kết nối internet.\n"
+"\"Giới hạn băng thông\" cho biết bao nhiêu dữ liệu có thể gửi mỗi giây. Nếu "
+"có một tốc độ đều thì có thể đặt thành tốc độ lớn nhất của kết nối "
+"internet.\n"
 "\n"
-"\"Sử dụng CPU lớn nhất\" là phần trăm thời gian của bộ xử lý cho phép GNUnet 
sử dụng."
+"\"Sử dụng CPU lớn nhất\" là phần trăm thời gian của bộ xử lý cho phép GNUnet "
+"sử dụng."
 
 #: src/conf/wizard_interface.c:521
 msgid "Upstream (Bytes/s):"
@@ -2581,18 +2861,32 @@
 
 #: src/conf/wizard_interface.c:814
 msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-"It also helps to spread popular content over different peers to enhance 
availability.\n"
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability.\n"
 "\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content). Its maximum size can be specified below.\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content). Its maximum size can be specified below.\n"
 "\n"
-"If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator."
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator."
 msgstr ""
-"GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ liệu. 
Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã chèn và 
người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật dùng, nội dung có 
thể \"nhập\" qua internet tới nút của người dùng mà người dùng không biết.\n"
-"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.\n"
-"Kho dữ liệu GNUnet chứa mọi dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, nội dung 
chèn và nhập vào). Có thể chỉ ra kích thước lớn nhất ở dưới\n"
+"GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ liệu. "
+"Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã chèn và "
+"người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật dùng, nội dung "
+"có thể \"nhập\" qua internet tới nút của người dùng mà người dùng không "
+"biết.\n"
+"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.\n"
+"Kho dữ liệu GNUnet chứa mọi dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, nội dung "
+"chèn và nhập vào). Có thể chỉ ra kích thước lớn nhất ở dưới\n"
 "\n"
-"Nếu là một người dùng có kinh nghiệm, bạn có thể chỉnh sửa cài đặt GNUnet của 
mình bằng trình cấu hình nâng cấp."
+"Nếu là một người dùng có kinh nghiệm, bạn có thể chỉnh sửa cài đặt GNUnet "
+"của mình bằng trình cấu hình nâng cấp."
 
 #: src/conf/wizard_interface.c:829
 msgid "Store migrated content"
@@ -2646,17 +2940,24 @@
 msgid ""
 "Define the user and the group owning the GNUnet service here.\n"
 "\n"
-"For security reasons, it is a good idea to let this setup create a new user 
account and a new group under which the GNUnet service is started at system 
startup.\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account and a new group under which the GNUnet service is started at system "
+"startup.\n"
 "\n"
-"However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
 "\n"
 "Leave the fields empty to run GNUnet with system privileges."
 msgstr ""
 "Xác định người dùng và nhóm sở hữu dịch vụ GNUnet ở đây.\n"
 "\n"
-"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng và một nhóm mới 
sở hữu dịch vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
+"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng và một nhóm mới "
+"sở hữu dịch vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
 "\n"
-"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm 
các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép người 
dùng chỉ ra dưới đây quyền đọc chúng.\n"
+"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm "
+"các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép "
+"người dùng chỉ ra dưới đây quyền đọc chúng.\n"
 "\n"
 "Để trống để chạy GNUnet với quyền hệ thống."
 
@@ -2668,95 +2969,105 @@
 msgid "User account:"
 msgstr "Tài khoản người dùng:"
 
-#: src/conf/wizard_util.c:174 src/conf/wizard_util.c:236
+#: src/conf/wizard_util.c:89
 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/conf/wizard_util.c:180
+#: src/conf/wizard_util.c:94
 msgid "Can't create service"
 msgstr "Không tạo được dịch vụ"
 
-#: src/conf/wizard_util.c:185 src/conf/wizard_util.c:248
-msgid "Unknown error"
-msgstr "Lỗi không rõ"
-
-#: src/conf/wizard_util.c:198
+#: src/conf/wizard_util.c:99
 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/conf/wizard_util.c:219
+#: src/conf/wizard_util.c:103
 msgid "Cannot write to the regisitry"
 msgstr "Không ghi được tới bản ghi"
 
-#: src/conf/wizard_util.c:240
+#: src/conf/wizard_util.c:106
 msgid "Can't access the service"
 msgstr "Không truy cập được dịch vụ"
 
-#: src/conf/wizard_util.c:244
+#: src/conf/wizard_util.c:109
 msgid "Can't delete the service"
 msgstr "Không xóa được dịch vụ"
 
-#: src/conf/wizard_util.c:410
+#: src/conf/wizard_util.c:112
+msgid "Unknown error"
+msgstr "Lỗi không rõ"
+
+#: src/conf/wizard_util.c:140
 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/conf/wizard_util.c:414
+#: src/conf/wizard_util.c:144
 msgid "Error creating user"
 msgstr "Lỗi tạo người dùng"
 
-#: src/conf/wizard_util.c:417
+#: src/conf/wizard_util.c:147
 msgid "Error accessing local security policy"
 msgstr "Lỗi truy cập chính sách bảo mật nội bộ"
 
-#: src/conf/wizard_util.c:420
+#: src/conf/wizard_util.c:150
 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"
 
-#: src/conf/wizard_util.c:423
+#: src/conf/wizard_util.c:153
 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"
 
-#: src/server/connection.c:993
+#: src/server/connection.c:971
 #, 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:1001
+#: src/server/connection.c:979
 #, 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:1970
+#: src/server/connection.c:2155
 #, 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:2044
+#: src/server/connection.c:2232
 #, 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:2060
+#: src/server/connection.c:2248
 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:2193
-#, c-format
-msgid "Session with peer '%s' confirmed, but I cannot connect! (bug?)\n"
-msgstr "Đã xác nhận buổi làm việc với '%s', nhưng không kết nối được! (lỗi 
bug?)\n"
-
-#: src/server/connection.c:2470
+#: src/server/connection.c:2641
 msgid "# outgoing messages dropped"
 msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/server/connection.c:2472
+#: src/server/connection.c:2643
 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:2474
+#: src/server/connection.c:2645
 msgid "# connections closed (HANGUP sent)"
 msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
+#: src/server/connection.c:2647
+#, fuzzy
+msgid "# bytes encrypted"
+msgstr "# byte nhận được của dạng %d"
+
+#: src/server/connection.c:2649
+#, fuzzy
+msgid "# bytes decrypted"
+msgstr "# byte nhận được của dạng %d"
+
+#: src/server/connection.c:2651
+#, fuzzy
+msgid "# bytes noise sent"
+msgstr "# byte nhận được do nhiễu đường truyền"
+
 #: src/server/core.c:114
 #, c-format
 msgid "Application module '%s' already initialized!\n"
@@ -2787,7 +3098,7 @@
 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:475 src/server/gnunet-update.c:218
+#: src/server/core.c:475 src/server/gnunet-update.c:219
 msgid "No applications defined in configuration!\n"
 msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
 
@@ -2844,27 +3155,30 @@
 msgid "'%s': Could not connect.\n"
 msgstr "'%s': Không kết nối được.\n"
 
-#: src/server/gnunet-transport-check.c:146
+#: src/server/gnunet-transport-check.c:147
 #, c-format
 msgid "'%s': Could not send.\n"
 msgstr "'%s': Không gửi được.\n"
 
-#: src/server/gnunet-transport-check.c:166
+#: src/server/gnunet-transport-check.c:167
 #, 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:180
+#: src/server/gnunet-transport-check.c:181
 #, 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:187
+#: src/server/gnunet-transport-check.c:188
 #, c-format
-msgid "'%s' transport OK.  It took %ums to transmit %d messages of %d 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"
+msgid ""
+"'%s' transport OK.  It took %ums to transmit %d messages of %d 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:220
+#: src/server/gnunet-transport-check.c:221
 #, c-format
 msgid ""
 "\n"
@@ -2873,7 +3187,7 @@
 "\n"
 "Đang liên hệ '%s'."
 
-#: src/server/gnunet-transport-check.c:231
+#: src/server/gnunet-transport-check.c:232
 #, c-format
 msgid " Transport %d not available\n"
 msgstr " Giao thông %d là không thể\n"
@@ -2915,11 +3229,13 @@
 
 #: src/server/gnunet-transport-check.c:500
 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."
+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:548
 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"
+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:553
 #, c-format
@@ -2933,7 +3249,8 @@
 
 #: src/server/gnunet-transport-check.c:600
 #, c-format
-msgid "%d out of %d peers contacted successfully (%d times transport 
unavailable).\n"
+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/gnunet-update.c:49
@@ -2962,17 +3279,17 @@
 "\n"
 "Đang thoát.\n"
 
-#: src/server/gnunet-update.c:235
+#: src/server/gnunet-update.c:236
 #, 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:239
+#: src/server/gnunet-update.c:240
 #, 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:294
+#: src/server/gnunet-update.c:296
 #, c-format
 msgid "Updated data for %d applications.\n"
 msgstr "Cập nhật dữ liệu cho %d ứng dụng.\n"
@@ -2980,7 +3297,8 @@
 #: src/server/gnunetd.c:108
 #, 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"
+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:116
 #, c-format
@@ -3010,7 +3328,8 @@
 #: src/server/startup.c:268
 #, 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"
+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"
 
 #: src/server/startup.c:283
 #, c-format
@@ -3018,8 +3337,12 @@
 msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
 
 #: src/server/startup.c:387
-msgid "run in debug mode; gnunetd will not daemonize and error messages will 
be written to stderr instead of a logfile"
-msgstr "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"
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
+msgstr ""
+"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:393
 msgid "run as user LOGIN"
@@ -3059,8 +3382,11 @@
 
 #: src/server/tcpserver.c:696
 #, c-format
-msgid "Malformed network specification in the configuration in section '%s' 
for entry '%s': %s\n"
-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"
+msgid ""
+"Malformed network specification in the configuration in section '%s' for "
+"entry '%s': %s\n"
+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:802
 #, c-format
@@ -3090,30 +3416,33 @@
 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:1099
+#: src/transports/http.c:1097
 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:1174 src/transports/tcp.c:1127 src/util/tcpio.c:166
+#: src/transports/http.c:1171 src/transports/tcp.c:1124 src/util/tcpio.c:166
 #: src/util/tcpio.c:196
 #, 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:1331
+#: src/transports/http.c:1327
 #, c-format
-msgid "Could not bind the HTTP listener to port %d. No transport service 
started.\n"
-msgstr "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"
+msgid ""
+"Could not bind the HTTP listener to port %d. No transport service started.\n"
+msgstr ""
+"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:1474
+#: src/transports/http.c:1470
 msgid "# bytes received via HTTP"
 msgstr "# byte nhận được qua HTTP"
 
-#: src/transports/http.c:1476
+#: src/transports/http.c:1472
 msgid "# bytes sent via HTTP"
 msgstr "# byte gửi qua HTTP"
 
-#: src/transports/http.c:1478
+#: src/transports/http.c:1474
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte loại bỏ bởi HTTP (đi ra)"
 
@@ -3124,18 +3453,22 @@
 
 #: src/transports/smtp.c:413
 #, c-format
-msgid "You must specify the name of a pipe for the SMTP transport in section 
'%s' under '%s'.\n"
-msgstr "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"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section '%s' "
+"under '%s'.\n"
+msgstr ""
+"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:482
 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:571
+#: src/transports/smtp.c:569
 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:578
+#: src/transports/smtp.c:576
 #, 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"
@@ -3155,40 +3488,45 @@
 msgid "%.*s filter %s (SMTP)"
 msgstr "%.*s đầu lọc %s (SMTP)"
 
-#: src/transports/smtp.c:891 src/transports/udp.c:655
-#: src/transports/udp6.c:634
+#: src/transports/smtp.c:891 src/transports/udp.c:657
+#: src/transports/udp6.c:635
 #, 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:464
 #, 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"
+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/tcp.c:498
 #, 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"
+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:1058
+#: src/transports/tcp.c:1056
 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:1310 src/transports/tcp6.c:1203
+#: src/transports/tcp.c:1306 src/transports/tcp6.c:1199
 #, 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:1425
+#: src/transports/tcp.c:1423
 msgid "# bytes received via TCP"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp.c:1427
+#: src/transports/tcp.c:1425
 msgid "# bytes sent via TCP"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp.c:1429
+#: src/transports/tcp.c:1427
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
@@ -3197,27 +3535,33 @@
 msgstr "Mong chào mừng từ kết nối tcp, nhận được rác. Đang đóng.\n"
 
 #: src/transports/tcp6.c:468
-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 ""
+"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:656 src/transports/udp6.c:273
 #, 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/tcp6.c:959
+#: src/transports/tcp6.c:957
 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:1004
+#: src/transports/tcp6.c:1001
 #, c-format
 msgid "'%s': unknown service: %s\n"
 msgstr "'%s': không rõ dịch vụ: %s\n"
 
 #: src/transports/udp.c:144 src/transports/udp6.c:127
 #, 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 ""
+"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/transports/udp.c:178
 #, c-format
@@ -3232,33 +3576,39 @@
 #: src/transports/udp.c:274
 #, 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"
+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:356
+#: src/transports/udp.c:355
 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:486
+#: src/transports/udp.c:487
 #, 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"
+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:640
+#: src/transports/udp.c:642
 msgid "# bytes received via UDP"
 msgstr "# byte nhận được qua UDP"
 
-#: src/transports/udp.c:642
+#: src/transports/udp.c:644
 msgid "# bytes sent via UDP"
 msgstr "# byte gửi qua UDP"
 
-#: src/transports/udp.c:644
+#: src/transports/udp.c:646
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte loại bỏ bởi UDP (đi ra)"
 
 #: src/transports/ip.c:141
 #, c-format
-msgid "Could not find interface '%s' in '%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"
+msgid ""
+"Could not find interface '%s' in '%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:166
 #, c-format
@@ -3308,7 +3658,7 @@
 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:353
+#: src/transports/udp6.c:352
 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"
 
@@ -3329,8 +3679,12 @@
 
 #: src/util/configuration.c:471
 #, c-format
-msgid "Configuration file '%s' not found. I will try to create the default 
configuration file at that location.\n"
-msgstr "Không tìm thấy tập tin cấu hình '%s'. Chương trình sẽ thử tạo tập tin 
cấu hình mặc định tại vị trí đó.\n"
+msgid ""
+"Configuration file '%s' not found. I will try to create the default "
+"configuration file at that location.\n"
+msgstr ""
+"Không tìm thấy tập tin cấu hình '%s'. Chương trình sẽ thử tạo tập tin cấu "
+"hình mặc định tại vị trí đó.\n"
 
 #: src/util/configuration.c:488
 #, c-format
@@ -3343,23 +3697,28 @@
 
 #: src/util/cron.c:366
 #, c-format
-msgid "'%s' called with cron job not in queue, adding.  This may not be what 
you want.\n"
-msgstr "'%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"
+msgid ""
+"'%s' called with cron job not in queue, adding.  This may not be what you "
+"want.\n"
+msgstr ""
+"'%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/dso.c:41
+#: src/util/dso.c:42
 #, 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/dso.c:93
+#: src/util/dso.c:94
 #, c-format
 msgid "'%s' failed for library '%s' at %s:%d 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/dso.c:143
+#: src/util/dso.c:144
 #, c-format
 msgid "'%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
-msgstr "'%s' thất bại khi giải quyết phương pháp '%s%s' tại %s:%d với lỗi: 
%s\n"
+msgstr ""
+"'%s' thất bại khi giải quyết phương pháp '%s%s' tại %s:%d với lỗi: %s\n"
 
 #: src/util/getopt.c:641
 #, c-format
@@ -3505,24 +3864,24 @@
 msgid "EVERYTHING"
 msgstr "MỌITHỨ"
 
-#: src/util/logging.c:251
-msgid "LOGLEVEL not specified, that is not ok.\n"
-msgstr "Chưa chỉ ra mức độ ghi sự kiện LOGLEVEL, không ổn.\n"
-
-#: src/util/logging.c:262
+#: src/util/logging.c:261
 #, c-format
 msgid "Invalid LOGLEVEL '%s' specified.\n"
 msgstr "Đưa ra LOGLEVEL sai '%s'.\n"
 
-#: src/util/logging.c:367 src/util/logging.c:373
+#: src/util/logging.c:353 src/util/logging.c:359
 #, c-format
 msgid "Failure at %s:%d.\n"
 msgstr "Thất bại tại %s: %d.\n"
 
 #: src/util/port.c:45
 #, c-format
-msgid "Cannot determine port of gnunetd server. Define in configuration file 
in section '%s' under '%s'.\n"
-msgstr "Không nhận ra cổng của máy chủ gnunetd. Hãy xác định trong phần '%s' 
của tập tin cấu hình dưới '%s'.\n"
+msgid ""
+"Cannot determine port of gnunetd server. Define in configuration file in "
+"section '%s' under '%s'.\n"
+msgstr ""
+"Không nhận ra cổng của máy chủ gnunetd. Hãy xác định trong phần '%s' của tập "
+"tin cấu hình dưới '%s'.\n"
 
 #: src/util/printhelp.c:42
 #, c-format
@@ -3537,7 +3896,8 @@
 
 #: src/util/printhelp.c:45
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
+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/semaphore.c:172 src/util/semaphore.c:198
@@ -3562,47 +3922,33 @@
 
 #: src/util/state.c:86
 #, 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"
+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/util/statuscalls.c:138
+#: src/util/statuscalls.c:185
 #, c-format
-msgid "No network interfaces defined in configuration 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/util/statuscalls.c:163
-#, c-format
-msgid "Interfaces string (%s) in configuration section '%s' under '%s' is 
malformed.\n"
-msgstr "Chuỗi giao diện (%s) trong cấu hình phần '%s' dưới '%s' bị hỏng.\n"
-
-#: src/util/statuscalls.c:176
-#, c-format
-msgid "No network interfaces specified in the configuration file in section 
'%s' under '%s'.\n"
-msgstr "Không có giao diện mạng nào được xác định trong tập tin cấu hình phần 
'%s' dưới '%s'.\n"
-
-#: src/util/statuscalls.c:398 src/util/statuscalls.c:618
-#, c-format
 msgid "Failed to parse interface data from '%s' at %s:%d.\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/statuscalls.c:500
-#, c-format
-msgid "Failed to parse interface data '%s' output at %s:%d.\n"
-msgstr "Thất bại khi phân tích dữ liệu giao diện '%s' ra tại %s:%d.\n"
-
-#: src/util/statuscalls.c:827
-#, c-format
-msgid "Could not decoding file '%s' at %s:%d.\n"
-msgstr "Không giải mã được tập tin '%s' tại %s:%d.\n"
-
-#: src/util/statuscalls.c:1002
+#: src/util/statuscalls.c:487
 msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr "Không hỏi được sự sử dụng CPU (Windows NT).\n"
 
-#: src/util/statuscalls.c:1022
+#: src/util/statuscalls.c:505
 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/statuscalls.c:598
+#, c-format
+msgid ""
+"No network interfaces defined in configuration 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/util/storage.c:196
 #, c-format
 msgid "'%s' failed for drive %s: %u\n"
@@ -3628,6 +3974,26 @@
 msgid "'%s' failed, reply invalid!\n"
 msgstr "'%s' thất bại, câu trả lời sai!\n"
 
+#: src/util/timer.c:188
+msgid "ms"
+msgstr "mili giây"
+
+#: src/util/timer.c:193
+msgid "s"
+msgstr "giây"
+
+#: src/util/timer.c:196
+msgid "m"
+msgstr "phút"
+
+#: src/util/timer.c:199
+msgid "h"
+msgstr "giờ"
+
+#: src/util/timer.c:202
+msgid " days"
+msgstr " ngày"
+
 #: src/util/daemon.c:142
 #, c-format
 msgid "Attempted path to '%s' was '%s'.\n"
@@ -3638,37 +4004,74 @@
 msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
 msgstr "Không mong đợi một phân phối rất rộng (%u) tại %s:%d!\n"
 
-#: src/include/gnunet_util.h:147
+#: src/include/gnunet_util.h:155
 msgid "print this help"
 msgstr "in trợ giúp này"
 
-#: src/include/gnunet_util.h:150
+#: src/include/gnunet_util.h:158
 msgid "set verbosity to LEVEL"
 msgstr "đặt mức độ thông báo chi tiết thành LEVEL"
 
-#: src/include/gnunet_util.h:153
+#: src/include/gnunet_util.h:161
 msgid "use configuration file FILENAME"
 msgstr "dùng tập tin cấu hình FILENAME"
 
-#: src/include/gnunet_util.h:156
+#: src/include/gnunet_util.h:164
 msgid "specify host on which gnunetd is running"
 msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/include/gnunet_util.h:159
+#: src/include/gnunet_util.h:167
 msgid "print the version number"
 msgstr "in số của phiên bản"
 
-#: src/include/gnunet_util.h:162
+#: src/include/gnunet_util.h:170
 msgid "be verbose"
 msgstr "thông báo chi tiết"
 
-#: src/include/gnunet_util.h:602 src/include/gnunet_util.h:604
+#: src/include/gnunet_util.h:611 src/include/gnunet_util.h:613
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Xác nhận thất bại tại %s:%d.\n"
 
-#: src/include/gnunet_util.h:1009 src/include/gnunet_util.h:1011
-#: src/include/gnunet_util.h:1018
+#: src/include/gnunet_util.h:1018 src/include/gnunet_util.h:1020
+#: src/include/gnunet_util.h:1027
 #, c-format
 msgid "'%s' failed on file '%s' at %s:%d with error: %s\n"
 msgstr "'%s' thất bại trên tập tin'%s' tại %s:%d với lỗi: %s\n"
+
+#~ msgid "# client trace requests received"
+#~ msgstr "# nhận được yêu cầu theo vết trace của máy khách"
+
+#~ msgid "# client trace replies sent"
+#~ msgstr "# đã gửi câu trả lời theo vết trace đến máy khách"
+
+#~ msgid "# p2p trace requests received"
+#~ msgstr "# nhận được yêu cầu theo vết trace p2p"
+
+#~ msgid "# p2p trace replies sent"
+#~ msgstr "# đã gửi câu trả lời theo vết trace p2p"
+
+#~ msgid "Session with peer '%s' confirmed, but I cannot connect! (bug?)\n"
+#~ msgstr ""
+#~ "Đã xác nhận buổi làm việc với '%s', nhưng không kết nối được! (lỗi bug?)\n"
+
+#~ msgid "LOGLEVEL not specified, that is not ok.\n"
+#~ msgstr "Chưa chỉ ra mức độ ghi sự kiện LOGLEVEL, không ổn.\n"
+
+#~ msgid ""
+#~ "Interfaces string (%s) in configuration section '%s' under '%s' is "
+#~ "malformed.\n"
+#~ msgstr "Chuỗi giao diện (%s) trong cấu hình phần '%s' dưới '%s' bị hỏng.\n"
+
+#~ msgid ""
+#~ "No network interfaces specified in the configuration file in section '%s' "
+#~ "under '%s'.\n"
+#~ msgstr ""
+#~ "Không có giao diện mạng nào được xác định trong tập tin cấu hình phần '%"
+#~ "s' dưới '%s'.\n"
+
+#~ msgid "Failed to parse interface data '%s' output at %s:%d.\n"
+#~ msgstr "Thất bại khi phân tích dữ liệu giao diện '%s' ra tại %s:%d.\n"
+
+#~ msgid "Could not decoding file '%s' at %s:%d.\n"
+#~ msgstr "Không giải mã được tập tin '%s' tại %s:%d.\n"





reply via email to

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