gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r6263 - in GNUnet: po src/transports/upnp src/util/containe


From: gnunet
Subject: [GNUnet-SVN] r6263 - in GNUnet: po src/transports/upnp src/util/containers
Date: Tue, 12 Feb 2008 00:42:00 -0700 (MST)

Author: grothoff
Date: 2008-02-12 00:42:00 -0700 (Tue, 12 Feb 2008)
New Revision: 6263

Modified:
   GNUnet/po/GNUnet.pot
   GNUnet/po/POTFILES.in
   GNUnet/po/de.po
   GNUnet/po/es.po
   GNUnet/po/rw.po
   GNUnet/po/sv.po
   GNUnet/po/vi.po
   GNUnet/src/transports/upnp/upnp.c
   GNUnet/src/util/containers/vector.c
Log:
potup

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2008-02-12 07:33:28 UTC (rev 6262)
+++ GNUnet/po/GNUnet.pot        2008-02-12 07:42:00 UTC (rev 6263)
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-02-07 00:26-0700\n"
+"POT-Creation-Date: 2008-02-12 00:40-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -20,7 +20,7 @@
 #: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
 #: src/transports/http.c:1345 src/transports/http.c:1442
 #: src/transports/http.c:1620 src/transports/http.c:2047
-#: src/transports/http.c:2108 src/applications/bootstrap_http/http.c:123
+#: src/transports/http.c:2097 src/applications/bootstrap_http/http.c:123
 #: src/applications/bootstrap_http/http.c:257
 #: src/applications/bootstrap_http/http.c:274
 #: src/applications/bootstrap_http/http.c:306
@@ -42,123 +42,66 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:77 src/util/network/io.c:86
+#: src/transports/ip.c:70 src/transports/ip.c:390
 #, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr ""
-
-#: src/transports/ip6.c:110 src/util/network/ip.c:88 src/util/network/ip.c:153
-#, c-format
-msgid "No interface specified in section `%s' under `%s'!\n"
-msgstr ""
-
-#: src/transports/ip6.c:141 src/util/network/ip.c:119
-#: src/util/network/ip.c:239
-#, c-format
-msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-msgstr ""
-
-#: src/transports/ip6.c:175
-#, c-format
-msgid "Could not resolve `%s': %s\n"
-msgstr ""
-
-#: src/transports/ip6.c:229 src/transports/ip.c:61
-#, c-format
 msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/tcp6.c:249
-msgid "Could not determine my public IPv6 address.\n"
-msgstr ""
-
-#: src/transports/tcp6.c:317
+#: src/transports/ip.c:238
 #, c-format
-msgid "`%s': unknown service: %s\n"
+msgid "Could not find IPv6 address of host `%s': %s\n"
 msgstr ""
 
-#: src/transports/tcp6.c:420 src/transports/tcp.c:463
+#: src/transports/ip.c:271 src/util/network/ip.c:88 src/util/network/ip.c:153
 #, c-format
-msgid "Failed to start transport service on port %d.\n"
+msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr ""
 
-#: src/transports/tcp6.c:531
-msgid "# bytes received via TCP6"
-msgstr ""
-
-#: src/transports/tcp6.c:532
-msgid "# bytes sent via TCP6"
-msgstr ""
-
-#: src/transports/tcp6.c:534
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr ""
-
-#: src/transports/udp6.c:131 src/transports/udp.c:135
+#: src/transports/ip.c:302 src/util/network/ip.c:119 src/util/network/ip.c:239
 #, c-format
-msgid "Failed to bind to UDP port %d.\n"
+msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/transports/udp6.c:277
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr ""
-
-#: src/transports/udp6.c:494 src/transports/udp.c:544
+#: src/transports/ip.c:336
 #, c-format
-msgid "MTU %llu for `%s' is probably too low!\n"
+msgid "Could not resolve `%s': %s\n"
 msgstr ""
 
-#: src/transports/udp6.c:500
-msgid "# bytes received via UDP6"
-msgstr ""
-
-#: src/transports/udp6.c:501
-msgid "# bytes sent via UDP6"
-msgstr ""
-
-#: src/transports/udp6.c:503
-msgid "# bytes dropped by UDP6 (outgoing)"
-msgstr ""
-
-#: src/transports/udp6.c:505
-msgid "# UDP6 connections (right now)"
-msgstr ""
-
 #: src/transports/http.c:892
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/transports/http.c:2325
+#: src/transports/http.c:2314
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2334
+#: src/transports/http.c:2323
 msgid "# bytes received via HTTP"
 msgstr ""
 
-#: src/transports/http.c:2335
+#: src/transports/http.c:2324
 msgid "# bytes sent via HTTP"
 msgstr ""
 
-#: src/transports/http.c:2337
+#: src/transports/http.c:2326
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/transports/http.c:2338
+#: src/transports/http.c:2327
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2340
+#: src/transports/http.c:2329
 msgid "# HTTP GET received"
 msgstr ""
 
-#: src/transports/http.c:2341
+#: src/transports/http.c:2330
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2343
+#: src/transports/http.c:2332
 msgid "# HTTP PUT received"
 msgstr ""
 
@@ -199,70 +142,63 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transports/tcp_helper.c:261
-msgid "Received malformed message instead of welcome message. Closing.\n"
+#: src/transports/common.c:369
+#, c-format
+msgid "Port is 0, will only send using %s.\n"
 msgstr ""
 
-#: src/transports/tcp_helper.c:281
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
+#: src/transports/tcp.c:272 src/transports/tcp.c:291
+msgid "Received malformed message via TCP. Closing.\n"
 msgstr ""
 
-#: src/transports/tcp.c:297
-msgid "TCP: Could not determine my public IP address.\n"
-msgstr ""
-
-#: src/transports/tcp.c:402
+#: src/transports/tcp.c:707 src/transports/udp.c:458
 #, c-format
-msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+msgid "Failed to bind to %s port %d.\n"
 msgstr ""
 
-#: src/transports/tcp.c:585
+#: src/transports/tcp.c:789
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:798
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:595
+#: src/transports/tcp.c:799
 msgid "# bytes sent via TCP"
 msgstr ""
 
-#: src/transports/tcp.c:597
+#: src/transports/tcp.c:801
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:302
-msgid "UDP: Could not determine my public IP address.\n"
+#: src/transports/udp.c:107
+msgid "Received malformed message via UDP. Ignored.\n"
 msgstr ""
 
-#: src/transports/udp.c:401
+#: src/transports/udp.c:525
 #, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/udp.c:560
+#: src/transports/udp.c:547
 msgid "# bytes received via UDP"
 msgstr ""
 
-#: src/transports/udp.c:561
+#: src/transports/udp.c:548
 msgid "# bytes sent via UDP"
 msgstr ""
 
-#: src/transports/udp.c:563
+#: src/transports/udp.c:550
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:565
+#: src/transports/udp.c:552
 msgid "# UDP connections (right now)"
 msgstr ""
 
-#: src/transports/udp_helper.c:96
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr ""
-
 #: src/setup/ncurses/mconf.c:86
 msgid "Exit"
 msgstr ""
@@ -300,7 +236,7 @@
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:528
 msgid "GNUnet Configuration"
 msgstr ""
 
@@ -528,23 +464,23 @@
 msgid "Unable to save configuration file `%s':"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:464
+#: src/setup/ncurses/wizard_curs.c:465
 msgid "Unable to create user account for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:471
+#: src/setup/ncurses/wizard_curs.c:472
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:486
+#: src/setup/ncurses/wizard_curs.c:487
 msgid "Save configuration?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:487
+#: src/setup/ncurses/wizard_curs.c:488
 msgid "Save configuration now?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/ncurses/wizard_curs.c:532 src/setup/gtk/gnunet-setup.glade:723
 #: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
 msgid "Back"
 msgstr ""
@@ -901,12 +837,6 @@
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest.c:51
-#: src/applications/dht/tools/dhttest2.c:43
-#: src/applications/dht/module/table.c:758
-msgid "# dht connections"
-msgstr ""
-
 #: src/applications/dht/tools/dht-query.c:52
 msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr ""
@@ -994,6 +924,10 @@
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr ""
 
+#: src/applications/dht/module/table.c:758
+msgid "# dht connections"
+msgstr ""
+
 #: src/applications/dht/module/table.c:760
 msgid "# dht discovery messages received"
 msgstr ""
@@ -1155,7 +1089,7 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:113
+#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:116
 #: src/applications/stats/gnunet-stats.c:121
 #: src/applications/tbench/gnunet-tbench.c:126
 #: src/applications/tracekit/gnunet-tracekit.c:352
@@ -1401,7 +1335,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:132
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
@@ -1732,23 +1666,15 @@
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-search.c:135
 msgid "Search GNUnet for files."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:143
-msgid "exit after receiving LIMIT results"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:146
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:149
-msgid "wait DELAY seconds for search results before aborting"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:186
+#: src/applications/fs/tools/gnunet-search.c:176
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
@@ -1883,23 +1809,12 @@
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/fsui/deserialize.c:772
+#: src/applications/fs/fsui/deserialize.c:770
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:154
-#: src/applications/fs/fsui/fsuitest.c:173
-#: src/applications/fs/fsui/downloadtest.c:289
-#: src/applications/fs/fsui/serializetest2.c:391
-#: src/applications/fs/fsui/serializetest3.c:163
-#: src/applications/fs/fsui/serializetest4.c:358
-#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
-#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
-msgid "AND"
-msgstr ""
-
-#: src/applications/fs/fsui/search.c:241
+#: src/applications/fs/fsui/search.c:240
 msgid "Error running search (no reason given)."
 msgstr ""
 
@@ -1933,7 +1848,7 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:646
+#: src/applications/fs/ecrs/download.c:647
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -1943,41 +1858,46 @@
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:156
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr ""
+
+#: src/applications/fs/ecrs/upload.c:153
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:161
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:173
+#: src/applications/fs/ecrs/upload.c:170
 msgid "Failed to connect to gnunetd."
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:185
+#: src/applications/fs/ecrs/upload.c:182
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:204
+#: src/applications/fs/ecrs/upload.c:201
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:212
+#: src/applications/fs/ecrs/upload.c:209
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:223
 #, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:309
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
@@ -1999,7 +1919,7 @@
 
 #: src/applications/fs/ecrs/namespace.c:339
 #: src/applications/fs/ecrs/namespace.c:420
-#: src/applications/fs/ecrs/namespace.c:571
+#: src/applications/fs/ecrs/namespace.c:572
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr ""
@@ -2010,8 +1930,8 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:583
-#: src/applications/fs/ecrs/namespace.c:594
+#: src/applications/fs/ecrs/namespace.c:584
+#: src/applications/fs/ecrs/namespace.c:595
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr ""
@@ -2052,17 +1972,17 @@
 #: src/applications/sqstore_mysql/mysql.c:582
 #: src/applications/sqstore_mysql/mysql.c:680
 #: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:706
-#: src/applications/sqstore_mysql/mysql.c:721
-#: src/applications/sqstore_mysql/mysql.c:821
-#: src/applications/sqstore_mysql/mysql.c:836
-#: src/applications/sqstore_mysql/mysql.c:988
-#: src/applications/sqstore_mysql/mysql.c:1000
-#: src/applications/sqstore_mysql/mysql.c:1012
-#: src/applications/sqstore_mysql/mysql.c:1260
-#: src/applications/sqstore_mysql/mysql.c:1272
-#: src/applications/sqstore_mysql/mysql.c:1284
-#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/sqstore_mysql/mysql.c:707
+#: src/applications/sqstore_mysql/mysql.c:722
+#: src/applications/sqstore_mysql/mysql.c:822
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1001
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1264
+#: src/applications/sqstore_mysql/mysql.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1288
+#: src/applications/sqstore_mysql/mysql.c:1373
 #: src/applications/dstore_mysql/dstore_mysql.c:107
 #: src/applications/dstore_mysql/dstore_mysql.c:114
 #: src/applications/dstore_mysql/dstore_mysql.c:286
@@ -2092,14 +2012,6 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/applications/advertising/advertising_test.c:47
-#: src/applications/session/sessiontest_http.c:40
-#: src/applications/session/sessiontest.c:40
-#: src/applications/session/sessiontest2.c:40
-#: src/applications/stats/statistics.c:233
-msgid "# of connected peers"
-msgstr ""
-
 #: src/applications/advertising/advertising.c:194
 #, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
@@ -2177,7 +2089,7 @@
 msgstr ""
 
 #: src/applications/advertising/advertising.c:929
-#: src/applications/session/connect.c:974
+#: src/applications/session/connect.c:945
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -2187,33 +2099,29 @@
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/chat/chat.c:95
-msgid "Message received from peer is invalid.\n"
-msgstr ""
-
-#: src/applications/chat/chat.c:144
+#: src/applications/chat/chat.c:106 src/applications/chat/chat.c:187
 msgid "Message received from client is invalid\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:165
+#: src/applications/chat/chat.c:226
 msgid "Maximum number of chat clients reached.\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:171
+#: src/applications/chat/chat.c:232
 #, c-format
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:211
+#: src/applications/chat/chat.c:272
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:230
+#: src/applications/chat/chat.c:291
 msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/chat/clientapi.c:119 src/applications/chat/clientapi.c:197
+#: src/applications/chat/clientapi.c:122 src/applications/chat/clientapi.c:216
 #, c-format
 msgid "Error writing to socket.\n"
 msgstr ""
@@ -2230,17 +2138,17 @@
 msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:147
+#: src/applications/chat/gnunet-chat.c:146
 #, c-format
 msgid "You must specify a nickname\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:157
+#: src/applications/chat/gnunet-chat.c:156
 #, c-format
 msgid "Failed to join the room\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:182
+#: src/applications/chat/gnunet-chat.c:181
 #, c-format
 msgid "Failed to send message.\n"
 msgstr ""
@@ -2265,13 +2173,13 @@
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1399
-#: src/applications/sqstore_mysql/mysql.c:1483
+#: src/applications/sqstore_sqlite/sqlite.c:1401
+#: src/applications/sqstore_mysql/mysql.c:1487
 msgid "# bytes in datastore"
 msgstr ""
 
 #: src/applications/pingpong/pingpong.c:134
-#: src/applications/pingpong/pingpong.c:206
+#: src/applications/pingpong/pingpong.c:204
 #: src/applications/pingpong/pingpong.c:274
 #: src/applications/pingpong/pingpong.c:346
 #, c-format
@@ -2282,8 +2190,9 @@
 msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:217
-msgid "Received PING not destined for us!\n"
+#: src/applications/pingpong/pingpong.c:216
+#, c-format
+msgid "Received PING from `%s' not destined for us!\n"
 msgstr ""
 
 #: src/applications/pingpong/pingpong.c:316
@@ -2314,12 +2223,12 @@
 msgstr ""
 
 #: src/applications/pingpong/pingpong.c:527
-#: src/applications/session/connect.c:968
+#: src/applications/session/connect.c:939
 msgid "# encrypted PONG messages sent"
 msgstr ""
 
 #: src/applications/pingpong/pingpong.c:531
-#: src/applications/session/connect.c:966
+#: src/applications/session/connect.c:937
 msgid "# encrypted PING messages sent"
 msgstr ""
 
@@ -2336,67 +2245,66 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:260
-#: src/applications/session/connect.c:279
+#: src/applications/session/connect.c:235
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:323
+#: src/applications/session/connect.c:279
 #, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:496
 #, c-format
 msgid "Could not create any HELLO for myself (have transports `%s')!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:627
+#: src/applications/session/connect.c:605
 #, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:661
+#: src/applications/session/connect.c:639
 #, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:695
+#: src/applications/session/connect.c:668
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:706
+#: src/applications/session/connect.c:680
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:776
+#: src/applications/session/connect.c:742
 #, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
 "invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:755
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:958
+#: src/applications/session/connect.c:929
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:960
+#: src/applications/session/connect.c:931
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:962
+#: src/applications/session/connect.c:933
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:964
+#: src/applications/session/connect.c:935
 msgid "# sessions established"
 msgstr ""
 
@@ -2406,20 +2314,20 @@
 msgid "`%s' failed at %s:%d with error: %s"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1388
+#: src/applications/sqstore_mysql/mysql.c:1392
 #, c-format
 msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1508
-#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/sqstore_mysql/mysql.c:1512
+#: src/applications/sqstore_mysql/mysql.c:1665
 #: src/applications/dstore_mysql/dstore_mysql.c:627
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1535
-#: src/applications/sqstore_mysql/mysql.c:1686
+#: src/applications/sqstore_mysql/mysql.c:1539
+#: src/applications/sqstore_mysql/mysql.c:1690
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -2643,6 +2551,10 @@
 msgid "% of allowed io load"
 msgstr ""
 
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr ""
+
 #: src/applications/stats/statistics.c:235
 msgid "# bytes of noise received"
 msgstr ""
@@ -2792,33 +2704,6 @@
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:53
-#, c-format
-msgid "Using %u messages of size %u for %u times.\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:85
-#, c-format
-msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:89
-#, c-format
-msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:95
-#, c-format
-msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:151
-#, c-format
-msgid "Running benchmark...\n"
-msgstr ""
-
 #: src/applications/tracekit/gnunet-tracekit.c:104
 #, c-format
 msgid "`%s' connected to `%s'.\n"
@@ -2918,7 +2803,7 @@
 msgid "# bytes received in plaintext of type %d"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:650
+#: src/applications/traffic/traffic.c:652
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -3429,7 +3314,7 @@
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/select.c:483
+#: src/util/network/select.c:489
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
@@ -3461,6 +3346,11 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr ""
 
+#: src/util/network/io.c:86
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr ""
+
 #: src/util/network/ip.c:209
 #, c-format
 msgid ""
@@ -4047,14 +3937,14 @@
 #: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
-"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
+"available transports are udp, tcp, http, smtp and nat.\n"
 "\t\t\n"
 "Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes "
 "that cannot directly be reached from the outside.  Peers that are NOT behind "
 "a NAT box and that want to *allow* peers that ARE behind a NAT box to "
 "connect must ALSO load the 'nat' module.  Note that the actual transfer will "
 "always be via tcp initiated by the peer behind the NAT box.  The nat "
-"transport requires the use of tcp, http, smtp and/or tcp6 in addition to nat "
+"transport requires the use of tcp, http and/or smtp in addition to nat "
 "itself."
 msgstr ""
 
@@ -4412,8 +4302,8 @@
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
-#: contrib/config-daemon.scm:1091
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:966
+#: contrib/config-daemon.scm:1116
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
@@ -4425,26 +4315,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1115
-#: contrib/config-daemon.scm:1170 contrib/config-daemon.scm:1235
-msgid "Which IPs are not allowed to connect?"
+#: contrib/config-daemon.scm:887
+msgid "Which IP(v4)s are not allowed to connect?"
 msgstr ""
 
 #: contrib/config-daemon.scm:899
 msgid ""
-"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
-"network interface."
+"Which IP(v4)s are allowed to connect? Leave empty to use the IP of your "
+"primary network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:911 contrib/config-daemon.scm:1164
+msgid "Which IPv6s are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:923 contrib/config-daemon.scm:1176
+msgid ""
+"Which IPv6s are allowed to connect? Leave empty to allow any IP to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:936
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:929
+#: contrib/config-daemon.scm:954
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1092
+#: contrib/config-daemon.scm:967 contrib/config-daemon.scm:1117
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -4452,11 +4350,11 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:953
+#: contrib/config-daemon.scm:978
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:954
+#: contrib/config-daemon.scm:979
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4464,138 +4362,117 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:965
+#: contrib/config-daemon.scm:990
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1009
 msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1021
 msgid ""
 "What is the maximum number of e-mails that gnunetd would be allowed to send "
 "per hour?"
 msgstr ""
 
-#: contrib/config-daemon.scm:997
+#: contrib/config-daemon.scm:1022
 msgid "Use 0 for unlimited"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1033
 msgid "Which e-mail address should be used to send e-mail to this peer?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1009
+#: contrib/config-daemon.scm:1034
 msgid ""
 "You must make sure that e-mail received at this address is forwarded to the "
 "PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
 "procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1045
 msgid ""
 "Which header line should other peers include in e-mails to enable filtering?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1046
 msgid ""
 "You can specify a header line here which can then be used by procmail to "
 "filter GNUnet e-mail from your inbox and forward it to gnunetd."
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1057
 msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1058
 msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
 msgstr ""
 
-#: contrib/config-daemon.scm:1044
+#: contrib/config-daemon.scm:1069
 msgid "What is the name and port of the server for outgoing e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1070
 msgid "The basic format is HOSTNAME:PORT."
 msgstr ""
 
-#: contrib/config-daemon.scm:1056
+#: contrib/config-daemon.scm:1081
 msgid "SMTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1079
+#: contrib/config-daemon.scm:1104
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1103
+#: contrib/config-daemon.scm:1128
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1127
+#: contrib/config-daemon.scm:1140
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1152
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:1139
+#: contrib/config-daemon.scm:1188
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
-msgid "Which port should be used by the TCP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1182 contrib/config-daemon.scm:1247
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
-msgstr ""
-
-#: contrib/config-daemon.scm:1194
-msgid "TCP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1211
-msgid "Which port should be used by the UDP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1223
-msgid "What is the maximum transfer unit for UDP 6?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1259
-msgid "UDP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1277
+#: contrib/config-daemon.scm:1210
 msgid "Network interface"
 msgstr ""
 
-#: contrib/config-daemon.scm:1289
+#: contrib/config-daemon.scm:1222
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1301
+#: contrib/config-daemon.scm:1234
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1313
+#: contrib/config-daemon.scm:1246
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1337
+#: contrib/config-daemon.scm:1268
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1349
+#: contrib/config-daemon.scm:1280
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1361
+#: contrib/config-daemon.scm:1292
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1363
+#: contrib/config-daemon.scm:1294
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4605,11 +4482,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1374
+#: contrib/config-daemon.scm:1305
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1376
+#: contrib/config-daemon.scm:1307
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4619,36 +4496,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1387
+#: contrib/config-daemon.scm:1318
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1388
+#: contrib/config-daemon.scm:1319
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1399
+#: contrib/config-daemon.scm:1330
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1400
+#: contrib/config-daemon.scm:1331
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1411
+#: contrib/config-daemon.scm:1342
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1423
+#: contrib/config-daemon.scm:1354
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1425
+#: contrib/config-daemon.scm:1356
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -4693,11 +4570,11 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1442
+#: contrib/config-daemon.scm:1373
 msgid "Network interface to monitor"
 msgstr ""
 
-#: contrib/config-daemon.scm:1443
+#: contrib/config-daemon.scm:1374
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -4708,11 +4585,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1454
+#: contrib/config-daemon.scm:1385
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1479 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1410 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5406,26 +5283,26 @@
 msgid "Not for English ;-)"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:704
+#: src/applications/fs/gap/fs.c:735
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:706
+#: src/applications/fs/gap/fs.c:737
 msgid "# gap content total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:708
+#: src/applications/fs/gap/fs.c:739
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:736
+#: src/applications/fs/gap/fs.c:767
 #, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
 "d\n"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -5437,19 +5314,19 @@
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/fs/gap/fs_dht.c:261
+#: src/applications/fs/gap/fs_dht.c:257
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:348
+#: src/applications/fs/gap/migration.c:354
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:350
+#: src/applications/fs/gap/migration.c:356
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:353
+#: src/applications/fs/gap/migration.c:359
 msgid "# on-demand block migration attempts"
 msgstr ""
 
@@ -5461,11 +5338,11 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/gap/ondemand.c:454
+#: src/applications/fs/gap/ondemand.c:452
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/gap/ondemand.c:566
+#: src/applications/fs/gap/ondemand.c:568
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"

Modified: GNUnet/po/POTFILES.in
===================================================================
--- GNUnet/po/POTFILES.in       2008-02-12 07:33:28 UTC (rev 6262)
+++ GNUnet/po/POTFILES.in       2008-02-12 07:42:00 UTC (rev 6263)
@@ -1,5 +1,4 @@
 src/transports/upnp/upnp.c
-src/transports/upnp/upnptest.c
 src/transports/upnp/init.c
 src/transports/upnp/xmlnode.c
 src/transports/upnp/ip.c
@@ -7,13 +6,11 @@
 src/transports/upnp/util.c
 src/transports/ip.c
 src/transports/http.c
-src/transports/test.c
 src/transports/nat.c
 src/transports/smtp.c
 src/transports/common.c
 src/transports/tcp.c
 src/transports/udp.c
-src/transports/test_repeat.c
 src/setup/ncurses/mconf.c
 src/setup/ncurses/wizard_curs.c
 src/setup/text/conf.c
@@ -26,8 +23,6 @@
 src/setup/lib/wizard_util.c
 src/setup/gnunet-setup.c
 src/setup/gnunet-win-tool.c
-src/applications/dht/tools/dhttest.c
-src/applications/dht/tools/dhttest2.c
 src/applications/dht/tools/dht-query.c
 src/applications/dht/tools/dht_api.c
 src/applications/dht/module/service.c
@@ -36,13 +31,11 @@
 src/applications/dht/module/table.c
 src/applications/topology_default/topology.c
 src/applications/rpc/parameters.c
-src/applications/rpc/parameterstest.c
 src/applications/rpc/rpc.c
 src/applications/datastore/prefetch.c
 src/applications/datastore/filter.c
 src/applications/datastore/datastore.c
 src/applications/fragmentation/fragmentation.c
-src/applications/fragmentation/fragmentationtest.c
 src/applications/vpn/gnunet-vpn.c
 src/applications/vpn/vpn.c
 src/applications/fs/tools/gnunet-pseudonym.c
@@ -52,86 +45,50 @@
 src/applications/fs/tools/gnunet-download.c
 src/applications/fs/tools/gnunet-unindex.c
 src/applications/fs/uritrack/callbacks.c
-src/applications/fs/uritrack/tracktest.c
 src/applications/fs/uritrack/file_info.c
 src/applications/fs/uritrack/uri_info.c
 src/applications/fs/fsui/deserialize.c
-src/applications/fs/fsui/searchtest.c
 src/applications/fs/fsui/search.c
-src/applications/fs/fsui/fsuitest.c
 src/applications/fs/fsui/fsui.c
-src/applications/fs/fsui/downloadtest.c
 src/applications/fs/fsui/download.c
-src/applications/fs/fsui/serializetest2.c
 src/applications/fs/fsui/fsui-loader.c
-src/applications/fs/fsui/serializetest3.c
 src/applications/fs/fsui/unindex.c
-src/applications/fs/fsui/serializetest4.c
 src/applications/fs/fsui/upload.c
-src/applications/fs/fsui/serializetest.c
 src/applications/fs/fsui/serialize.c
-src/applications/fs/fsui/fsuitest2.c
 src/applications/fs/lib/fslib.c
-src/applications/fs/lib/fslibtest.c
 src/applications/fs/collection/collection.c
-src/applications/fs/collection/collectiontest.c
-src/applications/fs/ecrs/uritest.c
 src/applications/fs/ecrs/uri.c
 src/applications/fs/ecrs/tree.c
 src/applications/fs/ecrs/directory.c
-src/applications/fs/ecrs/directorytest.c
 src/applications/fs/ecrs/keyspace.c
-src/applications/fs/ecrs/searchtest.c
 src/applications/fs/ecrs/search.c
 src/applications/fs/ecrs/download.c
-src/applications/fs/ecrs/downloadtest.c
-src/applications/fs/ecrs/metatest2.c
 src/applications/fs/ecrs/unindex.c
 src/applications/fs/ecrs/helper.c
 src/applications/fs/ecrs/indexinfo.c
 src/applications/fs/ecrs/upload.c
-src/applications/fs/ecrs/bincodertest.c
 src/applications/fs/ecrs/bincoder.c
-src/applications/fs/ecrs/metatest.c
 src/applications/fs/ecrs/meta.c
-src/applications/fs/ecrs/ecrstest.c
 src/applications/fs/ecrs/ecrs.c
 src/applications/fs/ecrs/namespace.c
-src/applications/fs/ecrs/namespacetest.c
 src/applications/fs/ecrs/parser.c
 src/applications/fs/namespace/namespace_info.c
-src/applications/fs/namespace/namespace_infotest.c
-src/applications/fs/ecrs_core_test.c
 src/applications/fs/ecrs_core.c
 src/applications/testing/testing.c
-src/applications/testing/testingtest.c
 src/applications/kvstore_sqlite/kv_sqlite.c
-src/applications/kvstore_sqlite/kv_sqlitetest.c
-src/applications/advertising/advertising_test.c
 src/applications/advertising/advertising.c
 src/applications/advertising/bootstrap.c
 src/applications/chat/chat.c
 src/applications/chat/clientapi.c
 src/applications/chat/gnunet-chat.c
 src/applications/state/state.c
-src/applications/state/statetest.c
 src/applications/sqstore_sqlite/sqlite.c
-src/applications/sqstore_sqlite/sqlitetest.c
-src/applications/sqstore_sqlite/sqlitetest2.c
-src/applications/sqstore_sqlite/sqlitetest3.c
 src/applications/pingpong/pingpong.c
-src/applications/session/sessiontest_http.c
-src/applications/session/sessiontest.c
-src/applications/session/sessiontest2.c
 src/applications/session/connect.c
 src/applications/sqstore_mysql/mysql.c
-src/applications/sqstore_mysql/mysqltest.c
-src/applications/sqstore_mysql/mysqltest2.c
-src/applications/sqstore_mysql/mysqltest3.c
 src/applications/identity/hostkey.c
 src/applications/identity/clientapi.c
 src/applications/identity/identity.c
-src/applications/identity/identitytest.c
 src/applications/transport/transport.c
 src/applications/transport/check.c
 src/applications/stats/sqstats.c
@@ -140,7 +97,6 @@
 src/applications/stats/gnunet-stats.c
 src/applications/tbench/gnunet-tbench.c
 src/applications/tbench/tbench.c
-src/applications/tbench/tbenchtest.c
 src/applications/tracekit/gnunet-tracekit.c
 src/applications/tracekit/tracekit.c
 src/applications/getoption/clientapi.c
@@ -148,12 +104,9 @@
 src/applications/template/gnunet-template.c
 src/applications/template/template.c
 src/applications/bootstrap_http/http.c
-src/applications/bootstrap_http/httptest.c
 src/applications/traffic/traffic.c
 src/applications/traffic/clientapi.c
-src/applications/dstore_mysql/dstore_test.c
 src/applications/dstore_mysql/dstore_mysql.c
-src/applications/dstore_sqlite/dstore_test.c
 src/applications/dstore_sqlite/dstore.c
 src/server/connection.c
 src/server/startup.c
@@ -166,62 +119,43 @@
 src/server/version.c
 src/server/core.c
 src/util/crypto/hashperf.c
-src/util/crypto/weakkeytest.c
-src/util/crypto/symciphertest.c
-src/util/crypto/crctest.c
 src/util/crypto/crc32.c
-src/util/crypto/kblockkey_test.c
 src/util/crypto/hostkey_gcrypt.c
 src/util/crypto/kblockkey.c
 src/util/crypto/locking_gcrypt.c
 src/util/crypto/random.c
 src/util/crypto/hashing.c
-src/util/crypto/hashingtest.c
-src/util/crypto/hostkeytest.c
 src/util/crypto/symcipher_gcrypt.c
 src/util/os/time.c
-src/util/os/statuscallstest.c
 src/util/os/statuscalls.c
 src/util/os/console.c
 src/util/os/init.c
-src/util/os/daemontest.c
 src/util/os/daemon.c
 src/util/os/osconfig.c
 src/util/os/user.c
 src/util/os/priority.c
-src/util/os/semaphoretest.c
 src/util/os/semaphore.c
 src/util/os/installpath.c
 src/util/os/dso.c
 src/util/os/cpustatus.c
 src/util/network_client/tcpio.c
-src/util/network_client/tcpiotest.c
 src/util/network_client/daemon.c
 src/util/network/endian.c
 src/util/network/select.c
-src/util/network/selecttest.c
 src/util/network/dns.c
 src/util/network/ipcheck.c
 src/util/network/io.c
 src/util/network/ip.c
-src/util/network/ipchecktest.c
 src/util/error/error.c
 src/util/disk/storage.c
-src/util/disk/storagetest.c
 src/util/threads/time.c
-src/util/threads/timertest.c
 src/util/threads/mutex.c
 src/util/threads/semaphore.c
-src/util/threads/semaphoretest.c
 src/util/threads/pthread.c
 src/util/threads/shutdown.c
-src/util/threads/shutdowntest.c
-src/util/threads/shutdowntest2.c
 src/util/threads/signal.c
 src/util/win/winproc.c
-src/util/cron/timertest.c
 src/util/cron/cron.c
-src/util/cron/crontest.c
 src/util/loggers/file.c
 src/util/loggers/smtp.c
 src/util/loggers/memory.c
@@ -232,13 +166,8 @@
 src/util/boot/startup.c
 src/util/containers/bloomfilter.c
 src/util/containers/vector.c
-src/util/containers/vectortest.c
-src/util/containers/hashtest.c
-src/util/containers/bloomtest.c
 src/util/config/config.c
-src/util/config/configtest.c
 src/util/string/xmalloc.c
-src/util/string/xmalloctest.c
 src/util/string/string.c
 src/util/libgnunetutil.c
 src/transports/upnp/error.h
@@ -358,9 +287,6 @@
 src/applications/fs/gap/fs_dht.c
 src/applications/fs/gap/migration.c
 src/applications/fs/gap/gap.c
-src/applications/fs/gap/test_loopback.c
-src/applications/fs/gap/test_linear_topology.c
-src/applications/fs/gap/test_star_topology.c
 src/applications/fs/gap/ondemand.c
 src/applications/fs/gap/plan.c
 src/applications/fs/gap/anonymity.c

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2008-02-12 07:33:28 UTC (rev 6262)
+++ GNUnet/po/de.po     2008-02-12 07:42:00 UTC (rev 6263)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-02-07 00:26-0700\n"
+"POT-Creation-Date: 2008-02-12 00:40-0700\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -20,7 +20,7 @@
 #: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
 #: src/transports/http.c:1345 src/transports/http.c:1442
 #: src/transports/http.c:1620 src/transports/http.c:2047
-#: src/transports/http.c:2108 src/applications/bootstrap_http/http.c:123
+#: src/transports/http.c:2097 src/applications/bootstrap_http/http.c:123
 #: src/applications/bootstrap_http/http.c:257
 #: src/applications/bootstrap_http/http.c:274
 #: src/applications/bootstrap_http/http.c:306
@@ -42,136 +42,71 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:77 src/util/network/io.c:86
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
+#: src/transports/ip.c:70 src/transports/ip.c:390
+#, fuzzy, c-format
+msgid "Failed to obtain my (external) %s address!\n"
+msgstr "Fehler beim Bestimmen der (externen) IP-Adresse!\n"
+
+#: src/transports/ip.c:238
+#, fuzzy, c-format
+msgid "Could not find IPv6 address of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/transports/ip6.c:110 src/util/network/ip.c:88 src/util/network/ip.c:153
+#: src/transports/ip.c:271 src/util/network/ip.c:88 src/util/network/ip.c:153
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr ""
 "Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion `%s' "
 "unter `%s' definiert!\n"
 
-#: src/transports/ip6.c:141 src/util/network/ip.c:119
-#: src/util/network/ip.c:239
+#: src/transports/ip.c:302 src/util/network/ip.c:119 src/util/network/ip.c:239
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 "Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
 "werden.\n"
 
-#: src/transports/ip6.c:175
+#: src/transports/ip.c:336
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/transports/ip6.c:229 src/transports/ip.c:61
-#, fuzzy, c-format
-msgid "Failed to obtain my (external) %s address!\n"
-msgstr "Fehler beim Bestimmen der (externen) IP-Adresse!\n"
-
-#: src/transports/tcp6.c:249
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
-
-#: src/transports/tcp6.c:317
-#, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "`%s': unbekannter Dienst: %s\n"
-
-#: src/transports/tcp6.c:420 src/transports/tcp.c:463
-#, 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/tcp6.c:531
-#, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/transports/tcp6.c:532
-#, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "# Bytes gesendet über TCP"
-
-#: src/transports/tcp6.c:534
-#, fuzzy
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr "# Bytes verworfen von TCP (ausgehend)"
-
-#: src/transports/udp6.c:131 src/transports/udp.c:135
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
-
-#: src/transports/udp6.c:277
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
-
-#: src/transports/udp6.c:494 src/transports/udp.c:544
-#, fuzzy, c-format
-msgid "MTU %llu for `%s' is probably too low!\n"
-msgstr ""
-"MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
-"implementiert!)\n"
-
-#: src/transports/udp6.c:500
-#, fuzzy
-msgid "# bytes received via UDP6"
-msgstr "# Bytes empfangen über UDP"
-
-#: src/transports/udp6.c:501
-#, fuzzy
-msgid "# bytes sent via UDP6"
-msgstr "# Bytes gesendet über UDP"
-
-#: src/transports/udp6.c:503
-#, fuzzy
-msgid "# bytes dropped by UDP6 (outgoing)"
-msgstr "# Bytes verworfen von UDP (outgoing)"
-
-#: src/transports/udp6.c:505
-msgid "# UDP6 connections (right now)"
-msgstr ""
-
 #: src/transports/http.c:892
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/transports/http.c:2325
+#: src/transports/http.c:2314
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2334
+#: src/transports/http.c:2323
 msgid "# bytes received via HTTP"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/transports/http.c:2335
+#: src/transports/http.c:2324
 msgid "# bytes sent via HTTP"
 msgstr "# Bytes gesendet über HTTP"
 
-#: src/transports/http.c:2337
+#: src/transports/http.c:2326
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# Bytes verworfen von HTTP"
 
-#: src/transports/http.c:2338
+#: src/transports/http.c:2327
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2340
+#: src/transports/http.c:2329
 #, fuzzy
 msgid "# HTTP GET received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/http.c:2341
+#: src/transports/http.c:2330
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2343
+#: src/transports/http.c:2332
 #, fuzzy
 msgid "# HTTP PUT received"
 msgstr "# Bytes empfangen über TCP"
@@ -221,82 +156,69 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transports/tcp_helper.c:261
-#, fuzzy
-msgid "Received malformed message instead of welcome message. Closing.\n"
+#: src/transports/common.c:369
+#, c-format
+msgid "Port is 0, will only send using %s.\n"
 msgstr ""
-"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
-"u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/transports/tcp_helper.c:281
+#: src/transports/tcp.c:272 src/transports/tcp.c:291
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgid "Received malformed message via TCP. Closing.\n"
 msgstr ""
-"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
-"u) empfangen. Verbindung wird geschlossen.\n"
+"Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
 
-#: src/transports/tcp.c:297
-#, fuzzy
-msgid "TCP: Could not determine my public IP address.\n"
-msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+#: src/transports/tcp.c:707 src/transports/udp.c:458
+#, fuzzy, c-format
+msgid "Failed to bind to %s port %d.\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transports/tcp.c:402
-#, 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/tcp.c:585
+#: src/transports/tcp.c:789
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:798
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transports/tcp.c:595
+#: src/transports/tcp.c:799
 msgid "# bytes sent via TCP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transports/tcp.c:597
+#: src/transports/tcp.c:801
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transports/udp.c:302
-msgid "UDP: Could not determine my public IP address.\n"
-msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+#: src/transports/udp.c:107
+#, fuzzy
+msgid "Received malformed message via UDP. Ignored.\n"
+msgstr ""
+"Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
 
-#: src/transports/udp.c:401
-#, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
+#: src/transports/udp.c:525
+#, fuzzy, c-format
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
-"Eine Nachricht der Größe %d konnte nicht per UDP an %u.%u.%u.%u:%u versendet "
-"werden: %s\n"
+"MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
+"implementiert!)\n"
 
-#: src/transports/udp.c:560
+#: src/transports/udp.c:547
 msgid "# bytes received via UDP"
 msgstr "# Bytes empfangen über UDP"
 
-#: src/transports/udp.c:561
+#: src/transports/udp.c:548
 msgid "# bytes sent via UDP"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transports/udp.c:563
+#: src/transports/udp.c:550
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/transports/udp.c:565
+#: src/transports/udp.c:552
 msgid "# UDP connections (right now)"
 msgstr ""
 
-#: src/transports/udp_helper.c:96
-#, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr ""
-"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
-"u) empfangen. Verbindung wird geschlossen.\n"
-
 #: src/setup/ncurses/mconf.c:86
 msgid "Exit"
 msgstr ""
@@ -334,7 +256,7 @@
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:528
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "GNUnet Konfiguration"
@@ -663,26 +585,26 @@
 msgid "Unable to save configuration file `%s':"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/setup/ncurses/wizard_curs.c:464
+#: src/setup/ncurses/wizard_curs.c:465
 #, fuzzy
 msgid "Unable to create user account for daemon."
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/setup/ncurses/wizard_curs.c:471
+#: src/setup/ncurses/wizard_curs.c:472
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:486
+#: src/setup/ncurses/wizard_curs.c:487
 #, fuzzy
 msgid "Save configuration?"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:487
+#: src/setup/ncurses/wizard_curs.c:488
 #, fuzzy
 msgid "Save configuration now?"
 msgstr "GNUnet Konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/ncurses/wizard_curs.c:532 src/setup/gtk/gnunet-setup.glade:723
 #: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
 msgid "Back"
 msgstr "Zurück"
@@ -1056,12 +978,6 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Fehler: Dienst konnte nicht gelöscht werden: %s\n"
 
-#: src/applications/dht/tools/dhttest.c:51
-#: src/applications/dht/tools/dhttest2.c:43
-#: src/applications/dht/module/table.c:758
-msgid "# dht connections"
-msgstr ""
-
 #: src/applications/dht/tools/dht-query.c:52
 #, fuzzy
 msgid "Query (get KEY, put KEY VALUE) DHT table."
@@ -1154,6 +1070,10 @@
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr "`%s' registriert Handler %d %d %d\n"
 
+#: src/applications/dht/module/table.c:758
+msgid "# dht connections"
+msgstr ""
+
 #: src/applications/dht/module/table.c:760
 #, fuzzy
 msgid "# dht discovery messages received"
@@ -1324,7 +1244,7 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:113
+#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:116
 #: src/applications/stats/gnunet-stats.c:121
 #: src/applications/tbench/gnunet-tbench.c:126
 #: src/applications/tracekit/gnunet-tracekit.c:352
@@ -1571,7 +1491,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:132
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
@@ -1954,23 +1874,15 @@
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-search.c:135
 msgid "Search GNUnet for files."
 msgstr "Das GNUnet nach Dateien durchsuchen."
 
-#: src/applications/fs/tools/gnunet-search.c:143
-msgid "exit after receiving LIMIT results"
-msgstr "Abbrechen, nachdem LIMIT Ergebnisse empfangen wurden"
-
-#: src/applications/fs/tools/gnunet-search.c:146
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Begegnete (entschlüsselte) Suchergebnisse in FILENAME schreiben"
 
-#: src/applications/fs/tools/gnunet-search.c:149
-msgid "wait DELAY seconds for search results before aborting"
-msgstr "TIMEOUT Sekunden auf Suchergebnisse warten, bevor abgebrochen wird"
-
-#: src/applications/fs/tools/gnunet-search.c:186
+#: src/applications/fs/tools/gnunet-search.c:176
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
@@ -2114,23 +2026,12 @@
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/fsui/deserialize.c:772
+#: src/applications/fs/fsui/deserialize.c:770
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
 
-#: src/applications/fs/fsui/searchtest.c:154
-#: src/applications/fs/fsui/fsuitest.c:173
-#: src/applications/fs/fsui/downloadtest.c:289
-#: src/applications/fs/fsui/serializetest2.c:391
-#: src/applications/fs/fsui/serializetest3.c:163
-#: src/applications/fs/fsui/serializetest4.c:358
-#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
-#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
-msgid "AND"
-msgstr "UND"
-
-#: src/applications/fs/fsui/search.c:241
+#: src/applications/fs/fsui/search.c:240
 msgid "Error running search (no reason given)."
 msgstr "Das Starten der Suche schlug fehl (Ursache unbekannt)."
 
@@ -2165,7 +2066,7 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Write(%d, %p, %d) schlug fehl: %s\n"
 
-#: src/applications/fs/ecrs/download.c:646
+#: src/applications/fs/ecrs/download.c:647
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2178,41 +2079,46 @@
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/applications/fs/ecrs/upload.c:156
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr "UND"
+
+#: src/applications/fs/ecrs/upload.c:153
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:161
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Die Größe der Datei `%s' konnte nicht ermittelt werden"
 
-#: src/applications/fs/ecrs/upload.c:173
+#: src/applications/fs/ecrs/upload.c:170
 msgid "Failed to connect to gnunetd."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/applications/fs/ecrs/upload.c:185
+#: src/applications/fs/ecrs/upload.c:182
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:204
+#: src/applications/fs/ecrs/upload.c:201
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Initialisierung der Indizierung der Datei `%s' fehlgeschlagen.\n"
 
-#: src/applications/fs/ecrs/upload.c:212
+#: src/applications/fs/ecrs/upload.c:209
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/applications/fs/ecrs/upload.c:309
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
@@ -2237,7 +2143,7 @@
 
 #: src/applications/fs/ecrs/namespace.c:339
 #: src/applications/fs/ecrs/namespace.c:420
-#: src/applications/fs/ecrs/namespace.c:571
+#: src/applications/fs/ecrs/namespace.c:572
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
@@ -2248,8 +2154,8 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:583
-#: src/applications/fs/ecrs/namespace.c:594
+#: src/applications/fs/ecrs/namespace.c:584
+#: src/applications/fs/ecrs/namespace.c:595
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Format der Datei `%s' ist ungültig.\n"
@@ -2295,17 +2201,17 @@
 #: src/applications/sqstore_mysql/mysql.c:582
 #: src/applications/sqstore_mysql/mysql.c:680
 #: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:706
-#: src/applications/sqstore_mysql/mysql.c:721
-#: src/applications/sqstore_mysql/mysql.c:821
-#: src/applications/sqstore_mysql/mysql.c:836
-#: src/applications/sqstore_mysql/mysql.c:988
-#: src/applications/sqstore_mysql/mysql.c:1000
-#: src/applications/sqstore_mysql/mysql.c:1012
-#: src/applications/sqstore_mysql/mysql.c:1260
-#: src/applications/sqstore_mysql/mysql.c:1272
-#: src/applications/sqstore_mysql/mysql.c:1284
-#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/sqstore_mysql/mysql.c:707
+#: src/applications/sqstore_mysql/mysql.c:722
+#: src/applications/sqstore_mysql/mysql.c:822
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1001
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1264
+#: src/applications/sqstore_mysql/mysql.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1288
+#: src/applications/sqstore_mysql/mysql.c:1373
 #: src/applications/dstore_mysql/dstore_mysql.c:107
 #: src/applications/dstore_mysql/dstore_mysql.c:114
 #: src/applications/dstore_mysql/dstore_mysql.c:286
@@ -2335,14 +2241,6 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/applications/advertising/advertising_test.c:47
-#: src/applications/session/sessiontest_http.c:40
-#: src/applications/session/sessiontest.c:40
-#: src/applications/session/sessiontest2.c:40
-#: src/applications/stats/statistics.c:233
-msgid "# of connected peers"
-msgstr "# verbundener Knoten"
-
 #: src/applications/advertising/advertising.c:194
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
@@ -2436,7 +2334,7 @@
 msgstr "# Klartext PING Nachrichten gesendet"
 
 #: src/applications/advertising/advertising.c:929
-#: src/applications/session/connect.c:974
+#: src/applications/session/connect.c:945
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
@@ -2448,33 +2346,29 @@
 "Stellt sicher, dass dieser Knoten anderen Knoten bekannt ist und entdeckt "
 "andere Knoten"
 
-#: src/applications/chat/chat.c:95
-msgid "Message received from peer is invalid.\n"
-msgstr "Empfangene Nachricht ist ungültig.\n"
-
-#: src/applications/chat/chat.c:144
+#: src/applications/chat/chat.c:106 src/applications/chat/chat.c:187
 msgid "Message received from client is invalid\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/applications/chat/chat.c:165
+#: src/applications/chat/chat.c:226
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
-#: src/applications/chat/chat.c:171
+#: src/applications/chat/chat.c:232
 #, c-format
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Jetzt sind %d von %d auf diesem Knoten.\n"
 
-#: src/applications/chat/chat.c:211
+#: src/applications/chat/chat.c:272
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "`%s' registriert Handler %d und %d\n"
 
-#: src/applications/chat/chat.c:230
+#: src/applications/chat/chat.c:291
 msgid "enables P2P-chat (incomplete)"
 msgstr "Ermöglicht P2P-Chat"
 
-#: src/applications/chat/clientapi.c:119 src/applications/chat/clientapi.c:197
+#: src/applications/chat/clientapi.c:122 src/applications/chat/clientapi.c:216
 #, fuzzy, c-format
 msgid "Error writing to socket.\n"
 msgstr "Fehler beim Anlegen des Benutzers"
@@ -2491,17 +2385,17 @@
 msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:147
+#: src/applications/chat/gnunet-chat.c:146
 #, fuzzy, c-format
 msgid "You must specify a nickname\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/applications/chat/gnunet-chat.c:157
+#: src/applications/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid "Failed to join the room\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/applications/chat/gnunet-chat.c:182
+#: src/applications/chat/gnunet-chat.c:181
 #, fuzzy, c-format
 msgid "Failed to send message.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
@@ -2526,13 +2420,13 @@
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1399
-#: src/applications/sqstore_mysql/mysql.c:1483
+#: src/applications/sqstore_sqlite/sqlite.c:1401
+#: src/applications/sqstore_mysql/mysql.c:1487
 msgid "# bytes in datastore"
 msgstr "# bytes in der Datenbank"
 
 #: src/applications/pingpong/pingpong.c:134
-#: src/applications/pingpong/pingpong.c:206
+#: src/applications/pingpong/pingpong.c:204
 #: src/applications/pingpong/pingpong.c:274
 #: src/applications/pingpong/pingpong.c:346
 #, c-format
@@ -2543,8 +2437,9 @@
 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:217
-msgid "Received PING not destined for us!\n"
+#: src/applications/pingpong/pingpong.c:216
+#, fuzzy, c-format
+msgid "Received PING from `%s' not destined for us!\n"
 msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
 
 #: src/applications/pingpong/pingpong.c:316
@@ -2579,12 +2474,12 @@
 msgstr "# PING Nachrichten erstellt"
 
 #: src/applications/pingpong/pingpong.c:527
-#: src/applications/session/connect.c:968
+#: src/applications/session/connect.c:939
 msgid "# encrypted PONG messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
 #: src/applications/pingpong/pingpong.c:531
-#: src/applications/session/connect.c:966
+#: src/applications/session/connect.c:937
 msgid "# encrypted PING messages sent"
 msgstr "# verschlüsselter PING Nachrichten gesendet"
 
@@ -2603,47 +2498,46 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "`%s' registriert Handler %d %d (Plaintext und Ciphertext)\n"
 
-#: src/applications/session/connect.c:260
-#: src/applications/session/connect.c:279
+#: src/applications/session/connect.c:235
 #, 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:323
+#: src/applications/session/connect.c:279
 #, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 "Sitzungsschlüssel kann nicht verschlüsselt werden, Knoten `%s' ist uns nicht "
 "bekannt!\n"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:496
 #, fuzzy, c-format
 msgid "Could not create any HELLO for myself (have transports `%s')!\n"
 msgstr "Hostkey konnte nicht erzeugt werden!\n"
 
-#: src/applications/session/connect.c:627
+#: src/applications/session/connect.c:605
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Empfangene Nachricht ist ungültig.\n"
 
-#: src/applications/session/connect.c:661
+#: src/applications/session/connect.c:639
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "Empfangene Nachricht ist ungültig.\n"
 
-#: src/applications/session/connect.c:695
+#: src/applications/session/connect.c:668
 #, 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:706
+#: src/applications/session/connect.c:680
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 "setkey `%s' von `%s' hat eine ungültige CRC Prüfsumme (tatsächlich: %u, "
 "erwartet: %u).\n"
 
-#: src/applications/session/connect.c:776
+#: src/applications/session/connect.c:742
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
@@ -2652,24 +2546,24 @@
 "Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
 "Nachrichtenteilgröße ist ungültig.\n"
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:755
 #, fuzzy, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr "Unbekannter Typ in engebetteter Nachricht: %u (%u bytes)\n"
 
-#: src/applications/session/connect.c:958
+#: src/applications/session/connect.c:929
 msgid "# session keys sent"
 msgstr "# Sitzungsschlüssel gesendet"
 
-#: src/applications/session/connect.c:960
+#: src/applications/session/connect.c:931
 msgid "# session keys rejected"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/applications/session/connect.c:962
+#: src/applications/session/connect.c:933
 msgid "# session keys accepted"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/applications/session/connect.c:964
+#: src/applications/session/connect.c:935
 msgid "# sessions established"
 msgstr "# Sitzungen aufgebaut"
 
@@ -2679,20 +2573,20 @@
 msgid "`%s' failed at %s:%d with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1388
+#: src/applications/sqstore_mysql/mysql.c:1392
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1508
-#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/sqstore_mysql/mysql.c:1512
+#: src/applications/sqstore_mysql/mysql.c:1665
 #: src/applications/dstore_mysql/dstore_mysql.c:627
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1535
-#: src/applications/sqstore_mysql/mysql.c:1686
+#: src/applications/sqstore_mysql/mysql.c:1539
+#: src/applications/sqstore_mysql/mysql.c:1690
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -2928,6 +2822,10 @@
 msgid "% of allowed io load"
 msgstr "% of allowed cpu load"
 
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr "# verbundener Knoten"
+
 #: src/applications/stats/statistics.c:235
 msgid "# bytes of noise received"
 msgstr "# Bytes Rauschen empfangen"
@@ -3080,35 +2978,6 @@
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr "Ermöglicht das Untersuchen direkter Peer-to-Peer Verbindungen"
 
-#: src/applications/tbench/tbenchtest.c:53
-#, c-format
-msgid "Using %u messages of size %u for %u times.\n"
-msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
-
-#: src/applications/tbench/tbenchtest.c:85
-#, c-format
-msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
-msgstr "Zeiten:   Max %16llu  Min %16llu  Mittel %12.3f  Varianz %12.3f\n"
-
-#: src/applications/tbench/tbenchtest.c:89
-#, c-format
-msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
-msgstr "Verloren:  Max %16u  Min %16u  Mittel %12.3f  Varianz %12.3f\n"
-
-#: src/applications/tbench/tbenchtest.c:95
-#, c-format
-msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
-msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
-
-#: src/applications/tbench/tbenchtest.c:151
-#, c-format
-msgid "Running benchmark...\n"
-msgstr "Benchmark läuft...\n"
-
 #: src/applications/tracekit/gnunet-tracekit.c:104
 #, c-format
 msgid "`%s' connected to `%s'.\n"
@@ -3212,7 +3081,7 @@
 msgid "# bytes received in plaintext of type %d"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/applications/traffic/traffic.c:650
+#: src/applications/traffic/traffic.c:652
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
@@ -3760,7 +3629,7 @@
 "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
 "u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/util/network/select.c:483
+#: src/util/network/select.c:489
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
@@ -3792,6 +3661,11 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
+#: src/util/network/io.c:86
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
+
 #: src/util/network/ip.c:209
 #, fuzzy, c-format
 msgid ""
@@ -4393,14 +4267,14 @@
 #: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
-"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
+"available transports are udp, tcp, http, smtp and nat.\n"
 "\t\t\n"
 "Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes "
 "that cannot directly be reached from the outside.  Peers that are NOT behind "
 "a NAT box and that want to *allow* peers that ARE behind a NAT box to "
 "connect must ALSO load the 'nat' module.  Note that the actual transfer will "
 "always be via tcp initiated by the peer behind the NAT box.  The nat "
-"transport requires the use of tcp, http, smtp and/or tcp6 in addition to nat "
+"transport requires the use of tcp, http and/or smtp in addition to nat "
 "itself."
 msgstr ""
 
@@ -4771,8 +4645,8 @@
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
-#: contrib/config-daemon.scm:1091
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:966
+#: contrib/config-daemon.scm:1116
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
@@ -4784,26 +4658,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1115
-#: contrib/config-daemon.scm:1170 contrib/config-daemon.scm:1235
-msgid "Which IPs are not allowed to connect?"
+#: contrib/config-daemon.scm:887
+msgid "Which IP(v4)s are not allowed to connect?"
 msgstr ""
 
 #: contrib/config-daemon.scm:899
 msgid ""
-"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
-"network interface."
+"Which IP(v4)s are allowed to connect? Leave empty to use the IP of your "
+"primary network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:911 contrib/config-daemon.scm:1164
+msgid "Which IPv6s are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:923 contrib/config-daemon.scm:1176
+msgid ""
+"Which IPv6s are allowed to connect? Leave empty to allow any IP to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:936
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:929
+#: contrib/config-daemon.scm:954
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1092
+#: contrib/config-daemon.scm:967 contrib/config-daemon.scm:1117
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -4811,11 +4693,11 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:953
+#: contrib/config-daemon.scm:978
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:954
+#: contrib/config-daemon.scm:979
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4823,139 +4705,118 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:965
+#: contrib/config-daemon.scm:990
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1009
 msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1021
 msgid ""
 "What is the maximum number of e-mails that gnunetd would be allowed to send "
 "per hour?"
 msgstr ""
 
-#: contrib/config-daemon.scm:997
+#: contrib/config-daemon.scm:1022
 msgid "Use 0 for unlimited"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1033
 msgid "Which e-mail address should be used to send e-mail to this peer?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1009
+#: contrib/config-daemon.scm:1034
 msgid ""
 "You must make sure that e-mail received at this address is forwarded to the "
 "PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
 "procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1045
 msgid ""
 "Which header line should other peers include in e-mails to enable filtering?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1046
 msgid ""
 "You can specify a header line here which can then be used by procmail to "
 "filter GNUnet e-mail from your inbox and forward it to gnunetd."
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1057
 msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1058
 msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
 msgstr ""
 
-#: contrib/config-daemon.scm:1044
+#: contrib/config-daemon.scm:1069
 msgid "What is the name and port of the server for outgoing e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1070
 msgid "The basic format is HOSTNAME:PORT."
 msgstr ""
 
-#: contrib/config-daemon.scm:1056
+#: contrib/config-daemon.scm:1081
 msgid "SMTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1079
+#: contrib/config-daemon.scm:1104
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1103
+#: contrib/config-daemon.scm:1128
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1127
+#: contrib/config-daemon.scm:1140
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1152
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:1139
+#: contrib/config-daemon.scm:1188
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
-msgid "Which port should be used by the TCP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1182 contrib/config-daemon.scm:1247
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
-msgstr ""
-
-#: contrib/config-daemon.scm:1194
-msgid "TCP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1211
-msgid "Which port should be used by the UDP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1223
-msgid "What is the maximum transfer unit for UDP 6?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1259
-msgid "UDP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1277
+#: contrib/config-daemon.scm:1210
 #, fuzzy
 msgid "Network interface"
 msgstr "Netzwerkgerät:"
 
-#: contrib/config-daemon.scm:1289
+#: contrib/config-daemon.scm:1222
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1301
+#: contrib/config-daemon.scm:1234
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1313
+#: contrib/config-daemon.scm:1246
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1337
+#: contrib/config-daemon.scm:1268
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1349
+#: contrib/config-daemon.scm:1280
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1361
+#: contrib/config-daemon.scm:1292
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1363
+#: contrib/config-daemon.scm:1294
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4965,11 +4826,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1374
+#: contrib/config-daemon.scm:1305
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1376
+#: contrib/config-daemon.scm:1307
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4979,36 +4840,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1387
+#: contrib/config-daemon.scm:1318
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1388
+#: contrib/config-daemon.scm:1319
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1399
+#: contrib/config-daemon.scm:1330
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1400
+#: contrib/config-daemon.scm:1331
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1411
+#: contrib/config-daemon.scm:1342
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1423
+#: contrib/config-daemon.scm:1354
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1425
+#: contrib/config-daemon.scm:1356
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -5053,12 +4914,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1442
+#: contrib/config-daemon.scm:1373
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Netzwerkgerät:"
 
-#: contrib/config-daemon.scm:1443
+#: contrib/config-daemon.scm:1374
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -5069,12 +4930,12 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1454
+#: contrib/config-daemon.scm:1385
 #, fuzzy
 msgid "Load management"
 msgstr "Ungültige Kommandozeilen Parameter.\n"
 
-#: contrib/config-daemon.scm:1479 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1410 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5863,27 +5724,27 @@
 msgid "Not for English ;-)"
 msgstr "Nils Durner and Christian Grothoff"
 
-#: src/applications/fs/gap/fs.c:704
+#: src/applications/fs/gap/fs.c:735
 msgid "# gap requests total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/applications/fs/gap/fs.c:706
+#: src/applications/fs/gap/fs.c:737
 #, fuzzy
 msgid "# gap content total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/applications/fs/gap/fs.c:708
+#: src/applications/fs/gap/fs.c:739
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:736
+#: src/applications/fs/gap/fs.c:767
 #, fuzzy, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
 "d\n"
 msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
 msgid "enables (anonymous) file-sharing"
 msgstr "Ermöglicht (anonymes) Filesharing"
 
@@ -5895,20 +5756,20 @@
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/fs/gap/fs_dht.c:261
+#: src/applications/fs/gap/fs_dht.c:257
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:348
+#: src/applications/fs/gap/migration.c:354
 msgid "# blocks migrated"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/gap/migration.c:350
+#: src/applications/fs/gap/migration.c:356
 #, fuzzy
 msgid "# blocks fetched for migration"
 msgstr "# Blöcke migriert"
 
-#: src/applications/fs/gap/migration.c:353
+#: src/applications/fs/gap/migration.c:359
 msgid "# on-demand block migration attempts"
 msgstr ""
 
@@ -5923,11 +5784,11 @@
 "aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
 "löschen, da Ihr Index nun ungültige Referenzen enthält!\n"
 
-#: src/applications/fs/gap/ondemand.c:454
+#: src/applications/fs/gap/ondemand.c:452
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/gap/ondemand.c:566
+#: src/applications/fs/gap/ondemand.c:568
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -5939,6 +5800,103 @@
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
+#~ msgid "Could not determine my public IPv6 address.\n"
+#~ msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
+
+#~ msgid "`%s': unknown service: %s\n"
+#~ msgstr "`%s': unbekannter Dienst: %s\n"
+
+#~ msgid "Failed to start transport service on port %d.\n"
+#~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#, fuzzy
+#~ msgid "# bytes received via TCP6"
+#~ msgstr "# Bytes empfangen über TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via TCP6"
+#~ msgstr "# Bytes gesendet über TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by TCP6 (outgoing)"
+#~ msgstr "# Bytes verworfen von TCP (ausgehend)"
+
+#~ msgid "UDP6: Could not determine my public IPv6 address.\n"
+#~ msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
+
+#, fuzzy
+#~ msgid "# bytes received via UDP6"
+#~ msgstr "# Bytes empfangen über UDP"
+
+#, fuzzy
+#~ msgid "# bytes sent via UDP6"
+#~ msgstr "# Bytes gesendet über UDP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by UDP6 (outgoing)"
+#~ msgstr "# Bytes verworfen von UDP (outgoing)"
+
+#, fuzzy
+#~ msgid "Received malformed message instead of welcome message. Closing.\n"
+#~ msgstr ""
+#~ "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe "
+#~ "%u) empfangen. Verbindung wird geschlossen.\n"
+
+#, fuzzy
+#~ msgid "Received malformed message from tcp-peer connection. Closing.\n"
+#~ msgstr ""
+#~ "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe "
+#~ "%u) empfangen. Verbindung wird geschlossen.\n"
+
+#, fuzzy
+#~ msgid "TCP: Could not determine my public IP address.\n"
+#~ msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+
+#~ msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+#~ msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
+
+#~ msgid "UDP: Could not determine my public IP address.\n"
+#~ msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Received malformed message from udp-peer connection. Closing.\n"
+#~ msgstr ""
+#~ "Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe "
+#~ "%u) empfangen. Verbindung wird geschlossen.\n"
+
+#~ msgid "exit after receiving LIMIT results"
+#~ msgstr "Abbrechen, nachdem LIMIT Ergebnisse empfangen wurden"
+
+#~ msgid "wait DELAY seconds for search results before aborting"
+#~ msgstr "TIMEOUT Sekunden auf Suchergebnisse warten, bevor abgebrochen wird"
+
+#~ msgid "Message received from peer is invalid.\n"
+#~ msgstr "Empfangene Nachricht ist ungültig.\n"
+
+#~ msgid "Using %u messages of size %u for %u times.\n"
+#~ msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
+
+#~ msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
+#~ msgstr "Zeiten:   Max %16llu  Min %16llu  Mittel %12.3f  Varianz %12.3f\n"
+
+#~ msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+#~ msgstr "Verloren:  Max %16u  Min %16u  Mittel %12.3f  Varianz %12.3f\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Failed to receive reply from gnunetd.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fehler beim Empfangen der Antwort von gnunetd.\n"
+
+#~ msgid "Running benchmark...\n"
+#~ msgstr "Benchmark läuft...\n"
+
 #~ msgid "GAP received invalid content from `%s'\n"
 #~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2008-02-12 07:33:28 UTC (rev 6262)
+++ GNUnet/po/es.po     2008-02-12 07:42:00 UTC (rev 6263)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-02-07 00:26-0700\n"
+"POT-Creation-Date: 2008-02-12 00:40-0700\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -22,7 +22,7 @@
 #: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
 #: src/transports/http.c:1345 src/transports/http.c:1442
 #: src/transports/http.c:1620 src/transports/http.c:2047
-#: src/transports/http.c:2108 src/applications/bootstrap_http/http.c:123
+#: src/transports/http.c:2097 src/applications/bootstrap_http/http.c:123
 #: src/applications/bootstrap_http/http.c:257
 #: src/applications/bootstrap_http/http.c:274
 #: src/applications/bootstrap_http/http.c:306
@@ -44,130 +44,67 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:77 src/util/network/io.c:86
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
+#: src/transports/ip.c:70 src/transports/ip.c:390
+#, fuzzy, c-format
+msgid "Failed to obtain my (external) %s address!\n"
+msgstr "¡Falló al obtener mi dirección IP (externa)!\n"
+
+#: src/transports/ip.c:238
+#, fuzzy, c-format
+msgid "Could not find IPv6 address of host `%s': %s\n"
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/transports/ip6.c:110 src/util/network/ip.c:88 src/util/network/ip.c:153
+#: src/transports/ip.c:271 src/util/network/ip.c:88 src/util/network/ip.c:153
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/transports/ip6.c:141 src/util/network/ip.c:119
-#: src/util/network/ip.c:239
+#: src/transports/ip.c:302 src/util/network/ip.c:119 src/util/network/ip.c:239
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
-#: src/transports/ip6.c:175
+#: src/transports/ip.c:336
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/transports/ip6.c:229 src/transports/ip.c:61
-#, fuzzy, c-format
-msgid "Failed to obtain my (external) %s address!\n"
-msgstr "¡Falló al obtener mi dirección IP (externa)!\n"
-
-#: src/transports/tcp6.c:249
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "Imposible determinar mi dirección IPv6 pública.\n"
-
-#: src/transports/tcp6.c:317
-#, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "'%s': servicio desconocido: %s\n"
-
-#: src/transports/tcp6.c:420 src/transports/tcp.c:463
-#, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr ""
-
-#: src/transports/tcp6.c:531
-#, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "# bytes recibidos por TCP"
-
-#: src/transports/tcp6.c:532
-#, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "# bytes enviados por TCP"
-
-#: src/transports/tcp6.c:534
-#, fuzzy
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr "# bytes omitidos por TCP (salientes)"
-
-#: src/transports/udp6.c:131 src/transports/udp.c:135
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr ""
-
-#: src/transports/udp6.c:277
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr "UDP6: Imposible determinar mi dirección IPv6 pública.\n"
-
-#: src/transports/udp6.c:494 src/transports/udp.c:544
-#, c-format
-msgid "MTU %llu for `%s' is probably too low!\n"
-msgstr ""
-
-#: src/transports/udp6.c:500
-#, fuzzy
-msgid "# bytes received via UDP6"
-msgstr "# bytes recibidos vía UDP"
-
-#: src/transports/udp6.c:501
-#, fuzzy
-msgid "# bytes sent via UDP6"
-msgstr "# bytes enviados vía UDP"
-
-#: src/transports/udp6.c:503
-#, fuzzy
-msgid "# bytes dropped by UDP6 (outgoing)"
-msgstr "# bytes omitidos por UDP (salientes)"
-
-#: src/transports/udp6.c:505
-msgid "# UDP6 connections (right now)"
-msgstr ""
-
 #: src/transports/http.c:892
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/transports/http.c:2325
+#: src/transports/http.c:2314
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2334
+#: src/transports/http.c:2323
 msgid "# bytes received via HTTP"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/transports/http.c:2335
+#: src/transports/http.c:2324
 msgid "# bytes sent via HTTP"
 msgstr "# bytes mandados vía HTTP"
 
-#: src/transports/http.c:2337
+#: src/transports/http.c:2326
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "#bytes omitidos vía HTTP (salientes)"
 
-#: src/transports/http.c:2338
+#: src/transports/http.c:2327
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2340
+#: src/transports/http.c:2329
 #, fuzzy
 msgid "# HTTP GET received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/http.c:2341
+#: src/transports/http.c:2330
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2343
+#: src/transports/http.c:2332
 #, fuzzy
 msgid "# HTTP PUT received"
 msgstr "# bytes recibidos por TCP"
@@ -212,76 +149,65 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transports/tcp_helper.c:261
-#, fuzzy
-msgid "Received malformed message instead of welcome message. Closing.\n"
-msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+#: src/transports/common.c:369
+#, c-format
+msgid "Port is 0, will only send using %s.\n"
+msgstr ""
 
-#: src/transports/tcp_helper.c:281
+#: src/transports/tcp.c:272 src/transports/tcp.c:291
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgid "Received malformed message via TCP. Closing.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transports/tcp.c:297
-#, fuzzy
-msgid "TCP: Could not determine my public IP address.\n"
-msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
+#: src/transports/tcp.c:707 src/transports/udp.c:458
+#, fuzzy, c-format
+msgid "Failed to bind to %s port %d.\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transports/tcp.c:402
-#, c-format
-msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
-msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
-
-#: src/transports/tcp.c:585
+#: src/transports/tcp.c:789
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:798
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transports/tcp.c:595
+#: src/transports/tcp.c:799
 msgid "# bytes sent via TCP"
 msgstr "# bytes enviados por TCP"
 
-#: src/transports/tcp.c:597
+#: src/transports/tcp.c:801
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transports/udp.c:302
-msgid "UDP: Could not determine my public IP address.\n"
-msgstr "UDP: Imposible determinar mi dirección IP pública.\n"
+#: src/transports/udp.c:107
+#, fuzzy
+msgid "Received malformed message via UDP. Ignored.\n"
+msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transports/udp.c:401
+#: src/transports/udp.c:525
 #, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
-"Falló al mandar el mensaje de tamaño %d a través de UDP a %u.%u.%u.%u:%u: %"
-"s\n"
 
-#: src/transports/udp.c:560
+#: src/transports/udp.c:547
 msgid "# bytes received via UDP"
 msgstr "# bytes recibidos vía UDP"
 
-#: src/transports/udp.c:561
+#: src/transports/udp.c:548
 msgid "# bytes sent via UDP"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transports/udp.c:563
+#: src/transports/udp.c:550
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/transports/udp.c:565
+#: src/transports/udp.c:552
 msgid "# UDP connections (right now)"
 msgstr ""
 
-#: src/transports/udp_helper.c:96
-#, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
-
 #: src/setup/ncurses/mconf.c:86
 msgid "Exit"
 msgstr ""
@@ -319,7 +245,7 @@
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:528
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "Configuración de GNUnet"
@@ -645,26 +571,26 @@
 msgid "Unable to save configuration file `%s':"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/setup/ncurses/wizard_curs.c:464
+#: src/setup/ncurses/wizard_curs.c:465
 #, fuzzy
 msgid "Unable to create user account for daemon."
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/setup/ncurses/wizard_curs.c:471
+#: src/setup/ncurses/wizard_curs.c:472
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:486
+#: src/setup/ncurses/wizard_curs.c:487
 #, fuzzy
 msgid "Save configuration?"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:487
+#: src/setup/ncurses/wizard_curs.c:488
 #, fuzzy
 msgid "Save configuration now?"
 msgstr "Configuración de GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/ncurses/wizard_curs.c:532 src/setup/gtk/gnunet-setup.glade:723
 #: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
 msgid "Back"
 msgstr "Atrás"
@@ -1035,12 +961,6 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Error: imposible borrar el servicio: %s\n"
 
-#: src/applications/dht/tools/dhttest.c:51
-#: src/applications/dht/tools/dhttest2.c:43
-#: src/applications/dht/module/table.c:758
-msgid "# dht connections"
-msgstr ""
-
 #: src/applications/dht/tools/dht-query.c:52
 #, fuzzy
 msgid "Query (get KEY, put KEY VALUE) DHT table."
@@ -1133,6 +1053,10 @@
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr "'%s' registrando manejadores %d %d %d\n"
 
+#: src/applications/dht/module/table.c:758
+msgid "# dht connections"
+msgstr ""
+
 #: src/applications/dht/module/table.c:760
 #, fuzzy
 msgid "# dht discovery messages received"
@@ -1302,7 +1226,7 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:113
+#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:116
 #: src/applications/stats/gnunet-stats.c:121
 #: src/applications/tbench/gnunet-tbench.c:126
 #: src/applications/tracekit/gnunet-tracekit.c:352
@@ -1549,7 +1473,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:132
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
@@ -1923,24 +1847,15 @@
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-search.c:135
 msgid "Search GNUnet for files."
 msgstr "Buscar GNUnet en busca de ficheros."
 
-#: src/applications/fs/tools/gnunet-search.c:143
-msgid "exit after receiving LIMIT results"
-msgstr "sale después de recibir LIMIT resultados"
-
-#: src/applications/fs/tools/gnunet-search.c:146
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "escribe los resultados encontrados (desencriptados) a FILENAME"
 
-#: src/applications/fs/tools/gnunet-search.c:149
-#, fuzzy
-msgid "wait DELAY seconds for search results before aborting"
-msgstr "espera TIMEOUT segundos para buscar resultados después de abortar"
-
-#: src/applications/fs/tools/gnunet-search.c:186
+#: src/applications/fs/tools/gnunet-search.c:176
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
@@ -2087,25 +2002,14 @@
 msgid "Deleted corrupt URI database in `%s'."
 msgstr "Borrada base de datos de URIs corrupta en '%s'."
 
-#: src/applications/fs/fsui/deserialize.c:772
+#: src/applications/fs/fsui/deserialize.c:770
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 "Fichero del estado de FSUI '%s' tiene un error de sintáxis en la asignación %"
 "u.\n"
 
-#: src/applications/fs/fsui/searchtest.c:154
-#: src/applications/fs/fsui/fsuitest.c:173
-#: src/applications/fs/fsui/downloadtest.c:289
-#: src/applications/fs/fsui/serializetest2.c:391
-#: src/applications/fs/fsui/serializetest3.c:163
-#: src/applications/fs/fsui/serializetest4.c:358
-#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
-#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
-msgid "AND"
-msgstr "Y"
-
-#: src/applications/fs/fsui/search.c:241
+#: src/applications/fs/fsui/search.c:240
 #, fuzzy
 msgid "Error running search (no reason given)."
 msgstr "Se produjo un fallo al comenzar la búsqueda. Consulte los logs.\n"
@@ -2142,7 +2046,7 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Escribiendo(%d, %p, %d) se produjo un fallo: %s\n"
 
-#: src/applications/fs/ecrs/download.c:646
+#: src/applications/fs/ecrs/download.c:647
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2154,43 +2058,48 @@
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna clave especificada!\n"
 
-#: src/applications/fs/ecrs/upload.c:156
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr "Y"
+
+#: src/applications/fs/ecrs/upload.c:153
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s' no es un fichero.\n"
 
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:161
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Imposible determinar el tamaño del fichero '%s'"
 
-#: src/applications/fs/ecrs/upload.c:173
+#: src/applications/fs/ecrs/upload.c:170
 msgid "Failed to connect to gnunetd."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/applications/fs/ecrs/upload.c:185
+#: src/applications/fs/ecrs/upload.c:182
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:204
+#: src/applications/fs/ecrs/upload.c:201
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 "Durante la inicialización de la indexación del fichero '%s' se produjo un "
 "fallo.\n"
 
-#: src/applications/fs/ecrs/upload.c:212
+#: src/applications/fs/ecrs/upload.c:209
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Imposible abrir el fichero de configuración '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:309
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
@@ -2212,7 +2121,7 @@
 
 #: src/applications/fs/ecrs/namespace.c:339
 #: src/applications/fs/ecrs/namespace.c:420
-#: src/applications/fs/ecrs/namespace.c:571
+#: src/applications/fs/ecrs/namespace.c:572
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
@@ -2223,8 +2132,8 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/applications/fs/ecrs/namespace.c:583
-#: src/applications/fs/ecrs/namespace.c:594
+#: src/applications/fs/ecrs/namespace.c:584
+#: src/applications/fs/ecrs/namespace.c:595
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
@@ -2269,17 +2178,17 @@
 #: src/applications/sqstore_mysql/mysql.c:582
 #: src/applications/sqstore_mysql/mysql.c:680
 #: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:706
-#: src/applications/sqstore_mysql/mysql.c:721
-#: src/applications/sqstore_mysql/mysql.c:821
-#: src/applications/sqstore_mysql/mysql.c:836
-#: src/applications/sqstore_mysql/mysql.c:988
-#: src/applications/sqstore_mysql/mysql.c:1000
-#: src/applications/sqstore_mysql/mysql.c:1012
-#: src/applications/sqstore_mysql/mysql.c:1260
-#: src/applications/sqstore_mysql/mysql.c:1272
-#: src/applications/sqstore_mysql/mysql.c:1284
-#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/sqstore_mysql/mysql.c:707
+#: src/applications/sqstore_mysql/mysql.c:722
+#: src/applications/sqstore_mysql/mysql.c:822
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1001
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1264
+#: src/applications/sqstore_mysql/mysql.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1288
+#: src/applications/sqstore_mysql/mysql.c:1373
 #: src/applications/dstore_mysql/dstore_mysql.c:107
 #: src/applications/dstore_mysql/dstore_mysql.c:114
 #: src/applications/dstore_mysql/dstore_mysql.c:286
@@ -2309,14 +2218,6 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/applications/advertising/advertising_test.c:47
-#: src/applications/session/sessiontest_http.c:40
-#: src/applications/session/sessiontest.c:40
-#: src/applications/session/sessiontest2.c:40
-#: src/applications/stats/statistics.c:233
-msgid "# of connected peers"
-msgstr "# de pares conectados"
-
 #: src/applications/advertising/advertising.c:194
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
@@ -2405,7 +2306,7 @@
 msgstr "# mensajes de texto mandados por PING"
 
 #: src/applications/advertising/advertising.c:929
-#: src/applications/session/connect.c:974
+#: src/applications/session/connect.c:945
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "'%s' registrando manejador %d (texto plano e hipertexto)\n"
@@ -2416,33 +2317,29 @@
 msgstr ""
 "Asegura que este par es conocido por otros pares y descubre otros pares"
 
-#: src/applications/chat/chat.c:95
-msgid "Message received from peer is invalid.\n"
-msgstr "El mensaje recibido del par es inválido.\n"
-
-#: src/applications/chat/chat.c:144
+#: src/applications/chat/chat.c:106 src/applications/chat/chat.c:187
 msgid "Message received from client is invalid\n"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/applications/chat/chat.c:165
+#: src/applications/chat/chat.c:226
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Número máximo de clientes en el chat alcanzado.\n"
 
-#: src/applications/chat/chat.c:171
+#: src/applications/chat/chat.c:232
 #, c-format
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Ahora hay %d de %d clientes de chat en este nodo.\n"
 
-#: src/applications/chat/chat.c:211
+#: src/applications/chat/chat.c:272
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "'%s' registrando manejadores %d y %d\n"
 
-#: src/applications/chat/chat.c:230
+#: src/applications/chat/chat.c:291
 msgid "enables P2P-chat (incomplete)"
 msgstr "Activa el chat P2P (incompleto)"
 
-#: src/applications/chat/clientapi.c:119 src/applications/chat/clientapi.c:197
+#: src/applications/chat/clientapi.c:122 src/applications/chat/clientapi.c:216
 #, fuzzy, c-format
 msgid "Error writing to socket.\n"
 msgstr "Error creando usuario"
@@ -2459,17 +2356,17 @@
 msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:147
+#: src/applications/chat/gnunet-chat.c:146
 #, fuzzy, c-format
 msgid "You must specify a nickname\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/applications/chat/gnunet-chat.c:157
+#: src/applications/chat/gnunet-chat.c:156
 #, c-format
 msgid "Failed to join the room\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:182
+#: src/applications/chat/gnunet-chat.c:181
 #, fuzzy, c-format
 msgid "Failed to send message.\n"
 msgstr "Falló al entregar el mensaje '%s'.\n"
@@ -2494,13 +2391,13 @@
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:1399
-#: src/applications/sqstore_mysql/mysql.c:1483
+#: src/applications/sqstore_sqlite/sqlite.c:1401
+#: src/applications/sqstore_mysql/mysql.c:1487
 msgid "# bytes in datastore"
 msgstr "# bytes en la base de datos"
 
 #: src/applications/pingpong/pingpong.c:134
-#: src/applications/pingpong/pingpong.c:206
+#: src/applications/pingpong/pingpong.c:204
 #: src/applications/pingpong/pingpong.c:274
 #: src/applications/pingpong/pingpong.c:346
 #, c-format
@@ -2511,8 +2408,9 @@
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "Recibido ping de otro par. Omitiendo.\n"
 
-#: src/applications/pingpong/pingpong.c:217
-msgid "Received PING not destined for us!\n"
+#: src/applications/pingpong/pingpong.c:216
+#, fuzzy, c-format
+msgid "Received PING from `%s' not destined for us!\n"
 msgstr "¡Recibido PING no destinado a nosotros!\n"
 
 #: src/applications/pingpong/pingpong.c:316
@@ -2543,12 +2441,12 @@
 msgstr ""
 
 #: src/applications/pingpong/pingpong.c:527
-#: src/applications/session/connect.c:968
+#: src/applications/session/connect.c:939
 msgid "# encrypted PONG messages sent"
 msgstr ""
 
 #: src/applications/pingpong/pingpong.c:531
-#: src/applications/session/connect.c:966
+#: src/applications/session/connect.c:937
 msgid "# encrypted PING messages sent"
 msgstr ""
 
@@ -2567,45 +2465,44 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "'%s' registrando manejadores %d %d (texto plano e hipertexto)\n"
 
-#: src/applications/session/connect.c:260
-#: src/applications/session/connect.c:279
+#: src/applications/session/connect.c:235
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/applications/session/connect.c:323
+#: src/applications/session/connect.c:279
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:496
 #, fuzzy, c-format
 msgid "Could not create any HELLO for myself (have transports `%s')!\n"
 msgstr "¡Imposible crear la clave local!\n"
 
-#: src/applications/session/connect.c:627
+#: src/applications/session/connect.c:605
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "El mensaje recibido del par es inválido.\n"
 
-#: src/applications/session/connect.c:661
+#: src/applications/session/connect.c:639
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "El mensaje recibido del par es inválido.\n"
 
-#: src/applications/session/connect.c:695
+#: src/applications/session/connect.c:668
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/applications/session/connect.c:706
+#: src/applications/session/connect.c:680
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 "el cambio de clave '%s' de '%s' falló al comprobar el CRC (dio: %u, esperado "
 "%u).\n"
 
-#: src/applications/session/connect.c:776
+#: src/applications/session/connect.c:742
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
@@ -2614,24 +2511,24 @@
 "Error pasando la clave de sesión encriptada, el mensaje dado del tamaño de "
 "las partes es inválido.\n"
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:755
 #, fuzzy, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
 
-#: src/applications/session/connect.c:958
+#: src/applications/session/connect.c:929
 msgid "# session keys sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/applications/session/connect.c:960
+#: src/applications/session/connect.c:931
 msgid "# session keys rejected"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/applications/session/connect.c:962
+#: src/applications/session/connect.c:933
 msgid "# session keys accepted"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/applications/session/connect.c:964
+#: src/applications/session/connect.c:935
 msgid "# sessions established"
 msgstr "# sesiones establecidas"
 
@@ -2641,20 +2538,20 @@
 msgid "`%s' failed at %s:%d with error: %s"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1388
+#: src/applications/sqstore_mysql/mysql.c:1392
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1508
-#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/sqstore_mysql/mysql.c:1512
+#: src/applications/sqstore_mysql/mysql.c:1665
 #: src/applications/dstore_mysql/dstore_mysql.c:627
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1535
-#: src/applications/sqstore_mysql/mysql.c:1686
+#: src/applications/sqstore_mysql/mysql.c:1539
+#: src/applications/sqstore_mysql/mysql.c:1690
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -2887,6 +2784,10 @@
 msgid "% of allowed io load"
 msgstr "% de CPU permitida para el uso"
 
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr "# de pares conectados"
+
 #: src/applications/stats/statistics.c:235
 msgid "# bytes of noise received"
 msgstr "# bytes de ruido recibidos"
@@ -3039,35 +2940,6 @@
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:53
-#, c-format
-msgid "Using %u messages of size %u for %u times.\n"
-msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
-
-#: src/applications/tbench/tbenchtest.c:85
-#, c-format
-msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:89
-#, c-format
-msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:95
-#, c-format
-msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
-msgstr ""
-"\n"
-"Fallo al recibir la respuesta de gnunetd.\n"
-
-#: src/applications/tbench/tbenchtest.c:151
-#, c-format
-msgid "Running benchmark...\n"
-msgstr ""
-
 #: src/applications/tracekit/gnunet-tracekit.c:104
 #, c-format
 msgid "`%s' connected to `%s'.\n"
@@ -3169,7 +3041,7 @@
 msgid "# bytes received in plaintext of type %d"
 msgstr "# bytes recibidos por TCP"
 
-#: src/applications/traffic/traffic.c:650
+#: src/applications/traffic/traffic.c:652
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -3699,7 +3571,7 @@
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/util/network/select.c:483
+#: src/util/network/select.c:489
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
@@ -3731,6 +3603,11 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Formato '%s' erróneo para la red: %s\n"
 
+#: src/util/network/io.c:86
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "Imposible encontrar la IP del host '%s': %s\n"
+
 #: src/util/network/ip.c:209
 #, fuzzy, c-format
 msgid ""
@@ -4330,14 +4207,14 @@
 #: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
-"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
+"available transports are udp, tcp, http, smtp and nat.\n"
 "\t\t\n"
 "Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes "
 "that cannot directly be reached from the outside.  Peers that are NOT behind "
 "a NAT box and that want to *allow* peers that ARE behind a NAT box to "
 "connect must ALSO load the 'nat' module.  Note that the actual transfer will "
 "always be via tcp initiated by the peer behind the NAT box.  The nat "
-"transport requires the use of tcp, http, smtp and/or tcp6 in addition to nat "
+"transport requires the use of tcp, http and/or smtp in addition to nat "
 "itself."
 msgstr ""
 
@@ -4706,8 +4583,8 @@
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
-#: contrib/config-daemon.scm:1091
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:966
+#: contrib/config-daemon.scm:1116
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
@@ -4719,26 +4596,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1115
-#: contrib/config-daemon.scm:1170 contrib/config-daemon.scm:1235
-msgid "Which IPs are not allowed to connect?"
+#: contrib/config-daemon.scm:887
+msgid "Which IP(v4)s are not allowed to connect?"
 msgstr ""
 
 #: contrib/config-daemon.scm:899
 msgid ""
-"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
-"network interface."
+"Which IP(v4)s are allowed to connect? Leave empty to use the IP of your "
+"primary network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:911 contrib/config-daemon.scm:1164
+msgid "Which IPv6s are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:923 contrib/config-daemon.scm:1176
+msgid ""
+"Which IPv6s are allowed to connect? Leave empty to allow any IP to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:936
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:929
+#: contrib/config-daemon.scm:954
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1092
+#: contrib/config-daemon.scm:967 contrib/config-daemon.scm:1117
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -4746,11 +4631,11 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:953
+#: contrib/config-daemon.scm:978
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:954
+#: contrib/config-daemon.scm:979
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4758,139 +4643,118 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:965
+#: contrib/config-daemon.scm:990
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1009
 msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1021
 msgid ""
 "What is the maximum number of e-mails that gnunetd would be allowed to send "
 "per hour?"
 msgstr ""
 
-#: contrib/config-daemon.scm:997
+#: contrib/config-daemon.scm:1022
 msgid "Use 0 for unlimited"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1033
 msgid "Which e-mail address should be used to send e-mail to this peer?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1009
+#: contrib/config-daemon.scm:1034
 msgid ""
 "You must make sure that e-mail received at this address is forwarded to the "
 "PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
 "procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1045
 msgid ""
 "Which header line should other peers include in e-mails to enable filtering?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1046
 msgid ""
 "You can specify a header line here which can then be used by procmail to "
 "filter GNUnet e-mail from your inbox and forward it to gnunetd."
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1057
 msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1058
 msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
 msgstr ""
 
-#: contrib/config-daemon.scm:1044
+#: contrib/config-daemon.scm:1069
 msgid "What is the name and port of the server for outgoing e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1070
 msgid "The basic format is HOSTNAME:PORT."
 msgstr ""
 
-#: contrib/config-daemon.scm:1056
+#: contrib/config-daemon.scm:1081
 msgid "SMTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1079
+#: contrib/config-daemon.scm:1104
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1103
+#: contrib/config-daemon.scm:1128
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1127
+#: contrib/config-daemon.scm:1140
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1152
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:1139
+#: contrib/config-daemon.scm:1188
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
-msgid "Which port should be used by the TCP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1182 contrib/config-daemon.scm:1247
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
-msgstr ""
-
-#: contrib/config-daemon.scm:1194
-msgid "TCP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1211
-msgid "Which port should be used by the UDP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1223
-msgid "What is the maximum transfer unit for UDP 6?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1259
-msgid "UDP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1277
+#: contrib/config-daemon.scm:1210
 #, fuzzy
 msgid "Network interface"
 msgstr "Interfaz de red:"
 
-#: contrib/config-daemon.scm:1289
+#: contrib/config-daemon.scm:1222
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1301
+#: contrib/config-daemon.scm:1234
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1313
+#: contrib/config-daemon.scm:1246
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1337
+#: contrib/config-daemon.scm:1268
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1349
+#: contrib/config-daemon.scm:1280
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1361
+#: contrib/config-daemon.scm:1292
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1363
+#: contrib/config-daemon.scm:1294
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4900,11 +4764,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1374
+#: contrib/config-daemon.scm:1305
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1376
+#: contrib/config-daemon.scm:1307
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4914,36 +4778,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1387
+#: contrib/config-daemon.scm:1318
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1388
+#: contrib/config-daemon.scm:1319
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1399
+#: contrib/config-daemon.scm:1330
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1400
+#: contrib/config-daemon.scm:1331
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1411
+#: contrib/config-daemon.scm:1342
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1423
+#: contrib/config-daemon.scm:1354
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1425
+#: contrib/config-daemon.scm:1356
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -4988,12 +4852,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1442
+#: contrib/config-daemon.scm:1373
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Interfaz de red:"
 
-#: contrib/config-daemon.scm:1443
+#: contrib/config-daemon.scm:1374
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -5004,12 +4868,12 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1454
+#: contrib/config-daemon.scm:1385
 #, fuzzy
 msgid "Load management"
 msgstr "Argumentos en la linea de comandos inválidos.\n"
 
-#: contrib/config-daemon.scm:1479 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1410 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5784,26 +5648,26 @@
 msgid "Not for English ;-)"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:704
+#: src/applications/fs/gap/fs.c:735
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:706
+#: src/applications/fs/gap/fs.c:737
 msgid "# gap content total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:708
+#: src/applications/fs/gap/fs.c:739
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:736
+#: src/applications/fs/gap/fs.c:767
 #, fuzzy, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
 "d\n"
 msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
 msgid "enables (anonymous) file-sharing"
 msgstr "activa la compartición de ficheros anónima"
 
@@ -5815,20 +5679,20 @@
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/fs/gap/fs_dht.c:261
+#: src/applications/fs/gap/fs_dht.c:257
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:348
+#: src/applications/fs/gap/migration.c:354
 msgid "# blocks migrated"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/gap/migration.c:350
+#: src/applications/fs/gap/migration.c:356
 #, fuzzy
 msgid "# blocks fetched for migration"
 msgstr "# blocks migrados"
 
-#: src/applications/fs/gap/migration.c:353
+#: src/applications/fs/gap/migration.c:359
 msgid "# on-demand block migration attempts"
 msgstr ""
 
@@ -5843,11 +5707,11 @@
 "disponible durante tres días.  Por favor, desindexa los ficheros antes de "
 "borrarlos porque eso causa que el índice tenga referencias no válidas.\n"
 
-#: src/applications/fs/gap/ondemand.c:454
+#: src/applications/fs/gap/ondemand.c:452
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/gap/ondemand.c:566
+#: src/applications/fs/gap/ondemand.c:568
 #, fuzzy, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -5858,6 +5722,86 @@
 msgid "Failed to get traffic stats.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
+#~ msgid "Could not determine my public IPv6 address.\n"
+#~ msgstr "Imposible determinar mi dirección IPv6 pública.\n"
+
+#~ msgid "`%s': unknown service: %s\n"
+#~ msgstr "'%s': servicio desconocido: %s\n"
+
+#, fuzzy
+#~ msgid "# bytes received via TCP6"
+#~ msgstr "# bytes recibidos por TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via TCP6"
+#~ msgstr "# bytes enviados por TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by TCP6 (outgoing)"
+#~ msgstr "# bytes omitidos por TCP (salientes)"
+
+#~ msgid "UDP6: Could not determine my public IPv6 address.\n"
+#~ msgstr "UDP6: Imposible determinar mi dirección IPv6 pública.\n"
+
+#, fuzzy
+#~ msgid "# bytes received via UDP6"
+#~ msgstr "# bytes recibidos vía UDP"
+
+#, fuzzy
+#~ msgid "# bytes sent via UDP6"
+#~ msgstr "# bytes enviados vía UDP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by UDP6 (outgoing)"
+#~ msgstr "# bytes omitidos por UDP (salientes)"
+
+#, fuzzy
+#~ msgid "Received malformed message instead of welcome message. Closing.\n"
+#~ msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+
+#, fuzzy
+#~ msgid "Received malformed message from tcp-peer connection. Closing.\n"
+#~ msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+
+#, fuzzy
+#~ msgid "TCP: Could not determine my public IP address.\n"
+#~ msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
+
+#~ msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+#~ msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
+
+#~ msgid "UDP: Could not determine my public IP address.\n"
+#~ msgstr "UDP: Imposible determinar mi dirección IP pública.\n"
+
+#~ msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
+#~ msgstr ""
+#~ "Falló al mandar el mensaje de tamaño %d a través de UDP a %u.%u.%u.%u:%u: "
+#~ "%s\n"
+
+#, fuzzy
+#~ msgid "Received malformed message from udp-peer connection. Closing.\n"
+#~ msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+
+#~ msgid "exit after receiving LIMIT results"
+#~ msgstr "sale después de recibir LIMIT resultados"
+
+#, fuzzy
+#~ msgid "wait DELAY seconds for search results before aborting"
+#~ msgstr "espera TIMEOUT segundos para buscar resultados después de abortar"
+
+#~ msgid "Message received from peer is invalid.\n"
+#~ msgstr "El mensaje recibido del par es inválido.\n"
+
+#~ msgid "Using %u messages of size %u for %u times.\n"
+#~ msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Failed to receive reply from gnunetd.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fallo al recibir la respuesta de gnunetd.\n"
+
 #~ msgid "GAP received invalid content from `%s'\n"
 #~ msgstr "GAP recibido contenido no válido de '%s'\n"
 

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2008-02-12 07:33:28 UTC (rev 6262)
+++ GNUnet/po/rw.po     2008-02-12 07:42:00 UTC (rev 6263)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-02-07 00:26-0700\n"
+"POT-Creation-Date: 2008-02-12 00:40-0700\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -28,7 +28,7 @@
 #: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
 #: src/transports/http.c:1345 src/transports/http.c:1442
 #: src/transports/http.c:1620 src/transports/http.c:2047
-#: src/transports/http.c:2108 src/applications/bootstrap_http/http.c:123
+#: src/transports/http.c:2097 src/applications/bootstrap_http/http.c:123
 #: src/applications/bootstrap_http/http.c:257
 #: src/applications/bootstrap_http/http.c:274
 #: src/applications/bootstrap_http/http.c:306
@@ -50,133 +50,70 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:77 src/util/network/io.c:86
+#: src/transports/ip.c:70 src/transports/ip.c:390
+#, c-format
+msgid "Failed to obtain my (external) %s address!\n"
+msgstr ""
+
+#: src/transports/ip.c:238
 #, fuzzy, c-format
-msgid "Could not find IP of host `%s': %s\n"
+msgid "Could not find IPv6 address of host `%s': %s\n"
 msgstr "OYA Gushaka Bya Ubuturo"
 
-#: src/transports/ip6.c:110 src/util/network/ip.c:88 src/util/network/ip.c:153
+#: src/transports/ip.c:271 src/util/network/ip.c:88 src/util/network/ip.c:153
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr "urusobe in Iboneza Icyiciro"
 
-#: src/transports/ip6.c:141 src/util/network/ip.c:119
-#: src/util/network/ip.c:239
+#: src/transports/ip.c:302 src/util/network/ip.c:119 src/util/network/ip.c:239
 #, fuzzy, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "OYA kugirango ikoresha"
 
-#: src/transports/ip6.c:175
+#: src/transports/ip.c:336
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "OYA"
 
-#: src/transports/ip6.c:229 src/transports/ip.c:61
-#, c-format
-msgid "Failed to obtain my (external) %s address!\n"
-msgstr ""
-
-#: src/transports/tcp6.c:249
-#, fuzzy
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "OYA Rusange Aderesi"
-
-#: src/transports/tcp6.c:317
-#, fuzzy, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "'%s':Kitazwi Serivisi"
-
-#: src/transports/tcp6.c:420 src/transports/tcp.c:463
-#, fuzzy, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
-
-#: src/transports/tcp6.c:531
-#, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-
-#: src/transports/tcp6.c:532
-#, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "#Bayite Yoherejwe:"
-
-#: src/transports/tcp6.c:534
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr ""
-
-#: src/transports/udp6.c:131 src/transports/udp.c:135
-#, fuzzy, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Kuri Kuri Umuyoboro"
-
-#: src/transports/udp6.c:277
-#, fuzzy
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr "OYA Rusange Aderesi"
-
-#: src/transports/udp6.c:494 src/transports/udp.c:544
-#, fuzzy, c-format
-msgid "MTU %llu for `%s' is probably too low!\n"
-msgstr "kugirango ni Byo hasi OYA"
-
-#: src/transports/udp6.c:500
-#, fuzzy
-msgid "# bytes received via UDP6"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-
-#: src/transports/udp6.c:501
-#, fuzzy
-msgid "# bytes sent via UDP6"
-msgstr "#Bayite Yoherejwe:"
-
-#: src/transports/udp6.c:503
-msgid "# bytes dropped by UDP6 (outgoing)"
-msgstr ""
-
-#: src/transports/udp6.c:505
-msgid "# UDP6 connections (right now)"
-msgstr ""
-
 #: src/transports/http.c:892
 #, fuzzy
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "OYA Rusange Aderesi"
 
-#: src/transports/http.c:2325
+#: src/transports/http.c:2314
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2334
+#: src/transports/http.c:2323
 #, fuzzy
 msgid "# bytes received via HTTP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/http.c:2335
+#: src/transports/http.c:2324
 #, fuzzy
 msgid "# bytes sent via HTTP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/http.c:2337
+#: src/transports/http.c:2326
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/transports/http.c:2338
+#: src/transports/http.c:2327
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2340
+#: src/transports/http.c:2329
 #, fuzzy
 msgid "# HTTP GET received"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/transports/http.c:2341
+#: src/transports/http.c:2330
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2343
+#: src/transports/http.c:2332
 #, fuzzy
 msgid "# HTTP PUT received"
 msgstr "#Bayite Bya BYAKIRIWE"
@@ -223,109 +160,69 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transports/tcp_helper.c:261
-#, fuzzy
-msgid "Received malformed message instead of welcome message. Closing.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza"
+#: src/transports/common.c:369
+#, c-format
+msgid "Port is 0, will only send using %s.\n"
+msgstr ""
 
-#: src/transports/tcp_helper.c:281
+#: src/transports/tcp.c:272 src/transports/tcp.c:291
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza"
+msgid "Received malformed message via TCP. Closing.\n"
+msgstr "Ubutumwa Biturutse Ingano"
 
-#: src/transports/tcp.c:297
-#, fuzzy
-msgid "TCP: Could not determine my public IP address.\n"
-msgstr "OYA Rusange Aderesi"
-
-#: src/transports/tcp.c:402
+#: src/transports/tcp.c:707 src/transports/udp.c:458
 #, fuzzy, c-format
-msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-". Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
+msgid "Failed to bind to %s port %d.\n"
+msgstr "Kuri Kuri Umuyoboro"
 
-#: src/transports/tcp.c:585
+#: src/transports/tcp.c:789
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:798
 #, fuzzy
 msgid "# bytes received via TCP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/tcp.c:595
+#: src/transports/tcp.c:799
 #, fuzzy
 msgid "# bytes sent via TCP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/tcp.c:597
+#: src/transports/tcp.c:801
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:302
+#: src/transports/udp.c:107
 #, fuzzy
-msgid "UDP: Could not determine my public IP address.\n"
-msgstr "OYA Rusange Aderesi"
+msgid "Received malformed message via UDP. Ignored.\n"
+msgstr "Ubutumwa Biturutse Ingano"
 
-#: src/transports/udp.c:401
+#: src/transports/udp.c:525
 #, fuzzy, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-". Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
+msgid "MTU %llu for `%s' is probably too low!\n"
+msgstr "kugirango ni Byo hasi OYA"
 
-#: src/transports/udp.c:560
+#: src/transports/udp.c:547
 #, fuzzy
 msgid "# bytes received via UDP"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/transports/udp.c:561
+#: src/transports/udp.c:548
 #, fuzzy
 msgid "# bytes sent via UDP"
 msgstr "#Bayite Yoherejwe:"
 
-#: src/transports/udp.c:563
+#: src/transports/udp.c:550
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr ""
 
-#: src/transports/udp.c:565
+#: src/transports/udp.c:552
 msgid "# UDP connections (right now)"
 msgstr ""
 
-#: src/transports/udp_helper.c:96
-#, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza"
-
 #: src/setup/ncurses/mconf.c:86
 msgid "Exit"
 msgstr ""
@@ -363,7 +260,7 @@
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:528
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "Umubare Bya Amasubiramo"
@@ -601,24 +498,24 @@
 msgid "Unable to save configuration file `%s':"
 msgstr "OYA Iboneza IDOSIYE"
 
-#: src/setup/ncurses/wizard_curs.c:464
+#: src/setup/ncurses/wizard_curs.c:465
 msgid "Unable to create user account for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:471
+#: src/setup/ncurses/wizard_curs.c:472
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:486
+#: src/setup/ncurses/wizard_curs.c:487
 #, fuzzy
 msgid "Save configuration?"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/setup/ncurses/wizard_curs.c:487
+#: src/setup/ncurses/wizard_curs.c:488
 msgid "Save configuration now?"
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/ncurses/wizard_curs.c:532 src/setup/gtk/gnunet-setup.glade:723
 #: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
 msgid "Back"
 msgstr ""
@@ -985,12 +882,6 @@
 msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest.c:51
-#: src/applications/dht/tools/dhttest2.c:43
-#: src/applications/dht/module/table.c:758
-msgid "# dht connections"
-msgstr ""
-
 #: src/applications/dht/tools/dht-query.c:52
 #, fuzzy
 msgid "Query (get KEY, put KEY VALUE) DHT table."
@@ -1084,6 +975,10 @@
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr ""
 
+#: src/applications/dht/module/table.c:758
+msgid "# dht connections"
+msgstr ""
+
 #: src/applications/dht/module/table.c:760
 #, fuzzy
 msgid "# dht discovery messages received"
@@ -1253,7 +1148,7 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:113
+#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:116
 #: src/applications/stats/gnunet-stats.c:121
 #: src/applications/tbench/gnunet-tbench.c:126
 #: src/applications/tracekit/gnunet-tracekit.c:352
@@ -1501,7 +1396,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:132
 #: src/applications/fs/tools/gnunet-download.c:69
 #, fuzzy
 msgid "set the desired LEVEL of sender-anonymity"
@@ -1897,27 +1792,17 @@
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Oya Ihitamo"
 
-#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-search.c:135
 #, fuzzy
 msgid "Search GNUnet for files."
 msgstr "kugirango Idosiye"
 
-#: src/applications/fs/tools/gnunet-search.c:143
+#: src/applications/fs/tools/gnunet-search.c:139
 #, fuzzy
-msgid "exit after receiving LIMIT results"
-msgstr "Gusohoka Nyuma Ibisubizo ku"
-
-#: src/applications/fs/tools/gnunet-search.c:146
-#, fuzzy
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "Kwandika Gushaka Ibisubizo ku Kuri i IDOSIYE"
 
-#: src/applications/fs/tools/gnunet-search.c:149
-#, fuzzy
-msgid "wait DELAY seconds for search results before aborting"
-msgstr "Tegereza amasogonda kugirango Gushaka Ibisubizo ku Mbere"
-
-#: src/applications/fs/tools/gnunet-search.c:186
+#: src/applications/fs/tools/gnunet-search.c:176
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
@@ -2059,23 +1944,12 @@
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/fsui/deserialize.c:772
+#: src/applications/fs/fsui/deserialize.c:770
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:154
-#: src/applications/fs/fsui/fsuitest.c:173
-#: src/applications/fs/fsui/downloadtest.c:289
-#: src/applications/fs/fsui/serializetest2.c:391
-#: src/applications/fs/fsui/serializetest3.c:163
-#: src/applications/fs/fsui/serializetest4.c:358
-#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
-#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
-msgid "AND"
-msgstr ""
-
-#: src/applications/fs/fsui/search.c:241
+#: src/applications/fs/fsui/search.c:240
 msgid "Error running search (no reason given)."
 msgstr ""
 
@@ -2111,7 +1985,7 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "'%s'%sByanze"
 
-#: src/applications/fs/ecrs/download.c:646
+#: src/applications/fs/ecrs/download.c:647
 #, fuzzy
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
@@ -2123,43 +1997,48 @@
 msgid "No keywords specified!\n"
 msgstr "Amagambo fatizo"
 
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr ""
+
 # 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
-#: src/applications/fs/ecrs/upload.c:156
+#: src/applications/fs/ecrs/upload.c:153
 #, fuzzy, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s'ntabwo ari idosiye"
 
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:161
 #, fuzzy, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:173
+#: src/applications/fs/ecrs/upload.c:170
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Kuri Kwihuza Kuri"
 
-#: src/applications/fs/ecrs/upload.c:185
+#: src/applications/fs/ecrs/upload.c:182
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Ibirimo"
 
-#: src/applications/fs/ecrs/upload.c:204
+#: src/applications/fs/ecrs/upload.c:201
 #, fuzzy, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Bya in IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:212
+#: src/applications/fs/ecrs/upload.c:209
 #, fuzzy, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Kuri Umubarendanga Urutonde Byanze Iyinjizamo"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/applications/fs/ecrs/upload.c:309
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr ""
@@ -2181,7 +2060,7 @@
 
 #: src/applications/fs/ecrs/namespace.c:339
 #: src/applications/fs/ecrs/namespace.c:420
-#: src/applications/fs/ecrs/namespace.c:571
+#: src/applications/fs/ecrs/namespace.c:572
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Idosiye OYA a"
@@ -2192,8 +2071,8 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
 
-#: src/applications/fs/ecrs/namespace.c:583
-#: src/applications/fs/ecrs/namespace.c:594
+#: src/applications/fs/ecrs/namespace.c:584
+#: src/applications/fs/ecrs/namespace.c:595
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Bya ni Sibyo Ijambobanga..."
@@ -2234,17 +2113,17 @@
 #: src/applications/sqstore_mysql/mysql.c:582
 #: src/applications/sqstore_mysql/mysql.c:680
 #: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:706
-#: src/applications/sqstore_mysql/mysql.c:721
-#: src/applications/sqstore_mysql/mysql.c:821
-#: src/applications/sqstore_mysql/mysql.c:836
-#: src/applications/sqstore_mysql/mysql.c:988
-#: src/applications/sqstore_mysql/mysql.c:1000
-#: src/applications/sqstore_mysql/mysql.c:1012
-#: src/applications/sqstore_mysql/mysql.c:1260
-#: src/applications/sqstore_mysql/mysql.c:1272
-#: src/applications/sqstore_mysql/mysql.c:1284
-#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/sqstore_mysql/mysql.c:707
+#: src/applications/sqstore_mysql/mysql.c:722
+#: src/applications/sqstore_mysql/mysql.c:822
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1001
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1264
+#: src/applications/sqstore_mysql/mysql.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1288
+#: src/applications/sqstore_mysql/mysql.c:1373
 #: src/applications/dstore_mysql/dstore_mysql.c:107
 #: src/applications/dstore_mysql/dstore_mysql.c:114
 #: src/applications/dstore_mysql/dstore_mysql.c:286
@@ -2274,15 +2153,6 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/applications/advertising/advertising_test.c:47
-#: src/applications/session/sessiontest_http.c:40
-#: src/applications/session/sessiontest.c:40
-#: src/applications/session/sessiontest2.c:40
-#: src/applications/stats/statistics.c:233
-#, fuzzy
-msgid "# of connected peers"
-msgstr "#Bya"
-
 #: src/applications/advertising/advertising.c:194
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
@@ -2372,7 +2242,7 @@
 msgstr ""
 
 #: src/applications/advertising/advertising.c:929
-#: src/applications/session/connect.c:974
+#: src/applications/session/connect.c:945
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -2382,36 +2252,31 @@
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/chat/chat.c:95
+#: src/applications/chat/chat.c:106 src/applications/chat/chat.c:187
 #, fuzzy
-msgid "Message received from peer is invalid.\n"
-msgstr "BYAKIRIWE Bivuye ni Sibyo"
-
-#: src/applications/chat/chat.c:144
-#, fuzzy
 msgid "Message received from client is invalid\n"
 msgstr "BYAKIRIWE Bivuye Umukiriya ni"
 
-#: src/applications/chat/chat.c:165
+#: src/applications/chat/chat.c:226
 #, fuzzy
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Umubare Bya"
 
-#: src/applications/chat/chat.c:171
+#: src/applications/chat/chat.c:232
 #, fuzzy, c-format
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Bya ku iyi"
 
-#: src/applications/chat/chat.c:211
+#: src/applications/chat/chat.c:272
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:230
+#: src/applications/chat/chat.c:291
 msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/chat/clientapi.c:119 src/applications/chat/clientapi.c:197
+#: src/applications/chat/clientapi.c:122 src/applications/chat/clientapi.c:216
 #, fuzzy, c-format
 msgid "Error writing to socket.\n"
 msgstr "Ivugurura Verisiyo"
@@ -2428,17 +2293,17 @@
 msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:147
+#: src/applications/chat/gnunet-chat.c:146
 #, fuzzy, c-format
 msgid "You must specify a nickname\n"
 msgstr "a Ijambo- banze"
 
-#: src/applications/chat/gnunet-chat.c:157
+#: src/applications/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid "Failed to join the room\n"
 msgstr "Kuri Kuri Umuyoboro"
 
-#: src/applications/chat/gnunet-chat.c:182
+#: src/applications/chat/gnunet-chat.c:181
 #, fuzzy, c-format
 msgid "Failed to send message.\n"
 msgstr "Kuri Kohereza Ubutumwa Kuri"
@@ -2463,14 +2328,14 @@
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1399
-#: src/applications/sqstore_mysql/mysql.c:1483
+#: src/applications/sqstore_sqlite/sqlite.c:1401
+#: src/applications/sqstore_mysql/mysql.c:1487
 #, fuzzy
 msgid "# bytes in datastore"
 msgstr "#Bayite Yoherejwe:"
 
 #: src/applications/pingpong/pingpong.c:134
-#: src/applications/pingpong/pingpong.c:206
+#: src/applications/pingpong/pingpong.c:204
 #: src/applications/pingpong/pingpong.c:274
 #: src/applications/pingpong/pingpong.c:346
 #, fuzzy, c-format
@@ -2482,9 +2347,9 @@
 msgid "Received ping for another peer. Dropping.\n"
 msgstr "kugirango"
 
-#: src/applications/pingpong/pingpong.c:217
-#, fuzzy
-msgid "Received PING not destined for us!\n"
+#: src/applications/pingpong/pingpong.c:216
+#, fuzzy, c-format
+msgid "Received PING from `%s' not destined for us!\n"
 msgstr "OYA kugirango RW"
 
 #: src/applications/pingpong/pingpong.c:316
@@ -2519,13 +2384,13 @@
 msgstr "#Ubutumwa"
 
 #: src/applications/pingpong/pingpong.c:527
-#: src/applications/session/connect.c:968
+#: src/applications/session/connect.c:939
 #, fuzzy
 msgid "# encrypted PONG messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
 
 #: src/applications/pingpong/pingpong.c:531
-#: src/applications/session/connect.c:966
+#: src/applications/session/connect.c:937
 #, fuzzy
 msgid "# encrypted PING messages sent"
 msgstr "#Bishunzwe: Bayite Yoherejwe:"
@@ -2545,67 +2410,66 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:260
-#: src/applications/session/connect.c:279
+#: src/applications/session/connect.c:235
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Urufunguzo Bivuye OYA Byagenzuwe"
 
-#: src/applications/session/connect.c:323
+#: src/applications/session/connect.c:279
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:496
 #, c-format
 msgid "Could not create any HELLO for myself (have transports `%s')!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:627
+#: src/applications/session/connect.c:605
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "'%s'Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:661
+#: src/applications/session/connect.c:639
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr "'%s'Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:695
+#: src/applications/session/connect.c:668
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Ubutumwa BYAKIRIWE Bivuye"
 
-#: src/applications/session/connect.c:706
+#: src/applications/session/connect.c:680
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:776
+#: src/applications/session/connect.c:742
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
 "invalid.\n"
 msgstr "Bishunzwe: Umukoro Urufunguzo Ubutumwa Ingano ni Sibyo"
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:755
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:958
+#: src/applications/session/connect.c:929
 msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/session/connect.c:960
+#: src/applications/session/connect.c:931
 msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/session/connect.c:962
+#: src/applications/session/connect.c:933
 msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/session/connect.c:964
+#: src/applications/session/connect.c:935
 msgid "# sessions established"
 msgstr ""
 
@@ -2615,20 +2479,20 @@
 msgid "`%s' failed at %s:%d with error: %s"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/applications/sqstore_mysql/mysql.c:1388
+#: src/applications/sqstore_mysql/mysql.c:1392
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "'%s'Byanze ku Na: Ikosa"
 
-#: src/applications/sqstore_mysql/mysql.c:1508
-#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/sqstore_mysql/mysql.c:1512
+#: src/applications/sqstore_mysql/mysql.c:1665
 #: src/applications/dstore_mysql/dstore_mysql.c:627
 #, fuzzy, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Kuri Gukoresha IDOSIYE kugirango Iboneza"
 
-#: src/applications/sqstore_mysql/mysql.c:1535
-#: src/applications/sqstore_mysql/mysql.c:1686
+#: src/applications/sqstore_mysql/mysql.c:1539
+#: src/applications/sqstore_mysql/mysql.c:1690
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -2854,6 +2718,11 @@
 msgid "% of allowed io load"
 msgstr "%Bya CPU Ibirimo"
 
+#: src/applications/stats/statistics.c:233
+#, fuzzy
+msgid "# of connected peers"
+msgstr "#Bya"
+
 #: src/applications/stats/statistics.c:235
 #, fuzzy
 msgid "# bytes of noise received"
@@ -3029,33 +2898,6 @@
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:53
-#, c-format
-msgid "Using %u messages of size %u for %u times.\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:85
-#, c-format
-msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:89
-#, c-format
-msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:95
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
-msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
-
-#: src/applications/tbench/tbenchtest.c:151
-#, c-format
-msgid "Running benchmark...\n"
-msgstr ""
-
 #: src/applications/tracekit/gnunet-tracekit.c:104
 #, fuzzy, c-format
 msgid "`%s' connected to `%s'.\n"
@@ -3163,7 +3005,7 @@
 msgid "# bytes received in plaintext of type %d"
 msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/applications/traffic/traffic.c:650
+#: src/applications/traffic/traffic.c:652
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -3718,7 +3560,7 @@
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr "Ubutumwa Bivuye Ukwihuza"
 
-#: src/util/network/select.c:483
+#: src/util/network/select.c:489
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
@@ -3750,6 +3592,11 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Imiterere kugirango urusobe"
 
+#: src/util/network/io.c:86
+#, fuzzy, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "OYA Gushaka Bya Ubuturo"
+
 #: src/util/network/ip.c:209
 #, fuzzy, c-format
 msgid ""
@@ -4366,14 +4213,14 @@
 #: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
-"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
+"available transports are udp, tcp, http, smtp and nat.\n"
 "\t\t\n"
 "Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes "
 "that cannot directly be reached from the outside.  Peers that are NOT behind "
 "a NAT box and that want to *allow* peers that ARE behind a NAT box to "
 "connect must ALSO load the 'nat' module.  Note that the actual transfer will "
 "always be via tcp initiated by the peer behind the NAT box.  The nat "
-"transport requires the use of tcp, http, smtp and/or tcp6 in addition to nat "
+"transport requires the use of tcp, http and/or smtp in addition to nat "
 "itself."
 msgstr ""
 
@@ -4736,8 +4583,8 @@
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
-#: contrib/config-daemon.scm:1091
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:966
+#: contrib/config-daemon.scm:1116
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
@@ -4749,26 +4596,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1115
-#: contrib/config-daemon.scm:1170 contrib/config-daemon.scm:1235
-msgid "Which IPs are not allowed to connect?"
+#: contrib/config-daemon.scm:887
+msgid "Which IP(v4)s are not allowed to connect?"
 msgstr ""
 
 #: contrib/config-daemon.scm:899
 msgid ""
-"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
-"network interface."
+"Which IP(v4)s are allowed to connect? Leave empty to use the IP of your "
+"primary network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:911 contrib/config-daemon.scm:1164
+msgid "Which IPv6s are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:923 contrib/config-daemon.scm:1176
+msgid ""
+"Which IPv6s are allowed to connect? Leave empty to allow any IP to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:936
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:929
+#: contrib/config-daemon.scm:954
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1092
+#: contrib/config-daemon.scm:967 contrib/config-daemon.scm:1117
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -4776,11 +4631,11 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:953
+#: contrib/config-daemon.scm:978
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:954
+#: contrib/config-daemon.scm:979
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4788,138 +4643,117 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:965
+#: contrib/config-daemon.scm:990
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1009
 msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1021
 msgid ""
 "What is the maximum number of e-mails that gnunetd would be allowed to send "
 "per hour?"
 msgstr ""
 
-#: contrib/config-daemon.scm:997
+#: contrib/config-daemon.scm:1022
 msgid "Use 0 for unlimited"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1033
 msgid "Which e-mail address should be used to send e-mail to this peer?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1009
+#: contrib/config-daemon.scm:1034
 msgid ""
 "You must make sure that e-mail received at this address is forwarded to the "
 "PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
 "procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1045
 msgid ""
 "Which header line should other peers include in e-mails to enable filtering?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1046
 msgid ""
 "You can specify a header line here which can then be used by procmail to "
 "filter GNUnet e-mail from your inbox and forward it to gnunetd."
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1057
 msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1058
 msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
 msgstr ""
 
-#: contrib/config-daemon.scm:1044
+#: contrib/config-daemon.scm:1069
 msgid "What is the name and port of the server for outgoing e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1070
 msgid "The basic format is HOSTNAME:PORT."
 msgstr ""
 
-#: contrib/config-daemon.scm:1056
+#: contrib/config-daemon.scm:1081
 msgid "SMTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1079
+#: contrib/config-daemon.scm:1104
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1103
+#: contrib/config-daemon.scm:1128
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1127
+#: contrib/config-daemon.scm:1140
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1152
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:1139
+#: contrib/config-daemon.scm:1188
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
-msgid "Which port should be used by the TCP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1182 contrib/config-daemon.scm:1247
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
-msgstr ""
-
-#: contrib/config-daemon.scm:1194
-msgid "TCP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1211
-msgid "Which port should be used by the UDP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1223
-msgid "What is the maximum transfer unit for UDP 6?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1259
-msgid "UDP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1277
+#: contrib/config-daemon.scm:1210
 msgid "Network interface"
 msgstr ""
 
-#: contrib/config-daemon.scm:1289
+#: contrib/config-daemon.scm:1222
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1301
+#: contrib/config-daemon.scm:1234
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1313
+#: contrib/config-daemon.scm:1246
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1337
+#: contrib/config-daemon.scm:1268
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1349
+#: contrib/config-daemon.scm:1280
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1361
+#: contrib/config-daemon.scm:1292
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1363
+#: contrib/config-daemon.scm:1294
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4929,11 +4763,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1374
+#: contrib/config-daemon.scm:1305
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1376
+#: contrib/config-daemon.scm:1307
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4943,36 +4777,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1387
+#: contrib/config-daemon.scm:1318
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1388
+#: contrib/config-daemon.scm:1319
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1399
+#: contrib/config-daemon.scm:1330
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1400
+#: contrib/config-daemon.scm:1331
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1411
+#: contrib/config-daemon.scm:1342
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1423
+#: contrib/config-daemon.scm:1354
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1425
+#: contrib/config-daemon.scm:1356
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -5017,11 +4851,11 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1442
+#: contrib/config-daemon.scm:1373
 msgid "Network interface to monitor"
 msgstr ""
 
-#: contrib/config-daemon.scm:1443
+#: contrib/config-daemon.scm:1374
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -5032,11 +4866,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1454
+#: contrib/config-daemon.scm:1385
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1479 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1410 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5740,28 +5574,28 @@
 msgid "Not for English ;-)"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:704
+#: src/applications/fs/gap/fs.c:735
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/fs/gap/fs.c:706
+#: src/applications/fs/gap/fs.c:737
 #, fuzzy
 msgid "# gap content total received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/fs/gap/fs.c:708
+#: src/applications/fs/gap/fs.c:739
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:736
+#: src/applications/fs/gap/fs.c:767
 #, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
 "d\n"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -5773,19 +5607,19 @@
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/fs/gap/fs_dht.c:261
+#: src/applications/fs/gap/fs_dht.c:257
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:348
+#: src/applications/fs/gap/migration.c:354
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:350
+#: src/applications/fs/gap/migration.c:356
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:353
+#: src/applications/fs/gap/migration.c:359
 msgid "# on-demand block migration attempts"
 msgstr ""
 
@@ -5797,11 +5631,11 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/gap/ondemand.c:454
+#: src/applications/fs/gap/ondemand.c:452
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/gap/ondemand.c:566
+#: src/applications/fs/gap/ondemand.c:568
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -5813,6 +5647,114 @@
 msgstr "Kuri Ikibazo# Ibyerekeye"
 
 #, fuzzy
+#~ msgid "Could not determine my public IPv6 address.\n"
+#~ msgstr "OYA Rusange Aderesi"
+
+#, fuzzy
+#~ msgid "`%s': unknown service: %s\n"
+#~ msgstr "'%s':Kitazwi Serivisi"
+
+#, fuzzy
+#~ msgid "Failed to start transport service on port %d.\n"
+#~ msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
+
+#, fuzzy
+#~ msgid "# bytes received via TCP6"
+#~ msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#, fuzzy
+#~ msgid "# bytes sent via TCP6"
+#~ msgstr "#Bayite Yoherejwe:"
+
+#, fuzzy
+#~ msgid "UDP6: Could not determine my public IPv6 address.\n"
+#~ msgstr "OYA Rusange Aderesi"
+
+#, fuzzy
+#~ msgid "# bytes received via UDP6"
+#~ msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#, fuzzy
+#~ msgid "# bytes sent via UDP6"
+#~ msgstr "#Bayite Yoherejwe:"
+
+#, fuzzy
+#~ msgid "Received malformed message instead of welcome message. Closing.\n"
+#~ msgstr "Ubutumwa Bivuye Ukwihuza"
+
+#, fuzzy
+#~ msgid "Received malformed message from tcp-peer connection. Closing.\n"
+#~ msgstr "Ubutumwa Bivuye Ukwihuza"
+
+#, fuzzy
+#~ msgid "TCP: Could not determine my public IP address.\n"
+#~ msgstr "OYA Rusange Aderesi"
+
+#, fuzzy
+#~ msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+#~ msgstr ""
+#~ "Project- Id- Version: basctl\n"
+#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+#~ "Content- Type: text/ plain; charset= UTF- 8\n"
+#~ "Content- Transfer- Encoding: 8bit\n"
+#~ "X- Generator: KBabel 1. 0\n"
+#~ ". Project- Id- Version: basctl\n"
+#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+#~ "Content- Type: text/ plain; charset= UTF- 8\n"
+#~ "Content- Transfer- Encoding: 8bit\n"
+#~ "X- Generator: KBabel 1. 0\n"
+#~ "."
+
+#, fuzzy
+#~ msgid "UDP: Could not determine my public IP address.\n"
+#~ msgstr "OYA Rusange Aderesi"
+
+#, fuzzy
+#~ msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
+#~ msgstr ""
+#~ "Project- Id- Version: basctl\n"
+#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+#~ "Content- Type: text/ plain; charset= UTF- 8\n"
+#~ "Content- Transfer- Encoding: 8bit\n"
+#~ "X- Generator: KBabel 1. 0\n"
+#~ ". Project- Id- Version: basctl\n"
+#~ "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+#~ "PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+#~ "Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+#~ "Content- Type: text/ plain; charset= UTF- 8\n"
+#~ "Content- Transfer- Encoding: 8bit\n"
+#~ "X- Generator: KBabel 1. 0\n"
+#~ "."
+
+#, fuzzy
+#~ msgid "Received malformed message from udp-peer connection. Closing.\n"
+#~ msgstr "Ubutumwa Bivuye Ukwihuza"
+
+#, fuzzy
+#~ msgid "exit after receiving LIMIT results"
+#~ msgstr "Gusohoka Nyuma Ibisubizo ku"
+
+#, fuzzy
+#~ msgid "wait DELAY seconds for search results before aborting"
+#~ msgstr "Tegereza amasogonda kugirango Gushaka Ibisubizo ku Mbere"
+
+#, fuzzy
+#~ msgid "Message received from peer is invalid.\n"
+#~ msgstr "BYAKIRIWE Bivuye ni Sibyo"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Failed to receive reply from gnunetd.\n"
+#~ msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
+
+#, fuzzy
 #~ msgid "GAP received invalid content from `%s'\n"
 #~ msgstr "Sibyo Ubutumwa Bivuye"
 

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2008-02-12 07:33:28 UTC (rev 6262)
+++ GNUnet/po/sv.po     2008-02-12 07:42:00 UTC (rev 6263)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-02-07 00:26-0700\n"
+"POT-Creation-Date: 2008-02-12 00:40-0700\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -19,7 +19,7 @@
 #: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
 #: src/transports/http.c:1345 src/transports/http.c:1442
 #: src/transports/http.c:1620 src/transports/http.c:2047
-#: src/transports/http.c:2108 src/applications/bootstrap_http/http.c:123
+#: src/transports/http.c:2097 src/applications/bootstrap_http/http.c:123
 #: src/applications/bootstrap_http/http.c:257
 #: src/applications/bootstrap_http/http.c:274
 #: src/applications/bootstrap_http/http.c:306
@@ -41,132 +41,69 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:77 src/util/network/io.c:86
+#: src/transports/ip.c:70 src/transports/ip.c:390
 #, c-format
-msgid "Could not find IP of host `%s': %s\n"
+msgid "Failed to obtain my (external) %s address!\n"
 msgstr ""
 
-#: src/transports/ip6.c:110 src/util/network/ip.c:88 src/util/network/ip.c:153
+#: src/transports/ip.c:238
 #, fuzzy, c-format
+msgid "Could not find IPv6 address of host `%s': %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/transports/ip.c:271 src/util/network/ip.c:88 src/util/network/ip.c:153
+#, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr ""
 "Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
 "\"!\n"
 
-#: src/transports/ip6.c:141 src/util/network/ip.c:119
-#: src/util/network/ip.c:239
+#: src/transports/ip.c:302 src/util/network/ip.c:119 src/util/network/ip.c:239
 #, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/transports/ip6.c:175
+#: src/transports/ip.c:336
 #, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transports/ip6.c:229 src/transports/ip.c:61
-#, c-format
-msgid "Failed to obtain my (external) %s address!\n"
-msgstr ""
-
-#: src/transports/tcp6.c:249
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
-
-#: src/transports/tcp6.c:317
-#, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "\"%s\": okänd tjänst: %s\n"
-
-#: src/transports/tcp6.c:420 src/transports/tcp.c:463
-#, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr ""
-
-#: src/transports/tcp6.c:531
-#, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "# byte mottogs via TCP"
-
-#: src/transports/tcp6.c:532
-#, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "# byte skickades via TCP"
-
-#: src/transports/tcp6.c:534
-#, fuzzy
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr "# byte kastade via TCP (utgående)"
-
-#: src/transports/udp6.c:131 src/transports/udp.c:135
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/transports/udp6.c:277
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr ""
-
-#: src/transports/udp6.c:494 src/transports/udp.c:544
-#, c-format
-msgid "MTU %llu for `%s' is probably too low!\n"
-msgstr ""
-
-#: src/transports/udp6.c:500
-#, fuzzy
-msgid "# bytes received via UDP6"
-msgstr "# byte mottagna via UDP"
-
-#: src/transports/udp6.c:501
-#, fuzzy
-msgid "# bytes sent via UDP6"
-msgstr "# byte skickade via UDP"
-
-#: src/transports/udp6.c:503
-#, fuzzy
-msgid "# bytes dropped by UDP6 (outgoing)"
-msgstr "# byte kastade via UDP (utgående)"
-
-#: src/transports/udp6.c:505
-msgid "# UDP6 connections (right now)"
-msgstr ""
-
 #: src/transports/http.c:892
 msgid "HTTP: Could not determine my public IP address.\n"
 msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
 
-#: src/transports/http.c:2325
+#: src/transports/http.c:2314
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2334
+#: src/transports/http.c:2323
 msgid "# bytes received via HTTP"
 msgstr "# byte mottagna via HTTP"
 
-#: src/transports/http.c:2335
+#: src/transports/http.c:2324
 msgid "# bytes sent via HTTP"
 msgstr "# byte skickade via HTTP"
 
-#: src/transports/http.c:2337
+#: src/transports/http.c:2326
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte kastade via HTTP (utgående)"
 
-#: src/transports/http.c:2338
+#: src/transports/http.c:2327
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2340
+#: src/transports/http.c:2329
 #, fuzzy
 msgid "# HTTP GET received"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/http.c:2341
+#: src/transports/http.c:2330
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2343
+#: src/transports/http.c:2332
 #, fuzzy
 msgid "# HTTP PUT received"
 msgstr "# byte mottogs via TCP"
@@ -214,74 +151,66 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transports/tcp_helper.c:261
-msgid "Received malformed message instead of welcome message. Closing.\n"
+#: src/transports/common.c:369
+#, c-format
+msgid "Port is 0, will only send using %s.\n"
 msgstr ""
 
-#: src/transports/tcp_helper.c:281
+#: src/transports/tcp.c:272 src/transports/tcp.c:291
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
+msgid "Received malformed message via TCP. Closing.\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/transports/tcp.c:297
-#, fuzzy
-msgid "TCP: Could not determine my public IP address.\n"
-msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
+#: src/transports/tcp.c:707 src/transports/udp.c:458
+#, fuzzy, c-format
+msgid "Failed to bind to %s port %d.\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transports/tcp.c:402
-#, c-format
-msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/transports/tcp.c:585
+#: src/transports/tcp.c:789
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:798
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transports/tcp.c:595
+#: src/transports/tcp.c:799
 msgid "# bytes sent via TCP"
 msgstr "# byte skickades via TCP"
 
-#: src/transports/tcp.c:597
+#: src/transports/tcp.c:801
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transports/udp.c:302
-msgid "UDP: Could not determine my public IP address.\n"
-msgstr ""
+#: src/transports/udp.c:107
+#, fuzzy
+msgid "Received malformed message via UDP. Ignored.\n"
+msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/transports/udp.c:401
+#: src/transports/udp.c:525
 #, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
+msgid "MTU %llu for `%s' is probably too low!\n"
 msgstr ""
 
-#: src/transports/udp.c:560
+#: src/transports/udp.c:547
 msgid "# bytes received via UDP"
 msgstr "# byte mottagna via UDP"
 
-#: src/transports/udp.c:561
+#: src/transports/udp.c:548
 msgid "# bytes sent via UDP"
 msgstr "# byte skickade via UDP"
 
-#: src/transports/udp.c:563
+#: src/transports/udp.c:550
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/transports/udp.c:565
+#: src/transports/udp.c:552
 #, fuzzy
 msgid "# UDP connections (right now)"
 msgstr "Nätverksanslutning"
 
-#: src/transports/udp_helper.c:96
-#, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
-
 #: src/setup/ncurses/mconf.c:86
 msgid "Exit"
 msgstr ""
@@ -319,7 +248,7 @@
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:528
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "GNUnet-konfiguration"
@@ -574,26 +503,26 @@
 msgid "Unable to save configuration file `%s':"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/setup/ncurses/wizard_curs.c:464
+#: src/setup/ncurses/wizard_curs.c:465
 #, fuzzy
 msgid "Unable to create user account for daemon."
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/setup/ncurses/wizard_curs.c:471
+#: src/setup/ncurses/wizard_curs.c:472
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:486
+#: src/setup/ncurses/wizard_curs.c:487
 #, fuzzy
 msgid "Save configuration?"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:487
+#: src/setup/ncurses/wizard_curs.c:488
 #, fuzzy
 msgid "Save configuration now?"
 msgstr "GNUnet-konfiguration"
 
-#: src/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/ncurses/wizard_curs.c:532 src/setup/gtk/gnunet-setup.glade:723
 #: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
 msgid "Back"
 msgstr "Tillbaka"
@@ -960,13 +889,6 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
-#: src/applications/dht/tools/dhttest.c:51
-#: src/applications/dht/tools/dhttest2.c:43
-#: src/applications/dht/module/table.c:758
-#, fuzzy
-msgid "# dht connections"
-msgstr "Nätverksanslutning"
-
 #: src/applications/dht/tools/dht-query.c:52
 msgid "Query (get KEY, put KEY VALUE) DHT table."
 msgstr ""
@@ -1056,6 +978,11 @@
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr "\"%s\" registrerar handtag %d %d %d\n"
 
+#: src/applications/dht/module/table.c:758
+#, fuzzy
+msgid "# dht connections"
+msgstr "Nätverksanslutning"
+
 #: src/applications/dht/module/table.c:760
 #, fuzzy
 msgid "# dht discovery messages received"
@@ -1220,7 +1147,7 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:113
+#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:116
 #: src/applications/stats/gnunet-stats.c:121
 #: src/applications/tbench/gnunet-tbench.c:126
 #: src/applications/tracekit/gnunet-tracekit.c:352
@@ -1467,7 +1394,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:132
 #: src/applications/fs/tools/gnunet-download.c:69
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
@@ -1808,23 +1735,15 @@
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-search.c:135
 msgid "Search GNUnet for files."
 msgstr "Sök GNUnet efter filer."
 
-#: src/applications/fs/tools/gnunet-search.c:143
-msgid "exit after receiving LIMIT results"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:146
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:149
-msgid "wait DELAY seconds for search results before aborting"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:186
+#: src/applications/fs/tools/gnunet-search.c:176
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr ""
@@ -1969,23 +1888,12 @@
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/fsui/deserialize.c:772
+#: src/applications/fs/fsui/deserialize.c:770
 #, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/searchtest.c:154
-#: src/applications/fs/fsui/fsuitest.c:173
-#: src/applications/fs/fsui/downloadtest.c:289
-#: src/applications/fs/fsui/serializetest2.c:391
-#: src/applications/fs/fsui/serializetest3.c:163
-#: src/applications/fs/fsui/serializetest4.c:358
-#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
-#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
-msgid "AND"
-msgstr "OCH"
-
-#: src/applications/fs/fsui/search.c:241
+#: src/applications/fs/fsui/search.c:240
 msgid "Error running search (no reason given)."
 msgstr ""
 
@@ -2020,7 +1928,7 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
 
-#: src/applications/fs/ecrs/download.c:646
+#: src/applications/fs/ecrs/download.c:647
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2032,42 +1940,47 @@
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/applications/fs/ecrs/upload.c:156
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr "OCH"
+
+#: src/applications/fs/ecrs/upload.c:153
 #, c-format
 msgid "`%s' is not a file.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:161
 #, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Kan inte hämta storlek på fil \"%s\""
 
-#: src/applications/fs/ecrs/upload.c:173
+#: src/applications/fs/ecrs/upload.c:170
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/fs/ecrs/upload.c:185
+#: src/applications/fs/ecrs/upload.c:182
 #, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:204
+#: src/applications/fs/ecrs/upload.c:201
 #, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Initiering av indexering av fil \"%s\" misslyckades.\n"
 
-#: src/applications/fs/ecrs/upload.c:212
+#: src/applications/fs/ecrs/upload.c:209
 #, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/applications/fs/ecrs/upload.c:309
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
@@ -2089,7 +2002,7 @@
 
 #: src/applications/fs/ecrs/namespace.c:339
 #: src/applications/fs/ecrs/namespace.c:420
-#: src/applications/fs/ecrs/namespace.c:571
+#: src/applications/fs/ecrs/namespace.c:572
 #, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
@@ -2100,8 +2013,8 @@
 msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/fs/ecrs/namespace.c:583
-#: src/applications/fs/ecrs/namespace.c:594
+#: src/applications/fs/ecrs/namespace.c:584
+#: src/applications/fs/ecrs/namespace.c:595
 #, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Formatet på filen \"%s\" är ogiltig.\n"
@@ -2142,17 +2055,17 @@
 #: src/applications/sqstore_mysql/mysql.c:582
 #: src/applications/sqstore_mysql/mysql.c:680
 #: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:706
-#: src/applications/sqstore_mysql/mysql.c:721
-#: src/applications/sqstore_mysql/mysql.c:821
-#: src/applications/sqstore_mysql/mysql.c:836
-#: src/applications/sqstore_mysql/mysql.c:988
-#: src/applications/sqstore_mysql/mysql.c:1000
-#: src/applications/sqstore_mysql/mysql.c:1012
-#: src/applications/sqstore_mysql/mysql.c:1260
-#: src/applications/sqstore_mysql/mysql.c:1272
-#: src/applications/sqstore_mysql/mysql.c:1284
-#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/sqstore_mysql/mysql.c:707
+#: src/applications/sqstore_mysql/mysql.c:722
+#: src/applications/sqstore_mysql/mysql.c:822
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1001
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1264
+#: src/applications/sqstore_mysql/mysql.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1288
+#: src/applications/sqstore_mysql/mysql.c:1373
 #: src/applications/dstore_mysql/dstore_mysql.c:107
 #: src/applications/dstore_mysql/dstore_mysql.c:114
 #: src/applications/dstore_mysql/dstore_mysql.c:286
@@ -2182,14 +2095,6 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/advertising/advertising_test.c:47
-#: src/applications/session/sessiontest_http.c:40
-#: src/applications/session/sessiontest.c:40
-#: src/applications/session/sessiontest2.c:40
-#: src/applications/stats/statistics.c:233
-msgid "# of connected peers"
-msgstr "# av anslutna parter"
-
 #: src/applications/advertising/advertising.c:194
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
@@ -2268,7 +2173,7 @@
 msgstr "# PING-meddelanden i klartext skickade"
 
 #: src/applications/advertising/advertising.c:929
-#: src/applications/session/connect.c:974
+#: src/applications/session/connect.c:945
 #, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr "\"%s\" registrerar handtag %d (klartext och kryptotext)\n"
@@ -2278,33 +2183,29 @@
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/chat/chat.c:95
-msgid "Message received from peer is invalid.\n"
-msgstr "Meddelande mottaget från motpart är ogiltig.\n"
-
-#: src/applications/chat/chat.c:144
+#: src/applications/chat/chat.c:106 src/applications/chat/chat.c:187
 msgid "Message received from client is invalid\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/applications/chat/chat.c:165
+#: src/applications/chat/chat.c:226
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/applications/chat/chat.c:171
+#: src/applications/chat/chat.c:232
 #, c-format
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Nu är det %d av %d chattklienter på den här noden.\n"
 
-#: src/applications/chat/chat.c:211
+#: src/applications/chat/chat.c:272
 #, c-format
 msgid "`%s' registering handlers %d and %d\n"
 msgstr "\"%s\" registrerar handtagen %d och %d\n"
 
-#: src/applications/chat/chat.c:230
+#: src/applications/chat/chat.c:291
 msgid "enables P2P-chat (incomplete)"
 msgstr "aktiverar P2P-chatt (ej komplett)"
 
-#: src/applications/chat/clientapi.c:119 src/applications/chat/clientapi.c:197
+#: src/applications/chat/clientapi.c:122 src/applications/chat/clientapi.c:216
 #, fuzzy, c-format
 msgid "Error writing to socket.\n"
 msgstr "Fel vid skapandet av användare"
@@ -2321,17 +2222,17 @@
 msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:147
+#: src/applications/chat/gnunet-chat.c:146
 #, fuzzy, c-format
 msgid "You must specify a nickname\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/applications/chat/gnunet-chat.c:157
+#: src/applications/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid "Failed to join the room\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/applications/chat/gnunet-chat.c:182
+#: src/applications/chat/gnunet-chat.c:181
 #, fuzzy, c-format
 msgid "Failed to send message.\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -2356,13 +2257,13 @@
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1399
-#: src/applications/sqstore_mysql/mysql.c:1483
+#: src/applications/sqstore_sqlite/sqlite.c:1401
+#: src/applications/sqstore_mysql/mysql.c:1487
 msgid "# bytes in datastore"
 msgstr ""
 
 #: src/applications/pingpong/pingpong.c:134
-#: src/applications/pingpong/pingpong.c:206
+#: src/applications/pingpong/pingpong.c:204
 #: src/applications/pingpong/pingpong.c:274
 #: src/applications/pingpong/pingpong.c:346
 #, c-format
@@ -2373,8 +2274,9 @@
 msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:217
-msgid "Received PING not destined for us!\n"
+#: src/applications/pingpong/pingpong.c:216
+#, fuzzy, c-format
+msgid "Received PING from `%s' not destined for us!\n"
 msgstr "Mottog PING som ej var ämnat för oss!\n"
 
 #: src/applications/pingpong/pingpong.c:316
@@ -2405,12 +2307,12 @@
 msgstr "# PING-meddelanden skapade"
 
 #: src/applications/pingpong/pingpong.c:527
-#: src/applications/session/connect.c:968
+#: src/applications/session/connect.c:939
 msgid "# encrypted PONG messages sent"
 msgstr "# krypterade PONG-meddelanden skickade"
 
 #: src/applications/pingpong/pingpong.c:531
-#: src/applications/session/connect.c:966
+#: src/applications/session/connect.c:937
 msgid "# encrypted PING messages sent"
 msgstr "# krypterade PING-meddelanden skickade"
 
@@ -2429,67 +2331,66 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr "\"%s\" registrerar handtag %d %d (klartext och kryptotext)\n"
 
-#: src/applications/session/connect.c:260
-#: src/applications/session/connect.c:279
+#: src/applications/session/connect.c:235
 #, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:323
+#: src/applications/session/connect.c:279
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:496
 #, fuzzy, c-format
 msgid "Could not create any HELLO for myself (have transports `%s')!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/applications/session/connect.c:627
+#: src/applications/session/connect.c:605
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Meddelande mottaget från motpart är ogiltig.\n"
 
-#: src/applications/session/connect.c:661
+#: src/applications/session/connect.c:639
 #, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\n"
 msgstr ""
 
-#: src/applications/session/connect.c:695
+#: src/applications/session/connect.c:668
 #, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:706
+#: src/applications/session/connect.c:680
 #, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/session/connect.c:776
+#: src/applications/session/connect.c:742
 #, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
 "invalid.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:789
+#: src/applications/session/connect.c:755
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:958
+#: src/applications/session/connect.c:929
 msgid "# session keys sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/applications/session/connect.c:960
+#: src/applications/session/connect.c:931
 msgid "# session keys rejected"
 msgstr "# sessionnycklar vägrade"
 
-#: src/applications/session/connect.c:962
+#: src/applications/session/connect.c:933
 msgid "# session keys accepted"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/applications/session/connect.c:964
+#: src/applications/session/connect.c:935
 msgid "# sessions established"
 msgstr "# sessioner etablerade"
 
@@ -2499,20 +2400,20 @@
 msgid "`%s' failed at %s:%d with error: %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1388
+#: src/applications/sqstore_mysql/mysql.c:1392
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1508
-#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/sqstore_mysql/mysql.c:1512
+#: src/applications/sqstore_mysql/mysql.c:1665
 #: src/applications/dstore_mysql/dstore_mysql.c:627
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1535
-#: src/applications/sqstore_mysql/mysql.c:1686
+#: src/applications/sqstore_mysql/mysql.c:1539
+#: src/applications/sqstore_mysql/mysql.c:1690
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -2738,6 +2639,10 @@
 msgid "% of allowed io load"
 msgstr ""
 
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr "# av anslutna parter"
+
 #: src/applications/stats/statistics.c:235
 msgid "# bytes of noise received"
 msgstr ""
@@ -2887,33 +2792,6 @@
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:53
-#, c-format
-msgid "Using %u messages of size %u for %u times.\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:85
-#, c-format
-msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:89
-#, c-format
-msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:95
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#: src/applications/tbench/tbenchtest.c:151
-#, c-format
-msgid "Running benchmark...\n"
-msgstr ""
-
 #: src/applications/tracekit/gnunet-tracekit.c:104
 #, c-format
 msgid "`%s' connected to `%s'.\n"
@@ -3014,7 +2892,7 @@
 msgid "# bytes received in plaintext of type %d"
 msgstr "# byte mottagna av typen %d"
 
-#: src/applications/traffic/traffic.c:650
+#: src/applications/traffic/traffic.c:652
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -3540,7 +3418,7 @@
 msgid "Received malformed message (too small) from connection. Closing.\n"
 msgstr ""
 
-#: src/util/network/select.c:483
+#: src/util/network/select.c:489
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
@@ -3572,6 +3450,11 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
+#: src/util/network/io.c:86
+#, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr ""
+
 #: src/util/network/ip.c:209
 #, c-format
 msgid ""
@@ -4166,14 +4049,14 @@
 #: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
-"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
+"available transports are udp, tcp, http, smtp and nat.\n"
 "\t\t\n"
 "Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes "
 "that cannot directly be reached from the outside.  Peers that are NOT behind "
 "a NAT box and that want to *allow* peers that ARE behind a NAT box to "
 "connect must ALSO load the 'nat' module.  Note that the actual transfer will "
 "always be via tcp initiated by the peer behind the NAT box.  The nat "
-"transport requires the use of tcp, http, smtp and/or tcp6 in addition to nat "
+"transport requires the use of tcp, http and/or smtp in addition to nat "
 "itself."
 msgstr ""
 
@@ -4538,8 +4421,8 @@
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
-#: contrib/config-daemon.scm:1091
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:966
+#: contrib/config-daemon.scm:1116
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
@@ -4551,26 +4434,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1115
-#: contrib/config-daemon.scm:1170 contrib/config-daemon.scm:1235
-msgid "Which IPs are not allowed to connect?"
+#: contrib/config-daemon.scm:887
+msgid "Which IP(v4)s are not allowed to connect?"
 msgstr ""
 
 #: contrib/config-daemon.scm:899
 msgid ""
-"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
-"network interface."
+"Which IP(v4)s are allowed to connect? Leave empty to use the IP of your "
+"primary network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:911 contrib/config-daemon.scm:1164
+msgid "Which IPv6s are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:923 contrib/config-daemon.scm:1176
+msgid ""
+"Which IPv6s are allowed to connect? Leave empty to allow any IP to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:936
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:929
+#: contrib/config-daemon.scm:954
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1092
+#: contrib/config-daemon.scm:967 contrib/config-daemon.scm:1117
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -4578,11 +4469,11 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:953
+#: contrib/config-daemon.scm:978
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:954
+#: contrib/config-daemon.scm:979
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4590,139 +4481,118 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:965
+#: contrib/config-daemon.scm:990
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1009
 msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1021
 msgid ""
 "What is the maximum number of e-mails that gnunetd would be allowed to send "
 "per hour?"
 msgstr ""
 
-#: contrib/config-daemon.scm:997
+#: contrib/config-daemon.scm:1022
 msgid "Use 0 for unlimited"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1033
 msgid "Which e-mail address should be used to send e-mail to this peer?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1009
+#: contrib/config-daemon.scm:1034
 msgid ""
 "You must make sure that e-mail received at this address is forwarded to the "
 "PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
 "procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1045
 msgid ""
 "Which header line should other peers include in e-mails to enable filtering?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1046
 msgid ""
 "You can specify a header line here which can then be used by procmail to "
 "filter GNUnet e-mail from your inbox and forward it to gnunetd."
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1057
 msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1058
 msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
 msgstr ""
 
-#: contrib/config-daemon.scm:1044
+#: contrib/config-daemon.scm:1069
 msgid "What is the name and port of the server for outgoing e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1070
 msgid "The basic format is HOSTNAME:PORT."
 msgstr ""
 
-#: contrib/config-daemon.scm:1056
+#: contrib/config-daemon.scm:1081
 msgid "SMTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1079
+#: contrib/config-daemon.scm:1104
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1103
+#: contrib/config-daemon.scm:1128
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1127
+#: contrib/config-daemon.scm:1140
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1152
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:1139
+#: contrib/config-daemon.scm:1188
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
-msgid "Which port should be used by the TCP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1182 contrib/config-daemon.scm:1247
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
-msgstr ""
-
-#: contrib/config-daemon.scm:1194
-msgid "TCP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1211
-msgid "Which port should be used by the UDP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1223
-msgid "What is the maximum transfer unit for UDP 6?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1259
-msgid "UDP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1277
+#: contrib/config-daemon.scm:1210
 #, fuzzy
 msgid "Network interface"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:1289
+#: contrib/config-daemon.scm:1222
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1301
+#: contrib/config-daemon.scm:1234
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1313
+#: contrib/config-daemon.scm:1246
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1337
+#: contrib/config-daemon.scm:1268
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1349
+#: contrib/config-daemon.scm:1280
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1361
+#: contrib/config-daemon.scm:1292
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1363
+#: contrib/config-daemon.scm:1294
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4732,11 +4602,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1374
+#: contrib/config-daemon.scm:1305
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1376
+#: contrib/config-daemon.scm:1307
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4746,36 +4616,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1387
+#: contrib/config-daemon.scm:1318
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1388
+#: contrib/config-daemon.scm:1319
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1399
+#: contrib/config-daemon.scm:1330
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1400
+#: contrib/config-daemon.scm:1331
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1411
+#: contrib/config-daemon.scm:1342
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1423
+#: contrib/config-daemon.scm:1354
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1425
+#: contrib/config-daemon.scm:1356
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -4820,12 +4690,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1442
+#: contrib/config-daemon.scm:1373
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Nätverksgränssnitt:"
 
-#: contrib/config-daemon.scm:1443
+#: contrib/config-daemon.scm:1374
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -4836,11 +4706,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1454
+#: contrib/config-daemon.scm:1385
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1479 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1410 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5559,26 +5429,26 @@
 msgid "Not for English ;-)"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:704
+#: src/applications/fs/gap/fs.c:735
 msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:706
+#: src/applications/fs/gap/fs.c:737
 msgid "# gap content total received"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:708
+#: src/applications/fs/gap/fs.c:739
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:736
+#: src/applications/fs/gap/fs.c:767
 #, fuzzy, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %d %"
 "d\n"
 msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
 
-#: src/applications/fs/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
 msgid "enables (anonymous) file-sharing"
 msgstr "aktiverar (anonym) fildelning"
 
@@ -5590,19 +5460,19 @@
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/fs/gap/fs_dht.c:261
+#: src/applications/fs/gap/fs_dht.c:257
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:348
+#: src/applications/fs/gap/migration.c:354
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:350
+#: src/applications/fs/gap/migration.c:356
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:353
+#: src/applications/fs/gap/migration.c:359
 msgid "# on-demand block migration attempts"
 msgstr ""
 
@@ -5614,11 +5484,11 @@
 "contains invalid references!\n"
 msgstr ""
 
-#: src/applications/fs/gap/ondemand.c:454
+#: src/applications/fs/gap/ondemand.c:452
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/gap/ondemand.c:566
+#: src/applications/fs/gap/ondemand.c:568
 #, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -5628,7 +5498,57 @@
 msgid "Failed to get traffic stats.\n"
 msgstr ""
 
+#~ msgid "Could not determine my public IPv6 address.\n"
+#~ msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+
+#~ msgid "`%s': unknown service: %s\n"
+#~ msgstr "\"%s\": okänd tjänst: %s\n"
+
 #, fuzzy
+#~ msgid "# bytes received via TCP6"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via TCP6"
+#~ msgstr "# byte skickades via TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by TCP6 (outgoing)"
+#~ msgstr "# byte kastade via TCP (utgående)"
+
+#, fuzzy
+#~ msgid "# bytes received via UDP6"
+#~ msgstr "# byte mottagna via UDP"
+
+#, fuzzy
+#~ msgid "# bytes sent via UDP6"
+#~ msgstr "# byte skickade via UDP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by UDP6 (outgoing)"
+#~ msgstr "# byte kastade via UDP (utgående)"
+
+#, fuzzy
+#~ msgid "TCP: Could not determine my public IP address.\n"
+#~ msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
+
+#~ msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+#~ msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Received malformed message from udp-peer connection. Closing.\n"
+#~ msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+
+#~ msgid "Message received from peer is invalid.\n"
+#~ msgstr "Meddelande mottaget från motpart är ogiltig.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Failed to receive reply from gnunetd.\n"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
 #~ msgid "GAP received invalid content from `%s'\n"
 #~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2008-02-12 07:33:28 UTC (rev 6262)
+++ GNUnet/po/vi.po     2008-02-12 07:42:00 UTC (rev 6263)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-02-07 00:26-0700\n"
+"POT-Creation-Date: 2008-02-12 00:40-0700\n"
 "PO-Revision-Date: 2005-07-05 21:18+0400\n"
 "Last-Translator: Phan Vinh Thinh <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -19,7 +19,7 @@
 #: src/transports/upnp/upnp.c:356 src/transports/upnp/upnp.c:541
 #: src/transports/http.c:1345 src/transports/http.c:1442
 #: src/transports/http.c:1620 src/transports/http.c:2047
-#: src/transports/http.c:2108 src/applications/bootstrap_http/http.c:123
+#: src/transports/http.c:2097 src/applications/bootstrap_http/http.c:123
 #: src/applications/bootstrap_http/http.c:257
 #: src/applications/bootstrap_http/http.c:274
 #: src/applications/bootstrap_http/http.c:306
@@ -41,131 +41,68 @@
 msgid "upnp: NAT Returned IP: %s\n"
 msgstr ""
 
-#: src/transports/ip6.c:77 src/util/network/io.c:86
+#: src/transports/ip.c:70 src/transports/ip.c:390
 #, fuzzy, c-format
-msgid "Could not find IP of host `%s': %s\n"
+msgid "Failed to obtain my (external) %s address!\n"
+msgstr "Lấy địa chỉ IP (ngoài) của tôi không thành công!\n"
+
+#: src/transports/ip.c:238
+#, fuzzy, c-format
+msgid "Could not find IPv6 address of host `%s': %s\n"
 msgstr "Không tìm thấy IP của máy '%s': %s\n"
 
-#: src/transports/ip6.c:110 src/util/network/ip.c:88 src/util/network/ip.c:153
+#: src/transports/ip.c:271 src/util/network/ip.c:88 src/util/network/ip.c:153
 #, fuzzy, c-format
 msgid "No interface specified in section `%s' under `%s'!\n"
 msgstr ""
 "Không có giao diện mạng được xác định trong cấu hình phần '%s' dưới '%s'!\n"
 
-#: src/transports/ip6.c:141 src/util/network/ip.c:119
-#: src/util/network/ip.c:239
+#: src/transports/ip.c:302 src/util/network/ip.c:119 src/util/network/ip.c:239
 #, fuzzy, c-format
 msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr "Không lấy được IP cho giao diện '%s' đang dùng '%s'.\n"
 
-#: src/transports/ip6.c:175
+#: src/transports/ip.c:336
 #, fuzzy, c-format
 msgid "Could not resolve `%s': %s\n"
 msgstr "Không tìm thấy '%s': %s\n"
 
-#: src/transports/ip6.c:229 src/transports/ip.c:61
-#, fuzzy, c-format
-msgid "Failed to obtain my (external) %s address!\n"
-msgstr "Lấy địa chỉ IP (ngoài) của tôi không thành công!\n"
-
-#: src/transports/tcp6.c:249
-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:317
-#, fuzzy, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "'%s': không rõ dịch vụ: %s\n"
-
-#: src/transports/tcp6.c:420 src/transports/tcp.c:463
-#, 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/tcp6.c:531
-#, fuzzy
-msgid "# bytes received via TCP6"
-msgstr "# byte nhận được qua TCP"
-
-#: src/transports/tcp6.c:532
-#, fuzzy
-msgid "# bytes sent via TCP6"
-msgstr "# Byte gửi qua TCP"
-
-#: src/transports/tcp6.c:534
-#, fuzzy
-msgid "# bytes dropped by TCP6 (outgoing)"
-msgstr "# byte loại đi bởi TCP (đi ra)"
-
-#: src/transports/udp6.c:131 src/transports/udp.c:135
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Không kết gắn được tới cổng UDP %d.\n"
-
-#: src/transports/udp6.c:277
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr "UDP6: Không nhận ra địa chỉ IP công cộng của tôi.\n"
-
-#: src/transports/udp6.c:494 src/transports/udp.c:544
-#, fuzzy, c-format
-msgid "MTU %llu for `%s' is probably too low!\n"
-msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
-
-#: src/transports/udp6.c:500
-#, fuzzy
-msgid "# bytes received via UDP6"
-msgstr "# byte nhận được qua UDP"
-
-#: src/transports/udp6.c:501
-#, fuzzy
-msgid "# bytes sent via UDP6"
-msgstr "# byte gửi qua UDP"
-
-#: src/transports/udp6.c:503
-#, fuzzy
-msgid "# bytes dropped by UDP6 (outgoing)"
-msgstr "# byte loại bỏ bởi UDP (đi ra)"
-
-#: src/transports/udp6.c:505
-msgid "# UDP6 connections (right now)"
-msgstr ""
-
 #: src/transports/http.c:892
 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:2325
+#: src/transports/http.c:2314
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"HTTP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/http.c:2334
+#: src/transports/http.c:2323
 msgid "# bytes received via HTTP"
 msgstr "# byte nhận được qua HTTP"
 
-#: src/transports/http.c:2335
+#: src/transports/http.c:2324
 msgid "# bytes sent via HTTP"
 msgstr "# byte gửi qua HTTP"
 
-#: src/transports/http.c:2337
+#: src/transports/http.c:2326
 msgid "# bytes dropped by HTTP (outgoing)"
 msgstr "# byte loại bỏ bởi HTTP (đi ra)"
 
-#: src/transports/http.c:2338
+#: src/transports/http.c:2327
 msgid "# HTTP GET issued"
 msgstr ""
 
-#: src/transports/http.c:2340
+#: src/transports/http.c:2329
 #, fuzzy
 msgid "# HTTP GET received"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/http.c:2341
+#: src/transports/http.c:2330
 msgid "# HTTP PUT issued"
 msgstr ""
 
-#: src/transports/http.c:2343
+#: src/transports/http.c:2332
 #, fuzzy
 msgid "# HTTP PUT received"
 msgstr "# byte nhận được qua TCP"
@@ -212,83 +149,66 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/transports/tcp_helper.c:261
-#, fuzzy
-msgid "Received malformed message instead of welcome message. Closing.\n"
+#: src/transports/common.c:369
+#, c-format
+msgid "Port is 0, will only send using %s.\n"
 msgstr ""
-"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
-"đóng.\n"
 
-#: src/transports/tcp_helper.c:281
+#: src/transports/tcp.c:272 src/transports/tcp.c:291
 #, fuzzy
-msgid "Received malformed message from tcp-peer connection. Closing.\n"
-msgstr ""
-"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
-"đóng.\n"
+msgid "Received malformed message via TCP. Closing.\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/tcp.c:297
-#, fuzzy
-msgid "TCP: 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/tcp.c:707 src/transports/udp.c:458
+#, fuzzy, c-format
+msgid "Failed to bind to %s port %d.\n"
+msgstr "Không kết gắn được tới cổng UDP %d.\n"
 
-#: src/transports/tcp.c:402
-#, 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/tcp.c:585
+#: src/transports/tcp.c:789
 msgid ""
 "The UPnP service could not be loaded. To disable UPnP, set the configuration "
 "option \"UPNP\" in section \"TCP\" to \"NO\"\n"
 msgstr ""
 
-#: src/transports/tcp.c:594
+#: src/transports/tcp.c:798
 msgid "# bytes received via TCP"
 msgstr "# byte nhận được qua TCP"
 
-#: src/transports/tcp.c:595
+#: src/transports/tcp.c:799
 msgid "# bytes sent via TCP"
 msgstr "# Byte gửi qua TCP"
 
-#: src/transports/tcp.c:597
+#: src/transports/tcp.c:801
 msgid "# bytes dropped by TCP (outgoing)"
 msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/transports/udp.c:302
-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:107
+#, fuzzy
+msgid "Received malformed message via UDP. Ignored.\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/udp.c:401
-#, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
-msgstr ""
-"Gửi thông báo với kích thước %d qua UDP tới %u.%u.%u.%u:%u không thành công: "
-"%s\n"
+#: src/transports/udp.c:525
+#, fuzzy, c-format
+msgid "MTU %llu for `%s' is probably too low!\n"
+msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
 
-#: src/transports/udp.c:560
+#: src/transports/udp.c:547
 msgid "# bytes received via UDP"
 msgstr "# byte nhận được qua UDP"
 
-#: src/transports/udp.c:561
+#: src/transports/udp.c:548
 msgid "# bytes sent via UDP"
 msgstr "# byte gửi qua UDP"
 
-#: src/transports/udp.c:563
+#: src/transports/udp.c:550
 msgid "# bytes dropped by UDP (outgoing)"
 msgstr "# byte loại bỏ bởi UDP (đi ra)"
 
-#: src/transports/udp.c:565
+#: src/transports/udp.c:552
 #, fuzzy
 msgid "# UDP connections (right now)"
 msgstr "Kết nối mạng"
 
-#: src/transports/udp_helper.c:96
-#, fuzzy
-msgid "Received malformed message from udp-peer connection. Closing.\n"
-msgstr ""
-"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
-"đóng.\n"
-
 #: src/setup/ncurses/mconf.c:86
 msgid "Exit"
 msgstr ""
@@ -326,7 +246,7 @@
 msgid "Value is not in legal range."
 msgstr ""
 
-#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:527
+#: src/setup/ncurses/mconf.c:515 src/setup/ncurses/wizard_curs.c:528
 #, fuzzy
 msgid "GNUnet Configuration"
 msgstr "Cấu hình GNUnet"
@@ -643,26 +563,26 @@
 msgid "Unable to save configuration file `%s':"
 msgstr "Không ghi được tập tin cấu hình %s:"
 
-#: src/setup/ncurses/wizard_curs.c:464
+#: src/setup/ncurses/wizard_curs.c:465
 #, fuzzy
 msgid "Unable to create user account for daemon."
 msgstr "Không tạo được tài khoản người dùng:"
 
-#: src/setup/ncurses/wizard_curs.c:471
+#: src/setup/ncurses/wizard_curs.c:472
 msgid "Unable to setup autostart for daemon."
 msgstr ""
 
-#: src/setup/ncurses/wizard_curs.c:486
+#: src/setup/ncurses/wizard_curs.c:487
 #, fuzzy
 msgid "Save configuration?"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:487
+#: src/setup/ncurses/wizard_curs.c:488
 #, fuzzy
 msgid "Save configuration now?"
 msgstr "Cấu hình GNUnet"
 
-#: src/setup/ncurses/wizard_curs.c:531 src/setup/gtk/gnunet-setup.glade:723
+#: src/setup/ncurses/wizard_curs.c:532 src/setup/gtk/gnunet-setup.glade:723
 #: src/setup/gtk/gnunet-setup.glade:1056 src/setup/gtk/gnunet-setup.glade:1340
 msgid "Back"
 msgstr "Quay lại"
@@ -1030,13 +950,6 @@
 msgid "Error: can't delete service: %s\n"
 msgstr "Lỗi: không xóa được dịch vụ: %s\n"
 
-#: src/applications/dht/tools/dhttest.c:51
-#: src/applications/dht/tools/dhttest2.c:43
-#: src/applications/dht/module/table.c:758
-#, fuzzy
-msgid "# dht connections"
-msgstr "Kết nối mạng"
-
 #: src/applications/dht/tools/dht-query.c:52
 #, fuzzy
 msgid "Query (get KEY, put KEY VALUE) DHT table."
@@ -1130,6 +1043,11 @@
 msgid "`%s' registering p2p handlers: %d %d %d\n"
 msgstr "'%s' đăng ký trình điều khiển %d %d %d\n"
 
+#: src/applications/dht/module/table.c:758
+#, fuzzy
+msgid "# dht connections"
+msgstr "Kết nối mạng"
+
 #: src/applications/dht/module/table.c:760
 #, fuzzy
 msgid "# dht discovery messages received"
@@ -1299,7 +1217,7 @@
 msgid "Suppress display of asynchronous log messages"
 msgstr ""
 
-#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:113
+#: src/applications/vpn/gnunet-vpn.c:149 src/applications/chat/clientapi.c:116
 #: src/applications/stats/gnunet-stats.c:121
 #: src/applications/tbench/gnunet-tbench.c:126
 #: src/applications/tracekit/gnunet-tracekit.c:352
@@ -1545,7 +1463,7 @@
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:70
 #: src/applications/fs/tools/gnunet-insert.c:268
-#: src/applications/fs/tools/gnunet-search.c:136
+#: src/applications/fs/tools/gnunet-search.c:132
 #: src/applications/fs/tools/gnunet-download.c:69
 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"
@@ -1904,24 +1822,15 @@
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'.\n"
 
-#: src/applications/fs/tools/gnunet-search.c:139
+#: src/applications/fs/tools/gnunet-search.c:135
 msgid "Search GNUnet for files."
 msgstr "Tìm kiếm tập tin trong GNUnet."
 
-#: src/applications/fs/tools/gnunet-search.c:143
-msgid "exit after receiving LIMIT results"
-msgstr "thoát sau khi nhận được kết quả GIỚIHẠN"
-
-#: src/applications/fs/tools/gnunet-search.c:146
+#: src/applications/fs/tools/gnunet-search.c:139
 msgid "write encountered (decrypted) search results to FILENAME"
 msgstr "ghi kết quả tìm kiếm tìm thấy (đã giải mã) vào tập tin FILENAME"
 
-#: src/applications/fs/tools/gnunet-search.c:149
-#, fuzzy
-msgid "wait DELAY seconds for search results before aborting"
-msgstr "chờ kết quả tìm kiếm TIMEOUT giây trước khi thoát"
-
-#: src/applications/fs/tools/gnunet-search.c:186
+#: src/applications/fs/tools/gnunet-search.c:176
 #, c-format
 msgid "Error converting arguments to URI!\n"
 msgstr "Lỗi chuyển đổi tham số tới URI!\n"
@@ -2064,23 +1973,12 @@
 msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/fs/fsui/deserialize.c:772
+#: src/applications/fs/fsui/deserialize.c:770
 #, fuzzy, c-format
 msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr "Tập tin trạng thái FSUI '%s' có lỗi cú pháp tại vùng %u.\n"
 
-#: src/applications/fs/fsui/searchtest.c:154
-#: src/applications/fs/fsui/fsuitest.c:173
-#: src/applications/fs/fsui/downloadtest.c:289
-#: src/applications/fs/fsui/serializetest2.c:391
-#: src/applications/fs/fsui/serializetest3.c:163
-#: src/applications/fs/fsui/serializetest4.c:358
-#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
-#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
-msgid "AND"
-msgstr "VÀ"
-
-#: src/applications/fs/fsui/search.c:241
+#: src/applications/fs/fsui/search.c:240
 msgid "Error running search (no reason given)."
 msgstr ""
 
@@ -2116,7 +2014,7 @@
 msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr "'%s' %s không thành công: %s\n"
 
-#: src/applications/fs/ecrs/download.c:646
+#: src/applications/fs/ecrs/download.c:647
 msgid ""
 "Decrypted content does not match key. This is either a bug or a maliciously "
 "inserted file. Download aborted.\n"
@@ -2128,42 +2026,47 @@
 msgid "No keywords specified!\n"
 msgstr "Chưa chỉ ra từ khóa!\n"
 
-#: src/applications/fs/ecrs/upload.c:156
+#: src/applications/fs/ecrs/helper.c:132 src/applications/fs/ecrs/helper.c:135
+#: src/applications/fs/ecrs/helper.c:139 src/applications/fs/ecrs/helper.c:144
+msgid "AND"
+msgstr "VÀ"
+
+#: src/applications/fs/ecrs/upload.c:153
 #, fuzzy, c-format
 msgid "`%s' is not a file.\n"
 msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/applications/fs/ecrs/upload.c:164
+#: src/applications/fs/ecrs/upload.c:161
 #, fuzzy, c-format
 msgid "Cannot get size of file `%s'"
 msgstr "Không mở được tập tin cấu hình '%s'\n"
 
-#: src/applications/fs/ecrs/upload.c:173
+#: src/applications/fs/ecrs/upload.c:170
 #, fuzzy
 msgid "Failed to connect to gnunetd."
 msgstr "Kết nối tới gnunetd không thành công.\n"
 
-#: src/applications/fs/ecrs/upload.c:185
+#: src/applications/fs/ecrs/upload.c:182
 #, fuzzy, c-format
 msgid "Cannot hash `%s'.\n"
 msgstr "Không hash được '%s'.\n"
 
-#: src/applications/fs/ecrs/upload.c:204
+#: src/applications/fs/ecrs/upload.c:201
 #, fuzzy, c-format
 msgid "Initialization for indexing file `%s' failed.\n"
 msgstr "Nạp để đánh chỉ mục tập tin '%s' thất bại.\n"
 
-#: src/applications/fs/ecrs/upload.c:212
+#: src/applications/fs/ecrs/upload.c:209
 #, fuzzy, c-format
 msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr "nạp môđun '%s' không thành công.  Đang cho máy khách biết.\n"
 
-#: src/applications/fs/ecrs/upload.c:226
+#: src/applications/fs/ecrs/upload.c:223
 #, fuzzy, c-format
 msgid "Cannot open file `%s': `%s'"
 msgstr "Không mở được tập tin cấu hình '%s'\n"
 
-#: src/applications/fs/ecrs/upload.c:309
+#: src/applications/fs/ecrs/upload.c:303
 #, c-format
 msgid "Indexing data failed at position %i.\n"
 msgstr "Đánh chỉ mục dữ liệu thất bại tại vị trí %i.\n"
@@ -2185,7 +2088,7 @@
 
 #: src/applications/fs/ecrs/namespace.c:339
 #: src/applications/fs/ecrs/namespace.c:420
-#: src/applications/fs/ecrs/namespace.c:571
+#: src/applications/fs/ecrs/namespace.c:572
 #, fuzzy, c-format
 msgid "File `%s' does not contain a pseudonym.\n"
 msgstr "Tập tin '%s' không chứa một tên hiệu.\n"
@@ -2196,8 +2099,8 @@
 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:583
-#: src/applications/fs/ecrs/namespace.c:594
+#: src/applications/fs/ecrs/namespace.c:584
+#: src/applications/fs/ecrs/namespace.c:595
 #, fuzzy, c-format
 msgid "Format of file `%s' is invalid.\n"
 msgstr "Định dạng của tập tin '%s' sai.\n"
@@ -2241,17 +2144,17 @@
 #: src/applications/sqstore_mysql/mysql.c:582
 #: src/applications/sqstore_mysql/mysql.c:680
 #: src/applications/sqstore_mysql/mysql.c:693
-#: src/applications/sqstore_mysql/mysql.c:706
-#: src/applications/sqstore_mysql/mysql.c:721
-#: src/applications/sqstore_mysql/mysql.c:821
-#: src/applications/sqstore_mysql/mysql.c:836
-#: src/applications/sqstore_mysql/mysql.c:988
-#: src/applications/sqstore_mysql/mysql.c:1000
-#: src/applications/sqstore_mysql/mysql.c:1012
-#: src/applications/sqstore_mysql/mysql.c:1260
-#: src/applications/sqstore_mysql/mysql.c:1272
-#: src/applications/sqstore_mysql/mysql.c:1284
-#: src/applications/sqstore_mysql/mysql.c:1369
+#: src/applications/sqstore_mysql/mysql.c:707
+#: src/applications/sqstore_mysql/mysql.c:722
+#: src/applications/sqstore_mysql/mysql.c:822
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:989
+#: src/applications/sqstore_mysql/mysql.c:1001
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1264
+#: src/applications/sqstore_mysql/mysql.c:1276
+#: src/applications/sqstore_mysql/mysql.c:1288
+#: src/applications/sqstore_mysql/mysql.c:1373
 #: src/applications/dstore_mysql/dstore_mysql.c:107
 #: src/applications/dstore_mysql/dstore_mysql.c:114
 #: src/applications/dstore_mysql/dstore_mysql.c:286
@@ -2281,14 +2184,6 @@
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/applications/advertising/advertising_test.c:47
-#: src/applications/session/sessiontest_http.c:40
-#: src/applications/session/sessiontest.c:40
-#: src/applications/session/sessiontest2.c:40
-#: src/applications/stats/statistics.c:233
-msgid "# of connected peers"
-msgstr "# của các đầu đã kết nối"
-
 #: src/applications/advertising/advertising.c:194
 #, fuzzy, c-format
 msgid "HELLO message from `%s' has an invalid signature. Dropping.\n"
@@ -2378,7 +2273,7 @@
 msgstr "# đã gửi các thông báo PING dạng văn bản thông thường"
 
 #: src/applications/advertising/advertising.c:929
-#: src/applications/session/connect.c:974
+#: src/applications/session/connect.c:945
 #, fuzzy, c-format
 msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
@@ -2389,33 +2284,29 @@
 "ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/chat/chat.c:95
-msgid "Message received from peer is invalid.\n"
-msgstr "Thông báo nhận được từ một đầu là sai.\n"
-
-#: src/applications/chat/chat.c:144
+#: src/applications/chat/chat.c:106 src/applications/chat/chat.c:187
 msgid "Message received from client is invalid\n"
 msgstr "Thông báo nhận được từ máy khách là sai.\n"
 
-#: src/applications/chat/chat.c:165
+#: src/applications/chat/chat.c:226
 msgid "Maximum number of chat clients reached.\n"
 msgstr "Đã đạt tới số máy khách chát lớn nhất.\n"
 
-#: src/applications/chat/chat.c:171
+#: src/applications/chat/chat.c:232
 #, c-format
 msgid "Now %d of %d chat clients at this node.\n"
 msgstr "Bây giờ có %d từ %d máy khách chát tại nút này.\n"
 
-#: src/applications/chat/chat.c:211
+#: src/applications/chat/chat.c:272
 #, fuzzy, c-format
 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:230
+#: src/applications/chat/chat.c:291
 msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/chat/clientapi.c:119 src/applications/chat/clientapi.c:197
+#: src/applications/chat/clientapi.c:122 src/applications/chat/clientapi.c:216
 #, fuzzy, c-format
 msgid "Error writing to socket.\n"
 msgstr "Lỗi tạo người dùng"
@@ -2432,17 +2323,17 @@
 msgid "set the chat room to join (requred)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:147
+#: src/applications/chat/gnunet-chat.c:146
 #, fuzzy, c-format
 msgid "You must specify a nickname\n"
 msgstr "Người dùng phải chỉ ra một trình nhận!\n"
 
-#: src/applications/chat/gnunet-chat.c:157
+#: src/applications/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid "Failed to join the room\n"
 msgstr "Không kết gắn được tới cổng UDP %d.\n"
 
-#: src/applications/chat/gnunet-chat.c:182
+#: src/applications/chat/gnunet-chat.c:181
 #, fuzzy, c-format
 msgid "Failed to send message.\n"
 msgstr "Phân phát tin nhắn '%s' không thành công.\n"
@@ -2467,13 +2358,13 @@
 msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1399
-#: src/applications/sqstore_mysql/mysql.c:1483
+#: src/applications/sqstore_sqlite/sqlite.c:1401
+#: src/applications/sqstore_mysql/mysql.c:1487
 msgid "# bytes in datastore"
 msgstr ""
 
 #: src/applications/pingpong/pingpong.c:134
-#: src/applications/pingpong/pingpong.c:206
+#: src/applications/pingpong/pingpong.c:204
 #: src/applications/pingpong/pingpong.c:274
 #: src/applications/pingpong/pingpong.c:346
 #, fuzzy, c-format
@@ -2484,8 +2375,9 @@
 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:217
-msgid "Received PING not destined for us!\n"
+#: src/applications/pingpong/pingpong.c:216
+#, fuzzy, c-format
+msgid "Received PING from `%s' not destined for us!\n"
 msgstr "Nhận được PING không dành cho chúng ta!\n"
 
 #: src/applications/pingpong/pingpong.c:316
@@ -2518,12 +2410,12 @@
 msgstr "# đã tạo tin nhắn PING"
 
 #: src/applications/pingpong/pingpong.c:527
-#: src/applications/session/connect.c:968
+#: src/applications/session/connect.c:939
 msgid "# encrypted PONG messages sent"
 msgstr "# đã gửi thông báo PONG đã mã hóa"
 
 #: src/applications/pingpong/pingpong.c:531
-#: src/applications/session/connect.c:966
+#: src/applications/session/connect.c:937
 msgid "# encrypted PING messages sent"
 msgstr "# đã gửi các thông báo PING mã hóa"
 
@@ -2544,44 +2436,43 @@
 "'%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/session/connect.c:260
-#: src/applications/session/connect.c:279
+#: src/applications/session/connect.c:235
 #, fuzzy, c-format
 msgid "Session key from peer `%s' could not be verified.\n"
 msgstr "Không kiểm tra được chìa khóa buổi làm việc từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:323
+#: src/applications/session/connect.c:279
 #, fuzzy, c-format
 msgid "Cannot encrypt sessionkey, peer `%s' not known!\n"
 msgstr ""
 "Không mã hóa được chìa khóa buổi làm việc, không biết đến đầu peer khác!\n"
 
-#: src/applications/session/connect.c:520
+#: src/applications/session/connect.c:496
 #, fuzzy, c-format
 msgid "Could not create any HELLO for myself (have transports `%s')!\n"
 msgstr "Không tạo được chìa khóa máy!\n"
 
-#: src/applications/session/connect.c:627
+#: src/applications/session/connect.c:605
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' has invalid format (discarded).\n"
 msgstr "Thông báo nhận được từ một đầu là sai.\n"
 
-#: src/applications/session/connect.c:661
+#: src/applications/session/connect.c:639
 #, fuzzy, c-format
 msgid "Session key received from peer `%s' is for `%s' and not for me!\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:695
+#: src/applications/session/connect.c:668
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr "Nhận được thông báo '%s' sai từ đầu peer '%s'.\n"
 
-#: src/applications/session/connect.c:706
+#: src/applications/session/connect.c:680
 #, fuzzy, c-format
 msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr "Kiểm tra CRC của SKEY từ '%s' không thành công (có: %u, muốn %u).\n"
 
-#: src/applications/session/connect.c:776
+#: src/applications/session/connect.c:742
 #, fuzzy, c-format
 msgid ""
 "Error parsing encrypted session key from `%s', given message part size is "
@@ -2590,24 +2481,24 @@
 "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:789
+#: src/applications/session/connect.c:755
 #, c-format
 msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/session/connect.c:958
+#: src/applications/session/connect.c:929
 msgid "# session keys sent"
 msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/session/connect.c:960
+#: src/applications/session/connect.c:931
 msgid "# session keys rejected"
 msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/session/connect.c:962
+#: src/applications/session/connect.c:933
 msgid "# session keys accepted"
 msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/session/connect.c:964
+#: src/applications/session/connect.c:935
 msgid "# sessions established"
 msgstr "# đã thiết lập buổi làm việc"
 
@@ -2617,20 +2508,20 @@
 msgid "`%s' failed at %s:%d with error: %s"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1388
+#: src/applications/sqstore_mysql/mysql.c:1392
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error `%s' after %llums\n"
 msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1508
-#: src/applications/sqstore_mysql/mysql.c:1661
+#: src/applications/sqstore_mysql/mysql.c:1512
+#: src/applications/sqstore_mysql/mysql.c:1665
 #: src/applications/dstore_mysql/dstore_mysql.c:627
 #, fuzzy, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Đang thử dùng tập tin '%s' cho cấu hình MySQL.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1535
-#: src/applications/sqstore_mysql/mysql.c:1686
+#: src/applications/sqstore_mysql/mysql.c:1539
+#: src/applications/sqstore_mysql/mysql.c:1690
 msgid ""
 "Failed to load MySQL database module.  Check that MySQL is running and "
 "configured properly!\n"
@@ -2858,6 +2749,10 @@
 msgid "% of allowed io load"
 msgstr "% o tải cho phép của cpu"
 
+#: src/applications/stats/statistics.c:233
+msgid "# of connected peers"
+msgstr "# của các đầu đã kết nối"
+
 #: src/applications/stats/statistics.c:235
 msgid "# bytes of noise received"
 msgstr "# byte nhận được do nhiễu đường truyền"
@@ -3010,35 +2905,6 @@
 msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:53
-#, c-format
-msgid "Using %u messages of size %u for %u times.\n"
-msgstr "Sử dụng %u thông báo với kích thước %u trong %u lần.\n"
-
-#: src/applications/tbench/tbenchtest.c:85
-#, c-format
-msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
-msgstr "Thời gian:  max %16llu  min %16llu  có nghĩa %12.3f  biến %12.3f\n"
-
-#: src/applications/tbench/tbenchtest.c:89
-#, c-format
-msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
-msgstr "Mất:  max %16u  min %16u  có nghĩa %12.3f  biến %12.3f\n"
-
-#: src/applications/tbench/tbenchtest.c:95
-#, c-format
-msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
-msgstr ""
-"\n"
-"Không nhận thành công câu trả lời từ gnunetd.\n"
-
-#: src/applications/tbench/tbenchtest.c:151
-#, c-format
-msgid "Running benchmark...\n"
-msgstr "Đang chạy thử mức độ (benchmark)...\n"
-
 #: src/applications/tracekit/gnunet-tracekit.c:104
 #, fuzzy, c-format
 msgid "`%s' connected to `%s'.\n"
@@ -3144,7 +3010,7 @@
 msgid "# bytes received in plaintext of type %d"
 msgstr "# byte nhận được của dạng %d"
 
-#: src/applications/traffic/traffic.c:650
+#: src/applications/traffic/traffic.c:652
 msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
@@ -3683,7 +3549,7 @@
 "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
 "đóng.\n"
 
-#: src/util/network/select.c:483
+#: src/util/network/select.c:489
 #, c-format
 msgid "select listen socket for `%s' not valid!\n"
 msgstr ""
@@ -3715,6 +3581,11 @@
 msgid "Wrong format `%s' for network: %s\n"
 msgstr "Định dạng sai '%s' cho mạng: %s\n"
 
+#: src/util/network/io.c:86
+#, fuzzy, c-format
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "Không tìm thấy IP của máy '%s': %s\n"
+
 #: src/util/network/ip.c:209
 #, fuzzy, c-format
 msgid ""
@@ -4309,14 +4180,14 @@
 #: contrib/config-daemon.scm:350
 msgid ""
 "Use space-separated list of the modules, e.g.  \"udp smtp tcp\".  The "
-"available transports are udp, tcp, http, smtp, tcp6, udp6 and nat.\n"
+"available transports are udp, tcp, http, smtp and nat.\n"
 "\t\t\n"
 "Loading the 'nat' and 'tcp' modules is required for peers behind NAT boxes "
 "that cannot directly be reached from the outside.  Peers that are NOT behind "
 "a NAT box and that want to *allow* peers that ARE behind a NAT box to "
 "connect must ALSO load the 'nat' module.  Note that the actual transfer will "
 "always be via tcp initiated by the peer behind the NAT box.  The nat "
-"transport requires the use of tcp, http, smtp and/or tcp6 in addition to nat "
+"transport requires the use of tcp, http and/or smtp in addition to nat "
 "itself."
 msgstr ""
 
@@ -4678,8 +4549,8 @@
 msgid "Which port should be used by the TCP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:941
-#: contrib/config-daemon.scm:1091
+#: contrib/config-daemon.scm:875 contrib/config-daemon.scm:966
+#: contrib/config-daemon.scm:1116
 msgid "Should we try to determine our external IP using UPnP?"
 msgstr ""
 
@@ -4691,26 +4562,34 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:887 contrib/config-daemon.scm:1115
-#: contrib/config-daemon.scm:1170 contrib/config-daemon.scm:1235
-msgid "Which IPs are not allowed to connect?"
+#: contrib/config-daemon.scm:887
+msgid "Which IP(v4)s are not allowed to connect?"
 msgstr ""
 
 #: contrib/config-daemon.scm:899
 msgid ""
-"Which IPs are allowed to connect? Leave empty to use the IP of your primary "
-"network interface."
+"Which IP(v4)s are allowed to connect? Leave empty to use the IP of your "
+"primary network interface."
 msgstr ""
 
-#: contrib/config-daemon.scm:911
+#: contrib/config-daemon.scm:911 contrib/config-daemon.scm:1164
+msgid "Which IPv6s are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:923 contrib/config-daemon.scm:1176
+msgid ""
+"Which IPv6s are allowed to connect? Leave empty to allow any IP to connect."
+msgstr ""
+
+#: contrib/config-daemon.scm:936
 msgid "TCP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:929
+#: contrib/config-daemon.scm:954
 msgid "Which port should be used by the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:942 contrib/config-daemon.scm:1092
+#: contrib/config-daemon.scm:967 contrib/config-daemon.scm:1117
 msgid ""
 "You can use 'make check' in src/transports/upnp/ to find out if your NAT "
 "supports UPnP. You should disable this option if you are sure that you are "
@@ -4718,11 +4597,11 @@
 "will not do much harm (only cost a small amount of resources)."
 msgstr ""
 
-#: contrib/config-daemon.scm:953
+#: contrib/config-daemon.scm:978
 msgid "Which is the external port of the HTTP transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:954
+#: contrib/config-daemon.scm:979
 msgid ""
 "Use this option if your firewall maps say port 80 to your real HTTP port.  "
 "This can be useful in making the HTTP messages appear even more legit "
@@ -4730,139 +4609,118 @@
 "priviledged port)."
 msgstr ""
 
-#: contrib/config-daemon.scm:965
+#: contrib/config-daemon.scm:990
 msgid "HTTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:984
+#: contrib/config-daemon.scm:1009
 msgid "What is the maximum transfer unit for SMTP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:996
+#: contrib/config-daemon.scm:1021
 msgid ""
 "What is the maximum number of e-mails that gnunetd would be allowed to send "
 "per hour?"
 msgstr ""
 
-#: contrib/config-daemon.scm:997
+#: contrib/config-daemon.scm:1022
 msgid "Use 0 for unlimited"
 msgstr ""
 
-#: contrib/config-daemon.scm:1008
+#: contrib/config-daemon.scm:1033
 msgid "Which e-mail address should be used to send e-mail to this peer?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1009
+#: contrib/config-daemon.scm:1034
 msgid ""
 "You must make sure that e-mail received at this address is forwarded to the "
 "PIPE which is read by gnunetd.  Use the FILTER option to filter e-mail with "
 "procmail and the PIPE option to set the name of the pipe."
 msgstr ""
 
-#: contrib/config-daemon.scm:1020
+#: contrib/config-daemon.scm:1045
 msgid ""
 "Which header line should other peers include in e-mails to enable filtering?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1021
+#: contrib/config-daemon.scm:1046
 msgid ""
 "You can specify a header line here which can then be used by procmail to "
 "filter GNUnet e-mail from your inbox and forward it to gnunetd."
 msgstr ""
 
-#: contrib/config-daemon.scm:1032
+#: contrib/config-daemon.scm:1057
 msgid "What is the filename of the pipe where gnunetd can read its e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1033
+#: contrib/config-daemon.scm:1058
 msgid "Have a look at contrib/dot-procmailrc for an example .procmailrc file."
 msgstr ""
 
-#: contrib/config-daemon.scm:1044
+#: contrib/config-daemon.scm:1069
 msgid "What is the name and port of the server for outgoing e-mail?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1045
+#: contrib/config-daemon.scm:1070
 msgid "The basic format is HOSTNAME:PORT."
 msgstr ""
 
-#: contrib/config-daemon.scm:1056
+#: contrib/config-daemon.scm:1081
 msgid "SMTP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1079
+#: contrib/config-daemon.scm:1104
 msgid "Which port should be used by the UDP IPv4 transport?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1103
+#: contrib/config-daemon.scm:1128
 msgid "What is the maximum transfer unit for UDP?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1127
+#: contrib/config-daemon.scm:1140
+msgid "Which IPs are not allowed to connect?"
+msgstr ""
+
+#: contrib/config-daemon.scm:1152
 msgid ""
 "Which IPs are allowed to connect? Leave empty to allow connections from any "
 "IP."
 msgstr ""
 
-#: contrib/config-daemon.scm:1139
+#: contrib/config-daemon.scm:1188
 msgid "UDP transport"
 msgstr ""
 
-#: contrib/config-daemon.scm:1158
-msgid "Which port should be used by the TCP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1182 contrib/config-daemon.scm:1247
-msgid ""
-"Which IPs are allowed to connect? Leave empty to allow any IP to connect."
-msgstr ""
-
-#: contrib/config-daemon.scm:1194
-msgid "TCP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1211
-msgid "Which port should be used by the UDP IPv6 transport?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1223
-msgid "What is the maximum transfer unit for UDP 6?"
-msgstr ""
-
-#: contrib/config-daemon.scm:1259
-msgid "UDP6 transport"
-msgstr ""
-
-#: contrib/config-daemon.scm:1277
+#: contrib/config-daemon.scm:1210
 #, fuzzy
 msgid "Network interface"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:1289
+#: contrib/config-daemon.scm:1222
 msgid "External IP address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1301
+#: contrib/config-daemon.scm:1234
 msgid "External IPv6 address (leave empty to try auto-detection)"
 msgstr ""
 
-#: contrib/config-daemon.scm:1313
+#: contrib/config-daemon.scm:1246
 msgid "Transports"
 msgstr ""
 
-#: contrib/config-daemon.scm:1337
+#: contrib/config-daemon.scm:1268
 msgid "What is the maximum number of bytes per second that we may receive?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1349
+#: contrib/config-daemon.scm:1280
 msgid "What is the maximum number of bytes per second that we may send?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1361
+#: contrib/config-daemon.scm:1292
 msgid "What is the maximum CPU load (percentage)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1363
+#: contrib/config-daemon.scm:1294
 msgid ""
 "Which CPU load can be tolerated.  Load here always refers to the total "
 "system load, that is it includes CPU utilization by other processes.  A "
@@ -4872,11 +4730,11 @@
 "Multiprocessors may use values above 100."
 msgstr ""
 
-#: contrib/config-daemon.scm:1374
+#: contrib/config-daemon.scm:1305
 msgid "What is the maximum IO load (permille)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1376
+#: contrib/config-daemon.scm:1307
 msgid ""
 "Which IO load can be tolerated.  Load here refers to the percentage of CPU "
 "cycles wasted waiting for IO for the entire system, that is it includes disk "
@@ -4886,36 +4744,36 @@
 "values are typically between 10 and 75."
 msgstr ""
 
-#: contrib/config-daemon.scm:1387
+#: contrib/config-daemon.scm:1318
 msgid "What is the maximum CPU load (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1388
+#: contrib/config-daemon.scm:1319
 msgid ""
 "Which CPU load can be tolerated.  This is the hard limit, so once it is "
 "reached, gnunetd will start to massively drop data to reduce the load.  Use "
 "with caution."
 msgstr ""
 
-#: contrib/config-daemon.scm:1399
+#: contrib/config-daemon.scm:1330
 msgid "What is the maximum upstream bandwidth (hard limit)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1400
+#: contrib/config-daemon.scm:1331
 msgid ""
 "The limit is given as a percentage of the MAXNETUPBPS limit.  Use 100 to "
 "have MAXNETUPBPS be the hard limit.  Use zero for no limit."
 msgstr ""
 
-#: contrib/config-daemon.scm:1411
+#: contrib/config-daemon.scm:1342
 msgid "Should we disable random padding (experimental option)?"
 msgstr ""
 
-#: contrib/config-daemon.scm:1423
+#: contrib/config-daemon.scm:1354
 msgid "Use basic bandwidth limitation? (YES/NO).  If in doubt, say YES."
 msgstr ""
 
-#: contrib/config-daemon.scm:1425
+#: contrib/config-daemon.scm:1356
 msgid ""
 "Basic bandwidth limitation (YES) means simply that the bandwidth limits "
 "specified apply to GNUnet and only to GNUnet.  If set to YES, you simply "
@@ -4960,12 +4818,12 @@
 "since it is irrelevant)."
 msgstr ""
 
-#: contrib/config-daemon.scm:1442
+#: contrib/config-daemon.scm:1373
 #, fuzzy
 msgid "Network interface to monitor"
 msgstr "Giao diện mạng:"
 
-#: contrib/config-daemon.scm:1443
+#: contrib/config-daemon.scm:1374
 msgid ""
 "For which interfaces should we do accounting?  GNUnet will evaluate the "
 "total traffic (not only the GNUnet related traffic) and adjust its bandwidth "
@@ -4976,11 +4834,11 @@
 "number reported by  'gnunet-win-tool -n'."
 msgstr ""
 
-#: contrib/config-daemon.scm:1454
+#: contrib/config-daemon.scm:1385
 msgid "Load management"
 msgstr ""
 
-#: contrib/config-daemon.scm:1479 contrib/config-client.scm:379
+#: contrib/config-daemon.scm:1410 contrib/config-client.scm:379
 msgid "Root node"
 msgstr ""
 
@@ -5740,28 +5598,28 @@
 msgid "Not for English ;-)"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:704
+#: src/applications/fs/gap/fs.c:735
 #, fuzzy
 msgid "# gap requests total received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/fs/gap/fs.c:706
+#: src/applications/fs/gap/fs.c:737
 #, fuzzy
 msgid "# gap content total received"
 msgstr "# nhận được yêu cầu theo vết trace p2p"
 
-#: src/applications/fs/gap/fs.c:708
+#: src/applications/fs/gap/fs.c:739
 msgid "# gap total trust awarded"
 msgstr ""
 
-#: src/applications/fs/gap/fs.c:736
+#: src/applications/fs/gap/fs.c:767
 #, fuzzy, c-format
 msgid ""
 "`%s' registering client handlers %d %d %d %d %d %d %d and P2P handlers %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/gap/fs.c:788
+#: src/applications/fs/gap/fs.c:819
 msgid "enables (anonymous) file-sharing"
 msgstr ""
 
@@ -5773,19 +5631,19 @@
 msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/fs/gap/fs_dht.c:261
+#: src/applications/fs/gap/fs_dht.c:257
 msgid "# blocks pushed into DHT"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:348
+#: src/applications/fs/gap/migration.c:354
 msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:350
+#: src/applications/fs/gap/migration.c:356
 msgid "# blocks fetched for migration"
 msgstr ""
 
-#: src/applications/fs/gap/migration.c:353
+#: src/applications/fs/gap/migration.c:359
 msgid "# on-demand block migration attempts"
 msgstr ""
 
@@ -5800,11 +5658,11 @@
 "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/gap/ondemand.c:454
+#: src/applications/fs/gap/ondemand.c:452
 msgid "Indexed content changed (does not match its hash).\n"
 msgstr ""
 
-#: src/applications/fs/gap/ondemand.c:566
+#: src/applications/fs/gap/ondemand.c:568
 #, fuzzy, c-format
 msgid ""
 "Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
@@ -5814,7 +5672,106 @@
 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"
 
+#~ msgid "Could not determine my public IPv6 address.\n"
+#~ msgstr "Không nhận ra địa chỉ IPv6 của tôi.\n"
+
 #, fuzzy
+#~ msgid "`%s': unknown service: %s\n"
+#~ msgstr "'%s': không rõ dịch vụ: %s\n"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "# bytes received via TCP6"
+#~ msgstr "# byte nhận được qua TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via TCP6"
+#~ msgstr "# Byte gửi qua TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by TCP6 (outgoing)"
+#~ msgstr "# byte loại đi bởi TCP (đi ra)"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "# bytes received via UDP6"
+#~ msgstr "# byte nhận được qua UDP"
+
+#, fuzzy
+#~ msgid "# bytes sent via UDP6"
+#~ msgstr "# byte gửi qua UDP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by UDP6 (outgoing)"
+#~ msgstr "# byte loại bỏ bởi UDP (đi ra)"
+
+#, fuzzy
+#~ msgid "Received malformed message instead of welcome message. Closing.\n"
+#~ msgstr ""
+#~ "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
+#~ "đóng.\n"
+
+#, fuzzy
+#~ msgid "Received malformed message from tcp-peer connection. Closing.\n"
+#~ msgstr ""
+#~ "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
+#~ "đóng.\n"
+
+#, fuzzy
+#~ msgid "TCP: 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"
+
+#~ 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"
+
+#~ 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"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Received malformed message from udp-peer connection. Closing.\n"
+#~ msgstr ""
+#~ "Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
+#~ "đóng.\n"
+
+#~ msgid "exit after receiving LIMIT results"
+#~ msgstr "thoát sau khi nhận được kết quả GIỚIHẠN"
+
+#, fuzzy
+#~ msgid "wait DELAY seconds for search results before aborting"
+#~ msgstr "chờ kết quả tìm kiếm TIMEOUT giây trước khi thoát"
+
+#~ msgid "Message received from peer is invalid.\n"
+#~ msgstr "Thông báo nhận được từ một đầu là sai.\n"
+
+#~ msgid "Using %u messages of size %u for %u times.\n"
+#~ msgstr "Sử dụng %u thông báo với kích thước %u trong %u lần.\n"
+
+#~ msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
+#~ msgstr "Thời gian:  max %16llu  min %16llu  có nghĩa %12.3f  biến %12.3f\n"
+
+#~ msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+#~ msgstr "Mất:  max %16u  min %16u  có nghĩa %12.3f  biến %12.3f\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Failed to receive reply from gnunetd.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận thành công câu trả lời từ gnunetd.\n"
+
+#~ msgid "Running benchmark...\n"
+#~ msgstr "Đang chạy thử mức độ (benchmark)...\n"
+
+#, fuzzy
 #~ msgid "GAP received invalid content from `%s'\n"
 #~ msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
 

Modified: GNUnet/src/transports/upnp/upnp.c
===================================================================
--- GNUnet/src/transports/upnp/upnp.c   2008-02-12 07:33:28 UTC (rev 6262)
+++ GNUnet/src/transports/upnp/upnp.c   2008-02-12 07:42:00 UTC (rev 6263)
@@ -672,8 +672,8 @@
 const char *
 gaim_upnp_get_public_ip ()
 {
-  if (control_info.status == GAIM_UPNP_STATUS_DISCOVERED
-      && control_info.publicip && strlen (control_info.publicip) > 0)
+  if ((control_info.status == GAIM_UPNP_STATUS_DISCOVERED)
+      && (strlen (control_info.publicip) > 0))
     return control_info.publicip;
   return NULL;
 }

Modified: GNUnet/src/util/containers/vector.c
===================================================================
--- GNUnet/src/util/containers/vector.c 2008-02-12 07:33:28 UTC (rev 6262)
+++ GNUnet/src/util/containers/vector.c 2008-02-12 07:42:00 UTC (rev 6263)
@@ -392,7 +392,7 @@
 GNUNET_vector_get (Vector * v, unsigned int index)
 {
   int ret;
-  if ((index < 0) || (index >= v->size))
+  if (index >= v->size)
     return NULL;
   ret = vectorFindIndex (v, index, &v->iteratorSegment);
   if (ret == -1)





reply via email to

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