gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r3130 - GNUnet/po


From: grothoff
Subject: [GNUnet-SVN] r3130 - GNUnet/po
Date: Mon, 24 Jul 2006 16:05:26 -0700 (PDT)

Author: grothoff
Date: 2006-07-24 16:05:12 -0700 (Mon, 24 Jul 2006)
New Revision: 3130

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

Modified: GNUnet/po/GNUnet.pot
===================================================================
--- GNUnet/po/GNUnet.pot        2006-07-23 17:07:38 UTC (rev 3129)
+++ GNUnet/po/GNUnet.pot        2006-07-24 23:05:12 UTC (rev 3130)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 09:13-0700\n"
+"POT-Creation-Date: 2006-07-24 16:55-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -16,321 +16,324 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/transports/ip6.c:60
 #, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:167
-msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+#: src/transports/ip6.c:100
+#, c-format
+msgid "Could not resolve `%s': %s\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:176
-#, c-format
-msgid "hello advertisement for protocol %d received.\n"
+#: src/transports/ip6.c:138
+msgid "Failed to obtain my (external) IPv6 address!\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:295
-msgid "Could not send hellos+PING, ping buffer full.\n"
+#: src/transports/udp6.c:128 src/transports/udp.c:145
+#, c-format
+msgid ""
+"Cannot determine port to bind to.  Define in configuration file in section `%"
+"s' under `%s' or in `%s' under %s/%s.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:308
+#: src/transports/udp6.c:164
 #, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
+msgid "Failed to bind to UDP6 port %d.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:460
+#: src/transports/udp6.c:235
 #, c-format
-msgid "Advertising my transport %d to selected peers.\n"
+msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:467
-msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+#: src/transports/udp6.c:290
+#, c-format
+msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:569
+#: src/transports/udp6.c:321
 #, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+msgid "Packet received from %s:%d (UDP6) failed format check."
 msgstr ""
 
-#: src/applications/advertising/advertising.c:729
-msgid "# Peer advertisements received"
+#: src/transports/udp6.c:334 src/transports/tcp6.c:657
+#, c-format
+msgid "%s: Rejected connection from blacklisted address %s.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:730
-msgid "# Self advertisments transmitted"
+#: src/transports/udp6.c:415
+msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:731
-msgid "# Foreign advertisements forwarded"
+#: src/transports/udp6.c:699 src/transports/smtp.c:932
+#: src/transports/udp.c:722
+#, c-format
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:733
-#: src/applications/pingpong/pingpong.c:462
-msgid "# plaintext PING messages sent"
+#: src/transports/http.c:601
+msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:737
-#: src/applications/session/connect.c:752
+#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
 #, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
+msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:756
-msgid "Network advertisements disabled by configuration!\n"
+#: src/transports/http.c:1101
+msgid "HTTP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:776
-msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
-msgstr ""
-
-#: src/applications/bootstrap_http/http.c:81
-#: src/applications/testbed/testbed.c:1079
+#: src/transports/http.c:1177 src/transports/tcp.c:1150
 #, c-format
-msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:109
+#: src/transports/http.c:1333
 #, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+msgid ""
+"Could not bind the HTTP listener to port %d. No transport service started.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:120
+#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
 #, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:132
-#, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+#: src/transports/http.c:1478
+msgid "# bytes received via HTTP"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
-#, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+#: src/transports/http.c:1480
+msgid "# bytes sent via HTTP"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:217
-#, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
+#: src/transports/http.c:1482
+msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:252
+#: src/transports/smtp.c:297
 #, c-format
-msgid "Parsing hello from `%s' failed.\n"
+msgid "Could not resolve name of SMTP server `%s': %s"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:330
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
 #, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section `%s' "
+"under `%s'.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:355
-msgid "# hellos downloaded via http"
+#: src/transports/smtp.c:489
+msgid "Received malformed message via SMTP (size mismatch).\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:87
-msgid "Message received from peer is invalid.\n"
+#: src/transports/smtp.c:584
+msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:134
-msgid "Message received from client is invalid\n"
+#: src/transports/smtp.c:591
+#, c-format
+msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:156
-msgid "Maximum number of chat clients reached.\n"
+#: src/transports/smtp.c:764
+#, c-format
+msgid "Sending E-mail to `%s' failed.\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:160
+#: src/transports/smtp.c:815
 #, c-format
-msgid "Now %d of %d chat clients at this node.\n"
+msgid "SMTP server send unexpected response at %s:%d.\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:197
+#: src/transports/smtp.c:838
 #, c-format
-msgid "`%s' registering handlers %d and %d\n"
+msgid ""
+"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:212
-msgid "enables P2P-chat (incomplete)"
+#: src/transports/smtp.c:844
+#, c-format
+msgid "Failed to send `%s' request to SMTP server.\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
+#: src/transports/smtp.c:903
+#, c-format
+msgid "%.*s filter %s (SMTP)"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
+#: src/transports/tcp.c:465
+#, c-format
+msgid ""
+"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:106
-#: src/conf/gnunet-setup.c:286 src/server/gnunet-peer-info.c:107
-#: src/server/gnunet-transport-check.c:521 src/server/gnunet-update.c:142
-#: src/server/startup.c:574
+#: src/transports/tcp.c:499
 #, c-format
-msgid "Use --help to get a list of options.\n"
+msgid ""
+"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:151
-#: src/applications/fs/tools/gnunet-delete.c:142
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363 src/util/port.c:85
-msgid "Could not connect to gnunetd.\n"
+#: src/transports/tcp.c:1082
+msgid "Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:155
+#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
 #, c-format
-msgid "You must specify a nickname (use option `%s').\n"
+msgid "Failed to start transport service on port %d.\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
+#: src/transports/tcp.c:1449
+msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:191
-msgid "Could not send message to gnunetd\n"
+#: src/transports/tcp.c:1451
+msgid "# bytes sent via TCP"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:118
-#, c-format
-msgid "Availability test failed for `%s' at %s:%d.\n"
+#: src/transports/tcp.c:1453
+msgid "# bytes dropped by TCP (outgoing)"
 msgstr ""
 
-#: src/applications/datastore/datastore.c:142
+#: src/transports/udp.c:179
 #, c-format
-msgid "Database failed to delete `%s'.\n"
+msgid "Failed to bind to UDP port %d.\n"
 msgstr ""
 
-#: src/applications/datastore/filter.c:42
+#: src/transports/udp.c:250
 #, c-format
-msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
+msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:446
+#: src/transports/udp.c:307
 #, c-format
-msgid "`%s' failed: table not found!\n"
+msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:466
+#: src/transports/udp.c:332
 #, c-format
-msgid "`%s' failed.  Terminating connection to client.\n"
+msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:542
-msgid "sendAck failed.  Terminating connection to client.\n"
+#: src/transports/udp.c:417
+msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/transports/udp.c:551
 #, c-format
-msgid "`%s' failed. Terminating connection to client.\n"
+msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
-#, c-format
-msgid "Failed to deliver `%s' message.\n"
+#: src/transports/udp.c:707
+msgid "# bytes received via UDP"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:946
-#, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
+#: src/transports/udp.c:709
+msgid "# bytes sent via UDP"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:973
+#: src/transports/udp.c:711
+msgid "# bytes dropped by UDP (outgoing)"
+msgstr ""
+
+#: src/transports/ip.c:124
 #, c-format
-msgid "Could not find peer `%s' in routing table!\n"
+msgid ""
+"Could not find interface `%s' in `%s', trying to find another interface.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
+#: src/transports/ip.c:149
 #, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
+msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1447
+#: src/transports/ip.c:193
 #, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
+msgid "Could not find an IP address for interface `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#: src/transports/ip.c:203
 #, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgid ""
+"There is more than one IP address specified for interface `%s'.\n"
+"GNUnet will use %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1793
+#: src/transports/ip.c:224
 #, c-format
-msgid "Invalid response to `%s'.\n"
+msgid "Could not resolve `%s' to determine our IP address: %s\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1993
+#: src/transports/ip.c:256
 #, c-format
-msgid "Malformed response to `%s' on master table.\n"
+msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/transports/ip.c:306
+msgid "Failed to obtain my (external) IP address!\n"
+msgstr ""
+
+#: src/transports/tcp6.c:439
+msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:469
+msgid ""
+"Received malformed message from tcp6-peer connection. Closing connection.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:958
+msgid "Could not determine my public IPv6 address.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:1002
 #, c-format
-msgid "Invalid response to `%s' from `%s'\n"
+msgid "`%s': unknown service: %s\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/session/sessiontest.c:48
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:107
+#: src/applications/tbench/tbenchtest_udp.c:107
+#: src/applications/gap/gaptest.c:52
+msgid "# of connected peers"
+msgstr ""
+
+#: src/applications/dht/tools/dhttest2.c:128
+#: src/applications/session/sessiontest.c:118
+#: src/applications/tbench/tbenchtest.c:199
+#: src/applications/tbench/tbenchtest_udp.c:201
+#: src/applications/gap/gaptest.c:318
 #, c-format
-msgid "Received invalid RPC `%s'.\n"
+msgid "Waiting for gnunetd to start (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/session/sessiontest.c:133
+#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/tbench/tbenchtest_udp.c:122
+#: src/applications/gap/gaptest.c:330
 #, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
+msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
+#: src/applications/dht/tools/dht-query.c:39
+msgid "query table called NAME"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
+#: src/applications/dht/tools/dht-query.c:41
+msgid "allow TIME ms to process each command"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:51
-msgid "Join a DHT."
+#: src/applications/dht/tools/dht-query.c:46
+msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/tbench/gnunet-tbench.c:124
 #: src/applications/tbench/gnunet-tbench.c:134
 #: src/applications/tbench/gnunet-tbench.c:147
@@ -341,6 +344,13 @@
 #: src/applications/tracekit/gnunet-tracekit.c:87
 #: src/applications/tracekit/gnunet-tracekit.c:122
 #: src/applications/tracekit/gnunet-tracekit.c:136
+#: src/applications/fs/tools/gnunet-pseudonym.c:120
+#: src/applications/fs/tools/gnunet-insert.c:315
+#: src/applications/fs/tools/gnunet-insert.c:461
+#: src/applications/fs/tools/gnunet-search.c:167
+#: src/applications/fs/tools/gnunet-search.c:183
+#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/fs/tools/gnunet-download.c:96
 #: src/server/gnunet-transport-check.c:448
 #: src/server/gnunet-transport-check.c:462
 #: src/server/gnunet-transport-check.c:479
@@ -349,56 +359,30 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-query.c:99
+#: src/applications/dht/tools/dht-join.c:108
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546
+#: src/applications/stats/gnunet-stats.c:144
+#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tracekit/gnunet-tracekit.c:153
+#: src/applications/fs/tools/gnunet-pseudonym.c:232
+#: src/applications/fs/tools/gnunet-delete.c:111
+#: src/applications/fs/tools/gnunet-directory.c:190
+#: src/applications/fs/tools/gnunet-insert.c:532
+#: src/applications/fs/tools/gnunet-search.c:221
+#: src/applications/fs/tools/gnunet-download.c:130
+#: src/applications/fs/tools/gnunet-unindex.c:140
+#: src/applications/template/gnunet-template.c:87
+#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
+#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
+#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
 #, c-format
-msgid "Call to `%s' returns %d.\n"
+msgid "Use --help to get a list of options.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:132
-#, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:133
-#, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:211
-#: src/applications/dht/tools/dht-query.c:231
-#, c-format
-msgid "No table name specified, using `%s'.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:236
-msgid "Error joining DHT.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:243
-#, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:250
-msgid "Error leaving DHT.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:39
-msgid "query table called NAME"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:46
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
-msgstr ""
-
 #: src/applications/dht/tools/dht-query.c:106
 msgid "No commands specified.\n"
 msgstr ""
@@ -415,6 +399,12 @@
 msgid "'%s(%s,%s)' failed.\n"
 msgstr ""
 
+#: src/applications/dht/tools/dht-query.c:231
+#: src/applications/dht/tools/dht-join.c:211
+#, c-format
+msgid "No table name specified, using `%s'.\n"
+msgstr ""
+
 #: src/applications/dht/tools/dht-query.c:246
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
@@ -493,3024 +483,2522 @@
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest2.c:50 src/applications/gap/gaptest.c:52
-#: src/applications/session/sessiontest.c:48
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:107
-msgid "# of connected peers"
+#: src/applications/dht/tools/dht-join.c:43
+msgid "allow SIZE bytes of memory for the local table"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
-#: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:199
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+#: src/applications/dht/tools/dht-join.c:45
+msgid "join table called NAME"
 msgstr ""
 
-#: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/gap/gaptest.c:330
-#: src/applications/session/sessiontest.c:133
-#: src/applications/tbench/tbenchtest.c:122
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
+#: src/applications/dht/tools/dht-join.c:51
+msgid "Join a DHT."
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:557
-msgid "# messages defragmented"
+#: src/applications/dht/tools/dht-join.c:115
+msgid "Superflous arguments (ignored).\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:558
-msgid "# messages fragmented"
+#: src/applications/dht/tools/dht-join.c:131
+#, c-format
+msgid "Call to `%s' returns %d.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:559
-msgid "# fragments discarded"
+#: src/applications/dht/tools/dht-join.c:132
+#, c-format
+msgid "Call to `%s' with key `%s'.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/dht/tools/dht-join.c:133
 #, c-format
-msgid "`%s' registering handler %d\n"
+msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:125
-#, c-format
-msgid "Could not unlink temporary file `%s': %s\n"
+#: src/applications/dht/tools/dht-join.c:236
+msgid "Error joining DHT.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:257
+#: src/applications/dht/tools/dht-join.c:243
 #, c-format
-msgid "Write(%d, %p, %d) failed: %s\n"
+msgid "Joined DHT.  Press CTRL-C to leave.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:927
-msgid ""
-"Decrypted content does not match key. This is either a bug or a maliciously "
-"inserted file. Download aborted.\n"
+#: src/applications/dht/tools/dht-join.c:250
+msgid "Error leaving DHT.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:1104
+#: src/applications/dht/module/dht.c:946
 #, c-format
-msgid ""
-"Content `%s' seems to be not available on the network (tried %u times).\n"
+msgid "Malformed optional field `%s' received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:842
+#: src/applications/dht/module/dht.c:973
 #, c-format
-msgid "Renaming of file `%s' to `%s' failed: %s\n"
+msgid "Could not find peer `%s' in routing table!\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:850
+#: src/applications/dht/module/dht.c:1120
+#: src/applications/dht/module/dht.c:1135
 #, c-format
-msgid "Could not rename file `%s' to `%s': file exists\n"
+msgid "Received malformed response to `%s' from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/dht/module/dht.c:1447
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
+msgid "Invalid response to `%s' from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:133
+#: src/applications/dht/module/dht.c:1603
+#: src/applications/dht/module/dht.c:2340
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
 #, c-format
-msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/dht/module/dht.c:1793
 #, c-format
-msgid "File `%s' does not contain a pseudonym.\n"
+msgid "Invalid response to `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/dht/module/dht.c:1993
 #, c-format
-msgid "Format of pseudonym `%s' is invalid.\n"
+msgid "Malformed response to `%s' on master table.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/dht/module/dht.c:2207
+#: src/applications/dht/module/dht.c:2507
 #, c-format
-msgid "Format of file `%s' is invalid.\n"
+msgid "Invalid response to `%s' from `%s'\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:160
-msgid "CHK URI not allowed for search.\n"
+#: src/applications/dht/module/dht.c:2881
+#: src/applications/dht/module/dht.c:3021
+#: src/applications/dht/module/dht.c:3148
+#: src/applications/dht/module/dht.c:3282
+#, c-format
+msgid "Received invalid RPC `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/search.c:216
-msgid "LOC URI not allowed for search.\n"
+#: src/applications/dht/module/dht.c:3160
+#: src/applications/dht/module/dht.c:3296
+#, c-format
+msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/dht/module/cs.c:446
 #, c-format
-msgid "`%s' is not a file.\n"
+msgid "`%s' failed: table not found!\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/dht/module/cs.c:466
 #, c-format
-msgid "Cannot get size of file `%s'"
+msgid "`%s' failed.  Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:193
-msgid "Failed to connect to gnunetd."
+#: src/applications/dht/module/cs.c:542
+msgid "sendAck failed.  Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
+#: src/applications/dht/module/cs.c:688
 #, c-format
-msgid "Cannot hash `%s'.\n"
+msgid "`%s' failed. Terminating connection to client.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
 #, c-format
-msgid "Initialization for indexing file `%s' failed.\n"
+msgid "Failed to deliver `%s' message.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:227
-#, c-format
-msgid "Indexing file `%s' failed. Trying to insert file...\n"
+#: src/applications/chat/chat.c:87
+msgid "Message received from peer is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:306
+#: src/applications/chat/chat.c:134
+msgid "Message received from client is invalid\n"
+msgstr ""
+
+#: src/applications/chat/chat.c:156
+msgid "Maximum number of chat clients reached.\n"
+msgstr ""
+
+#: src/applications/chat/chat.c:160
 #, c-format
-msgid "Indexing data failed at position %i.\n"
+msgid "Now %d of %d chat clients at this node.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:290
-msgid "Download aborted."
+#: src/applications/chat/chat.c:197
+#, c-format
+msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:294
-msgid "ECRS download failed (see logs)."
+#: src/applications/chat/chat.c:212
+msgid "enables P2P-chat (incomplete)"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:298
-msgid "ECRS download suspending."
+#: src/applications/chat/gnunet-chat.c:82
+msgid "specify nickname"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:302
-msgid "Unexpected download state."
+#: src/applications/chat/gnunet-chat.c:87
+msgid "Start GNUnet chat client."
 msgstr ""
 
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-msgid "AND"
+#: src/applications/chat/gnunet-chat.c:151
+#: src/applications/tbench/gnunet-tbench.c:213
+#: src/applications/tracekit/gnunet-tracekit.c:363
+#: src/applications/fs/tools/gnunet-delete.c:142
+msgid "Could not connect to gnunetd.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:66
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1044
+#: src/applications/chat/gnunet-chat.c:155
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s\n"
+msgid "You must specify a nickname (use option `%s').\n"
 msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
+#: src/applications/chat/gnunet-chat.c:182
+msgid "Could not send join message to gnunetd\n"
 msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:292
+#: src/applications/chat/gnunet-chat.c:191
+msgid "Could not send message to gnunetd\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:161
 #, c-format
-msgid "Deleted corrupt URI database in `%s'."
+msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:189
-msgid "FSUI persistence: error restoring download\n"
+#: src/applications/advertising/advertising.c:167
+msgid ""
+"hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/advertising/advertising.c:176
 #, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+msgid "hello advertisement for protocol %d received.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
+#: src/applications/advertising/advertising.c:295
+msgid "Could not send hellos+PING, ping buffer full.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
+#: src/applications/advertising/advertising.c:308
+#, c-format
+msgid "`%s' failed (%d, %u). Will not send PING.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:604
+#: src/applications/advertising/advertising.c:463
+#, c-format
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:470
 msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
+#: src/applications/advertising/advertising.c:572
+#, c-format
+msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr ""
 
-#: src/applications/fs/fsui/unindex.c:85
-msgid "Unindex failed."
+#: src/applications/advertising/advertising.c:734
+msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
-msgid "Upload failed."
+#: src/applications/advertising/advertising.c:735
+msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/fs/fsui/upload.c:455
-msgid "Cannot upload directory without using recursion."
+#: src/applications/advertising/advertising.c:736
+msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1184
-#, c-format
-msgid ""
-"You must specify a postive number for `%s' in the configuration in section `%"
-"s'.\n"
+#: src/applications/advertising/advertising.c:738
+#: src/applications/pingpong/pingpong.c:462
+msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1233
+#: src/applications/advertising/advertising.c:742
+#: src/applications/session/connect.c:752
 #, c-format
-msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
+msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1270
-msgid "enables (anonymous) file-sharing"
+#: src/applications/advertising/advertising.c:761
+msgid "Network advertisements disabled by configuration!\n"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:224
-msgid "# blocks migrated"
+#: src/applications/advertising/advertising.c:781
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:225
-msgid "# on-demand block migration attempts"
+#: src/applications/topology_default/topology.c:398
+#, c-format
+msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/pingpong/pingpong.c:120
+#: src/applications/pingpong/pingpong.c:179
+#: src/applications/pingpong/pingpong.c:227
+#: src/applications/pingpong/pingpong.c:292
 #, c-format
-msgid "Indexed file disappeared, deleting block for query `%s'\n"
+msgid "Received malformed `%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:393
-#, c-format
-msgid ""
-"Because the file `%s' has been unavailable for 3 days it got removed from "
-"your share.  Please unindex files before deleting them as the index now "
-"contains invalid references!\n"
+#: src/applications/pingpong/pingpong.c:130
+msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:419
-#, c-format
-msgid ""
-"Configuration file must specify directory for storage of FS data in section `"
-"%s' under `%s'.\n"
+#: src/applications/pingpong/pingpong.c:187
+msgid "Received PING not destined for us!\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:617
-#, c-format
+#: src/applications/pingpong/pingpong.c:267
+#: src/applications/pingpong/pingpong.c:325
 msgid ""
-"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
 msgstr ""
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1802
-msgid "Failed to get traffic stats.\n"
+#: src/applications/pingpong/pingpong.c:366
+msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-delete.c:37
-#, c-format
-msgid "%8u of %8u bytes deleted."
+#: src/applications/pingpong/pingpong.c:452
+msgid "# encrypted PONG messages received"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-delete.c:52
-msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
+#: src/applications/pingpong/pingpong.c:454
+msgid "# plaintext PONG messages received"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-delete.c:61
-msgid ""
-"Remove file from GNUnet.  The specified file is not removed\n"
-"from the filesystem but just from the local GNUnet datastore."
+#: src/applications/pingpong/pingpong.c:456
+msgid "# encrypted PING messages received"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-delete.c:139
-msgid "You must specify a filename (option -f)\n"
+#: src/applications/pingpong/pingpong.c:458
+msgid "# PING messages created"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-delete.c:151
-#, c-format
-msgid ""
-"Error deleting file %s.\n"
-"Probably a few blocks were already missing from the database.\n"
+#: src/applications/pingpong/pingpong.c:460
+msgid "# encrypted PONG messages sent"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:76
-#, c-format
-msgid "==> Directory `%s':\n"
+#: src/applications/pingpong/pingpong.c:464
+msgid "# encrypted PING messages sent"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:81
+#: src/applications/pingpong/pingpong.c:473
 #, c-format
-msgid "=\tError reading directory.\n"
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:111
+#: src/applications/sqstore_sqlite/sqlite.c:44
+#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_mysql/mysql.c:137
+#: src/applications/sqstore_mysql/mysql.c:144
+#: src/applications/sqstore_mysql/mysql.c:386
+#: src/applications/sqstore_mysql/mysql.c:725
+#: src/applications/sqstore_mysql/mysql.c:740
+#: src/applications/sqstore_mysql/mysql.c:749
+#: src/applications/sqstore_mysql/mysql.c:773
+#: src/applications/sqstore_mysql/mysql.c:783
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:922
+#: src/applications/sqstore_mysql/mysql.c:932
+#: src/applications/sqstore_mysql/mysql.c:1004
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1053
+#: src/applications/sqstore_mysql/mysql.c:1067
+#: src/applications/kvstore_sqlite/kv_sqlite.c:43
+#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
 #, c-format
-msgid "File format error (not a GNUnet directory?)\n"
+msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:113
-#, c-format
-msgid "%d files found in directory.\n"
+#: src/applications/sqstore_sqlite/sqlite.c:139
+msgid "Unable to initialize SQLite.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:131
-msgid "remove all entries from the directory database and stop tracking URIs"
+#: src/applications/sqstore_sqlite/sqlite.c:271
+#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_mysql/mysql.c:223
+#: src/applications/sqstore_mysql/mysql.c:800
+#, c-format
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:133
-msgid "list entries from the directory database"
+#: src/applications/sqstore_sqlite/sqlite.c:272
+#: src/applications/sqstore_sqlite/sqlite.c:290
+msgid "sqlite datastore"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:136
-msgid "start tracking entries for the directory database"
+#: src/applications/sqstore_sqlite/sqlite.c:1035
+#, c-format
+msgid ""
+"Configuration file must specify directory for storing FS data in section `%"
+"s' under `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:140
-msgid "gnunet-directory [OPTIONS] [FILENAMES]"
+#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1178
+msgid "# bytes in datastore"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:141
-msgid "Perform directory related operations."
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
+msgid "Could not initialize libgnunetutil!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:206
+#: src/applications/session/connect.c:209
 #, c-format
-msgid "Listed %d matching entries.\n"
+msgid "Session key from peer `%s' could not be verified.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
+#: src/applications/session/connect.c:246
+msgid "Cannot encrypt sessionkey, other peer not known!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:42
-#: src/applications/fs/tools/gnunet-search.c:108
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/applications/session/connect.c:523
+#, c-format
+msgid "Invalid `%s' message received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
+#: src/applications/session/connect.c:532
+#, c-format
+msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
+#: src/applications/session/connect.c:587
+msgid ""
+"Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:50
-msgid "download a GNUnet directory recursively"
+#: src/applications/session/connect.c:597
+#, c-format
+msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
+#: src/applications/session/connect.c:742
+msgid "# session keys sent"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+#: src/applications/session/connect.c:744
+msgid "# session keys rejected"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:159
-#, c-format
-msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
+#: src/applications/session/connect.c:746
+msgid "# session keys accepted"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
-#, c-format
-msgid "Error downloading: %s\n"
+#: src/applications/session/connect.c:748
+msgid "# sessions established"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:191
+#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
 #, c-format
-msgid "Download of file `%s' complete.  Speed was %8.3f kilobyte per second.\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:237
+#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
 #, c-format
-msgid "URI `%s' invalid for gnunet-download.\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:288
+#: src/applications/rpc/rpc.c:232
 #, c-format
-msgid "File stored as `%s'.\n"
+msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:110
+#: src/applications/rpc/rpc.c:279
 #, c-format
-msgid "Created entry `%s' in namespace `%s'\n"
+msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:115
+#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
+#: src/applications/rpc/rpc.c:1084
 #, c-format
-msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
+msgid "Invalid message of type %u received.  Dropping.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/rpc/rpc.c:936
 #, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
+msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:150
+#: src/applications/rpc/rpc.c:1388
 #, c-format
-msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
+msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:164
+#: src/applications/rpc/rpc.c:1414
 #, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f kbps.\n"
+msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:174
+#: src/applications/rpc/rpc.c:1435
 #, c-format
-msgid "File `%s' has URI: %s\n"
+msgid "Failed to initialize `%s' service.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:187
-#, c-format
-msgid ""
-"\n"
-"Error uploading file: %s\n"
+#: src/applications/rpc/rpc.c:1491
+msgid "RPC async reply invalid.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:206
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-msgid "set the desired LEVEL of sender-anonymity"
+#: src/applications/rpc/rpc.c:1562
+msgid "async RPC reply not received.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:209
-msgid ""
-"even if gnunetd is running on the local machine, force the creation of a "
-"copy instead of making a link to the GNUnet share directory"
+#: src/applications/sqstore_mysql/mysql.c:224
+#: src/applications/sqstore_mysql/mysql.c:801
+msgid "mysql datastore"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:212
-msgid ""
-"use libextractor to add additional direct references to directory entries"
+#: src/applications/sqstore_mysql/mysql.c:1107
+#, c-format
+msgid "Query `%s' had no results.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:214
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/applications/sqstore_mysql/mysql.c:1205
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:218
+#: src/applications/sqstore_mysql/mysql.c:1223
 msgid ""
-"set interval for availability of updates to SECONDS (for namespace "
-"insertions only)"
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:221
+#: src/applications/datastore/filter.c:42
+#, c-format
 msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+"Configuration must specify directory for FS data in section `%s' under `%"
+"s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:224
-msgid ""
-"add an additional keyword for all files and directories (this option can be "
-"specified multiple times)"
+#: src/applications/datastore/datastore.c:118
+#, c-format
+msgid "Availability test failed for `%s' at %s:%d.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:228
-msgid "set the meta-data for the given TYPE to the given VALUE"
+#: src/applications/datastore/datastore.c:142
+#, c-format
+msgid "Database failed to delete `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:230
+#: src/applications/identity/hostkey.c:98
+#: src/applications/identity/identity.c:1086
+#: src/applications/fs/fsui/file_info.c:66
+#, c-format
 msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/identity/hostkey.c:119
+#, c-format
 msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:236
-msgid "specify the priority of the content"
+#: src/applications/identity/hostkey.c:127
+msgid "Creating new hostkey (this may take a while).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:238
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
+#: src/applications/identity/hostkey.c:130
+msgid "Could not create hostkey!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
-msgid "process directories recursively"
+#: src/applications/identity/hostkey.c:139
+msgid "Done creating hostkey.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:242
+#: src/applications/identity/identity.c:333
+#, c-format
 msgid ""
-"specifies this as an aperiodic but updated publication (for namespace "
-"insertions only)"
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:245
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+#: src/applications/identity/identity.c:366
+#, c-format
+msgid "%s `%s' returned no known hosts!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:248
-msgid "specify creation time for SBlock (see man-page for format)"
+#: src/applications/identity/identity.c:648
+#: src/applications/identity/identity.c:666
+#, c-format
+msgid "Removed file `%s' containing invalid hello data.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:250
-msgid "ID of the previous version of the content (for namespace update only)"
+#: src/applications/identity/identity.c:716
+#, c-format
+msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:257
-msgid "Make files available to GNUnet for sharing."
+#: src/applications/identity/identity.c:724
+msgid "Signature failed verification: signature invalid.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:344
+#: src/applications/testbed/commands.c:1130
+#: src/applications/stats/gnunet-stats.c:61
 #, c-format
-msgid "You must pass a positive number to the `%s' option.\n"
+msgid "Supported peer-to-peer messages:\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:429
+#: src/applications/testbed/commands.c:1132
+#: src/applications/stats/gnunet-stats.c:64
 #, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+msgid "Supported client-server messages:\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:537
-#: src/applications/fs/tools/gnunet-unindex.c:145
-#, c-format
-msgid "You must specify a list of files to insert.\n"
+#: src/applications/testbed/gnunet-testbed.c:119
+msgid "Start GNUnet-testbed helper."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:541
+#: src/applications/testbed/gnunet-testbed.c:183
 #, c-format
-msgid "Only one file or directory can be specified at a time.\n"
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:545
+#: src/applications/testbed/gnunet-testbed.c:282
 #, c-format
-msgid "You must specify a file or directory to upload.\n"
+msgid "Could not execute `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:595
-#, c-format
-msgid "Keywords for file `%s':\n"
+#: src/applications/testbed/gnunet-testbed.c:325
+msgid "No client service started. Trying again in 30 seconds.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:617
+#: src/applications/testbed/gnunet-testbed.c:348
 #, c-format
-msgid "Could not access namespace `%s' (does not exist?).\n"
+msgid ""
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:636
+#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
 #, c-format
-msgid "Parsing time failed. Use `%s' format.\n"
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:649
-#: src/applications/fs/tools/gnunet-insert.c:653
-#: src/applications/fs/tools/gnunet-insert.c:657
-#: src/applications/fs/tools/gnunet-insert.c:661
-#: src/applications/fs/tools/gnunet-insert.c:666
+#: src/applications/testbed/gnunet-testbed.c:428
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+msgid "Protocol violation on socket. Expected command.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:35
-msgid "automate creation of a namespace by starting a collection"
+#: src/applications/testbed/gnunet-testbed.c:467
+#, c-format
+msgid "Command `%s' not found!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
-msgid "create a new pseudonym under the given NICKNAME"
+#: src/applications/testbed/gnunet-testbed.c:540
+msgid "Start GNUnet testbed controller."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
-msgid "delete the pseudonym with the given NICKNAME"
+#: src/applications/testbed/gnunet-testbed.c:594
+#, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
-msgid "end automated building of a namespace (ends collection)"
+#: src/applications/testbed/testbed.c:50
+msgid "Could not send acknowledgement back to client.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
-msgid ""
-"use the given keyword to advertise the namespace (use when creating a new "
-"pseudonym)"
+#: src/applications/testbed/testbed.c:60
+#, c-format
+msgid "Received unknown testbed message of type %u.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
+#: src/applications/testbed/testbed.c:78
+#: src/applications/testbed/testbed.c:807
+#, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
-msgid ""
-"do not generate an advertisement for this namespace (use when creating a new "
-"pseudonym)"
+#: src/applications/testbed/testbed.c:85
+#, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
-msgid "do not list the pseudonyms from the pseudonym database"
+#: src/applications/testbed/testbed.c:137
+#, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
-msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
+#: src/applications/testbed/testbed.c:215
+#: src/applications/testbed/testbed.c:256
+#: src/applications/testbed/testbed.c:359
+#: src/applications/testbed/testbed.c:366
+#: src/applications/testbed/testbed.c:403
+#: src/applications/testbed/testbed.c:410
+#, c-format
+msgid "received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid ""
-"specify IDENTIFIER to be the address of the entrypoint to content in the "
-"namespace (use when creating a new pseudonym)"
+#: src/applications/testbed/testbed.c:231
+#: src/applications/testbed/testbed.c:271
+#, c-format
+msgid "received invalid `%s' message (empty module name)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
-msgid "set the rating of a namespace"
+#: src/applications/testbed/testbed.c:238
+#, c-format
+msgid "loading module `%s' failed.  Notifying client.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
+#: src/applications/testbed/testbed.c:278
+msgid "unloading module failed.  Notifying client.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
+#: src/applications/testbed/testbed.c:539
+#, c-format
+msgid "`%s' %s failed: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+#: src/applications/testbed/testbed.c:625
+#, c-format
+msgid "received invalid `%s' message: %s.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#: src/applications/testbed/testbed.c:817
 #, c-format
-msgid "Invalid argument: `%s'\n"
+msgid "'..' is not allowed in file name (%s).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/conf/gnunet-setup.c:179 src/server/gnunet-peer-info.c:118
-#: src/server/gnunet-transport-check.c:532
-msgid "Invalid arguments. Exiting.\n"
+#: src/applications/testbed/testbed.c:826
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, c-format
-msgid "Namespace `%s' has rating %d.\n"
+#: src/applications/testbed/testbed.c:833
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
-#, c-format
-msgid "Namespace `%s' (%s) has rating %d.\n"
+#: src/applications/testbed/testbed.c:841
+msgid "Upload refused!"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#: src/applications/testbed/testbed.c:867
 #, c-format
-msgid "\tRating (after update): %d\n"
+msgid "Invalid message received at %s:%d."
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#: src/applications/testbed/testbed.c:985
 #, c-format
-msgid "Collection stopped.\n"
+msgid "received invalid testbed message of size %u\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#: src/applications/testbed/testbed.c:1002
 #, c-format
-msgid "Failed to stop collection (not active?).\n"
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
-#, c-format
-msgid "Pseudonym `%s' deleted.\n"
+#: src/applications/testbed/testbed.c:1045
+msgid "No testbed URL given, not registered.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#: src/applications/testbed/testbed.c:1079
+#: src/applications/bootstrap_http/http.c:81
 #, c-format
-msgid "Error deleting pseudonym `%s' (does not exist?).\n"
+msgid "Invalid URL `%s' (must begin with `%s')\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#: src/applications/testbed/testbed.c:1118
 #, c-format
-msgid "Started collection `%s'.\n"
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#: src/applications/testbed/testbed.c:1154
 #, c-format
-msgid "Failed to start collection.\n"
+msgid "Could not register testbed, host `%s' unknown\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#: src/applications/testbed/testbed.c:1177
 #, c-format
-msgid "Could not create namespace `%s' (exists?).\n"
+msgid "Failed to send HTTP request to host `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#: src/applications/testbed/testbed.c:1230
 #, c-format
-msgid "Namespace `%s' created (root: %s).\n"
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
-#, c-format
-msgid "Could not access namespace information.\n"
+#: src/applications/testbed/testbed.c:1269
+msgid "Exit register (error: no http response read).\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:114
-msgid "exit after receiving LIMIT results"
+#: src/applications/testbed/testbed.c:1357
+msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:116
-msgid "write encountered (decrypted) search results to FILENAME"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:118
-msgid "wait TIMEOUT seconds for search results before aborting"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:123
-msgid "Search GNUnet for files."
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:227
-msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-search.c:278
+#: src/applications/transport/transport.c:483
+#: src/applications/transport/transport.c:491
 #, c-format
-msgid "Starting search failed. Consult logs.\n"
+msgid "No transport of type %d known.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-search.c:353
+#: src/applications/transport/transport.c:676
 #, c-format
-msgid "Error converting arguments to URI!\n"
+msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:50
+#: src/applications/transport/transport.c:691
 #, c-format
 msgid ""
-"%16llu of %16llu bytes unindexed (estimating %llu seconds to "
-"completion)                "
+"You should specify at least one transport service under option `%s' in "
+"section `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
+#: src/applications/transport/transport.c:717
 #, c-format
-msgid ""
-"\n"
-"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
+msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/transport/transport.c:738
 #, c-format
-msgid ""
-"\n"
-"Error unindexing file: %s\n"
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:97
-msgid "Unindex files."
+#: src/applications/fragmentation/fragmentation.c:557
+msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:149
-#, c-format
-msgid "You must specify one and only one file to unindex.\n"
+#: src/applications/fragmentation/fragmentation.c:558
+msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-unindex.c:190
-#, c-format
-msgid "`%s' failed.  Is `%s' a file?\n"
+#: src/applications/fragmentation/fragmentation.c:559
+msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/fragmentation/fragmentation.c:569
 #, c-format
-msgid "GAP received invalid content from `%s'\n"
+msgid "`%s' registering handler %d\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1618
-msgid "myself"
+#: src/applications/stats/gnunet-stats.c:94
+msgid "prints supported protocol messages"
 msgstr ""
 
-#: src/applications/gap/gap.c:1791
-msgid ""
-"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+#: src/applications/stats/gnunet-stats.c:99
+msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
-msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
+#: src/applications/stats/gnunet-stats.c:167
+#, c-format
+msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2077
-msgid "# gap requests total received"
+#: src/applications/stats/gnunet-stats.c:181
+#, c-format
+msgid "Error reading information from gnunetd.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2078
-msgid "# gap requests policy: immediate drop"
+#: src/applications/stats/clientapi.c:179
+msgid "Uptime (seconds)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2079
-msgid "# gap requests policy: not routed"
+#: src/applications/stats/statistics.c:206
+#, c-format
+msgid "% of allowed network load (up)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2080
-msgid "# gap requests policy: not answered"
+#: src/applications/stats/statistics.c:208
+#, c-format
+msgid "% of allowed network load (down)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2081
-msgid "# gap requests processed: attempted add to RT"
+#: src/applications/stats/statistics.c:210
+#, c-format
+msgid "% of allowed cpu load"
 msgstr ""
 
-#: src/applications/gap/gap.c:2082
-msgid "# gap requests processed: local result"
+#: src/applications/stats/statistics.c:214
+msgid "# bytes of noise received"
 msgstr ""
 
-#: src/applications/gap/gap.c:2083
-msgid "# gap routing successes (total)"
+#: src/applications/stats/statistics.c:374
+msgid "keeps statistics about gnunetd's operation"
 msgstr ""
 
-#: src/applications/gap/gap.c:2084
-msgid "# gap requests dropped: collision in RT"
+#: src/applications/tbench/gnunet-tbench.c:95
+msgid "output in gnuplot format"
 msgstr ""
 
-#: src/applications/gap/gap.c:2085
-msgid "# gap requests forwarded (counting each peer)"
+#: src/applications/tbench/gnunet-tbench.c:98
+msgid "number of iterations"
 msgstr ""
 
-#: src/applications/gap/gap.c:2086
-msgid "# gap duplicate requests (pending)"
+#: src/applications/tbench/gnunet-tbench.c:100
+msgid "number of messages to use per iteration"
 msgstr ""
 
-#: src/applications/gap/gap.c:2087
-msgid "# gap duplicate requests that were re-tried"
+#: src/applications/tbench/gnunet-tbench.c:102
+msgid "receiver host identifier (ENC file name)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2088
-msgid "# gap re-try ttl difference (cummulative)"
+#: src/applications/tbench/gnunet-tbench.c:104
+msgid "message size"
 msgstr ""
 
-#: src/applications/gap/gap.c:2089
-msgid "# gap reply duplicates"
+#: src/applications/tbench/gnunet-tbench.c:106
+msgid "sleep for SPACE ms after each a message block"
 msgstr ""
 
-#: src/applications/gap/gap.c:2090
-msgid "# gap spurious replies"
+#: src/applications/tbench/gnunet-tbench.c:108
+msgid "time to wait for the completion of an iteration (in ms)"
 msgstr ""
 
-#: src/applications/gap/gap.c:2091
-msgid "# gap routing slots currently in use"
+#: src/applications/tbench/gnunet-tbench.c:111
+msgid "number of messages in a message block"
 msgstr ""
 
-#: src/applications/gap/gap.c:2092
-msgid "# gap memory used for tracking seen content"
+#: src/applications/tbench/gnunet-tbench.c:115
+msgid "Start GNUnet transport benchmarking tool."
 msgstr ""
 
-#: src/applications/gap/gap.c:2093
-msgid "# gap memory used for tracking routing destinations"
+#: src/applications/tbench/gnunet-tbench.c:225
+msgid "You must specify a receiver!\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2094
-msgid "# gap rewards pending"
+#: src/applications/tbench/gnunet-tbench.c:228
+#, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2095
-msgid "# gap response weights"
+#: src/applications/tbench/gnunet-tbench.c:249
+#, c-format
+msgid "Time:\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2112
-msgid ""
-"Traffic service failed to load; gap cannot ensure cover-traffic "
-"availability.\n"
+#: src/applications/tbench/gnunet-tbench.c:250
+#, c-format
+msgid "\tmax      %llums\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/tbench/gnunet-tbench.c:252
 #, c-format
-msgid "`%s' registering handlers %d %d\n"
+msgid "\tmin      %llums\n"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/tbench/gnunet-tbench.c:254
 #, c-format
-msgid "`%s' registering client handler %d\n"
+msgid "\tmean     %8.4fms\n"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:82
-msgid "allows clients to determine gnunetd's configuration"
+#: src/applications/tbench/gnunet-tbench.c:256
+#, c-format
+msgid "\tvariance %8.4fms\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/tbench/gnunet-tbench.c:259
 #, c-format
-msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:127
-msgid "Creating new hostkey (this may take a while).\n"
+#: src/applications/tbench/gnunet-tbench.c:260
+#, c-format
+msgid "\tmax      %u\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
+#: src/applications/tbench/gnunet-tbench.c:262
+#, c-format
+msgid "\tmin      %u\n"
 msgstr ""
 
-#: src/applications/identity/hostkey.c:139
-msgid "Done creating hostkey.\n"
+#: src/applications/tbench/gnunet-tbench.c:264
+#, c-format
+msgid "\tmean     %8.4f\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:329
+#: src/applications/tbench/gnunet-tbench.c:266
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgid "\tvariance %8.4f\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:362
+#: src/applications/tbench/gnunet-tbench.c:275
 #, c-format
-msgid "%s `%s' returned no known hosts!\n"
+msgid "Output format not known, this should not happen.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:644
-#: src/applications/identity/identity.c:662
+#: src/applications/tbench/gnunet-tbench.c:279
 #, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
+msgid ""
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:712
+#: src/applications/tbench/tbenchtest.c:57
+#: src/applications/tbench/tbenchtest_udp.c:57
 #, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
+msgid "Using %u messages of size %u for %u times.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:720
-msgid "Signature failed verification: signature invalid.\n"
+#: src/applications/tbench/tbenchtest.c:84
+#: src/applications/tbench/tbenchtest_udp.c:84
+#, c-format
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
+#: src/applications/tbench/tbenchtest.c:89
+#: src/applications/tbench/tbenchtest_udp.c:89
 #, c-format
-msgid "Received malformed `%s' message. Dropping.\n"
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:130
-msgid "Received ping for another peer. Dropping.\n"
-msgstr ""
-
-#: src/applications/pingpong/pingpong.c:187
-msgid "Received PING not destined for us!\n"
-msgstr ""
-
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/tbench/tbenchtest.c:95
+#: src/applications/tbench/tbenchtest_udp.c:95
+#, c-format
 msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+"\n"
+"Failed to receive reply from gnunetd.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:366
-msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+#: src/applications/tbench/tbenchtest.c:211
+#: src/applications/tbench/tbenchtest_udp.c:213
+#, c-format
+msgid "Running benchmark...\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:452
-msgid "# encrypted PONG messages received"
+#: src/applications/tbench/tbench.c:448
+msgid "allows profiling of direct peer-to-peer connections"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:454
-msgid "# plaintext PONG messages received"
+#: src/applications/tracekit/gnunet-tracekit.c:101
+msgid "probe network to the given DEPTH"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:456
-msgid "# encrypted PING messages received"
+#: src/applications/tracekit/gnunet-tracekit.c:103
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:458
-msgid "# PING messages created"
+#: src/applications/tracekit/gnunet-tracekit.c:107
+msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:460
-msgid "# encrypted PONG messages sent"
+#: src/applications/tracekit/gnunet-tracekit.c:110
+msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:464
-msgid "# encrypted PING messages sent"
+#: src/applications/tracekit/gnunet-tracekit.c:114
+msgid "Trace GNUnet network topology."
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/tracekit/gnunet-tracekit.c:222
 #, c-format
-msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+msgid "`%s' is not connected to any peer.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/tracekit/gnunet-tracekit.c:233
 #, c-format
 msgid ""
-"%s::%s - RPC %s:%p could not be registered: another callback is already "
-"using this name (%p)\n"
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/tracekit/gnunet-tracekit.c:260
 #, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
-"under that name: %p\n"
+msgid "`%s' connected to `%s'.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:232
+#: src/applications/tracekit/gnunet-tracekit.c:275
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
+msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/tracekit/gnunet-tracekit.c:298
 #, c-format
-msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
+msgid "Peer `%s' did not report back.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
-#, c-format
-msgid "Invalid message of type %u received.  Dropping.\n"
+#: src/applications/tracekit/gnunet-tracekit.c:387
+msgid "Could not send request to gnunetd.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/tracekit/tracekit.c:62
+#: src/applications/tracekit/tracekit.c:186
 #, c-format
-msgid "Dropping RPC request %u: message malformed.\n"
+msgid "Received invalid `%s' message from `%s'.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1388
-#, c-format
-msgid "RPC not unregistered: %s:%p\n"
+#: src/applications/tracekit/tracekit.c:243
+msgid "TRACEKIT: routing table full, trace request dropped\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/tracekit/tracekit.c:331
 #, c-format
-msgid "`%s' registering handlers %d %d %d\n"
+msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1435
-#, c-format
-msgid "Failed to initialize `%s' service.\n"
+#: src/applications/tracekit/tracekit.c:431
+msgid "allows mapping of the network topology"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1491
-msgid "RPC async reply invalid.\n"
+#: src/applications/gap/gap.c:1617
+#, c-format
+msgid "GAP received invalid content from `%s'\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1562
-msgid "async RPC reply not received.\n"
+#: src/applications/gap/gap.c:1618
+msgid "myself"
 msgstr ""
 
-#: src/applications/session/connect.c:209
-#, c-format
-msgid "Session key from peer `%s' could not be verified.\n"
+#: src/applications/gap/gap.c:1791
+msgid ""
+"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:246
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
+#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
+msgid "Failed to get traffic stats.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:523
-#, c-format
-msgid "Invalid `%s' message received from peer `%s'.\n"
+#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
+#: src/applications/gap/gap.c:1819
+msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:532
-#, c-format
-msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
+#: src/applications/gap/gap.c:2077
+msgid "# gap requests total received"
 msgstr ""
 
-#: src/applications/session/connect.c:587
-msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+#: src/applications/gap/gap.c:2078
+msgid "# gap requests policy: immediate drop"
 msgstr ""
 
-#: src/applications/session/connect.c:597
-#, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
+#: src/applications/gap/gap.c:2079
+msgid "# gap requests policy: not routed"
 msgstr ""
 
-#: src/applications/session/connect.c:742
-msgid "# session keys sent"
+#: src/applications/gap/gap.c:2080
+msgid "# gap requests policy: not answered"
 msgstr ""
 
-#: src/applications/session/connect.c:744
-msgid "# session keys rejected"
+#: src/applications/gap/gap.c:2081
+msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/applications/session/connect.c:746
-msgid "# session keys accepted"
+#: src/applications/gap/gap.c:2082
+msgid "# gap requests processed: local result"
 msgstr ""
 
-#: src/applications/session/connect.c:748
-msgid "# sessions established"
+#: src/applications/gap/gap.c:2083
+msgid "# gap routing successes (total)"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:57
-#: src/util/hostkey_gcrypt.c:64 src/util/storage.c:659
-#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1042 src/include/gnunet_util.h:1049
-#: src/include/gnunet_util.h:1051
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
+#: src/applications/gap/gap.c:2084
+msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
-#, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+#: src/applications/gap/gap.c:2085
+msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
-msgid "mysql datastore"
+#: src/applications/gap/gap.c:2086
+msgid "# gap duplicate requests (pending)"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1107
-#, c-format
-msgid "Query `%s' had no results.\n"
+#: src/applications/gap/gap.c:2087
+msgid "# gap duplicate requests that were re-tried"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-msgid "# bytes in datastore"
+#: src/applications/gap/gap.c:2088
+msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1205
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
+#: src/applications/gap/gap.c:2089
+msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1223
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
+#: src/applications/gap/gap.c:2090
+msgid "# gap spurious replies"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-msgid "Could not initialize libgnunetutil!\n"
+#: src/applications/gap/gap.c:2091
+msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
+#: src/applications/gap/gap.c:2092
+msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
-msgid "sqlite datastore"
+#: src/applications/gap/gap.c:2093
+msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1035
-#, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
+#: src/applications/gap/gap.c:2094
+msgid "# gap rewards pending"
 msgstr ""
 
-#: src/applications/stats/clientapi.c:179
-msgid "Uptime (seconds)"
+#: src/applications/gap/gap.c:2095
+msgid "# gap response weights"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:61
-#: src/applications/testbed/commands.c:1130
-#, c-format
-msgid "Supported peer-to-peer messages:\n"
+#: src/applications/gap/gap.c:2112
+msgid ""
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:64
-#: src/applications/testbed/commands.c:1132
+#: src/applications/gap/gap.c:2143
 #, c-format
-msgid "Supported client-server messages:\n"
+msgid "`%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:94
-msgid "prints supported protocol messages"
+#: src/applications/gap/pid_table.c:151
+msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
+#: src/applications/gap/pid_table.c:153
+msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/getoption/getoption.c:75
 #, c-format
-msgid "Error establishing connection with gnunetd.\n"
+msgid "`%s' registering client handler %d\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:181
-#, c-format
-msgid "Error reading information from gnunetd.\n"
+#: src/applications/getoption/getoption.c:82
+msgid "allows clients to determine gnunetd's configuration"
 msgstr ""
 
-#: src/applications/stats/statistics.c:206
-#, c-format
-msgid "% of allowed network load (up)"
+#: src/applications/fs/tools/gnunet-pseudonym.c:33
+#: src/applications/fs/tools/gnunet-insert.c:206
+msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/applications/stats/statistics.c:208
-#, c-format
-msgid "% of allowed network load (down)"
+#: src/applications/fs/tools/gnunet-pseudonym.c:35
+msgid "automate creation of a namespace by starting a collection"
 msgstr ""
 
-#: src/applications/stats/statistics.c:210
-#, c-format
-msgid "% of allowed cpu load"
+#: src/applications/fs/tools/gnunet-pseudonym.c:38
+msgid "create a new pseudonym under the given NICKNAME"
 msgstr ""
 
-#: src/applications/stats/statistics.c:214
-msgid "# bytes of noise received"
+#: src/applications/fs/tools/gnunet-pseudonym.c:40
+msgid "delete the pseudonym with the given NICKNAME"
 msgstr ""
 
-#: src/applications/stats/statistics.c:372
-msgid "keeps statistics about gnunetd's operation"
+#: src/applications/fs/tools/gnunet-pseudonym.c:42
+msgid "end automated building of a namespace (ends collection)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:95
-msgid "output in gnuplot format"
+#: src/applications/fs/tools/gnunet-pseudonym.c:46
+msgid ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:98
-msgid "number of iterations"
+#: src/applications/fs/tools/gnunet-pseudonym.c:48
+msgid ""
+"specify that the contents of the namespace are of the given MIMETYPE (use "
+"when creating a new pseudonym)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:100
-msgid "number of messages to use per iteration"
+#: src/applications/fs/tools/gnunet-pseudonym.c:50
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:102
-msgid "receiver host identifier (ENC file name)"
+#: src/applications/fs/tools/gnunet-pseudonym.c:52
+msgid "do not list the pseudonyms from the pseudonym database"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:104
-msgid "message size"
+#: src/applications/fs/tools/gnunet-pseudonym.c:54
+msgid ""
+"specify NAME to be the realname of the user controlling the namespace (use "
+"when creating a new pseudonym)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:106
-msgid "sleep for SPACE ms after each a message block"
+#: src/applications/fs/tools/gnunet-pseudonym.c:56
+msgid ""
+"specify IDENTIFIER to be the address of the entrypoint to content in the "
+"namespace (use when creating a new pseudonym)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:108
-msgid "time to wait for the completion of an iteration (in ms)"
+#: src/applications/fs/tools/gnunet-pseudonym.c:58
+msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:111
-msgid "number of messages in a message block"
+#: src/applications/fs/tools/gnunet-pseudonym.c:60
+msgid ""
+"use DESCRIPTION to describe the content of the namespace (use when creating "
+"a new pseudonym)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
+#: src/applications/fs/tools/gnunet-pseudonym.c:62
+msgid ""
+"specify the given URI as an address that contains more information about the "
+"namespace (use when creating a new pseudonym)"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:225
-msgid "You must specify a receiver!\n"
+#: src/applications/fs/tools/gnunet-pseudonym.c:67
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:228
-#, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+#: src/applications/fs/tools/gnunet-pseudonym.c:159
+#: src/applications/fs/tools/gnunet-pseudonym.c:164
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
+#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
+msgid "AND"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:249
+#: src/applications/fs/tools/gnunet-pseudonym.c:239
 #, c-format
-msgid "Time:\n"
+msgid "Invalid argument: `%s'\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:250
-#, c-format
-msgid "\tmax      %llums\n"
+#: src/applications/fs/tools/gnunet-pseudonym.c:241
+#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
+#: src/setup/gnunet-setup.c:179
+msgid "Invalid arguments. Exiting.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/fs/tools/gnunet-pseudonym.c:282
 #, c-format
-msgid "\tmin      %llums\n"
+msgid "Namespace `%s' has rating %d.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:254
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
 #, c-format
-msgid "\tmean     %8.4fms\n"
+msgid "Namespace `%s' (%s) has rating %d.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/fs/tools/gnunet-pseudonym.c:319
 #, c-format
-msgid "\tvariance %8.4fms\n"
+msgid "\tRating (after update): %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:259
+#: src/applications/fs/tools/gnunet-pseudonym.c:359
 #, c-format
-msgid "Loss:\n"
+msgid "Collection stopped.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/fs/tools/gnunet-pseudonym.c:361
 #, c-format
-msgid "\tmax      %u\n"
+msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:262
+#: src/applications/fs/tools/gnunet-pseudonym.c:369
 #, c-format
-msgid "\tmin      %u\n"
+msgid "Pseudonym `%s' deleted.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:264
+#: src/applications/fs/tools/gnunet-pseudonym.c:373
 #, c-format
-msgid "\tmean     %8.4f\n"
+msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/fs/tools/gnunet-pseudonym.c:426
 #, c-format
-msgid "\tvariance %8.4f\n"
+msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/applications/fs/tools/gnunet-pseudonym.c:429
 #, c-format
-msgid "Output format not known, this should not happen.\n"
+msgid "Failed to start collection.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/fs/tools/gnunet-pseudonym.c:473
 #, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:448
-msgid "allows profiling of direct peer-to-peer connections"
+#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#, c-format
+msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:57
+#: src/applications/fs/tools/gnunet-pseudonym.c:504
 #, c-format
-msgid "Using %u messages of size %u for %u times.\n"
+msgid "Could not access namespace information.\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:84
+#: src/applications/fs/tools/gnunet-delete.c:37
 #, c-format
-msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
+msgid "%8u of %8u bytes deleted."
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:89
-#, c-format
-msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+#: src/applications/fs/tools/gnunet-delete.c:52
+msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:95
-#, c-format
+#: src/applications/fs/tools/gnunet-delete.c:61
 msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
+"Remove file from GNUnet.  The specified file is not removed\n"
+"from the filesystem but just from the local GNUnet datastore."
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:211
-#, c-format
-msgid "Running benchmark...\n"
+#: src/applications/fs/tools/gnunet-delete.c:139
+msgid "You must specify a filename (option -f)\n"
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:70
-msgid "helptext for -t"
+#: src/applications/fs/tools/gnunet-delete.c:151
+#, c-format
+msgid ""
+"Error deleting file %s.\n"
+"Probably a few blocks were already missing from the database.\n"
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
+#: src/applications/fs/tools/gnunet-directory.c:76
+#, c-format
+msgid "==> Directory `%s':\n"
 msgstr ""
 
-#: src/applications/template/template.c:61
+#: src/applications/fs/tools/gnunet-directory.c:81
 #, c-format
-msgid "`%s' registering client handler %d and %d\n"
+msgid "=\tError reading directory.\n"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:119
-msgid "Start GNUnet-testbed helper."
+#: src/applications/fs/tools/gnunet-directory.c:111
+#, c-format
+msgid "File format error (not a GNUnet directory?)\n"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:183
+#: src/applications/fs/tools/gnunet-directory.c:113
 #, c-format
-msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgid "%d files found in directory.\n"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:282
-#, c-format
-msgid "Could not execute `%s': %s\n"
+#: src/applications/fs/tools/gnunet-directory.c:131
+msgid "remove all entries from the directory database and stop tracking URIs"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:325
-msgid "No client service started. Trying again in 30 seconds.\n"
+#: src/applications/fs/tools/gnunet-directory.c:133
+msgid "list entries from the directory database"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:348
-#, c-format
-msgid ""
-"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
-"Trying again in %d seconds...\n"
+#: src/applications/fs/tools/gnunet-directory.c:136
+msgid "start tracking entries for the directory database"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
-#, c-format
-msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
+#: src/applications/fs/tools/gnunet-directory.c:140
+msgid "gnunet-directory [OPTIONS] [FILENAMES]"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:428
-#, c-format
-msgid "Protocol violation on socket. Expected command.\n"
+#: src/applications/fs/tools/gnunet-directory.c:141
+msgid "Perform directory related operations."
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:467
+#: src/applications/fs/tools/gnunet-directory.c:206
 #, c-format
-msgid "Command `%s' not found!\n"
+msgid "Listed %d matching entries.\n"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:540
-msgid "Start GNUnet testbed controller."
+#: src/applications/fs/tools/gnunet-insert.c:110
+#, c-format
+msgid "Created entry `%s' in namespace `%s'\n"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:594
+#: src/applications/fs/tools/gnunet-insert.c:115
 #, c-format
-msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:50
-msgid "Could not send acknowledgement back to client.\n"
+#: src/applications/fs/tools/gnunet-insert.c:136
+#, c-format
+msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:60
+#: src/applications/fs/tools/gnunet-insert.c:150
 #, c-format
-msgid "Received unknown testbed message of type %u.\n"
+msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:78
-#: src/applications/testbed/testbed.c:807
+#: src/applications/fs/tools/gnunet-insert.c:164
 #, c-format
-msgid "size of `%s' message is too short. Ignoring.\n"
+msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:85
+#: src/applications/fs/tools/gnunet-insert.c:174
 #, c-format
-msgid "size of `%s' message is wrong. Ignoring.\n"
+msgid "File `%s' has URI: %s\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:137
+#: src/applications/fs/tools/gnunet-insert.c:187
 #, c-format
-msgid "TESTBED could not generate hello message for protocol %u\n"
+msgid ""
+"\n"
+"Error uploading file: %s\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:215
-#: src/applications/testbed/testbed.c:256
-#: src/applications/testbed/testbed.c:359
-#: src/applications/testbed/testbed.c:366
-#: src/applications/testbed/testbed.c:403
-#: src/applications/testbed/testbed.c:410
-#, c-format
-msgid "received invalid `%s' message\n"
+#: src/applications/fs/tools/gnunet-insert.c:209
+msgid ""
+"even if gnunetd is running on the local machine, force the creation of a "
+"copy instead of making a link to the GNUnet share directory"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:231
-#: src/applications/testbed/testbed.c:271
-#, c-format
-msgid "received invalid `%s' message (empty module name)\n"
+#: src/applications/fs/tools/gnunet-insert.c:212
+msgid ""
+"use libextractor to add additional direct references to directory entries"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:238
-#, c-format
-msgid "loading module `%s' failed.  Notifying client.\n"
+#: src/applications/fs/tools/gnunet-insert.c:214
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:278
-msgid "unloading module failed.  Notifying client.\n"
+#: src/applications/fs/tools/gnunet-insert.c:218
+msgid ""
+"set interval for availability of updates to SECONDS (for namespace "
+"insertions only)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:539
-#, c-format
-msgid "`%s' %s failed: %s\n"
+#: src/applications/fs/tools/gnunet-insert.c:221
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:625
-#, c-format
-msgid "received invalid `%s' message: %s.\n"
+#: src/applications/fs/tools/gnunet-insert.c:224
+msgid ""
+"add an additional keyword for all files and directories (this option can be "
+"specified multiple times)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:817
-#, c-format
-msgid "'..' is not allowed in file name (%s).\n"
+#: src/applications/fs/tools/gnunet-insert.c:228
+msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:826
-msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+#: src/applications/fs/tools/gnunet-insert.c:230
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:833
-msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+#: src/applications/fs/tools/gnunet-insert.c:233
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:841
-msgid "Upload refused!"
+#: src/applications/fs/tools/gnunet-insert.c:236
+msgid "specify the priority of the content"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:867
-#, c-format
-msgid "Invalid message received at %s:%d."
+#: src/applications/fs/tools/gnunet-insert.c:238
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:985
-#, c-format
-msgid "received invalid testbed message of size %u\n"
+#: src/applications/fs/tools/gnunet-insert.c:240
+msgid "process directories recursively"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1002
-#, c-format
+#: src/applications/fs/tools/gnunet-insert.c:242
 msgid ""
-"Received testbed message of type %u but unexpected size %u, expected %u\n"
+"specifies this as an aperiodic but updated publication (for namespace "
+"insertions only)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1045
-msgid "No testbed URL given, not registered.\n"
+#: src/applications/fs/tools/gnunet-insert.c:245
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1054 src/transports/http.c:1455
-#, c-format
-msgid "Could not resolve name of HTTP proxy `%s'.\n"
+#: src/applications/fs/tools/gnunet-insert.c:248
+msgid "specify creation time for SBlock (see man-page for format)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1118
-#, c-format
-msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
+#: src/applications/fs/tools/gnunet-insert.c:250
+msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1154
-#, c-format
-msgid "Could not register testbed, host `%s' unknown\n"
+#: src/applications/fs/tools/gnunet-insert.c:257
+msgid "Make files available to GNUnet for sharing."
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1177
+#: src/applications/fs/tools/gnunet-insert.c:344
 #, c-format
-msgid "Failed to send HTTP request to host `%s': %s\n"
+msgid "You must pass a positive number to the `%s' option.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1230
+#: src/applications/fs/tools/gnunet-insert.c:429
 #, c-format
-msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1269
-msgid "Exit register (error: no http response read).\n"
+#: src/applications/fs/tools/gnunet-insert.c:537
+#: src/applications/fs/tools/gnunet-unindex.c:145
+#, c-format
+msgid "You must specify a list of files to insert.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1357
-msgid "allows construction of a P2P-testbed (incomplete)"
+#: src/applications/fs/tools/gnunet-insert.c:541
+#, c-format
+msgid "Only one file or directory can be specified at a time.\n"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:398
+#: src/applications/fs/tools/gnunet-insert.c:545
 #, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
+msgid "You must specify a file or directory to upload.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:323
+#: src/applications/fs/tools/gnunet-insert.c:595
 #, c-format
-msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+msgid "Keywords for file `%s':\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/applications/fs/tools/gnunet-insert.c:617
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
+msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:358
-msgid "Syntax error in topology specification, skipping bytes.\n"
+#: src/applications/fs/tools/gnunet-insert.c:636
+#, c-format
+msgid "Parsing time failed. Use `%s' format.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/applications/fs/tools/gnunet-insert.c:649
+#: src/applications/fs/tools/gnunet-insert.c:653
+#: src/applications/fs/tools/gnunet-insert.c:657
+#: src/applications/fs/tools/gnunet-insert.c:661
+#: src/applications/fs/tools/gnunet-insert.c:666
 #, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
-msgid "probe network to the given DEPTH"
+#: src/applications/fs/tools/gnunet-search.c:108
+#: src/applications/fs/tools/gnunet-download.c:42
+msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
-msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+#: src/applications/fs/tools/gnunet-search.c:114
+msgid "exit after receiving LIMIT results"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
-msgid "use PRIO for the priority of the trace request"
+#: src/applications/fs/tools/gnunet-search.c:116
+msgid "write encountered (decrypted) search results to FILENAME"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
-msgid "wait DELAY seconds for replies"
+#: src/applications/fs/tools/gnunet-search.c:118
+msgid "wait TIMEOUT seconds for search results before aborting"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
+#: src/applications/fs/tools/gnunet-search.c:123
+msgid "Search GNUnet for files."
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:222
-#, c-format
-msgid "`%s' is not connected to any peer.\n"
+#: src/applications/fs/tools/gnunet-search.c:227
+msgid "Not enough arguments. You must specify a keyword or identifier.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:233
+#: src/applications/fs/tools/gnunet-search.c:278
 #, c-format
-msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
+msgid "Starting search failed. Consult logs.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
+#: src/applications/fs/tools/gnunet-search.c:353
 #, c-format
-msgid "`%s' connected to `%s'.\n"
+msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
-#, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+#: src/applications/fs/tools/gnunet-download.c:41
+msgid "LEVEL"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
-#, c-format
-msgid "Peer `%s' did not report back.\n"
+#: src/applications/fs/tools/gnunet-download.c:47
+msgid "FILENAME"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
-msgid "Could not send request to gnunetd.\n"
+#: src/applications/fs/tools/gnunet-download.c:48
+msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
-#, c-format
-msgid "Received invalid `%s' message from `%s'.\n"
+#: src/applications/fs/tools/gnunet-download.c:50
+msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:243
-msgid "TRACEKIT: routing table full, trace request dropped\n"
+#: src/applications/fs/tools/gnunet-download.c:56
+msgid "Download files from GNUnet."
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:331
-#, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
+#: src/applications/fs/tools/gnunet-download.c:136
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:431
-msgid "allows mapping of the network topology"
+#: src/applications/fs/tools/gnunet-download.c:159
+#, c-format
+msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
+#: src/applications/fs/tools/gnunet-download.c:172
+#: src/applications/fs/tools/gnunet-download.c:183
+#, c-format
+msgid "Error downloading: %s\n"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
+#: src/applications/fs/tools/gnunet-download.c:191
+#, c-format
+msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:445
+#: src/applications/fs/tools/gnunet-download.c:237
 #, c-format
-msgid "# bytes transmitted of type %d"
+msgid "URI `%s' invalid for gnunet-download.\n"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:465
+#: src/applications/fs/tools/gnunet-download.c:288
 #, c-format
-msgid "# bytes received of type %d"
+msgid "File stored as `%s'.\n"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:605
-msgid "tracks bandwidth utilization by gnunetd"
-msgstr ""
-
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/applications/fs/tools/gnunet-unindex.c:50
 #, c-format
-msgid "No transport of type %d known.\n"
+msgid ""
+"%16llu of %16llu bytes unindexed (estimating %llu seconds to "
+"completion)                "
 msgstr ""
 
-#: src/applications/transport/transport.c:676
+#: src/applications/fs/tools/gnunet-unindex.c:61
 #, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgid ""
+"\n"
+"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:691
+#: src/applications/fs/tools/gnunet-unindex.c:72
 #, c-format
 msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
+"\n"
+"Error unindexing file: %s\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:717
-#, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
+#: src/applications/fs/tools/gnunet-unindex.c:97
+msgid "Unindex files."
 msgstr ""
 
-#: src/applications/transport/transport.c:738
+#: src/applications/fs/tools/gnunet-unindex.c:149
 #, c-format
-msgid "I am peer `%s'.\n"
+msgid "You must specify one and only one file to unindex.\n"
 msgstr ""
 
-#: src/conf/conf.c:522 src/conf/recreate.c:135
+#: src/applications/fs/tools/gnunet-unindex.c:190
 #, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
+msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr ""
 
-#: src/conf/conf.c:529
+#: src/applications/fs/module/ondemand.c:305
 #, c-format
-msgid "Configuration file `%s' created.\n"
+msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/conf/confdata.c:93
+#: src/applications/fs/module/ondemand.c:393
 #, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
+msgid ""
+"Because the file `%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!\n"
 msgstr ""
 
-#: src/conf/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
+#: src/applications/fs/module/ondemand.c:419
+#, c-format
+msgid ""
+"Configuration file must specify directory for storage of FS data in section `"
+"%s' under `%s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:10 src/conf/wizard.glade:259
-#: src/conf/wizard.glade:711 src/conf/wizard.glade:1436
-#: src/conf/wizard.glade:2217
-msgid "GNUnet configuration assistant"
+#: src/applications/fs/module/ondemand.c:617
+#, c-format
+msgid ""
+"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:56
+#: src/applications/fs/module/fs.c:1184
+#, c-format
 msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org\n";
-"and join our community at\n"
-"\thttps://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"The GNUnet team"
+"You must specify a postive number for `%s' in the configuration in section `%"
+"s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:142 src/conf/wizard.glade:594
-#: src/conf/wizard.glade:1319 src/conf/wizard.glade:2581
-msgid "Next"
+#: src/applications/fs/module/fs.c:1233
+#, c-format
+msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/conf/wizard.glade:217 src/conf/wizard.glade:669
-#: src/conf/wizard.glade:1394 src/conf/wizard.glade:1928
-#: src/conf/wizard.glade:2656
-msgid "Cancel"
+#: src/applications/fs/module/fs.c:1270
+msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/conf/wizard.glade:318
-msgid ""
-"Enter information about your network connection here.\n"
-"\n"
-"The \"Network interface\" is the device that connects your computer to the "
-"internet. This is usually a modem, an ISDN card or a network card in case "
-"you are using DSL.\n"
-"\n"
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your "
-"IP-Address.\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, check the last option on this page. Leave it "
-"unchecked on direct connections through modems, ISDN cards and DNAT (also "
-"known as \"port forwarding\")."
+#: src/applications/fs/module/migration.c:224
+msgid "# blocks migrated"
 msgstr ""
 
-#: src/conf/wizard.glade:372
-msgid "Network interface:"
+#: src/applications/fs/module/migration.c:225
+msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/conf/wizard.glade:400
-msgid "IP-Address/Hostname:"
+#: src/applications/fs/fsui/namespace_info.c:583
+msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/conf/wizard.glade:451
-msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+#: src/applications/fs/fsui/namespace_info.c:604
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:514
-msgid "Network connection"
+#: src/applications/fs/fsui/search.c:245
+msgid "This search is already pending!\n"
 msgstr ""
 
-#: src/conf/wizard.glade:770
-msgid ""
-"You can limit GNUnet's ressource usage here.\n"
-"\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you "
-"have a flatrate you can set it to the maximum speed of your internet "
-"connection.\n"
-"\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
-"to use."
+#: src/applications/fs/fsui/fsui.c:189
+msgid "FSUI persistence: error restoring download\n"
 msgstr ""
 
-#: src/conf/wizard.glade:833
-msgid "Upstream (Bytes/s):"
+#: src/applications/fs/fsui/fsui.c:638
+#, c-format
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:883
-msgid "Downstream (Bytes/s):"
+#: src/applications/fs/fsui/download.c:290
+msgid "Download aborted."
 msgstr ""
 
-#: src/conf/wizard.glade:942
-msgid "Bandwidth limitation"
+#: src/applications/fs/fsui/download.c:294
+msgid "ECRS download failed (see logs)."
 msgstr ""
 
-#: src/conf/wizard.glade:986
-msgid "Use denoted bandwidth for GNUnet"
+#: src/applications/fs/fsui/download.c:298
+msgid "ECRS download suspending."
 msgstr ""
 
-#: src/conf/wizard.glade:1006
-msgid "Share denoted bandwidth with other applications"
+#: src/applications/fs/fsui/download.c:302
+msgid "Unexpected download state."
 msgstr ""
 
-#: src/conf/wizard.glade:1028
-msgid "Bandwidth sharing"
+#: src/applications/fs/fsui/unindex.c:85
+msgid "Unindex failed."
 msgstr ""
 
-#: src/conf/wizard.glade:1071
-msgid "Max. CPU usage (%):"
+#: src/applications/fs/fsui/helper.c:67
+msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1118
-msgid "CPU usage"
+#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:448
+msgid "Upload failed."
 msgstr ""
 
-#: src/conf/wizard.glade:1164
-msgid "Load limitation"
+#: src/applications/fs/fsui/upload.c:455
+msgid "Cannot upload directory without using recursion."
 msgstr ""
 
-#: src/conf/wizard.glade:1244 src/conf/wizard.glade:1778
-#: src/conf/wizard.glade:2506
-msgid "Back"
+#: src/applications/fs/fsui/file_info.c:93
+msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1495
-msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is "
-"useful if an adversary has access to your inserted content and you need to "
-"deny that the content is yours. With \"content migration\" on, the content "
-"could have \"migrated\" over the internet to your node without your "
-"knowledge.\n"
-"It also helps to spread popular content over different peers to enhance "
-"availability.\n"
-"\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, "
-"inserted and migrated content). Its maximum size can be specified below.\n"
-"\n"
-"If you are an experienced user, you may want to tweak your GNUnet "
-"installation using the enhanced configurator.\n"
-"\n"
-"After changing the configuration and/or updating GNUnet, it is sometimes "
-"required to run gnunet-update to update internal data structures. Depending "
-"on the changes made, this may take some time."
+#: src/applications/fs/fsui/file_info.c:282
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/conf/wizard.glade:1541
-msgid "Store migrated content"
+#: src/applications/fs/ecrs/search.c:160
+msgid "CHK URI not allowed for search.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1566
-msgid "Maximum datastore size (MB):"
+#: src/applications/fs/ecrs/search.c:216
+msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1621
-msgid "Start the GNUnet background process on computer startup"
+#: src/applications/fs/ecrs/download.c:125
+#, c-format
+msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1642
-msgid "Open the enhanced configurator"
+#: src/applications/fs/ecrs/download.c:257
+#, c-format
+msgid "Write(%d, %p, %d) failed: %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1663
-msgid "Run gnunet-update"
+#: src/applications/fs/ecrs/download.c:935
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1698 src/conf/wizard.glade:2426
-msgid "Other settings"
+#: src/applications/fs/ecrs/download.c:1112
+#, c-format
+msgid ""
+"Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1853
-msgid "Finish"
+#: src/applications/fs/ecrs/upload.c:180
+#, c-format
+msgid "`%s' is not a file.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1968
-msgid "Question"
+#: src/applications/fs/ecrs/upload.c:186
+#, c-format
+msgid "Cannot get size of file `%s'"
 msgstr ""
 
-#: src/conf/wizard.glade:2014
-msgid "Do you want to save your settings?"
+#: src/applications/fs/ecrs/upload.c:193
+msgid "Failed to connect to gnunetd."
 msgstr ""
 
-#: src/conf/wizard.glade:2065
-msgid "Yes"
+#: src/applications/fs/ecrs/upload.c:203
+#, c-format
+msgid "Cannot hash `%s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2078
-msgid "No"
+#: src/applications/fs/ecrs/upload.c:221
+#, c-format
+msgid "Initialization for indexing file `%s' failed.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2098 src/conf/wizard.glade:2696
-#: src/conf/wizard_curs.c:58 src/conf/wizard_util.c:120
-#: src/conf/wizard_util.c:163 src/util/configuration.c:522
-msgid "Error"
+#: src/applications/fs/ecrs/upload.c:227
+#, c-format
+msgid "Indexing file `%s' failed. Trying to insert file...\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2144
-msgid "Unable to save configuration!"
+#: src/applications/fs/ecrs/upload.c:306
+#, c-format
+msgid "Indexing data failed at position %i.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2195 src/conf/wizard.glade:2793
-msgid "OK"
+#: src/applications/fs/ecrs/meta.c:842
+#, c-format
+msgid "Renaming of file `%s' to `%s' failed: %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2276
+#: src/applications/fs/ecrs/meta.c:850
+#, c-format
+msgid "Could not rename file `%s' to `%s': file exists\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/namespace.c:45
+#, c-format
 msgid ""
-"Define the user and the group owning the GNUnet service here.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new user "
-"account and a new group under which the GNUnet service is started at system "
-"startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the fields empty to run GNUnet with system privileges."
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2317
-msgid "Group:"
+#: src/applications/fs/ecrs/namespace.c:133
+#, c-format
+msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2389
-msgid "User account:"
+#: src/applications/fs/ecrs/namespace.c:307
+#: src/applications/fs/ecrs/namespace.c:383
+#: src/applications/fs/ecrs/namespace.c:528
+#, c-format
+msgid "File `%s' does not contain a pseudonym.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2742
-msgid "gnunet-update failed!"
+#: src/applications/fs/ecrs/namespace.c:318
+#: src/applications/fs/ecrs/namespace.c:394
+#, c-format
+msgid "Format of pseudonym `%s' is invalid.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2813
-msgid "Gtk GNUnet Configurator"
+#: src/applications/fs/ecrs/namespace.c:538
+#: src/applications/fs/ecrs/namespace.c:548
+#, c-format
+msgid "Format of file `%s' is invalid.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2847
-msgid "_File"
+#: src/applications/topology_f2f/topology.c:323
+#, c-format
+msgid ""
+"Need to have list of friends in configuration under `%s' in section `%s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2856 src/conf/wizard.glade:3189
-msgid "Load a config file"
+#: src/applications/topology_f2f/topology.c:342
+#, c-format
+msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2857
-msgid "_Load"
+#: src/applications/topology_f2f/topology.c:358
+msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2879
-msgid "Save the config in .config"
+#: src/applications/topology_f2f/topology.c:370
+#, c-format
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2880
-msgid "_Save"
+#: src/applications/template/template.c:61
+#, c-format
+msgid "`%s' registering client handler %d and %d\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2908
-msgid "_Quit"
+#: src/applications/template/gnunet-template.c:70
+#: src/applications/vpn/gnunet-vpn.c:72
+msgid "helptext for -t"
 msgstr ""
 
-#: src/conf/wizard.glade:2934
-msgid "_Options"
+#: src/applications/template/gnunet-template.c:75
+msgid "Template for gnunet-clients."
 msgstr ""
 
-#: src/conf/wizard.glade:2943
-msgid "Show name"
+#: src/applications/bootstrap_http/http.c:109
+#, c-format
+msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2944
-msgid "Show _name"
+#: src/applications/bootstrap_http/http.c:120
+#, c-format
+msgid "`%s' failed at %s:%d with error: `%s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2954
-msgid "Show range (Y/M/N)"
+#: src/applications/bootstrap_http/http.c:132
+#, c-format
+msgid "Could not download list of peer contacts, host `%s' unknown.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2955
-msgid "Show _range"
+#: src/applications/bootstrap_http/http.c:155
+#: src/applications/bootstrap_http/http.c:181
+#, c-format
+msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2965
-msgid "Show value of the option"
+#: src/applications/bootstrap_http/http.c:217
+#, c-format
+msgid "Parsing HTTP response for URL `%s' failed.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2966
-msgid "Show _data"
+#: src/applications/bootstrap_http/http.c:252
+#, c-format
+msgid "Parsing hello from `%s' failed.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2982
-msgid "Show all options"
+#: src/applications/bootstrap_http/http.c:330
+#, c-format
+msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2983
-msgid "Show all _options"
+#: src/applications/bootstrap_http/http.c:355
+msgid "# hellos downloaded via http"
 msgstr ""
 
-#: src/conf/wizard.glade:2997
-msgid "_Help"
+#: src/applications/traffic/traffic.c:445
+#, c-format
+msgid "# bytes transmitted of type %d"
 msgstr ""
 
-#: src/conf/wizard.glade:3006
-msgid "_Introduction"
+#: src/applications/traffic/traffic.c:465
+#, c-format
+msgid "# bytes received of type %d"
 msgstr ""
 
-#: src/conf/wizard.glade:3028
-msgid "_About"
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/conf/wizard.glade:3083
-msgid "Goes up of one level (single view)"
+#: src/applications/traffic/clientapi.c:67
+msgid "Failed to query gnunetd about traffic conditions.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3126
-msgid "Up"
+#: src/applications/traffic/clientapi.c:74
+msgid "Did not receive reply from gnunetd about traffic conditions.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3232
-msgid "Load"
+#: src/applications/kvstore_sqlite/kv_sqlite.c:181
+#, c-format
+msgid ""
+"Configuration file must specify directory for storing data in section `%s' "
+"under `%s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3276
-msgid "Save a config file"
+#: src/applications/kvstore_sqlite/kv_sqlite.c:264
+msgid "Unable to initialize SQLite KVStore.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3319
-msgid "Save"
+#: src/applications/vpn/gnunet-vpn.c:77
+msgid "VPN over GNUnet."
 msgstr ""
 
-#: src/conf/wizard.glade:3382
-msgid "Single view"
+#: src/applications/vpn/vpn.c:315
+#, c-format
+msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3425
-msgid "Single"
+#: src/applications/vpn/vpn.c:323
+#, c-format
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/conf/wizard.glade:3469
-msgid "Split view"
+#: src/applications/vpn/vpn.c:351
+#, c-format
+msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3512
-msgid "Split"
+#: src/applications/vpn/vpn.c:400
+#, c-format
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3556
-msgid "Full view"
+#: src/applications/vpn/vpn.c:404
+#, c-format
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3599
-msgid "Full"
+#: src/applications/vpn/vpn.c:414
+#, c-format
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3662
-msgid "Collapse the whole tree in the right frame"
+#: src/applications/vpn/vpn.c:474
+#, c-format
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3705
-msgid "Collapse"
+#: src/applications/vpn/vpn.c:478
+#, c-format
+msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/conf/wizard.glade:3749
-msgid "Expand the whole tree in the right frame"
+#: src/applications/vpn/vpn.c:505
+#, c-format
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3792
-msgid "Expand"
+#: src/applications/vpn/vpn.c:513
+#, c-format
+msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3935
-msgid ""
-"This is GNUnet's configuration interface.\n"
-"\n"
-"GNUnet's options are separated into categories. You can browse them in the "
-"left tree. If you click on one of the categories, its options are shown "
-"above. \n"
-"\n"
-"To change the value of an option, simply click on its value and enter a new "
-"value. To get additional information about a specific option, click on its "
-"description."
+#: src/applications/vpn/vpn.c:517
+#, c-format
+msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3967
-msgid "Introduction"
+#: src/applications/vpn/vpn.c:555
+#, c-format
+msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:4043
-msgid ""
-"Welcome to GNUnet Setup.\n"
-"\n"
-"For each option, a blank box indicates the feature is disabled, and checked "
-"one indicates it is enabled.\n"
-"If you do not see an option that you believe should be present, try turning "
-"on Show All Options under the Options menu.\n"
-"\n"
-"Although there is no cross reference yet to help you figure out what other "
-"options must be enabled to support the option you are interested in, you can "
-"still view the help of a grayed-out option.\n"
-"\n"
-"Toggling Show Debug Info under the Options menu will show the dependencies, "
-"which you can then match by examining other options."
+#: src/applications/vpn/vpn.c:559
+#, c-format
+msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:4067
-msgid "gnunet-setup"
+#: src/applications/vpn/vpn.c:566
+#, c-format
+msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:4068
-msgid "(C) 2001-2006 Christian Grothoff (and other contributing authors)"
+#: src/applications/vpn/vpn.c:571
+#, c-format
+msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:4069
-msgid "This is the configuration tool for GNUnet."
+#: src/applications/vpn/vpn.c:579
+#, c-format
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/conf/wizard.glade:4070
-msgid ""
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"\t\t       Version 2, June 1991\n"
-"\n"
-" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
-"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-" Everyone is permitted to copy and distribute verbatim copies\n"
-" of this license document, but changing it is not allowed.\n"
-"\n"
-"\t\t\t    Preamble\n"
-"\n"
-"  The licenses for most software are designed to take away your\n"
-"freedom to share and change it.  By contrast, the GNU General Public\n"
-"License is intended to guarantee your freedom to share and change free\n"
-"software--to make sure the software is free for all its users.  This\n"
-"General Public License applies to most of the Free Software\n"
-"Foundation's software and to any other program whose authors commit to\n"
-"using it.  (Some other Free Software Foundation software is covered by\n"
-"the GNU Library General Public License instead.)  You can apply it to\n"
-"your programs, too.\n"
-"\n"
-"  When we speak of free software, we are referring to freedom, not\n"
-"price.  Our General Public Licenses are designed to make sure that you\n"
-"have the freedom to distribute copies of free software (and charge for\n"
-"this service if you wish), that you receive source code or can get it\n"
-"if you want it, that you can change the software or use pieces of it\n"
-"in new free programs; and that you know you can do these things.\n"
-"\n"
-"  To protect your rights, we need to make restrictions that forbid\n"
-"anyone to deny you these rights or to ask you to surrender the rights.\n"
-"These restrictions translate to certain responsibilities for you if you\n"
-"distribute copies of the software, or if you modify it.\n"
-"\n"
-"  For example, if you distribute copies of such a program, whether\n"
-"gratis or for a fee, you must give the recipients all the rights that\n"
-"you have.  You must make sure that they, too, receive or can get the\n"
-"source code.  And you must show them these terms so they know their\n"
-"rights.\n"
-"\n"
-"  We protect your rights with two steps: (1) copyright the software, and\n"
-"(2) offer you this license which gives you legal permission to copy,\n"
-"distribute and/or modify the software.\n"
-"\n"
-"  Also, for each author's protection and ours, we want to make certain\n"
-"that everyone understands that there is no warranty for this free\n"
-"software.  If the software is modified by someone else and passed on, we\n"
-"want its recipients to know that what they have is not the original, so\n"
-"that any problems introduced by others will not reflect on the original\n"
-"authors' reputations.\n"
-"\n"
-"  Finally, any free program is threatened constantly by software\n"
-"patents.  We wish to avoid the danger that redistributors of a free\n"
-"program will individually obtain patent licenses, in effect making the\n"
-"program proprietary.  To prevent this, we have made it clear that any\n"
-"patent must be licensed for everyone's free use or not licensed at all.\n"
-"\n"
-"  The precise terms and conditions for copying, distribution and\n"
-"modification follow.\n"
-"\n"
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
-"\n"
-"  0. This License applies to any program or other work which contains\n"
-"a notice placed by the copyright holder saying it may be distributed\n"
-"under the terms of this General Public License.  The \"Program\", below,\n"
-"refers to any such program or work, and a \"work based on the Program\"\n"
-"means either the Program or any derivative work under copyright law:\n"
-"that is to say, a work containing the Program or a portion of it,\n"
-"either verbatim or with modifications and/or translated into another\n"
-"language.  (Hereinafter, translation is included without limitation in\n"
-"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
-"\n"
-"Activities other than copying, distribution and modification are not\n"
-"covered by this License; they are outside its scope.  The act of\n"
-"running the Program is not restricted, and the output from the Program\n"
-"is covered only if its contents constitute a work based on the\n"
-"Program (independent of having been made by running the Program).\n"
-"Whether that is true depends on what the Program does.\n"
-"\n"
-"  1. You may copy and distribute verbatim copies of the Program's\n"
-"source code as you receive it, in any medium, provided that you\n"
-"conspicuously and appropriately publish on each copy an appropriate\n"
-"copyright notice and disclaimer of warranty; keep intact all the\n"
-"notices that refer to this License and to the absence of any warranty;\n"
-"and give any other recipients of the Program a copy of this License\n"
-"along with the Program.\n"
-"\n"
-"You may charge a fee for the physical act of transferring a copy, and\n"
-"you may at your option offer warranty protection in exchange for a fee.\n"
-"\n"
-"  2. You may modify your copy or copies of the Program or any portion\n"
-"of it, thus forming a work based on the Program, and copy and\n"
-"distribute such modifications or work under the terms of Section 1\n"
-"above, provided that you also meet all of these conditions:\n"
-"\n"
-"    a) You must cause the modified files to carry prominent notices\n"
-"    stating that you changed the files and the date of any change.\n"
-"\n"
-"    b) You must cause any work that you distribute or publish, that in\n"
-"    whole or in part contains or is derived from the Program or any\n"
-"    part thereof, to be licensed as a whole at no charge to all third\n"
-"    parties under the terms of this License.\n"
-"\n"
-"    c) If the modified program normally reads commands interactively\n"
-"    when run, you must cause it, when started running for such\n"
-"    interactive use in the most ordinary way, to print or display an\n"
-"    announcement including an appropriate copyright notice and a\n"
-"    notice that there is no warranty (or else, saying that you provide\n"
-"    a warranty) and that users may redistribute the program under\n"
-"    these conditions, and telling the user how to view a copy of this\n"
-"    License.  (Exception: if the Program itself is interactive but\n"
-"    does not normally print such an announcement, your work based on\n"
-"    the Program is not required to print an announcement.)\n"
-"\n"
-"These requirements apply to the modified work as a whole.  If\n"
-"identifiable sections of that work are not derived from the Program,\n"
-"and can be reasonably considered independent and separate works in\n"
-"themselves, then this License, and its terms, do not apply to those\n"
-"sections when you distribute them as separate works.  But when you\n"
-"distribute the same sections as part of a whole which is a work based\n"
-"on the Program, the distribution of the whole must be on the terms of\n"
-"this License, whose permissions for other licensees extend to the\n"
-"entire whole, and thus to each and every part regardless of who wrote it.\n"
-"\n"
-"Thus, it is not the intent of this section to claim rights or contest\n"
-"your rights to work written entirely by you; rather, the intent is to\n"
-"exercise the right to control the distribution of derivative or\n"
-"collective works based on the Program.\n"
-"\n"
-"In addition, mere aggregation of another work not based on the Program\n"
-"with the Program (or with a work based on the Program) on a volume of\n"
-"a storage or distribution medium does not bring the other work under\n"
-"the scope of this License.\n"
-"\n"
-"  3. You may copy and distribute the Program (or a work based on it,\n"
-"under Section 2) in object code or executable form under the terms of\n"
-"Sections 1 and 2 above provided that you also do one of the following:\n"
-"\n"
-"    a) Accompany it with the complete corresponding machine-readable\n"
-"    source code, which must be distributed under the terms of Sections\n"
-"    1 and 2 above on a medium customarily used for software interchange; "
-"or,\n"
-"\n"
-"    b) Accompany it with a written offer, valid for at least three\n"
-"    years, to give any third party, for a charge no more than your\n"
-"    cost of physically performing source distribution, a complete\n"
-"    machine-readable copy of the corresponding source code, to be\n"
-"    distributed under the terms of Sections 1 and 2 above on a medium\n"
-"    customarily used for software interchange; or,\n"
-"\n"
-"    c) Accompany it with the information you received as to the offer\n"
-"    to distribute corresponding source code.  (This alternative is\n"
-"    allowed only for noncommercial distribution and only if you\n"
-"    received the program in object code or executable form with such\n"
-"    an offer, in accord with Subsection b above.)\n"
-"\n"
-"The source code for a work means the preferred form of the work for\n"
-"making modifications to it.  For an executable work, complete source\n"
-"code means all the source code for all modules it contains, plus any\n"
-"associated interface definition files, plus the scripts used to\n"
-"control compilation and installation of the executable.  However, as a\n"
-"special exception, the source code distributed need not include\n"
-"anything that is normally distributed (in either source or binary\n"
-"form) with the major components (compiler, kernel, and so on) of the\n"
-"operating system on which the executable runs, unless that component\n"
-"itself accompanies the executable.\n"
-"\n"
-"If distribution of executable or object code is made by offering\n"
-"access to copy from a designated place, then offering equivalent\n"
-"access to copy the source code from the same place counts as\n"
-"distribution of the source code, even though third parties are not\n"
-"compelled to copy the source along with the object code.\n"
-"\n"
-"  4. You may not copy, modify, sublicense, or distribute the Program\n"
-"except as expressly provided under this License.  Any attempt\n"
-"otherwise to copy, modify, sublicense or distribute the Program is\n"
-"void, and will automatically terminate your rights under this License.\n"
-"However, parties who have received copies, or rights, from you under\n"
-"this License will not have their licenses terminated so long as such\n"
-"parties remain in full compliance.\n"
-"\n"
-"  5. You are not required to accept this License, since you have not\n"
-"signed it.  However, nothing else grants you permission to modify or\n"
-"distribute the Program or its derivative works.  These actions are\n"
-"prohibited by law if you do not accept this License.  Therefore, by\n"
-"modifying or distributing the Program (or any work based on the\n"
-"Program), you indicate your acceptance of this License to do so, and\n"
-"all its terms and conditions for copying, distributing or modifying\n"
-"the Program or works based on it.\n"
-"\n"
-"  6. Each time you redistribute the Program (or any work based on the\n"
-"Program), the recipient automatically receives a license from the\n"
-"original licensor to copy, distribute or modify the Program subject to\n"
-"these terms and conditions.  You may not impose any further\n"
-"restrictions on the recipients' exercise of the rights granted herein.\n"
-"You are not responsible for enforcing compliance by third parties to\n"
-"this License.\n"
-"\n"
-"  7. If, as a consequence of a court judgment or allegation of patent\n"
-"infringement or for any other reason (not limited to patent issues),\n"
-"conditions are imposed on you (whether by court order, agreement or\n"
-"otherwise) that contradict the conditions of this License, they do not\n"
-"excuse you from the conditions of this License.  If you cannot\n"
-"distribute so as to satisfy simultaneously your obligations under this\n"
-"License and any other pertinent obligations, then as a consequence you\n"
-"may not distribute the Program at all.  For example, if a patent\n"
-"license would not permit royalty-free redistribution of the Program by\n"
-"all those who receive copies directly or indirectly through you, then\n"
-"the only way you could satisfy both it and this License would be to\n"
-"refrain entirely from distribution of the Program.\n"
-"\n"
-"If any portion of this section is held invalid or unenforceable under\n"
-"any particular circumstance, the balance of the section is intended to\n"
-"apply and the section as a whole is intended to apply in other\n"
-"circumstances.\n"
-"\n"
-"It is not the purpose of this section to induce you to infringe any\n"
-"patents or other property right claims or to contest validity of any\n"
-"such claims; this section has the sole purpose of protecting the\n"
-"integrity of the free software distribution system, which is\n"
-"implemented by public license practices.  Many people have made\n"
-"generous contributions to the wide range of software distributed\n"
-"through that system in reliance on consistent application of that\n"
-"system; it is up to the author/donor to decide if he or she is willing\n"
-"to distribute software through any other system and a licensee cannot\n"
-"impose that choice.\n"
-"\n"
-"This section is intended to make thoroughly clear what is believed to\n"
-"be a consequence of the rest of this License.\n"
-"\n"
-"  8. If the distribution and/or use of the Program is restricted in\n"
-"certain countries either by patents or by copyrighted interfaces, the\n"
-"original copyright holder who places the Program under this License\n"
-"may add an explicit geographical distribution limitation excluding\n"
-"those countries, so that distribution is permitted only in or among\n"
-"countries not thus excluded.  In such case, this License incorporates\n"
-"the limitation as if written in the body of this License.\n"
-"\n"
-"  9. The Free Software Foundation may publish revised and/or new versions\n"
-"of the General Public License from time to time.  Such new versions will\n"
-"be similar in spirit to the present version, but may differ in detail to\n"
-"address new problems or concerns.\n"
-"\n"
-"Each version is given a distinguishing version number.  If the Program\n"
-"specifies a version number of this License which applies to it and \"any\n"
-"later version\", you have the option of following the terms and conditions\n"
-"either of that version or of any later version published by the Free\n"
-"Software Foundation.  If the Program does not specify a version number of\n"
-"this License, you may choose any version ever published by the Free "
-"Software\n"
-"Foundation.\n"
-"\n"
-"  10. If you wish to incorporate parts of the Program into other free\n"
-"programs whose distribution conditions are different, write to the author\n"
-"to ask for permission.  For software which is copyrighted by the Free\n"
-"Software Foundation, write to the Free Software Foundation; we sometimes\n"
-"make exceptions for this.  Our decision will be guided by the two goals\n"
-"of preserving the free status of all derivatives of our free software and\n"
-"of promoting the sharing and reuse of software generally.\n"
-"\n"
-"\t\t\t    NO WARRANTY\n"
-"\n"
-"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
-"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
-"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
-"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
-"EXPRESSED\n"
-"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
-"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
-"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
-"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
-"REPAIR OR CORRECTION.\n"
-"\n"
-"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
-"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
-"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
-"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
-"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
-"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
-"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
-"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
-"POSSIBILITY OF SUCH DAMAGES.\n"
-"\n"
-"\t\t     END OF TERMS AND CONDITIONS\n"
-"\n"
-"\t    How to Apply These Terms to Your New Programs\n"
-"\n"
-"  If you develop a new program, and you want it to be of the greatest\n"
-"possible use to the public, the best way to achieve this is to make it\n"
-"free software which everyone can redistribute and change under these terms.\n"
-"\n"
-"  To do so, attach the following notices to the program.  It is safest\n"
-"to attach them to the start of each source file to most effectively\n"
-"convey the exclusion of warranty; and each file should have at least\n"
-"the \"copyright\" line and a pointer to where the full notice is found.\n"
-"\n"
-"    <one line to give the program's name and a brief idea of what it does.>\n"
-"    Copyright (C) <year>  <name of author>\n"
-"\n"
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License as published by\n"
-"    the Free Software Foundation; either version 2 of the License, or\n"
-"    (at your option) any later version.\n"
-"\n"
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-"\n"
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
-"USA\n"
-"\n"
-"\n"
-"Also add information on how to contact you by electronic and paper mail.\n"
-"\n"
-"If the program is interactive, make it output a short notice like this\n"
-"when it starts in an interactive mode:\n"
-"\n"
-"    Gnomovision version 69, Copyright (C) year  name of author\n"
-"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
-"w'.\n"
-"    This is free software, and you are welcome to redistribute it\n"
-"    under certain conditions; type `show c' for details.\n"
-"\n"
-"The hypothetical commands `show w' and `show c' should show the appropriate\n"
-"parts of the General Public License.  Of course, the commands you use may\n"
-"be called something other than `show w' and `show c'; they could even be\n"
-"mouse-clicks or menu items--whatever suits your program.\n"
-"\n"
-"You should also get your employer (if you work as a programmer) or your\n"
-"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
-"necessary.  Here is a sample; alter the names:\n"
-"\n"
-"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
-"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
-"\n"
-"  <signature of Ty Coon>, 1 April 1989\n"
-"  Ty Coon, President of Vice\n"
-"\n"
-"This General Public License does not permit incorporating your program into\n"
-"proprietary programs.  If your program is a subroutine library, you may\n"
-"consider it more useful to permit linking proprietary applications with the\n"
-"library.  If this is what you want to do, use the GNU Library General\n"
-"Public License instead of this License.\n"
+#: src/applications/vpn/vpn.c:591
+#, c-format
+msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:4458
-msgid "Not for English ;-)"
+#: src/applications/vpn/vpn.c:602
+#, c-format
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:82
-msgid "generate configuration for gnunetd, the GNUnet daemon"
+#: src/applications/vpn/vpn.c:614
+#, c-format
+msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:90
-msgid "Tool to setup GNUnet."
+#: src/applications/vpn/vpn.c:646
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:91
+#: src/applications/vpn/vpn.c:692
 #, c-format
-msgid "Available MODEs:\n"
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:92
+#: src/applications/vpn/vpn.c:754
 #, c-format
-msgid " config\t\ttext-based configuration\n"
+msgid "RFC4193 --- whitelist of peer %x\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:94
-#, c-format
-msgid " menuconfig\ttext-based menu\n"
+#: src/applications/vpn/vpn.c:772
+msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:96
-#, c-format
-msgid " wizard-curses\tBasic text-based graphical configuration\n"
+#: src/applications/vpn/vpn.c:812
+msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:99
-#, c-format
-msgid " gconfig\tGTK configuration\n"
+#: src/applications/vpn/vpn.c:816
+msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:100
-#, c-format
-msgid ""
-" wizard-gtk\tBasic GTK configuration\n"
-"\n"
+#: src/applications/vpn/vpn.c:822
+msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:167
+#: src/applications/vpn/vpn.c:825
 #, c-format
-msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
+msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:176 src/server/gnunet-peer-info.c:113
-#: src/server/gnunet-transport-check.c:527 src/server/gnunet-update.c:152
+#: src/applications/vpn/vpn.c:835
 #, c-format
-msgid "Invalid arguments: "
+msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:224
-msgid "No interface specified, using default\n"
+#: src/applications/vpn/vpn.c:854
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:237 src/conf/gnunet-setup.c:251
-#: src/conf/gnunet-setup.c:270 src/conf/gnunet-setup.c:281
+#: src/applications/vpn/vpn.c:869
 #, c-format
-msgid "`%s' is not available."
+msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:264 src/conf/gnunet-setup.c:275
-#, c-format
-msgid ""
-"Can only run wizard to configure gnunetd.\n"
-"Did you forget the `%s' option?\n"
+#: src/applications/vpn/vpn.c:885
+msgid "Receive route request\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:285
+#: src/applications/vpn/vpn.c:890
 #, c-format
-msgid "Unknown operation `%s'\n"
+msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:109
+#: src/applications/vpn/vpn.c:901
 #, c-format
-msgid "GNUnet service installed successfully.\n"
+msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:112 src/conf/gnunet-win-tool.c:139
+#: src/applications/vpn/vpn.c:907
 #, c-format
-msgid "This version of Windows doesn't support services.\n"
+msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:116 src/conf/gnunet-win-tool.c:143
-#, c-format
-msgid "Error: can't open Service Control Manager: %s\n"
+#: src/applications/vpn/vpn.c:923
+msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:121
-#, c-format
-msgid "Error: can't create service: %s\n"
+#: src/applications/vpn/vpn.c:927
+msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
+#: src/applications/vpn/vpn.c:931
 #, c-format
-msgid "Unknown error.\n"
+msgid "Inserting with hops %d\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:136
+#: src/applications/vpn/vpn.c:945
 #, c-format
-msgid "Service deleted.\n"
+msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:148
+#: src/applications/vpn/vpn.c:960
 #, c-format
-msgid "Error: can't access service: %s\n"
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:152
-#, c-format
-msgid "Error: can't delete service: %s\n"
+#: src/applications/vpn/vpn.c:998
+msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/conf/wizard_gtk.c:429
-#, c-format
-msgid "Unable to save configuration file `%s':"
+#: src/applications/vpn/vpn.c:1013
+msgid "realise add routes\n"
 msgstr ""
 
-#: src/conf/wizard_gtk.c:475 src/conf/wizard_curs.c:616
-msgid "Unable to create user account:"
+#: src/applications/vpn/vpn.c:1058
+msgid "realise pull routes\n"
 msgstr ""
 
-#: src/conf/wizard_gtk.c:482 src/conf/wizard_curs.c:619
-msgid "Unable to change startup process:"
+#: src/applications/vpn/vpn.c:1104
+msgid "realise copy table\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:116 src/conf/wizard_curs.c:131
-#: src/conf/wizard_curs.c:184 src/conf/wizard_curs.c:221
-#: src/conf/wizard_curs.c:251 src/conf/wizard_curs.c:277
-#: src/conf/wizard_curs.c:310 src/conf/wizard_curs.c:337
-#: src/conf/wizard_curs.c:369 src/conf/wizard_curs.c:394
-#: src/conf/wizard_curs.c:423 src/conf/wizard_curs.c:446
-#: src/conf/wizard_curs.c:501 src/conf/wizard_curs.c:563
-#: src/conf/wizard_curs.c:594 src/conf/wizard_curs.c:638
-msgid "GNUnet configuration"
+#: src/applications/vpn/vpn.c:1161
+msgid "Yes"
 msgstr ""
 
-#: src/conf/wizard_curs.c:117
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org/\n";
-"and join our community at\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"the GNUnet team"
+#: src/applications/vpn/vpn.c:1161
+msgid "No"
 msgstr ""
 
-#: src/conf/wizard_curs.c:132
-msgid ""
-"Choose the network interface that connects your computer to the internet "
-"from the list below."
+#: src/applications/vpn/vpn.c:1324
+#, c-format
+msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:191
-#: src/conf/wizard_curs.c:228 src/conf/wizard_curs.c:283
-#: src/conf/wizard_curs.c:315 src/conf/wizard_curs.c:375
-msgid "Help"
+#: src/applications/vpn/vpn.c:1325
+#, c-format
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:192
-msgid ""
-"The \"Network interface\" is the device that connects your computer to the "
-"internet. This is usually a modem, an ISDN card or a network card in case "
-"you are using DSL."
+#: src/applications/vpn/vpn.c:1361
+msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/conf/wizard_curs.c:185
-msgid ""
-"What is the name of the network interface that connects your computer to the "
-"Internet?"
+#: src/applications/vpn/vpn.c:1383
+msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:222
-msgid ""
-"What is this computer's public IP address or hostname?\n"
-"\n"
-"If in doubt, leave this empty."
+#: src/applications/vpn/vpn.c:1394
+msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:229
-msgid ""
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your "
-"IP-Address."
+#: src/applications/vpn/vpn.c:1405
+#, c-format
+msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:252
+#: src/applications/state/state.c:85
+#, c-format
 msgid ""
-"Is this machine behind NAT?\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
-"connections through modems, ISDN cards and DNAT (also known as \"port "
-"forwarding\")."
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:278
-msgid "How much upstream (Bytes/s) may be used?"
+#: src/server/gnunet-update.c:50
+msgid "print a value from the configuration file to stdout"
 msgstr ""
 
-#: src/conf/wizard_curs.c:283
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"upstream\" is the data channel through which data is *sent* to the "
-"internet. The limit is either the total maximum for this computer or how "
-"much GNUnet itself is allowed to use. You can specify that later. If you "
-"have a flatrate, you can set it to the maximum speed of your internet "
-"connection."
+#: src/server/gnunet-update.c:55 src/server/startup.c:450
+#: src/server/gnunet-transport-check.c:407
+msgid "run as user LOGIN"
 msgstr ""
 
-#: src/conf/wizard_curs.c:310
-msgid "How much downstream (Bytes/s) may be used?"
+#: src/server/gnunet-update.c:58
+msgid "run in client mode (for getting client configuration values)"
 msgstr ""
 
-#: src/conf/wizard_curs.c:316
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"downstream\" is the data channel through which data is *received* from "
-"the internet. The limit is either the total maximum for this computer or how "
-"much GNUnet itself is allowed to use. You can specify that later. If you "
-"have a flatrate you can set it to the maximum speed of your internet "
-"connection."
+#: src/server/gnunet-update.c:64
+msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/conf/wizard_curs.c:338
-msgid ""
-"Share denoted bandwidth with other applications?\n"
-"\n"
-"Say \"yes\" here, if you don't want other network traffic to interfere with "
-"GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to "
-"values entered in the previous steps, or if you can't reliably measure the "
-"maximum capabilities of your connection. \"No\" can be very useful if other "
-"applications are causing a lot of traffic on your LAN.  In this case, you do "
-"not want to limit the traffic that GNUnet can inflict on your internet "
-"connection whenever your high-speed LAN gets used (e.g. by NFS)."
+#: src/server/gnunet-update.c:147
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'."
 msgstr ""
 
-#: src/conf/wizard_curs.c:370
-msgid "How much CPU (in %) may be used?"
+#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
+#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
+#, c-format
+msgid "Invalid arguments: "
 msgstr ""
 
-#: src/conf/wizard_curs.c:376
+#: src/server/gnunet-update.c:155
+#, c-format
 msgid ""
-"You can limit GNUnet's resource usage here.\n"
 "\n"
-"This is the percentage of processor time GNUnet is allowed to use."
+"Exiting.\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:395
-msgid ""
-"Store migrated content?\n"
-"\n"
-"GNUnet is able to store data from other peers in your datastore. This is "
-"useful if an adversary has access to your inserted content and you need to "
-"deny that the content is yours. With \"content migration\" on, the content "
-"could have \"migrated\" over the internet to your node without your "
-"knowledge.\n"
-"It also helps to spread popular content over different peers to enhance "
-"availability."
+#: src/server/gnunet-update.c:232 src/server/core.c:476
+msgid "No applications defined in configuration!\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:424
-msgid ""
-"What's the maximum datastore size in MB?\n"
-"\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, "
-"inserted and migrated content)."
+#: src/server/gnunet-update.c:249
+#, c-format
+msgid "Updating data for module `%s'\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:447
-msgid ""
-"Do you want to launch GNUnet as a system service?\n"
-"\n"
-"If you say \"yes\" here, the GNUnet background process will be automatically "
-"started when you turn on your computer. If you say \"no\" here, you have to "
-"launch GNUnet yourself each time you want to use it."
+#: src/server/gnunet-update.c:253
+#, c-format
+msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:502
-msgid ""
-"Define the user owning the GNUnet service.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new user "
-"account under which the GNUnet service is started at system startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the fields empty to run GNUnet with system privileges.\n"
-"\n"
-"GNUnet user:"
+#: src/server/gnunet-update.c:309
+#, c-format
+msgid "Updated data for %d applications.\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:564
-msgid ""
-"Define the group owning the GNUnet service.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new group "
-"for the chosen user account.\n"
-"\n"
-"You can also specify a already existant group here.\n"
-"\n"
-"Only members of this group will be allowed to start and stop the the GNUnet "
-"server and have access to GNUnet server data.\n"
-"\n"
-"GNUnet group:"
+#: src/server/connection.c:983
+#, c-format
+msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:595
-msgid ""
-"If you are an experienced user, you may want to tweak your GNUnet "
-"installation using the enhanced configurator.\n"
-"\n"
-"Do you want to start it after saving your configuration?"
+#: src/server/connection.c:990
+#, c-format
+msgid "Message details: %u: length %d, priority: %d\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:632
+#: src/server/connection.c:2254
 #, c-format
-msgid ""
-"Unable to save configuration file %s: %s.\n"
-"\n"
-"Try again?"
+msgid "Message from `%s' discarded: invalid format.\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:89
-msgid "Can't open Service Control Manager"
+#: src/server/connection.c:2325
+#, c-format
+msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:94
-msgid "Can't create service"
+#: src/server/connection.c:2340
+msgid "Message received more than one day old. Dropped.\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:99
-msgid "Error changing the permissions of the GNUnet directory"
+#: src/server/connection.c:2708
+msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/conf/wizard_util.c:104
-msgid "Cannot write to the regisitry"
+#: src/server/connection.c:2712
+msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/conf/wizard_util.c:107
-msgid "Can't access the service"
+#: src/server/connection.c:2714
+msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/conf/wizard_util.c:111
-msgid "Can't delete the service"
+#: src/server/connection.c:2717
+msgid "# bytes encrypted"
 msgstr ""
 
-#: src/conf/wizard_util.c:115
-msgid "Unknown error"
+#: src/server/connection.c:2721
+msgid "# bytes transmitted"
 msgstr ""
 
-#: src/conf/wizard_util.c:146
-msgid "This version of Windows does not support multiple users."
+#: src/server/connection.c:2725
+msgid "# bytes received"
 msgstr ""
 
-#: src/conf/wizard_util.c:150
-msgid "Error creating user"
+#: src/server/connection.c:2727
+msgid "# bytes decrypted"
 msgstr ""
 
-#: src/conf/wizard_util.c:153
-msgid "Error accessing local security policy"
+#: src/server/connection.c:2728
+msgid "# bytes noise sent"
 msgstr ""
 
-#: src/conf/wizard_util.c:156
-msgid "Error granting service right to user"
+#: src/server/startup.c:196
+#, c-format
+msgid "The `%s' request received from client is malformed.\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:159
-msgid "Unknown error while creating a new user"
+#: src/server/startup.c:324
+#, c-format
+msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
 msgstr ""
 
-#: src/server/connection.c:979
+#: src/server/startup.c:339
 #, c-format
-msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
+msgid "Could not write PID to file `%s': %s.\n"
 msgstr ""
 
-#: src/server/connection.c:986
-#, c-format
-msgid "Message details: %u: length %d, priority: %d\n"
+#: src/server/startup.c:443
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
 msgstr ""
 
-#: src/server/connection.c:2243
+#: src/server/startup.c:456
+msgid "Starts the gnunetd daemon."
+msgstr ""
+
+#: src/server/startup.c:470
 #, c-format
-msgid "Message from `%s' discarded: invalid format.\n"
+msgid "User `%s' not known, cannot change UID to it.\n"
 msgstr ""
 
-#: src/server/connection.c:2309
+#: src/server/startup.c:479
 #, c-format
-msgid "Invalid sequence number %u <= %u, dropping message.\n"
+msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/server/connection.c:2324
-msgid "Message received more than one day old. Dropped.\n"
+#: src/server/startup.c:580
+msgid "Invalid command-line arguments:\n"
 msgstr ""
 
-#: src/server/connection.c:2690
-msgid "# outgoing messages dropped"
+#: src/server/startup.c:583
+#, c-format
+msgid "Argument %d: `%s'\n"
 msgstr ""
 
-#: src/server/connection.c:2692
-msgid "# bytes of outgoing messages dropped"
+#: src/server/startup.c:589
+msgid "Invalid command-line arguments.\n"
 msgstr ""
 
-#: src/server/connection.c:2694
-msgid "# connections closed (HANGUP sent)"
+#: src/server/gnunetd.c:76
+#, c-format
+msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
 
-#: src/server/connection.c:2695
-msgid "# bytes encrypted"
+#: src/server/gnunetd.c:84
+#, c-format
+msgid "`%s' starting\n"
 msgstr ""
 
-#: src/server/connection.c:2696
-msgid "# bytes decrypted"
+#: src/server/gnunetd.c:106
+#, c-format
+msgid "`%s' startup complete.\n"
 msgstr ""
 
-#: src/server/connection.c:2697
-msgid "# bytes noise sent"
+#: src/server/gnunetd.c:111
+#, c-format
+msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/server/core.c:114
+#: src/server/core.c:115
 #, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr ""
 
-#: src/server/core.c:167
+#: src/server/core.c:168
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/server/core.c:214
+#: src/server/core.c:215
 #, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr ""
 
-#: src/server/core.c:221
+#: src/server/core.c:222
 #, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
 
-#: src/server/core.c:230 src/server/core.c:419
+#: src/server/core.c:231 src/server/core.c:420
 #, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:397
+#: src/server/core.c:398
 #, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/server/core.c:475 src/server/gnunet-update.c:232
-msgid "No applications defined in configuration!\n"
-msgstr ""
-
-#: src/server/core.c:498
+#: src/server/core.c:499
 #, c-format
 msgid "Could not initialize application `%s'\n"
 msgstr ""
 
-#: src/server/core.c:515
+#: src/server/core.c:516
 #, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr ""
 
-#: src/server/core.c:574
+#: src/server/core.c:575
 msgid "FATAL: Identity plugin not found!\n"
 msgstr ""
 
-#: src/server/core.c:632
+#: src/server/core.c:633
 #, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr ""
 
-#: src/server/gnunet-peer-info.c:95
-msgid "Print information about GNUnet peers."
-msgstr ""
-
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
-#, c-format
-msgid "Could not get address of peer `%s'.\n"
-msgstr ""
-
-#: src/server/gnunet-peer-info.c:153
-msgid "hello message invalid (signature invalid).\n"
-msgstr ""
-
-#: src/server/gnunet-peer-info.c:164
-#, c-format
-msgid "Peer `%s' with trust %8u and address `%s'\n"
-msgstr ""
-
 #: src/server/gnunet-transport-check.c:109
 #, c-format
 msgid "`%s': Could not create hello.\n"
@@ -3589,11 +3077,6 @@
 msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:407 src/server/gnunet-update.c:55
-#: src/server/startup.c:450
-msgid "run as user LOGIN"
-msgstr ""
-
 #: src/server/gnunet-transport-check.c:414
 msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
@@ -3618,827 +3101,853 @@
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
-msgstr ""
-
-#: src/server/gnunet-update.c:58
-msgid "run in client mode (for getting client configuration values)"
-msgstr ""
-
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr ""
-
-#: src/server/gnunet-update.c:147
+#: src/server/tcpserver.c:422
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'."
+msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:155
+#: src/server/tcpserver.c:688
 #, c-format
 msgid ""
-"\n"
-"Exiting.\n"
+"Malformed network specification in the configuration in section `%s' for "
+"entry `%s': %s\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:249
+#: src/server/tcpserver.c:798
 #, c-format
-msgid "Updating data for module `%s'\n"
+msgid "%s failed, message type %d already in use.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:253
+#: src/server/handler.c:367
 #, c-format
-msgid "Failed to update data for module `%s'\n"
+msgid "Received corrupt message from peer `%s'in %s:%d.\n"
 msgstr ""
 
-#: src/server/gnunet-update.c:309
-#, c-format
-msgid "Updated data for %d applications.\n"
+#: src/server/gnunet-peer-info.c:95
+msgid "Print information about GNUnet peers."
 msgstr ""
 
-#: src/server/gnunetd.c:76
+#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
 #, c-format
-msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
+msgid "Could not get address of peer `%s'.\n"
 msgstr ""
 
-#: src/server/gnunetd.c:84
-#, c-format
-msgid "`%s' starting\n"
+#: src/server/gnunet-peer-info.c:153
+msgid "hello message invalid (signature invalid).\n"
 msgstr ""
 
-#: src/server/gnunetd.c:106
+#: src/server/gnunet-peer-info.c:164
 #, c-format
-msgid "`%s' startup complete.\n"
+msgid "Peer `%s' with trust %8u and address `%s'\n"
 msgstr ""
 
-#: src/server/gnunetd.c:111
+#: src/util/cron/cron.c:355
 #, c-format
-msgid "`%s' is shutting down.\n"
+msgid ""
+"`%s' called with cron job not in queue, adding.  This may not be what you "
+"want.\n"
 msgstr ""
 
-#: src/server/handler.c:367
+#: src/util/crypto/hostkey_gcrypt.c:1031
 #, c-format
-msgid "Received corrupt message from peer `%s'in %s:%d.\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/server/startup.c:196
+#: src/util/crypto/locking_gcrypt.c:47
 #, c-format
-msgid "The `%s' request received from client is malformed.\n"
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/server/startup.c:324
+#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
 #, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
+msgid "Failed to parse interface data from `%s'.\n"
 msgstr ""
 
-#: src/server/startup.c:339
+#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
 #, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr ""
-
-#: src/server/startup.c:443
 msgid ""
-"run in debug mode; gnunetd will not daemonize and error messages will be "
-"written to stderr instead of a logfile"
+"No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
 
-#: src/server/startup.c:456
-msgid "Starts the gnunetd daemon."
+#: src/util/os/semaphore.c:213
+#, c-format
+msgid "Can't create semaphore: %i"
 msgstr ""
 
-#: src/server/startup.c:470
+#: src/util/os/dso.c:75
 #, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
+msgid ""
+"Cannot determine plugin path, application must be installed in directory "
+"ending with `%s'.\n"
 msgstr ""
 
-#: src/server/startup.c:479
+#: src/util/os/dso.c:97
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
+msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
+#: src/util/os/dso.c:134
+#, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/server/startup.c:583
+#: src/util/os/dso.c:176
 #, c-format
-msgid "Argument %d: `%s'\n"
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
+#: src/util/os/cpustatus.c:274
+msgid "Cannot query the CPU usage (Windows NT).\n"
 msgstr ""
 
-#: src/server/tcpserver.c:422
-#, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+#: src/util/os/cpustatus.c:293
+msgid "Cannot query the CPU usage (Win 9x)\n"
 msgstr ""
 
-#: src/server/tcpserver.c:688
-#, c-format
+#: src/util/os/installpath.c:172
 msgid ""
-"Malformed network specification in the configuration in section `%s' for "
-"entry `%s': %s\n"
+"Cannot determine the path to the executable, your system may be broken or "
+"not supported.\n"
 msgstr ""
 
-#: src/server/tcpserver.c:798
-#, c-format
-msgid "%s failed, message type %d already in use.\n"
+#: src/util/os/installpath.c:211
+msgid ""
+"GNUnet executables are not in a directory named 'bin'. This may signal a "
+"broken installation.\n"
 msgstr ""
 
-#: src/transports/ip6.c:60 src/util/configuration.c:925
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
+#: src/util/os/installpath.c:222
+msgid "Cannot determine the installation prefix. Unknown error.\n"
 msgstr ""
 
-#: src/transports/ip6.c:100
-#, c-format
-msgid "Could not resolve `%s': %s\n"
+#: src/util/network/tcpio.c:100
+msgid "Could not find valid value for PORT in section NETWORK."
 msgstr ""
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
+#: src/util/network/tcpio.c:124
+msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/transports/http.c:601
-msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
+#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
+#, c-format
+msgid "Cannot connect to %s:u: %s\n"
 msgstr ""
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#: src/util/network/tcpio.c:406
 #, c-format
-msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
+msgid "`%s' failed, reply invalid!\n"
 msgstr ""
 
-#: src/transports/http.c:1101
-msgid "HTTP: Could not determine my public IP address.\n"
+#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
+#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
-#: src/util/tcpio.c:188
+#: src/util/network/ipcheck.c:156
 #, c-format
-msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/transports/http.c:1333
+#: src/util/network/ipcheck.c:217
 #, c-format
-msgid ""
-"Could not bind the HTTP listener to port %d. No transport service started.\n"
+msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/transports/http.c:1478
-msgid "# bytes received via HTTP"
+#: src/util/network/ipcheck.c:250
+#, c-format
+msgid "Wrong format `%s' for netmask: %s\n"
 msgstr ""
 
-#: src/transports/http.c:1480
-msgid "# bytes sent via HTTP"
+#: src/util/network/ipcheck.c:265
+#, c-format
+msgid "Wrong format `%s' for network: %s\n"
 msgstr ""
 
-#: src/transports/http.c:1482
-msgid "# bytes dropped by HTTP (outgoing)"
-msgstr ""
-
-#: src/transports/smtp.c:297
+#: src/util/disk/storage.c:194
 #, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
+msgid "`%s' failed for drive `%s': %u\n"
 msgstr ""
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
+#: src/util/disk/storage.c:240
 #, c-format
-msgid ""
-"You must specify the name of a pipe for the SMTP transport in section `%s' "
-"under `%s'.\n"
+msgid "Expected `%s' to be a directory\n"
 msgstr ""
 
-#: src/transports/smtp.c:489
-msgid "Received malformed message via SMTP (size mismatch).\n"
-msgstr ""
-
-#: src/transports/smtp.c:584
-msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
-msgstr ""
-
-#: src/transports/smtp.c:591
+#: src/util/disk/storage.c:279
 #, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
+msgid "Expected `%s' to be a regular file\n"
 msgstr ""
 
-#: src/transports/smtp.c:764
+#: src/util/disk/storage.c:486
 #, c-format
-msgid "Sending E-mail to `%s' failed.\n"
+msgid "expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/transports/smtp.c:815
+#: src/util/config_impl/impl.c:256
 #, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
+msgid "Syntax error in configuration file `%s' at line %d.\n"
 msgstr ""
 
-#: src/transports/smtp.c:838
+#: src/util/config_impl/impl.c:412
 #, c-format
 msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/transports/smtp.c:844
+#: src/util/config_impl/impl.c:424
 #, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/transports/smtp.c:903
+#: src/util/config_impl/impl.c:494
 #, c-format
-msgid "%.*s filter %s (SMTP)"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/transports/smtp.c:932 src/transports/udp.c:722
-#: src/transports/udp6.c:699
-#, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+#: src/util/error/error.c:138 src/util/error/error.c:182
+msgid "DEBUG"
 msgstr ""
 
-#: src/transports/tcp.c:465
-#, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+#: src/util/error/error.c:141 src/util/error/error.c:184
+msgid "STATUS"
 msgstr ""
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
+#: src/util/error/error.c:144 src/util/error/error.c:186
+msgid "WARNING"
 msgstr ""
 
-#: src/transports/tcp.c:1082
-msgid "Could not determine my public IP address.\n"
+#: src/util/error/error.c:147 src/util/error/error.c:188
+msgid "ERROR"
 msgstr ""
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
-#, c-format
-msgid "Failed to start transport service on port %d.\n"
+#: src/util/error/error.c:150 src/util/error/error.c:190
+msgid "FATAL"
 msgstr ""
 
-#: src/transports/tcp.c:1449
-msgid "# bytes received via TCP"
+#: src/util/error/error.c:153 src/util/error/error.c:192
+msgid "USER"
 msgstr ""
 
-#: src/transports/tcp.c:1451
-msgid "# bytes sent via TCP"
+#: src/util/error/error.c:156 src/util/error/error.c:194
+msgid "ADMIN"
 msgstr ""
 
-#: src/transports/tcp.c:1453
-msgid "# bytes dropped by TCP (outgoing)"
+#: src/util/error/error.c:159 src/util/error/error.c:196
+msgid "DEVELOPER"
 msgstr ""
 
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+#: src/util/error/error.c:162 src/util/error/error.c:198
+msgid "REQUEST"
 msgstr ""
 
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
+#: src/util/error/error.c:165 src/util/error/error.c:200
+msgid "BULK"
 msgstr ""
 
-#: src/transports/tcp6.c:657 src/transports/udp6.c:334
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
+#: src/util/error/error.c:168 src/util/error/error.c:202
+msgid "IMMEDIATE"
 msgstr ""
 
-#: src/transports/tcp6.c:958
-msgid "Could not determine my public IPv6 address.\n"
+#: src/util/error/error.c:171
+msgid "ALL"
 msgstr ""
 
-#: src/transports/tcp6.c:1002
-#, c-format
-msgid "`%s': unknown service: %s\n"
+#: src/util/error/error.c:203
+msgid "NOTHING"
 msgstr ""
 
-#: src/transports/udp.c:145 src/transports/udp6.c:128
+#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
 #, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
+msgid "Invalid argument for `%s'.\n"
 msgstr ""
 
-#: src/transports/udp.c:179
+#: src/util/threads/mutex.c:136
 #, c-format
-msgid "Failed to bind to UDP port %d.\n"
+msgid "Deadlock due to `%s'.\n"
 msgstr ""
 
-#: src/transports/udp.c:250
+#: src/util/threads/mutex.c:156
 #, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
+msgid "Permission denied for `%s'.\n"
 msgstr ""
 
-#: src/transports/udp.c:307
+#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
+#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
+#: src/util/threads/pthread.c:275
 #, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+msgid "`%s' failed with error code %s: %s\n"
 msgstr ""
 
-#: src/transports/udp.c:332
+#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
 #, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
+msgid "`%s' failed with error code %d: %s\n"
 msgstr ""
 
-#: src/transports/udp.c:417
-msgid "UDP: Could not determine my public IP address.\n"
+#: src/util/loggers/memory.c:71
+msgid "Out of memory (for logging)"
 msgstr ""
 
-#: src/transports/udp.c:551
+#: src/util/getopt/getopt.c:686
 #, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
+msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/transports/udp.c:707
-msgid "# bytes received via UDP"
+#: src/util/getopt/getopt.c:710
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/transports/udp.c:709
-msgid "# bytes sent via UDP"
+#: src/util/getopt/getopt.c:715
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/transports/udp.c:711
-msgid "# bytes dropped by UDP (outgoing)"
+#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/transports/ip.c:124
+#: src/util/getopt/getopt.c:762
 #, c-format
-msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
+msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/transports/ip.c:149
+#: src/util/getopt/getopt.c:766
 #, c-format
-msgid "Could not obtain IP for interface `%s' using `%s'.\n"
+msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/transports/ip.c:193
+#: src/util/getopt/getopt.c:792
 #, c-format
-msgid "Could not find an IP address for interface `%s'.\n"
+msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/transports/ip.c:203
+#: src/util/getopt/getopt.c:795
 #, c-format
-msgid ""
-"There is more than one IP address specified for interface `%s'.\n"
-"GNUnet will use %u.%u.%u.%u.\n"
+msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/transports/ip.c:224
+#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
 #, c-format
-msgid "Could not resolve `%s' to determine our IP address: %s\n"
+msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/transports/ip.c:256
+#: src/util/getopt/getopt.c:872
 #, c-format
-msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
+#: src/util/getopt/getopt.c:890
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/transports/udp6.c:164
+#: src/util/getopt/printhelp.c:49
 #, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/transports/udp6.c:235
-#, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
+#: src/util/string/string.c:101
+msgid "ms"
 msgstr ""
 
-#: src/transports/udp6.c:290
-#, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+#: src/util/string/string.c:106
+msgid "s"
 msgstr ""
 
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
+#: src/util/string/string.c:109
+msgid "m"
 msgstr ""
 
-#: src/transports/udp6.c:415
-msgid "UDP6: Could not determine my public IPv6 address.\n"
+#: src/util/string/string.c:112
+msgid "h"
 msgstr ""
 
-#: src/util/configuration.c:182
-#, c-format
-msgid "inlining configration file `%s'\n"
+#: src/util/string/string.c:115
+msgid " days"
 msgstr ""
 
-#: src/util/configuration.c:186
-#, c-format
-msgid "Could not parse configuration file `%s'.\n"
+#: src/util/string/string.c:133
+msgid "b"
 msgstr ""
 
-#: src/util/configuration.c:222
-#, c-format
-msgid "Syntax error in configuration file `%s' at line %d.\n"
+#: src/util/string/string.c:138
+msgid "KiB"
 msgstr ""
 
-#: src/util/configuration.c:515 src/util/configuration.c:524
-#, c-format
-msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
+#: src/util/string/string.c:141
+msgid "MiB"
 msgstr ""
 
-#: src/util/configuration.c:521
-msgid ""
-"Configuration file not found. Please run GNUnet Setup (Client Configuration) "
-"first."
+#: src/util/string/string.c:144
+msgid "GiB"
 msgstr ""
 
-#: src/util/configuration.c:528
-#, c-format
-msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
+#: src/util/string/string.c:147
+msgid "TiB"
 msgstr ""
 
-#: src/util/configuration.c:532
-#, c-format
-msgid "Cannot open configuration file `%s'.\n"
+#: src/util/string/string.c:267
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/cron.c:189
-msgid "Stopping cron\n"
+#: src/setup/gnunet-setup.c:82
+msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/util/cron.c:199
-msgid "Cron stopped\n"
+#: src/setup/gnunet-setup.c:90
+msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/util/cron.c:348
+#: src/setup/gnunet-setup.c:91
 #, c-format
-msgid ""
-"`%s' called with cron job not in queue, adding.  This may not be what you "
-"want.\n"
+msgid "Available MODEs:\n"
 msgstr ""
 
-#: src/util/dso.c:43
+#: src/setup/gnunet-setup.c:92
 #, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
+msgid " config\t\ttext-based configuration\n"
 msgstr ""
 
-#: src/util/dso.c:98
+#: src/setup/gnunet-setup.c:94
 #, c-format
-msgid "`%s' failed for library `%s' at %s:%d with error: %s\n"
+msgid " menuconfig\ttext-based menu\n"
 msgstr ""
 
-#: src/util/dso.c:152
+#: src/setup/gnunet-setup.c:96
 #, c-format
-msgid "`%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
+msgid " wizard-curses\tBasic text-based graphical configuration\n"
 msgstr ""
 
-#: src/util/getopt.c:641
+#: src/setup/gnunet-setup.c:99
 #, c-format
-msgid "%s: option `%s' is ambiguous\n"
+msgid " gconfig\tGTK configuration\n"
 msgstr ""
 
-#: src/util/getopt.c:665
+#: src/setup/gnunet-setup.c:100
 #, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
+msgid ""
+" wizard-gtk\tBasic GTK configuration\n"
+"\n"
 msgstr ""
 
-#: src/util/getopt.c:670
+#: src/setup/gnunet-setup.c:167
 #, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
+msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:687 src/util/getopt.c:861
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
+#: src/setup/gnunet-setup.c:224
+msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/util/getopt.c:717
+#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
+#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
 #, c-format
-msgid "%s: unrecognized option `--%s'\n"
+msgid "`%s' is not available."
 msgstr ""
 
-#: src/util/getopt.c:721
+#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
 #, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+msgid ""
+"Can only run wizard to configure gnunetd.\n"
+"Did you forget the `%s' option?\n"
 msgstr ""
 
-#: src/util/getopt.c:747
+#: src/setup/gnunet-setup.c:285
 #, c-format
-msgid "%s: illegal option -- %c\n"
+msgid "Unknown operation `%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:750
+#: src/setup/wizard_gtk.c:429
 #, c-format
-msgid "%s: invalid option -- %c\n"
+msgid "Unable to save configuration file `%s':"
 msgstr ""
 
-#: src/util/getopt.c:780 src/util/getopt.c:910
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
+#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
+msgid "Unable to create user account:"
 msgstr ""
 
-#: src/util/getopt.c:827
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
+#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
+msgid "Unable to change startup process:"
 msgstr ""
 
-#: src/util/getopt.c:845
+#: src/setup/gnunet-win-tool.c:109
 #, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
+msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/util/hostkey_gcrypt.c:937
+#: src/setup/gnunet-win-tool.c:112 src/setup/gnunet-win-tool.c:139
 #, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
+msgid "This version of Windows doesn't support services.\n"
 msgstr ""
 
-#: src/util/initialize.c:229
-msgid "Shutdown complete.\n"
-msgstr ""
-
-#: src/util/io.c:35
+#: src/setup/gnunet-win-tool.c:116 src/setup/gnunet-win-tool.c:143
 #, c-format
-msgid "Caught signal %d.\n"
+msgid "Error: can't open Service Control Manager: %s\n"
 msgstr ""
 
-#: src/util/random.c:38
+#: src/setup/gnunet-win-tool.c:121
 #, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgid "Error: can't create service: %s\n"
 msgstr ""
 
-#: src/util/ipcheck.c:100
+#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:155
 #, c-format
-msgid "Invalid format for IP: `%s'\n"
+msgid "Unknown error.\n"
 msgstr ""
 
-#: src/util/ipcheck.c:150
+#: src/setup/gnunet-win-tool.c:136
 #, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgid "Service deleted.\n"
 msgstr ""
 
-#: src/util/ipcheck.c:164
+#: src/setup/gnunet-win-tool.c:148
 #, c-format
-msgid "Invalid network notation (additional characters: `%s')."
+msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/util/ipcheck.c:235
+#: src/setup/gnunet-win-tool.c:152
 #, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgid "Error: can't delete service: %s\n"
 msgstr ""
 
-#: src/util/ipcheck.c:267
+#: src/setup/conf.c:522 src/setup/recreate.c:135
 #, c-format
-msgid "Wrong format `%s' for netmask: %s\n"
+msgid "Unable to save configuration file `%s': %s.\n"
 msgstr ""
 
-#: src/util/ipcheck.c:281
+#: src/setup/conf.c:529
 #, c-format
-msgid "Wrong format `%s' for network: %s\n"
+msgid "Configuration file `%s' created.\n"
 msgstr ""
 
-#: src/util/logging.c:90
-msgid "NOTHING"
+#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
+#: src/setup/wizard_util.c:193
+msgid "Error"
 msgstr ""
 
-#: src/util/logging.c:91
-msgid "FATAL"
+#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
+#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
+#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
+#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
+#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
+#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
+#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
+#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
+msgid "GNUnet configuration"
 msgstr ""
 
-#: src/util/logging.c:92
-msgid "ERROR"
+#: src/setup/wizard_curs.c:117
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org/\n";
+"and join our community at\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
 msgstr ""
 
-#: src/util/logging.c:93
-msgid "FAILURE"
+#: src/setup/wizard_curs.c:132
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
 msgstr ""
 
-#: src/util/logging.c:94
-msgid "WARNING"
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
+#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
+#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
+msgid "Help"
 msgstr ""
 
-#: src/util/logging.c:95
-msgid "MESSAGE"
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
+msgid ""
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL."
 msgstr ""
 
-#: src/util/logging.c:96
-msgid "INFO"
+#: src/setup/wizard_curs.c:185
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
 msgstr ""
 
-#: src/util/logging.c:97
-msgid "DEBUG"
+#: src/setup/wizard_curs.c:222
+msgid ""
+"What is this computer's public IP address or hostname?\n"
+"\n"
+"If in doubt, leave this empty."
 msgstr ""
 
-#: src/util/logging.c:98
-msgid "CRON"
+#: src/setup/wizard_curs.c:229
+msgid ""
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address."
 msgstr ""
 
-#: src/util/logging.c:99
-msgid "EVERYTHING"
+#: src/setup/wizard_curs.c:252
+msgid ""
+"Is this machine behind NAT?\n"
+"\n"
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
+"connections through modems, ISDN cards and DNAT (also known as \"port "
+"forwarding\")."
 msgstr ""
 
-#: src/util/logging.c:285
-#, c-format
-msgid "Invalid LOGLEVEL `%s' specified.\n"
+#: src/setup/wizard_curs.c:278
+msgid "How much upstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/util/logging.c:377 src/util/logging.c:383
-#, c-format
-msgid "Failure at %s:%d.\n"
+#: src/setup/wizard_curs.c:283
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate, you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 
-#: src/util/port.c:47
-#, c-format
-msgid ""
-"Cannot determine port of gnunetd server. Define in configuration file in "
-"section `%s' under `%s'.\n"
+#: src/setup/wizard_curs.c:310
+msgid "How much downstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/util/printhelp.c:42
-#, c-format
+#: src/setup/wizard_curs.c:316
 msgid ""
-"Usage: %s\n"
-"%s\n"
+"You can limit GNUnet's resource usage here.\n"
 "\n"
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 
-#: src/util/printhelp.c:45
-#, c-format
+#: src/setup/wizard_curs.c:338
 msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
+"Share denoted bandwidth with other applications?\n"
+"\n"
+"Say \"yes\" here, if you don't want other network traffic to interfere with "
+"GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to "
+"values entered in the previous steps, or if you can't reliably measure the "
+"maximum capabilities of your connection. \"No\" can be very useful if other "
+"applications are causing a lot of traffic on your LAN.  In this case, you do "
+"not want to limit the traffic that GNUnet can inflict on your internet "
+"connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 
-#: src/util/semaphore.c:172 src/util/semaphore.c:198
-#, c-format
-msgid "Invalid argument for `%s' at %s:%d.\n"
+#: src/setup/wizard_curs.c:370
+msgid "How much CPU (in %) may be used?"
 msgstr ""
 
-#: src/util/semaphore.c:176
-#, c-format
-msgid "Deadlock due to `%s' at %s:%d.\n"
+#: src/setup/wizard_curs.c:376
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"This is the percentage of processor time GNUnet is allowed to use."
 msgstr ""
 
-#: src/util/semaphore.c:202
-#, c-format
-msgid "Permission denied for `%s' at %s:%d.\n"
+#: src/setup/wizard_curs.c:395
+msgid ""
+"Store migrated content?\n"
+"\n"
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability."
 msgstr ""
 
-#: src/util/semaphore.c:452 src/util/semaphore.c:459
-#, c-format
-msgid "`%s' failed with error code %s: %s"
+#: src/setup/wizard_curs.c:424
+msgid ""
+"What's the maximum datastore size in MB?\n"
+"\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content)."
 msgstr ""
 
-#: src/util/semaphore.c:466
-#, c-format
-msgid "`%s' failed with error code %d: %s"
+#: src/setup/wizard_curs.c:447
+msgid ""
+"Do you want to launch GNUnet as a system service?\n"
+"\n"
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/util/semaphore.c:604
-#, c-format
-msgid "Can't create semaphore: %i"
+#: src/setup/wizard_curs.c:502
+msgid ""
+"Define the user owning the GNUnet service.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account under which the GNUnet service is started at system startup.\n"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges.\n"
+"\n"
+"GNUnet user:"
 msgstr ""
 
-#: src/util/state.c:86
-#, c-format
+#: src/setup/wizard_curs.c:564
 msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
+"Define the group owning the GNUnet service.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
+"\n"
+"You can also specify a already existant group here.\n"
+"\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
+"\n"
+"GNUnet group:"
 msgstr ""
 
-#: src/util/statuscalls.c:185
-#, c-format
-msgid "Failed to parse interface data from `%s' at %s:%d.\n"
+#: src/setup/wizard_curs.c:595
+msgid ""
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
+"\n"
+"Do you want to start it after saving your configuration?"
 msgstr ""
 
-#: src/util/statuscalls.c:489
-msgid "Cannot query the CPU usage (Windows NT).\n"
-msgstr ""
-
-#: src/util/statuscalls.c:507
-msgid "Cannot query the CPU usage (Win 9x)\n"
-msgstr ""
-
-#: src/util/statuscalls.c:600
+#: src/setup/wizard_curs.c:632
 #, c-format
 msgid ""
-"No network interfaces defined in configuration section `%s' under `%s'!\n"
+"Unable to save configuration file %s: %s.\n"
+"\n"
+"Try again?"
 msgstr ""
 
-#: src/util/storage.c:212
+#: src/setup/confdata.c:93
 #, c-format
-msgid "`%s' failed for drive %s: %u\n"
+msgid "%s: symbol value `%s' invalid for %s\n"
 msgstr ""
 
-#: src/util/storage.c:310
-#, c-format
-msgid "`%s' is not a regular file.\n"
+#: src/setup/wizard_util.c:119
+msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/util/storage.c:564
-#, c-format
-msgid "`%s' expected `%s' to be a directory!\n"
+#: src/setup/wizard_util.c:124
+msgid "Can't create service"
 msgstr ""
 
-#: src/util/storage.c:670
-msgid "b"
+#: src/setup/wizard_util.c:129
+msgid "Error changing the permissions of the GNUnet directory"
 msgstr ""
 
-#: src/util/storage.c:675
-msgid "k"
+#: src/setup/wizard_util.c:134
+msgid "Cannot write to the regisitry"
 msgstr ""
 
-#: src/util/storage.c:678 src/util/timer.c:198
-msgid "m"
+#: src/setup/wizard_util.c:137
+msgid "Can't access the service"
 msgstr ""
 
-#: src/util/storage.c:681
-msgid "g"
+#: src/setup/wizard_util.c:141
+msgid "Can't delete the service"
 msgstr ""
 
-#: src/util/storage.c:684
-msgid "t"
+#: src/setup/wizard_util.c:145
+msgid "Unknown error"
 msgstr ""
 
-#: src/util/string.c:108
-msgid "unknown"
+#: src/setup/wizard_util.c:176
+msgid "This version of Windows does not support multiple users."
 msgstr ""
 
-#: src/util/string.c:111
-msgid "GiB"
+#: src/setup/wizard_util.c:180
+msgid "Error creating user"
 msgstr ""
 
-#: src/util/string.c:114
-msgid "MiB"
+#: src/setup/wizard_util.c:183
+msgid "Error accessing local security policy"
 msgstr ""
 
-#: src/util/string.c:117
-msgid "KiB"
+#: src/setup/wizard_util.c:186
+msgid "Error granting service right to user"
 msgstr ""
 
-#: src/util/string.c:120
-msgid "Bytes"
+#: src/setup/wizard_util.c:189
+msgid "Unknown error while creating a new user"
 msgstr ""
 
-#: src/util/tcp_return.c:51
-#, c-format
-msgid "`%s' failed, other side closed connection.\n"
+#: src/setup/gconf.c:73
+msgid "Sorry, no help is available for this option.\n"
 msgstr ""
 
-#: src/util/tcp_return.c:58
+#: src/setup/glade_support.c:75
 #, c-format
-msgid "`%s' failed, reply invalid!\n"
+msgid "Failed to find handler for `%s'\n"
 msgstr ""
 
-#: src/util/timer.c:190
-msgid "ms"
+#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
+#, c-format
+msgid "Failed to open `%s'.\n"
 msgstr ""
 
-#: src/util/timer.c:195
-msgid "s"
+#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
+#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
+#, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
 msgstr ""
 
-#: src/util/timer.c:201
-msgid "h"
-msgstr ""
-
-#: src/util/timer.c:204
-msgid " days"
-msgstr ""
-
-#: src/util/daemon.c:142
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
+#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
 #, c-format
-msgid "Attempted path to `%s' was `%s'.\n"
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
 msgstr ""
 
-#: src/util/xmalloc.c:52
+#: src/include/gnunet_util_error.h:207
 #, c-format
-msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
 msgstr ""
 
-#: src/include/gnunet_util.h:167
+#: src/include/gnunet_util_getopt.h:145
 msgid "print this help"
 msgstr ""
 
-#: src/include/gnunet_util.h:170
-msgid "set verbosity to LEVEL"
+#: src/include/gnunet_util_getopt.h:154
+msgid "print the version number"
 msgstr ""
 
-#: src/include/gnunet_util.h:173
-msgid "use configuration file FILENAME"
+#: src/include/gnunet_util_getopt.h:160
+msgid "configure logging to use LOGRULES"
 msgstr ""
 
-#: src/include/gnunet_util.h:176
-msgid "specify host on which gnunetd is running"
-msgstr ""
-
-#: src/include/gnunet_util.h:179
-msgid "print the version number"
-msgstr ""
-
-#: src/include/gnunet_util.h:182
+#: src/include/gnunet_util_getopt.h:166
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_util.h:637 src/include/gnunet_util.h:639
-#, c-format
-msgid "Assertion failed at %s:%d.\n"
+#: src/include/gnunet_util_getopt.h:172
+msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/include/gnunet_util.h:1058 src/include/gnunet_util.h:1060
-#: src/include/gnunet_util.h:1067
-#, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
+#: src/include/gnunet_util_getopt.h:178
+msgid "specify host on which gnunetd is running"
 msgstr ""

Modified: GNUnet/po/POTFILES.in
===================================================================
--- GNUnet/po/POTFILES.in       2006-07-23 17:07:38 UTC (rev 3129)
+++ GNUnet/po/POTFILES.in       2006-07-24 23:05:12 UTC (rev 3130)
@@ -1,275 +1,327 @@
 libltdl/ltdl.c
-src/applications/advertising/advertising.c
-src/applications/advertising/bootstrap.c
-src/applications/bootstrap_http/http.c
-src/applications/chat/chat.c
-src/applications/chat/gnunet-chat.c
-src/applications/datastore/datastore.c
-src/applications/datastore/filter.c
-src/applications/datastore/prefetch.c
-src/applications/dht/module/cs.c
+src/transports/ip6.c
+src/transports/udp6.c
+src/transports/http.c
+src/transports/nat.c
+src/transports/smtp.c
+src/transports/tcp.c
+src/transports/udp.c
+src/transports/ip.c
+src/transports/tcp6.c
+src/applications/dht/tools/dhttest2.c
+src/applications/dht/tools/dht-query.c
+src/applications/dht/tools/dht_api.c
+src/applications/dht/tools/dht-join.c
 src/applications/dht/module/datastore_dht_master.c
 src/applications/dht/module/datastore_memory.c
+src/applications/dht/module/dht.c
+src/applications/dht/module/cs.c
 src/applications/dht/module/datastore_memory_test.c
-src/applications/dht/module/dht.c
-src/applications/dht/tools/dht-join.c
-src/applications/dht/tools/dht-query.c
-src/applications/dht/tools/dht_api.c
-src/applications/dht/tools/dhttest2.c
-src/applications/fragmentation/fragmentation.c
-src/applications/fragmentation/fragmentationtest.c
-src/applications/fs/ecrs_core.c
-src/applications/fs/ecrs/directory.c
-src/applications/fs/ecrs/directorytest.c
-src/applications/fs/ecrs/download.c
-src/applications/fs/ecrs/ecrs.c
-src/applications/fs/ecrs/ecrstest.c
-src/applications/fs/ecrs/indexinfo.c
-src/applications/fs/ecrs/keyspace.c
-src/applications/fs/ecrs/meta.c
-src/applications/fs/ecrs/metatest.c
-src/applications/fs/ecrs/metatest2.c
-src/applications/fs/ecrs/namespace.c
-src/applications/fs/ecrs/namespacetest.c
-src/applications/fs/ecrs/search.c
-src/applications/fs/ecrs/searchtest.c
-src/applications/fs/ecrs/tree.c
-src/applications/fs/ecrs/unindex.c
-src/applications/fs/ecrs/upload.c
-src/applications/fs/ecrs/uri.c
-src/applications/fs/ecrs/uritest.c
-src/applications/fs/fsui/collection.c
-src/applications/fs/fsui/download.c
-src/applications/fs/fsui/downloadtest.c
-src/applications/fs/fsui/file_info.c
-src/applications/fs/fsui/fsui.c
-src/applications/fs/fsui/fsuitest.c
-src/applications/fs/fsui/fsuitest2.c
-src/applications/fs/fsui/helper.c
-src/applications/fs/fsui/namespace_info.c
-src/applications/fs/fsui/search.c
-src/applications/fs/fsui/searchtest.c
-src/applications/fs/fsui/unindex.c
-src/applications/fs/fsui/upload.c
-src/applications/fs/lib/fslib.c
-src/applications/fs/lib/fslibtest.c
-src/applications/fs/module/fs.c
-src/applications/fs/module/migration.c
-src/applications/fs/module/ondemand.c
-src/applications/fs/module/anonymity.c
-src/applications/fs/module/querymanager.c
-src/applications/fs/tools/gnunet-delete.c
-src/applications/fs/tools/gnunet-directory.c
-src/applications/fs/tools/gnunet-download.c
-src/applications/fs/tools/gnunet-insert.c
-src/applications/fs/tools/gnunet-pseudonym.c
-src/applications/fs/tools/gnunet-search.c
-src/applications/fs/tools/gnunet-unindex.c
-src/applications/gap/gap.c
-src/applications/gap/gaptest.c
-src/applications/getoption/clientapi.c
-src/applications/getoption/getoption.c
-src/applications/identity/hostkey.c
-src/applications/identity/identity.c
-src/applications/identity/identitytest.c
+src/applications/chat/chat.c
+src/applications/chat/gnunet-chat.c
+src/applications/advertising/advertising.c
+src/applications/advertising/bootstrap.c
+src/applications/topology_default/topology.c
 src/applications/pingpong/pingpong.c
+src/applications/sqstore_sqlite/sqlite.c
+src/applications/sqstore_sqlite/sqlitetest.c
+src/applications/session/sessiontest.c
+src/applications/session/connect.c
+src/applications/rpc/parameterstest.c
 src/applications/rpc/parameters.c
-src/applications/rpc/parameterstest.c
 src/applications/rpc/rpc.c
-src/applications/session/connect.c
-src/applications/session/sessiontest.c
 src/applications/sqstore_mysql/mysql.c
 src/applications/sqstore_mysql/mysqltest.c
-src/applications/sqstore_sqlite/sqlite.c
-src/applications/sqstore_sqlite/sqlitetest.c
+src/applications/datastore/prefetch.c
+src/applications/datastore/filter.c
+src/applications/datastore/datastore.c
+src/applications/identity/identitytest.c
+src/applications/identity/hostkey.c
+src/applications/identity/identity.c
+src/applications/testbed/commands.c
+src/applications/testbed/gnunet-testbed.c
+src/applications/testbed/socket.c
+src/applications/testbed/testbed.c
+src/applications/transport/transport.c
+src/applications/fragmentation/fragmentationtest.c
+src/applications/fragmentation/fragmentation.c
+src/applications/stats/gnunet-stats.c
 src/applications/stats/clientapi.c
-src/applications/stats/gnunet-stats.c
 src/applications/stats/statistics.c
 src/applications/tbench/gnunet-tbench.c
+src/applications/tbench/tbenchtest.c
 src/applications/tbench/tbench.c
-src/applications/tbench/tbenchtest.c
-src/applications/template/gnunet-template.c
-src/applications/template/template.c
-src/applications/testbed/commands.c
-src/applications/testbed/gnunet-testbed.c
-src/applications/testbed/socket.c
-src/applications/testbed/testbed.c
-src/applications/topology_default/topology.c
-src/applications/topology_f2f/topology.c
+src/applications/tbench/tbenchtest_udp.c
 src/applications/tracekit/gnunet-tracekit.c
 src/applications/tracekit/tracekit.c
+src/applications/gap/gap.c
+src/applications/gap/gaptest.c
+src/applications/gap/pid_table.c
+src/applications/getoption/clientapi.c
+src/applications/getoption/getoption.c
+src/applications/fs/tools/gnunet-pseudonym.c
+src/applications/fs/tools/gnunet-delete.c
+src/applications/fs/tools/gnunet-directory.c
+src/applications/fs/tools/gnunet-insert.c
+src/applications/fs/tools/gnunet-search.c
+src/applications/fs/tools/gnunet-download.c
+src/applications/fs/tools/gnunet-unindex.c
+src/applications/fs/module/querymanager.c
+src/applications/fs/module/ondemand.c
+src/applications/fs/module/anonymity.c
+src/applications/fs/module/fs.c
+src/applications/fs/module/migration.c
+src/applications/fs/fsui/namespace_info.c
+src/applications/fs/fsui/searchtest.c
+src/applications/fs/fsui/search.c
+src/applications/fs/fsui/fsuitest.c
+src/applications/fs/fsui/fsui.c
+src/applications/fs/fsui/namespace_infotest.c
+src/applications/fs/fsui/downloadtest.c
+src/applications/fs/fsui/download.c
+src/applications/fs/fsui/unindex.c
+src/applications/fs/fsui/helper.c
+src/applications/fs/fsui/upload.c
+src/applications/fs/fsui/fsuitest2.c
+src/applications/fs/fsui/file_info.c
+src/applications/fs/fsui/collection.c
+src/applications/fs/fsui/fsui-loader.c
+src/applications/fs/lib/fslibtest.c
+src/applications/fs/lib/fslib.c
+src/applications/fs/ecrs/uritest.c
+src/applications/fs/ecrs/tree.c
+src/applications/fs/ecrs/uri.c
+src/applications/fs/ecrs/keyspace.c
+src/applications/fs/ecrs/directorytest.c
+src/applications/fs/ecrs/directory.c
+src/applications/fs/ecrs/search.c
+src/applications/fs/ecrs/searchtest.c
+src/applications/fs/ecrs/download.c
+src/applications/fs/ecrs/metatest2.c
+src/applications/fs/ecrs/unindex.c
+src/applications/fs/ecrs/indexinfo.c
+src/applications/fs/ecrs/upload.c
+src/applications/fs/ecrs/metatest.c
+src/applications/fs/ecrs/meta.c
+src/applications/fs/ecrs/namespacetest.c
+src/applications/fs/ecrs/namespace.c
+src/applications/fs/ecrs/ecrstest.c
+src/applications/fs/ecrs/ecrs.c
+src/applications/fs/ecrs_core.c
+src/applications/topology_f2f/topology.c
+src/applications/template/template.c
+src/applications/template/gnunet-template.c
+src/applications/bootstrap_http/http.c
+src/applications/traffic/traffic.c
 src/applications/traffic/clientapi.c
-src/applications/traffic/traffic.c
-src/applications/transport/transport.c
-src/conf/conf.c
-src/conf/confdata.c
-src/conf/recreate.c
-src/conf/expr.c
-src/conf/gconf.c
-src/conf/wizard.glade
-src/conf/gnunet-setup.c
-src/conf/gnunet-win-tool.c
-src/conf/lex.zconf.c
-src/conf/mconf.c
-src/conf/mconf_checklist.c
-src/conf/mconf_inputbox.c
-src/conf/mconf_menubox.c
-src/conf/mconf_msgbox.c
-src/conf/mconf_textbox.c
-src/conf/mconf_util.c
-src/conf/mconf_yesno.c
-src/conf/menu.c
-src/conf/symbol.c
-src/conf/wizard_gtk.c
-src/conf/wizard_curs.c
-src/conf/wizard_util.c
-src/conf/zconf_tab.c
+src/applications/kvstore_sqlite/kv_sqlitetest.c
+src/applications/kvstore_sqlite/kv_sqlite.c
+src/applications/vpn/gnunet-vpn.c
+src/applications/vpn/vpn.c
+src/applications/state/statetest.c
+src/applications/state/state.c
+src/server/gnunet-update.c
 src/server/connection.c
+src/server/startup.c
+src/server/gnunetd.c
 src/server/core.c
-src/server/gnunet-peer-info.c
 src/server/gnunet-transport-check.c
-src/server/gnunet-update.c
-src/server/gnunetd.c
+src/server/tcpserver.c
 src/server/handler.c
-src/server/startup.c
-src/server/tcpserver.c
 src/server/version.c
-src/transports/ip6.c
-src/transports/http.c
-src/transports/nat.c
-src/transports/smtp.c
-src/transports/tcp.c
-src/transports/tcp6.c
-src/transports/udp.c
-src/transports/ip.c
-src/transports/udp6.c
-src/util/bloomfilter.c
-src/util/bloomtest.c
-src/util/checksum.c
-src/util/configtest.c
-src/util/configuration.c
-src/util/crctest.c
-src/util/cron.c
-src/util/crontest.c
-src/util/dso.c
-src/util/getopt.c
-src/util/hashing.c
-src/util/hashingtest.c
-src/util/hashtest.c
-src/util/hostkey_gcrypt.c
-src/util/hostkeytest.c
-src/util/identitytest.c
+src/server/gnunet-peer-info.c
+src/util/win/winproc.c
+src/util/cron/crontest.c
+src/util/cron/cron.c
 src/util/initialize.c
-src/util/io.c
-src/util/random.c
-src/util/ipcheck.c
-src/util/kblockkey.c
-src/util/kblockkey_test.c
-src/util/locking_gcrypt.c
-src/util/logging.c
-src/util/port.c
-src/util/printhelp.c
-src/util/semaphore.c
-src/util/semaphoretest.c
-src/util/shutdown.c
-src/util/shutdowntest.c
-src/util/state.c
-src/util/statetest.c
-src/util/statuscalls.c
-src/util/statuscallstest.c
-src/util/storage.c
-src/util/storagetest.c
-src/util/string.c
-src/util/symcipher_gcrypt.c
-src/util/symciphertest.c
-src/util/tcp_return.c
-src/util/tcpio.c
-src/util/tcpiotest.c
-src/util/timer.c
-src/util/timertest.c
-src/util/vector.c
-src/util/daemon.c
-src/util/vectortest.c
-src/util/weakkeytest.c
-src/util/win/winproc.c
-src/util/xmalloc.c
-src/util/xmalloctest.c
-src/util/daemontest.c
+src/util/crypto/symcipher_gcrypt.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/weakkeytest.c
+src/util/crypto/hashing.c
+src/util/crypto/hashingtest.c
+src/util/crypto/symciphertest.c
+src/util/crypto/hostkeytest.c
+src/util/crypto/crctest.c
+src/util/crypto/crc32.c
+src/util/crypto/kblockkey_test.c
+src/util/os/statuscallstest.c
+src/util/os/statuscalls.c
+src/util/os/daemontest.c
+src/util/os/daemon.c
+src/util/os/semaphoretest.c
+src/util/os/semaphore.c
+src/util/os/osconfig.c
+src/util/os/dso.c
+src/util/os/cpustatus.c
+src/util/os/time.c
+src/util/os/installpath.c
+src/util/network/tcpiotest.c
+src/util/network/endian.c
+src/util/network/tcpio.c
+src/util/network/ipcheck.c
+src/util/network/io.c
+src/util/network/daemon.c
+src/util/disk/storagetest.c
+src/util/disk/storage.c
+src/util/config_impl/configtest.c
+src/util/config_impl/impl.c
+src/util/error/error.c
+src/util/threads/semaphoretest.c
+src/util/threads/timertest.c
+src/util/threads/mutex.c
+src/util/threads/semaphore.c
+src/util/threads/shutdowntest.c
+src/util/threads/pthread.c
+src/util/threads/shutdown.c
+src/util/threads/time.c
+src/util/loggers/file.c
+src/util/loggers/smtp.c
+src/util/loggers/memory.c
+src/util/getopt/printversion.c
+src/util/getopt/getopt.c
+src/util/getopt/setoption.c
+src/util/getopt/printhelp.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/containers/hashtable.c
+src/util/containers/hashtabletest.c
+src/util/config/config.c
+src/util/string/xmalloctest.c
+src/util/string/xmalloc.c
+src/util/string/string.c
+src/setup/gnunet-setup.c
+src/setup/mconf_util.c
+src/setup/wizard_gtk.c
+src/setup/mconf.c
+src/setup/gnunet-win-tool.c
+src/setup/symbol.c
+src/setup/mconf_textbox.c
+src/setup/mconf_yesno.c
+src/setup/conf.c
+src/setup/wizard_curs.c
+src/setup/recreate.c
+src/setup/mconf_checklist.c
+src/setup/mconf_menubox.c
+src/setup/menu.c
+src/setup/images.c
+src/setup/zconf_tab.c
+src/setup/lex.zconf.c
+src/setup/expr.c
+src/setup/confdata.c
+src/setup/mconf_msgbox.c
+src/setup/mconf_inputbox.c
+src/setup/wizard_util.c
+src/setup/gconf.c
+src/setup/glade_support.c
 config.h
+libltdl/ltdl.h
 libltdl/config.h
-libltdl/ltdl.h
-src/applications/advertising/bootstrap.h
-src/applications/chat/chat.h
-src/applications/datastore/filter.h
-src/applications/datastore/prefetch.h
-src/applications/dht/module/datastore_dht_master.h
-src/applications/dht/module/dht.h
-src/applications/fs/ecrs/ecrs.h
-src/applications/fs/ecrs/tree.h
-src/applications/fs/ecrs/uri.h
-src/applications/fs/fsui/fsui.h
-src/applications/fs/module/migration.h
-src/applications/fs/module/ondemand.h
-src/applications/fs/module/querymanager.h
-src/applications/fs/module/anonymity.h
-src/applications/getoption/getoption.h
-src/applications/identity/hostkey.h
-src/applications/stats/statistics.h
-src/applications/tbench/tbench.h
-src/applications/testbed/commands.h
-src/applications/testbed/socket.h
-src/applications/testbed/testbed.h
-src/applications/tracekit/tracekit.h
-src/applications/traffic/traffic.h
-src/conf/bool.h
-src/conf/expr.h
-src/conf/lkc.h
-src/conf/lkc_defs.h
-src/conf/lkc_proto.h
-src/conf/mconf_colors.h
-src/conf/mconf_dialog.h
-src/conf/wizard_gtk.h
-src/conf/wizard_util.h
-src/conf/zconf.tab.h
-src/include/core.h
-src/include/ecrs_core.h
-src/include/fs.h
-src/include/gettext.h
-src/include/gnunet_blockstore.h
-src/include/gnunet_bootstrap_service.h
+src/transports/ip6.h
+src/transports/ip.h
 src/include/gnunet_core.h
-src/include/gnunet_datastore_service.h
 src/include/gnunet_dht.h
 src/include/gnunet_dht_datastore_memory.h
-src/include/gnunet_dht_lib.h
-src/include/gnunet_dht_service.h
-src/include/gnunet_ecrs_lib.h
+src/include/gnunet_util.h
 src/include/gnunet_fragmentation_service.h
-src/include/gnunet_fs_lib.h
-src/include/gnunet_fsui_lib.h
+src/include/gnunet_getoption_lib.h
+src/include/gnunet_stats_lib.h
+src/include/gnunet_protocols.h
 src/include/gnunet_gap_service.h
-src/include/gnunet_getoption_lib.h
-src/include/gnunet_identity_service.h
+src/include/ecrs_core.h
+src/include/core.h
+src/include/gnunet_topology_service.h
+src/include/gnunet_bootstrap_service.h
 src/include/gnunet_pingpong_service.h
-src/include/gnunet_protocols.h
-src/include/gnunet_rpc_service.h
+src/include/winproc.h
 src/include/gnunet_session_service.h
-src/include/gnunet_sqstore_service.h
-src/include/gnunet_stats_lib.h
-src/include/gnunet_stats_service.h
-src/include/gnunet_topology_service.h
 src/include/gnunet_traffic_lib.h
-src/include/gnunet_traffic_service.h
+src/include/platform.h
+src/include/gnunet_dht_lib.h
+src/include/plibc.h
+src/include/gnunet_fs_lib.h
+src/include/gnunet_identity_service.h
+src/include/fs.h
 src/include/gnunet_transport.h
 src/include/gnunet_transport_service.h
-src/include/gnunet_util.h
-src/include/platform.h
-src/include/plibc.h
-src/include/winproc.h
+src/include/gnunet_stats_service.h
+src/include/gnunet_sqstore_service.h
+src/include/gnunet_ecrs_lib.h
+src/include/gnunet_traffic_service.h
+src/include/gnunet_fsui_lib.h
+src/include/gnunet_dht_service.h
+src/include/gnunet_rpc_service.h
+src/include/gettext.h
+src/include/gnunet_blockstore.h
+src/include/gnunet_datastore_service.h
+src/include/gnunet_util_config_impl.h
+src/include/gnunet_kvstore_service.h
+src/include/gnunet_util_crypto.h
+src/include/gnunet_util_error.h
+src/include/gnunet_util_network.h
+src/include/gnunet_util_cron.h
+src/include/gnunet_util_threads.h
+src/include/gnunet_util_getopt.h
+src/include/gnunet_state_service.h
+src/include/gnunet_util_config.h
+src/include/gnunet_util_containers.h
+src/include/gnunet_util_string.h
+src/include/gnunet_util_os.h
+src/include/gnunet_util_disk.h
+src/include/gnunet_util_error_loggers.h
+src/include/gnunet_util_common.h
+src/applications/dht/module/dht.h
+src/applications/dht/module/datastore_dht_master.h
+src/applications/chat/chat.h
+src/applications/advertising/bootstrap.h
+src/applications/datastore/prefetch.h
+src/applications/datastore/filter.h
+src/applications/identity/hostkey.h
+src/applications/testbed/testbed.h
+src/applications/testbed/commands.h
+src/applications/testbed/socket.h
+src/applications/stats/statistics.h
+src/applications/tbench/tbench.h
+src/applications/tracekit/tracekit.h
+src/applications/gap/gap.h
+src/applications/gap/pid_table.h
+src/applications/getoption/getoption.h
+src/applications/fs/module/migration.h
+src/applications/fs/module/querymanager.h
+src/applications/fs/module/ondemand.h
+src/applications/fs/module/anonymity.h
+src/applications/fs/fsui/fsui.h
+src/applications/fs/ecrs/ecrs.h
+src/applications/fs/ecrs/tree.h
+src/applications/fs/ecrs/uri.h
+src/applications/traffic/traffic.h
 src/server/connection.h
-src/server/handler.h
 src/server/startup.h
 src/server/tcpserver.h
+src/server/handler.h
 src/server/version.h
-src/transports/ip6.h
-src/util/locking_gcrypt.h
+src/util/crypto/locking_gcrypt.h
+src/setup/gconf_callbacks.h
+src/setup/gconf.h
+src/setup/wizard_gtk.h
+src/setup/wizard_util.h
+src/setup/mconf.h
+src/setup/zconf.tab.h
+src/setup/conf.h
+src/setup/recreate.h
+src/setup/bool.h
+src/setup/lkc_proto.h
+src/setup/wizard_curs.h
+src/setup/zconf_tab.h
+src/setup/lkc.h
+src/setup/lkc_defs.h
+src/setup/expr.h
+src/setup/confdata.h
+src/setup/mconf_dialog.h
+src/setup/mconf_colors.h
+src/setup/glade_support.h

Modified: GNUnet/po/de.po
===================================================================
--- GNUnet/po/de.po     2006-07-23 17:07:38 UTC (rev 3129)
+++ GNUnet/po/de.po     2006-07-24 23:05:12 UTC (rev 3130)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 09:13-0700\n"
+"POT-Creation-Date: 2006-07-24 16:55-0700\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -16,336 +16,368 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/transports/ip6.c:60
 #, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
-msgstr ""
-"Hello Nachricht von `%s' ist ungültig (Signatur ist ungültig). Nachricht "
-"wurde verworfen.\n"
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/applications/advertising/advertising.c:167
+#: src/transports/ip6.c:100
+#, c-format
+msgid "Could not resolve `%s': %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+
+#: src/transports/ip6.c:138
+msgid "Failed to obtain my (external) IPv6 address!\n"
+msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
+
+#: src/transports/udp6.c:128 src/transports/udp.c:145
+#, c-format
 msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+"Cannot determine port to bind to.  Define in configuration file in section `%"
+"s' under `%s' or in `%s' under %s/%s.\n"
 msgstr ""
-"Empfangene Hello Nachricht ist ungültig (Ablaufzeit über Limit). Nachricht "
-"wurde verworfen.\n"
+"Der Port, an dem Verbindungen entgegengenommen werden sollen, konnte nicht "
+"ermittelt werden. Bitte definieren Sie ihn in der Konfigurationsdatei in der "
+"Sektion `%s' unter `%s' oder in `%s' unter %s/%s.\n"
 
-#: src/applications/advertising/advertising.c:176
+#: src/transports/udp6.c:164
 #, c-format
-msgid "hello advertisement for protocol %d received.\n"
-msgstr "Hello Ankündigung für Protokoll %d empfangen.\n"
+msgid "Failed to bind to UDP6 port %d.\n"
+msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/applications/advertising/advertising.c:295
-msgid "Could not send hellos+PING, ping buffer full.\n"
-msgstr "Hellos+PING konnten nicht gesendet werden, Ping Puffer ist voll.\n"
+#: src/transports/udp6.c:235
+#, fuzzy, c-format
+msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
+msgstr ""
+"UDP: select kam zurück aber ioctl berichtet, dass 0 Bytes verfügbar sind!\n"
 
-#: src/applications/advertising/advertising.c:308
+#: src/transports/udp6.c:290
 #, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
-msgstr "`%s' fehlgeschlagen (%d, %u). PING wird nicht gesendet.\n"
+msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+msgstr ""
+"Ungültige UDP6 Nachricht von %s:%d empfangen, Nachricht wird ignoriert.\n"
 
-#: src/applications/advertising/advertising.c:460
+#: src/transports/udp6.c:321
 #, c-format
-msgid "Advertising my transport %d to selected peers.\n"
-msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
+msgid "Packet received from %s:%d (UDP6) failed format check."
+msgstr ""
+"Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
+"schlug fehl."
 
-#: src/applications/advertising/advertising.c:467
+#: src/transports/udp6.c:334 src/transports/tcp6.c:657
+#, c-format
+msgid "%s: Rejected connection from blacklisted address %s.\n"
+msgstr "%s: Zurückgewiesene Verbindung von schwarzgelisteter Adresse %s.\n"
+
+#: src/transports/udp6.c:415
+msgid "UDP6: Could not determine my public IPv6 address.\n"
+msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/transports/udp6.c:699 src/transports/smtp.c:932
+#: src/transports/udp.c:722
+#, c-format
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgstr ""
+"MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
+"implementiert!)\n"
+
+#: src/transports/http.c:601
+msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
+msgstr ""
+"Es wurde eine Willkommensnachricht erwartet, tatsächlich wurde jedoch keine "
+"gesendet. HTTP-Verbindung wird geschlossen.\n"
+
+#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#, c-format
+msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
+msgstr ""
+"%s: Abgewiesene Verbindung von schwarzgelisteter Adresse %u.%u.%u.%u.\n"
+
+#: src/transports/http.c:1101
+msgid "HTTP: Could not determine my public IP address.\n"
+msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#, c-format
+msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
+
+#: src/transports/http.c:1333
+#, c-format
 msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+"Could not bind the HTTP listener to port %d. No transport service started.\n"
 msgstr ""
-"Bekanntmachung von uns zwecklos: bis jetzt sind uns keine anderen Knoten "
-"bekannt.\n"
+"HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport Dienst "
+"wurde nicht gestartet.\n"
 
-#: src/applications/advertising/advertising.c:569
+#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
 #, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
-msgstr "Hello von Knoten `%s' wird entfernt (lief vor %ds ab).\n"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden.\n"
 
-#: src/applications/advertising/advertising.c:729
-msgid "# Peer advertisements received"
-msgstr "# Knotenankündigungen empfangen"
+#: src/transports/http.c:1478
+msgid "# bytes received via HTTP"
+msgstr "# Bytes empfangen über HTTP"
 
-#: src/applications/advertising/advertising.c:730
-msgid "# Self advertisments transmitted"
-msgstr "# Selbstbekanntmachungen übertragen"
+#: src/transports/http.c:1480
+msgid "# bytes sent via HTTP"
+msgstr "# Bytes gesendet über HTTP"
 
-#: src/applications/advertising/advertising.c:731
-msgid "# Foreign advertisements forwarded"
-msgstr "# Bekanntmachungen von anderen übertragen"
+#: src/transports/http.c:1482
+msgid "# bytes dropped by HTTP (outgoing)"
+msgstr "# Bytes verworfen von HTTP"
 
-#: src/applications/advertising/advertising.c:733
-#: src/applications/pingpong/pingpong.c:462
-msgid "# plaintext PING messages sent"
-msgstr "# Klartext PING Nachrichten gesendet"
+#: src/transports/smtp.c:297
+#, c-format
+msgid "Could not resolve name of SMTP server `%s': %s"
+msgstr "Der Name des SMTP servers `%s' konnte nicht aufgelöst werden: %s"
 
-#: src/applications/advertising/advertising.c:737
-#: src/applications/session/connect.c:752
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
 #, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
-msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section `%s' "
+"under `%s'.\n"
+msgstr ""
+"Für den SMTP Transport müssen Sie den Namen einer Pipe in Sektion `%s', "
+"Eintrag `%s' eintragen.\n"
 
-#: src/applications/advertising/advertising.c:756
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
+#: src/transports/smtp.c:489
+msgid "Received malformed message via SMTP (size mismatch).\n"
+msgstr ""
+"Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
 
-#: src/applications/advertising/advertising.c:776
-msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+#: src/transports/smtp.c:584
+msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
 msgstr ""
-"Stellt sicher, dass dieser Knoten anderen Knoten bekannt ist und entdeckt "
-"andere Knoten"
+"Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
+"werden.\n"
 
-#: src/applications/bootstrap_http/http.c:81
-#: src/applications/testbed/testbed.c:1079
+#: src/transports/smtp.c:591
 #, c-format
-msgid "Invalid URL `%s' (must begin with `%s')\n"
-msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
+msgid "SMTP filter string to long, capped to `%s'\n"
+msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/applications/bootstrap_http/http.c:109
+#: src/transports/smtp.c:764
 #, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-msgstr "Ungültiger Port \"%s\" in Angabe der Hostlist, versuche Port %d.\n"
+msgid "Sending E-mail to `%s' failed.\n"
+msgstr "Das Senden einer E-Mail an `%s' schlug fehl.\n"
 
-#: src/applications/bootstrap_http/http.c:120
+#: src/transports/smtp.c:815
 #, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+msgid "SMTP server send unexpected response at %s:%d.\n"
+msgstr "Der SMTP server sendete eine unerwartete Antwort bei %s:%d.\n"
 
-#: src/applications/bootstrap_http/http.c:132
+#: src/transports/smtp.c:838
 #, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+msgid ""
+"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
 msgstr ""
-"Die Liste mit Knotenkontakten konnte nicht heruntergeladen werden, Host `%s' "
-"ist unbekannt.\n"
+"SMTP Server antwortete nicht mit einem 250 Bestätigungscode auf eine `%s' "
+"Anfrage.\n"
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
+#: src/transports/smtp.c:844
 #, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
+msgid "Failed to send `%s' request to SMTP server.\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/applications/bootstrap_http/http.c:217
+#: src/transports/smtp.c:903
 #, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "Das Parsen der HTTP Antwort für die URL `%s' schlug fehl.\n"
+msgid "%.*s filter %s (SMTP)"
+msgstr "%.*s filter %s (SMTP)"
 
-#: src/applications/bootstrap_http/http.c:252
+#: src/transports/tcp.c:465
 #, c-format
-msgid "Parsing hello from `%s' failed.\n"
-msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
+msgid ""
+"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgstr ""
+"Es wurde eine Willkommensnachricht erwartet, über die TCP Verbindung wurde "
+"aber keine gesendet (%u, %u). Verbindung wird geschlossen.\n"
 
-#: src/applications/bootstrap_http/http.c:330
+#: src/transports/tcp.c:499
 #, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+msgid ""
+"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
 msgstr ""
-"Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden. Es wird ohne "
-"Proxy versucht.\n"
+"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
+"u) empfangen. Verbindung wird geschlossen.\n"
 
-#: src/applications/bootstrap_http/http.c:355
-msgid "# hellos downloaded via http"
-msgstr "# Hellos per HTTP heruntergeladen"
+#: src/transports/tcp.c:1082
+msgid "Could not determine my public IP address.\n"
+msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/applications/chat/chat.c:87
-msgid "Message received from peer is invalid.\n"
-msgstr "Empfangene Nachricht ist ungültig.\n"
+#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
+#, c-format
+msgid "Failed to start transport service on port %d.\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/applications/chat/chat.c:134
-msgid "Message received from client is invalid\n"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+#: src/transports/tcp.c:1449
+msgid "# bytes received via TCP"
+msgstr "# Bytes empfangen über TCP"
 
-#: src/applications/chat/chat.c:156
-msgid "Maximum number of chat clients reached.\n"
-msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
+#: src/transports/tcp.c:1451
+msgid "# bytes sent via TCP"
+msgstr "# Bytes gesendet über TCP"
 
-#: src/applications/chat/chat.c:160
-#, c-format
-msgid "Now %d of %d chat clients at this node.\n"
-msgstr "Jetzt sind %d von %d auf diesem Knoten.\n"
+#: src/transports/tcp.c:1453
+msgid "# bytes dropped by TCP (outgoing)"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/applications/chat/chat.c:197
+#: src/transports/udp.c:179
 #, c-format
-msgid "`%s' registering handlers %d and %d\n"
-msgstr "`%s' registriert Handler %d und %d\n"
+msgid "Failed to bind to UDP port %d.\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/applications/chat/chat.c:212
-msgid "enables P2P-chat (incomplete)"
-msgstr "Ermöglicht P2P-Chat"
+#: src/transports/udp.c:250
+#, fuzzy, c-format
+msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
+msgstr ""
+"UDP: select kam zurück aber ioctl berichtet, dass 0 Bytes verfügbar sind!\n"
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
-msgstr "Spitznamen angeben"
+#: src/transports/udp.c:307
+#, c-format
+msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+msgstr ""
+"Es wurde eine ungültige UDP Nachricht von %u.%u.%u.%u:%u empfangen, "
+"Nachricht wird ignoriert.\n"
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
-msgstr "GNUnet chat client starten"
-
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:106
-#: src/conf/gnunet-setup.c:286 src/server/gnunet-peer-info.c:107
-#: src/server/gnunet-transport-check.c:521 src/server/gnunet-update.c:142
-#: src/server/startup.c:574
+#: src/transports/udp.c:332
 #, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
+msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
+msgstr ""
+"Ein Paket empfangen von %u.%u.%u.%u:%u (UDP) hat ein ungültiges Format.\n"
 
-#: src/applications/chat/gnunet-chat.c:151
-#: src/applications/fs/tools/gnunet-delete.c:142
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363 src/util/port.c:85
-msgid "Could not connect to gnunetd.\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+#: src/transports/udp.c:417
+msgid "UDP: Could not determine my public IP address.\n"
+msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/applications/chat/gnunet-chat.c:155
+#: src/transports/udp.c:551
 #, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "Sie müssen einen Spitznamen angeben (verwenden Sie die Option `%s').\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"
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
-msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
+#: src/transports/udp.c:707
+msgid "# bytes received via UDP"
+msgstr "# Bytes empfangen über UDP"
 
-#: src/applications/chat/gnunet-chat.c:191
-msgid "Could not send message to gnunetd\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+#: src/transports/udp.c:709
+msgid "# bytes sent via UDP"
+msgstr "# Bytes gesendet über UDP"
 
-#: src/applications/datastore/datastore.c:118
-#, c-format
-msgid "Availability test failed for `%s' at %s:%d.\n"
-msgstr "Verfügbarkeitstest für `%s' fehlgeschlagen bei %s:%d.\n"
+#: src/transports/udp.c:711
+msgid "# bytes dropped by UDP (outgoing)"
+msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/applications/datastore/datastore.c:142
+#: src/transports/ip.c:124
 #, c-format
-msgid "Database failed to delete `%s'.\n"
-msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
-
-#: src/applications/datastore/filter.c:42
-#, c-format
 msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
+"Could not find interface `%s' in `%s', trying to find another interface.\n"
 msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"für FS Daten angeben.\n"
+"Gerät `%s' konnte in `%s' nicht gefunden werden, es wird versucht, ein "
+"anderes Gerät zu finden.\n"
 
-#: src/applications/dht/module/cs.c:446
+#: src/transports/ip.c:149
 #, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
+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/applications/dht/module/cs.c:466
+#: src/transports/ip.c:193
 #, c-format
-msgid "`%s' failed.  Terminating connection to client.\n"
-msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
+msgid "Could not find an IP address for interface `%s'.\n"
+msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/applications/dht/module/cs.c:542
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "sendAck fehlgeschlagen. Beende Verbindung zu Client.\n"
-
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/transports/ip.c:203
 #, c-format
-msgid "`%s' failed. Terminating connection to client.\n"
-msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
+msgid ""
+"There is more than one IP address specified for interface `%s'.\n"
+"GNUnet will use %u.%u.%u.%u.\n"
+msgstr ""
+"Es ist mehr als eine IP-Adresse für das Gerät `%s' angegeben.\n"
+"GNUnet wird %u.%u.%u.%u. verwenden.\n"
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/transports/ip.c:224
 #, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+msgid "Could not resolve `%s' to determine our IP address: %s\n"
+msgstr ""
+"`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/applications/dht/module/dht.c:946
+#: src/transports/ip.c:256
 #, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr "Ungültiges optionales Feld `%s' empfangen von Knoten `%s'.\n"
+msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/applications/dht/module/dht.c:973
-#, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+#: src/transports/ip.c:306
+msgid "Failed to obtain my (external) IP address!\n"
+msgstr "Fehler beim Bestimmen der (externen) IP-Adresse!\n"
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
-#, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
+#: src/transports/tcp6.c:439
+msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+msgstr ""
+"Es wurde eine Willkommensnachricht erwartet, über die TCP Verbindung wurde "
+"jedoch keine gesendet. Verbindung wird geschlossen.\n"
 
-#: src/applications/dht/module/dht.c:1447
-#, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
+#: src/transports/tcp6.c:469
+msgid ""
+"Received malformed message from tcp6-peer connection. Closing connection.\n"
+msgstr ""
+"über die TCP6-Verbindung zu einem anderen Knoten wurde eine ungültige "
+"Nachricht empfangen. Verbindung wird geschlossen.\n"
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
-#, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "`%s' mit einem Timeout von über einer Stunde aufgerufen (Fehler?)\n"
+#: src/transports/tcp6.c:958
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/applications/dht/module/dht.c:1793
+#: src/transports/tcp6.c:1002
 #, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Ungültige Antwort auf `%s'.\n"
+msgid "`%s': unknown service: %s\n"
+msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/applications/dht/module/dht.c:1993
-#, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr "Beschädigte Antwort auf `%s' in Master Tabelle.\n"
+#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/session/sessiontest.c:48
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:107
+#: src/applications/tbench/tbenchtest_udp.c:107
+#: src/applications/gap/gaptest.c:52
+msgid "# of connected peers"
+msgstr "# verbundener Knoten"
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/applications/dht/tools/dhttest2.c:128
+#: src/applications/session/sessiontest.c:118
+#: src/applications/tbench/tbenchtest.c:199
+#: src/applications/tbench/tbenchtest_udp.c:201
+#: src/applications/gap/gaptest.c:318
 #, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Ungültige Antwort auf `%s' von `%s'\n"
+msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+msgstr "Warte auf den Start von gnunetd (%u Iterationen verbleiben)...\n"
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/session/sessiontest.c:133
+#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/tbench/tbenchtest_udp.c:122
+#: src/applications/gap/gaptest.c:330
 #, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Ungültiger RPC `%s' empfangen.\n"
-
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
-#, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
+msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
-"RPC für `%s' empfangen für eine Tabelle, an der wir nicht beteiligt sind!\n"
+"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
+"verbleiben)...\n"
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "SIZE bytes an Speicher für die lokale Tabelle erlauben"
+#: src/applications/dht/tools/dht-query.c:39
+msgid "query table called NAME"
+msgstr "Frage Tabelle mit dem Namen NAME ab"
 
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
-msgstr "Tabelle NAME anschließen"
+#: src/applications/dht/tools/dht-query.c:41
+msgid "allow TIME ms to process each command"
+msgstr "TIME ms erlauben, um jedes Kommando zu bearbeiten"
 
-#: src/applications/dht/tools/dht-join.c:51
-msgid "Join a DHT."
-msgstr "Einer DHT anschließen."
+#: src/applications/dht/tools/dht-query.c:46
+msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
+msgstr "Eine DHT Tabelle abfragen (get KEY, put KEY VALUE, remove KEY VALUE)."
 
-#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/tbench/gnunet-tbench.c:124
 #: src/applications/tbench/gnunet-tbench.c:134
 #: src/applications/tbench/gnunet-tbench.c:147
@@ -356,6 +388,13 @@
 #: src/applications/tracekit/gnunet-tracekit.c:87
 #: src/applications/tracekit/gnunet-tracekit.c:122
 #: src/applications/tracekit/gnunet-tracekit.c:136
+#: src/applications/fs/tools/gnunet-pseudonym.c:120
+#: src/applications/fs/tools/gnunet-insert.c:315
+#: src/applications/fs/tools/gnunet-insert.c:461
+#: src/applications/fs/tools/gnunet-search.c:167
+#: src/applications/fs/tools/gnunet-search.c:183
+#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/fs/tools/gnunet-download.c:96
 #: src/server/gnunet-transport-check.c:448
 #: src/server/gnunet-transport-check.c:462
 #: src/server/gnunet-transport-check.c:479
@@ -364,56 +403,30 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
-msgstr "überflüssige Parameter (werden ignoriert).\n"
-
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-query.c:99
+#: src/applications/dht/tools/dht-join.c:108
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546
+#: src/applications/stats/gnunet-stats.c:144
+#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tracekit/gnunet-tracekit.c:153
+#: src/applications/fs/tools/gnunet-pseudonym.c:232
+#: src/applications/fs/tools/gnunet-delete.c:111
+#: src/applications/fs/tools/gnunet-directory.c:190
+#: src/applications/fs/tools/gnunet-insert.c:532
+#: src/applications/fs/tools/gnunet-search.c:221
+#: src/applications/fs/tools/gnunet-download.c:130
+#: src/applications/fs/tools/gnunet-unindex.c:140
+#: src/applications/template/gnunet-template.c:87
+#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
+#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
+#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
 #, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "Aufruf von `%s' gibt %d zurück.\n"
+msgid "Use --help to get a list of options.\n"
+msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
-#: src/applications/dht/tools/dht-join.c:132
-#, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
-
-#: src/applications/dht/tools/dht-join.c:133
-#, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Aufruf von `%s' mit Wert '%.*s' (%d Bytes).\n"
-
-#: src/applications/dht/tools/dht-join.c:211
-#: src/applications/dht/tools/dht-query.c:231
-#, c-format
-msgid "No table name specified, using `%s'.\n"
-msgstr "Kein Tabellenname angegeben, verwende `%s'.\n"
-
-#: src/applications/dht/tools/dht-join.c:236
-msgid "Error joining DHT.\n"
-msgstr "Fehler beim Beitreten zu der DHT.\n"
-
-#: src/applications/dht/tools/dht-join.c:243
-#, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr "Der DHT beigetreten. Drücken Sie STRG-C, um sie zu verlassen.\n"
-
-#: src/applications/dht/tools/dht-join.c:250
-msgid "Error leaving DHT.\n"
-msgstr "Fehler beim Verlassen der DHT.\n"
-
-#: src/applications/dht/tools/dht-query.c:39
-msgid "query table called NAME"
-msgstr "Frage Tabelle mit dem Namen NAME ab"
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-msgstr "TIME ms erlauben, um jedes Kommando zu bearbeiten"
-
-#: src/applications/dht/tools/dht-query.c:46
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
-msgstr "Eine DHT Tabelle abfragen (get KEY, put KEY VALUE, remove KEY VALUE)."
-
 #: src/applications/dht/tools/dht-query.c:106
 msgid "No commands specified.\n"
 msgstr "Keine Kommandos angegeben.\n"
@@ -430,6 +443,12 @@
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)' fehlgeschlagen.\n"
 
+#: src/applications/dht/tools/dht-query.c:231
+#: src/applications/dht/tools/dht-join.c:211
+#, c-format
+msgid "No table name specified, using `%s'.\n"
+msgstr "Kein Tabellenname angegeben, verwende `%s'.\n"
+
 #: src/applications/dht/tools/dht-query.c:246
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
@@ -508,192 +527,555 @@
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Unerwartete Antwort zu `%s' Operation.\n"
 
-#: src/applications/dht/tools/dhttest2.c:50 src/applications/gap/gaptest.c:52
-#: src/applications/session/sessiontest.c:48
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:107
-msgid "# of connected peers"
-msgstr "# verbundener Knoten"
+#: src/applications/dht/tools/dht-join.c:43
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "SIZE bytes an Speicher für die lokale Tabelle erlauben"
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
-#: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:199
+#: src/applications/dht/tools/dht-join.c:45
+msgid "join table called NAME"
+msgstr "Tabelle NAME anschließen"
+
+#: src/applications/dht/tools/dht-join.c:51
+msgid "Join a DHT."
+msgstr "Einer DHT anschließen."
+
+#: src/applications/dht/tools/dht-join.c:115
+msgid "Superflous arguments (ignored).\n"
+msgstr "überflüssige Parameter (werden ignoriert).\n"
+
+#: src/applications/dht/tools/dht-join.c:131
 #, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Warte auf den Start von gnunetd (%u Iterationen verbleiben)...\n"
+msgid "Call to `%s' returns %d.\n"
+msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/gap/gaptest.c:330
-#: src/applications/session/sessiontest.c:133
-#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/dht/tools/dht-join.c:132
 #, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgid "Call to `%s' with key `%s'.\n"
+msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
+
+#: src/applications/dht/tools/dht-join.c:133
+#, c-format
+msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+msgstr "Aufruf von `%s' mit Wert '%.*s' (%d Bytes).\n"
+
+#: src/applications/dht/tools/dht-join.c:236
+msgid "Error joining DHT.\n"
+msgstr "Fehler beim Beitreten zu der DHT.\n"
+
+#: src/applications/dht/tools/dht-join.c:243
+#, c-format
+msgid "Joined DHT.  Press CTRL-C to leave.\n"
+msgstr "Der DHT beigetreten. Drücken Sie STRG-C, um sie zu verlassen.\n"
+
+#: src/applications/dht/tools/dht-join.c:250
+msgid "Error leaving DHT.\n"
+msgstr "Fehler beim Verlassen der DHT.\n"
+
+#: src/applications/dht/module/dht.c:946
+#, c-format
+msgid "Malformed optional field `%s' received from peer `%s'.\n"
+msgstr "Ungültiges optionales Feld `%s' empfangen von Knoten `%s'.\n"
+
+#: src/applications/dht/module/dht.c:973
+#, c-format
+msgid "Could not find peer `%s' in routing table!\n"
+msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+
+#: src/applications/dht/module/dht.c:1120
+#: src/applications/dht/module/dht.c:1135
+#, c-format
+msgid "Received malformed response to `%s' from peer `%s'.\n"
+msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
+
+#: src/applications/dht/module/dht.c:1447
+#, c-format
+msgid "Invalid response to `%s' from peer `%s'.\n"
+msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
+
+#: src/applications/dht/module/dht.c:1603
+#: src/applications/dht/module/dht.c:2340
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "`%s' mit einem Timeout von über einer Stunde aufgerufen (Fehler?)\n"
+
+#: src/applications/dht/module/dht.c:1793
+#, c-format
+msgid "Invalid response to `%s'.\n"
+msgstr "Ungültige Antwort auf `%s'.\n"
+
+#: src/applications/dht/module/dht.c:1993
+#, c-format
+msgid "Malformed response to `%s' on master table.\n"
+msgstr "Beschädigte Antwort auf `%s' in Master Tabelle.\n"
+
+#: src/applications/dht/module/dht.c:2207
+#: src/applications/dht/module/dht.c:2507
+#, c-format
+msgid "Invalid response to `%s' from `%s'\n"
+msgstr "Ungültige Antwort auf `%s' von `%s'\n"
+
+#: src/applications/dht/module/dht.c:2881
+#: src/applications/dht/module/dht.c:3021
+#: src/applications/dht/module/dht.c:3148
+#: src/applications/dht/module/dht.c:3282
+#, c-format
+msgid "Received invalid RPC `%s'.\n"
+msgstr "Ungültiger RPC `%s' empfangen.\n"
+
+#: src/applications/dht/module/dht.c:3160
+#: src/applications/dht/module/dht.c:3296
+#, c-format
+msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr ""
-"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
-"verbleiben)...\n"
+"RPC für `%s' empfangen für eine Tabelle, an der wir nicht beteiligt sind!\n"
 
-#: src/applications/fragmentation/fragmentation.c:557
-msgid "# messages defragmented"
-msgstr "# defragmentierter Nachrichten"
+#: src/applications/dht/module/cs.c:446
+#, c-format
+msgid "`%s' failed: table not found!\n"
+msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/applications/fragmentation/fragmentation.c:558
-msgid "# messages fragmented"
-msgstr "# fragmentierter Nachrichten"
+#: src/applications/dht/module/cs.c:466
+#, c-format
+msgid "`%s' failed.  Terminating connection to client.\n"
+msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/fragmentation/fragmentation.c:559
-msgid "# fragments discarded"
-msgstr "# verworfener Nachrichten"
+#: src/applications/dht/module/cs.c:542
+msgid "sendAck failed.  Terminating connection to client.\n"
+msgstr "sendAck fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
+#: src/applications/dht/module/cs.c:688
 #, c-format
-msgid "`%s' registering handler %d\n"
-msgstr "`%s' registriert Handler %d\n"
+msgid "`%s' failed. Terminating connection to client.\n"
+msgstr "`%s' fehlgeschlagen. Beende Verbindung zu Client.\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
 #, c-format
-msgid "Could not unlink temporary file `%s': %s\n"
-msgstr "Temporäre Datei `%s' konnte nicht gelöscht werden: %s\n"
+msgid "Failed to deliver `%s' message.\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/applications/fs/ecrs/download.c:257
+#: src/applications/chat/chat.c:87
+msgid "Message received from peer is invalid.\n"
+msgstr "Empfangene Nachricht ist ungültig.\n"
+
+#: src/applications/chat/chat.c:134
+msgid "Message received from client is invalid\n"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/applications/chat/chat.c:156
+msgid "Maximum number of chat clients reached.\n"
+msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
+
+#: src/applications/chat/chat.c:160
 #, c-format
-msgid "Write(%d, %p, %d) failed: %s\n"
-msgstr "Write(%d, %p, %d) schlug fehl: %s\n"
+msgid "Now %d of %d chat clients at this node.\n"
+msgstr "Jetzt sind %d von %d auf diesem Knoten.\n"
 
-#: src/applications/fs/ecrs/download.c:927
+#: src/applications/chat/chat.c:197
+#, c-format
+msgid "`%s' registering handlers %d and %d\n"
+msgstr "`%s' registriert Handler %d und %d\n"
+
+#: src/applications/chat/chat.c:212
+msgid "enables P2P-chat (incomplete)"
+msgstr "Ermöglicht P2P-Chat"
+
+#: src/applications/chat/gnunet-chat.c:82
+msgid "specify nickname"
+msgstr "Spitznamen angeben"
+
+#: src/applications/chat/gnunet-chat.c:87
+msgid "Start GNUnet chat client."
+msgstr "GNUnet chat client starten"
+
+#: src/applications/chat/gnunet-chat.c:151
+#: src/applications/tbench/gnunet-tbench.c:213
+#: src/applications/tracekit/gnunet-tracekit.c:363
+#: src/applications/fs/tools/gnunet-delete.c:142
+msgid "Could not connect to gnunetd.\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/applications/chat/gnunet-chat.c:155
+#, c-format
+msgid "You must specify a nickname (use option `%s').\n"
+msgstr "Sie müssen einen Spitznamen angeben (verwenden Sie die Option `%s').\n"
+
+#: src/applications/chat/gnunet-chat.c:182
+msgid "Could not send join message to gnunetd\n"
+msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/applications/chat/gnunet-chat.c:191
+msgid "Could not send message to gnunetd\n"
+msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/applications/advertising/advertising.c:161
+#, c-format
+msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgstr ""
+"Hello Nachricht von `%s' ist ungültig (Signatur ist ungültig). Nachricht "
+"wurde verworfen.\n"
+
+#: src/applications/advertising/advertising.c:167
 msgid ""
-"Decrypted content does not match key. This is either a bug or a maliciously "
-"inserted file. Download aborted.\n"
+"hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
-"Entschlüsselter Inhalt entspricht nicht dem Schlüssel. Dies ist entweder ein "
-"Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
-"abgebrochen.\n"
+"Empfangene Hello Nachricht ist ungültig (Ablaufzeit über Limit). Nachricht "
+"wurde verworfen.\n"
 
-#: src/applications/fs/ecrs/download.c:1104
+#: src/applications/advertising/advertising.c:176
 #, c-format
+msgid "hello advertisement for protocol %d received.\n"
+msgstr "Hello Ankündigung für Protokoll %d empfangen.\n"
+
+#: src/applications/advertising/advertising.c:295
+msgid "Could not send hellos+PING, ping buffer full.\n"
+msgstr "Hellos+PING konnten nicht gesendet werden, Ping Puffer ist voll.\n"
+
+#: src/applications/advertising/advertising.c:308
+#, c-format
+msgid "`%s' failed (%d, %u). Will not send PING.\n"
+msgstr "`%s' fehlgeschlagen (%d, %u). PING wird nicht gesendet.\n"
+
+#: src/applications/advertising/advertising.c:463
+#, c-format
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
+
+#: src/applications/advertising/advertising.c:470
 msgid ""
-"Content `%s' seems to be not available on the network (tried %u times).\n"
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
-"Inhalt `%s' scheint im Netzwerk nicht verfügbar zu sein (%u mal versucht).\n"
+"Bekanntmachung von uns zwecklos: bis jetzt sind uns keine anderen Knoten "
+"bekannt.\n"
 
-#: src/applications/fs/ecrs/meta.c:842
+#: src/applications/advertising/advertising.c:572
 #, c-format
-msgid "Renaming of file `%s' to `%s' failed: %s\n"
-msgstr "Umbenennen der Datei `%s' zu `%s' fehlgeschlagen: %s\n"
+msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+msgstr "Hello von Knoten `%s' wird entfernt (lief vor %ds ab).\n"
 
-#: src/applications/fs/ecrs/meta.c:850
+#: src/applications/advertising/advertising.c:734
+msgid "# Peer advertisements received"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/applications/advertising/advertising.c:735
+msgid "# Self advertisments transmitted"
+msgstr "# Selbstbekanntmachungen übertragen"
+
+#: src/applications/advertising/advertising.c:736
+msgid "# Foreign advertisements forwarded"
+msgstr "# Bekanntmachungen von anderen übertragen"
+
+#: src/applications/advertising/advertising.c:738
+#: src/applications/pingpong/pingpong.c:462
+msgid "# plaintext PING messages sent"
+msgstr "# Klartext PING Nachrichten gesendet"
+
+#: src/applications/advertising/advertising.c:742
+#: src/applications/session/connect.c:752
 #, c-format
-msgid "Could not rename file `%s' to `%s': file exists\n"
+msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
+msgstr "`%s' registriert Handler %d (Plaintext und Ciphertext)\n"
+
+#: src/applications/advertising/advertising.c:761
+msgid "Network advertisements disabled by configuration!\n"
+msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
+
+#: src/applications/advertising/advertising.c:781
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
-"Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
+"Stellt sicher, dass dieser Knoten anderen Knoten bekannt ist und entdeckt "
+"andere Knoten"
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/topology_default/topology.c:398
 #, c-format
+msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
+msgstr ""
+"Versionen stimmen nicht überein (`%s' vs. '%*.s'), lassen Sie gnunet-update "
+"laufen!\n"
+
+#: src/applications/pingpong/pingpong.c:120
+#: src/applications/pingpong/pingpong.c:179
+#: src/applications/pingpong/pingpong.c:227
+#: src/applications/pingpong/pingpong.c:292
+#, c-format
+msgid "Received malformed `%s' message. Dropping.\n"
+msgstr "Beschädigte `%s' Nachricht empfangen. Nachricht wird verworfen.\n"
+
+#: src/applications/pingpong/pingpong.c:130
+msgid "Received ping for another peer. Dropping.\n"
+msgstr "Ping für einen anderen Knoten empfangen. Ping wird verworfen.\n"
+
+#: src/applications/pingpong/pingpong.c:187
+msgid "Received PING not destined for us!\n"
+msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
+
+#: src/applications/pingpong/pingpong.c:267
+#: src/applications/pingpong/pingpong.c:325
 msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
 msgstr ""
-"Die Konfigurationsdatei muss unter %s%s ein Verzeichnis für GNUnet angeben, "
-"in dem Knotenbezogene Daten gespeichert werden.\n"
+"PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante "
+"MAX_PING_PONG hochzusetzen.\n"
 
-#: src/applications/fs/ecrs/namespace.c:133
+#: src/applications/pingpong/pingpong.c:366
+msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+msgstr ""
+"PING konnte nicht erstellt werden, da die Tabelle voll ist. Versuchen Sie, "
+"die Konstante MAX_PING_PONG hochzusetzen.\n"
+
+#: src/applications/pingpong/pingpong.c:452
+msgid "# encrypted PONG messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/applications/pingpong/pingpong.c:454
+msgid "# plaintext PONG messages received"
+msgstr "# Klartext PONG Nachrichten empfangen"
+
+#: src/applications/pingpong/pingpong.c:456
+msgid "# encrypted PING messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/applications/pingpong/pingpong.c:458
+msgid "# PING messages created"
+msgstr "# PING Nachrichten erstellt"
+
+#: src/applications/pingpong/pingpong.c:460
+msgid "# encrypted PONG messages sent"
+msgstr "# verschlüsselter PONG Nachrichten gesendet"
+
+#: src/applications/pingpong/pingpong.c:464
+msgid "# encrypted PING messages sent"
+msgstr "# verschlüsselter PING Nachrichten gesendet"
+
+#: src/applications/pingpong/pingpong.c:473
 #, c-format
-msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+msgstr "`%s' registriert Handler %d %d (Plaintext und Ciphertext)\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:44
+#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_mysql/mysql.c:137
+#: src/applications/sqstore_mysql/mysql.c:144
+#: src/applications/sqstore_mysql/mysql.c:386
+#: src/applications/sqstore_mysql/mysql.c:725
+#: src/applications/sqstore_mysql/mysql.c:740
+#: src/applications/sqstore_mysql/mysql.c:749
+#: src/applications/sqstore_mysql/mysql.c:773
+#: src/applications/sqstore_mysql/mysql.c:783
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:922
+#: src/applications/sqstore_mysql/mysql.c:932
+#: src/applications/sqstore_mysql/mysql.c:1004
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1053
+#: src/applications/sqstore_mysql/mysql.c:1067
+#: src/applications/kvstore_sqlite/kv_sqlite.c:43
+#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:139
+msgid "Unable to initialize SQLite.\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:271
+#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_mysql/mysql.c:223
+#: src/applications/sqstore_mysql/mysql.c:800
+#, c-format
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:272
+#: src/applications/sqstore_sqlite/sqlite.c:290
+msgid "sqlite datastore"
+msgstr "sqlite Datenspeicher"
+
+#: src/applications/sqstore_sqlite/sqlite.c:1035
+#, c-format
+msgid ""
+"Configuration file must specify directory for storing FS data in section `%"
+"s' under `%s'.\n"
 msgstr ""
-"Pseudonym `%s' kann nicht erstellt werden, da die Datei `%s' bereits "
-"existiert.\n"
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1178
+msgid "# bytes in datastore"
+msgstr "# bytes in der Datenbank"
+
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
+msgid "Could not initialize libgnunetutil!\n"
+msgstr "Konnte libgnunetutil nicht initialisieren!\n"
+
+#: src/applications/session/connect.c:209
 #, c-format
-msgid "File `%s' does not contain a pseudonym.\n"
-msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
+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/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/session/connect.c:246
+msgid "Cannot encrypt sessionkey, other peer not known!\n"
+msgstr ""
+"Sitzungsschlüssel kann nicht verschlüsselt werden, der andere Knoten ist uns "
+"nicht bekannt!\n"
+
+#: src/applications/session/connect.c:523
 #, c-format
-msgid "Format of pseudonym `%s' is invalid.\n"
-msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
+msgid "Invalid `%s' message received from peer `%s'.\n"
+msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/session/connect.c:532
 #, c-format
-msgid "Format of file `%s' is invalid.\n"
-msgstr "Format der Datei `%s' ist ungültig.\n"
+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/fs/ecrs/search.c:160
-msgid "CHK URI not allowed for search.\n"
-msgstr "CHK URI ist nicht erlaubt für Suchen.\n"
+#: src/applications/session/connect.c:587
+msgid ""
+"Error parsing encrypted session key, given message part size is invalid.\n"
+msgstr ""
+"Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
+"Nachrichtenteilgröße ist ungültig.\n"
 
-#: src/applications/fs/ecrs/search.c:216
-msgid "LOC URI not allowed for search.\n"
-msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
+#: src/applications/session/connect.c:597
+#, c-format
+msgid "Unknown type in embedded message: %u (size: %u)\n"
+msgstr "Unbekannter Typ in engebetteter Nachricht: %u (%u bytes)\n"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/session/connect.c:742
+msgid "# session keys sent"
+msgstr "# Sitzungsschlüssel gesendet"
+
+#: src/applications/session/connect.c:744
+msgid "# session keys rejected"
+msgstr "# Sitzungsschlüssel abgelehnt"
+
+#: src/applications/session/connect.c:746
+msgid "# session keys accepted"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/applications/session/connect.c:748
+msgid "# sessions established"
+msgstr "# Sitzungen aufgebaut"
+
+#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
 #, c-format
-msgid "`%s' is not a file.\n"
-msgstr "`%s' ist keine Datei.\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
+msgstr ""
+"%s::%s - RPC %s:%p konnte nicht registriert werden: ein anderer Callback "
+"verwendet bereits diesen Namen (%p)\n"
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
 #, c-format
-msgid "Cannot get size of file `%s'"
-msgstr "Die Größe der Datei `%s' konnte nicht ermittelt werden"
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
+msgstr ""
+"%s::%s - RPC %s:%p konnte nicht unregistriert werden: ein anderer Callback "
+"ist unter diesem Namen registiert: %p\n"
 
-#: src/applications/fs/ecrs/upload.c:193
-#, fuzzy
-msgid "Failed to connect to gnunetd."
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/applications/rpc/rpc.c:232
+#, c-format
+msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
+msgstr "%s::%s - RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/rpc/rpc.c:279
 #, c-format
-msgid "Cannot hash `%s'.\n"
-msgstr "`%s' konnte nicht gehashed werden.\n"
+msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
+msgstr ""
+"%s::%s - async RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
+#: src/applications/rpc/rpc.c:1084
 #, c-format
-msgid "Initialization for indexing file `%s' failed.\n"
-msgstr "Initialisierung der Indizierung der Datei `%s' fehlgeschlagen.\n"
+msgid "Invalid message of type %u received.  Dropping.\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/applications/fs/ecrs/upload.c:227
+#: src/applications/rpc/rpc.c:936
 #, c-format
-msgid "Indexing file `%s' failed. Trying to insert file...\n"
-msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
+msgid "Dropping RPC request %u: message malformed.\n"
+msgstr "RPC Anfrage %u wird verworfen: Nachricht ist beschädigt.\n"
 
-#: src/applications/fs/ecrs/upload.c:306
+#: src/applications/rpc/rpc.c:1388
 #, c-format
-msgid "Indexing data failed at position %i.\n"
-msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
+msgid "RPC not unregistered: %s:%p\n"
+msgstr "RPC nicht unregistriert: %s:%p\n"
 
-#: src/applications/fs/fsui/download.c:290
-msgid "Download aborted."
-msgstr "Download abgebrochen."
+#: src/applications/rpc/rpc.c:1414
+#, c-format
+msgid "`%s' registering handlers %d %d %d\n"
+msgstr "`%s' registriert Handler %d %d %d\n"
 
-#: src/applications/fs/fsui/download.c:294
-msgid "ECRS download failed (see logs)."
-msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
+#: src/applications/rpc/rpc.c:1435
+#, c-format
+msgid "Failed to initialize `%s' service.\n"
+msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/applications/fs/fsui/download.c:298
-msgid "ECRS download suspending."
-msgstr "ECRS download wird eingefroren."
+#: src/applications/rpc/rpc.c:1491
+msgid "RPC async reply invalid.\n"
+msgstr "RPC async Antwort ungültig.\n"
 
-#: src/applications/fs/fsui/download.c:302
-msgid "Unexpected download state."
+#: src/applications/rpc/rpc.c:1562
+msgid "async RPC reply not received.\n"
+msgstr "async RPC Antwort nicht empfangen.\n"
+
+#: src/applications/sqstore_mysql/mysql.c:224
+#: src/applications/sqstore_mysql/mysql.c:801
+msgid "mysql datastore"
+msgstr "mysql Datenspeicher"
+
+#: src/applications/sqstore_mysql/mysql.c:1107
+#, c-format
+msgid "Query `%s' had no results.\n"
+msgstr "Abfrage `%s' hatte keine Ergebnisse.\n"
+
+#: src/applications/sqstore_mysql/mysql.c:1205
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
+
+#: src/applications/sqstore_mysql/mysql.c:1223
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
+"Fehler beim Laden des MySQL Datenbankmoduls. Prüfen Sie, ob MySQL läuft und "
+"richtig eingerichtet ist!\n"
 
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-msgid "AND"
-msgstr "UND"
+#: src/applications/datastore/filter.c:42
+#, c-format
+msgid ""
+"Configuration must specify directory for FS data in section `%s' under `%"
+"s'.\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"für FS Daten angeben.\n"
 
-#: src/applications/fs/fsui/file_info.c:66
+#: src/applications/datastore/datastore.c:118
+#, c-format
+msgid "Availability test failed for `%s' at %s:%d.\n"
+msgstr "Verfügbarkeitstest für `%s' fehlgeschlagen bei %s:%d.\n"
+
+#: src/applications/datastore/datastore.c:142
+#, c-format
+msgid "Database failed to delete `%s'.\n"
+msgstr "Die Datenbank konnte `%s' nicht löschen.\n"
+
 #: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1044
+#: src/applications/identity/identity.c:1086
+#: src/applications/fs/fsui/file_info.c:66
 #, c-format
 msgid ""
 "Configuration file must specify a directory for GNUnet to store per-peer "
@@ -702,123 +1084,888 @@
 "Die Konfigurationsdatei muss unter %s%s ein Verzeichnis angeben, in dem "
 "GNUnet knotenspezifische Daten speichern kann.\n"
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
+#: src/applications/identity/hostkey.c:119
+#, c-format
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+msgstr ""
+"Formatüberprüfung schlug für die existierende Hostkeydatei `%s' fehl, es "
+"wird ein neuer Hostkey erzeugt.\n"
 
-#: src/applications/fs/fsui/file_info.c:292
+#: src/applications/identity/hostkey.c:127
+msgid "Creating new hostkey (this may take a while).\n"
+msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
+
+#: src/applications/identity/hostkey.c:130
+msgid "Could not create hostkey!\n"
+msgstr "Hostkey konnte nicht erzeugt werden!\n"
+
+#: src/applications/identity/hostkey.c:139
+msgid "Done creating hostkey.\n"
+msgstr "Hostkey wurde erfolgreich erzeugt.\n"
+
+#: src/applications/identity/identity.c:333
 #, c-format
-msgid "Deleted corrupt URI database in `%s'."
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
+"Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
+"Datei wurde entfernt.\n"
 
-#: src/applications/fs/fsui/fsui.c:189
-msgid "FSUI persistence: error restoring download\n"
-msgstr "FSUI Beständigkeit: Fehler beim Wiederherstellen des Downloads\n"
+#: src/applications/identity/identity.c:366
+#, c-format
+msgid "%s `%s' returned no known hosts!\n"
+msgstr "%s `%s' ergab keine bekannten Knoten!\n"
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/identity/identity.c:648
+#: src/applications/identity/identity.c:666
 #, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
-msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
+msgid "Removed file `%s' containing invalid hello data.\n"
+msgstr "Datei `%s' enthielt ungültige Hello Daten und wurde entfernt.\n"
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
-msgstr "Keine Schlüsselwörter angegeben!\n"
+#: src/applications/identity/identity.c:716
+#, fuzzy, c-format
+msgid "Signature failed verification: peer `%s' not known.\n"
+msgstr ""
+"Signatur kann nicht verifiziert werden, der andere Knoten ist uns nicht "
+"bekannt!\n"
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
+#: src/applications/identity/identity.c:724
+msgid "Signature failed verification: signature invalid.\n"
+msgstr "Verifikation einer Signatur fehlgeschlagen: Signatur ist ungültig.\n"
+
+#: src/applications/testbed/commands.c:1130
+#: src/applications/stats/gnunet-stats.c:61
+#, c-format
+msgid "Supported peer-to-peer messages:\n"
+msgstr "unterstützte Peer-to-Peer Nachrichten:\n"
+
+#: src/applications/testbed/commands.c:1132
+#: src/applications/stats/gnunet-stats.c:64
+#, c-format
+msgid "Supported client-server messages:\n"
+msgstr "unterstützte Client-Server Nachrichten:\n"
+
+#: src/applications/testbed/gnunet-testbed.c:119
+msgid "Start GNUnet-testbed helper."
+msgstr "GNUnet-testbed Helfer starten."
+
+#: src/applications/testbed/gnunet-testbed.c:183
+#, c-format
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgstr "Verbindung zum LOOPBACK port %d schlug fehl: %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:282
+#, c-format
+msgid "Could not execute `%s': %s\n"
+msgstr "`%s' konnte nicht ausgeführt werden: %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:325
+msgid "No client service started. Trying again in 30 seconds.\n"
+msgstr "Kein Client Dienst gestartet. Erneuter Versuch in 30 Sekunden.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:348
+#, c-format
+msgid ""
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
 msgstr ""
-"Veröffentlichungsintervall für periodische Veröffentlichung wurde geändert."
+"Fehler (%s) beim Binden des TCP Listeners an den Port %d. Der Proxy Dienst "
+"wurde nicht gestartet.\n"
+"Erneuter Versuch in %d Sekunden...\n"
 
-#: src/applications/fs/fsui/namespace_info.c:604
+#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#, c-format
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
+msgstr "Unauthorisierte Verbindung von %u.%u.%u.%u. wurde abgewiesen.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:428
+#, c-format
+msgid "Protocol violation on socket. Expected command.\n"
+msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:467
+#, c-format
+msgid "Command `%s' not found!\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/applications/testbed/gnunet-testbed.c:540
+msgid "Start GNUnet testbed controller."
+msgstr "GNUnet testbed Controller starten."
+
+#: src/applications/testbed/gnunet-testbed.c:594
+#, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+msgstr ""
+"Beschädigter Eintrag in der Konfigurationsdatei in Sektion %s unter %s: %s\n"
+
+#: src/applications/testbed/testbed.c:50
+msgid "Could not send acknowledgement back to client.\n"
+msgstr "Bestätigung konnte nicht an Client zurück gesendet werden.\n"
+
+#: src/applications/testbed/testbed.c:60
+#, c-format
+msgid "Received unknown testbed message of type %u.\n"
+msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
+
+#: src/applications/testbed/testbed.c:78
+#: src/applications/testbed/testbed.c:807
+#, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
+msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
+
+#: src/applications/testbed/testbed.c:85
+#, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
+msgstr "Größe der `%s' Nachricht ist falsch. Nachricht wird ignoriert.\n"
+
+#: src/applications/testbed/testbed.c:137
+#, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
+msgstr ""
+"Das TESTBED konnte keine Hello Nachricht für das Protokoll %u erzeugen\n"
+
+#: src/applications/testbed/testbed.c:215
+#: src/applications/testbed/testbed.c:256
+#: src/applications/testbed/testbed.c:359
+#: src/applications/testbed/testbed.c:366
+#: src/applications/testbed/testbed.c:403
+#: src/applications/testbed/testbed.c:410
+#, c-format
+msgid "received invalid `%s' message\n"
+msgstr "ungültige `%s' Nachricht empfangen\n"
+
+#: src/applications/testbed/testbed.c:231
+#: src/applications/testbed/testbed.c:271
+#, c-format
+msgid "received invalid `%s' message (empty module name)\n"
+msgstr "ungültige `%s' Nachricht empfangen (leerer Modulname)\n"
+
+#: src/applications/testbed/testbed.c:238
+#, c-format
+msgid "loading module `%s' failed.  Notifying client.\n"
+msgstr "das Laden von Modul `%s' schlug fehl. Client wird benachrichtigt.\n"
+
+#: src/applications/testbed/testbed.c:278
+msgid "unloading module failed.  Notifying client.\n"
+msgstr "das Entladen des Moduls schlug fehl. Client wird benachrichtigt.\n"
+
+#: src/applications/testbed/testbed.c:539
+#, c-format
+msgid "`%s' %s failed: %s\n"
+msgstr "`%s' %s schlug fehl: %s\n"
+
+#: src/applications/testbed/testbed.c:625
+#, c-format
+msgid "received invalid `%s' message: %s.\n"
+msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
+
+#: src/applications/testbed/testbed.c:817
+#, c-format
+msgid "'..' is not allowed in file name (%s).\n"
+msgstr "'..' ist nicht erlaubt in einem Dateinamen (%s).\n"
+
+#: src/applications/testbed/testbed.c:826
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+msgstr "Leerer Dateiname für UPLOAD_FILE Nachricht ist ungültig!\n"
+
+#: src/applications/testbed/testbed.c:833
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+msgstr ""
+"Dateiname für UPLOAD_FILE Nachricht ist nicht Null-terminiert (ungültig!)\n"
+
+#: src/applications/testbed/testbed.c:841
+msgid "Upload refused!"
+msgstr "Upload abgewiesen!"
+
+#: src/applications/testbed/testbed.c:867
+#, c-format
+msgid "Invalid message received at %s:%d."
+msgstr "Ungültige Nachricht empfangen bei %s:%d."
+
+#: src/applications/testbed/testbed.c:985
+#, c-format
+msgid "received invalid testbed message of size %u\n"
+msgstr "ungültige Testbed Nachricht der Größe %u empfangen\n"
+
+#: src/applications/testbed/testbed.c:1002
+#, c-format
 msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
-"Veröffentlichungsdatum für periodisch aktualisierten Inhalt ist mehr als "
-"eine Woche früher als geplant.\n"
+"Empfangene Testbed Nachricht des Typs %u hat die unerwartete Größe %u, es "
+"wurde %u erwartet\n"
 
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr "Diese Suche läuft bereits!\n"
+#: src/applications/testbed/testbed.c:1045
+msgid "No testbed URL given, not registered.\n"
+msgstr ""
+"Keine Testbed URL angegeben, es wurde keine Registrierung vorgenommen.\n"
 
-#: src/applications/fs/fsui/unindex.c:85
-msgid "Unindex failed."
-msgstr "Deindizierung schlug fehl."
+#: src/applications/testbed/testbed.c:1079
+#: src/applications/bootstrap_http/http.c:81
+#, c-format
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
-msgid "Upload failed."
-msgstr "Upload fehlgeschlagen."
+#: src/applications/testbed/testbed.c:1118
+#, c-format
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
+msgstr ""
+"Beschädigte HTTP URL: `%s' bei `%s'. Testbed-Client wurde nicht "
+"registriert.\n"
 
-#: src/applications/fs/fsui/upload.c:455
-msgid "Cannot upload directory without using recursion."
+#: src/applications/testbed/testbed.c:1154
+#, c-format
+msgid "Could not register testbed, host `%s' unknown\n"
 msgstr ""
-"Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen werden."
+"Testbed konnte nicht registriert werden, Host `%s' ist nicht bekannt.\n"
 
-#: src/applications/fs/module/fs.c:1184
+#: src/applications/testbed/testbed.c:1177
 #, c-format
+msgid "Failed to send HTTP request to host `%s': %s\n"
+msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
+
+#: src/applications/testbed/testbed.c:1230
+#, c-format
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgstr "Fehler beim Senden der HTTP Anfrage `%s' an Host `%s': %s\n"
+
+#: src/applications/testbed/testbed.c:1269
+msgid "Exit register (error: no http response read).\n"
+msgstr "Abbruch der Registrierung (Fehler: keine HTTP Antwort gelesen).\n"
+
+#: src/applications/testbed/testbed.c:1357
+msgid "allows construction of a P2P-testbed (incomplete)"
+msgstr "Ermöglicht die Konstruktion einer P2P-Testumgebung (inkomplett)"
+
+#: src/applications/transport/transport.c:483
+#: src/applications/transport/transport.c:491
+#, c-format
+msgid "No transport of type %d known.\n"
+msgstr "Kein Transport des Typs %d bekannt.\n"
+
+#: src/applications/transport/transport.c:676
+#, c-format
+msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgstr ""
+"Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
+"gesetzt, sie wird auf %dm gesetzt.\n"
+
+#: src/applications/transport/transport.c:691
+#, c-format
 msgid ""
-"You must specify a postive number for `%s' in the configuration in section `%"
-"s'.\n"
+"You should specify at least one transport service under option `%s' in "
+"section `%s'.\n"
 msgstr ""
-"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
-"positive Zahl angeben.\n"
+"Sie sollten mindestens einen Transport Dienst unter der Option `%s' in der "
+"Sektion `%s' angegeben.\n"
 
-#: src/applications/fs/module/fs.c:1233
+#: src/applications/transport/transport.c:717
 #, c-format
-msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
-msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
+msgid "Transport library `%s' did not provide required function '%s%s'.\n"
+msgstr ""
+"Transport Bibliothek `%s' stellt nicht die benötigte Funktion '%s%s' zur "
+"Verfügung.\n"
 
-#: src/applications/fs/module/fs.c:1270
-msgid "enables (anonymous) file-sharing"
-msgstr "Ermöglicht (anonymes) Filesharing"
+#: src/applications/transport/transport.c:738
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Ich bin Peer `%s'.\n"
 
-#: src/applications/fs/module/migration.c:224
-msgid "# blocks migrated"
-msgstr "# Blöcke migriert"
+#: src/applications/fragmentation/fragmentation.c:557
+msgid "# messages defragmented"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/applications/fs/module/migration.c:225
-msgid "# on-demand block migration attempts"
+#: src/applications/fragmentation/fragmentation.c:558
+msgid "# messages fragmented"
+msgstr "# fragmentierter Nachrichten"
+
+#: src/applications/fragmentation/fragmentation.c:559
+msgid "# fragments discarded"
+msgstr "# verworfener Nachrichten"
+
+#: src/applications/fragmentation/fragmentation.c:569
+#, c-format
+msgid "`%s' registering handler %d\n"
+msgstr "`%s' registriert Handler %d\n"
+
+#: src/applications/stats/gnunet-stats.c:94
+msgid "prints supported protocol messages"
+msgstr "gibt unterstützte Protokollnachrichten aus"
+
+#: src/applications/stats/gnunet-stats.c:99
+msgid "Print statistics about GNUnet operations."
+msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
+
+#: src/applications/stats/gnunet-stats.c:167
+#, c-format
+msgid "Error establishing connection with gnunetd.\n"
+msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
+
+#: src/applications/stats/gnunet-stats.c:181
+#, c-format
+msgid "Error reading information from gnunetd.\n"
+msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
+
+#: src/applications/stats/clientapi.c:179
+msgid "Uptime (seconds)"
+msgstr "Laufzeit (Sekunden)"
+
+#: src/applications/stats/statistics.c:206
+#, c-format
+msgid "% of allowed network load (up)"
+msgstr "% of allowed network load (up)"
+
+#: src/applications/stats/statistics.c:208
+#, c-format
+msgid "% of allowed network load (down)"
+msgstr "% of allowed network load (down)"
+
+#: src/applications/stats/statistics.c:210
+#, c-format
+msgid "% of allowed cpu load"
+msgstr "% of allowed cpu load"
+
+#: src/applications/stats/statistics.c:214
+msgid "# bytes of noise received"
+msgstr "# Bytes Rauschen empfangen"
+
+#: src/applications/stats/statistics.c:374
+msgid "keeps statistics about gnunetd's operation"
+msgstr "Hält Statistiken über Betrieb von gnunetd"
+
+#: src/applications/tbench/gnunet-tbench.c:95
+msgid "output in gnuplot format"
+msgstr "Ausgabe im gnuplot Format"
+
+#: src/applications/tbench/gnunet-tbench.c:98
+msgid "number of iterations"
+msgstr "Anzahl an Durchläufen"
+
+#: src/applications/tbench/gnunet-tbench.c:100
+msgid "number of messages to use per iteration"
+msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
+
+#: src/applications/tbench/gnunet-tbench.c:102
+msgid "receiver host identifier (ENC file name)"
+msgstr "Bezeichner des Empfängerhosts (ENC Dateiname)"
+
+#: src/applications/tbench/gnunet-tbench.c:104
+msgid "message size"
+msgstr "Nachrichtengröße"
+
+#: src/applications/tbench/gnunet-tbench.c:106
+msgid "sleep for SPACE ms after each a message block"
+msgstr "Für SPACE ms nach jedem Nachrichtenblock pausieren"
+
+#: src/applications/tbench/gnunet-tbench.c:108
+msgid "time to wait for the completion of an iteration (in ms)"
+msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
+
+#: src/applications/tbench/gnunet-tbench.c:111
+msgid "number of messages in a message block"
+msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
+
+#: src/applications/tbench/gnunet-tbench.c:115
+msgid "Start GNUnet transport benchmarking tool."
+msgstr "GNUnet Transport Benchmarking Werkzeug starten."
+
+#: src/applications/tbench/gnunet-tbench.c:225
+msgid "You must specify a receiver!\n"
+msgstr "Sie müssen einen Empfänger angeben!\n"
+
+#: src/applications/tbench/gnunet-tbench.c:228
+#, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
 msgstr ""
+"Ungültige Empfängerknoten ID angegeben (`%s' ist kein gültiger Name).\n"
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/tbench/gnunet-tbench.c:249
 #, c-format
-msgid "Indexed file disappeared, deleting block for query `%s'\n"
+msgid "Time:\n"
+msgstr "Zeit:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:250
+#, c-format
+msgid "\tmax      %llums\n"
+msgstr "\tMax      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:252
+#, c-format
+msgid "\tmin      %llums\n"
+msgstr "\tMin      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:254
+#, c-format
+msgid "\tmean     %8.4fms\n"
+msgstr "\tMittel   %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:256
+#, c-format
+msgid "\tvariance %8.4fms\n"
+msgstr "\tVarianz  %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:259
+#, c-format
+msgid "Loss:\n"
+msgstr "Verlust:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:260
+#, c-format
+msgid "\tmax      %u\n"
+msgstr "\tMax      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:262
+#, c-format
+msgid "\tmin      %u\n"
+msgstr "\tMin      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:264
+#, c-format
+msgid "\tmean     %8.4f\n"
+msgstr "\tMittel   %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:266
+#, c-format
+msgid "\tvariance %8.4f\n"
+msgstr "\tVarianz %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:275
+#, c-format
+msgid "Output format not known, this should not happen.\n"
+msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
+
+#: src/applications/tbench/gnunet-tbench.c:279
+#, c-format
+msgid ""
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
-"Indizierte Datei ist verschwunden, Block für Anfrage `%s' wird gelöscht\n"
+"\n"
+"Es wurde keine Nachricht von gnunetd empfangen. Läuft gnunetd?\n"
 
-#: src/applications/fs/module/ondemand.c:393
+#: src/applications/tbench/tbenchtest.c:57
+#: src/applications/tbench/tbenchtest_udp.c:57
 #, 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:84
+#: src/applications/tbench/tbenchtest_udp.c:84
+#, 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
+#: src/applications/tbench/tbenchtest_udp.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
+#: src/applications/tbench/tbenchtest_udp.c:95
+#, c-format
 msgid ""
-"Because the file `%s' has been unavailable for 3 days it got removed from "
-"your share.  Please unindex files before deleting them as the index now "
-"contains invalid references!\n"
+"\n"
+"Failed to receive reply from gnunetd.\n"
 msgstr ""
-"Weil die Datei `%s' nun seit 3 Tagen nicht zur Verfügung steht, wurde Sie "
-"aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
-"löschen, da Ihr Index nun ungültige Referenzen enthält!\n"
+"\n"
+"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/tbench/tbenchtest.c:211
+#: src/applications/tbench/tbenchtest_udp.c:213
 #, c-format
+msgid "Running benchmark...\n"
+msgstr "Benchmark läuft...\n"
+
+#: src/applications/tbench/tbench.c:448
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr "Ermöglicht das Untersuchen direkter Peer-to-Peer Verbindungen"
+
+#: src/applications/tracekit/gnunet-tracekit.c:101
+msgid "probe network to the given DEPTH"
+msgstr "Netzwerk bis zur angegebenen Tiefe DEPTH sondieren"
+
+#: src/applications/tracekit/gnunet-tracekit.c:103
 msgid ""
-"Configuration file must specify directory for storage of FS data in section `"
-"%s' under `%s'.\n"
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+msgstr "Gibt das Ausgabeformat an: 0 für menschen-lesbar, 1 für dot, 2 für vcg"
+
+#: src/applications/tracekit/gnunet-tracekit.c:107
+msgid "use PRIO for the priority of the trace request"
+msgstr "PRIO als Priorität für die Trace Anfragen verwenden"
+
+#: src/applications/tracekit/gnunet-tracekit.c:110
+msgid "wait DELAY seconds for replies"
+msgstr "DELAY Sekunden auf Antworten warten"
+
+#: src/applications/tracekit/gnunet-tracekit.c:114
+msgid "Trace GNUnet network topology."
+msgstr "GNUnet Netzwerk Topologie tracen."
+
+#: src/applications/tracekit/gnunet-tracekit.c:222
+#, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "`%s' ist zu keinem Knoten verbunden.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:233
+#, c-format
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
-"Die Konfigurationsdatei muss ein Verzeichnis für die Speicherung von FS "
-"Daten in der Sektion `%s' unter `%s' angeben.\n"
+"Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar, 1 für dot und 2 "
+"für vcg.\n"
 
-#: src/applications/fs/module/ondemand.c:617
+#: src/applications/tracekit/gnunet-tracekit.c:260
 #, c-format
+msgid "`%s' connected to `%s'.\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:275
+#, c-format
+msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+msgstr ""
+"Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar und 1 für dot\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:298
+#, c-format
+msgid "Peer `%s' did not report back.\n"
+msgstr "Knoten `%s' hat sich nicht zurückgemeldet.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:387
+msgid "Could not send request to gnunetd.\n"
+msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/applications/tracekit/tracekit.c:62
+#: src/applications/tracekit/tracekit.c:186
+#, c-format
+msgid "Received invalid `%s' message from `%s'.\n"
+msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+
+#: src/applications/tracekit/tracekit.c:243
+msgid "TRACEKIT: routing table full, trace request dropped\n"
+msgstr "TRACEKIT: Routing-Tabelle ist voll, Trace-Anfrage wird verworfen\n"
+
+#: src/applications/tracekit/tracekit.c:331
+#, c-format
+msgid "TRACEKIT: received invalid `%s' message\n"
+msgstr "TRACEKIT: ungültige `%s' Nachricht empfangen\n"
+
+#: src/applications/tracekit/tracekit.c:431
+msgid "allows mapping of the network topology"
+msgstr "Erlaubt die Kartographierung der Netzwerktopologie"
+
+#: src/applications/gap/gap.c:1617
+#, c-format
+msgid "GAP received invalid content from `%s'\n"
+msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
+#: src/applications/gap/gap.c:1618
+msgid "myself"
+msgstr ""
+
+#: src/applications/gap/gap.c:1791
 msgid ""
-"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
+"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
 msgstr ""
-"Deindizierter ODB Block `%s' vom Offset %llu fehlt bereits im "
-"Datenspeicher.\n"
+"Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
+"nicht geladen. Anfrage wird abgelehnt.\n"
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1802
+#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
 msgid "Failed to get traffic stats.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
+#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
+#: src/applications/gap/gap.c:1819
+msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
+msgstr ""
+"Gewünschter Grad an Anonymität kann nicht erreicht werden, Anfrage wird "
+"ignoriert.\n"
+
+#: src/applications/gap/gap.c:2077
+msgid "# gap requests total received"
+msgstr "# gap Anfragen insgesamt empfangen"
+
+#: src/applications/gap/gap.c:2078
+msgid "# gap requests policy: immediate drop"
+msgstr "# gap Anfragen mit taktischer Entscheidung: sofortiges Verwerfen"
+
+#: src/applications/gap/gap.c:2079
+msgid "# gap requests policy: not routed"
+msgstr "# gap Anfragen mit taktischer Entscheidung: kein Routing"
+
+#: src/applications/gap/gap.c:2080
+msgid "# gap requests policy: not answered"
+msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
+
+#: src/applications/gap/gap.c:2081
+msgid "# gap requests processed: attempted add to RT"
+msgstr "# gap Anfragen verarbeitet: versucht, der RT hinzuzufügen"
+
+#: src/applications/gap/gap.c:2082
+msgid "# gap requests processed: local result"
+msgstr "# gap Anfragen verarbeitet: lokales Ergebnis"
+
+#: src/applications/gap/gap.c:2083
+msgid "# gap routing successes (total)"
+msgstr "# gap Routing erfolgreich (insgesamt)"
+
+#: src/applications/gap/gap.c:2084
+msgid "# gap requests dropped: collision in RT"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/applications/gap/gap.c:2085
+msgid "# gap requests forwarded (counting each peer)"
+msgstr "#gap Anfragen weitergeleitet (jeder Knoten gezählt)"
+
+#: src/applications/gap/gap.c:2086
+msgid "# gap duplicate requests (pending)"
+msgstr "# gap doppelte Anfragen (unfertig)"
+
+#: src/applications/gap/gap.c:2087
+msgid "# gap duplicate requests that were re-tried"
+msgstr "# gap doppelte Anfragen, die wiederholt wurden"
+
+#: src/applications/gap/gap.c:2088
+msgid "# gap re-try ttl difference (cummulative)"
+msgstr "# gap Wiederholungs-TTL-Differenz (kummulativ)"
+
+#: src/applications/gap/gap.c:2089
+msgid "# gap reply duplicates"
+msgstr "#gap doppelte Antworten"
+
+#: src/applications/gap/gap.c:2090
+msgid "# gap spurious replies"
+msgstr "# gap falsche Antworten"
+
+#: src/applications/gap/gap.c:2091
+msgid "# gap routing slots currently in use"
+msgstr "# gap Routingschächte im Moment in Verwendung"
+
+#: src/applications/gap/gap.c:2092
+msgid "# gap memory used for tracking seen content"
+msgstr ""
+
+#: src/applications/gap/gap.c:2093
+msgid "# gap memory used for tracking routing destinations"
+msgstr ""
+
+#: src/applications/gap/gap.c:2094
+#, fuzzy
+msgid "# gap rewards pending"
+msgstr "# gap doppelte Anfragen (unfertig)"
+
+#: src/applications/gap/gap.c:2095
+#, fuzzy
+msgid "# gap response weights"
+msgstr "# gap falsche Antworten"
+
+#: src/applications/gap/gap.c:2112
+msgid ""
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
+msgstr ""
+"Verkehrsdienst konnte nicht geladen werden, GAP kann keinen verdeckenden "
+"Netzwerkverkehr sicherstellen.\n"
+
+#: src/applications/gap/gap.c:2143
+#, c-format
+msgid "`%s' registering handlers %d %d\n"
+msgstr "`%s' registriert Handler %d %d\n"
+
+#: src/applications/gap/pid_table.c:151
+msgid "# distinct interned peer IDs in pid table"
+msgstr ""
+
+#: src/applications/gap/pid_table.c:153
+msgid "# total RC of interned peer IDs in pid table"
+msgstr ""
+
+#: src/applications/getoption/getoption.c:75
+#, c-format
+msgid "`%s' registering client handler %d\n"
+msgstr "`%s' registriert Client-Handler %d\n"
+
+#: src/applications/getoption/getoption.c:82
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:33
+#: src/applications/fs/tools/gnunet-insert.c:206
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:35
+msgid "automate creation of a namespace by starting a collection"
+msgstr ""
+"Erstellung eines Namespaces durch das Anfangen einer Collection "
+"automatisieren"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:38
+msgid "create a new pseudonym under the given NICKNAME"
+msgstr "Neues Pseudonym unter dem angegebenen NICKNAME erstellen"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:40
+msgid "delete the pseudonym with the given NICKNAME"
+msgstr "Pseudonym mit dem angegeben NICKNAME löschen"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:42
+msgid "end automated building of a namespace (ends collection)"
+msgstr ""
+"Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:46
+msgid ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"Das angegebene schlüsselwort verwenden, um den Namespace bekanntzumachen (zu "
+"verwenden, wenn ein neues Pseudonym erstellt wird)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:48
+msgid ""
+"specify that the contents of the namespace are of the given MIMETYPE (use "
+"when creating a new pseudonym)"
+msgstr ""
+"Angeben, dass die Inhalte des Namespaces vom angegebenen MIMETYOE sind (zu "
+"verwenden, wenn ein neues Pseudonym erstellt wird)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:50
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"Keine Bekanntmachung für diesen Namespace erstellen (zu verwenden, wenn ein "
+"neues Pseudonym erstellt wird)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:52
+msgid "do not list the pseudonyms from the pseudonym database"
+msgstr "Keine Ausgabe der Pseudonyme in der Pseudonymdatenbank"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:54
+msgid ""
+"specify NAME to be the realname of the user controlling the namespace (use "
+"when creating a new pseudonym)"
+msgstr ""
+"NAME als den Realnamen des Benutzers angeben, der den Namespace verwaltet "
+"(zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:56
+msgid ""
+"specify IDENTIFIER to be the address of the entrypoint to content in the "
+"namespace (use when creating a new pseudonym)"
+msgstr ""
+"IDENTIFIER als Adresse angeben, die der Einsprungspunkt zu den Inhalten im "
+"Namespace ist (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:58
+msgid "set the rating of a namespace"
+msgstr "das Rating eines Namespaces setzen"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:60
+msgid ""
+"use DESCRIPTION to describe the content of the namespace (use when creating "
+"a new pseudonym)"
+msgstr ""
+"DESCRIPTION als Beschreibung der Inhalte des Namespaces verwenden (zu "
+"verwenden, wenn ein neues Pseudonym erstellt wird)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:62
+msgid ""
+"specify the given URI as an address that contains more information about the "
+"namespace (use when creating a new pseudonym)"
+msgstr ""
+"die angegebene URI als die Adresse angeben, die weitere Informationen über "
+"den Namespace enthält (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:67
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr ""
+"Erstellen von neuen Pseudonymen, Löschen von Pseudonymen und Auflisten von "
+"bestehenden Pseudonymen."
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:159
+#: src/applications/fs/tools/gnunet-pseudonym.c:164
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
+#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
+msgid "AND"
+msgstr "UND"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#, c-format
+msgid "Invalid argument: `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:241
+#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
+#: src/setup/gnunet-setup.c:179
+msgid "Invalid arguments. Exiting.\n"
+msgstr "Ungültige Parameter. Abbruch.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:282
+#, c-format
+msgid "Namespace `%s' has rating %d.\n"
+msgstr "Namespace `%s' hat das Rating %d.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#, c-format
+msgid "Namespace `%s' (%s) has rating %d.\n"
+msgstr "Namespace `%s' (%s) hat das Rating %d.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#, c-format
+msgid "\tRating (after update): %d\n"
+msgstr "\tRating (nach Update): %d\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#, c-format
+msgid "Collection stopped.\n"
+msgstr "Collection beendet.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#, c-format
+msgid "Failed to stop collection (not active?).\n"
+msgstr "Fehler beim Beenden der Collection (nicht aktiv?).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#, c-format
+msgid "Pseudonym `%s' deleted.\n"
+msgstr "Pseudonym `%s' wurde gelöscht.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#, c-format
+msgid "Error deleting pseudonym `%s' (does not exist?).\n"
+msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#, c-format
+msgid "Started collection `%s'.\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#, c-format
+msgid "Failed to start collection.\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#, c-format
+msgid "Could not create namespace `%s' (exists?).\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#, c-format
+msgid "Namespace `%s' created (root: %s).\n"
+msgstr "Namespace `%s' wurde erstellt (Root: %s).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#, c-format
+msgid "Could not access namespace information.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
 #: src/applications/fs/tools/gnunet-delete.c:37
 #, c-format
 msgid "%8u of %8u bytes deleted."
@@ -897,62 +2044,6 @@
 msgid "Listed %d matching entries.\n"
 msgstr "%d übereinstimmende Einträge aufgelistet.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
-msgstr "GRAD"
-
-#: src/applications/fs/tools/gnunet-download.c:42
-#: src/applications/fs/tools/gnunet-search.c:108
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
-
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
-msgstr "DATEINAME"
-
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
-msgstr "Schreibe die Datei in DATEINAME"
-
-#: src/applications/fs/tools/gnunet-download.c:50
-msgid "download a GNUnet directory recursively"
-msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
-
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
-msgstr "Dateien aus dem GNUnet herunterladen."
-
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr "Nicht genügend Parameter. Sie müssen eine GNUnet Datei URI angeben\n"
-
-#: src/applications/fs/tools/gnunet-download.c:159
-#, c-format
-msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
-msgstr "Download der Datei `%s' bei %16llu von %16llu Bytes (%8.3f kbps)\n"
-
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
-#, c-format
-msgid "Error downloading: %s\n"
-msgstr "Fehler beim Download: %s\n"
-
-#: src/applications/fs/tools/gnunet-download.c:191
-#, c-format
-msgid "Download of file `%s' complete.  Speed was %8.3f kilobyte per second.\n"
-msgstr ""
-"Download der Datei `%s' abgeschlossen. Geschwindigkeit war %8.3f KB/s.\n"
-
-#: src/applications/fs/tools/gnunet-download.c:237
-#, c-format
-msgid "URI `%s' invalid for gnunet-download.\n"
-msgstr "URI `%s' ist ungültig für gnunet-download.\n"
-
-#: src/applications/fs/tools/gnunet-download.c:288
-#, c-format
-msgid "File stored as `%s'.\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
 #: src/applications/fs/tools/gnunet-insert.c:110
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
@@ -971,14 +2062,14 @@
 msgstr "%16llu von %16llu Bytes eingefügt (geschätzte %s bis Fertigstellung)\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:150
-#, c-format
-msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
+#, fuzzy, c-format
+msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "Upload von `%s' komplett, %llu Bytes brauchten %llu Sekunden (%8.3f KB/s).\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:164
-#, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f kbps.\n"
+#, fuzzy, c-format
+msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
@@ -997,11 +2088,6 @@
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:206
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
-
 #: src/applications/fs/tools/gnunet-insert.c:209
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
@@ -1166,166 +2252,11 @@
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:35
-msgid "automate creation of a namespace by starting a collection"
-msgstr ""
-"Erstellung eines Namespaces durch das Anfangen einer Collection "
-"automatisieren"
+#: src/applications/fs/tools/gnunet-search.c:108
+#: src/applications/fs/tools/gnunet-download.c:42
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
-msgid "create a new pseudonym under the given NICKNAME"
-msgstr "Neues Pseudonym unter dem angegebenen NICKNAME erstellen"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
-msgid "delete the pseudonym with the given NICKNAME"
-msgstr "Pseudonym mit dem angegeben NICKNAME löschen"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
-msgid "end automated building of a namespace (ends collection)"
-msgstr ""
-"Automatisierte Erstellung eines Namespaces beenden (beendet Collection)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
-msgid ""
-"use the given keyword to advertise the namespace (use when creating a new "
-"pseudonym)"
-msgstr ""
-"Das angegebene schlüsselwort verwenden, um den Namespace bekanntzumachen (zu "
-"verwenden, wenn ein neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
-msgstr ""
-"Angeben, dass die Inhalte des Namespaces vom angegebenen MIMETYOE sind (zu "
-"verwenden, wenn ein neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
-msgid ""
-"do not generate an advertisement for this namespace (use when creating a new "
-"pseudonym)"
-msgstr ""
-"Keine Bekanntmachung für diesen Namespace erstellen (zu verwenden, wenn ein "
-"neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
-msgid "do not list the pseudonyms from the pseudonym database"
-msgstr "Keine Ausgabe der Pseudonyme in der Pseudonymdatenbank"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
-msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr ""
-"NAME als den Realnamen des Benutzers angeben, der den Namespace verwaltet "
-"(zu verwenden, wenn ein neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid ""
-"specify IDENTIFIER to be the address of the entrypoint to content in the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"IDENTIFIER als Adresse angeben, die der Einsprungspunkt zu den Inhalten im "
-"Namespace ist (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
-msgid "set the rating of a namespace"
-msgstr "das Rating eines Namespaces setzen"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr ""
-"DESCRIPTION als Beschreibung der Inhalte des Namespaces verwenden (zu "
-"verwenden, wenn ein neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"die angegebene URI als die Adresse angeben, die weitere Informationen über "
-"den Namespace enthält (zu verwenden, wenn ein neues Pseudonym erstellt wird)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr ""
-"Erstellen von neuen Pseudonymen, Löschen von Pseudonymen und Auflisten von "
-"bestehenden Pseudonymen."
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
-#, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/conf/gnunet-setup.c:179 src/server/gnunet-peer-info.c:118
-#: src/server/gnunet-transport-check.c:532
-msgid "Invalid arguments. Exiting.\n"
-msgstr "Ungültige Parameter. Abbruch.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, c-format
-msgid "Namespace `%s' has rating %d.\n"
-msgstr "Namespace `%s' hat das Rating %d.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
-#, c-format
-msgid "Namespace `%s' (%s) has rating %d.\n"
-msgstr "Namespace `%s' (%s) hat das Rating %d.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
-#, c-format
-msgid "\tRating (after update): %d\n"
-msgstr "\tRating (nach Update): %d\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
-#, c-format
-msgid "Collection stopped.\n"
-msgstr "Collection beendet.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
-#, c-format
-msgid "Failed to stop collection (not active?).\n"
-msgstr "Fehler beim Beenden der Collection (nicht aktiv?).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
-#, c-format
-msgid "Pseudonym `%s' deleted.\n"
-msgstr "Pseudonym `%s' wurde gelöscht.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
-#, c-format
-msgid "Error deleting pseudonym `%s' (does not exist?).\n"
-msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
-#, c-format
-msgid "Started collection `%s'.\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
-#, c-format
-msgid "Failed to start collection.\n"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
-#, c-format
-msgid "Could not create namespace `%s' (exists?).\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
-#, c-format
-msgid "Namespace `%s' created (root: %s).\n"
-msgstr "Namespace `%s' wurde erstellt (Root: %s).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
-#, c-format
-msgid "Could not access namespace information.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
-
 #: src/applications/fs/tools/gnunet-search.c:114
 msgid "exit after receiving LIMIT results"
 msgstr "Abbrechen, nachdem LIMIT Ergebnisse empfangen wurden"
@@ -1360,6 +2291,57 @@
 msgid "Error converting arguments to URI!\n"
 msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
 
+#: src/applications/fs/tools/gnunet-download.c:41
+msgid "LEVEL"
+msgstr "GRAD"
+
+#: src/applications/fs/tools/gnunet-download.c:47
+msgid "FILENAME"
+msgstr "DATEINAME"
+
+#: src/applications/fs/tools/gnunet-download.c:48
+msgid "write the file to FILENAME"
+msgstr "Schreibe die Datei in DATEINAME"
+
+#: src/applications/fs/tools/gnunet-download.c:50
+msgid "download a GNUnet directory recursively"
+msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
+
+#: src/applications/fs/tools/gnunet-download.c:56
+msgid "Download files from GNUnet."
+msgstr "Dateien aus dem GNUnet herunterladen."
+
+#: src/applications/fs/tools/gnunet-download.c:136
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr "Nicht genügend Parameter. Sie müssen eine GNUnet Datei URI angeben\n"
+
+#: src/applications/fs/tools/gnunet-download.c:159
+#, fuzzy, c-format
+msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
+msgstr "Download der Datei `%s' bei %16llu von %16llu Bytes (%8.3f kbps)\n"
+
+#: src/applications/fs/tools/gnunet-download.c:172
+#: src/applications/fs/tools/gnunet-download.c:183
+#, c-format
+msgid "Error downloading: %s\n"
+msgstr "Fehler beim Download: %s\n"
+
+#: src/applications/fs/tools/gnunet-download.c:191
+#, fuzzy, c-format
+msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
+msgstr ""
+"Download der Datei `%s' abgeschlossen. Geschwindigkeit war %8.3f KB/s.\n"
+
+#: src/applications/fs/tools/gnunet-download.c:237
+#, c-format
+msgid "URI `%s' invalid for gnunet-download.\n"
+msgstr "URI `%s' ist ungültig für gnunet-download.\n"
+
+#: src/applications/fs/tools/gnunet-download.c:288
+#, c-format
+msgid "File stored as `%s'.\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
 #: src/applications/fs/tools/gnunet-unindex.c:50
 #, c-format
 msgid ""
@@ -1370,10 +2352,10 @@
 "Fertigstellung)            "
 
 #: src/applications/fs/tools/gnunet-unindex.c:61
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
+"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "\n"
 "Deindizierung von `%s' abgeschlossen, %llu Bytes benötigten %llu Sekunden (%"
@@ -1402,1900 +2384,1413 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "`%s' schlug fehl. Ist `%s' eine Datei?\n"
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/fs/module/ondemand.c:305
 #, c-format
-msgid "GAP received invalid content from `%s'\n"
-msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+msgid "Indexed file disappeared, deleting block for query `%s'\n"
+msgstr ""
+"Indizierte Datei ist verschwunden, Block für Anfrage `%s' wird gelöscht\n"
 
-#: src/applications/gap/gap.c:1618
-msgid "myself"
+#: src/applications/fs/module/ondemand.c:393
+#, c-format
+msgid ""
+"Because the file `%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!\n"
 msgstr ""
+"Weil die Datei `%s' nun seit 3 Tagen nicht zur Verfügung steht, wurde Sie "
+"aus Ihrem Share entfernt. Bitte deindizieren Sie Dateien, bevor Sie sie "
+"löschen, da Ihr Index nun ungültige Referenzen enthält!\n"
 
-#: src/applications/gap/gap.c:1791
+#: src/applications/fs/module/ondemand.c:419
+#, c-format
 msgid ""
-"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+"Configuration file must specify directory for storage of FS data in section `"
+"%s' under `%s'.\n"
 msgstr ""
-"Verdeckender Netzwerkverkehr angefordert, aber der Verkehrsdienst wurde "
-"nicht geladen. Anfrage wird abgelehnt.\n"
+"Die Konfigurationsdatei muss ein Verzeichnis für die Speicherung von FS "
+"Daten in der Sektion `%s' unter `%s' angeben.\n"
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
-msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
+#: src/applications/fs/module/ondemand.c:617
+#, c-format
+msgid ""
+"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
-"Gewünschter Grad an Anonymität kann nicht erreicht werden, Anfrage wird "
-"ignoriert.\n"
+"Deindizierter ODB Block `%s' vom Offset %llu fehlt bereits im "
+"Datenspeicher.\n"
 
-#: src/applications/gap/gap.c:2077
-msgid "# gap requests total received"
-msgstr "# gap Anfragen insgesamt empfangen"
+#: src/applications/fs/module/fs.c:1184
+#, c-format
+msgid ""
+"You must specify a postive number for `%s' in the configuration in section `%"
+"s'.\n"
+msgstr ""
+"Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
+"positive Zahl angeben.\n"
 
-#: src/applications/gap/gap.c:2078
-msgid "# gap requests policy: immediate drop"
-msgstr "# gap Anfragen mit taktischer Entscheidung: sofortiges Verwerfen"
+#: src/applications/fs/module/fs.c:1233
+#, c-format
+msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
+msgstr "`%s' registriert die Client Handler %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/gap/gap.c:2079
-msgid "# gap requests policy: not routed"
-msgstr "# gap Anfragen mit taktischer Entscheidung: kein Routing"
+#: src/applications/fs/module/fs.c:1270
+msgid "enables (anonymous) file-sharing"
+msgstr "Ermöglicht (anonymes) Filesharing"
 
-#: src/applications/gap/gap.c:2080
-msgid "# gap requests policy: not answered"
-msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
+#: src/applications/fs/module/migration.c:224
+msgid "# blocks migrated"
+msgstr "# Blöcke migriert"
 
-#: src/applications/gap/gap.c:2081
-msgid "# gap requests processed: attempted add to RT"
-msgstr "# gap Anfragen verarbeitet: versucht, der RT hinzuzufügen"
+#: src/applications/fs/module/migration.c:225
+msgid "# on-demand block migration attempts"
+msgstr ""
 
-#: src/applications/gap/gap.c:2082
-msgid "# gap requests processed: local result"
-msgstr "# gap Anfragen verarbeitet: lokales Ergebnis"
+#: src/applications/fs/fsui/namespace_info.c:583
+msgid "Publication interval for periodic publication changed."
+msgstr ""
+"Veröffentlichungsintervall für periodische Veröffentlichung wurde geändert."
 
-#: src/applications/gap/gap.c:2083
-msgid "# gap routing successes (total)"
-msgstr "# gap Routing erfolgreich (insgesamt)"
+#: src/applications/fs/fsui/namespace_info.c:604
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
+msgstr ""
+"Veröffentlichungsdatum für periodisch aktualisierten Inhalt ist mehr als "
+"eine Woche früher als geplant.\n"
 
-#: src/applications/gap/gap.c:2084
-msgid "# gap requests dropped: collision in RT"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+#: src/applications/fs/fsui/search.c:245
+msgid "This search is already pending!\n"
+msgstr "Diese Suche läuft bereits!\n"
 
-#: src/applications/gap/gap.c:2085
-msgid "# gap requests forwarded (counting each peer)"
-msgstr "#gap Anfragen weitergeleitet (jeder Knoten gezählt)"
+#: src/applications/fs/fsui/fsui.c:189
+msgid "FSUI persistence: error restoring download\n"
+msgstr "FSUI Beständigkeit: Fehler beim Wiederherstellen des Downloads\n"
 
-#: src/applications/gap/gap.c:2086
-msgid "# gap duplicate requests (pending)"
-msgstr "# gap doppelte Anfragen (unfertig)"
+#: src/applications/fs/fsui/fsui.c:638
+#, 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/gap/gap.c:2087
-msgid "# gap duplicate requests that were re-tried"
-msgstr "# gap doppelte Anfragen, die wiederholt wurden"
+#: src/applications/fs/fsui/download.c:290
+msgid "Download aborted."
+msgstr "Download abgebrochen."
 
-#: src/applications/gap/gap.c:2088
-msgid "# gap re-try ttl difference (cummulative)"
-msgstr "# gap Wiederholungs-TTL-Differenz (kummulativ)"
+#: src/applications/fs/fsui/download.c:294
+msgid "ECRS download failed (see logs)."
+msgstr "ECRS Download schlug fehl (siehe Protokolldateien)."
 
-#: src/applications/gap/gap.c:2089
-msgid "# gap reply duplicates"
-msgstr "#gap doppelte Antworten"
+#: src/applications/fs/fsui/download.c:298
+msgid "ECRS download suspending."
+msgstr "ECRS download wird eingefroren."
 
-#: src/applications/gap/gap.c:2090
-msgid "# gap spurious replies"
-msgstr "# gap falsche Antworten"
+#: src/applications/fs/fsui/download.c:302
+msgid "Unexpected download state."
+msgstr ""
 
-#: src/applications/gap/gap.c:2091
-msgid "# gap routing slots currently in use"
-msgstr "# gap Routingschächte im Moment in Verwendung"
+#: src/applications/fs/fsui/unindex.c:85
+msgid "Unindex failed."
+msgstr "Deindizierung schlug fehl."
 
-#: src/applications/gap/gap.c:2092
-msgid "# gap memory used for tracking seen content"
-msgstr ""
+#: src/applications/fs/fsui/helper.c:67
+msgid "No keywords specified!\n"
+msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/applications/gap/gap.c:2093
-msgid "# gap memory used for tracking routing destinations"
+#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:448
+msgid "Upload failed."
+msgstr "Upload fehlgeschlagen."
+
+#: src/applications/fs/fsui/upload.c:455
+msgid "Cannot upload directory without using recursion."
 msgstr ""
+"Verzeichnis kann nicht ohne die Verwendung von Rekursion hochgeladen werden."
 
-#: src/applications/gap/gap.c:2094
-#, fuzzy
-msgid "# gap rewards pending"
-msgstr "# gap doppelte Anfragen (unfertig)"
+#: src/applications/fs/fsui/file_info.c:93
+msgid "Collecting file identifiers disabled.\n"
+msgstr "Einsammeln von Dateibezeichnern deaktiviert.\n"
 
-#: src/applications/gap/gap.c:2095
-#, fuzzy
-msgid "# gap response weights"
-msgstr "# gap falsche Antworten"
-
-#: src/applications/gap/gap.c:2112
-msgid ""
-"Traffic service failed to load; gap cannot ensure cover-traffic "
-"availability.\n"
+#: src/applications/fs/fsui/file_info.c:282
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
-"Verkehrsdienst konnte nicht geladen werden, GAP kann keinen verdeckenden "
-"Netzwerkverkehr sicherstellen.\n"
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/fs/ecrs/search.c:160
+msgid "CHK URI not allowed for search.\n"
+msgstr "CHK URI ist nicht erlaubt für Suchen.\n"
+
+#: src/applications/fs/ecrs/search.c:216
+msgid "LOC URI not allowed for search.\n"
+msgstr "LOC URI ist nicht erlaubt für Suchen.\n"
+
+#: src/applications/fs/ecrs/download.c:125
 #, c-format
-msgid "`%s' registering handlers %d %d\n"
-msgstr "`%s' registriert Handler %d %d\n"
+msgid "Could not unlink temporary file `%s': %s\n"
+msgstr "Temporäre Datei `%s' konnte nicht gelöscht werden: %s\n"
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/fs/ecrs/download.c:257
 #, c-format
-msgid "`%s' registering client handler %d\n"
-msgstr "`%s' registriert Client-Handler %d\n"
+msgid "Write(%d, %p, %d) failed: %s\n"
+msgstr "Write(%d, %p, %d) schlug fehl: %s\n"
 
-#: src/applications/getoption/getoption.c:82
-msgid "allows clients to determine gnunetd's configuration"
-msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
+#: src/applications/fs/ecrs/download.c:935
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
+msgstr ""
+"Entschlüsselter Inhalt entspricht nicht dem Schlüssel. Dies ist entweder ein "
+"Bug oder eine mit bösen Absichten eingefügte Datei. Download wurde "
+"abgebrochen.\n"
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/fs/ecrs/download.c:1112
 #, c-format
 msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+"Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
-"Formatüberprüfung schlug für die existierende Hostkeydatei `%s' fehl, es "
-"wird ein neuer Hostkey erzeugt.\n"
+"Inhalt `%s' scheint im Netzwerk nicht verfügbar zu sein (%u mal versucht).\n"
 
-#: src/applications/identity/hostkey.c:127
-msgid "Creating new hostkey (this may take a while).\n"
-msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
+#: src/applications/fs/ecrs/upload.c:180
+#, c-format
+msgid "`%s' is not a file.\n"
+msgstr "`%s' ist keine Datei.\n"
 
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
-msgstr "Hostkey konnte nicht erzeugt werden!\n"
+#: src/applications/fs/ecrs/upload.c:186
+#, c-format
+msgid "Cannot get size of file `%s'"
+msgstr "Die Größe der Datei `%s' konnte nicht ermittelt werden"
 
-#: src/applications/identity/hostkey.c:139
-msgid "Done creating hostkey.\n"
-msgstr "Hostkey wurde erfolgreich erzeugt.\n"
+#: src/applications/fs/ecrs/upload.c:193
+#, fuzzy
+msgid "Failed to connect to gnunetd."
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/applications/identity/identity.c:329
+#: src/applications/fs/ecrs/upload.c:203
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
-"Datei wurde entfernt.\n"
+msgid "Cannot hash `%s'.\n"
+msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/applications/identity/identity.c:362
+#: src/applications/fs/ecrs/upload.c:221
 #, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "%s `%s' ergab keine bekannten Knoten!\n"
+msgid "Initialization for indexing file `%s' failed.\n"
+msgstr "Initialisierung der Indizierung der Datei `%s' fehlgeschlagen.\n"
 
-#: src/applications/identity/identity.c:644
-#: src/applications/identity/identity.c:662
+#: src/applications/fs/ecrs/upload.c:227
 #, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
-msgstr "Datei `%s' enthielt ungültige Hello Daten und wurde entfernt.\n"
+msgid "Indexing file `%s' failed. Trying to insert file...\n"
+msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/applications/identity/identity.c:712
-#, fuzzy, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
-msgstr ""
-"Signatur kann nicht verifiziert werden, der andere Knoten ist uns nicht "
-"bekannt!\n"
+#: src/applications/fs/ecrs/upload.c:306
+#, c-format
+msgid "Indexing data failed at position %i.\n"
+msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/applications/identity/identity.c:720
-msgid "Signature failed verification: signature invalid.\n"
-msgstr "Verifikation einer Signatur fehlgeschlagen: Signatur ist ungültig.\n"
+#: src/applications/fs/ecrs/meta.c:842
+#, c-format
+msgid "Renaming of file `%s' to `%s' failed: %s\n"
+msgstr "Umbenennen der Datei `%s' zu `%s' fehlgeschlagen: %s\n"
 
-#: src/applications/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
+#: src/applications/fs/ecrs/meta.c:850
 #, c-format
-msgid "Received malformed `%s' message. Dropping.\n"
-msgstr "Beschädigte `%s' Nachricht empfangen. Nachricht wird verworfen.\n"
+msgid "Could not rename file `%s' to `%s': file exists\n"
+msgstr ""
+"Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/applications/pingpong/pingpong.c:130
-msgid "Received ping for another peer. Dropping.\n"
-msgstr "Ping für einen anderen Knoten empfangen. Ping wird verworfen.\n"
-
-#: src/applications/pingpong/pingpong.c:187
-msgid "Received PING not destined for us!\n"
-msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
-
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/fs/ecrs/namespace.c:45
+#, c-format
 msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s.\n"
 msgstr ""
-"PONG konnte keinem PING zugeordnet werden. Versuchen Sie die Konstante "
-"MAX_PING_PONG hochzusetzen.\n"
+"Die Konfigurationsdatei muss unter %s%s ein Verzeichnis für GNUnet angeben, "
+"in dem Knotenbezogene Daten gespeichert werden.\n"
 
-#: src/applications/pingpong/pingpong.c:366
-msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+#: src/applications/fs/ecrs/namespace.c:133
+#, c-format
+msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
 msgstr ""
-"PING konnte nicht erstellt werden, da die Tabelle voll ist. Versuchen Sie, "
-"die Konstante MAX_PING_PONG hochzusetzen.\n"
+"Pseudonym `%s' kann nicht erstellt werden, da die Datei `%s' bereits "
+"existiert.\n"
 
-#: src/applications/pingpong/pingpong.c:452
-msgid "# encrypted PONG messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+#: src/applications/fs/ecrs/namespace.c:307
+#: src/applications/fs/ecrs/namespace.c:383
+#: src/applications/fs/ecrs/namespace.c:528
+#, c-format
+msgid "File `%s' does not contain a pseudonym.\n"
+msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/applications/pingpong/pingpong.c:454
-msgid "# plaintext PONG messages received"
-msgstr "# Klartext PONG Nachrichten empfangen"
+#: src/applications/fs/ecrs/namespace.c:318
+#: src/applications/fs/ecrs/namespace.c:394
+#, c-format
+msgid "Format of pseudonym `%s' is invalid.\n"
+msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
-#: src/applications/pingpong/pingpong.c:456
-msgid "# encrypted PING messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+#: src/applications/fs/ecrs/namespace.c:538
+#: src/applications/fs/ecrs/namespace.c:548
+#, c-format
+msgid "Format of file `%s' is invalid.\n"
+msgstr "Format der Datei `%s' ist ungültig.\n"
 
-#: src/applications/pingpong/pingpong.c:458
-msgid "# PING messages created"
-msgstr "# PING Nachrichten erstellt"
+#: src/applications/topology_f2f/topology.c:323
+#, c-format
+msgid ""
+"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+msgstr ""
+"Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
+"Sektion `%s' angegeben werden.\n"
 
-#: src/applications/pingpong/pingpong.c:460
-msgid "# encrypted PONG messages sent"
-msgstr "# verschlüsselter PONG Nachrichten gesendet"
+#: src/applications/topology_f2f/topology.c:342
+#, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/applications/pingpong/pingpong.c:464
-msgid "# encrypted PING messages sent"
-msgstr "# verschlüsselter PING Nachrichten gesendet"
+#: src/applications/topology_f2f/topology.c:358
+msgid "Syntax error in topology specification, skipping bytes.\n"
+msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/topology_f2f/topology.c:370
 #, c-format
-msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
-msgstr "`%s' registriert Handler %d %d (Plaintext und Ciphertext)\n"
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/template/template.c:61
 #, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be registered: another callback is already "
-"using this name (%p)\n"
-msgstr ""
-"%s::%s - RPC %s:%p konnte nicht registriert werden: ein anderer Callback "
-"verwendet bereits diesen Namen (%p)\n"
+msgid "`%s' registering client handler %d and %d\n"
+msgstr "`%s' registriert Client-Handler %d and %d\n"
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/template/gnunet-template.c:70
+#: src/applications/vpn/gnunet-vpn.c:72
+msgid "helptext for -t"
+msgstr "Hilfetext für -t"
+
+#: src/applications/template/gnunet-template.c:75
+msgid "Template for gnunet-clients."
+msgstr "Vorlage für gnunet-clients."
+
+#: src/applications/bootstrap_http/http.c:109
 #, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
-"under that name: %p\n"
-msgstr ""
-"%s::%s - RPC %s:%p konnte nicht unregistriert werden: ein anderer Callback "
-"ist unter diesem Namen registiert: %p\n"
+msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+msgstr "Ungültiger Port \"%s\" in Angabe der Hostlist, versuche Port %d.\n"
 
-#: src/applications/rpc/rpc.c:232
+#: src/applications/bootstrap_http/http.c:120
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
-msgstr "%s::%s - RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
+msgid "`%s' failed at %s:%d with error: `%s'.\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/bootstrap_http/http.c:132
 #, c-format
-msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
+msgid "Could not download list of peer contacts, host `%s' unknown.\n"
 msgstr ""
-"%s::%s - async RPC %s:%p konnte nicht unregistriert werden: nicht gefunden\n"
+"Die Liste mit Knotenkontakten konnte nicht heruntergeladen werden, Host `%s' "
+"ist unbekannt.\n"
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
+#: src/applications/bootstrap_http/http.c:155
+#: src/applications/bootstrap_http/http.c:181
 #, c-format
-msgid "Invalid message of type %u received.  Dropping.\n"
-msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/bootstrap_http/http.c:217
 #, c-format
-msgid "Dropping RPC request %u: message malformed.\n"
-msgstr "RPC Anfrage %u wird verworfen: Nachricht ist beschädigt.\n"
+msgid "Parsing HTTP response for URL `%s' failed.\n"
+msgstr "Das Parsen der HTTP Antwort für die URL `%s' schlug fehl.\n"
 
-#: src/applications/rpc/rpc.c:1388
+#: src/applications/bootstrap_http/http.c:252
 #, c-format
-msgid "RPC not unregistered: %s:%p\n"
-msgstr "RPC nicht unregistriert: %s:%p\n"
+msgid "Parsing hello from `%s' failed.\n"
+msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/bootstrap_http/http.c:330
 #, c-format
-msgid "`%s' registering handlers %d %d %d\n"
-msgstr "`%s' registriert Handler %d %d %d\n"
+msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+msgstr ""
+"Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden. Es wird ohne "
+"Proxy versucht.\n"
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/bootstrap_http/http.c:355
+msgid "# hellos downloaded via http"
+msgstr "# Hellos per HTTP heruntergeladen"
+
+#: src/applications/traffic/traffic.c:445
 #, c-format
-msgid "Failed to initialize `%s' service.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+msgid "# bytes transmitted of type %d"
+msgstr "# Bytes des Typs %d übertragen"
 
-#: src/applications/rpc/rpc.c:1491
-msgid "RPC async reply invalid.\n"
-msgstr "RPC async Antwort ungültig.\n"
+#: src/applications/traffic/traffic.c:465
+#, c-format
+msgid "# bytes received of type %d"
+msgstr "# Bytes des Typs %d empfangen"
 
-#: src/applications/rpc/rpc.c:1562
-msgid "async RPC reply not received.\n"
-msgstr "async RPC Antwort nicht empfangen.\n"
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/applications/session/connect.c:209
-#, 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/traffic/clientapi.c:67
+msgid "Failed to query gnunetd about traffic conditions.\n"
+msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
 
-#: src/applications/session/connect.c:246
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
+#: src/applications/traffic/clientapi.c:74
+msgid "Did not receive reply from gnunetd about traffic conditions.\n"
+msgstr "Keine Antwort von gnunetd über die Netzwerkverkehrsbedingungen.\n"
+
+#: src/applications/kvstore_sqlite/kv_sqlite.c:181
+#, fuzzy, c-format
+msgid ""
+"Configuration file must specify directory for storing data in section `%s' "
+"under `%s'.\n"
 msgstr ""
-"Sitzungsschlüssel kann nicht verschlüsselt werden, der andere Knoten ist uns "
-"nicht bekannt!\n"
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/applications/session/connect.c:523
+#: src/applications/kvstore_sqlite/kv_sqlite.c:264
+#, fuzzy
+msgid "Unable to initialize SQLite KVStore.\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/applications/vpn/gnunet-vpn.c:77
+msgid "VPN over GNUnet."
+msgstr ""
+
+#: src/applications/vpn/vpn.c:315
 #, c-format
-msgid "Invalid `%s' message received from peer `%s'.\n"
-msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+msgid "Not storing route to myself from peer %d\n"
+msgstr ""
 
-#: src/applications/session/connect.c:532
+#: src/applications/vpn/vpn.c:323
 #, c-format
-msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
-"setkey `%s' von `%s' hat eine ungültige CRC Prüfsumme (tatsächlich: %u, "
-"erwartet: %u).\n"
 
-#: src/applications/session/connect.c:587
-msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+#: src/applications/vpn/vpn.c:351
+#, c-format
+msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
-"Fehler beim Parsen des Verschlüsselten Sitzungsschlüssels, gegebene "
-"Nachrichtenteilgröße ist ungültig.\n"
 
-#: src/applications/session/connect.c:597
+#: src/applications/vpn/vpn.c:400
 #, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
-msgstr "Unbekannter Typ in engebetteter Nachricht: %u (%u bytes)\n"
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+msgstr ""
 
-#: src/applications/session/connect.c:742
-msgid "# session keys sent"
-msgstr "# Sitzungsschlüssel gesendet"
+#: src/applications/vpn/vpn.c:404
+#, c-format
+msgid "RFC4193 Frame length %d too small\n"
+msgstr ""
 
-#: src/applications/session/connect.c:744
-msgid "# session keys rejected"
-msgstr "# Sitzungsschlüssel abgelehnt"
+#: src/applications/vpn/vpn.c:414
+#, c-format
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
+msgstr ""
 
-#: src/applications/session/connect.c:746
-msgid "# session keys accepted"
-msgstr "# Sitzungsschlüssel akzeptiert"
+#: src/applications/vpn/vpn.c:474
+#, c-format
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+msgstr ""
 
-#: src/applications/session/connect.c:748
-msgid "# sessions established"
-msgstr "# Sitzungen aufgebaut"
+#: src/applications/vpn/vpn.c:478
+#, c-format
+msgid "Cannot open tunnel device because of %s"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:57
-#: src/util/hostkey_gcrypt.c:64 src/util/storage.c:659
-#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1042 src/include/gnunet_util.h:1049
-#: src/include/gnunet_util.h:1051
+#: src/applications/vpn/vpn.c:505
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/vpn/vpn.c:513
 #, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
-msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
+msgid "Cannot set tunnel name to %s because of %s\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
-msgid "mysql datastore"
-msgstr "mysql Datenspeicher"
+#: src/applications/vpn/vpn.c:517
+#, c-format
+msgid "Configured tunnel name to %s\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/vpn/vpn.c:555
 #, c-format
-msgid "Query `%s' had no results.\n"
-msgstr "Abfrage `%s' hatte keine Ergebnisse.\n"
+msgid "Cannot get socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-msgid "# bytes in datastore"
-msgstr "# bytes in der Datenbank"
+#: src/applications/vpn/vpn.c:559
+#, c-format
+msgid "Cannot set socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1205
+#: src/applications/vpn/vpn.c:566
 #, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
+msgid "Cannot set MTU for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1223
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
+#: src/applications/vpn/vpn.c:571
+#, c-format
+msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
-"Fehler beim Laden des MySQL Datenbankmoduls. Prüfen Sie, ob MySQL läuft und "
-"richtig eingerichtet ist!\n"
 
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "Konnte libgnunetutil nicht initialisieren!\n"
+#: src/applications/vpn/vpn.c:579
+#, c-format
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+#: src/applications/vpn/vpn.c:591
+#, fuzzy, c-format
+msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
+msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
-msgid "sqlite datastore"
-msgstr "sqlite Datenspeicher"
-
-#: src/applications/sqstore_sqlite/sqlite.c:1035
+#: src/applications/vpn/vpn.c:602
 #, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
-"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
-"angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/applications/stats/clientapi.c:179
-msgid "Uptime (seconds)"
-msgstr "Laufzeit (Sekunden)"
+#: src/applications/vpn/vpn.c:614
+#, fuzzy, c-format
+msgid "Cannot add route IPv6 address for gnu%s because %s\n"
+msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
 
-#: src/applications/stats/gnunet-stats.c:61
-#: src/applications/testbed/commands.c:1130
+#: src/applications/vpn/vpn.c:646
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:692
 #, c-format
-msgid "Supported peer-to-peer messages:\n"
-msgstr "unterstützte Peer-to-Peer Nachrichten:\n"
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:64
-#: src/applications/testbed/commands.c:1132
+#: src/applications/vpn/vpn.c:754
 #, c-format
-msgid "Supported client-server messages:\n"
-msgstr "unterstützte Client-Server Nachrichten:\n"
+msgid "RFC4193 --- whitelist of peer %x\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:94
-msgid "prints supported protocol messages"
-msgstr "gibt unterstützte Protokollnachrichten aus"
+#: src/applications/vpn/vpn.c:772
+msgid "RFC4193 Thread exiting\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
-msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
+#: src/applications/vpn/vpn.c:812
+msgid "VPN IP src not anonymous. drop..\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/vpn/vpn.c:816
+msgid "VPN IP not anonymous, drop.\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:822
+msgid "VPN Received, not anonymous, drop.\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:825
+#, fuzzy, c-format
+msgid "VPN Received unknown IP version %d...\n"
+msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
+
+#: src/applications/vpn/vpn.c:835
 #, c-format
-msgid "Error establishing connection with gnunetd.\n"
-msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
+msgid "<- GNUnet(%d) : %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/vpn/vpn.c:854
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:869
 #, c-format
-msgid "Error reading information from gnunetd.\n"
-msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
+msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:206
+#: src/applications/vpn/vpn.c:885
+msgid "Receive route request\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:890
 #, c-format
-msgid "% of allowed network load (up)"
-msgstr "% of allowed network load (up)"
+msgid "Prepare route announcement level %d\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:208
+#: src/applications/vpn/vpn.c:901
 #, c-format
-msgid "% of allowed network load (down)"
-msgstr "% of allowed network load (down)"
+msgid "Send route announcement %d with route announce\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:210
+#: src/applications/vpn/vpn.c:907
 #, c-format
-msgid "% of allowed cpu load"
-msgstr "% of allowed cpu load"
+msgid "Send outside table info %d\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:214
-msgid "# bytes of noise received"
-msgstr "# Bytes Rauschen empfangen"
+#: src/applications/vpn/vpn.c:923
+msgid "Receive route announce.\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:372
-msgid "keeps statistics about gnunetd's operation"
-msgstr "Hält Statistiken über Betrieb von gnunetd"
+#: src/applications/vpn/vpn.c:927
+msgid "Going to try insert route into local table.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:95
-msgid "output in gnuplot format"
-msgstr "Ausgabe im gnuplot Format"
+#: src/applications/vpn/vpn.c:931
+#, c-format
+msgid "Inserting with hops %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:98
-msgid "number of iterations"
-msgstr "Anzahl an Durchläufen"
+#: src/applications/vpn/vpn.c:945
+#, c-format
+msgid "Request level %d from peer %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:100
-msgid "number of messages to use per iteration"
-msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
+#: src/applications/vpn/vpn.c:960
+#, c-format
+msgid "Receive table limit on peer reached %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:102
-msgid "receiver host identifier (ENC file name)"
-msgstr "Bezeichner des Empfängerhosts (ENC Dateiname)"
+#: src/applications/vpn/vpn.c:998
+msgid "realise alloc ram\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:104
-msgid "message size"
-msgstr "Nachrichtengröße"
+#: src/applications/vpn/vpn.c:1013
+msgid "realise add routes\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:106
-msgid "sleep for SPACE ms after each a message block"
-msgstr "Für SPACE ms nach jedem Nachrichtenblock pausieren"
+#: src/applications/vpn/vpn.c:1058
+msgid "realise pull routes\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:108
-msgid "time to wait for the completion of an iteration (in ms)"
-msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
+#: src/applications/vpn/vpn.c:1104
+msgid "realise copy table\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:111
-msgid "number of messages in a message block"
-msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
+#: src/applications/vpn/vpn.c:1161
+msgid "Yes"
+msgstr "Ja"
 
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
-msgstr "GNUnet Transport Benchmarking Werkzeug starten."
+#: src/applications/vpn/vpn.c:1161
+msgid "No"
+msgstr "Nein"
 
-#: src/applications/tbench/gnunet-tbench.c:225
-msgid "You must specify a receiver!\n"
-msgstr "Sie müssen einen Empfänger angeben!\n"
+#: src/applications/vpn/vpn.c:1324
+#, fuzzy, c-format
+msgid "`%s' initialising RFC4913 module  %d and %d\n"
+msgstr "`%s' registriert Handler %d und %d\n"
 
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/vpn/vpn.c:1325
 #, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
-"Ungültige Empfängerknoten ID angegeben (`%s' ist kein gültiger Name).\n"
 
-#: src/applications/tbench/gnunet-tbench.c:249
-#, c-format
-msgid "Time:\n"
-msgstr "Zeit:\n"
+#: src/applications/vpn/vpn.c:1361
+#, fuzzy
+msgid "enables IPv6 over GNUnet (incomplete)"
+msgstr "Ermöglicht P2P-Chat"
 
-#: src/applications/tbench/gnunet-tbench.c:250
-#, c-format
-msgid "\tmax      %llums\n"
-msgstr "\tMax      %llums\n"
+#: src/applications/vpn/vpn.c:1383
+msgid "RFC4193 Waiting for tun thread to end\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:252
-#, c-format
-msgid "\tmin      %llums\n"
-msgstr "\tMin      %llums\n"
+#: src/applications/vpn/vpn.c:1394
+msgid "RFC4193 The tun thread has ended\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:254
+#: src/applications/vpn/vpn.c:1405
 #, c-format
-msgid "\tmean     %8.4fms\n"
-msgstr "\tMittel   %8.4fms\n"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/state/state.c:85
 #, c-format
-msgid "\tvariance %8.4fms\n"
-msgstr "\tVarianz  %8.4fms\n"
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
+msgstr ""
+"Die Konfigurationsdatei muss unter %s\\%s ein Verzeichnis für GNUnet "
+"angeben, in dem knotenbezogene Daten gespeichert werden.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:259
-#, c-format
-msgid "Loss:\n"
-msgstr "Verlust:\n"
+#: src/server/gnunet-update.c:50
+msgid "print a value from the configuration file to stdout"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/applications/tbench/gnunet-tbench.c:260
-#, c-format
-msgid "\tmax      %u\n"
-msgstr "\tMax      %u\n"
+#: src/server/gnunet-update.c:55 src/server/startup.c:450
+#: src/server/gnunet-transport-check.c:407
+msgid "run as user LOGIN"
+msgstr "als Benutzer LOGIN ausführen"
 
-#: src/applications/tbench/gnunet-tbench.c:262
-#, c-format
-msgid "\tmin      %u\n"
-msgstr "\tMin      %u\n"
+#: src/server/gnunet-update.c:58
+msgid "run in client mode (for getting client configuration values)"
+msgstr ""
+"Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
+"zu holen"
 
-#: src/applications/tbench/gnunet-tbench.c:264
-#, c-format
-msgid "\tmean     %8.4f\n"
-msgstr "\tMittel   %8.4fms\n"
+#: src/server/gnunet-update.c:64
+msgid "Updates GNUnet datastructures after version change."
+msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
 
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/server/gnunet-update.c:147
 #, c-format
-msgid "\tvariance %8.4f\n"
-msgstr "\tVarianz %8.4f\n"
+msgid "Option `%s' makes no sense without option `%s'."
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'."
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
+#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
 #, c-format
-msgid "Output format not known, this should not happen.\n"
-msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
+msgid "Invalid arguments: "
+msgstr "Ungültige Parameter: "
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/server/gnunet-update.c:155
 #, c-format
 msgid ""
 "\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+"Exiting.\n"
 msgstr ""
 "\n"
-"Es wurde keine Nachricht von gnunetd empfangen. Läuft gnunetd?\n"
+"Abbruch.\n"
 
-#: src/applications/tbench/tbench.c:448
-msgid "allows profiling of direct peer-to-peer connections"
-msgstr "Ermöglicht das Untersuchen direkter Peer-to-Peer Verbindungen"
+#: src/server/gnunet-update.c:232 src/server/core.c:476
+msgid "No applications defined in configuration!\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/applications/tbench/tbenchtest.c:57
+#: src/server/gnunet-update.c:249
 #, c-format
-msgid "Using %u messages of size %u for %u times.\n"
-msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
+msgid "Updating data for module `%s'\n"
+msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/applications/tbench/tbenchtest.c:84
+#: src/server/gnunet-update.c:253
 #, 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"
+msgid "Failed to update data for module `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/applications/tbench/tbenchtest.c:89
+#: src/server/gnunet-update.c:309
 #, 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"
+msgid "Updated data for %d applications.\n"
+msgstr "Daten für %d Anwendungen wurden aktualisiert.\n"
 
-#: src/applications/tbench/tbenchtest.c:95
+#: src/server/connection.c:983
 #, c-format
-msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
-msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
+msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
+msgstr "`%s' wählte %d von %d Nachrichten aus (MTU: %d).\n"
 
-#: src/applications/tbench/tbenchtest.c:211
+#: src/server/connection.c:990
 #, c-format
-msgid "Running benchmark...\n"
-msgstr "Benchmark läuft...\n"
+msgid "Message details: %u: length %d, priority: %d\n"
+msgstr "Nachrichten Details: %u: Länge %d, Priorität: %d\n"
 
-#: src/applications/template/gnunet-template.c:70
-msgid "helptext for -t"
-msgstr "Hilfetext für -t"
+#: src/server/connection.c:2254
+#, c-format
+msgid "Message from `%s' discarded: invalid format.\n"
+msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
 
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
-msgstr "Vorlage für gnunet-clients."
-
-#: src/applications/template/template.c:61
+#: src/server/connection.c:2325
 #, c-format
-msgid "`%s' registering client handler %d and %d\n"
-msgstr "`%s' registriert Client-Handler %d and %d\n"
+msgid "Invalid sequence number %u <= %u, dropping message.\n"
+msgstr "Ungültige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
 
-#: src/applications/testbed/gnunet-testbed.c:119
-msgid "Start GNUnet-testbed helper."
-msgstr "GNUnet-testbed Helfer starten."
+#: src/server/connection.c:2340
+msgid "Message received more than one day old. Dropped.\n"
+msgstr ""
+"Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
 
-#: src/applications/testbed/gnunet-testbed.c:183
-#, c-format
-msgid "Cannot connect to LOOPBACK port %d: %s\n"
-msgstr "Verbindung zum LOOPBACK port %d schlug fehl: %s\n"
+#: src/server/connection.c:2708
+msgid "# outgoing messages dropped"
+msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/applications/testbed/gnunet-testbed.c:282
-#, c-format
-msgid "Could not execute `%s': %s\n"
-msgstr "`%s' konnte nicht ausgeführt werden: %s\n"
+#: src/server/connection.c:2712
+msgid "# bytes of outgoing messages dropped"
+msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/applications/testbed/gnunet-testbed.c:325
-msgid "No client service started. Trying again in 30 seconds.\n"
-msgstr "Kein Client Dienst gestartet. Erneuter Versuch in 30 Sekunden.\n"
+#: src/server/connection.c:2714
+msgid "# connections closed (HANGUP sent)"
+msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/applications/testbed/gnunet-testbed.c:348
-#, c-format
-msgid ""
-"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
-"Trying again in %d seconds...\n"
-msgstr ""
-"Fehler (%s) beim Binden des TCP Listeners an den Port %d. Der Proxy Dienst "
-"wurde nicht gestartet.\n"
-"Erneuter Versuch in %d Sekunden...\n"
+#: src/server/connection.c:2717
+msgid "# bytes encrypted"
+msgstr "# Bytes verschlüsselt"
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
-#, c-format
-msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
-msgstr "Unauthorisierte Verbindung von %u.%u.%u.%u. wurde abgewiesen.\n"
+#: src/server/connection.c:2721
+#, fuzzy
+msgid "# bytes transmitted"
+msgstr "# Bytes des Typs %d übertragen"
 
-#: src/applications/testbed/gnunet-testbed.c:428
+#: src/server/connection.c:2725
+#, fuzzy
+msgid "# bytes received"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/server/connection.c:2727
+msgid "# bytes decrypted"
+msgstr "# Bytes entschlüsselt"
+
+#: src/server/connection.c:2728
+msgid "# bytes noise sent"
+msgstr "# Bytes Rauschen gesendet"
+
+#: src/server/startup.c:196
 #, c-format
-msgid "Protocol violation on socket. Expected command.\n"
-msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
+msgid "The `%s' request received from client is malformed.\n"
+msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
 
-#: src/applications/testbed/gnunet-testbed.c:467
+#: src/server/startup.c:324
 #, c-format
-msgid "Command `%s' not found!\n"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
+msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
+msgstr ""
+"Sie müssen einen Namen für die PID Datei in Sektion `%s' unter `%s' "
+"angeben.\n"
 
-#: src/applications/testbed/gnunet-testbed.c:540
-msgid "Start GNUnet testbed controller."
-msgstr "GNUnet testbed Controller starten."
-
-#: src/applications/testbed/gnunet-testbed.c:594
+#: src/server/startup.c:339
 #, c-format
-msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+msgid "Could not write PID to file `%s': %s.\n"
+msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
+
+#: src/server/startup.c:443
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
 msgstr ""
-"Beschädigter Eintrag in der Konfigurationsdatei in Sektion %s unter %s: %s\n"
+"Im Debug-Modus ausführen. gnunetd wird nicht im Hintergrund laufen und "
+"Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
+"Standardfehlerausgabe (stderr) geschrieben."
 
-#: src/applications/testbed/testbed.c:50
-msgid "Could not send acknowledgement back to client.\n"
-msgstr "Bestätigung konnte nicht an Client zurück gesendet werden.\n"
+#: src/server/startup.c:456
+msgid "Starts the gnunetd daemon."
+msgstr "Startet den gnunetd Daemonen."
 
-#: src/applications/testbed/testbed.c:60
+#: src/server/startup.c:470
 #, c-format
-msgid "Received unknown testbed message of type %u.\n"
-msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
+msgid "User `%s' not known, cannot change UID to it.\n"
+msgstr "Benutzer `%s' ist nicht bekannt, UID kann nicht gewechselt werden.\n"
 
-#: src/applications/testbed/testbed.c:78
-#: src/applications/testbed/testbed.c:807
+#: src/server/startup.c:479
 #, c-format
-msgid "size of `%s' message is too short. Ignoring.\n"
-msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/applications/testbed/testbed.c:85
+#: src/server/startup.c:580
+msgid "Invalid command-line arguments:\n"
+msgstr "Ungültige Kommandozeilen Parameter:\n"
+
+#: src/server/startup.c:583
 #, c-format
-msgid "size of `%s' message is wrong. Ignoring.\n"
-msgstr "Größe der `%s' Nachricht ist falsch. Nachricht wird ignoriert.\n"
+msgid "Argument %d: `%s'\n"
+msgstr "Parameter %d: `%s'\n"
 
-#: src/applications/testbed/testbed.c:137
+#: src/server/startup.c:589
+msgid "Invalid command-line arguments.\n"
+msgstr "Ungültige Kommandozeilen Parameter.\n"
+
+#: src/server/gnunetd.c:76
 #, c-format
-msgid "TESTBED could not generate hello message for protocol %u\n"
+msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
-"Das TESTBED konnte keine Hello Nachricht für das Protokoll %u erzeugen\n"
+"Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
+"ausführen!\n"
 
-#: src/applications/testbed/testbed.c:215
-#: src/applications/testbed/testbed.c:256
-#: src/applications/testbed/testbed.c:359
-#: src/applications/testbed/testbed.c:366
-#: src/applications/testbed/testbed.c:403
-#: src/applications/testbed/testbed.c:410
+#: src/server/gnunetd.c:84
 #, c-format
-msgid "received invalid `%s' message\n"
-msgstr "ungültige `%s' Nachricht empfangen\n"
+msgid "`%s' starting\n"
+msgstr "`%s' startet\n"
 
-#: src/applications/testbed/testbed.c:231
-#: src/applications/testbed/testbed.c:271
+#: src/server/gnunetd.c:106
 #, c-format
-msgid "received invalid `%s' message (empty module name)\n"
-msgstr "ungültige `%s' Nachricht empfangen (leerer Modulname)\n"
+msgid "`%s' startup complete.\n"
+msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/applications/testbed/testbed.c:238
+#: src/server/gnunetd.c:111
 #, c-format
-msgid "loading module `%s' failed.  Notifying client.\n"
-msgstr "das Laden von Modul `%s' schlug fehl. Client wird benachrichtigt.\n"
+msgid "`%s' is shutting down.\n"
+msgstr "`%s' fährt herunter.\n"
 
-#: src/applications/testbed/testbed.c:278
-msgid "unloading module failed.  Notifying client.\n"
-msgstr "das Entladen des Moduls schlug fehl. Client wird benachrichtigt.\n"
-
-#: src/applications/testbed/testbed.c:539
+#: src/server/core.c:115
 #, c-format
-msgid "`%s' %s failed: %s\n"
-msgstr "`%s' %s schlug fehl: %s\n"
+msgid "Application module `%s' already initialized!\n"
+msgstr "Anwendungsmodul `%s' ist bereits initialisiert!\n"
 
-#: src/applications/testbed/testbed.c:625
+#: src/server/core.c:168
 #, c-format
-msgid "received invalid `%s' message: %s.\n"
-msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
+msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
+msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
 
-#: src/applications/testbed/testbed.c:817
+#: src/server/core.c:215
 #, c-format
-msgid "'..' is not allowed in file name (%s).\n"
-msgstr "'..' ist nicht erlaubt in einem Dateinamen (%s).\n"
+msgid "Could not shutdown `%s': application not loaded\n"
+msgstr "`%s' kann nicht heruntergefahren werden: Anwendung ist nicht geladen\n"
 
-#: src/applications/testbed/testbed.c:826
-msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
-msgstr "Leerer Dateiname für UPLOAD_FILE Nachricht ist ungültig!\n"
-
-#: src/applications/testbed/testbed.c:833
-msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+#: src/server/core.c:222
+#, c-format
+msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
-"Dateiname für UPLOAD_FILE Nachricht ist nicht Null-terminiert (ungültig!)\n"
+"Anwendung `%s' kann nicht heruntergefahren werden: sie ist nicht "
+"initialisiert\n"
 
-#: src/applications/testbed/testbed.c:841
-msgid "Upload refused!"
-msgstr "Upload abgewiesen!"
+#: src/server/core.c:231 src/server/core.c:420
+#, c-format
+msgid "Could not find '%s%s' method in library `%s'.\n"
+msgstr "Methode '%s%s' kann in Bibliothek `%s' nicht gefunden werden.\n"
 
-#: src/applications/testbed/testbed.c:867
+#: src/server/core.c:398
 #, c-format
-msgid "Invalid message received at %s:%d."
-msgstr "Ungültige Nachricht empfangen bei %s:%d."
+msgid "Could not release %p: service not loaded\n"
+msgstr "%p kann nicht freigegeben werden: Dienst ist nicht geladen\n"
 
-#: src/applications/testbed/testbed.c:985
+#: src/server/core.c:499
 #, c-format
-msgid "received invalid testbed message of size %u\n"
-msgstr "ungültige Testbed Nachricht der Größe %u empfangen\n"
+msgid "Could not initialize application `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/applications/testbed/testbed.c:1002
+#: src/server/core.c:516
 #, c-format
-msgid ""
-"Received testbed message of type %u but unexpected size %u, expected %u\n"
-msgstr ""
-"Empfangene Testbed Nachricht des Typs %u hat die unerwartete Größe %u, es "
-"wurde %u erwartet\n"
+msgid "Could not properly shutdown application `%s'.\n"
+msgstr "Anwendung `%s' konnte nicht ordentlich heruntergefahren werden.\n"
 
-#: src/applications/testbed/testbed.c:1045
-msgid "No testbed URL given, not registered.\n"
-msgstr ""
-"Keine Testbed URL angegeben, es wurde keine Registrierung vorgenommen.\n"
+#: src/server/core.c:575
+msgid "FATAL: Identity plugin not found!\n"
+msgstr "SCHWERWIEGEND: Identity Plugin wurde nicht gefunden!\n"
 
-#: src/applications/testbed/testbed.c:1054 src/transports/http.c:1455
+#: src/server/core.c:633
 #, c-format
-msgid "Could not resolve name of HTTP proxy `%s'.\n"
-msgstr "Der Name des HTTP Proxies `%s' konnte nicht aufgelöst werden.\n"
+msgid "Could not properly unload service `%s'!\n"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/applications/testbed/testbed.c:1118
+#: src/server/gnunet-transport-check.c:109
 #, c-format
-msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
-msgstr ""
-"Beschädigte HTTP URL: `%s' bei `%s'. Testbed-Client wurde nicht "
-"registriert.\n"
+msgid "`%s': Could not create hello.\n"
+msgstr "`%s': Hello konnte nicht erzeugt werden.\n"
 
-#: src/applications/testbed/testbed.c:1154
+#: src/server/gnunet-transport-check.c:118
 #, c-format
-msgid "Could not register testbed, host `%s' unknown\n"
-msgstr ""
-"Testbed konnte nicht registriert werden, Host `%s' ist nicht bekannt.\n"
+msgid "`%s': Could not connect.\n"
+msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
 
-#: src/applications/testbed/testbed.c:1177
+#: src/server/gnunet-transport-check.c:148
 #, c-format
-msgid "Failed to send HTTP request to host `%s': %s\n"
-msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
+msgid "`%s': Could not send.\n"
+msgstr "`%s': Kann nicht senden.\n"
 
-#: src/applications/testbed/testbed.c:1230
+#: src/server/gnunet-transport-check.c:168
 #, c-format
-msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
-msgstr "Fehler beim Senden der HTTP Anfrage `%s' an Host `%s': %s\n"
+msgid "`%s': Did not receive message within %llu ms.\n"
+msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
 
-#: src/applications/testbed/testbed.c:1269
-msgid "Exit register (error: no http response read).\n"
-msgstr "Abbruch der Registrierung (Fehler: keine HTTP Antwort gelesen).\n"
+#: src/server/gnunet-transport-check.c:182
+#, c-format
+msgid "`%s': Could not disconnect.\n"
+msgstr "`%s': Verbindung konnte nicht getrennt werden.\n"
 
-#: src/applications/testbed/testbed.c:1357
-msgid "allows construction of a P2P-testbed (incomplete)"
-msgstr "Ermöglicht die Konstruktion einer P2P-Testumgebung (inkomplett)"
-
-#: src/applications/topology_default/topology.c:398
+#: src/server/gnunet-transport-check.c:189
 #, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
+msgid ""
+"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
 msgstr ""
-"Versionen stimmen nicht überein (`%s' vs. '%*.s'), lassen Sie gnunet-update "
-"laufen!\n"
+"`%s' Transport funktioniert. Es dauerte %ums, um %d Nachrichten zu je %d "
+"Bytes zu übertragen.\n"
 
-#: src/applications/topology_f2f/topology.c:323
+#: src/server/gnunet-transport-check.c:219
+#, fuzzy, c-format
+msgid " Transport %d is not being tested\n"
+msgstr " Transport %d ist nicht verfügbar\n"
+
+#: src/server/gnunet-transport-check.c:230
 #, c-format
 msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+"\n"
+"Contacting `%s'."
 msgstr ""
-"Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
-"Sektion `%s' angegeben werden.\n"
+"\n"
+"Kontaktiere `%s'."
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/server/gnunet-transport-check.c:253
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid " Connection failed\n"
+msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/applications/topology_f2f/topology.c:358
-msgid "Syntax error in topology specification, skipping bytes.\n"
-msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+#: src/server/gnunet-transport-check.c:259
+#, c-format
+msgid " Connection failed (bug?)\n"
+msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/server/gnunet-transport-check.c:320
 #, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
-msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+msgid "No reply received within %llums.\n"
+msgstr "Keine Antwort innerhalb %llums erhalten.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
-msgid "probe network to the given DEPTH"
-msgstr "Netzwerk bis zur angegebenen Tiefe DEPTH sondieren"
+#: src/server/gnunet-transport-check.c:396
+msgid "ping peers from HOSTLISTURL that match transports"
+msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
-msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
-msgstr "Gibt das Ausgabeformat an: 0 für menschen-lesbar, 1 für dot, 2 für vcg"
+#: src/server/gnunet-transport-check.c:398
+msgid "send COUNT messages"
+msgstr "COUNT Nachrichten versenden"
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
-msgid "use PRIO for the priority of the trace request"
-msgstr "PRIO als Priorität für die Trace Anfragen verwenden"
+#: src/server/gnunet-transport-check.c:400
+msgid "send messages with SIZE bytes payload"
+msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
-msgid "wait DELAY seconds for replies"
-msgstr "DELAY Sekunden auf Antworten warten"
+#: src/server/gnunet-transport-check.c:402
+msgid "specifies which TRANSPORT should be tested"
+msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
-msgstr "GNUnet Netzwerk Topologie tracen."
+#: src/server/gnunet-transport-check.c:404
+msgid "specifies after how many MS to time-out"
+msgstr "Gibt an, nach wievielen MS die Zeit abgelaufen sein soll"
 
-#: src/applications/tracekit/gnunet-tracekit.c:222
+#: src/server/gnunet-transport-check.c:414
+msgid "Tool to test if GNUnet transport services are operational."
+msgstr ""
+"Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport Dienste "
+"funktionsfähig sind."
+
+#: src/server/gnunet-transport-check.c:565
+msgid "You must specify a non-empty set of transports to test!\n"
+msgstr ""
+"Sie müssen eine Menge an Transporten angeben, die getestet werden sollen!\n"
+
+#: src/server/gnunet-transport-check.c:570
 #, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "`%s' ist zu keinem Knoten verbunden.\n"
+msgid "Testing transport(s) %s\n"
+msgstr "Teste Transport(e) %s\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:233
+#: src/server/gnunet-transport-check.c:573
 #, c-format
+msgid "Available transport(s): %s\n"
+msgstr "Verfügbare(r) Transport(e): %s\n"
+
+#: src/server/gnunet-transport-check.c:617
+#, c-format
 msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
+"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
-"Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar, 1 für dot und 2 "
-"für vcg.\n"
+"%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport nicht "
+"verfügbar).\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
+#: src/server/tcpserver.c:422
 #, c-format
-msgid "`%s' connected to `%s'.\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
+msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/server/tcpserver.c:688
 #, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+msgid ""
+"Malformed network specification in the configuration in section `%s' for "
+"entry `%s': %s\n"
 msgstr ""
-"Formatangabe ungültig. Verwenden Sie 0 für menschen-lesbar und 1 für dot\n"
+"Beschädigte Netzwerkangabe in der Konfigurationsdatei in Sektion `%s' für "
+"Eintrag `%s': %s\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
+#: src/server/tcpserver.c:798
 #, c-format
-msgid "Peer `%s' did not report back.\n"
-msgstr "Knoten `%s' hat sich nicht zurückgemeldet.\n"
+msgid "%s failed, message type %d already in use.\n"
+msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
-msgid "Could not send request to gnunetd.\n"
-msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
-
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
+#: src/server/handler.c:367
 #, c-format
-msgid "Received invalid `%s' message from `%s'.\n"
-msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+msgid "Received corrupt message from peer `%s'in %s:%d.\n"
+msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
 
-#: src/applications/tracekit/tracekit.c:243
-msgid "TRACEKIT: routing table full, trace request dropped\n"
-msgstr "TRACEKIT: Routing-Tabelle ist voll, Trace-Anfrage wird verworfen\n"
+#: src/server/gnunet-peer-info.c:95
+msgid "Print information about GNUnet peers."
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/applications/tracekit/tracekit.c:331
+#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
 #, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
-msgstr "TRACEKIT: ungültige `%s' Nachricht empfangen\n"
+msgid "Could not get address of peer `%s'.\n"
+msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/applications/tracekit/tracekit.c:431
-msgid "allows mapping of the network topology"
-msgstr "Erlaubt die Kartographierung der Netzwerktopologie"
+#: src/server/gnunet-peer-info.c:153
+msgid "hello message invalid (signature invalid).\n"
+msgstr "Hello Nachricht ist ungültig (Signatur ist ungültig).\n"
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
-msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
-
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr "Keine Antwort von gnunetd über die Netzwerkverkehrsbedingungen.\n"
-
-#: src/applications/traffic/traffic.c:445
+#: src/server/gnunet-peer-info.c:164
 #, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "# Bytes des Typs %d übertragen"
+msgid "Peer `%s' with trust %8u and address `%s'\n"
+msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/applications/traffic/traffic.c:465
+#: src/util/cron/cron.c:355
 #, c-format
-msgid "# bytes received of type %d"
-msgstr "# Bytes des Typs %d empfangen"
+msgid ""
+"`%s' called with cron job not in queue, adding.  This may not be what you "
+"want.\n"
+msgstr ""
+"`%s' aufgerufen wobei Cron Job nicht Warteschlange ist. Er wird hinzugefügt. "
+"Das ist möglicherweise nicht, was Sie wollen.\n"
 
-#: src/applications/traffic/traffic.c:605
-msgid "tracks bandwidth utilization by gnunetd"
-msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
-
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/util/crypto/hostkey_gcrypt.c:1031
 #, c-format
-msgid "No transport of type %d known.\n"
-msgstr "Kein Transport des Typs %d bekannt.\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/applications/transport/transport.c:676
+#: src/util/crypto/locking_gcrypt.c:47
 #, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
-"Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
-"gesetzt, sie wird auf %dm gesetzt.\n"
+"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/applications/transport/transport.c:691
+#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#, fuzzy, c-format
+msgid "Failed to parse interface data from `%s'.\n"
+msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
+
+#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
 #, c-format
 msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
+"No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
-"Sie sollten mindestens einen Transport Dienst unter der Option `%s' in der "
-"Sektion `%s' angegeben.\n"
+"Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion `%s' "
+"unter `%s' definiert!\n"
 
-#: src/applications/transport/transport.c:717
+#: src/util/os/semaphore.c:213
 #, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
-msgstr ""
-"Transport Bibliothek `%s' stellt nicht die benötigte Funktion '%s%s' zur "
-"Verfügung.\n"
+msgid "Can't create semaphore: %i"
+msgstr "Semaphore konnte nicht angelegt werden: %i"
 
-#: src/applications/transport/transport.c:738
+#: src/util/os/dso.c:75
 #, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Ich bin Peer `%s'.\n"
+msgid ""
+"Cannot determine plugin path, application must be installed in directory "
+"ending with `%s'.\n"
+msgstr ""
 
-#: src/conf/conf.c:522 src/conf/recreate.c:135
+#: src/util/os/dso.c:97
 #, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/conf/conf.c:529
-#, c-format
-msgid "Configuration file `%s' created.\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+#: src/util/os/dso.c:134
+#, fuzzy, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/conf/confdata.c:93
-#, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
-msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
+#: src/util/os/dso.c:176
+#, fuzzy, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr ""
+"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/conf/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
-msgstr "Sorry, für diese Option steht keine Hilfe zur Verfügung.\n"
+#: src/util/os/cpustatus.c:274
+msgid "Cannot query the CPU usage (Windows NT).\n"
+msgstr "CPU Nutzung kann nicht ermittelt werden (Windows NT).\n"
 
-#: src/conf/wizard.glade:10 src/conf/wizard.glade:259
-#: src/conf/wizard.glade:711 src/conf/wizard.glade:1436
-#: src/conf/wizard.glade:2217
-msgid "GNUnet configuration assistant"
-msgstr "GNUnet Konfigurationsassistent"
+#: src/util/os/cpustatus.c:293
+msgid "Cannot query the CPU usage (Win 9x)\n"
+msgstr "CPU Nutzung kann nicht ermittelt werden (Win 9x).\n"
 
-#: src/conf/wizard.glade:56
-#, fuzzy
+#: src/util/os/installpath.c:172
 msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org\n";
-"and join our community at\n"
-"\thttps://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"The GNUnet team"
+"Cannot determine the path to the executable, your system may be broken or "
+"not supported.\n"
 msgstr ""
-"Willkommen bei GNUnet!\n"
-"\n"
-"Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet zu "
-"konfigurieren.\n"
-"\n"
-"Bitte besuchen Sie unsere Homepage\n"
-"\thttp://gnunet.org\n";
-"und schließen Sie sich unserer Community an:\n"
-"\thttps://gnunet.org/drupal/\n";
-"\n"
-"Viel Spaß,\n"
-"\n"
-"das GNUnet-Team"
 
-#: src/conf/wizard.glade:142 src/conf/wizard.glade:594
-#: src/conf/wizard.glade:1319 src/conf/wizard.glade:2581
-msgid "Next"
-msgstr "Weiter"
-
-#: src/conf/wizard.glade:217 src/conf/wizard.glade:669
-#: src/conf/wizard.glade:1394 src/conf/wizard.glade:1928
-#: src/conf/wizard.glade:2656
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/conf/wizard.glade:318
+#: src/util/os/installpath.c:211
 msgid ""
-"Enter information about your network connection here.\n"
-"\n"
-"The \"Network interface\" is the device that connects your computer to the "
-"internet. This is usually a modem, an ISDN card or a network card in case "
-"you are using DSL.\n"
-"\n"
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your "
-"IP-Address.\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, check the last option on this page. Leave it "
-"unchecked on direct connections through modems, ISDN cards and DNAT (also "
-"known as \"port forwarding\")."
+"GNUnet executables are not in a directory named 'bin'. This may signal a "
+"broken installation.\n"
 msgstr ""
-"Geben Sie hier Ihre Netzwerkinformationen ein.\n"
-"\n"
-"Das \"Netzwerkgerät\" ist das Gerät, das Ihren Computer mit dem Internet "
-"verbindet. Dies ist normalerweise ein Modem, eine ISDN-Karte oder eine "
-"Netzwerkkarte für den Fall, dass Sie DSL benutzen.\n"
-"\n"
-"Wenn Ihnen Ihr Provider immer die gleiche IP-Adresse zuweist (eine "
-"\"statische\" IP-Adresse), geben Sie diese in das \"IP-Adresse\"-Feld ein. "
-"Wenn Ihre IP-Adresse sich hin und wieder ändert (\"dynamische\" IP-Adresse), "
-"es jedoch einen Hostnamen gibt, der immer auf Ihre aktuelle IP-Adresse zeigt "
-"(\"Dynamisches DNS\"), so können Sie ihn auch eingeben.\n"
-"Im Zweifel lassen Sie das Feld leer. GNUnet wird dann versuchen, die IP-"
-"Adresse automatisch zu bestimmen.\n"
-"\n"
-"Wenn Sie nicht direkt mit dem Internet verbunden sind, sondern dies über "
-"einen anderen Rechner mit SNAT, einem Router oder einer \"Hardware Firewall"
-"\" geschieht und andere Computer im Internet keine Verbindung mit diesem "
-"Computer herstellen können, so aktivieren Sie die letzte Option auf dieser "
-"Seite. Lassen Sie sie jedoch deaktiviert, wenn Sie eine direkte Verbindung "
-"über ein Modem, eine ISDN-Karte oder einen anderen Rechner mit DNAT (auch "
-"bekannt als \"Port forwarding\") zum Internet haben."
 
-#: src/conf/wizard.glade:372
-msgid "Network interface:"
-msgstr "Netzwerkgerät:"
+#: src/util/os/installpath.c:222
+msgid "Cannot determine the installation prefix. Unknown error.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:400
-msgid "IP-Address/Hostname:"
-msgstr "IP-Adresse/Hostname:"
+#: src/util/network/tcpio.c:100
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
 
-#: src/conf/wizard.glade:451
-msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+#: src/util/network/tcpio.c:124
+msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
-"Computer kann keine ankommenden Verbindungen akzeptieren (SNAT/Firewall)"
 
-#: src/conf/wizard.glade:514
-msgid "Network connection"
-msgstr "Netzwerkverbindung"
+#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
+#, fuzzy, c-format
+msgid "Cannot connect to %s:u: %s\n"
+msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/conf/wizard.glade:770
-msgid ""
-"You can limit GNUnet's ressource usage here.\n"
-"\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you "
-"have a flatrate you can set it to the maximum speed of your internet "
-"connection.\n"
-"\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
-"to use."
-msgstr ""
-"Hier können Sie GNUnet's Ressourcennutzung einschränken.\n"
-"\n"
-"\"Bandbreitenbeschränkung\" gibt an, wieviele Daten maximal pro Sekunde "
-"übetragen werden dürfen. Wenn Sie eine Flatrate haben, können Sie diese "
-"Werte auf die maximal erreichbare Geschwindigkeit Ihrer Internetverbindung "
-"setzen.\n"
-"\n"
-"Die \"Max. CPU Nutzung\" gibt den Prozentsatz an CPU-Zeit an, den GNUnet für "
-"sich verwenden darf."
+#: src/util/network/tcpio.c:406
+#, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
 
-#: src/conf/wizard.glade:833
-msgid "Upstream (Bytes/s):"
-msgstr "Upstream (Bytes/s):"
+#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
+#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/conf/wizard.glade:883
-msgid "Downstream (Bytes/s):"
-msgstr "Downstream (Bytes/s):"
+#: src/util/network/ipcheck.c:156
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/conf/wizard.glade:942
-msgid "Bandwidth limitation"
-msgstr "Bandbreitenbeschränkung"
+#: src/util/network/ipcheck.c:217
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/conf/wizard.glade:986
-msgid "Use denoted bandwidth for GNUnet"
-msgstr "Angegebene Bandbreite für GNUnet verwenden"
+#: src/util/network/ipcheck.c:250
+#, c-format
+msgid "Wrong format `%s' for netmask: %s\n"
+msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/conf/wizard.glade:1006
-msgid "Share denoted bandwidth with other applications"
-msgstr "Angegebene Bandbreite mit anderen Anwendungen teilen"
+#: src/util/network/ipcheck.c:265
+#, c-format
+msgid "Wrong format `%s' for network: %s\n"
+msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/conf/wizard.glade:1028
-msgid "Bandwidth sharing"
-msgstr "Aufteilung der Bandbreite"
+#: src/util/disk/storage.c:194
+#, fuzzy, c-format
+msgid "`%s' failed for drive `%s': %u\n"
+msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/conf/wizard.glade:1071
-msgid "Max. CPU usage (%):"
-msgstr "Max. CPU Nutzung (%):"
+#: src/util/disk/storage.c:240
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory\n"
+msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/conf/wizard.glade:1118
-msgid "CPU usage"
-msgstr "CPU Nutzung"
+#: src/util/disk/storage.c:279
+#, fuzzy, c-format
+msgid "Expected `%s' to be a regular file\n"
+msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/conf/wizard.glade:1164
-msgid "Load limitation"
-msgstr "Lastbeschränkung"
+#: src/util/disk/storage.c:486
+#, fuzzy, c-format
+msgid "expected `%s' to be a directory!\n"
+msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/conf/wizard.glade:1244 src/conf/wizard.glade:1778
-#: src/conf/wizard.glade:2506
-msgid "Back"
-msgstr "Zurück"
+#: src/util/config_impl/impl.c:256
+#, c-format
+msgid "Syntax error in configuration file `%s' at line %d.\n"
+msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/conf/wizard.glade:1495
+#: src/util/config_impl/impl.c:412
+#, c-format
 msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is "
-"useful if an adversary has access to your inserted content and you need to "
-"deny that the content is yours. With \"content migration\" on, the content "
-"could have \"migrated\" over the internet to your node without your "
-"knowledge.\n"
-"It also helps to spread popular content over different peers to enhance "
-"availability.\n"
-"\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, "
-"inserted and migrated content). Its maximum size can be specified below.\n"
-"\n"
-"If you are an experienced user, you may want to tweak your GNUnet "
-"installation using the enhanced configurator.\n"
-"\n"
-"After changing the configuration and/or updating GNUnet, it is sometimes "
-"required to run gnunet-update to update internal data structures. Depending "
-"on the changes made, this may take some time."
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
-"GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher zu "
-"speichern. Das ist nützlich, wenn ein Widersacher Zugriff auf Ihre "
-"eingefügten Inhalte erlangt und Sie abstreiten müssen, dass diese Daten "
-"Ihnen gehören. Mit \"Inhaltsmigration\" angeschaltet können die Inhalte über "
-"das Internet von einem anderen Knoten zu Ihrem Rechner ohne Ihr Wissen "
-"\"gewandert\" sein.\n"
-"Außerdem hilft es, beliebte Inhalte über verschiedene Netzteilnehmer zu "
-"verteilen, um so die Verfügbarkeit zu erhöhen.\n"
-"\n"
-"Der GNUnet Datenspeicher enthält alle Daten, die GNUnet erzeugt (Indexdaten, "
-"eingefügte und migrierte Inhalte). Seine maximale Größe kann unten angegeben "
-"werden.\n"
-"\n"
-"Wenn Sie ein fortgeschrittener Benutzer sind, möchten Sie vielleicht weitere "
-"Feinjustierungen an GNUnet über den \"erweiterten Konfigurator\" vornehmen.\n"
-"Nachdem die Konfiguration verändert und/oder GNUnet upgedated wurde ist es "
-"manchmal nötig, gnunet-update auszuführen, um interne Datenstrukturen zu "
-"aktualisieren. Abhängig von den gemachten Änderungen kann dies etwas Zeit in "
-"Anspruch nehmen."
 
-#: src/conf/wizard.glade:1541
-msgid "Store migrated content"
-msgstr "Migrierte Inhalte speichern"
-
-#: src/conf/wizard.glade:1566
-msgid "Maximum datastore size (MB):"
-msgstr "Maximale Größe des Datenspeichers (MB):"
-
-#: src/conf/wizard.glade:1621
-msgid "Start the GNUnet background process on computer startup"
+#: src/util/config_impl/impl.c:424
+#, c-format
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
-"GNUnet Hintergrundprozeß beim Starten des Computers automatisch starten"
 
-#: src/conf/wizard.glade:1642
-msgid "Open the enhanced configurator"
-msgstr "Erweiterten Konfigurator starten"
-
-#: src/conf/wizard.glade:1663
-msgid "Run gnunet-update"
-msgstr "gnunet-update ausführen"
-
-#: src/conf/wizard.glade:1698 src/conf/wizard.glade:2426
-msgid "Other settings"
-msgstr "Weitere Einstellungen"
-
-#: src/conf/wizard.glade:1853
-msgid "Finish"
-msgstr "Fertigstellen"
-
-#: src/conf/wizard.glade:1968
-msgid "Question"
-msgstr "Frage"
-
-#: src/conf/wizard.glade:2014
-msgid "Do you want to save your settings?"
-msgstr "Möchten Sie Ihre Einstellungen speichern?"
-
-#: src/conf/wizard.glade:2065
-msgid "Yes"
-msgstr "Ja"
-
-#: src/conf/wizard.glade:2078
-msgid "No"
-msgstr "Nein"
-
-#: src/conf/wizard.glade:2098 src/conf/wizard.glade:2696
-#: src/conf/wizard_curs.c:58 src/conf/wizard_util.c:120
-#: src/conf/wizard_util.c:163 src/util/configuration.c:522
-msgid "Error"
-msgstr "Fehler"
-
-#: src/conf/wizard.glade:2144
-msgid "Unable to save configuration!"
-msgstr "Fehler beim Speichern der Konfiguration!"
-
-#: src/conf/wizard.glade:2195 src/conf/wizard.glade:2793
-msgid "OK"
-msgstr "OK"
-
-#: src/conf/wizard.glade:2276
+#: src/util/config_impl/impl.c:494
+#, c-format
 msgid ""
-"Define the user and the group owning the GNUnet service here.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new user "
-"account and a new group under which the GNUnet service is started at system "
-"startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the fields empty to run GNUnet with system privileges."
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
-"Geben Sie den Benutzer und die Gruppe an, der der GNUnet Dienst gehören "
-"soll.\n"
-"\n"
-"Aus Sicherheitsgründen ist es eine gute Idee, dieses Setup ein neues "
-"Benutzerkonto und eine neue Gruppe anlegen zu lassen, unter der der GNUnet "
-"Dienst beim Systemstart läuft.\n"
-"\n"
-"Natürlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
-"betrifft auch Dateien, die Sie im GNUnet veröffentlichen möchten. Sie müssen "
-"dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen geben.\n"
-"\n"
-"Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
-"lassen möchten."
 
-#: src/conf/wizard.glade:2317
-msgid "Group:"
-msgstr "Gruppe:"
+#: src/util/error/error.c:138 src/util/error/error.c:182
+msgid "DEBUG"
+msgstr "DEBUG"
 
-#: src/conf/wizard.glade:2389
-msgid "User account:"
-msgstr "Benutzerkonto:"
+#: src/util/error/error.c:141 src/util/error/error.c:184
+msgid "STATUS"
+msgstr ""
 
-#: src/conf/wizard.glade:2742
-msgid "gnunet-update failed!"
-msgstr "gnunet-update schlug fehlt!"
+#: src/util/error/error.c:144 src/util/error/error.c:186
+msgid "WARNING"
+msgstr "WARNUNG"
 
-#: src/conf/wizard.glade:2813
-msgid "Gtk GNUnet Configurator"
-msgstr "Gtk GNUnet Konfigurator"
+#: src/util/error/error.c:147 src/util/error/error.c:188
+msgid "ERROR"
+msgstr "FEHLER"
 
-#: src/conf/wizard.glade:2847
-msgid "_File"
-msgstr "_Datei"
+#: src/util/error/error.c:150 src/util/error/error.c:190
+msgid "FATAL"
+msgstr "SCHWERWIEGEND"
 
-#: src/conf/wizard.glade:2856 src/conf/wizard.glade:3189
-msgid "Load a config file"
-msgstr "Eine Konfigurationsdatei laden"
+#: src/util/error/error.c:153 src/util/error/error.c:192
+msgid "USER"
+msgstr ""
 
-#: src/conf/wizard.glade:2857
-msgid "_Load"
-msgstr "_öffnen"
+#: src/util/error/error.c:156 src/util/error/error.c:194
+msgid "ADMIN"
+msgstr ""
 
-#: src/conf/wizard.glade:2879
-msgid "Save the config in .config"
-msgstr "Die Konfiguration in .config speichern"
+#: src/util/error/error.c:159 src/util/error/error.c:196
+msgid "DEVELOPER"
+msgstr ""
 
-#: src/conf/wizard.glade:2880
-msgid "_Save"
-msgstr "_Speichern"
+#: src/util/error/error.c:162 src/util/error/error.c:198
+msgid "REQUEST"
+msgstr ""
 
-#: src/conf/wizard.glade:2908
-msgid "_Quit"
-msgstr "_Beenden"
+#: src/util/error/error.c:165 src/util/error/error.c:200
+msgid "BULK"
+msgstr ""
 
-#: src/conf/wizard.glade:2934
-msgid "_Options"
-msgstr "_Optionen"
+#: src/util/error/error.c:168 src/util/error/error.c:202
+msgid "IMMEDIATE"
+msgstr ""
 
-#: src/conf/wizard.glade:2943
-msgid "Show name"
-msgstr "Name anzeigen"
+#: src/util/error/error.c:171
+msgid "ALL"
+msgstr ""
 
-#: src/conf/wizard.glade:2944
-msgid "Show _name"
-msgstr "_Name anzeigen"
+#: src/util/error/error.c:203
+msgid "NOTHING"
+msgstr "NICHTS"
 
-#: src/conf/wizard.glade:2954
-msgid "Show range (Y/M/N)"
-msgstr "Bereich anzeigen (Y/M/N)"
+#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#, fuzzy, c-format
+msgid "Invalid argument for `%s'.\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/conf/wizard.glade:2955
-msgid "Show _range"
-msgstr "_Bereich anzeigen"
+#: src/util/threads/mutex.c:136
+#, fuzzy, c-format
+msgid "Deadlock due to `%s'.\n"
+msgstr "Durch `%s' ist ein Deadlock bei %s:%d entstanden\n"
 
-#: src/conf/wizard.glade:2965
-msgid "Show value of the option"
-msgstr "Wert der Option anzeigen"
+#: src/util/threads/mutex.c:156
+#, fuzzy, c-format
+msgid "Permission denied for `%s'.\n"
+msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/conf/wizard.glade:2966
-msgid "Show _data"
-msgstr "_Daten anzeigen"
+#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
+#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
+#: src/util/threads/pthread.c:275
+#, fuzzy, c-format
+msgid "`%s' failed with error code %s: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/conf/wizard.glade:2982
-msgid "Show all options"
-msgstr "Alle Optionen anzeigen"
+#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#, fuzzy, c-format
+msgid "`%s' failed with error code %d: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/conf/wizard.glade:2983
-msgid "Show all _options"
-msgstr "Alle _Optionen anzeigen"
+#: src/util/loggers/memory.c:71
+msgid "Out of memory (for logging)"
+msgstr ""
 
-#: src/conf/wizard.glade:2997
-msgid "_Help"
-msgstr "_Hilfe"
+#: src/util/getopt/getopt.c:686
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/conf/wizard.glade:3006
-msgid "_Introduction"
-msgstr "_Einführung"
+#: src/util/getopt/getopt.c:710
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
 
-#: src/conf/wizard.glade:3028
-msgid "_About"
-msgstr "_über"
+#: src/util/getopt/getopt.c:715
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
 
-#: src/conf/wizard.glade:3083
-msgid "Goes up of one level (single view)"
-msgstr "Bewegt sich eine Ebene nach oben (einfache Ansicht)"
+#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/conf/wizard.glade:3126
-msgid "Up"
-msgstr "Oben"
+#: src/util/getopt/getopt.c:762
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/conf/wizard.glade:3232
-msgid "Load"
-msgstr "Laden"
+#: src/util/getopt/getopt.c:766
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/conf/wizard.glade:3276
-msgid "Save a config file"
-msgstr "Konfigurationsdatei speichern"
+#: src/util/getopt/getopt.c:792
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/conf/wizard.glade:3319
-msgid "Save"
-msgstr "Speichern"
+#: src/util/getopt/getopt.c:795
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ungültige Option -- %c\n"
 
-#: src/conf/wizard.glade:3382
-msgid "Single view"
-msgstr "Einfache Ansicht"
+#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/conf/wizard.glade:3425
-msgid "Single"
-msgstr "Einfach"
+#: src/util/getopt/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/conf/wizard.glade:3469
-msgid "Split view"
-msgstr "Geteilte Ansicht"
+#: src/util/getopt/getopt.c:890
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
-#: src/conf/wizard.glade:3512
-msgid "Split"
-msgstr "Geteilt"
+#: src/util/getopt/printhelp.c:49
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
+"Optionen zwingend.\n"
 
-#: src/conf/wizard.glade:3556
-msgid "Full view"
-msgstr "Volle Ansicht"
+#: src/util/string/string.c:101
+msgid "ms"
+msgstr "ms"
 
-#: src/conf/wizard.glade:3599
-msgid "Full"
-msgstr "Voll"
+#: src/util/string/string.c:106
+msgid "s"
+msgstr "s"
 
-#: src/conf/wizard.glade:3662
-msgid "Collapse the whole tree in the right frame"
-msgstr "Den gesamten Baum im rechten Frame kollabieren"
+#: src/util/string/string.c:109
+msgid "m"
+msgstr "m"
 
-#: src/conf/wizard.glade:3705
-msgid "Collapse"
-msgstr "Kollabieren"
+#: src/util/string/string.c:112
+msgid "h"
+msgstr "h"
 
-#: src/conf/wizard.glade:3749
-msgid "Expand the whole tree in the right frame"
-msgstr "Den gesamten Baum im rechten Frame expandieren"
+#: src/util/string/string.c:115
+msgid " days"
+msgstr " Tage"
 
-#: src/conf/wizard.glade:3792
-msgid "Expand"
-msgstr "Expandieren"
+#: src/util/string/string.c:133
+msgid "b"
+msgstr "b"
 
-#: src/conf/wizard.glade:3935
-msgid ""
-"This is GNUnet's configuration interface.\n"
-"\n"
-"GNUnet's options are separated into categories. You can browse them in the "
-"left tree. If you click on one of the categories, its options are shown "
-"above. \n"
-"\n"
-"To change the value of an option, simply click on its value and enter a new "
-"value. To get additional information about a specific option, click on its "
-"description."
+#: src/util/string/string.c:138
+msgid "KiB"
 msgstr ""
 
-#: src/conf/wizard.glade:3967
-#, fuzzy
-msgid "Introduction"
-msgstr "_Einführung"
-
-#: src/conf/wizard.glade:4043
-msgid ""
-"Welcome to GNUnet Setup.\n"
-"\n"
-"For each option, a blank box indicates the feature is disabled, and checked "
-"one indicates it is enabled.\n"
-"If you do not see an option that you believe should be present, try turning "
-"on Show All Options under the Options menu.\n"
-"\n"
-"Although there is no cross reference yet to help you figure out what other "
-"options must be enabled to support the option you are interested in, you can "
-"still view the help of a grayed-out option.\n"
-"\n"
-"Toggling Show Debug Info under the Options menu will show the dependencies, "
-"which you can then match by examining other options."
+#: src/util/string/string.c:141
+msgid "MiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4067
-#, fuzzy
-msgid "gnunet-setup"
-msgstr "gnunet-update ausführen"
-
-#: src/conf/wizard.glade:4068
-msgid "(C) 2001-2006 Christian Grothoff (and other contributing authors)"
+#: src/util/string/string.c:144
+msgid "GiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4069
-msgid "This is the configuration tool for GNUnet."
+#: src/util/string/string.c:147
+msgid "TiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4070
-msgid ""
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"\t\t       Version 2, June 1991\n"
-"\n"
-" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
-"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-" Everyone is permitted to copy and distribute verbatim copies\n"
-" of this license document, but changing it is not allowed.\n"
-"\n"
-"\t\t\t    Preamble\n"
-"\n"
-"  The licenses for most software are designed to take away your\n"
-"freedom to share and change it.  By contrast, the GNU General Public\n"
-"License is intended to guarantee your freedom to share and change free\n"
-"software--to make sure the software is free for all its users.  This\n"
-"General Public License applies to most of the Free Software\n"
-"Foundation's software and to any other program whose authors commit to\n"
-"using it.  (Some other Free Software Foundation software is covered by\n"
-"the GNU Library General Public License instead.)  You can apply it to\n"
-"your programs, too.\n"
-"\n"
-"  When we speak of free software, we are referring to freedom, not\n"
-"price.  Our General Public Licenses are designed to make sure that you\n"
-"have the freedom to distribute copies of free software (and charge for\n"
-"this service if you wish), that you receive source code or can get it\n"
-"if you want it, that you can change the software or use pieces of it\n"
-"in new free programs; and that you know you can do these things.\n"
-"\n"
-"  To protect your rights, we need to make restrictions that forbid\n"
-"anyone to deny you these rights or to ask you to surrender the rights.\n"
-"These restrictions translate to certain responsibilities for you if you\n"
-"distribute copies of the software, or if you modify it.\n"
-"\n"
-"  For example, if you distribute copies of such a program, whether\n"
-"gratis or for a fee, you must give the recipients all the rights that\n"
-"you have.  You must make sure that they, too, receive or can get the\n"
-"source code.  And you must show them these terms so they know their\n"
-"rights.\n"
-"\n"
-"  We protect your rights with two steps: (1) copyright the software, and\n"
-"(2) offer you this license which gives you legal permission to copy,\n"
-"distribute and/or modify the software.\n"
-"\n"
-"  Also, for each author's protection and ours, we want to make certain\n"
-"that everyone understands that there is no warranty for this free\n"
-"software.  If the software is modified by someone else and passed on, we\n"
-"want its recipients to know that what they have is not the original, so\n"
-"that any problems introduced by others will not reflect on the original\n"
-"authors' reputations.\n"
-"\n"
-"  Finally, any free program is threatened constantly by software\n"
-"patents.  We wish to avoid the danger that redistributors of a free\n"
-"program will individually obtain patent licenses, in effect making the\n"
-"program proprietary.  To prevent this, we have made it clear that any\n"
-"patent must be licensed for everyone's free use or not licensed at all.\n"
-"\n"
-"  The precise terms and conditions for copying, distribution and\n"
-"modification follow.\n"
-"\n"
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
-"\n"
-"  0. This License applies to any program or other work which contains\n"
-"a notice placed by the copyright holder saying it may be distributed\n"
-"under the terms of this General Public License.  The \"Program\", below,\n"
-"refers to any such program or work, and a \"work based on the Program\"\n"
-"means either the Program or any derivative work under copyright law:\n"
-"that is to say, a work containing the Program or a portion of it,\n"
-"either verbatim or with modifications and/or translated into another\n"
-"language.  (Hereinafter, translation is included without limitation in\n"
-"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
-"\n"
-"Activities other than copying, distribution and modification are not\n"
-"covered by this License; they are outside its scope.  The act of\n"
-"running the Program is not restricted, and the output from the Program\n"
-"is covered only if its contents constitute a work based on the\n"
-"Program (independent of having been made by running the Program).\n"
-"Whether that is true depends on what the Program does.\n"
-"\n"
-"  1. You may copy and distribute verbatim copies of the Program's\n"
-"source code as you receive it, in any medium, provided that you\n"
-"conspicuously and appropriately publish on each copy an appropriate\n"
-"copyright notice and disclaimer of warranty; keep intact all the\n"
-"notices that refer to this License and to the absence of any warranty;\n"
-"and give any other recipients of the Program a copy of this License\n"
-"along with the Program.\n"
-"\n"
-"You may charge a fee for the physical act of transferring a copy, and\n"
-"you may at your option offer warranty protection in exchange for a fee.\n"
-"\n"
-"  2. You may modify your copy or copies of the Program or any portion\n"
-"of it, thus forming a work based on the Program, and copy and\n"
-"distribute such modifications or work under the terms of Section 1\n"
-"above, provided that you also meet all of these conditions:\n"
-"\n"
-"    a) You must cause the modified files to carry prominent notices\n"
-"    stating that you changed the files and the date of any change.\n"
-"\n"
-"    b) You must cause any work that you distribute or publish, that in\n"
-"    whole or in part contains or is derived from the Program or any\n"
-"    part thereof, to be licensed as a whole at no charge to all third\n"
-"    parties under the terms of this License.\n"
-"\n"
-"    c) If the modified program normally reads commands interactively\n"
-"    when run, you must cause it, when started running for such\n"
-"    interactive use in the most ordinary way, to print or display an\n"
-"    announcement including an appropriate copyright notice and a\n"
-"    notice that there is no warranty (or else, saying that you provide\n"
-"    a warranty) and that users may redistribute the program under\n"
-"    these conditions, and telling the user how to view a copy of this\n"
-"    License.  (Exception: if the Program itself is interactive but\n"
-"    does not normally print such an announcement, your work based on\n"
-"    the Program is not required to print an announcement.)\n"
-"\n"
-"These requirements apply to the modified work as a whole.  If\n"
-"identifiable sections of that work are not derived from the Program,\n"
-"and can be reasonably considered independent and separate works in\n"
-"themselves, then this License, and its terms, do not apply to those\n"
-"sections when you distribute them as separate works.  But when you\n"
-"distribute the same sections as part of a whole which is a work based\n"
-"on the Program, the distribution of the whole must be on the terms of\n"
-"this License, whose permissions for other licensees extend to the\n"
-"entire whole, and thus to each and every part regardless of who wrote it.\n"
-"\n"
-"Thus, it is not the intent of this section to claim rights or contest\n"
-"your rights to work written entirely by you; rather, the intent is to\n"
-"exercise the right to control the distribution of derivative or\n"
-"collective works based on the Program.\n"
-"\n"
-"In addition, mere aggregation of another work not based on the Program\n"
-"with the Program (or with a work based on the Program) on a volume of\n"
-"a storage or distribution medium does not bring the other work under\n"
-"the scope of this License.\n"
-"\n"
-"  3. You may copy and distribute the Program (or a work based on it,\n"
-"under Section 2) in object code or executable form under the terms of\n"
-"Sections 1 and 2 above provided that you also do one of the following:\n"
-"\n"
-"    a) Accompany it with the complete corresponding machine-readable\n"
-"    source code, which must be distributed under the terms of Sections\n"
-"    1 and 2 above on a medium customarily used for software interchange; "
-"or,\n"
-"\n"
-"    b) Accompany it with a written offer, valid for at least three\n"
-"    years, to give any third party, for a charge no more than your\n"
-"    cost of physically performing source distribution, a complete\n"
-"    machine-readable copy of the corresponding source code, to be\n"
-"    distributed under the terms of Sections 1 and 2 above on a medium\n"
-"    customarily used for software interchange; or,\n"
-"\n"
-"    c) Accompany it with the information you received as to the offer\n"
-"    to distribute corresponding source code.  (This alternative is\n"
-"    allowed only for noncommercial distribution and only if you\n"
-"    received the program in object code or executable form with such\n"
-"    an offer, in accord with Subsection b above.)\n"
-"\n"
-"The source code for a work means the preferred form of the work for\n"
-"making modifications to it.  For an executable work, complete source\n"
-"code means all the source code for all modules it contains, plus any\n"
-"associated interface definition files, plus the scripts used to\n"
-"control compilation and installation of the executable.  However, as a\n"
-"special exception, the source code distributed need not include\n"
-"anything that is normally distributed (in either source or binary\n"
-"form) with the major components (compiler, kernel, and so on) of the\n"
-"operating system on which the executable runs, unless that component\n"
-"itself accompanies the executable.\n"
-"\n"
-"If distribution of executable or object code is made by offering\n"
-"access to copy from a designated place, then offering equivalent\n"
-"access to copy the source code from the same place counts as\n"
-"distribution of the source code, even though third parties are not\n"
-"compelled to copy the source along with the object code.\n"
-"\n"
-"  4. You may not copy, modify, sublicense, or distribute the Program\n"
-"except as expressly provided under this License.  Any attempt\n"
-"otherwise to copy, modify, sublicense or distribute the Program is\n"
-"void, and will automatically terminate your rights under this License.\n"
-"However, parties who have received copies, or rights, from you under\n"
-"this License will not have their licenses terminated so long as such\n"
-"parties remain in full compliance.\n"
-"\n"
-"  5. You are not required to accept this License, since you have not\n"
-"signed it.  However, nothing else grants you permission to modify or\n"
-"distribute the Program or its derivative works.  These actions are\n"
-"prohibited by law if you do not accept this License.  Therefore, by\n"
-"modifying or distributing the Program (or any work based on the\n"
-"Program), you indicate your acceptance of this License to do so, and\n"
-"all its terms and conditions for copying, distributing or modifying\n"
-"the Program or works based on it.\n"
-"\n"
-"  6. Each time you redistribute the Program (or any work based on the\n"
-"Program), the recipient automatically receives a license from the\n"
-"original licensor to copy, distribute or modify the Program subject to\n"
-"these terms and conditions.  You may not impose any further\n"
-"restrictions on the recipients' exercise of the rights granted herein.\n"
-"You are not responsible for enforcing compliance by third parties to\n"
-"this License.\n"
-"\n"
-"  7. If, as a consequence of a court judgment or allegation of patent\n"
-"infringement or for any other reason (not limited to patent issues),\n"
-"conditions are imposed on you (whether by court order, agreement or\n"
-"otherwise) that contradict the conditions of this License, they do not\n"
-"excuse you from the conditions of this License.  If you cannot\n"
-"distribute so as to satisfy simultaneously your obligations under this\n"
-"License and any other pertinent obligations, then as a consequence you\n"
-"may not distribute the Program at all.  For example, if a patent\n"
-"license would not permit royalty-free redistribution of the Program by\n"
-"all those who receive copies directly or indirectly through you, then\n"
-"the only way you could satisfy both it and this License would be to\n"
-"refrain entirely from distribution of the Program.\n"
-"\n"
-"If any portion of this section is held invalid or unenforceable under\n"
-"any particular circumstance, the balance of the section is intended to\n"
-"apply and the section as a whole is intended to apply in other\n"
-"circumstances.\n"
-"\n"
-"It is not the purpose of this section to induce you to infringe any\n"
-"patents or other property right claims or to contest validity of any\n"
-"such claims; this section has the sole purpose of protecting the\n"
-"integrity of the free software distribution system, which is\n"
-"implemented by public license practices.  Many people have made\n"
-"generous contributions to the wide range of software distributed\n"
-"through that system in reliance on consistent application of that\n"
-"system; it is up to the author/donor to decide if he or she is willing\n"
-"to distribute software through any other system and a licensee cannot\n"
-"impose that choice.\n"
-"\n"
-"This section is intended to make thoroughly clear what is believed to\n"
-"be a consequence of the rest of this License.\n"
-"\n"
-"  8. If the distribution and/or use of the Program is restricted in\n"
-"certain countries either by patents or by copyrighted interfaces, the\n"
-"original copyright holder who places the Program under this License\n"
-"may add an explicit geographical distribution limitation excluding\n"
-"those countries, so that distribution is permitted only in or among\n"
-"countries not thus excluded.  In such case, this License incorporates\n"
-"the limitation as if written in the body of this License.\n"
-"\n"
-"  9. The Free Software Foundation may publish revised and/or new versions\n"
-"of the General Public License from time to time.  Such new versions will\n"
-"be similar in spirit to the present version, but may differ in detail to\n"
-"address new problems or concerns.\n"
-"\n"
-"Each version is given a distinguishing version number.  If the Program\n"
-"specifies a version number of this License which applies to it and \"any\n"
-"later version\", you have the option of following the terms and conditions\n"
-"either of that version or of any later version published by the Free\n"
-"Software Foundation.  If the Program does not specify a version number of\n"
-"this License, you may choose any version ever published by the Free "
-"Software\n"
-"Foundation.\n"
-"\n"
-"  10. If you wish to incorporate parts of the Program into other free\n"
-"programs whose distribution conditions are different, write to the author\n"
-"to ask for permission.  For software which is copyrighted by the Free\n"
-"Software Foundation, write to the Free Software Foundation; we sometimes\n"
-"make exceptions for this.  Our decision will be guided by the two goals\n"
-"of preserving the free status of all derivatives of our free software and\n"
-"of promoting the sharing and reuse of software generally.\n"
-"\n"
-"\t\t\t    NO WARRANTY\n"
-"\n"
-"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
-"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
-"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
-"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
-"EXPRESSED\n"
-"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
-"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
-"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
-"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
-"REPAIR OR CORRECTION.\n"
-"\n"
-"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
-"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
-"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
-"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
-"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
-"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
-"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
-"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
-"POSSIBILITY OF SUCH DAMAGES.\n"
-"\n"
-"\t\t     END OF TERMS AND CONDITIONS\n"
-"\n"
-"\t    How to Apply These Terms to Your New Programs\n"
-"\n"
-"  If you develop a new program, and you want it to be of the greatest\n"
-"possible use to the public, the best way to achieve this is to make it\n"
-"free software which everyone can redistribute and change under these terms.\n"
-"\n"
-"  To do so, attach the following notices to the program.  It is safest\n"
-"to attach them to the start of each source file to most effectively\n"
-"convey the exclusion of warranty; and each file should have at least\n"
-"the \"copyright\" line and a pointer to where the full notice is found.\n"
-"\n"
-"    <one line to give the program's name and a brief idea of what it does.>\n"
-"    Copyright (C) <year>  <name of author>\n"
-"\n"
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License as published by\n"
-"    the Free Software Foundation; either version 2 of the License, or\n"
-"    (at your option) any later version.\n"
-"\n"
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-"\n"
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
-"USA\n"
-"\n"
-"\n"
-"Also add information on how to contact you by electronic and paper mail.\n"
-"\n"
-"If the program is interactive, make it output a short notice like this\n"
-"when it starts in an interactive mode:\n"
-"\n"
-"    Gnomovision version 69, Copyright (C) year  name of author\n"
-"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
-"w'.\n"
-"    This is free software, and you are welcome to redistribute it\n"
-"    under certain conditions; type `show c' for details.\n"
-"\n"
-"The hypothetical commands `show w' and `show c' should show the appropriate\n"
-"parts of the General Public License.  Of course, the commands you use may\n"
-"be called something other than `show w' and `show c'; they could even be\n"
-"mouse-clicks or menu items--whatever suits your program.\n"
-"\n"
-"You should also get your employer (if you work as a programmer) or your\n"
-"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
-"necessary.  Here is a sample; alter the names:\n"
-"\n"
-"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
-"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
-"\n"
-"  <signature of Ty Coon>, 1 April 1989\n"
-"  Ty Coon, President of Vice\n"
-"\n"
-"This General Public License does not permit incorporating your program into\n"
-"proprietary programs.  If your program is a subroutine library, you may\n"
-"consider it more useful to permit linking proprietary applications with the\n"
-"library.  If this is what you want to do, use the GNU Library General\n"
-"Public License instead of this License.\n"
+#: src/util/string/string.c:267
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/conf/wizard.glade:4458
-msgid "Not for English ;-)"
-msgstr "Nils Durner and Christian Grothoff"
-
-#: src/conf/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:82
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr "Generiere Konfiguration für gnunetd, den GNUnet Daemon"
 
-#: src/conf/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:90
 msgid "Tool to setup GNUnet."
 msgstr "Werkzeug für die Einrichtung von GNUnet."
 
-#: src/conf/gnunet-setup.c:91
+#: src/setup/gnunet-setup.c:91
 #, c-format
 msgid "Available MODEs:\n"
 msgstr "Verfügbare MODEs:\n"
 
-#: src/conf/gnunet-setup.c:92
+#: src/setup/gnunet-setup.c:92
 #, c-format
 msgid " config\t\ttext-based configuration\n"
 msgstr " config\t\ttext-basierte Konfiguration\n"
 
-#: src/conf/gnunet-setup.c:94
+#: src/setup/gnunet-setup.c:94
 #, c-format
 msgid " menuconfig\ttext-based menu\n"
 msgstr "menuconfig\ttext-basiertes Menü\n"
 
-#: src/conf/gnunet-setup.c:96
+#: src/setup/gnunet-setup.c:96
 #, c-format
 msgid " wizard-curses\tBasic text-based graphical configuration\n"
 msgstr " wizard-curses\tEinfache text-basierte grafische Konfiguration\n"
 
-#: src/conf/gnunet-setup.c:99
+#: src/setup/gnunet-setup.c:99
 #, c-format
 msgid " gconfig\tGTK configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/conf/gnunet-setup.c:100
+#: src/setup/gnunet-setup.c:100
 #, c-format
 msgid ""
 " wizard-gtk\tBasic GTK configuration\n"
@@ -3304,30 +3799,24 @@
 " wizard-gtk\tEinfache GTK Konfiguration\n"
 "\n"
 
-#: src/conf/gnunet-setup.c:167
+#: src/setup/gnunet-setup.c:167
 #, c-format
 msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
 msgstr ""
 "gnunet-setup benötigt Schreibberechtigungen für die Konfigurationsdatei `%"
 "s'\n"
 
-#: src/conf/gnunet-setup.c:176 src/server/gnunet-peer-info.c:113
-#: src/server/gnunet-transport-check.c:527 src/server/gnunet-update.c:152
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Ungültige Parameter: "
-
-#: src/conf/gnunet-setup.c:224
+#: src/setup/gnunet-setup.c:224
 msgid "No interface specified, using default\n"
 msgstr "Keine Oberfläche angegeben, verwende Standard\n"
 
-#: src/conf/gnunet-setup.c:237 src/conf/gnunet-setup.c:251
-#: src/conf/gnunet-setup.c:270 src/conf/gnunet-setup.c:281
+#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
+#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
 #, c-format
 msgid "`%s' is not available."
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/conf/gnunet-setup.c:264 src/conf/gnunet-setup.c:275
+#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
 #, c-format
 msgid ""
 "Can only run wizard to configure gnunetd.\n"
@@ -3336,76 +3825,91 @@
 "Der Assistent kann nur zur Einrichtung von gnunetd gestartet werden.\n"
 "Haben Sie die `%s'-Option vergessen?\n"
 
-#: src/conf/gnunet-setup.c:285
+#: src/setup/gnunet-setup.c:285
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/conf/gnunet-win-tool.c:109
+#: src/setup/wizard_gtk.c:429
 #, c-format
+msgid "Unable to save configuration file `%s':"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
+msgid "Unable to create user account:"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
+
+#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
+msgid "Unable to change startup process:"
+msgstr "Startprozeß konnte nicht geändert werden:"
+
+#: src/setup/gnunet-win-tool.c:109
+#, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
 
-#: src/conf/gnunet-win-tool.c:112 src/conf/gnunet-win-tool.c:139
+#: src/setup/gnunet-win-tool.c:112 src/setup/gnunet-win-tool.c:139
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr "Diese Version von Windows unterstützt keine Dienste.\n"
 
-#: src/conf/gnunet-win-tool.c:116 src/conf/gnunet-win-tool.c:143
+#: src/setup/gnunet-win-tool.c:116 src/setup/gnunet-win-tool.c:143
 #, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr "Fehler: der Dienstemanager konnte nicht geöffnet werden: %s\n"
 
-#: src/conf/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:121
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr "Fehler: Dienst konnte nicht angelegt werden: %s\n"
 
-#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:155
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Unbekannter Fehler.\n"
 
-#: src/conf/gnunet-win-tool.c:136
+#: src/setup/gnunet-win-tool.c:136
 #, c-format
 msgid "Service deleted.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/conf/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:148
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr "Fehler: auf den Dienst konnte nicht zugegriffen werden: %s\n"
 
-#: src/conf/gnunet-win-tool.c:152
+#: src/setup/gnunet-win-tool.c:152
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr "Fehler: Dienst konnte nicht gelöscht werden: %s\n"
 
-#: src/conf/wizard_gtk.c:429
+#: src/setup/conf.c:522 src/setup/recreate.c:135
 #, c-format
-msgid "Unable to save configuration file `%s':"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+msgid "Unable to save configuration file `%s': %s.\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/conf/wizard_gtk.c:475 src/conf/wizard_curs.c:616
-msgid "Unable to create user account:"
-msgstr "Fehler beim Anlegen des Benutzerkontos:"
+#: src/setup/conf.c:529
+#, c-format
+msgid "Configuration file `%s' created.\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/conf/wizard_gtk.c:482 src/conf/wizard_curs.c:619
-msgid "Unable to change startup process:"
-msgstr "Startprozeß konnte nicht geändert werden:"
+#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
+#: src/setup/wizard_util.c:193
+msgid "Error"
+msgstr "Fehler"
 
-#: src/conf/wizard_curs.c:116 src/conf/wizard_curs.c:131
-#: src/conf/wizard_curs.c:184 src/conf/wizard_curs.c:221
-#: src/conf/wizard_curs.c:251 src/conf/wizard_curs.c:277
-#: src/conf/wizard_curs.c:310 src/conf/wizard_curs.c:337
-#: src/conf/wizard_curs.c:369 src/conf/wizard_curs.c:394
-#: src/conf/wizard_curs.c:423 src/conf/wizard_curs.c:446
-#: src/conf/wizard_curs.c:501 src/conf/wizard_curs.c:563
-#: src/conf/wizard_curs.c:594 src/conf/wizard_curs.c:638
+#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
+#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
+#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
+#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
+#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
+#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
+#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
+#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
 msgid "GNUnet configuration"
 msgstr "GNUnet Konfiguration"
 
-#: src/conf/wizard_curs.c:117
+#: src/setup/wizard_curs.c:117
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3435,7 +3939,7 @@
 "\n"
 "das GNUnet-Team"
 
-#: src/conf/wizard_curs.c:132
+#: src/setup/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
@@ -3443,13 +3947,13 @@
 "Wählen Sie das Netzwerkgerät, das Ihren Computer mit dem Internet verbindet, "
 "aus unten stehender Liste."
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:191
-#: src/conf/wizard_curs.c:228 src/conf/wizard_curs.c:283
-#: src/conf/wizard_curs.c:315 src/conf/wizard_curs.c:375
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
+#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
+#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:192
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
@@ -3459,7 +3963,7 @@
 "verbindet. Dies ist üblicherweise ein Modem, eine ISDN-Karte oder eine "
 "Netzwerkkarte falls Sie DSL nutzen."
 
-#: src/conf/wizard_curs.c:185
+#: src/setup/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
@@ -3467,7 +3971,7 @@
 "Was ist der Name des Netzwerkgerätes, das Ihren Computer mit dem Internet "
 "verbindet?"
 
-#: src/conf/wizard_curs.c:222
+#: src/setup/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
@@ -3477,7 +3981,7 @@
 "Computers?\n"
 "Wenn Sie nicht sicher sind, lassen Sie dieses Feld leer."
 
-#: src/conf/wizard_curs.c:229
+#: src/setup/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3495,7 +3999,7 @@
 "Wenn Sie nicht sicher sind, so können Sie das Feld leer lassen. GNUnet wird "
 "dann versuchen, Ihre IP-Adresse automatisch zu bestimmen."
 
-#: src/conf/wizard_curs.c:252
+#: src/setup/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3513,11 +4017,11 @@
 "hier \"Ja\". Antworten Sie \"Nein\" bei direkten Verbindungen über Modem, "
 "ISDN-Karten und DNAT (auch bekannt als \"Port forwarding\")."
 
-#: src/conf/wizard_curs.c:278
+#: src/setup/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr "Wieviel Upstream (Bytes/s) darf verwendet werden?"
 
-#: src/conf/wizard_curs.c:283
+#: src/setup/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3535,11 +4039,11 @@
 "festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
 "Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/conf/wizard_curs.c:310
+#: src/setup/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr "Wieviel Downstream (Bytes/s) darf verwendet werden?"
 
-#: src/conf/wizard_curs.c:316
+#: src/setup/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3557,7 +4061,7 @@
 "festlegen. Wenn Sie eine Flatrate haben, können Sie die maximale "
 "Geschwindigkeit Ihrer Internetverbindung angeben."
 
-#: src/conf/wizard_curs.c:338
+#: src/setup/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -3580,11 +4084,11 @@
 "Netzwerkverkehr über die Internetverbindung einschränken, wann immer Ihre "
 "Hochgeschwindigkeits-LAN-Verbindung verwendet wird (z.B. durch NFS)."
 
-#: src/conf/wizard_curs.c:370
+#: src/setup/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr "Wieviel CPU (in %) darf verwendet werden?"
 
-#: src/conf/wizard_curs.c:376
+#: src/setup/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3594,7 +4098,7 @@
 "\n"
 "Dies ist der Prozentsatz an Prozessorzeit, den GNUnet verwenden darf."
 
-#: src/conf/wizard_curs.c:395
+#: src/setup/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -3616,7 +4120,7 @@
 "Außerdem hilft es, beliebte Inhalte über verschiedene Netzteilnehmer zu "
 "verteilen, um so die Verfügbarkeit zu erhöhen."
 
-#: src/conf/wizard_curs.c:424
+#: src/setup/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -3627,7 +4131,7 @@
 "Der GNUnet Datenspeicher enthält alle Daten, die GNUnet erzeugt (Indexdaten, "
 "eingefügte und migrierte Inhalte)."
 
-#: src/conf/wizard_curs.c:447
+#: src/setup/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -3642,7 +4146,7 @@
 "\"Nein\" sagen, so müssen Sie GNUnet jedesmal selbst starten, wenn Sie es "
 "verwenden möchten."
 
-#: src/conf/wizard_curs.c:502
+#: src/setup/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -3672,7 +4176,7 @@
 "\n"
 "GNUnet Benutzer:"
 
-#: src/conf/wizard_curs.c:564
+#: src/setup/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -3698,7 +4202,7 @@
 "\n"
 "GNUnet Gruppe:"
 
-#: src/conf/wizard_curs.c:595
+#: src/setup/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -3710,7 +4214,7 @@
 "\n"
 "Möchten Sie ihn starten, nachdem Ihre Konfiguration gespeichert wurde?"
 
-#: src/conf/wizard_curs.c:632
+#: src/setup/wizard_curs.c:632
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -3721,1194 +4225,588 @@
 "\n"
 "Soll es nochmals versucht werden?"
 
-#: src/conf/wizard_util.c:89
+#: src/setup/confdata.c:93
+#, c-format
+msgid "%s: symbol value `%s' invalid for %s\n"
+msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
+
+#: src/setup/wizard_util.c:119
 msgid "Can't open Service Control Manager"
 msgstr "Der Dienstemanager konnte nicht geöffnet werden"
 
-#: src/conf/wizard_util.c:94
+#: src/setup/wizard_util.c:124
 msgid "Can't create service"
 msgstr "Der Dienst konnte nicht angelegt werden"
 
-#: src/conf/wizard_util.c:99
+#: src/setup/wizard_util.c:129
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr "Fehler beim Ändern der Berechtigungen des GNUnet Verzeichnisses"
 
-#: src/conf/wizard_util.c:104
+#: src/setup/wizard_util.c:134
 msgid "Cannot write to the regisitry"
 msgstr "Konnte nicht in die Registry schreiben"
 
-#: src/conf/wizard_util.c:107
+#: src/setup/wizard_util.c:137
 msgid "Can't access the service"
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/conf/wizard_util.c:111
+#: src/setup/wizard_util.c:141
 msgid "Can't delete the service"
 msgstr "Dienst konnte nicht gelöscht werden"
 
-#: src/conf/wizard_util.c:115
+#: src/setup/wizard_util.c:145
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/conf/wizard_util.c:146
+#: src/setup/wizard_util.c:176
 msgid "This version of Windows does not support multiple users."
 msgstr "Diese Version von Windows ist nicht Mehrbenutzerfähig."
 
-#: src/conf/wizard_util.c:150
+#: src/setup/wizard_util.c:180
 msgid "Error creating user"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/conf/wizard_util.c:153
+#: src/setup/wizard_util.c:183
 msgid "Error accessing local security policy"
 msgstr "Fehler beim Zugriff auf die lokale Sicherheitsrichtlinie"
 
-#: src/conf/wizard_util.c:156
+#: src/setup/wizard_util.c:186
 msgid "Error granting service right to user"
 msgstr "Fehler beim Zuweisen des Dienstrechtes dem Benutzer"
 
-#: src/conf/wizard_util.c:159
+#: src/setup/wizard_util.c:189
 msgid "Unknown error while creating a new user"
 msgstr "Unbekannter Fehler beim Anlegen des neuen Benutzers"
 
-#: src/server/connection.c:979
-#, c-format
-msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
-msgstr "`%s' wählte %d von %d Nachrichten aus (MTU: %d).\n"
+#: src/setup/gconf.c:73
+msgid "Sorry, no help is available for this option.\n"
+msgstr "Sorry, für diese Option steht keine Hilfe zur Verfügung.\n"
 
-#: src/server/connection.c:986
-#, c-format
-msgid "Message details: %u: length %d, priority: %d\n"
-msgstr "Nachrichten Details: %u: Länge %d, Priorität: %d\n"
+#: src/setup/glade_support.c:75
+#, fuzzy, c-format
+msgid "Failed to find handler for `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/server/connection.c:2243
-#, c-format
-msgid "Message from `%s' discarded: invalid format.\n"
-msgstr "Nachricht von `%s' verworfen: ungültiges Format.\n"
+#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
+#, fuzzy, c-format
+msgid "Failed to open `%s'.\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/server/connection.c:2309
-#, c-format
-msgid "Invalid sequence number %u <= %u, dropping message.\n"
-msgstr "Ungültige Sequenznummer %u <= %u, Nachricht wird verworfen.\n"
+#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
+#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/server/connection.c:2324
-msgid "Message received more than one day old. Dropped.\n"
-msgstr ""
-"Empfangene Nachricht ist mehr als ein Tag alt. Nachricht wird verworfen.\n"
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
+#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/server/connection.c:2690
-msgid "# outgoing messages dropped"
-msgstr "# ausgehender Nachrichten verworfen"
-
-#: src/server/connection.c:2692
-msgid "# bytes of outgoing messages dropped"
-msgstr "# Bytes ausgehender Nachrichten verworfen"
-
-#: src/server/connection.c:2694
-msgid "# connections closed (HANGUP sent)"
-msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
-
-#: src/server/connection.c:2695
-msgid "# bytes encrypted"
-msgstr "# Bytes verschlüsselt"
-
-#: src/server/connection.c:2696
-msgid "# bytes decrypted"
-msgstr "# Bytes entschlüsselt"
-
-#: src/server/connection.c:2697
-msgid "# bytes noise sent"
-msgstr "# Bytes Rauschen gesendet"
-
-#: src/server/core.c:114
-#, c-format
-msgid "Application module `%s' already initialized!\n"
-msgstr "Anwendungsmodul `%s' ist bereits initialisiert!\n"
-
-#: src/server/core.c:167
-#, c-format
-msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
-msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
-
-#: src/server/core.c:214
-#, c-format
-msgid "Could not shutdown `%s': application not loaded\n"
-msgstr "`%s' kann nicht heruntergefahren werden: Anwendung ist nicht geladen\n"
-
-#: src/server/core.c:221
-#, c-format
-msgid "Could not shutdown application `%s': not initialized\n"
-msgstr ""
-"Anwendung `%s' kann nicht heruntergefahren werden: sie ist nicht "
-"initialisiert\n"
-
-#: src/server/core.c:230 src/server/core.c:419
-#, c-format
-msgid "Could not find '%s%s' method in library `%s'.\n"
-msgstr "Methode '%s%s' kann in Bibliothek `%s' nicht gefunden werden.\n"
-
-#: src/server/core.c:397
-#, c-format
-msgid "Could not release %p: service not loaded\n"
-msgstr "%p kann nicht freigegeben werden: Dienst ist nicht geladen\n"
-
-#: src/server/core.c:475 src/server/gnunet-update.c:232
-msgid "No applications defined in configuration!\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
-
-#: src/server/core.c:498
-#, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/server/core.c:515
-#, c-format
-msgid "Could not properly shutdown application `%s'.\n"
-msgstr "Anwendung `%s' konnte nicht ordentlich heruntergefahren werden.\n"
-
-#: src/server/core.c:574
-msgid "FATAL: Identity plugin not found!\n"
-msgstr "SCHWERWIEGEND: Identity Plugin wurde nicht gefunden!\n"
-
-#: src/server/core.c:632
-#, c-format
-msgid "Could not properly unload service `%s'!\n"
-msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
-
-#: src/server/gnunet-peer-info.c:95
-msgid "Print information about GNUnet peers."
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
-#, c-format
-msgid "Could not get address of peer `%s'.\n"
-msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
-
-#: src/server/gnunet-peer-info.c:153
-msgid "hello message invalid (signature invalid).\n"
-msgstr "Hello Nachricht ist ungültig (Signatur ist ungültig).\n"
-
-#: src/server/gnunet-peer-info.c:164
-#, c-format
-msgid "Peer `%s' with trust %8u and address `%s'\n"
-msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
-
-#: src/server/gnunet-transport-check.c:109
-#, c-format
-msgid "`%s': Could not create hello.\n"
-msgstr "`%s': Hello konnte nicht erzeugt werden.\n"
-
-#: src/server/gnunet-transport-check.c:118
-#, c-format
-msgid "`%s': Could not connect.\n"
-msgstr "`%s': Verbindung konnte nicht hergestellt werden.\n"
-
-#: src/server/gnunet-transport-check.c:148
-#, c-format
-msgid "`%s': Could not send.\n"
-msgstr "`%s': Kann nicht senden.\n"
-
-#: src/server/gnunet-transport-check.c:168
-#, c-format
-msgid "`%s': Did not receive message within %llu ms.\n"
-msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
-
-#: src/server/gnunet-transport-check.c:182
-#, c-format
-msgid "`%s': Could not disconnect.\n"
-msgstr "`%s': Verbindung konnte nicht getrennt werden.\n"
-
-#: src/server/gnunet-transport-check.c:189
-#, c-format
-msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
-msgstr ""
-"`%s' Transport funktioniert. Es dauerte %ums, um %d Nachrichten zu je %d "
-"Bytes zu übertragen.\n"
-
-#: src/server/gnunet-transport-check.c:219
+#: src/include/gnunet_util_error.h:207
 #, fuzzy, c-format
-msgid " Transport %d is not being tested\n"
-msgstr " Transport %d ist nicht verfügbar\n"
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
-#: src/server/gnunet-transport-check.c:230
-#, c-format
-msgid ""
-"\n"
-"Contacting `%s'."
-msgstr ""
-"\n"
-"Kontaktiere `%s'."
+#: src/include/gnunet_util_getopt.h:145
+msgid "print this help"
+msgstr "Gibt diese Hilfe aus"
 
-#: src/server/gnunet-transport-check.c:253
-#, c-format
-msgid " Connection failed\n"
-msgstr " Verbindung fehlgeschlagen\n"
+#: src/include/gnunet_util_getopt.h:154
+msgid "print the version number"
+msgstr "Versionsnummer ausgeben"
 
-#: src/server/gnunet-transport-check.c:259
-#, c-format
-msgid " Connection failed (bug?)\n"
-msgstr " Verbindung fehlgeschlagen (Bug?)\n"
-
-#: src/server/gnunet-transport-check.c:320
-#, c-format
-msgid "No reply received within %llums.\n"
-msgstr "Keine Antwort innerhalb %llums erhalten.\n"
-
-#: src/server/gnunet-transport-check.c:396
-msgid "ping peers from HOSTLISTURL that match transports"
-msgstr "Knoten aus HOSTLISTURL anpingen, deren Transports passen"
-
-#: src/server/gnunet-transport-check.c:398
-msgid "send COUNT messages"
-msgstr "COUNT Nachrichten versenden"
-
-#: src/server/gnunet-transport-check.c:400
-msgid "send messages with SIZE bytes payload"
-msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
-
-#: src/server/gnunet-transport-check.c:402
-msgid "specifies which TRANSPORT should be tested"
-msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
-
-#: src/server/gnunet-transport-check.c:404
-msgid "specifies after how many MS to time-out"
-msgstr "Gibt an, nach wievielen MS die Zeit abgelaufen sein soll"
-
-#: src/server/gnunet-transport-check.c:407 src/server/gnunet-update.c:55
-#: src/server/startup.c:450
-msgid "run as user LOGIN"
-msgstr "als Benutzer LOGIN ausführen"
-
-#: src/server/gnunet-transport-check.c:414
-msgid "Tool to test if GNUnet transport services are operational."
+#: src/include/gnunet_util_getopt.h:160
+msgid "configure logging to use LOGRULES"
 msgstr ""
-"Werkzeug, mit dem getestet werden kann, ob die GNUnet Transport Dienste "
-"funktionsfähig sind."
 
-#: src/server/gnunet-transport-check.c:565
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr ""
-"Sie müssen eine Menge an Transporten angeben, die getestet werden sollen!\n"
+#: src/include/gnunet_util_getopt.h:166
+msgid "be verbose"
+msgstr "umfangreiche Meldungen ausgeben"
 
-#: src/server/gnunet-transport-check.c:570
-#, c-format
-msgid "Testing transport(s) %s\n"
-msgstr "Teste Transport(e) %s\n"
+#: src/include/gnunet_util_getopt.h:172
+msgid "use configuration file FILENAME"
+msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/server/gnunet-transport-check.c:573
-#, c-format
-msgid "Available transport(s): %s\n"
-msgstr "Verfügbare(r) Transport(e): %s\n"
+#: src/include/gnunet_util_getopt.h:178
+msgid "specify host on which gnunetd is running"
+msgstr "Gibt an, auf welchem Host gnunetd läuft"
 
-#: src/server/gnunet-transport-check.c:617
-#, c-format
-msgid ""
-"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
-msgstr ""
-"%d von %d Knoten erfolgreich kontaktiert (%d mal war der Transport nicht "
-"verfügbar).\n"
+#~ msgid "GNUnet configuration assistant"
+#~ msgstr "GNUnet Konfigurationsassistent"
 
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
-msgstr ""
-"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+#, fuzzy
+#~ msgid ""
+#~ "Welcome to GNUnet!\n"
+#~ "\n"
+#~ "This assistant will ask you a few basic questions in order to configure "
+#~ "GNUnet.\n"
+#~ "\n"
+#~ "Please visit our homepage at\n"
+#~ "\thttp://gnunet.org\n";
+#~ "and join our community at\n"
+#~ "\thttps://gnunet.org/drupal/\n";
+#~ "\n"
+#~ "Have a lot of fun,\n"
+#~ "\n"
+#~ "The GNUnet team"
+#~ msgstr ""
+#~ "Willkommen bei GNUnet!\n"
+#~ "\n"
+#~ "Dieser Assistent wird Ihnen einige grundlegende Fragen stellen, um GNUnet "
+#~ "zu konfigurieren.\n"
+#~ "\n"
+#~ "Bitte besuchen Sie unsere Homepage\n"
+#~ "\thttp://gnunet.org\n";
+#~ "und schließen Sie sich unserer Community an:\n"
+#~ "\thttps://gnunet.org/drupal/\n";
+#~ "\n"
+#~ "Viel Spaß,\n"
+#~ "\n"
+#~ "das GNUnet-Team"
 
-#: src/server/gnunet-update.c:58
-msgid "run in client mode (for getting client configuration values)"
-msgstr ""
-"Im Benuter-Modus laufen (um benutzerspezifische Konfigurationseinstellungen "
-"zu holen"
+#~ msgid "Next"
+#~ msgstr "Weiter"
 
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
 
-#: src/server/gnunet-update.c:147
-#, c-format
-msgid "Option `%s' makes no sense without option `%s'."
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'."
+#~ msgid ""
+#~ "Enter information about your network connection here.\n"
+#~ "\n"
+#~ "The \"Network interface\" is the device that connects your computer to "
+#~ "the internet. This is usually a modem, an ISDN card or a network card in "
+#~ "case you are using DSL.\n"
+#~ "\n"
+#~ "If your provider always assigns the same IP-Address to you (a \"static\" "
+#~ "IP-Address), enter it into the \"IP-Address\" field. If your IP-Address "
+#~ "changes every now and then (\"dynamic\" IP-Address) but there's a "
+#~ "hostname that always points to your actual IP-Address (\"Dynamic DNS\"), "
+#~ "you can also enter it here.\n"
+#~ "If in doubt, leave the field empty. GNUnet will then try to determine "
+#~ "your IP-Address.\n"
+#~ "\n"
+#~ "If you are connected to the internet through another computer doing SNAT, "
+#~ "a router or a \"hardware firewall\" and other computers on the internet "
+#~ "cannot connect to this computer, check the last option on this page. "
+#~ "Leave it unchecked on direct connections through modems, ISDN cards and "
+#~ "DNAT (also known as \"port forwarding\")."
+#~ msgstr ""
+#~ "Geben Sie hier Ihre Netzwerkinformationen ein.\n"
+#~ "\n"
+#~ "Das \"Netzwerkgerät\" ist das Gerät, das Ihren Computer mit dem Internet "
+#~ "verbindet. Dies ist normalerweise ein Modem, eine ISDN-Karte oder eine "
+#~ "Netzwerkkarte für den Fall, dass Sie DSL benutzen.\n"
+#~ "\n"
+#~ "Wenn Ihnen Ihr Provider immer die gleiche IP-Adresse zuweist (eine "
+#~ "\"statische\" IP-Adresse), geben Sie diese in das \"IP-Adresse\"-Feld "
+#~ "ein. Wenn Ihre IP-Adresse sich hin und wieder ändert (\"dynamische\" IP-"
+#~ "Adresse), es jedoch einen Hostnamen gibt, der immer auf Ihre aktuelle IP-"
+#~ "Adresse zeigt (\"Dynamisches DNS\"), so können Sie ihn auch eingeben.\n"
+#~ "Im Zweifel lassen Sie das Feld leer. GNUnet wird dann versuchen, die IP-"
+#~ "Adresse automatisch zu bestimmen.\n"
+#~ "\n"
+#~ "Wenn Sie nicht direkt mit dem Internet verbunden sind, sondern dies über "
+#~ "einen anderen Rechner mit SNAT, einem Router oder einer \"Hardware "
+#~ "Firewall\" geschieht und andere Computer im Internet keine Verbindung mit "
+#~ "diesem Computer herstellen können, so aktivieren Sie die letzte Option "
+#~ "auf dieser Seite. Lassen Sie sie jedoch deaktiviert, wenn Sie eine "
+#~ "direkte Verbindung über ein Modem, eine ISDN-Karte oder einen anderen "
+#~ "Rechner mit DNAT (auch bekannt als \"Port forwarding\") zum Internet "
+#~ "haben."
 
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
-msgstr ""
-"\n"
-"Abbruch.\n"
+#~ msgid "Network interface:"
+#~ msgstr "Netzwerkgerät:"
 
-#: src/server/gnunet-update.c:249
-#, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Daten des Moduls `%s' werden aktualisiert\n"
+#~ msgid "IP-Address/Hostname:"
+#~ msgstr "IP-Adresse/Hostname:"
 
-#: src/server/gnunet-update.c:253
-#, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+#~ msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+#~ msgstr ""
+#~ "Computer kann keine ankommenden Verbindungen akzeptieren (SNAT/Firewall)"
 
-#: src/server/gnunet-update.c:309
-#, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Daten für %d Anwendungen wurden aktualisiert.\n"
+#~ msgid "Network connection"
+#~ msgstr "Netzwerkverbindung"
 
-#: src/server/gnunetd.c:76
-#, c-format
-msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
-msgstr ""
-"Konfiguration oder die GNUnet Version hat sich geändert. Sie müssen `%s' "
-"ausführen!\n"
+#~ msgid ""
+#~ "You can limit GNUnet's ressource usage here.\n"
+#~ "\n"
+#~ "\"Bandwidth limitation\" is how much data may be sent per second. If you "
+#~ "have a flatrate you can set it to the maximum speed of your internet "
+#~ "connection.\n"
+#~ "\n"
+#~ "The \"Max. CPU usage\" is the percentage of processor time GNUnet is "
+#~ "allowed to use."
+#~ msgstr ""
+#~ "Hier können Sie GNUnet's Ressourcennutzung einschränken.\n"
+#~ "\n"
+#~ "\"Bandbreitenbeschränkung\" gibt an, wieviele Daten maximal pro Sekunde "
+#~ "übetragen werden dürfen. Wenn Sie eine Flatrate haben, können Sie diese "
+#~ "Werte auf die maximal erreichbare Geschwindigkeit Ihrer "
+#~ "Internetverbindung setzen.\n"
+#~ "\n"
+#~ "Die \"Max. CPU Nutzung\" gibt den Prozentsatz an CPU-Zeit an, den GNUnet "
+#~ "für sich verwenden darf."
 
-#: src/server/gnunetd.c:84
-#, c-format
-msgid "`%s' starting\n"
-msgstr "`%s' startet\n"
+#~ msgid "Upstream (Bytes/s):"
+#~ msgstr "Upstream (Bytes/s):"
 
-#: src/server/gnunetd.c:106
-#, c-format
-msgid "`%s' startup complete.\n"
-msgstr "`%s' Startvorgang abgeschlossen.\n"
+#~ msgid "Downstream (Bytes/s):"
+#~ msgstr "Downstream (Bytes/s):"
 
-#: src/server/gnunetd.c:111
-#, c-format
-msgid "`%s' is shutting down.\n"
-msgstr "`%s' fährt herunter.\n"
+#~ msgid "Bandwidth limitation"
+#~ msgstr "Bandbreitenbeschränkung"
 
-#: src/server/handler.c:367
-#, c-format
-msgid "Received corrupt message from peer `%s'in %s:%d.\n"
-msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
+#~ msgid "Use denoted bandwidth for GNUnet"
+#~ msgstr "Angegebene Bandbreite für GNUnet verwenden"
 
-#: src/server/startup.c:196
-#, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
+#~ msgid "Share denoted bandwidth with other applications"
+#~ msgstr "Angegebene Bandbreite mit anderen Anwendungen teilen"
 
-#: src/server/startup.c:324
-#, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
-msgstr ""
-"Sie müssen einen Namen für die PID Datei in Sektion `%s' unter `%s' "
-"angeben.\n"
+#~ msgid "Bandwidth sharing"
+#~ msgstr "Aufteilung der Bandbreite"
 
-#: src/server/startup.c:339
-#, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
+#~ msgid "Max. CPU usage (%):"
+#~ msgstr "Max. CPU Nutzung (%):"
 
-#: src/server/startup.c:443
-msgid ""
-"run in debug mode; gnunetd will not daemonize and error messages will be "
-"written to stderr instead of a logfile"
-msgstr ""
-"Im Debug-Modus ausführen. gnunetd wird nicht im Hintergrund laufen und "
-"Fehlermeldungen werden nicht in die Protokolldatei, sondern auf die "
-"Standardfehlerausgabe (stderr) geschrieben."
+#~ msgid "CPU usage"
+#~ msgstr "CPU Nutzung"
 
-#: src/server/startup.c:456
-msgid "Starts the gnunetd daemon."
-msgstr "Startet den gnunetd Daemonen."
+#~ msgid "Load limitation"
+#~ msgstr "Lastbeschränkung"
 
-#: src/server/startup.c:470
-#, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr "Benutzer `%s' ist nicht bekannt, UID kann nicht gewechselt werden.\n"
+#~ msgid "Back"
+#~ msgstr "Zurück"
 
-#: src/server/startup.c:479
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
+#~ msgid ""
+#~ "GNUnet is able to store data from other peers in your datastore. This is "
+#~ "useful if an adversary has access to your inserted content and you need "
+#~ "to deny that the content is yours. With \"content migration\" on, the "
+#~ "content could have \"migrated\" over the internet to your node without "
+#~ "your knowledge.\n"
+#~ "It also helps to spread popular content over different peers to enhance "
+#~ "availability.\n"
+#~ "\n"
+#~ "The GNUnet datastore contains all data that GNUnet generates (index data, "
+#~ "inserted and migrated content). Its maximum size can be specified below.\n"
+#~ "\n"
+#~ "If you are an experienced user, you may want to tweak your GNUnet "
+#~ "installation using the enhanced configurator.\n"
+#~ "\n"
+#~ "After changing the configuration and/or updating GNUnet, it is sometimes "
+#~ "required to run gnunet-update to update internal data structures. "
+#~ "Depending on the changes made, this may take some time."
+#~ msgstr ""
+#~ "GNUnet ist in der Lage, Daten von anderen Knoten in Ihrem Datenspeicher "
+#~ "zu speichern. Das ist nützlich, wenn ein Widersacher Zugriff auf Ihre "
+#~ "eingefügten Inhalte erlangt und Sie abstreiten müssen, dass diese Daten "
+#~ "Ihnen gehören. Mit \"Inhaltsmigration\" angeschaltet können die Inhalte "
+#~ "über das Internet von einem anderen Knoten zu Ihrem Rechner ohne Ihr "
+#~ "Wissen \"gewandert\" sein.\n"
+#~ "Außerdem hilft es, beliebte Inhalte über verschiedene Netzteilnehmer zu "
+#~ "verteilen, um so die Verfügbarkeit zu erhöhen.\n"
+#~ "\n"
+#~ "Der GNUnet Datenspeicher enthält alle Daten, die GNUnet erzeugt "
+#~ "(Indexdaten, eingefügte und migrierte Inhalte). Seine maximale Größe kann "
+#~ "unten angegeben werden.\n"
+#~ "\n"
+#~ "Wenn Sie ein fortgeschrittener Benutzer sind, möchten Sie vielleicht "
+#~ "weitere Feinjustierungen an GNUnet über den \"erweiterten Konfigurator\" "
+#~ "vornehmen.\n"
+#~ "Nachdem die Konfiguration verändert und/oder GNUnet upgedated wurde ist "
+#~ "es manchmal nötig, gnunet-update auszuführen, um interne Datenstrukturen "
+#~ "zu aktualisieren. Abhängig von den gemachten Änderungen kann dies etwas "
+#~ "Zeit in Anspruch nehmen."
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
-msgstr "Ungültige Kommandozeilen Parameter:\n"
+#~ msgid "Store migrated content"
+#~ msgstr "Migrierte Inhalte speichern"
 
-#: src/server/startup.c:583
-#, c-format
-msgid "Argument %d: `%s'\n"
-msgstr "Parameter %d: `%s'\n"
+#~ msgid "Maximum datastore size (MB):"
+#~ msgstr "Maximale Größe des Datenspeichers (MB):"
 
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
-msgstr "Ungültige Kommandozeilen Parameter.\n"
+#~ msgid "Start the GNUnet background process on computer startup"
+#~ msgstr ""
+#~ "GNUnet Hintergrundprozeß beim Starten des Computers automatisch starten"
 
-#: src/server/tcpserver.c:422
-#, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
-msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
+#~ msgid "Open the enhanced configurator"
+#~ msgstr "Erweiterten Konfigurator starten"
 
-#: src/server/tcpserver.c:688
-#, c-format
-msgid ""
-"Malformed network specification in the configuration in section `%s' for "
-"entry `%s': %s\n"
-msgstr ""
-"Beschädigte Netzwerkangabe in der Konfigurationsdatei in Sektion `%s' für "
-"Eintrag `%s': %s\n"
+#~ msgid "Run gnunet-update"
+#~ msgstr "gnunet-update ausführen"
 
-#: src/server/tcpserver.c:798
-#, c-format
-msgid "%s failed, message type %d already in use.\n"
-msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
+#~ msgid "Other settings"
+#~ msgstr "Weitere Einstellungen"
 
-#: src/transports/ip6.c:60 src/util/configuration.c:925
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
+#~ msgid "Finish"
+#~ msgstr "Fertigstellen"
 
-#: src/transports/ip6.c:100
-#, c-format
-msgid "Could not resolve `%s': %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+#~ msgid "Question"
+#~ msgstr "Frage"
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
+#~ msgid "Do you want to save your settings?"
+#~ msgstr "Möchten Sie Ihre Einstellungen speichern?"
 
-#: src/transports/http.c:601
-msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
-msgstr ""
-"Es wurde eine Willkommensnachricht erwartet, tatsächlich wurde jedoch keine "
-"gesendet. HTTP-Verbindung wird geschlossen.\n"
+#~ msgid "Unable to save configuration!"
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
-msgstr ""
-"%s: Abgewiesene Verbindung von schwarzgelisteter Adresse %u.%u.%u.%u.\n"
+#~ msgid "OK"
+#~ msgstr "OK"
 
-#: src/transports/http.c:1101
-msgid "HTTP: Could not determine my public IP address.\n"
-msgstr "HTTP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+#~ msgid ""
+#~ "Define the user and the group owning the GNUnet service here.\n"
+#~ "\n"
+#~ "For security reasons, it is a good idea to let this setup create a new "
+#~ "user account and a new group under which the GNUnet service is started at "
+#~ "system startup.\n"
+#~ "\n"
+#~ "However, GNUnet may not be able to access files other than its own. This "
+#~ "includes files you want to publish in GNUnet. You'll have to grant read "
+#~ "permissions to the user specified below.\n"
+#~ "\n"
+#~ "Leave the fields empty to run GNUnet with system privileges."
+#~ msgstr ""
+#~ "Geben Sie den Benutzer und die Gruppe an, der der GNUnet Dienst gehören "
+#~ "soll.\n"
+#~ "\n"
+#~ "Aus Sicherheitsgründen ist es eine gute Idee, dieses Setup ein neues "
+#~ "Benutzerkonto und eine neue Gruppe anlegen zu lassen, unter der der "
+#~ "GNUnet Dienst beim Systemstart läuft.\n"
+#~ "\n"
+#~ "Natürlich kann GNUnet dann nur auf seine eigenen Dateien zugreifen. Dies "
+#~ "betrifft auch Dateien, die Sie im GNUnet veröffentlichen möchten. Sie "
+#~ "müssen dann dem unten angegebenen Benutzerkonto zuerst Leseberechtigungen "
+#~ "geben.\n"
+#~ "\n"
+#~ "Lassen Sie dieses Feld leer, wenn Sie GNUnet mit Systemprivilegien laufen "
+#~ "lassen möchten."
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
-#: src/util/tcpio.c:188
-#, c-format
-msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
-msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
+#~ msgid "Group:"
+#~ msgstr "Gruppe:"
 
-#: src/transports/http.c:1333
-#, c-format
-msgid ""
-"Could not bind the HTTP listener to port %d. No transport service started.\n"
-msgstr ""
-"HTTP-Listener konnte nicht an Port %d gebunden werden. Der Transport Dienst "
-"wurde nicht gestartet.\n"
+#~ msgid "User account:"
+#~ msgstr "Benutzerkonto:"
 
-#: src/transports/http.c:1478
-msgid "# bytes received via HTTP"
-msgstr "# Bytes empfangen über HTTP"
+#~ msgid "gnunet-update failed!"
+#~ msgstr "gnunet-update schlug fehlt!"
 
-#: src/transports/http.c:1480
-msgid "# bytes sent via HTTP"
-msgstr "# Bytes gesendet über HTTP"
+#~ msgid "Gtk GNUnet Configurator"
+#~ msgstr "Gtk GNUnet Konfigurator"
 
-#: src/transports/http.c:1482
-msgid "# bytes dropped by HTTP (outgoing)"
-msgstr "# Bytes verworfen von HTTP"
+#~ msgid "_File"
+#~ msgstr "_Datei"
 
-#: src/transports/smtp.c:297
-#, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr "Der Name des SMTP servers `%s' konnte nicht aufgelöst werden: %s"
+#~ msgid "Load a config file"
+#~ msgstr "Eine Konfigurationsdatei laden"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
-#, c-format
-msgid ""
-"You must specify the name of a pipe for the SMTP transport in section `%s' "
-"under `%s'.\n"
-msgstr ""
-"Für den SMTP Transport müssen Sie den Namen einer Pipe in Sektion `%s', "
-"Eintrag `%s' eintragen.\n"
+#~ msgid "_Load"
+#~ msgstr "_öffnen"
 
-#: src/transports/smtp.c:489
-msgid "Received malformed message via SMTP (size mismatch).\n"
-msgstr ""
-"Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
+#~ msgid "Save the config in .config"
+#~ msgstr "Die Konfiguration in .config speichern"
 
-#: src/transports/smtp.c:584
-msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
-msgstr ""
-"Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
-"werden.\n"
+#~ msgid "_Save"
+#~ msgstr "_Speichern"
 
-#: src/transports/smtp.c:591
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
+#~ msgid "_Quit"
+#~ msgstr "_Beenden"
 
-#: src/transports/smtp.c:764
-#, c-format
-msgid "Sending E-mail to `%s' failed.\n"
-msgstr "Das Senden einer E-Mail an `%s' schlug fehl.\n"
+#~ msgid "_Options"
+#~ msgstr "_Optionen"
 
-#: src/transports/smtp.c:815
-#, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
-msgstr "Der SMTP server sendete eine unerwartete Antwort bei %s:%d.\n"
+#~ msgid "Show name"
+#~ msgstr "Name anzeigen"
 
-#: src/transports/smtp.c:838
-#, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr ""
-"SMTP Server antwortete nicht mit einem 250 Bestätigungscode auf eine `%s' "
-"Anfrage.\n"
+#~ msgid "Show _name"
+#~ msgstr "_Name anzeigen"
 
-#: src/transports/smtp.c:844
-#, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+#~ msgid "Show range (Y/M/N)"
+#~ msgstr "Bereich anzeigen (Y/M/N)"
 
-#: src/transports/smtp.c:903
-#, c-format
-msgid "%.*s filter %s (SMTP)"
-msgstr "%.*s filter %s (SMTP)"
+#~ msgid "Show _range"
+#~ msgstr "_Bereich anzeigen"
 
-#: src/transports/smtp.c:932 src/transports/udp.c:722
-#: src/transports/udp6.c:699
-#, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
-msgstr ""
-"MTU für `%s' ist möglicherweise zu gering (Fragmentierung ist nicht "
-"implementiert!)\n"
+#~ msgid "Show value of the option"
+#~ msgstr "Wert der Option anzeigen"
 
-#: src/transports/tcp.c:465
-#, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
-msgstr ""
-"Es wurde eine Willkommensnachricht erwartet, über die TCP Verbindung wurde "
-"aber keine gesendet (%u, %u). Verbindung wird geschlossen.\n"
+#~ msgid "Show _data"
+#~ msgstr "_Daten anzeigen"
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr ""
-"Es wurde per TCP von einem anderen Knoten eine ungültige Nachricht (Größe %"
-"u) empfangen. Verbindung wird geschlossen.\n"
+#~ msgid "Show all options"
+#~ msgstr "Alle Optionen anzeigen"
 
-#: src/transports/tcp.c:1082
-msgid "Could not determine my public IP address.\n"
-msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+#~ msgid "Show all _options"
+#~ msgstr "Alle _Optionen anzeigen"
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
-#, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+#~ msgid "_Help"
+#~ msgstr "_Hilfe"
 
-#: src/transports/tcp.c:1449
-msgid "# bytes received via TCP"
-msgstr "# Bytes empfangen über TCP"
+#~ msgid "_Introduction"
+#~ msgstr "_Einführung"
 
-#: src/transports/tcp.c:1451
-msgid "# bytes sent via TCP"
-msgstr "# Bytes gesendet über TCP"
+#~ msgid "_About"
+#~ msgstr "_über"
 
-#: src/transports/tcp.c:1453
-msgid "# bytes dropped by TCP (outgoing)"
-msgstr "# Bytes verworfen von TCP (ausgehend)"
+#~ msgid "Goes up of one level (single view)"
+#~ msgstr "Bewegt sich eine Ebene nach oben (einfache Ansicht)"
 
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr ""
-"Es wurde eine Willkommensnachricht erwartet, über die TCP Verbindung wurde "
-"jedoch keine gesendet. Verbindung wird geschlossen.\n"
+#~ msgid "Up"
+#~ msgstr "Oben"
 
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr ""
-"über die TCP6-Verbindung zu einem anderen Knoten wurde eine ungültige "
-"Nachricht empfangen. Verbindung wird geschlossen.\n"
+#~ msgid "Load"
+#~ msgstr "Laden"
 
-#: src/transports/tcp6.c:657 src/transports/udp6.c:334
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr "%s: Zurückgewiesene Verbindung von schwarzgelisteter Adresse %s.\n"
+#~ msgid "Save a config file"
+#~ msgstr "Konfigurationsdatei speichern"
 
-#: src/transports/tcp6.c:958
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
+#~ msgid "Save"
+#~ msgstr "Speichern"
 
-#: src/transports/tcp6.c:1002
-#, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "`%s': unbekannter Dienst: %s\n"
+#~ msgid "Single view"
+#~ msgstr "Einfache Ansicht"
 
-#: src/transports/udp.c:145 src/transports/udp6.c:128
-#, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
-msgstr ""
-"Der Port, an dem Verbindungen entgegengenommen werden sollen, konnte nicht "
-"ermittelt werden. Bitte definieren Sie ihn in der Konfigurationsdatei in der "
-"Sektion `%s' unter `%s' oder in `%s' unter %s/%s.\n"
+#~ msgid "Single"
+#~ msgstr "Einfach"
 
-#: src/transports/udp.c:179
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Fehler beim Binden an UDP Port %d.\n"
+#~ msgid "Split view"
+#~ msgstr "Geteilte Ansicht"
 
-#: src/transports/udp.c:250
-#, fuzzy, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-"UDP: select kam zurück aber ioctl berichtet, dass 0 Bytes verfügbar sind!\n"
+#~ msgid "Split"
+#~ msgstr "Geteilt"
 
-#: src/transports/udp.c:307
-#, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr ""
-"Es wurde eine ungültige UDP Nachricht von %u.%u.%u.%u:%u empfangen, "
-"Nachricht wird ignoriert.\n"
+#~ msgid "Full view"
+#~ msgstr "Volle Ansicht"
 
-#: src/transports/udp.c:332
-#, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
-"Ein Paket empfangen von %u.%u.%u.%u:%u (UDP) hat ein ungültiges Format.\n"
+#~ msgid "Full"
+#~ msgstr "Voll"
 
-#: src/transports/udp.c:417
-msgid "UDP: Could not determine my public IP address.\n"
-msgstr "UDP: öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+#~ msgid "Collapse the whole tree in the right frame"
+#~ msgstr "Den gesamten Baum im rechten Frame kollabieren"
 
-#: src/transports/udp.c:551
-#, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
-msgstr ""
-"Eine Nachricht der Größe %d konnte nicht per UDP an %u.%u.%u.%u:%u versendet "
-"werden: %s\n"
+#~ msgid "Collapse"
+#~ msgstr "Kollabieren"
 
-#: src/transports/udp.c:707
-msgid "# bytes received via UDP"
-msgstr "# Bytes empfangen über UDP"
+#~ msgid "Expand the whole tree in the right frame"
+#~ msgstr "Den gesamten Baum im rechten Frame expandieren"
 
-#: src/transports/udp.c:709
-msgid "# bytes sent via UDP"
-msgstr "# Bytes gesendet über UDP"
+#~ msgid "Expand"
+#~ msgstr "Expandieren"
 
-#: src/transports/udp.c:711
-msgid "# bytes dropped by UDP (outgoing)"
-msgstr "# Bytes verworfen von UDP (outgoing)"
+#, fuzzy
+#~ msgid "Introduction"
+#~ msgstr "_Einführung"
 
-#: src/transports/ip.c:124
-#, c-format
-msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
-msgstr ""
-"Gerät `%s' konnte in `%s' nicht gefunden werden, es wird versucht, ein "
-"anderes Gerät zu finden.\n"
+#, fuzzy
+#~ msgid "gnunet-setup"
+#~ msgstr "gnunet-update ausführen"
 
-#: src/transports/ip.c:149
-#, 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"
+#~ msgid "Not for English ;-)"
+#~ msgstr "Nils Durner and Christian Grothoff"
 
-#: src/transports/ip.c:193
-#, c-format
-msgid "Could not find an IP address for interface `%s'.\n"
-msgstr "Es konnte keine IP-Adresse für das Gerät `%s' ermittelt werden.\n"
+#~ msgid "inlining configration file `%s'\n"
+#~ msgstr "Binde Konfigurationsdatei `%s' ein\n"
 
-#: src/transports/ip.c:203
-#, c-format
-msgid ""
-"There is more than one IP address specified for interface `%s'.\n"
-"GNUnet will use %u.%u.%u.%u.\n"
-msgstr ""
-"Es ist mehr als eine IP-Adresse für das Gerät `%s' angegeben.\n"
-"GNUnet wird %u.%u.%u.%u. verwenden.\n"
+#~ msgid "Could not parse configuration file `%s'.\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/transports/ip.c:224
-#, c-format
-msgid "Could not resolve `%s' to determine our IP address: %s\n"
-msgstr ""
-"`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
+#~ msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
+#~ msgstr ""
+#~ "Konfigurationsdatei `%s' nicht gefunden. Bitte führen Sie gnunet-setup "
+#~ "aus!\n"
 
-#: src/transports/ip.c:256
-#, c-format
-msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
-msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
+#~ msgid ""
+#~ "Configuration file not found. Please run GNUnet Setup (Client "
+#~ "Configuration) first."
+#~ msgstr ""
+#~ "Die Konfigurationsdatei wurde nicht gefunden. Bitte führen Sie zuerst "
+#~ "GNUnet Setup (Client Konfiguration) aus."
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
-msgstr "Fehler beim Bestimmen der (externen) IP-Adresse!\n"
+#~ msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
+#~ msgstr ""
+#~ "Konfigurationsdatei `%s' nicht gefunden. Bitte führen Sie `gnunet-setup -"
+#~ "d' aus!\n"
 
-#: src/transports/udp6.c:164
-#, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
-msgstr "Fehler beim Binden an UDP6 Port %d.\n"
+#~ msgid "Cannot open configuration file `%s'.\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/transports/udp6.c:235
-#, fuzzy, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-"UDP: select kam zurück aber ioctl berichtet, dass 0 Bytes verfügbar sind!\n"
+#~ msgid "Cron stopped\n"
+#~ msgstr "Cron angehalten\n"
 
-#: src/transports/udp6.c:290
-#, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr ""
-"Ungültige UDP6 Nachricht von %s:%d empfangen, Nachricht wird ignoriert.\n"
+#~ msgid "Shutdown complete.\n"
+#~ msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr ""
-"Die Formatüberprüfung des Pakets, das von %s:%d (UDP6) empfangen wurde, "
-"schlug fehl."
+#~ msgid "Caught signal %d.\n"
+#~ msgstr "Signal %d empfangen.\n"
 
-#: src/transports/udp6.c:415
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr "UDP6: Öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
+#~ msgid "Invalid network notation (additional characters: `%s')."
+#~ msgstr "Ungültige Netzwerk Notation (zusätzliche Zeichen: `%s')."
 
-#: src/util/configuration.c:182
-#, c-format
-msgid "inlining configration file `%s'\n"
-msgstr "Binde Konfigurationsdatei `%s' ein\n"
+#~ msgid "FAILURE"
+#~ msgstr "FEHLSCHLAG"
 
-#: src/util/configuration.c:186
-#, c-format
-msgid "Could not parse configuration file `%s'.\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+#~ msgid "MESSAGE"
+#~ msgstr "MELDUNG"
 
-#: src/util/configuration.c:222
-#, c-format
-msgid "Syntax error in configuration file `%s' at line %d.\n"
-msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
+#~ msgid "INFO"
+#~ msgstr "INFO"
 
-#: src/util/configuration.c:515 src/util/configuration.c:524
-#, c-format
-msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
-msgstr ""
-"Konfigurationsdatei `%s' nicht gefunden. Bitte führen Sie gnunet-setup aus!\n"
+#~ msgid "CRON"
+#~ msgstr "CRON"
 
-#: src/util/configuration.c:521
-msgid ""
-"Configuration file not found. Please run GNUnet Setup (Client Configuration) "
-"first."
-msgstr ""
-"Die Konfigurationsdatei wurde nicht gefunden. Bitte führen Sie zuerst GNUnet "
-"Setup (Client Konfiguration) aus."
+#~ msgid "EVERYTHING"
+#~ msgstr "ALLES"
 
-#: src/util/configuration.c:528
-#, c-format
-msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
-msgstr ""
-"Konfigurationsdatei `%s' nicht gefunden. Bitte führen Sie `gnunet-setup -d' "
-"aus!\n"
+#~ msgid "Invalid LOGLEVEL `%s' specified.\n"
+#~ msgstr "Ungültiger LOGLEVEL `%s' angegeben.\n"
 
-#: src/util/configuration.c:532
-#, c-format
-msgid "Cannot open configuration file `%s'.\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+#~ msgid "Failure at %s:%d.\n"
+#~ msgstr "Fehler bei %s:%d.\n"
 
-#: src/util/cron.c:189
-msgid "Stopping cron\n"
-msgstr ""
+#~ msgid ""
+#~ "Cannot determine port of gnunetd server. Define in configuration file in "
+#~ "section `%s' under `%s'.\n"
+#~ msgstr ""
+#~ "Der Port des gnunetd Servers konnte nicht ermittelt werden. Definieren "
+#~ "Sie ihn in der Sektion `%s' unter `%s'.\n"
 
-#: src/util/cron.c:199
-msgid "Cron stopped\n"
-msgstr "Cron angehalten\n"
+#~ msgid ""
+#~ "Usage: %s\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Verwendung: %s\n"
+#~ "%s\n"
+#~ "\n"
 
-#: src/util/cron.c:348
-#, c-format
-msgid ""
-"`%s' called with cron job not in queue, adding.  This may not be what you "
-"want.\n"
-msgstr ""
-"`%s' aufgerufen wobei Cron Job nicht Warteschlange ist. Er wird hinzugefügt. "
-"Das ist möglicherweise nicht, was Sie wollen.\n"
+#~ msgid "Invalid argument for `%s' at %s:%d.\n"
+#~ msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
 
-#: src/util/dso.c:43
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: src/util/dso.c:98
-#, c-format
-msgid "`%s' failed for library `%s' at %s:%d with error: %s\n"
-msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: src/util/dso.c:152
-#, c-format
-msgid "`%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
-msgstr ""
-"`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: src/util/getopt.c:641
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Option `%s' ist mehrdeutig\n"
-
-#: src/util/getopt.c:665
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
-
-#: src/util/getopt.c:670
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
-
-#: src/util/getopt.c:687 src/util/getopt.c:861
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option `%s' benötigt einen Parameter\n"
-
-#: src/util/getopt.c:717
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: unbekannte Option '--%s'\n"
-
-#: src/util/getopt.c:721
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: unbekannte Option '%c%s'\n"
-
-#: src/util/getopt.c:747
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: unerlaubte Option -- %c\n"
-
-#: src/util/getopt.c:750
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ungültige Option -- %c\n"
-
-#: src/util/getopt.c:780 src/util/getopt.c:910
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option benötigt einen Parameter -- %c\n"
-
-#: src/util/getopt.c:827
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option '-W %s' ist mehrdeutig\n"
-
-#: src/util/getopt.c:845
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
-
-#: src/util/hostkey_gcrypt.c:937
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
-
-#: src/util/initialize.c:229
-msgid "Shutdown complete.\n"
-msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
-
-#: src/util/io.c:35
-#, c-format
-msgid "Caught signal %d.\n"
-msgstr "Signal %d empfangen.\n"
-
-#: src/util/random.c:38
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr ""
-"libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
-
-#: src/util/ipcheck.c:100
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ungültiges Format für IP: `%s'\n"
-
-#: src/util/ipcheck.c:150
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
-
-#: src/util/ipcheck.c:164
-#, c-format
-msgid "Invalid network notation (additional characters: `%s')."
-msgstr "Ungültige Netzwerk Notation (zusätzliche Zeichen: `%s')."
-
-#: src/util/ipcheck.c:235
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
-
-#: src/util/ipcheck.c:267
-#, c-format
-msgid "Wrong format `%s' for netmask: %s\n"
-msgstr "Falsches Format `%s' für Netzmaske: %s\n"
-
-#: src/util/ipcheck.c:281
-#, c-format
-msgid "Wrong format `%s' for network: %s\n"
-msgstr "Falsches Format `%s' für Netzwerk: %s\n"
-
-#: src/util/logging.c:90
-msgid "NOTHING"
-msgstr "NICHTS"
-
-#: src/util/logging.c:91
-msgid "FATAL"
-msgstr "SCHWERWIEGEND"
-
-#: src/util/logging.c:92
-msgid "ERROR"
-msgstr "FEHLER"
-
-#: src/util/logging.c:93
-msgid "FAILURE"
-msgstr "FEHLSCHLAG"
-
-#: src/util/logging.c:94
-msgid "WARNING"
-msgstr "WARNUNG"
-
-#: src/util/logging.c:95
-msgid "MESSAGE"
-msgstr "MELDUNG"
-
-#: src/util/logging.c:96
-msgid "INFO"
-msgstr "INFO"
-
-#: src/util/logging.c:97
-msgid "DEBUG"
-msgstr "DEBUG"
-
-#: src/util/logging.c:98
-msgid "CRON"
-msgstr "CRON"
-
-#: src/util/logging.c:99
-msgid "EVERYTHING"
-msgstr "ALLES"
-
-#: src/util/logging.c:285
-#, c-format
-msgid "Invalid LOGLEVEL `%s' specified.\n"
-msgstr "Ungültiger LOGLEVEL `%s' angegeben.\n"
-
-#: src/util/logging.c:377 src/util/logging.c:383
-#, c-format
-msgid "Failure at %s:%d.\n"
-msgstr "Fehler bei %s:%d.\n"
-
-#: src/util/port.c:47
-#, c-format
-msgid ""
-"Cannot determine port of gnunetd server. Define in configuration file in "
-"section `%s' under `%s'.\n"
-msgstr ""
-"Der Port des gnunetd Servers konnte nicht ermittelt werden. Definieren Sie "
-"ihn in der Sektion `%s' unter `%s'.\n"
-
-#: src/util/printhelp.c:42
-#, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
-msgstr ""
-"Verwendung: %s\n"
-"%s\n"
-"\n"
-
-#: src/util/printhelp.c:45
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-"Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
-"Optionen zwingend.\n"
-
-#: src/util/semaphore.c:172 src/util/semaphore.c:198
-#, c-format
-msgid "Invalid argument for `%s' at %s:%d.\n"
-msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
-
-#: src/util/semaphore.c:176
-#, c-format
-msgid "Deadlock due to `%s' at %s:%d.\n"
-msgstr "Durch `%s' ist ein Deadlock bei %s:%d entstanden\n"
-
-#: src/util/semaphore.c:202
-#, c-format
-msgid "Permission denied for `%s' at %s:%d.\n"
-msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
-
-#: src/util/semaphore.c:452 src/util/semaphore.c:459
-#, fuzzy, c-format
-msgid "`%s' failed with error code %s: %s"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/util/semaphore.c:466
-#, fuzzy, c-format
-msgid "`%s' failed with error code %d: %s"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/util/semaphore.c:604
-#, c-format
-msgid "Can't create semaphore: %i"
-msgstr "Semaphore konnte nicht angelegt werden: %i"
-
-#: src/util/state.c:86
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
-msgstr ""
-"Die Konfigurationsdatei muss unter %s\\%s ein Verzeichnis für GNUnet "
-"angeben, in dem knotenbezogene Daten gespeichert werden.\n"
-
-#: src/util/statuscalls.c:185
-#, c-format
-msgid "Failed to parse interface data from `%s' at %s:%d.\n"
-msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-
-#: src/util/statuscalls.c:489
-msgid "Cannot query the CPU usage (Windows NT).\n"
-msgstr "CPU Nutzung kann nicht ermittelt werden (Windows NT).\n"
-
-#: src/util/statuscalls.c:507
-msgid "Cannot query the CPU usage (Win 9x)\n"
-msgstr "CPU Nutzung kann nicht ermittelt werden (Win 9x).\n"
-
-#: src/util/statuscalls.c:600
-#, c-format
-msgid ""
-"No network interfaces defined in configuration section `%s' under `%s'!\n"
-msgstr ""
-"Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion `%s' "
-"unter `%s' definiert!\n"
-
-#: src/util/storage.c:212
-#, c-format
-msgid "`%s' failed for drive %s: %u\n"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
-
-#: src/util/storage.c:310
-#, c-format
-msgid "`%s' is not a regular file.\n"
-msgstr "`%s' ist keine normale Datei.\n"
-
-#: src/util/storage.c:564
-#, c-format
-msgid "`%s' expected `%s' to be a directory!\n"
-msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
-
-#: src/util/storage.c:670
-msgid "b"
-msgstr "b"
-
-#: src/util/storage.c:675
-msgid "k"
-msgstr "k"
-
-#: src/util/storage.c:678 src/util/timer.c:198
-msgid "m"
-msgstr "m"
-
-#: src/util/storage.c:681
-msgid "g"
-msgstr "g"
-
-#: src/util/storage.c:684
-msgid "t"
-msgstr "t"
-
-#: src/util/string.c:108
 #, fuzzy
-msgid "unknown"
-msgstr "Unbekannter Fehler"
+#~ msgid "unknown"
+#~ msgstr "Unbekannter Fehler"
 
-#: src/util/string.c:111
-msgid "GiB"
-msgstr ""
+#~ msgid "`%s' failed, other side closed connection.\n"
+#~ msgstr ""
+#~ "`%s' fehlgeschlagen, die andere Seite hat die Verbindung geschlossen\n"
 
-#: src/util/string.c:114
-msgid "MiB"
-msgstr ""
+#~ msgid "Attempted path to `%s' was `%s'.\n"
+#~ msgstr "Versuchter Pfad für `%s' war `%s'.\n"
 
-#: src/util/string.c:117
-msgid "KiB"
-msgstr ""
+#~ msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
+#~ msgstr "Unerwartete sehr große Allokierung (%u Bytes) bei %s:%d!\n"
 
-#: src/util/string.c:120
-msgid "Bytes"
-msgstr ""
+#~ msgid "set verbosity to LEVEL"
+#~ msgstr "Umfang der Meldungen auf LEVEL setzen"
 
-#: src/util/tcp_return.c:51
-#, c-format
-msgid "`%s' failed, other side closed connection.\n"
-msgstr "`%s' fehlgeschlagen, die andere Seite hat die Verbindung geschlossen\n"
-
-#: src/util/tcp_return.c:58
-#, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "`%s' fehlgeschlagen, Antwort ist ungültig!\n"
-
-#: src/util/timer.c:190
-msgid "ms"
-msgstr "ms"
-
-#: src/util/timer.c:195
-msgid "s"
-msgstr "s"
-
-#: src/util/timer.c:201
-msgid "h"
-msgstr "h"
-
-#: src/util/timer.c:204
-msgid " days"
-msgstr " Tage"
-
-#: src/util/daemon.c:142
-#, c-format
-msgid "Attempted path to `%s' was `%s'.\n"
-msgstr "Versuchter Pfad für `%s' war `%s'.\n"
-
-#: src/util/xmalloc.c:52
-#, c-format
-msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
-msgstr "Unerwartete sehr große Allokierung (%u Bytes) bei %s:%d!\n"
-
-#: src/include/gnunet_util.h:167
-msgid "print this help"
-msgstr "Gibt diese Hilfe aus"
-
-#: src/include/gnunet_util.h:170
-msgid "set verbosity to LEVEL"
-msgstr "Umfang der Meldungen auf LEVEL setzen"
-
-#: src/include/gnunet_util.h:173
-msgid "use configuration file FILENAME"
-msgstr "Konfigurationsdatei FILENAME verwenden"
-
-#: src/include/gnunet_util.h:176
-msgid "specify host on which gnunetd is running"
-msgstr "Gibt an, auf welchem Host gnunetd läuft"
-
-#: src/include/gnunet_util.h:179
-msgid "print the version number"
-msgstr "Versionsnummer ausgeben"
-
-#: src/include/gnunet_util.h:182
-msgid "be verbose"
-msgstr "umfangreiche Meldungen ausgeben"
-
-#: src/include/gnunet_util.h:637 src/include/gnunet_util.h:639
-#, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
-
-#: src/include/gnunet_util.h:1058 src/include/gnunet_util.h:1060
-#: src/include/gnunet_util.h:1067
-#, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
-msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
-
 #~ msgid "Not connected to gnunetd."
 #~ msgstr "Nicht verbunden zu gnunetd."
 

Modified: GNUnet/po/es.po
===================================================================
--- GNUnet/po/es.po     2006-07-23 17:07:38 UTC (rev 3129)
+++ GNUnet/po/es.po     2006-07-24 23:05:12 UTC (rev 3130)
@@ -9,335 +9,340 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 09:13-0700\n"
+"POT-Creation-Date: 2006-07-24 16:55-0700\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/transports/ip6.c:60
 #, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
-msgstr "mensaje de saludo de '%s' inválido (firma inválida). Omitiendo.\n"
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/applications/advertising/advertising.c:167
+#: src/transports/ip6.c:100
+#, c-format
+msgid "Could not resolve `%s': %s\n"
+msgstr "Imposible resolver '%s': %s\n"
+
+#: src/transports/ip6.c:138
+msgid "Failed to obtain my (external) IPv6 address!\n"
+msgstr "¡Falló al obtener mi dirección IPv6 (externa)!\n"
+
+#: src/transports/udp6.c:128 src/transports/udp.c:145
+#, c-format
 msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+"Cannot determine port to bind to.  Define in configuration file in section `%"
+"s' under `%s' or in `%s' under %s/%s.\n"
 msgstr ""
-"mensaje de saludo recibido inválido (tiempo superior al límite). Omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:176
+#: src/transports/udp6.c:164
 #, c-format
-msgid "hello advertisement for protocol %d received.\n"
-msgstr "Inicio de comunicación del protocolo %d recibido.\n"
+msgid "Failed to bind to UDP6 port %d.\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:295
-msgid "Could not send hellos+PING, ping buffer full.\n"
-msgstr "Imposible mandar ahora saludos+PING, buffer del ping lleno.\n"
+#: src/transports/udp6.c:235
+#, c-format
+msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:308
+#: src/transports/udp6.c:290
 #, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
-msgstr "'%s' falló (%d, %u). No se mandará el PING.\n"
+msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
 
-#: src/applications/advertising/advertising.c:460
+#: src/transports/udp6.c:321
 #, c-format
-msgid "Advertising my transport %d to selected peers.\n"
-msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
-
-#: src/applications/advertising/advertising.c:467
-msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+msgid "Packet received from %s:%d (UDP6) failed format check."
 msgstr ""
-"Es inútil anunciarnos: no hay más pares que nos conozcan más allá.\n"
 
-#: src/applications/advertising/advertising.c:569
+#: src/transports/udp6.c:334 src/transports/tcp6.c:657
 #, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
-msgstr "Eliminando saludo del par '%s' (expiró hace %ds).\n"
+msgid "%s: Rejected connection from blacklisted address %s.\n"
+msgstr "%s: Conexión rechazada de una dirección de la \"lista negra\" %s.\n"
 
-#: src/applications/advertising/advertising.c:729
-msgid "# Peer advertisements received"
-msgstr "# Anuncios de los pares recibidos"
+#: src/transports/udp6.c:415
+msgid "UDP6: Could not determine my public IPv6 address.\n"
+msgstr "UDP6: Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/applications/advertising/advertising.c:730
-msgid "# Self advertisments transmitted"
-msgstr "# Auto-anuncios transmitidos"
-
-#: src/applications/advertising/advertising.c:731
-msgid "# Foreign advertisements forwarded"
-msgstr "# Anuncios a extraños mandados"
-
-#: src/applications/advertising/advertising.c:733
-#: src/applications/pingpong/pingpong.c:462
-msgid "# plaintext PING messages sent"
-msgstr "# mensajes de texto mandados por PING"
-
-#: src/applications/advertising/advertising.c:737
-#: src/applications/session/connect.c:752
+#: src/transports/udp6.c:699 src/transports/smtp.c:932
+#: src/transports/udp.c:722
 #, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
-msgstr "'%s' registrando manejador %d (texto plano e hipertexto)\n"
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:756
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "¡Advertencias de la red desconectadas por configuración!\n"
-
-#: src/applications/advertising/advertising.c:776
-msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+#: src/transports/http.c:601
+msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr ""
-"Asegura que este par es conocido por otros pares y descubre otros pares"
+"Esperada bienvenida en la conexión http, encontrada basura. Cerrando la "
+"conexión.\n"
 
-#: src/applications/bootstrap_http/http.c:81
-#: src/applications/testbed/testbed.c:1079
+#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
 #, c-format
-msgid "Invalid URL `%s' (must begin with `%s')\n"
-msgstr "URL invalida '%s' (debe comenzar por '%s')\n"
+msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
+msgstr ""
+"%s: Conexión rechazada de una dirección de la \"lista negra\" %u.%u.%u.%u.\n"
 
-#: src/applications/bootstrap_http/http.c:109
-#, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-msgstr "Puerto inválido \"%s\" en la especificación de la lista local, 
probando el puerto %d.\n"
+#: src/transports/http.c:1101
+msgid "HTTP: Could not determine my public IP address.\n"
+msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/applications/bootstrap_http/http.c:120
+#: src/transports/http.c:1177 src/transports/tcp.c:1150
 #, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/applications/bootstrap_http/http.c:132
+#: src/transports/http.c:1333
 #, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
-msgstr "Imposible descargar lista de contactos, servidor '%s' desconocido.\n"
+msgid ""
+"Could not bind the HTTP listener to port %d. No transport service started.\n"
+msgstr ""
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
+#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
 #, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "Imposible resolver el nombre del proxy HTTP '%s'.\n"
 
-#: src/applications/bootstrap_http/http.c:217
-#, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "Analizando HTTP de la URL '%s' se produjo un fallo.\n"
+#: src/transports/http.c:1478
+msgid "# bytes received via HTTP"
+msgstr "# bytes recibidos vía HTTP"
 
-#: src/applications/bootstrap_http/http.c:252
+#: src/transports/http.c:1480
+msgid "# bytes sent via HTTP"
+msgstr "# bytes mandados vía HTTP"
+
+#: src/transports/http.c:1482
+msgid "# bytes dropped by HTTP (outgoing)"
+msgstr "#bytes omitidos vía HTTP (salientes)"
+
+#: src/transports/smtp.c:297
 #, c-format
-msgid "Parsing hello from `%s' failed.\n"
-msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
+msgid "Could not resolve name of SMTP server `%s': %s"
+msgstr "Imposible resolver el nombre del servidor de SMTP '%s': %s"
 
-#: src/applications/bootstrap_http/http.c:330
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
 #, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
-msgstr "Imposible resolver el nombre del proxy HTTP '%s'. Intentándolo sin un 
proxy.\n"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section `%s' "
+"under `%s'.\n"
+msgstr ""
 
-#: src/applications/bootstrap_http/http.c:355
-msgid "# hellos downloaded via http"
-msgstr "# saludos descargados vía HTTP"
+#: src/transports/smtp.c:489
+msgid "Received malformed message via SMTP (size mismatch).\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:87
-msgid "Message received from peer is invalid.\n"
-msgstr "El mensaje recibido del par es inválido.\n"
+#: src/transports/smtp.c:584
+msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:134
-msgid "Message received from client is invalid\n"
-msgstr "El mensaje recibido del cliente es inválido\n"
+#: src/transports/smtp.c:591
+#, c-format
+msgid "SMTP filter string to long, capped to `%s'\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:156
-msgid "Maximum number of chat clients reached.\n"
-msgstr "Número máximo de clientes en el chat alcanzado.\n"
+#: src/transports/smtp.c:764
+#, c-format
+msgid "Sending E-mail to `%s' failed.\n"
+msgstr "Enviando un correo electrónico a '%s' se produjo un fallo.\n"
 
-#: src/applications/chat/chat.c:160
+#: src/transports/smtp.c:815
 #, 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"
+msgid "SMTP server send unexpected response at %s:%d.\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:197
+#: src/transports/smtp.c:838
 #, c-format
-msgid "`%s' registering handlers %d and %d\n"
-msgstr "'%s' registrando manejadores %d y %d\n"
+msgid ""
+"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:212
-msgid "enables P2P-chat (incomplete)"
-msgstr "Activa el chat P2P (incompleto)"
+#: src/transports/smtp.c:844
+#, c-format
+msgid "Failed to send `%s' request to SMTP server.\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
-msgstr "especifica el apodo"
+#: src/transports/smtp.c:903
+#, c-format
+msgid "%.*s filter %s (SMTP)"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
-msgstr "Arranca el cliente de chat de GNUnet"
+#: src/transports/tcp.c:465
+#, c-format
+msgid ""
+"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:106
-#: src/conf/gnunet-setup.c:286 src/server/gnunet-peer-info.c:107
-#: src/server/gnunet-transport-check.c:521 src/server/gnunet-update.c:142
-#: src/server/startup.c:574
+#: src/transports/tcp.c:499
 #, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Usar --help para obtener una lista de opciones.\n"
+msgid ""
+"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:151
-#: src/applications/fs/tools/gnunet-delete.c:142
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363 src/util/port.c:85
-msgid "Could not connect to gnunetd.\n"
-msgstr "Imposible conectar con gnunetd.\n"
+#: src/transports/tcp.c:1082
+msgid "Could not determine my public IP address.\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:155
+#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
 #, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "Debes especificar un apodo (use la opción '%s').\n"
+msgid "Failed to start transport service on port %d.\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
-msgstr "Imposible mandar el mensaje a gnunetd\n"
+#: src/transports/tcp.c:1449
+msgid "# bytes received via TCP"
+msgstr "# bytes recibidos por TCP"
 
-#: src/applications/chat/gnunet-chat.c:191
-msgid "Could not send message to gnunetd\n"
-msgstr "Imposible mandar el mensaje a gnunetd\n"
+#: src/transports/tcp.c:1451
+msgid "# bytes sent via TCP"
+msgstr "# bytes enviados por TCP"
 
-#: src/applications/datastore/datastore.c:118
-#, c-format
-msgid "Availability test failed for `%s' at %s:%d.\n"
-msgstr "Test de disponibilidad fallido para '%s' en %s:%d.\n"
+#: src/transports/tcp.c:1453
+msgid "# bytes dropped by TCP (outgoing)"
+msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/applications/datastore/datastore.c:142
+#: src/transports/udp.c:179
 #, c-format
-msgid "Database failed to delete `%s'.\n"
-msgstr "Falló al borrar de la base de datos %s.\n"
+msgid "Failed to bind to UDP port %d.\n"
+msgstr ""
 
-#: src/applications/datastore/filter.c:42
+#: src/transports/udp.c:250
 #, c-format
-msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
+msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
 msgstr ""
-"La configuración debe especificar un directorio para los datos FS en la 
sección '%s' bajo"
-"'%s'.\n"
 
-#: src/applications/dht/module/cs.c:446
+#: src/transports/udp.c:307
 #, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "'%s' falló: ¡tabla no encontrada!\n"
+msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+msgstr "Recibido mensaje UDP no válido del %u.%u.%u.%u:%u, omitiendo.\n"
 
-#: src/applications/dht/module/cs.c:466
+#: src/transports/udp.c:332
 #, c-format
-msgid "`%s' failed.  Terminating connection to client.\n"
-msgstr "'%s' falló.  Finalizando conexión con el cliente.\n"
+msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
+msgstr ""
 
-#: src/applications/dht/module/cs.c:542
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "sendAck falló. Finalizando conexión con el cliente.\n"
+#: src/transports/udp.c:417
+msgid "UDP: Could not determine my public IP address.\n"
+msgstr "UDP: Imposible determinar mi dirección IP pública.\n"
 
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/transports/udp.c:551
 #, c-format
-msgid "`%s' failed. Terminating connection to client.\n"
-msgstr "'%s' falló. Finalizando conexión con el cleinte.\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"
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
-#, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Falló al entregar el mensaje '%s'.\n"
+#: src/transports/udp.c:707
+msgid "# bytes received via UDP"
+msgstr "# bytes recibidos vía UDP"
 
-#: src/applications/dht/module/dht.c:946
-#, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr "Campo opcional anómalo '%s' recibido del par '%s'.\n"
+#: src/transports/udp.c:709
+msgid "# bytes sent via UDP"
+msgstr "# bytes enviados vía UDP"
 
-#: src/applications/dht/module/dht.c:973
+#: src/transports/udp.c:711
+msgid "# bytes dropped by UDP (outgoing)"
+msgstr "# bytes omitidos por UDP (salientes)"
+
+#: src/transports/ip.c:124
 #, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+msgid ""
+"Could not find interface `%s' in `%s', trying to find another interface.\n"
+msgstr ""
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
+#: src/transports/ip.c:149
 #, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
+msgid "Could not obtain IP for interface `%s' using `%s'.\n"
+msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
-#: src/applications/dht/module/dht.c:1447
+#: src/transports/ip.c:193
 #, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Respuesta inválida a '%s' del par '%s'.\n"
+msgid "Could not find an IP address for interface `%s'.\n"
+msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#: src/transports/ip.c:203
 #, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "'%s' fue llamada con un retraso de una hora(¿bug?)\n"
+msgid ""
+"There is more than one IP address specified for interface `%s'.\n"
+"GNUnet will use %u.%u.%u.%u.\n"
+msgstr ""
+"Hay más de una dirección IP especificada para la interfaz '%s'.\n"
+"GNUnet usará %u.%u.%u.%u.\n"
 
-#: src/applications/dht/module/dht.c:1793
+#: src/transports/ip.c:224
 #, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Respuesta inválida a '%s'.\n"
+msgid "Could not resolve `%s' to determine our IP address: %s\n"
+msgstr "Imposible resolver '%s' para determinar nuestra dirección IP: %s\n"
 
-#: src/applications/dht/module/dht.c:1993
+#: src/transports/ip.c:256
 #, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr "Respuesta anómala a '%s' en la tabla maestra.\n"
+msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/transports/ip.c:306
+msgid "Failed to obtain my (external) IP address!\n"
+msgstr "¡Falló al obtener mi dirección IP (externa)!\n"
+
+#: src/transports/tcp6.c:439
+msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:469
+msgid ""
+"Received malformed message from tcp6-peer connection. Closing connection.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:958
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "Imposible determinar mi dirección IPv6 pública.\n"
+
+#: src/transports/tcp6.c:1002
 #, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Respuesta inválida a '%s' de '%s'\n"
+msgid "`%s': unknown service: %s\n"
+msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/session/sessiontest.c:48
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:107
+#: src/applications/tbench/tbenchtest_udp.c:107
+#: src/applications/gap/gaptest.c:52
+msgid "# of connected peers"
+msgstr "# de pares conectados"
+
+#: src/applications/dht/tools/dhttest2.c:128
+#: src/applications/session/sessiontest.c:118
+#: src/applications/tbench/tbenchtest.c:199
+#: src/applications/tbench/tbenchtest_udp.c:201
+#: src/applications/gap/gaptest.c:318
 #, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Recibido RPC '%s' inválida.\n"
+msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+msgstr "Esperando a gnunetd para empezar (%u ciclos restantes)...\n"
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/session/sessiontest.c:133
+#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/tbench/tbenchtest_udp.c:122
+#: src/applications/gap/gaptest.c:330
 #, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
-msgstr "¡RPC para '%s' recibida de la tabla en la cual no participamos!\n"
+msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "Reserva SIZE bytes de memoria para la tabla local"
+#: src/applications/dht/tools/dht-query.c:39
+msgid "query table called NAME"
+msgstr "pregunta a la tabla llamada NAME"
 
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
-msgstr "únete a la tabla llamada NAME"
+#: src/applications/dht/tools/dht-query.c:41
+msgid "allow TIME ms to process each command"
+msgstr "Reserva TIME ms para procesar cada comando"
 
-#: src/applications/dht/tools/dht-join.c:51
-msgid "Join a DHT."
-msgstr "Únete a DHT"
+#: src/applications/dht/tools/dht-query.c:46
+msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
+msgstr "Pregunta (coje KEY, pone KEY VALUE, borra KEY VALUE) a una tabla DHT."
 
+#: src/applications/dht/tools/dht-query.c:84
 #: src/applications/dht/tools/dht-join.c:85
-#: src/applications/dht/tools/dht-query.c:84
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
 #: src/applications/tbench/gnunet-tbench.c:124
 #: src/applications/tbench/gnunet-tbench.c:134
 #: src/applications/tbench/gnunet-tbench.c:147
@@ -348,6 +353,13 @@
 #: src/applications/tracekit/gnunet-tracekit.c:87
 #: src/applications/tracekit/gnunet-tracekit.c:122
 #: src/applications/tracekit/gnunet-tracekit.c:136
+#: src/applications/fs/tools/gnunet-pseudonym.c:120
+#: src/applications/fs/tools/gnunet-insert.c:315
+#: src/applications/fs/tools/gnunet-insert.c:461
+#: src/applications/fs/tools/gnunet-search.c:167
+#: src/applications/fs/tools/gnunet-search.c:183
+#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/fs/tools/gnunet-download.c:96
 #: src/server/gnunet-transport-check.c:448
 #: src/server/gnunet-transport-check.c:462
 #: src/server/gnunet-transport-check.c:479
@@ -356,56 +368,30 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción '%s'.\n"
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
-msgstr "Argumentos superfluos (ignorados).\n"
-
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-query.c:99
+#: src/applications/dht/tools/dht-join.c:108
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546
+#: src/applications/stats/gnunet-stats.c:144
+#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tracekit/gnunet-tracekit.c:153
+#: src/applications/fs/tools/gnunet-pseudonym.c:232
+#: src/applications/fs/tools/gnunet-delete.c:111
+#: src/applications/fs/tools/gnunet-directory.c:190
+#: src/applications/fs/tools/gnunet-insert.c:532
+#: src/applications/fs/tools/gnunet-search.c:221
+#: src/applications/fs/tools/gnunet-download.c:130
+#: src/applications/fs/tools/gnunet-unindex.c:140
+#: src/applications/template/gnunet-template.c:87
+#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
+#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
+#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
 #, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "La llamada a '%s' devuelve %d.\n"
+msgid "Use --help to get a list of options.\n"
+msgstr "Usar --help para obtener una lista de opciones.\n"
 
-#: src/applications/dht/tools/dht-join.c:132
-#, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Llamada a '%s' con la clave '%s'.\n"
-
-#: src/applications/dht/tools/dht-join.c:133
-#, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Llama a '%s' con el valor '%.*s' (%d bytes).\n"
-
-#: src/applications/dht/tools/dht-join.c:211
-#: src/applications/dht/tools/dht-query.c:231
-#, c-format
-msgid "No table name specified, using `%s'.\n"
-msgstr "Ningún nombre especificado para la tabla, usando '%s'.\n"
-
-#: src/applications/dht/tools/dht-join.c:236
-msgid "Error joining DHT.\n"
-msgstr "Error uniéndose a DHT.\n"
-
-#: src/applications/dht/tools/dht-join.c:243
-#, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr "Unido a DHT.  Pulsa CTRL-C para abandonarlo.\n"
-
-#: src/applications/dht/tools/dht-join.c:250
-msgid "Error leaving DHT.\n"
-msgstr "Error abandonando DHT.\n"
-
-#: src/applications/dht/tools/dht-query.c:39
-msgid "query table called NAME"
-msgstr "pregunta a la tabla llamada NAME"
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-msgstr "Reserva TIME ms para procesar cada comando"
-
-#: src/applications/dht/tools/dht-query.c:46
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
-msgstr "Pregunta (coje KEY, pone KEY VALUE, borra KEY VALUE) a una tabla DHT."
-
 #: src/applications/dht/tools/dht-query.c:106
 msgid "No commands specified.\n"
 msgstr "Ningún comando fue especificado.\n"
@@ -422,6 +408,12 @@
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s, %s)' falló.\n"
 
+#: src/applications/dht/tools/dht-query.c:231
+#: src/applications/dht/tools/dht-join.c:211
+#, c-format
+msgid "No table name specified, using `%s'.\n"
+msgstr "Ningún nombre especificado para la tabla, usando '%s'.\n"
+
 #: src/applications/dht/tools/dht-query.c:246
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
@@ -500,302 +492,1405 @@
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Respuesta inesperada a la operación '%s'.\n"
 
-#: src/applications/dht/tools/dhttest2.c:50 src/applications/gap/gaptest.c:52
-#: src/applications/session/sessiontest.c:48
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:107
-msgid "# of connected peers"
-msgstr "# de pares conectados"
+#: src/applications/dht/tools/dht-join.c:43
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "Reserva SIZE bytes de memoria para la tabla local"
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
-#: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:199
+#: src/applications/dht/tools/dht-join.c:45
+msgid "join table called NAME"
+msgstr "únete a la tabla llamada NAME"
+
+#: src/applications/dht/tools/dht-join.c:51
+msgid "Join a DHT."
+msgstr "Únete a DHT"
+
+#: src/applications/dht/tools/dht-join.c:115
+msgid "Superflous arguments (ignored).\n"
+msgstr "Argumentos superfluos (ignorados).\n"
+
+#: src/applications/dht/tools/dht-join.c:131
 #, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Esperando a gnunetd para empezar (%u ciclos restantes)...\n"
+msgid "Call to `%s' returns %d.\n"
+msgstr "La llamada a '%s' devuelve %d.\n"
 
-#: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/gap/gaptest.c:330
-#: src/applications/session/sessiontest.c:133
-#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/dht/tools/dht-join.c:132
 #, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
+msgid "Call to `%s' with key `%s'.\n"
+msgstr "Llamada a '%s' con la clave '%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:557
-msgid "# messages defragmented"
-msgstr "# mensajes defragmentados"
+#: src/applications/dht/tools/dht-join.c:133
+#, c-format
+msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+msgstr "Llama a '%s' con el valor '%.*s' (%d bytes).\n"
 
-#: src/applications/fragmentation/fragmentation.c:558
-msgid "# messages fragmented"
-msgstr "# mensajes fragmentados"
+#: src/applications/dht/tools/dht-join.c:236
+msgid "Error joining DHT.\n"
+msgstr "Error uniéndose a DHT.\n"
 
-#: src/applications/fragmentation/fragmentation.c:559
-msgid "# fragments discarded"
-msgstr "# fragmentos descartados"
+#: src/applications/dht/tools/dht-join.c:243
+#, c-format
+msgid "Joined DHT.  Press CTRL-C to leave.\n"
+msgstr "Unido a DHT.  Pulsa CTRL-C para abandonarlo.\n"
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/dht/tools/dht-join.c:250
+msgid "Error leaving DHT.\n"
+msgstr "Error abandonando DHT.\n"
+
+#: src/applications/dht/module/dht.c:946
 #, c-format
-msgid "`%s' registering handler %d\n"
-msgstr "'%s' registrando manejador %d\n"
+msgid "Malformed optional field `%s' received from peer `%s'.\n"
+msgstr "Campo opcional anómalo '%s' recibido del par '%s'.\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/dht/module/dht.c:973
 #, c-format
-msgid "Could not unlink temporary file `%s': %s\n"
-msgstr "Imposible desenlazar temporalmente el fichero '%s': %s\n"
+msgid "Could not find peer `%s' in routing table!\n"
+msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/applications/fs/ecrs/download.c:257
+#: src/applications/dht/module/dht.c:1120
+#: src/applications/dht/module/dht.c:1135
 #, c-format
-msgid "Write(%d, %p, %d) failed: %s\n"
-msgstr "Escribiendo(%d, %p, %d) se produjo un fallo: %s\n"
+msgid "Received malformed response to `%s' from peer `%s'.\n"
+msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/applications/fs/ecrs/download.c:927
+#: src/applications/dht/module/dht.c:1447
+#, c-format
+msgid "Invalid response to `%s' from peer `%s'.\n"
+msgstr "Respuesta inválida a '%s' del par '%s'.\n"
+
+#: src/applications/dht/module/dht.c:1603
+#: src/applications/dht/module/dht.c:2340
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "'%s' fue llamada con un retraso de una hora(¿bug?)\n"
+
+#: src/applications/dht/module/dht.c:1793
+#, c-format
+msgid "Invalid response to `%s'.\n"
+msgstr "Respuesta inválida a '%s'.\n"
+
+#: src/applications/dht/module/dht.c:1993
+#, c-format
+msgid "Malformed response to `%s' on master table.\n"
+msgstr "Respuesta anómala a '%s' en la tabla maestra.\n"
+
+#: src/applications/dht/module/dht.c:2207
+#: src/applications/dht/module/dht.c:2507
+#, c-format
+msgid "Invalid response to `%s' from `%s'\n"
+msgstr "Respuesta inválida a '%s' de '%s'\n"
+
+#: src/applications/dht/module/dht.c:2881
+#: src/applications/dht/module/dht.c:3021
+#: src/applications/dht/module/dht.c:3148
+#: src/applications/dht/module/dht.c:3282
+#, c-format
+msgid "Received invalid RPC `%s'.\n"
+msgstr "Recibido RPC '%s' inválida.\n"
+
+#: src/applications/dht/module/dht.c:3160
+#: src/applications/dht/module/dht.c:3296
+#, c-format
+msgid "RPC for `%s' received for table that we do not participate in!\n"
+msgstr "¡RPC para '%s' recibida de la tabla en la cual no participamos!\n"
+
+#: src/applications/dht/module/cs.c:446
+#, c-format
+msgid "`%s' failed: table not found!\n"
+msgstr "'%s' falló: ¡tabla no encontrada!\n"
+
+#: src/applications/dht/module/cs.c:466
+#, c-format
+msgid "`%s' failed.  Terminating connection to client.\n"
+msgstr "'%s' falló.  Finalizando conexión con el cliente.\n"
+
+#: src/applications/dht/module/cs.c:542
+msgid "sendAck failed.  Terminating connection to client.\n"
+msgstr "sendAck falló. Finalizando conexión con el cliente.\n"
+
+#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
+#: src/applications/dht/module/cs.c:688
+#, c-format
+msgid "`%s' failed. Terminating connection to client.\n"
+msgstr "'%s' falló. Finalizando conexión con el cleinte.\n"
+
+#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#, c-format
+msgid "Failed to deliver `%s' message.\n"
+msgstr "Falló al entregar el mensaje '%s'.\n"
+
+#: src/applications/chat/chat.c:87
+msgid "Message received from peer is invalid.\n"
+msgstr "El mensaje recibido del par es inválido.\n"
+
+#: src/applications/chat/chat.c:134
+msgid "Message received from client is invalid\n"
+msgstr "El mensaje recibido del cliente es inválido\n"
+
+#: src/applications/chat/chat.c:156
+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:160
+#, 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:197
+#, c-format
+msgid "`%s' registering handlers %d and %d\n"
+msgstr "'%s' registrando manejadores %d y %d\n"
+
+#: src/applications/chat/chat.c:212
+msgid "enables P2P-chat (incomplete)"
+msgstr "Activa el chat P2P (incompleto)"
+
+#: src/applications/chat/gnunet-chat.c:82
+msgid "specify nickname"
+msgstr "especifica el apodo"
+
+#: src/applications/chat/gnunet-chat.c:87
+msgid "Start GNUnet chat client."
+msgstr "Arranca el cliente de chat de GNUnet"
+
+#: src/applications/chat/gnunet-chat.c:151
+#: src/applications/tbench/gnunet-tbench.c:213
+#: src/applications/tracekit/gnunet-tracekit.c:363
+#: src/applications/fs/tools/gnunet-delete.c:142
+msgid "Could not connect to gnunetd.\n"
+msgstr "Imposible conectar con gnunetd.\n"
+
+#: src/applications/chat/gnunet-chat.c:155
+#, c-format
+msgid "You must specify a nickname (use option `%s').\n"
+msgstr "Debes especificar un apodo (use la opción '%s').\n"
+
+#: src/applications/chat/gnunet-chat.c:182
+msgid "Could not send join message to gnunetd\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
+
+#: src/applications/chat/gnunet-chat.c:191
+msgid "Could not send message to gnunetd\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
+
+#: src/applications/advertising/advertising.c:161
+#, c-format
+msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgstr "mensaje de saludo de '%s' inválido (firma inválida). Omitiendo.\n"
+
+#: src/applications/advertising/advertising.c:167
 msgid ""
-"Decrypted content does not match key. This is either a bug or a maliciously "
-"inserted file. Download aborted.\n"
+"hello message received invalid (expiration time over limit). Dropping.\n"
 msgstr ""
-"El contenido desencriptado no encuentra una clave. Esto puede ser un bug o "
-"un fichero introducido maliciosamente. Descarga abortada.\n"
+"mensaje de saludo recibido inválido (tiempo superior al límite). Omitiendo.\n"
 
-#: src/applications/fs/ecrs/download.c:1104
+#: src/applications/advertising/advertising.c:176
 #, c-format
+msgid "hello advertisement for protocol %d received.\n"
+msgstr "Inicio de comunicación del protocolo %d recibido.\n"
+
+#: src/applications/advertising/advertising.c:295
+msgid "Could not send hellos+PING, ping buffer full.\n"
+msgstr "Imposible mandar ahora saludos+PING, buffer del ping lleno.\n"
+
+#: src/applications/advertising/advertising.c:308
+#, c-format
+msgid "`%s' failed (%d, %u). Will not send PING.\n"
+msgstr "'%s' falló (%d, %u). No se mandará el PING.\n"
+
+#: src/applications/advertising/advertising.c:463
+#, c-format
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
+
+#: src/applications/advertising/advertising.c:470
 msgid ""
-"Content `%s' seems to be not available on the network (tried %u times).\n"
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
+msgstr "Es inútil anunciarnos: no hay más pares que nos conozcan más allá.\n"
+
+#: src/applications/advertising/advertising.c:572
+#, c-format
+msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+msgstr "Eliminando saludo del par '%s' (expiró hace %ds).\n"
+
+#: src/applications/advertising/advertising.c:734
+msgid "# Peer advertisements received"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/applications/advertising/advertising.c:735
+msgid "# Self advertisments transmitted"
+msgstr "# Auto-anuncios transmitidos"
+
+#: src/applications/advertising/advertising.c:736
+msgid "# Foreign advertisements forwarded"
+msgstr "# Anuncios a extraños mandados"
+
+#: src/applications/advertising/advertising.c:738
+#: src/applications/pingpong/pingpong.c:462
+msgid "# plaintext PING messages sent"
+msgstr "# mensajes de texto mandados por PING"
+
+#: src/applications/advertising/advertising.c:742
+#: src/applications/session/connect.c:752
+#, c-format
+msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
+msgstr "'%s' registrando manejador %d (texto plano e hipertexto)\n"
+
+#: src/applications/advertising/advertising.c:761
+msgid "Network advertisements disabled by configuration!\n"
+msgstr "¡Advertencias de la red desconectadas por configuración!\n"
+
+#: src/applications/advertising/advertising.c:781
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
-"El contenido '%s' parece no estar disponible en la red (intentado %u 
veces).\n"
+"Asegura que este par es conocido por otros pares y descubre otros pares"
 
-#: src/applications/fs/ecrs/meta.c:842
+#: src/applications/topology_default/topology.c:398
 #, c-format
-msgid "Renaming of file `%s' to `%s' failed: %s\n"
-msgstr "Al renombrar el fichero '%s' a '%s' se produjo un fallo: %s\n"
+msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
+msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:850
+#: src/applications/pingpong/pingpong.c:120
+#: src/applications/pingpong/pingpong.c:179
+#: src/applications/pingpong/pingpong.c:227
+#: src/applications/pingpong/pingpong.c:292
 #, c-format
-msgid "Could not rename file `%s' to `%s': file exists\n"
-msgstr "Imposible renombrar el fichero '%s' a '%s': el fichero ya existe\n"
+msgid "Received malformed `%s' message. Dropping.\n"
+msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/pingpong/pingpong.c:130
+msgid "Received ping for another peer. Dropping.\n"
+msgstr "Recibido ping de otro par. Omitiendo.\n"
+
+#: src/applications/pingpong/pingpong.c:187
+msgid "Received PING not destined for us!\n"
+msgstr "¡Recibido PING no destinado a nosotros!\n"
+
+#: src/applications/pingpong/pingpong.c:267
+#: src/applications/pingpong/pingpong.c:325
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:366
+msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:452
+msgid "# encrypted PONG messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/applications/pingpong/pingpong.c:454
+msgid "# plaintext PONG messages received"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:456
+msgid "# encrypted PING messages received"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:458
+msgid "# PING messages created"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:460
+msgid "# encrypted PONG messages sent"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:464
+msgid "# encrypted PING messages sent"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:473
 #, c-format
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+msgstr "'%s' registrando manejadores %d %d (texto plano e hipertexto)\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:44
+#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_mysql/mysql.c:137
+#: src/applications/sqstore_mysql/mysql.c:144
+#: src/applications/sqstore_mysql/mysql.c:386
+#: src/applications/sqstore_mysql/mysql.c:725
+#: src/applications/sqstore_mysql/mysql.c:740
+#: src/applications/sqstore_mysql/mysql.c:749
+#: src/applications/sqstore_mysql/mysql.c:773
+#: src/applications/sqstore_mysql/mysql.c:783
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:922
+#: src/applications/sqstore_mysql/mysql.c:932
+#: src/applications/sqstore_mysql/mysql.c:1004
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1053
+#: src/applications/sqstore_mysql/mysql.c:1067
+#: src/applications/kvstore_sqlite/kv_sqlite.c:43
+#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:139
+msgid "Unable to initialize SQLite.\n"
+msgstr "Imposible inicializar SQLite.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:271
+#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_mysql/mysql.c:223
+#: src/applications/sqstore_mysql/mysql.c:800
+#, c-format
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:272
+#: src/applications/sqstore_sqlite/sqlite.c:290
+msgid "sqlite datastore"
+msgstr "base de datos sqlite"
+
+#: src/applications/sqstore_sqlite/sqlite.c:1035
+#, c-format
 msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
-msgstr "El fichero de configuración debe especificar un directorio para que 
GNUnet "
-"almacene la información por-par bajo %s%s.\n"
+"Configuration file must specify directory for storing FS data in section `%"
+"s' under `%s'.\n"
+msgstr ""
+"El fichero de configuración debe especificar el directorio para almacenar "
+"los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/applications/fs/ecrs/namespace.c:133
+#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1178
+msgid "# bytes in datastore"
+msgstr "# bytes en la base de datos"
+
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
+msgid "Could not initialize libgnunetutil!\n"
+msgstr "¡Imposible inicializar libgnunetutil!\n"
+
+#: src/applications/session/connect.c:209
 #, c-format
-msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
-msgstr "Imposible crear el pseudónimo '%s', el fichero '%s' ya existe.\n"
+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/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/session/connect.c:246
+msgid "Cannot encrypt sessionkey, other peer not known!\n"
+msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
+
+#: src/applications/session/connect.c:523
 #, c-format
-msgid "File `%s' does not contain a pseudonym.\n"
-msgstr "El fichero '%s' no contiene un pseudónimo.\n"
+msgid "Invalid `%s' message received from peer `%s'.\n"
+msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/session/connect.c:532
 #, c-format
-msgid "Format of pseudonym `%s' is invalid.\n"
-msgstr "Formato del pseudónimo '%s' no es válido.\n"
+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/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/session/connect.c:587
+msgid ""
+"Error parsing encrypted session key, given message part size is invalid.\n"
+msgstr ""
+"Error pasando la clave de sesión encriptada, el mensaje dado del tamaño de "
+"las partes es inválido.\n"
+
+#: src/applications/session/connect.c:597
 #, c-format
-msgid "Format of file `%s' is invalid.\n"
-msgstr "El formato del fichero '%s' no es válido.\n"
+msgid "Unknown type in embedded message: %u (size: %u)\n"
+msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
 
-#: src/applications/fs/ecrs/search.c:160
-msgid "CHK URI not allowed for search.\n"
-msgstr "CHK URI no autorizado para buscar.\n"
+#: src/applications/session/connect.c:742
+msgid "# session keys sent"
+msgstr "# claves de la sesión mandadas"
 
-#: src/applications/fs/ecrs/search.c:216
-msgid "LOC URI not allowed for search.\n"
-msgstr "LOC URI no autorizado para buscar.\n"
+#: src/applications/session/connect.c:744
+msgid "# session keys rejected"
+msgstr "# claves de la sesión rechazadas"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/session/connect.c:746
+msgid "# session keys accepted"
+msgstr "# claves de la sesión aceptadas"
+
+#: src/applications/session/connect.c:748
+msgid "# sessions established"
+msgstr "# sesiones establecidas"
+
+#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
 #, c-format
-msgid "`%s' is not a file.\n"
-msgstr "'%s' no es un fichero.\n"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
+msgstr ""
+"%s::%s - RPC %s:%p no pudo ser registrada: otro evento está actualmente "
+"usando este nombre (%p)\n"
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
 #, c-format
-msgid "Cannot get size of file `%s'"
-msgstr "Imposible determinar el tamaño del fichero '%s'"
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
+msgstr ""
+"%s::%s - RPC %s:%p no pudo ser desregistrada: otro evento está actualmente "
+"registrado con este nombre (%p)\n"
 
-#: src/applications/fs/ecrs/upload.c:193
-msgid "Failed to connect to gnunetd."
-msgstr "Fallo al conectarse a gnunetd"
+#: src/applications/rpc/rpc.c:232
+#, c-format
+msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
+msgstr "%s::%s - RPC %s:%p no pudo ser desregistrada: no encontrada\n"
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/rpc/rpc.c:279
 #, c-format
-msgid "Cannot hash `%s'.\n"
-msgstr "Imposible hallar el hash de '%s'.\n"
+msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
+msgstr "%s::%s RPC asíncrona %s:%p no pudo ser desregistrada: no encontrada\n"
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
+#: src/applications/rpc/rpc.c:1084
 #, 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"
+msgid "Invalid message of type %u received.  Dropping.\n"
+msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/applications/fs/ecrs/upload.c:227
+#: src/applications/rpc/rpc.c:936
 #, c-format
-msgid "Indexing file `%s' failed. Trying to insert file...\n"
-msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
+msgid "Dropping RPC request %u: message malformed.\n"
+msgstr "Omitiendo la petición RPC %u: mensaje mal formado.\n"
 
-#: src/applications/fs/ecrs/upload.c:306
+#: src/applications/rpc/rpc.c:1388
 #, c-format
-msgid "Indexing data failed at position %i.\n"
-msgstr "La indexación de los datos falló en la posición %i.\n"
+msgid "RPC not unregistered: %s:%p\n"
+msgstr "No fue desregistrada RPC: %s:%p\n"
 
-#: src/applications/fs/fsui/download.c:290
-msgid "Download aborted."
-msgstr "Descarga abortada"
+#: src/applications/rpc/rpc.c:1414
+#, c-format
+msgid "`%s' registering handlers %d %d %d\n"
+msgstr "'%s' registrando manejadores %d %d %d\n"
 
-#: src/applications/fs/fsui/download.c:294
-msgid "ECRS download failed (see logs)."
-msgstr "La descarga del ERCS falló (vea los logs)."
+#: src/applications/rpc/rpc.c:1435
+#, c-format
+msgid "Failed to initialize `%s' service.\n"
+msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/applications/fs/fsui/download.c:298
-msgid "ECRS download suspending."
-msgstr "La descarga del ERCS fue suspendida."
+#: src/applications/rpc/rpc.c:1491
+msgid "RPC async reply invalid.\n"
+msgstr "RPC respuesta asíncrona no válida.\n"
 
-#: src/applications/fs/fsui/download.c:302
-msgid "Unexpected download state."
-msgstr "Estado de descarga inesperado."
+#: src/applications/rpc/rpc.c:1562
+msgid "async RPC reply not received.\n"
+msgstr "respuesta RPC asíncrona no recibida.\n"
 
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-msgid "AND"
-msgstr "Y"
+#: src/applications/sqstore_mysql/mysql.c:224
+#: src/applications/sqstore_mysql/mysql.c:801
+msgid "mysql datastore"
+msgstr "base de datos mysql"
 
+#: src/applications/sqstore_mysql/mysql.c:1107
+#, c-format
+msgid "Query `%s' had no results.\n"
+msgstr "La pregunta '%s' no tuvo resultados.\n"
+
+#: src/applications/sqstore_mysql/mysql.c:1205
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
+
+#: src/applications/sqstore_mysql/mysql.c:1223
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
+msgstr ""
+"Falló al cargar el modulo de la base de datos MySQL.  ¡Comprueba que MySQL "
+"esta ejecutandose y esta configurada correctamente!\n"
+
+#: src/applications/datastore/filter.c:42
+#, c-format
+msgid ""
+"Configuration must specify directory for FS data in section `%s' under `%"
+"s'.\n"
+msgstr ""
+"La configuración debe especificar un directorio para los datos FS en la "
+"sección '%s' bajo'%s'.\n"
+
+#: src/applications/datastore/datastore.c:118
+#, c-format
+msgid "Availability test failed for `%s' at %s:%d.\n"
+msgstr "Test de disponibilidad fallido para '%s' en %s:%d.\n"
+
+#: src/applications/datastore/datastore.c:142
+#, c-format
+msgid "Database failed to delete `%s'.\n"
+msgstr "Falló al borrar de la base de datos %s.\n"
+
+#: src/applications/identity/hostkey.c:98
+#: src/applications/identity/identity.c:1086
 #: src/applications/fs/fsui/file_info.c:66
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1044
 #, c-format
 msgid ""
 "Configuration file must specify a directory for GNUnet to store per-peer "
 "data under %s%s\n"
 msgstr ""
-"El fichero de configuración debe especificar un directorio para que GNUnet 
almacene "
-"la información por-par bajo%s%s\n"
+"El fichero de configuración debe especificar un directorio para que GNUnet "
+"almacene la información por-par bajo%s%s\n"
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr "Recolección de identificadores de fichero desactivada.\n"
+#: src/applications/identity/hostkey.c:119
+#, c-format
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+msgstr ""
+"Se produjo un fallo al comprobar la clave local existente en el fichero '%"
+"s', creando nueva clave local.\n"
 
-#: src/applications/fs/fsui/file_info.c:292
+#: src/applications/identity/hostkey.c:127
+msgid "Creating new hostkey (this may take a while).\n"
+msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
+
+#: src/applications/identity/hostkey.c:130
+msgid "Could not create hostkey!\n"
+msgstr "¡Imposible crear la clave local!\n"
+
+#: src/applications/identity/hostkey.c:139
+msgid "Done creating hostkey.\n"
+msgstr "Correcto al crear la clave local.\n"
+
+#: src/applications/identity/identity.c:333
 #, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr "Borrada base de datos de URIs corrupta en '%s'."
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
+"Eliminando.\n"
 
-#: src/applications/fs/fsui/fsui.c:189
-msgid "FSUI persistence: error restoring download\n"
-msgstr "FSUI persistente: error restableciendo la descarga\n"
+#: src/applications/identity/identity.c:366
+#, c-format
+msgid "%s `%s' returned no known hosts!\n"
+msgstr "¡%s '%s' devolvió hosts desconocidos!\n"
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/identity/identity.c:648
+#: src/applications/identity/identity.c:666
 #, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
-msgstr "Fichero del estado de FSUI '%s' tiene un error de sintáxis en la 
asignación %u.\n"
+msgid "Removed file `%s' containing invalid hello data.\n"
+msgstr "Borrando el fichero '%s' que contiene datos de saludo no válidos.\n"
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
-msgstr "¡Ninguna clave especificada!\n"
+#: src/applications/identity/identity.c:716
+#, c-format
+msgid "Signature failed verification: peer `%s' not known.\n"
+msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
-msgstr "Intervalo de publicación periódica cambiado."
+#: src/applications/identity/identity.c:724
+msgid "Signature failed verification: signature invalid.\n"
+msgstr "Falló la verificación de la firma: firma no válida.\n"
 
-#: src/applications/fs/fsui/namespace_info.c:604
+#: src/applications/testbed/commands.c:1130
+#: src/applications/stats/gnunet-stats.c:61
+#, c-format
+msgid "Supported peer-to-peer messages:\n"
+msgstr "Mensajes P2P soportados:\n"
+
+#: src/applications/testbed/commands.c:1132
+#: src/applications/stats/gnunet-stats.c:64
+#, c-format
+msgid "Supported client-server messages:\n"
+msgstr "Mensajes cliente-servidor soportados:\n"
+
+#: src/applications/testbed/gnunet-testbed.c:119
+msgid "Start GNUnet-testbed helper."
+msgstr ""
+
+#: src/applications/testbed/gnunet-testbed.c:183
+#, c-format
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgstr "Imposible conectar al puerto de LOOPBACK %d: %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:282
+#, c-format
+msgid "Could not execute `%s': %s\n"
+msgstr "Imposible ejecutar '%s': %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:325
+msgid "No client service started. Trying again in 30 seconds.\n"
+msgstr ""
+"No hay ningún servicio de cliente ejecutandose. Se volverá a intentar en 30 "
+"segundos.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:348
+#, c-format
 msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
 msgstr ""
-"publicaciones actualizadas para contenido actualizado periódicamente más de 
una semana antes de "
-"la tarea planificada.\n"
 
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr "¡Esta búsqueda está aún pendiente!\n"
+#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#, c-format
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
+msgstr "Rechazada conexión no autorizada de %u.%u.%u.%u.\n"
 
-#: src/applications/fs/fsui/unindex.c:85
-msgid "Unindex failed."
-msgstr "El desindexado falló"
+#: src/applications/testbed/gnunet-testbed.c:428
+#, c-format
+msgid "Protocol violation on socket. Expected command.\n"
+msgstr "Violación del protocolo en el socket. Esperando comando.\n"
 
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
-msgid "Upload failed."
-msgstr "Subida fallida"
+#: src/applications/testbed/gnunet-testbed.c:467
+#, c-format
+msgid "Command `%s' not found!\n"
+msgstr "¡Comando '%s' no encontrado!\n"
 
-#: src/applications/fs/fsui/upload.c:455
-msgid "Cannot upload directory without using recursion."
-msgstr "Imposible compartir un directorio sin hacerlo recursivamente."
+#: src/applications/testbed/gnunet-testbed.c:540
+msgid "Start GNUnet testbed controller."
+msgstr ""
 
-#: src/applications/fs/module/fs.c:1184
+#: src/applications/testbed/gnunet-testbed.c:594
 #, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+msgstr "Entrada mal formada en la configuración en la sección %s bajo %s: %s\n"
+
+#: src/applications/testbed/testbed.c:50
+msgid "Could not send acknowledgement back to client.\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:60
+#, c-format
+msgid "Received unknown testbed message of type %u.\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:78
+#: src/applications/testbed/testbed.c:807
+#, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
+msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
+
+#: src/applications/testbed/testbed.c:85
+#, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
+msgstr "el tamaño del mensaje '%s' es erroneo. Se ignora.\n"
+
+#: src/applications/testbed/testbed.c:137
+#, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
+msgstr "TESTBED no puede generar el mensaje de saludo para el protocolo %u\n"
+
+#: src/applications/testbed/testbed.c:215
+#: src/applications/testbed/testbed.c:256
+#: src/applications/testbed/testbed.c:359
+#: src/applications/testbed/testbed.c:366
+#: src/applications/testbed/testbed.c:403
+#: src/applications/testbed/testbed.c:410
+#, c-format
+msgid "received invalid `%s' message\n"
+msgstr "recibido mensaje '%s' no válido\n"
+
+#: src/applications/testbed/testbed.c:231
+#: src/applications/testbed/testbed.c:271
+#, c-format
+msgid "received invalid `%s' message (empty module name)\n"
+msgstr "recibido mensaje '%s' no válido (nombre del módulo vacío)\n"
+
+#: src/applications/testbed/testbed.c:238
+#, c-format
+msgid "loading module `%s' failed.  Notifying client.\n"
+msgstr ""
+"se produjo un fallo al cargar el módulo '%s'.  Notificando al cliente.\n"
+
+#: src/applications/testbed/testbed.c:278
+msgid "unloading module failed.  Notifying client.\n"
+msgstr "se produjo un fallo al descargar el módulo.  Notificando al cliente.\n"
+
+#: src/applications/testbed/testbed.c:539
+#, c-format
+msgid "`%s' %s failed: %s\n"
+msgstr "'%s' %s falló: %s\n"
+
+#: src/applications/testbed/testbed.c:625
+#, c-format
+msgid "received invalid `%s' message: %s.\n"
+msgstr "recibido mensaje '%s' no válido: %s.\n"
+
+#: src/applications/testbed/testbed.c:817
+#, c-format
+msgid "'..' is not allowed in file name (%s).\n"
+msgstr "'..' no esta permitido en el nombre del fichero(%s).\n"
+
+#: src/applications/testbed/testbed.c:826
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+msgstr "¡Nombre del fichero vacío para el mensaje UPLOAD_FILE es inválido!\n"
+
+#: src/applications/testbed/testbed.c:833
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+msgstr ""
+"Nombre del fichero para el mensaje UPLOAD_FILE no esta terminado en null "
+"(¡inválido!)\n"
+
+#: src/applications/testbed/testbed.c:841
+msgid "Upload refused!"
+msgstr "¡Subida rechazada!"
+
+#: src/applications/testbed/testbed.c:867
+#, c-format
+msgid "Invalid message received at %s:%d."
+msgstr "Mensaje inválido recibido en %s:%d."
+
+#: src/applications/testbed/testbed.c:985
+#, c-format
+msgid "received invalid testbed message of size %u\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:1002
+#, c-format
 msgid ""
-"You must specify a postive number for `%s' in the configuration in section `%"
-"s'.\n"
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
-"Debes especificar un número positivo para '%s' en la configuración en la 
sección '%s'.\n"
 
-#: src/applications/fs/module/fs.c:1233
+#: src/applications/testbed/testbed.c:1045
+msgid "No testbed URL given, not registered.\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:1079
+#: src/applications/bootstrap_http/http.c:81
 #, c-format
-msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
-msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "URL invalida '%s' (debe comenzar por '%s')\n"
 
-#: src/applications/fs/module/fs.c:1270
-msgid "enables (anonymous) file-sharing"
-msgstr "activa la compartición de ficheros anónima"
+#: src/applications/testbed/testbed.c:1118
+#, c-format
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
+msgstr ""
 
-#: src/applications/fs/module/migration.c:224
-msgid "# blocks migrated"
-msgstr "# blocks migrados"
+#: src/applications/testbed/testbed.c:1154
+#, c-format
+msgid "Could not register testbed, host `%s' unknown\n"
+msgstr ""
 
-#: src/applications/fs/module/migration.c:225
-msgid "# on-demand block migration attempts"
+#: src/applications/testbed/testbed.c:1177
+#, c-format
+msgid "Failed to send HTTP request to host `%s': %s\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+
+#: src/applications/testbed/testbed.c:1230
+#, c-format
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgstr "Falló al mandar la petición HTTP '%s' al host '%s': %s\n"
+
+#: src/applications/testbed/testbed.c:1269
+msgid "Exit register (error: no http response read).\n"
+msgstr "Saliendo del registro (error: no se leyó una respuesta de http).\n"
+
+#: src/applications/testbed/testbed.c:1357
+msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/transport/transport.c:483
+#: src/applications/transport/transport.c:491
+#, c-format
+msgid "No transport of type %d known.\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:676
+#, c-format
+msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:691
+#, c-format
+msgid ""
+"You should specify at least one transport service under option `%s' in "
+"section `%s'.\n"
+msgstr ""
+
+#: src/applications/transport/transport.c:717
+#, c-format
+msgid "Transport library `%s' did not provide required function '%s%s'.\n"
+msgstr ""
+"La biblioteca de transporte '%s' no provee la función '%s%s' requerida.\n"
+
+#: src/applications/transport/transport.c:738
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Yo soy el par '%s'.\n"
+
+#: src/applications/fragmentation/fragmentation.c:557
+msgid "# messages defragmented"
+msgstr "# mensajes defragmentados"
+
+#: src/applications/fragmentation/fragmentation.c:558
+msgid "# messages fragmented"
+msgstr "# mensajes fragmentados"
+
+#: src/applications/fragmentation/fragmentation.c:559
+msgid "# fragments discarded"
+msgstr "# fragmentos descartados"
+
+#: src/applications/fragmentation/fragmentation.c:569
+#, c-format
+msgid "`%s' registering handler %d\n"
+msgstr "'%s' registrando manejador %d\n"
+
+#: src/applications/stats/gnunet-stats.c:94
+msgid "prints supported protocol messages"
+msgstr "imprime los mensajes del protocolo"
+
+#: src/applications/stats/gnunet-stats.c:99
+msgid "Print statistics about GNUnet operations."
+msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
+
+#: src/applications/stats/gnunet-stats.c:167
+#, c-format
+msgid "Error establishing connection with gnunetd.\n"
+msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
+
+#: src/applications/stats/gnunet-stats.c:181
+#, c-format
+msgid "Error reading information from gnunetd.\n"
+msgstr "Se produjo un error leyendo información de gnunetd.\n"
+
+#: src/applications/stats/clientapi.c:179
+msgid "Uptime (seconds)"
+msgstr ""
+
+#: src/applications/stats/statistics.c:206
 #, fuzzy, c-format
-msgid "Indexed file disappeared, deleting block for query `%s'\n"
-msgstr "Fichero indexado desaparecido, borrando el bloque para preguntas 
'%s'\n"
+msgid "% of allowed network load (up)"
+msgstr "% de red permitida para la subida"
 
-#: src/applications/fs/module/ondemand.c:393
+#: src/applications/stats/statistics.c:208
+#, fuzzy, c-format
+msgid "% of allowed network load (down)"
+msgstr "% de red permitida para bajada"
+
+#: src/applications/stats/statistics.c:210
+#, fuzzy, c-format
+msgid "% of allowed cpu load"
+msgstr "% de CPU permitida para el uso"
+
+#: src/applications/stats/statistics.c:214
+msgid "# bytes of noise received"
+msgstr "# bytes de ruido recibidos"
+
+#: src/applications/stats/statistics.c:374
+msgid "keeps statistics about gnunetd's operation"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:95
+msgid "output in gnuplot format"
+msgstr "salida en formato de gnuplot"
+
+#: src/applications/tbench/gnunet-tbench.c:98
+msgid "number of iterations"
+msgstr "número de repeticiones"
+
+#: src/applications/tbench/gnunet-tbench.c:100
+msgid "number of messages to use per iteration"
+msgstr "número de mensajes a usar por iteración"
+
+#: src/applications/tbench/gnunet-tbench.c:102
+msgid "receiver host identifier (ENC file name)"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:104
+msgid "message size"
+msgstr "tamaño del mensaje"
+
+#: src/applications/tbench/gnunet-tbench.c:106
+msgid "sleep for SPACE ms after each a message block"
+msgstr "duerme durante SPACE ms después de cada bloque de mensajes"
+
+#: src/applications/tbench/gnunet-tbench.c:108
+msgid "time to wait for the completion of an iteration (in ms)"
+msgstr "tiempo para esperar hasta completar una iteración (en ms)"
+
+#: src/applications/tbench/gnunet-tbench.c:111
+msgid "number of messages in a message block"
+msgstr "número de mensajes en un bloque de mensajes"
+
+#: src/applications/tbench/gnunet-tbench.c:115
+msgid "Start GNUnet transport benchmarking tool."
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:225
+msgid "You must specify a receiver!\n"
+msgstr "¡Debes especificar un receptor!\n"
+
+#: src/applications/tbench/gnunet-tbench.c:228
 #, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgstr ""
+"ID del par receptor especificada no válida ('%s' no es un nombre válido).\n"
+
+#: src/applications/tbench/gnunet-tbench.c:249
+#, c-format
+msgid "Time:\n"
+msgstr "Tiempo:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:250
+#, c-format
+msgid "\tmax      %llums\n"
+msgstr "\tmax      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:252
+#, c-format
+msgid "\tmin      %llums\n"
+msgstr "\tmin      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:254
+#, c-format
+msgid "\tmean     %8.4fms\n"
+msgstr "\tmean     %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:256
+#, c-format
+msgid "\tvariance %8.4fms\n"
+msgstr "\tvariance %8.4fms\n"
+
+#: src/applications/tbench/gnunet-tbench.c:259
+#, c-format
+msgid "Loss:\n"
+msgstr "Perdido:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:260
+#, c-format
+msgid "\tmax      %u\n"
+msgstr "\tmax      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:262
+#, c-format
+msgid "\tmin      %u\n"
+msgstr "\tmin      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:264
+#, c-format
+msgid "\tmean     %8.4f\n"
+msgstr "\tmean     %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:266
+#, c-format
+msgid "\tvariance %8.4f\n"
+msgstr "\tvariance %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:275
+#, c-format
+msgid "Output format not known, this should not happen.\n"
+msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
+
+#: src/applications/tbench/gnunet-tbench.c:279
+#, c-format
 msgid ""
-"Because the file `%s' has been unavailable for 3 days it got removed from "
-"your share.  Please unindex files before deleting them as the index now "
-"contains invalid references!\n"
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
-"El fichero '%s' se ha eliminado de tus compartidos porque no ha estado "
-"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"
+"\n"
+"No se recibió el mensaje de gnunetd. ¿Está gnunetd ejecutandose?\n"
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/tbench/tbenchtest.c:57
+#: src/applications/tbench/tbenchtest_udp.c:57
 #, 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:84
+#: src/applications/tbench/tbenchtest_udp.c:84
+#, c-format
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
+msgstr ""
+
+#: src/applications/tbench/tbenchtest.c:89
+#: src/applications/tbench/tbenchtest_udp.c:89
+#, c-format
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+msgstr ""
+
+#: src/applications/tbench/tbenchtest.c:95
+#: src/applications/tbench/tbenchtest_udp.c:95
+#, c-format
 msgid ""
-"Configuration file must specify directory for storage of FS data in section `"
-"%s' under `%s'.\n"
-msgstr "El fichero de configuración debe especificar un directorio para el 
almacenamiento de los datos de FS "
-"en la sección '%s' bajo '%s'.\n"
+"\n"
+"Failed to receive reply from gnunetd.\n"
+msgstr ""
+"\n"
+"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/applications/fs/module/ondemand.c:617
-#, fuzzy, c-format
+#: src/applications/tbench/tbenchtest.c:211
+#: src/applications/tbench/tbenchtest_udp.c:213
+#, c-format
+msgid "Running benchmark...\n"
+msgstr ""
+
+#: src/applications/tbench/tbench.c:448
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:101
+msgid "probe network to the given DEPTH"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:103
 msgid ""
-"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
-msgstr "Bloque ODB '%s' desindexado del offset %llu perdido de la base de 
datos.\n"
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+msgstr ""
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1802
+#: src/applications/tracekit/gnunet-tracekit.c:107
+msgid "use PRIO for the priority of the trace request"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:110
+msgid "wait DELAY seconds for replies"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:114
+msgid "Trace GNUnet network topology."
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:222
+#, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "'%s' no esta conectado a ningún par.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:233
+#, c-format
+msgid ""
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:260
+#, c-format
+msgid "`%s' connected to `%s'.\n"
+msgstr "'%s' conectado a '%s'.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:275
+#, c-format
+msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:298
+#, c-format
+msgid "Peer `%s' did not report back.\n"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:387
+msgid "Could not send request to gnunetd.\n"
+msgstr ""
+
+#: src/applications/tracekit/tracekit.c:62
+#: src/applications/tracekit/tracekit.c:186
+#, c-format
+msgid "Received invalid `%s' message from `%s'.\n"
+msgstr ""
+
+#: src/applications/tracekit/tracekit.c:243
+msgid "TRACEKIT: routing table full, trace request dropped\n"
+msgstr ""
+
+#: src/applications/tracekit/tracekit.c:331
+#, c-format
+msgid "TRACEKIT: received invalid `%s' message\n"
+msgstr ""
+
+#: src/applications/tracekit/tracekit.c:431
+msgid "allows mapping of the network topology"
+msgstr ""
+
+#: src/applications/gap/gap.c:1617
+#, c-format
+msgid "GAP received invalid content from `%s'\n"
+msgstr "GAP recibido contenido no válido de '%s'\n"
+
+#: src/applications/gap/gap.c:1618
+msgid "myself"
+msgstr "yo"
+
+#: src/applications/gap/gap.c:1791
+msgid ""
+"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+msgstr ""
+"Solicitada la cobertura de tráfico pero el servicio de tráfico no ha sido "
+"cargado. Rechazando la petición.\n"
+
+#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
 msgid "Failed to get traffic stats.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
+#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
+#: src/applications/gap/gap.c:1819
+msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
+msgstr ""
+"Imposible satisfacer el nivel deseado de anonimato, ignorando la petición.\n"
+
+#: src/applications/gap/gap.c:2077
+msgid "# gap requests total received"
+msgstr ""
+
+#: src/applications/gap/gap.c:2078
+msgid "# gap requests policy: immediate drop"
+msgstr ""
+
+#: src/applications/gap/gap.c:2079
+msgid "# gap requests policy: not routed"
+msgstr ""
+
+#: src/applications/gap/gap.c:2080
+msgid "# gap requests policy: not answered"
+msgstr ""
+
+#: src/applications/gap/gap.c:2081
+msgid "# gap requests processed: attempted add to RT"
+msgstr ""
+
+#: src/applications/gap/gap.c:2082
+msgid "# gap requests processed: local result"
+msgstr ""
+
+#: src/applications/gap/gap.c:2083
+msgid "# gap routing successes (total)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2084
+msgid "# gap requests dropped: collision in RT"
+msgstr ""
+
+#: src/applications/gap/gap.c:2085
+msgid "# gap requests forwarded (counting each peer)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2086
+msgid "# gap duplicate requests (pending)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2087
+msgid "# gap duplicate requests that were re-tried"
+msgstr ""
+
+#: src/applications/gap/gap.c:2088
+msgid "# gap re-try ttl difference (cummulative)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2089
+msgid "# gap reply duplicates"
+msgstr ""
+
+#: src/applications/gap/gap.c:2090
+msgid "# gap spurious replies"
+msgstr ""
+
+#: src/applications/gap/gap.c:2091
+msgid "# gap routing slots currently in use"
+msgstr ""
+
+#: src/applications/gap/gap.c:2092
+msgid "# gap memory used for tracking seen content"
+msgstr ""
+
+#: src/applications/gap/gap.c:2093
+msgid "# gap memory used for tracking routing destinations"
+msgstr ""
+
+#: src/applications/gap/gap.c:2094
+msgid "# gap rewards pending"
+msgstr ""
+
+#: src/applications/gap/gap.c:2095
+msgid "# gap response weights"
+msgstr ""
+
+#: src/applications/gap/gap.c:2112
+msgid ""
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
+msgstr ""
+
+#: src/applications/gap/gap.c:2143
+#, c-format
+msgid "`%s' registering handlers %d %d\n"
+msgstr "'%s' registrando manejadores %d %d\n"
+
+#: src/applications/gap/pid_table.c:151
+msgid "# distinct interned peer IDs in pid table"
+msgstr ""
+
+#: src/applications/gap/pid_table.c:153
+msgid "# total RC of interned peer IDs in pid table"
+msgstr ""
+
+#: src/applications/getoption/getoption.c:75
+#, c-format
+msgid "`%s' registering client handler %d\n"
+msgstr "'%s' registrando un manejador de clientes %d\n"
+
+#: src/applications/getoption/getoption.c:82
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "permite a los clientes determinar la configuración de gnunetd"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:33
+#: src/applications/fs/tools/gnunet-insert.c:206
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "seleccione el NIVEL deseado de anonimato al enviar"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:35
+msgid "automate creation of a namespace by starting a collection"
+msgstr "creación automática de un espacio al empezar una colección"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:38
+msgid "create a new pseudonym under the given NICKNAME"
+msgstr "crea un nuevo pseudónimo bajo el APODO dado"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:40
+msgid "delete the pseudonym with the given NICKNAME"
+msgstr "borra el pseudónimo con el APODO dado"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:42
+msgid "end automated building of a namespace (ends collection)"
+msgstr ""
+"finaliza la construcción automática de un espacio (finaliza la recolección)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:46
+msgid ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"usa la clave dada para anunciar el espacio (úsalo cuando crees un nuevo "
+"pseudónimo)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:48
+msgid ""
+"specify that the contents of the namespace are of the given MIMETYPE (use "
+"when creating a new pseudonym)"
+msgstr ""
+"especifica que los contenidos del espacio son del MIMETYPE dado (úsalo "
+"cuando crees un nuevo pseudónimo)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:50
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"no genera un anuncio para este espacio (úsalo cuando crees un nuevo "
+"pseudónimo)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:52
+msgid "do not list the pseudonyms from the pseudonym database"
+msgstr "no listar los pseudónimos de la base de datos de pseudónimos"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:54
+msgid ""
+"specify NAME to be the realname of the user controlling the namespace (use "
+"when creating a new pseudonym)"
+msgstr ""
+"especifica el NAME  para ser el nombre real del usuario que controla el "
+"espacio (úsalo cuando crees un nuevo pseudónimo)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:56
+msgid ""
+"specify IDENTIFIER to be the address of the entrypoint to content in the "
+"namespace (use when creating a new pseudonym)"
+msgstr ""
+"especifica el IDENTIFIER para ser la dirección del punto de entrada al "
+"contenido en el espacio (úsalo cuando crees un nuevo pseudónimo)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:58
+msgid "set the rating of a namespace"
+msgstr "cambia la valoración de un espacio"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:60
+msgid ""
+"use DESCRIPTION to describe the content of the namespace (use when creating "
+"a new pseudonym)"
+msgstr ""
+"usa la DESCRIPTION para describir el contenido del espacio (úsalo cuando "
+"crees un nuevo pseudónimo)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:62
+msgid ""
+"specify the given URI as an address that contains more information about the "
+"namespace (use when creating a new pseudonym)"
+msgstr ""
+"especifica la URI dada como dirección que contiene mas información del "
+"espacio (úsalo cuando crees un nuevo pseudónimo)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:67
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr ""
+"Crea nuevos pseudónimos, borra pseudónimos o lista los pseudónimos "
+"existentes."
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:159
+#: src/applications/fs/tools/gnunet-pseudonym.c:164
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
+#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
+msgid "AND"
+msgstr "Y"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#, c-format
+msgid "Invalid argument: `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:241
+#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
+#: src/setup/gnunet-setup.c:179
+msgid "Invalid arguments. Exiting.\n"
+msgstr "Argumentos no válidos. Saliendo.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:282
+#, c-format
+msgid "Namespace `%s' has rating %d.\n"
+msgstr "El espacio '%s' ha sido valorado con un %d.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#, c-format
+msgid "Namespace `%s' (%s) has rating %d.\n"
+msgstr "El espacio '%s' (%s) ha sido valorado con un %d.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#, c-format
+msgid "\tRating (after update): %d\n"
+msgstr "\tValoración (después de la actualización): %d\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#, c-format
+msgid "Collection stopped.\n"
+msgstr "Colección detenida.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#, c-format
+msgid "Failed to stop collection (not active?).\n"
+msgstr "Falló al parar la recolección (¿no está activa?).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#, c-format
+msgid "Pseudonym `%s' deleted.\n"
+msgstr "El pseudónimo '%s' fue borrado.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#, c-format
+msgid "Error deleting pseudonym `%s' (does not exist?).\n"
+msgstr "Error borrando el pseudónimo '%s' (¿no existe?).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#, c-format
+msgid "Started collection `%s'.\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#, c-format
+msgid "Failed to start collection.\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#, c-format
+msgid "Could not create namespace `%s' (exists?).\n"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#, c-format
+msgid "Namespace `%s' created (root: %s).\n"
+msgstr "El espacio '%s' fue creado (root: %s).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#, c-format
+msgid "Could not access namespace information.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
 #: src/applications/fs/tools/gnunet-delete.c:37
 #, c-format
 msgid "%8u of %8u bytes deleted."
@@ -803,7 +1898,9 @@
 
 #: src/applications/fs/tools/gnunet-delete.c:52
 msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-msgstr "especifica el fichero a borrar de GNUnet (el fichero debe existir 
obligatoriamente)"
+msgstr ""
+"especifica el fichero a borrar de GNUnet (el fichero debe existir "
+"obligatoriamente)"
 
 #: src/applications/fs/tools/gnunet-delete.c:61
 msgid ""
@@ -848,7 +1945,9 @@
 
 #: src/applications/fs/tools/gnunet-directory.c:131
 msgid "remove all entries from the directory database and stop tracking URIs"
-msgstr "borra todas las entradas de la base de datos del directorio y detiene 
el seguimiento de URIs"
+msgstr ""
+"borra todas las entradas de la base de datos del directorio y detiene el "
+"seguimiento de URIs"
 
 #: src/applications/fs/tools/gnunet-directory.c:133
 msgid "list entries from the directory database"
@@ -871,61 +1970,6 @@
 msgid "Listed %d matching entries.\n"
 msgstr "%d entradas encontradas.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
-msgstr "NIVEL"
-
-#: src/applications/fs/tools/gnunet-download.c:42
-#: src/applications/fs/tools/gnunet-search.c:108
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
-
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
-msgstr "FICHERO"
-
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
-msgstr "escribe el fichero al FICHERO"
-
-#: src/applications/fs/tools/gnunet-download.c:50
-msgid "download a GNUnet directory recursively"
-msgstr "descarga un directorio de GNUnet recursivamente"
-
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
-msgstr "Descarga los ficheros de GNUnet"
-
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr "Argumentos insuficientes. Debes especificar una URI de un fichero de 
GNUnet\n"
-
-#: src/applications/fs/tools/gnunet-download.c:159
-#, c-format
-msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
-msgstr "Descargado del fichero '%s' el %16llu de %16llu bytes(%8.3f kbps)\n"
-
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
-#, c-format
-msgid "Error downloading: %s\n"
-msgstr "Error descargando: %s\n"
-
-#: src/applications/fs/tools/gnunet-download.c:191
-#, c-format
-msgid "Download of file `%s' complete.  Speed was %8.3f kilobyte per second.\n"
-msgstr "Descarga del fichero '%s' completada. La velocidad media fue 
%8.3fkilobytes por segundo.\n"
-
-#: src/applications/fs/tools/gnunet-download.c:237
-#, c-format
-msgid "URI `%s' invalid for gnunet-download.\n"
-msgstr "La URI '%s' no es válida para una descarga-de-gnunet.\n"
-
-#: src/applications/fs/tools/gnunet-download.c:288
-#, c-format
-msgid "File stored as `%s'.\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
 #: src/applications/fs/tools/gnunet-insert.c:110
 #, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
@@ -942,14 +1986,17 @@
 msgstr "%16llu de %16llu bytes insertados (%s estimado para completar)\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:150
-#, c-format
-msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
-msgstr "Subida de '%s' completada, %llu bytes tomaron %llu segundos (%8.3f 
kbps).\n"
+#, fuzzy, c-format
+msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
+msgstr ""
+"Subida de '%s' completada, %llu bytes tomaron %llu segundos (%8.3f kbps).\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:164
-#, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f kbps.\n"
-msgstr "Subida de '%s' completada, la velocidad media de subida actual es 
%8.3f kbps.\n"
+#, fuzzy, c-format
+msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
+msgstr ""
+"Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
+"kbps.\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:174
 #, c-format
@@ -965,50 +2012,52 @@
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:206
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "seleccione el NIVEL deseado de anonimato al enviar"
-
 #: src/applications/fs/tools/gnunet-insert.c:209
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
 "copy instead of making a link to the GNUnet share directory"
-msgstr "aunque gnunetd este corriendo en el ordenador local, fuerza la 
creación de una "
-"copia en vez de hacer un enlace al directorio para compartir de GNUnet"
+msgstr ""
+"aunque gnunetd este corriendo en el ordenador local, fuerza la creación de "
+"una copia en vez de hacer un enlace al directorio para compartir de GNUnet"
 
 #: src/applications/fs/tools/gnunet-insert.c:212
 msgid ""
 "use libextractor to add additional direct references to directory entries"
-msgstr "usa libextractor para añadir referencias directas adicionales a las 
entradas del directorio"
+msgstr ""
+"usa libextractor para añadir referencias directas adicionales a las entradas "
+"del directorio"
 
 #: src/applications/fs/tools/gnunet-insert.c:214
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
-msgstr "imprime la lista de las claves extraidas que podrían ser usadas, pero 
no realiza "
-"la subida"
+msgstr ""
+"imprime la lista de las claves extraidas que podrían ser usadas, pero no "
+"realiza la subida"
 
 #: src/applications/fs/tools/gnunet-insert.c:218
 msgid ""
 "set interval for availability of updates to SECONDS (for namespace "
 "insertions only)"
-msgstr "cambia el intervalo de disponibilidad de las actualizaciones a 
SEGUNDOS (para inserciones "
-"en el espacio solamente)"
+msgstr ""
+"cambia el intervalo de disponibilidad de las actualizaciones a SEGUNDOS "
+"(para inserciones en el espacio solamente)"
 
 #: src/applications/fs/tools/gnunet-insert.c:221
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
-msgstr "añade una clave adicional para el fichero del nivel más alto o el 
directorio (esta opción "
-"puede ser especificada varias veces)"
+msgstr ""
+"añade una clave adicional para el fichero del nivel más alto o el directorio "
+"(esta opción puede ser especificada varias veces)"
 
 #: src/applications/fs/tools/gnunet-insert.c:224
 msgid ""
 "add an additional keyword for all files and directories (this option can be "
 "specified multiple times)"
-msgstr "añade una clave adicional para todos los ficheros y directorios (esta 
opción puede ser "
-"especificada varias veces)"
+msgstr ""
+"añade una clave adicional para todos los ficheros y directorios (esta opción "
+"puede ser especificada varias veces)"
 
 #: src/applications/fs/tools/gnunet-insert.c:228
 msgid "set the meta-data for the given TYPE to the given VALUE"
@@ -1018,16 +2067,17 @@
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
-msgstr "no indexar, hacer inserciones totales (almacena el fichero entero de 
forma encriptada "
-"en la base de datos de GNUnet)"
+msgstr ""
+"no indexar, hacer inserciones totales (almacena el fichero entero de forma "
+"encriptada en la base de datos de GNUnet)"
 
 #: src/applications/fs/tools/gnunet-insert.c:233
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
-"especifica la ID de una versión actualizada para ser publicada en el futuro 
(para "
-"inserciones en el espacio únicamente)"
+"especifica la ID de una versión actualizada para ser publicada en el futuro "
+"(para inserciones en el espacio únicamente)"
 
 #: src/applications/fs/tools/gnunet-insert.c:236
 msgid "specify the priority of the content"
@@ -1035,7 +2085,9 @@
 
 #: src/applications/fs/tools/gnunet-insert.c:238
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en 
el espacio)"
+msgstr ""
+"publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
+"espacio)"
 
 #: src/applications/fs/tools/gnunet-insert.c:240
 msgid "process directories recursively"
@@ -1046,21 +2098,27 @@
 "specifies this as an aperiodic but updated publication (for namespace "
 "insertions only)"
 msgstr ""
-"especifica esto como una aperiódica pero actualizada publicación (para 
inserciones "
-"en el espacio únicamente)"
+"especifica esto como una aperiódica pero actualizada publicación (para "
+"inserciones en el espacio únicamente)"
 
 #: src/applications/fs/tools/gnunet-insert.c:245
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
-msgstr "cambia la ID de esta versión de la publicación (para inserciones en el 
espacio únicamente)"
+msgstr ""
+"cambia la ID de esta versión de la publicación (para inserciones en el "
+"espacio únicamente)"
 
 #: src/applications/fs/tools/gnunet-insert.c:248
 msgid "specify creation time for SBlock (see man-page for format)"
-msgstr "especifica el tiempo para la creación de un Superbloque (vea la página 
del manual para el formato)"
+msgstr ""
+"especifica el tiempo para la creación de un Superbloque (vea la página del "
+"manual para el formato)"
 
 #: src/applications/fs/tools/gnunet-insert.c:250
 msgid "ID of the previous version of the content (for namespace update only)"
-msgstr "ID de la versión previa del contenido (para actualizaciones del 
espacio únicamente)"
+msgstr ""
+"ID de la versión previa del contenido (para actualizaciones del espacio "
+"únicamente)"
 
 #: src/applications/fs/tools/gnunet-insert.c:257
 msgid "Make files available to GNUnet for sharing."
@@ -1076,8 +2134,9 @@
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
 "`unknown' instead.\n"
-msgstr "Tipo de metadatos desconocido en la opción de metadatos '%s'.  Usando 
el tipo de metadatos "
-"'desconocido' en su lugar.\n"
+msgstr ""
+"Tipo de metadatos desconocido en la opción de metadatos '%s'.  Usando el "
+"tipo de metadatos 'desconocido' en su lugar.\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:537
 #: src/applications/fs/tools/gnunet-unindex.c:145
@@ -1119,161 +2178,11 @@
 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-pseudonym.c:35
-msgid "automate creation of a namespace by starting a collection"
-msgstr "creación automática de un espacio al empezar una colección"
+#: src/applications/fs/tools/gnunet-search.c:108
+#: src/applications/fs/tools/gnunet-download.c:42
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
-msgid "create a new pseudonym under the given NICKNAME"
-msgstr "crea un nuevo pseudónimo bajo el APODO dado"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
-msgid "delete the pseudonym with the given NICKNAME"
-msgstr "borra el pseudónimo con el APODO dado"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
-msgid "end automated building of a namespace (ends collection)"
-msgstr "finaliza la construcción automática de un espacio (finaliza la 
recolección)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
-msgid ""
-"use the given keyword to advertise the namespace (use when creating a new "
-"pseudonym)"
-msgstr ""
-"usa la clave dada para anunciar el espacio (úsalo cuando crees un "
-"nuevo pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
-msgstr ""
-"especifica que los contenidos del espacio son del MIMETYPE dado (úsalo "
-"cuando crees un nuevo pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
-msgid ""
-"do not generate an advertisement for this namespace (use when creating a new "
-"pseudonym)"
-msgstr ""
-"no genera un anuncio para este espacio (úsalo cuando crees un nuevo "
-"pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
-msgid "do not list the pseudonyms from the pseudonym database"
-msgstr "no listar los pseudónimos de la base de datos de pseudónimos"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
-msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr ""
-"especifica el NAME  para ser el nombre real del usuario que controla el 
espacio (úsalo "
-"cuando crees un nuevo pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid ""
-"specify IDENTIFIER to be the address of the entrypoint to content in the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"especifica el IDENTIFIER para ser la dirección del punto de entrada al 
contenido en el "
-"espacio (úsalo cuando crees un nuevo pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
-msgid "set the rating of a namespace"
-msgstr "cambia la valoración de un espacio"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr ""
-"usa la DESCRIPTION para describir el contenido del espacio (úsalo cuando 
crees "
-"un nuevo pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"especifica la URI dada como dirección que contiene mas información del "
-"espacio (úsalo cuando crees un nuevo pseudónimo)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr "Crea nuevos pseudónimos, borra pseudónimos o lista los pseudónimos 
existentes."
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
-#, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr "Argumento no válido: '%s'\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/conf/gnunet-setup.c:179 src/server/gnunet-peer-info.c:118
-#: src/server/gnunet-transport-check.c:532
-msgid "Invalid arguments. Exiting.\n"
-msgstr "Argumentos no válidos. Saliendo.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, c-format
-msgid "Namespace `%s' has rating %d.\n"
-msgstr "El espacio '%s' ha sido valorado con un %d.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
-#, c-format
-msgid "Namespace `%s' (%s) has rating %d.\n"
-msgstr "El espacio '%s' (%s) ha sido valorado con un %d.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
-#, c-format
-msgid "\tRating (after update): %d\n"
-msgstr "\tValoración (después de la actualización): %d\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
-#, c-format
-msgid "Collection stopped.\n"
-msgstr "Colección detenida.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
-#, c-format
-msgid "Failed to stop collection (not active?).\n"
-msgstr "Falló al parar la recolección (¿no está activa?).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
-#, c-format
-msgid "Pseudonym `%s' deleted.\n"
-msgstr "El pseudónimo '%s' fue borrado.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
-#, c-format
-msgid "Error deleting pseudonym `%s' (does not exist?).\n"
-msgstr "Error borrando el pseudónimo '%s' (¿no existe?).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
-#, c-format
-msgid "Started collection `%s'.\n"
-msgstr "Iniciada colección '%s'.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
-#, c-format
-msgid "Failed to start collection.\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
-#, c-format
-msgid "Could not create namespace `%s' (exists?).\n"
-msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
-#, c-format
-msgid "Namespace `%s' created (root: %s).\n"
-msgstr "El espacio '%s' fue creado (root: %s).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
-#, c-format
-msgid "Could not access namespace information.\n"
-msgstr "Imposible acceder a la información del espacio.\n"
-
 #: src/applications/fs/tools/gnunet-search.c:114
 msgid "exit after receiving LIMIT results"
 msgstr "sale después de recibir LIMIT resultados"
@@ -1292,7 +2201,9 @@
 
 #: src/applications/fs/tools/gnunet-search.c:227
 msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr "No hay suficientes argumentos. Debes especificar una clave o un 
identificador.\n"
+msgstr ""
+"No hay suficientes argumentos. Debes especificar una clave o un "
+"identificador.\n"
 
 #: src/applications/fs/tools/gnunet-search.c:278
 #, c-format
@@ -1304,21 +2215,77 @@
 msgid "Error converting arguments to URI!\n"
 msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
 
+#: src/applications/fs/tools/gnunet-download.c:41
+msgid "LEVEL"
+msgstr "NIVEL"
+
+#: src/applications/fs/tools/gnunet-download.c:47
+msgid "FILENAME"
+msgstr "FICHERO"
+
+#: src/applications/fs/tools/gnunet-download.c:48
+msgid "write the file to FILENAME"
+msgstr "escribe el fichero al FICHERO"
+
+#: src/applications/fs/tools/gnunet-download.c:50
+msgid "download a GNUnet directory recursively"
+msgstr "descarga un directorio de GNUnet recursivamente"
+
+#: src/applications/fs/tools/gnunet-download.c:56
+msgid "Download files from GNUnet."
+msgstr "Descarga los ficheros de GNUnet"
+
+#: src/applications/fs/tools/gnunet-download.c:136
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr ""
+"Argumentos insuficientes. Debes especificar una URI de un fichero de GNUnet\n"
+
+#: src/applications/fs/tools/gnunet-download.c:159
+#, fuzzy, c-format
+msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
+msgstr "Descargado del fichero '%s' el %16llu de %16llu bytes(%8.3f kbps)\n"
+
+#: src/applications/fs/tools/gnunet-download.c:172
+#: src/applications/fs/tools/gnunet-download.c:183
+#, c-format
+msgid "Error downloading: %s\n"
+msgstr "Error descargando: %s\n"
+
+#: src/applications/fs/tools/gnunet-download.c:191
+#, fuzzy, c-format
+msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
+msgstr ""
+"Descarga del fichero '%s' completada. La velocidad media fue %8.3fkilobytes "
+"por segundo.\n"
+
+#: src/applications/fs/tools/gnunet-download.c:237
+#, c-format
+msgid "URI `%s' invalid for gnunet-download.\n"
+msgstr "La URI '%s' no es válida para una descarga-de-gnunet.\n"
+
+#: src/applications/fs/tools/gnunet-download.c:288
+#, c-format
+msgid "File stored as `%s'.\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
 #: src/applications/fs/tools/gnunet-unindex.c:50
 #, c-format
 msgid ""
 "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 "completion)                "
-msgstr "%16llu de %16llu bytes desindexados (estimados %llu segundos para 
completar)          "
+msgstr ""
+"%16llu de %16llu bytes desindexados (estimados %llu segundos para "
+"completar)          "
 
 #: src/applications/fs/tools/gnunet-unindex.c:61
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
+"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "\n"
-"El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos (%8.3f 
kbps).\n"
+"El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos (%8.3f "
+"kbps).\n"
 
 #: src/applications/fs/tools/gnunet-unindex.c:72
 #, c-format
@@ -1343,1855 +2310,1385 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' falló.  ¿Es '%s' un fichero?\n"
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/fs/module/ondemand.c:305
+#, fuzzy, c-format
+msgid "Indexed file disappeared, deleting block for query `%s'\n"
+msgstr ""
+"Fichero indexado desaparecido, borrando el bloque para preguntas '%s'\n"
+
+#: src/applications/fs/module/ondemand.c:393
 #, c-format
-msgid "GAP received invalid content from `%s'\n"
-msgstr "GAP recibido contenido no válido de '%s'\n"
-
-#: src/applications/gap/gap.c:1618
-msgid "myself"
-msgstr "yo"
-
-#: src/applications/gap/gap.c:1791
 msgid ""
-"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+"Because the file `%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!\n"
 msgstr ""
-"Solicitada la cobertura de tráfico pero el servicio de tráfico no ha sido 
cargado. Rechazando la petición.\n"
+"El fichero '%s' se ha eliminado de tus compartidos porque no ha estado "
+"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/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
-msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
-msgstr "Imposible satisfacer el nivel deseado de anonimato, ignorando la 
petición.\n"
-
-#: src/applications/gap/gap.c:2077
-msgid "# gap requests total received"
+#: src/applications/fs/module/ondemand.c:419
+#, c-format
+msgid ""
+"Configuration file must specify directory for storage of FS data in section `"
+"%s' under `%s'.\n"
 msgstr ""
+"El fichero de configuración debe especificar un directorio para el "
+"almacenamiento de los datos de FS en la sección '%s' bajo '%s'.\n"
 
-#: src/applications/gap/gap.c:2078
-msgid "# gap requests policy: immediate drop"
+#: src/applications/fs/module/ondemand.c:617
+#, fuzzy, c-format
+msgid ""
+"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
+"Bloque ODB '%s' desindexado del offset %llu perdido de la base de datos.\n"
 
-#: src/applications/gap/gap.c:2079
-msgid "# gap requests policy: not routed"
+#: src/applications/fs/module/fs.c:1184
+#, c-format
+msgid ""
+"You must specify a postive number for `%s' in the configuration in section `%"
+"s'.\n"
 msgstr ""
+"Debes especificar un número positivo para '%s' en la configuración en la "
+"sección '%s'.\n"
 
-#: src/applications/gap/gap.c:2080
-msgid "# gap requests policy: not answered"
-msgstr ""
+#: src/applications/fs/module/fs.c:1233
+#, c-format
+msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
+msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/gap/gap.c:2081
-msgid "# gap requests processed: attempted add to RT"
-msgstr ""
+#: src/applications/fs/module/fs.c:1270
+msgid "enables (anonymous) file-sharing"
+msgstr "activa la compartición de ficheros anónima"
 
-#: src/applications/gap/gap.c:2082
-msgid "# gap requests processed: local result"
-msgstr ""
+#: src/applications/fs/module/migration.c:224
+msgid "# blocks migrated"
+msgstr "# blocks migrados"
 
-#: src/applications/gap/gap.c:2083
-msgid "# gap routing successes (total)"
+#: src/applications/fs/module/migration.c:225
+msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/gap/gap.c:2084
-msgid "# gap requests dropped: collision in RT"
-msgstr ""
+#: src/applications/fs/fsui/namespace_info.c:583
+msgid "Publication interval for periodic publication changed."
+msgstr "Intervalo de publicación periódica cambiado."
 
-#: src/applications/gap/gap.c:2085
-msgid "# gap requests forwarded (counting each peer)"
+#: src/applications/fs/fsui/namespace_info.c:604
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
 msgstr ""
+"publicaciones actualizadas para contenido actualizado periódicamente más de "
+"una semana antes de la tarea planificada.\n"
 
-#: src/applications/gap/gap.c:2086
-msgid "# gap duplicate requests (pending)"
-msgstr ""
+#: src/applications/fs/fsui/search.c:245
+msgid "This search is already pending!\n"
+msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/applications/gap/gap.c:2087
-msgid "# gap duplicate requests that were re-tried"
-msgstr ""
+#: src/applications/fs/fsui/fsui.c:189
+msgid "FSUI persistence: error restoring download\n"
+msgstr "FSUI persistente: error restableciendo la descarga\n"
 
-#: src/applications/gap/gap.c:2088
-msgid "# gap re-try ttl difference (cummulative)"
+#: src/applications/fs/fsui/fsui.c:638
+#, 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/gap/gap.c:2089
-msgid "# gap reply duplicates"
-msgstr ""
+#: src/applications/fs/fsui/download.c:290
+msgid "Download aborted."
+msgstr "Descarga abortada"
 
-#: src/applications/gap/gap.c:2090
-msgid "# gap spurious replies"
-msgstr ""
+#: src/applications/fs/fsui/download.c:294
+msgid "ECRS download failed (see logs)."
+msgstr "La descarga del ERCS falló (vea los logs)."
 
-#: src/applications/gap/gap.c:2091
-msgid "# gap routing slots currently in use"
-msgstr ""
+#: src/applications/fs/fsui/download.c:298
+msgid "ECRS download suspending."
+msgstr "La descarga del ERCS fue suspendida."
 
-#: src/applications/gap/gap.c:2092
-msgid "# gap memory used for tracking seen content"
-msgstr ""
+#: src/applications/fs/fsui/download.c:302
+msgid "Unexpected download state."
+msgstr "Estado de descarga inesperado."
 
-#: src/applications/gap/gap.c:2093
-msgid "# gap memory used for tracking routing destinations"
-msgstr ""
+#: src/applications/fs/fsui/unindex.c:85
+msgid "Unindex failed."
+msgstr "El desindexado falló"
 
-#: src/applications/gap/gap.c:2094
-msgid "# gap rewards pending"
-msgstr ""
+#: src/applications/fs/fsui/helper.c:67
+msgid "No keywords specified!\n"
+msgstr "¡Ninguna clave especificada!\n"
 
-#: src/applications/gap/gap.c:2095
-msgid "# gap response weights"
-msgstr ""
+#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:448
+msgid "Upload failed."
+msgstr "Subida fallida"
 
-#: src/applications/gap/gap.c:2112
-msgid ""
-"Traffic service failed to load; gap cannot ensure cover-traffic "
-"availability.\n"
-msgstr ""
+#: src/applications/fs/fsui/upload.c:455
+msgid "Cannot upload directory without using recursion."
+msgstr "Imposible compartir un directorio sin hacerlo recursivamente."
 
-#: src/applications/gap/gap.c:2143
-#, c-format
-msgid "`%s' registering handlers %d %d\n"
-msgstr "'%s' registrando manejadores %d %d\n"
+#: src/applications/fs/fsui/file_info.c:93
+msgid "Collecting file identifiers disabled.\n"
+msgstr "Recolección de identificadores de fichero desactivada.\n"
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/fs/fsui/file_info.c:282
 #, c-format
-msgid "`%s' registering client handler %d\n"
-msgstr "'%s' registrando un manejador de clientes %d\n"
+msgid "Deleted corrupt URI database in `%s'."
+msgstr "Borrada base de datos de URIs corrupta en '%s'."
 
-#: src/applications/getoption/getoption.c:82
-msgid "allows clients to determine gnunetd's configuration"
-msgstr "permite a los clientes determinar la configuración de gnunetd"
+#: src/applications/fs/ecrs/search.c:160
+msgid "CHK URI not allowed for search.\n"
+msgstr "CHK URI no autorizado para buscar.\n"
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/fs/ecrs/search.c:216
+msgid "LOC URI not allowed for search.\n"
+msgstr "LOC URI no autorizado para buscar.\n"
+
+#: src/applications/fs/ecrs/download.c:125
 #, c-format
-msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
-msgstr "Se produjo un fallo al comprobar la clave local existente en el 
fichero '%s', creando nueva clave local.\n"
+msgid "Could not unlink temporary file `%s': %s\n"
+msgstr "Imposible desenlazar temporalmente el fichero '%s': %s\n"
 
-#: src/applications/identity/hostkey.c:127
-msgid "Creating new hostkey (this may take a while).\n"
-msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
+#: src/applications/fs/ecrs/download.c:257
+#, c-format
+msgid "Write(%d, %p, %d) failed: %s\n"
+msgstr "Escribiendo(%d, %p, %d) se produjo un fallo: %s\n"
 
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
-msgstr "¡Imposible crear la clave local!\n"
+#: src/applications/fs/ecrs/download.c:935
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
+msgstr ""
+"El contenido desencriptado no encuentra una clave. Esto puede ser un bug o "
+"un fichero introducido maliciosamente. Descarga abortada.\n"
 
-#: src/applications/identity/hostkey.c:139
-msgid "Done creating hostkey.\n"
-msgstr "Correcto al crear la clave local.\n"
-
-#: src/applications/identity/identity.c:329
+#: src/applications/fs/ecrs/download.c:1112
 #, c-format
 msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+"Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
-"El fichero '%s' en el directorio '%s' no sigue la convención de nombres. 
Eliminando.\n"
+"El contenido '%s' parece no estar disponible en la red (intentado %u "
+"veces).\n"
 
-#: src/applications/identity/identity.c:362
+#: src/applications/fs/ecrs/upload.c:180
 #, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "¡%s '%s' devolvió hosts desconocidos!\n"
+msgid "`%s' is not a file.\n"
+msgstr "'%s' no es un fichero.\n"
 
-#: src/applications/identity/identity.c:644
-#: src/applications/identity/identity.c:662
+#: src/applications/fs/ecrs/upload.c:186
 #, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
-msgstr "Borrando el fichero '%s' que contiene datos de saludo no válidos.\n"
+msgid "Cannot get size of file `%s'"
+msgstr "Imposible determinar el tamaño del fichero '%s'"
 
-#: src/applications/identity/identity.c:712
+#: src/applications/fs/ecrs/upload.c:193
+msgid "Failed to connect to gnunetd."
+msgstr "Fallo al conectarse a gnunetd"
+
+#: src/applications/fs/ecrs/upload.c:203
 #, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
-msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
+msgid "Cannot hash `%s'.\n"
+msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/applications/identity/identity.c:720
-msgid "Signature failed verification: signature invalid.\n"
-msgstr "Falló la verificación de la firma: firma no válida.\n"
+#: src/applications/fs/ecrs/upload.c:221
+#, 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/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
+#: src/applications/fs/ecrs/upload.c:227
 #, c-format
-msgid "Received malformed `%s' message. Dropping.\n"
-msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+msgid "Indexing file `%s' failed. Trying to insert file...\n"
+msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/applications/pingpong/pingpong.c:130
-msgid "Received ping for another peer. Dropping.\n"
-msgstr "Recibido ping de otro par. Omitiendo.\n"
+#: src/applications/fs/ecrs/upload.c:306
+#, c-format
+msgid "Indexing data failed at position %i.\n"
+msgstr "La indexación de los datos falló en la posición %i.\n"
 
-#: src/applications/pingpong/pingpong.c:187
-msgid "Received PING not destined for us!\n"
-msgstr "¡Recibido PING no destinado a nosotros!\n"
+#: src/applications/fs/ecrs/meta.c:842
+#, c-format
+msgid "Renaming of file `%s' to `%s' failed: %s\n"
+msgstr "Al renombrar el fichero '%s' a '%s' se produjo un fallo: %s\n"
 
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/fs/ecrs/meta.c:850
+#, c-format
+msgid "Could not rename file `%s' to `%s': file exists\n"
+msgstr "Imposible renombrar el fichero '%s' a '%s': el fichero ya existe\n"
+
+#: src/applications/fs/ecrs/namespace.c:45
+#, c-format
 msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s.\n"
 msgstr ""
+"El fichero de configuración debe especificar un directorio para que GNUnet "
+"almacene la información por-par bajo %s%s.\n"
 
-#: src/applications/pingpong/pingpong.c:366
-msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
-msgstr ""
+#: src/applications/fs/ecrs/namespace.c:133
+#, c-format
+msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
+msgstr "Imposible crear el pseudónimo '%s', el fichero '%s' ya existe.\n"
 
-#: src/applications/pingpong/pingpong.c:452
-msgid "# encrypted PONG messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/applications/fs/ecrs/namespace.c:307
+#: src/applications/fs/ecrs/namespace.c:383
+#: src/applications/fs/ecrs/namespace.c:528
+#, c-format
+msgid "File `%s' does not contain a pseudonym.\n"
+msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/applications/pingpong/pingpong.c:454
-msgid "# plaintext PONG messages received"
-msgstr ""
+#: src/applications/fs/ecrs/namespace.c:318
+#: src/applications/fs/ecrs/namespace.c:394
+#, c-format
+msgid "Format of pseudonym `%s' is invalid.\n"
+msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
-#: src/applications/pingpong/pingpong.c:456
-msgid "# encrypted PING messages received"
-msgstr ""
+#: src/applications/fs/ecrs/namespace.c:538
+#: src/applications/fs/ecrs/namespace.c:548
+#, c-format
+msgid "Format of file `%s' is invalid.\n"
+msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/applications/pingpong/pingpong.c:458
-msgid "# PING messages created"
+#: src/applications/topology_f2f/topology.c:323
+#, c-format
+msgid ""
+"Need to have list of friends in configuration under `%s' in section `%s'.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:460
-msgid "# encrypted PONG messages sent"
+#: src/applications/topology_f2f/topology.c:342
+#, c-format
+msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:464
-msgid "# encrypted PING messages sent"
+#: src/applications/topology_f2f/topology.c:358
+msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/topology_f2f/topology.c:370
 #, c-format
-msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
-msgstr "'%s' registrando manejadores %d %d (texto plano e hipertexto)\n"
-
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
-#, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be registered: another callback is already "
-"using this name (%p)\n"
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
 msgstr ""
-"%s::%s - RPC %s:%p no pudo ser registrada: otro evento está actualmente "
-"usando este nombre (%p)\n"
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/template/template.c:61
 #, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
-"under that name: %p\n"
-msgstr "%s::%s - RPC %s:%p no pudo ser desregistrada: otro evento está 
actualmente "
-"registrado con este nombre (%p)\n"
+msgid "`%s' registering client handler %d and %d\n"
+msgstr "'%s' registrando manejador de clientes %d y %d\n"
 
-#: src/applications/rpc/rpc.c:232
-#, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
-msgstr "%s::%s - RPC %s:%p no pudo ser desregistrada: no encontrada\n"
+#: src/applications/template/gnunet-template.c:70
+#: src/applications/vpn/gnunet-vpn.c:72
+msgid "helptext for -t"
+msgstr "texto de ayuda para -t"
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/template/gnunet-template.c:75
+msgid "Template for gnunet-clients."
+msgstr "Plantilla para clientes-de-gnunet."
+
+#: src/applications/bootstrap_http/http.c:109
 #, c-format
-msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
-msgstr "%s::%s RPC asíncrona %s:%p no pudo ser desregistrada: no encontrada\n"
+msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+msgstr ""
+"Puerto inválido \"%s\" en la especificación de la lista local, probando el "
+"puerto %d.\n"
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
+#: src/applications/bootstrap_http/http.c:120
 #, c-format
-msgid "Invalid message of type %u received.  Dropping.\n"
-msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
+msgid "`%s' failed at %s:%d with error: `%s'.\n"
+msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/bootstrap_http/http.c:132
 #, c-format
-msgid "Dropping RPC request %u: message malformed.\n"
-msgstr "Omitiendo la petición RPC %u: mensaje mal formado.\n"
+msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+msgstr "Imposible descargar lista de contactos, servidor '%s' desconocido.\n"
 
-#: src/applications/rpc/rpc.c:1388
+#: src/applications/bootstrap_http/http.c:155
+#: src/applications/bootstrap_http/http.c:181
 #, c-format
-msgid "RPC not unregistered: %s:%p\n"
-msgstr "No fue desregistrada RPC: %s:%p\n"
+msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/bootstrap_http/http.c:217
 #, c-format
-msgid "`%s' registering handlers %d %d %d\n"
-msgstr "'%s' registrando manejadores %d %d %d\n"
+msgid "Parsing HTTP response for URL `%s' failed.\n"
+msgstr "Analizando HTTP de la URL '%s' se produjo un fallo.\n"
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/bootstrap_http/http.c:252
 #, c-format
-msgid "Failed to initialize `%s' service.\n"
-msgstr "Falló al inicializar el servicio '%s'.\n"
+msgid "Parsing hello from `%s' failed.\n"
+msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
 
-#: src/applications/rpc/rpc.c:1491
-msgid "RPC async reply invalid.\n"
-msgstr "RPC respuesta asíncrona no válida.\n"
-
-#: src/applications/rpc/rpc.c:1562
-msgid "async RPC reply not received.\n"
-msgstr "respuesta RPC asíncrona no recibida.\n"
-
-#: src/applications/session/connect.c:209
+#: src/applications/bootstrap_http/http.c:330
 #, 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"
+msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+msgstr ""
+"Imposible resolver el nombre del proxy HTTP '%s'. Intentándolo sin un "
+"proxy.\n"
 
-#: src/applications/session/connect.c:246
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
-msgstr "¡Imposible encriptar la clave de sesión, otro par desconocido!\n"
+#: src/applications/bootstrap_http/http.c:355
+msgid "# hellos downloaded via http"
+msgstr "# saludos descargados vía HTTP"
 
-#: src/applications/session/connect.c:523
+#: src/applications/traffic/traffic.c:445
 #, c-format
-msgid "Invalid `%s' message received from peer `%s'.\n"
-msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
+msgid "# bytes transmitted of type %d"
+msgstr ""
 
-#: src/applications/session/connect.c:532
+#: src/applications/traffic/traffic.c:465
 #, 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"
+msgid "# bytes received of type %d"
+msgstr ""
 
-#: src/applications/session/connect.c:587
-msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
-"Error pasando la clave de sesión encriptada, el mensaje dado del tamaño de 
las partes es inválido.\n"
 
-#: src/applications/session/connect.c:597
-#, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
-msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
+#: src/applications/traffic/clientapi.c:67
+msgid "Failed to query gnunetd about traffic conditions.\n"
+msgstr ""
 
-#: src/applications/session/connect.c:742
-msgid "# session keys sent"
-msgstr "# claves de la sesión mandadas"
+#: src/applications/traffic/clientapi.c:74
+msgid "Did not receive reply from gnunetd about traffic conditions.\n"
+msgstr ""
 
-#: src/applications/session/connect.c:744
-msgid "# session keys rejected"
-msgstr "# claves de la sesión rechazadas"
+#: src/applications/kvstore_sqlite/kv_sqlite.c:181
+#, fuzzy, c-format
+msgid ""
+"Configuration file must specify directory for storing data in section `%s' "
+"under `%s'.\n"
+msgstr ""
+"El fichero de configuración debe especificar el directorio para almacenar "
+"los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/applications/session/connect.c:746
-msgid "# session keys accepted"
-msgstr "# claves de la sesión aceptadas"
+#: src/applications/kvstore_sqlite/kv_sqlite.c:264
+#, fuzzy
+msgid "Unable to initialize SQLite KVStore.\n"
+msgstr "Imposible inicializar SQLite.\n"
 
-#: src/applications/session/connect.c:748
-msgid "# sessions established"
-msgstr "# sesiones establecidas"
+#: src/applications/vpn/gnunet-vpn.c:77
+msgid "VPN over GNUnet."
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:57
-#: src/util/hostkey_gcrypt.c:64 src/util/storage.c:659
-#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1042 src/include/gnunet_util.h:1049
-#: src/include/gnunet_util.h:1051
+#: src/applications/vpn/vpn.c:315
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "'%s' falló en %s: %d con el error: %s\n"
+msgid "Not storing route to myself from peer %d\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/vpn/vpn.c:323
 #, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
-msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
-msgid "mysql datastore"
-msgstr "base de datos mysql"
+#: src/applications/vpn/vpn.c:351
+#, c-format
+msgid "Inserting route from peer %d in route table at location %d\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/vpn/vpn.c:400
 #, c-format
-msgid "Query `%s' had no results.\n"
-msgstr "La pregunta '%s' no tuvo resultados.\n"
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-msgid "# bytes in datastore"
-msgstr "# bytes en la base de datos"
+#: src/applications/vpn/vpn.c:404
+#, c-format
+msgid "RFC4193 Frame length %d too small\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1205
+#: src/applications/vpn/vpn.c:414
 #, 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"
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1223
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
+#: src/applications/vpn/vpn.c:474
+#, c-format
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
-"Falló al cargar el modulo de la base de datos MySQL.  ¡Comprueba que MySQL 
esta ejecutandose y "
-"esta configurada correctamente!\n"
 
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "¡Imposible inicializar libgnunetutil!\n"
-
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
-msgstr "Imposible inicializar SQLite.\n"
-
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
-msgid "sqlite datastore"
-msgstr "base de datos sqlite"
-
-#: src/applications/sqstore_sqlite/sqlite.c:1035
+#: src/applications/vpn/vpn.c:478
 #, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
+msgid "Cannot open tunnel device because of %s"
 msgstr ""
-"El fichero de configuración debe especificar el directorio para almacenar los 
datos FS en la sección "
-"'%s' bajo '%s'.\n"
 
-#: src/applications/stats/clientapi.c:179
-msgid "Uptime (seconds)"
+#: src/applications/vpn/vpn.c:505
+#, c-format
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:61
-#: src/applications/testbed/commands.c:1130
+#: src/applications/vpn/vpn.c:513
 #, c-format
-msgid "Supported peer-to-peer messages:\n"
-msgstr "Mensajes P2P soportados:\n"
+msgid "Cannot set tunnel name to %s because of %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:64
-#: src/applications/testbed/commands.c:1132
+#: src/applications/vpn/vpn.c:517
 #, c-format
-msgid "Supported client-server messages:\n"
-msgstr "Mensajes cliente-servidor soportados:\n"
+msgid "Configured tunnel name to %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:94
-msgid "prints supported protocol messages"
-msgstr "imprime los mensajes del protocolo"
-
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
-msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
-
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/vpn/vpn.c:555
 #, c-format
-msgid "Error establishing connection with gnunetd.\n"
-msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
+msgid "Cannot get socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/vpn/vpn.c:559
 #, c-format
-msgid "Error reading information from gnunetd.\n"
-msgstr "Se produjo un error leyendo información de gnunetd.\n"
+msgid "Cannot set socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:206
+#: src/applications/vpn/vpn.c:566
 #, c-format
-msgid "% of allowed network load (up)"
-msgstr "% de red permitida para la subida"
+msgid "Cannot set MTU for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:208
+#: src/applications/vpn/vpn.c:571
 #, c-format
-msgid "% of allowed network load (down)"
-msgstr "% de red permitida para bajada"
+msgid "Cannot get interface index for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:210
+#: src/applications/vpn/vpn.c:579
 #, c-format
-msgid "% of allowed cpu load"
-msgstr "% de CPU permitida para el uso"
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:214
-msgid "# bytes of noise received"
-msgstr "# bytes de ruido recibidos"
+#: src/applications/vpn/vpn.c:591
+#, fuzzy, c-format
+msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
+msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
 
-#: src/applications/stats/statistics.c:372
-msgid "keeps statistics about gnunetd's operation"
+#: src/applications/vpn/vpn.c:602
+#, c-format
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:95
-msgid "output in gnuplot format"
-msgstr "salida en formato de gnuplot"
+#: src/applications/vpn/vpn.c:614
+#, fuzzy, c-format
+msgid "Cannot add route IPv6 address for gnu%s because %s\n"
+msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:98
-msgid "number of iterations"
-msgstr "número de repeticiones"
+#: src/applications/vpn/vpn.c:646
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:100
-msgid "number of messages to use per iteration"
-msgstr "número de mensajes a usar por iteración"
+#: src/applications/vpn/vpn.c:692
+#, c-format
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:102
-msgid "receiver host identifier (ENC file name)"
+#: src/applications/vpn/vpn.c:754
+#, c-format
+msgid "RFC4193 --- whitelist of peer %x\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:104
-msgid "message size"
-msgstr "tamaño del mensaje"
+#: src/applications/vpn/vpn.c:772
+msgid "RFC4193 Thread exiting\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:106
-msgid "sleep for SPACE ms after each a message block"
-msgstr "duerme durante SPACE ms después de cada bloque de mensajes"
+#: src/applications/vpn/vpn.c:812
+msgid "VPN IP src not anonymous. drop..\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:108
-msgid "time to wait for the completion of an iteration (in ms)"
-msgstr "tiempo para esperar hasta completar una iteración (en ms)"
+#: src/applications/vpn/vpn.c:816
+msgid "VPN IP not anonymous, drop.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:111
-msgid "number of messages in a message block"
-msgstr "número de mensajes en un bloque de mensajes"
-
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
+#: src/applications/vpn/vpn.c:822
+msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:225
-msgid "You must specify a receiver!\n"
-msgstr "¡Debes especificar un receptor!\n"
-
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/vpn/vpn.c:825
 #, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
-msgstr "ID del par receptor especificada no válida ('%s' no es un nombre 
válido).\n"
+msgid "VPN Received unknown IP version %d...\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:249
+#: src/applications/vpn/vpn.c:835
 #, c-format
-msgid "Time:\n"
-msgstr "Tiempo:\n"
+msgid "<- GNUnet(%d) : %s\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:250
-#, c-format
-msgid "\tmax      %llums\n"
-msgstr "\tmax      %llums\n"
+#: src/applications/vpn/vpn.c:854
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/vpn/vpn.c:869
 #, c-format
-msgid "\tmin      %llums\n"
-msgstr "\tmin      %llums\n"
+msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:254
-#, c-format
-msgid "\tmean     %8.4fms\n"
-msgstr "\tmean     %8.4fms\n"
+#: src/applications/vpn/vpn.c:885
+msgid "Receive route request\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/vpn/vpn.c:890
 #, c-format
-msgid "\tvariance %8.4fms\n"
-msgstr "\tvariance %8.4fms\n"
+msgid "Prepare route announcement level %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:259
+#: src/applications/vpn/vpn.c:901
 #, c-format
-msgid "Loss:\n"
-msgstr "Perdido:\n"
+msgid "Send route announcement %d with route announce\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/vpn/vpn.c:907
 #, c-format
-msgid "\tmax      %u\n"
-msgstr "\tmax      %u\n"
+msgid "Send outside table info %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:262
-#, c-format
-msgid "\tmin      %u\n"
-msgstr "\tmin      %u\n"
+#: src/applications/vpn/vpn.c:923
+msgid "Receive route announce.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:264
-#, c-format
-msgid "\tmean     %8.4f\n"
-msgstr "\tmean     %8.4f\n"
+#: src/applications/vpn/vpn.c:927
+msgid "Going to try insert route into local table.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/vpn/vpn.c:931
 #, c-format
-msgid "\tvariance %8.4f\n"
-msgstr "\tvariance %8.4f\n"
+msgid "Inserting with hops %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/applications/vpn/vpn.c:945
 #, c-format
-msgid "Output format not known, this should not happen.\n"
-msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
+msgid "Request level %d from peer %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/vpn/vpn.c:960
 #, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
-"\n"
-"No se recibió el mensaje de gnunetd. ¿Está gnunetd ejecutandose?\n"
 
-#: src/applications/tbench/tbench.c:448
-msgid "allows profiling of direct peer-to-peer connections"
+#: src/applications/vpn/vpn.c:998
+msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:57
-#, 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/vpn/vpn.c:1013
+msgid "realise add routes\n"
+msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:84
+#: src/applications/vpn/vpn.c:1058
+msgid "realise pull routes\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1104
+msgid "realise copy table\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1161
+msgid "Yes"
+msgstr "Sí"
+
+#: src/applications/vpn/vpn.c:1161
+msgid "No"
+msgstr "No"
+
+#: src/applications/vpn/vpn.c:1324
+#, fuzzy, c-format
+msgid "`%s' initialising RFC4913 module  %d and %d\n"
+msgstr "'%s' registrando manejadores %d y %d\n"
+
+#: src/applications/vpn/vpn.c:1325
 #, c-format
-msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:89
+#: src/applications/vpn/vpn.c:1361
+#, fuzzy
+msgid "enables IPv6 over GNUnet (incomplete)"
+msgstr "Activa el chat P2P (incompleto)"
+
+#: src/applications/vpn/vpn.c:1383
+msgid "RFC4193 Waiting for tun thread to end\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1394
+msgid "RFC4193 The tun thread has ended\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1405
 #, c-format
-msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:95
+#: src/applications/state/state.c:85
 #, c-format
 msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
 msgstr ""
-"\n"
-"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/applications/tbench/tbenchtest.c:211
-#, c-format
-msgid "Running benchmark...\n"
+#: src/server/gnunet-update.c:50
+msgid "print a value from the configuration file to stdout"
 msgstr ""
 
-#: src/applications/template/gnunet-template.c:70
-msgid "helptext for -t"
-msgstr "texto de ayuda para -t"
+#: src/server/gnunet-update.c:55 src/server/startup.c:450
+#: src/server/gnunet-transport-check.c:407
+msgid "run as user LOGIN"
+msgstr "ejecuta como el usuario LOGIN"
 
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
-msgstr "Plantilla para clientes-de-gnunet."
+#: src/server/gnunet-update.c:58
+msgid "run in client mode (for getting client configuration values)"
+msgstr ""
 
-#: src/applications/template/template.c:61
-#, c-format
-msgid "`%s' registering client handler %d and %d\n"
-msgstr "'%s' registrando manejador de clientes %d y %d\n"
-
-#: src/applications/testbed/gnunet-testbed.c:119
-msgid "Start GNUnet-testbed helper."
+#: src/server/gnunet-update.c:64
+msgid "Updates GNUnet datastructures after version change."
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:183
+#: src/server/gnunet-update.c:147
 #, c-format
-msgid "Cannot connect to LOOPBACK port %d: %s\n"
-msgstr "Imposible conectar al puerto de LOOPBACK %d: %s\n"
+msgid "Option `%s' makes no sense without option `%s'."
+msgstr "La opción '%s' no tiene ningún sentido sin la opción '%s'."
 
-#: src/applications/testbed/gnunet-testbed.c:282
+#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
+#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
 #, c-format
-msgid "Could not execute `%s': %s\n"
-msgstr "Imposible ejecutar '%s': %s\n"
+msgid "Invalid arguments: "
+msgstr "Argumentos inválidos: "
 
-#: src/applications/testbed/gnunet-testbed.c:325
-msgid "No client service started. Trying again in 30 seconds.\n"
-msgstr "No hay ningún servicio de cliente ejecutandose. Se volverá a intentar 
en 30 segundos.\n"
-
-#: src/applications/testbed/gnunet-testbed.c:348
+#: src/server/gnunet-update.c:155
 #, c-format
 msgid ""
-"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
-"Trying again in %d seconds...\n"
+"\n"
+"Exiting.\n"
 msgstr ""
+"\n"
+"Saliendo.\n"
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
-#, c-format
-msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
-msgstr "Rechazada conexión no autorizada de %u.%u.%u.%u.\n"
+#: src/server/gnunet-update.c:232 src/server/core.c:476
+msgid "No applications defined in configuration!\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/applications/testbed/gnunet-testbed.c:428
+#: src/server/gnunet-update.c:249
 #, c-format
-msgid "Protocol violation on socket. Expected command.\n"
-msgstr "Violación del protocolo en el socket. Esperando comando.\n"
+msgid "Updating data for module `%s'\n"
+msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/applications/testbed/gnunet-testbed.c:467
+#: src/server/gnunet-update.c:253
 #, c-format
-msgid "Command `%s' not found!\n"
-msgstr "¡Comando '%s' no encontrado!\n"
+msgid "Failed to update data for module `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/applications/testbed/gnunet-testbed.c:540
-msgid "Start GNUnet testbed controller."
-msgstr ""
-
-#: src/applications/testbed/gnunet-testbed.c:594
+#: src/server/gnunet-update.c:309
 #, c-format
-msgid "Malformed entry in the configuration in section %s under %s: %s\n"
-msgstr "Entrada mal formada en la configuración en la sección %s bajo %s: %s\n"
+msgid "Updated data for %d applications.\n"
+msgstr "Actualizados los datos para %d aplicaciones.\n"
 
-#: src/applications/testbed/testbed.c:50
-msgid "Could not send acknowledgement back to client.\n"
-msgstr ""
-
-#: src/applications/testbed/testbed.c:60
+#: src/server/connection.c:983
 #, c-format
-msgid "Received unknown testbed message of type %u.\n"
+msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:78
-#: src/applications/testbed/testbed.c:807
+#: src/server/connection.c:990
 #, c-format
-msgid "size of `%s' message is too short. Ignoring.\n"
-msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
+msgid "Message details: %u: length %d, priority: %d\n"
+msgstr "Detalles del mensaje: %u: longitud %d, prioridad: %d\n"
 
-#: src/applications/testbed/testbed.c:85
+#: src/server/connection.c:2254
 #, c-format
-msgid "size of `%s' message is wrong. Ignoring.\n"
-msgstr "el tamaño del mensaje '%s' es erroneo. Se ignora.\n"
+msgid "Message from `%s' discarded: invalid format.\n"
+msgstr "Mensaje de '%s' descartado: formato inválido.\n"
 
-#: src/applications/testbed/testbed.c:137
+#: src/server/connection.c:2325
 #, c-format
-msgid "TESTBED could not generate hello message for protocol %u\n"
-msgstr "TESTBED no puede generar el mensaje de saludo para el protocolo %u\n"
+msgid "Invalid sequence number %u <= %u, dropping message.\n"
+msgstr "Secuencia de números no válida %u <= %u, omitiendo mensaje.\n"
 
-#: src/applications/testbed/testbed.c:215
-#: src/applications/testbed/testbed.c:256
-#: src/applications/testbed/testbed.c:359
-#: src/applications/testbed/testbed.c:366
-#: src/applications/testbed/testbed.c:403
-#: src/applications/testbed/testbed.c:410
-#, c-format
-msgid "received invalid `%s' message\n"
-msgstr "recibido mensaje '%s' no válido\n"
+#: src/server/connection.c:2340
+msgid "Message received more than one day old. Dropped.\n"
+msgstr "Mensajes recibidos de mas de un día de antigüedad. Omitidos.\n"
 
-#: src/applications/testbed/testbed.c:231
-#: src/applications/testbed/testbed.c:271
-#, c-format
-msgid "received invalid `%s' message (empty module name)\n"
-msgstr "recibido mensaje '%s' no válido (nombre del módulo vacío)\n"
+#: src/server/connection.c:2708
+msgid "# outgoing messages dropped"
+msgstr "# mensajes salientes omitidos"
 
-#: src/applications/testbed/testbed.c:238
-#, c-format
-msgid "loading module `%s' failed.  Notifying client.\n"
-msgstr "se produjo un fallo al cargar el módulo '%s'.  Notificando al 
cliente.\n"
+#: src/server/connection.c:2712
+msgid "# bytes of outgoing messages dropped"
+msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/applications/testbed/testbed.c:278
-msgid "unloading module failed.  Notifying client.\n"
-msgstr "se produjo un fallo al descargar el módulo.  Notificando al cliente.\n"
+#: src/server/connection.c:2714
+msgid "# connections closed (HANGUP sent)"
+msgstr ""
 
-#: src/applications/testbed/testbed.c:539
-#, c-format
-msgid "`%s' %s failed: %s\n"
-msgstr "'%s' %s falló: %s\n"
+#: src/server/connection.c:2717
+msgid "# bytes encrypted"
+msgstr "# bytes encriptados"
 
-#: src/applications/testbed/testbed.c:625
-#, c-format
-msgid "received invalid `%s' message: %s.\n"
-msgstr "recibido mensaje '%s' no válido: %s.\n"
+#: src/server/connection.c:2721
+#, fuzzy
+msgid "# bytes transmitted"
+msgstr "# bytes desencriptados"
 
-#: src/applications/testbed/testbed.c:817
-#, c-format
-msgid "'..' is not allowed in file name (%s).\n"
-msgstr "'..' no esta permitido en el nombre del fichero(%s).\n"
+#: src/server/connection.c:2725
+#, fuzzy
+msgid "# bytes received"
+msgstr "# bytes recibidos por TCP"
 
-#: src/applications/testbed/testbed.c:826
-msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
-msgstr "¡Nombre del fichero vacío para el mensaje UPLOAD_FILE es inválido!\n"
+#: src/server/connection.c:2727
+msgid "# bytes decrypted"
+msgstr "# bytes desencriptados"
 
-#: src/applications/testbed/testbed.c:833
-msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
-msgstr "Nombre del fichero para el mensaje UPLOAD_FILE no esta terminado en 
null (¡inválido!)\n"
+#: src/server/connection.c:2728
+msgid "# bytes noise sent"
+msgstr "# \"bytes-ruido\" mandados"
 
-#: src/applications/testbed/testbed.c:841
-msgid "Upload refused!"
-msgstr "¡Subida rechazada!"
-
-#: src/applications/testbed/testbed.c:867
+#: src/server/startup.c:196
 #, c-format
-msgid "Invalid message received at %s:%d."
-msgstr "Mensaje inválido recibido en %s:%d."
+msgid "The `%s' request received from client is malformed.\n"
+msgstr "La petición '%s' recibida del cliente esta mal formada.\n"
 
-#: src/applications/testbed/testbed.c:985
+#: src/server/startup.c:324
 #, c-format
-msgid "received invalid testbed message of size %u\n"
+msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1002
+#: src/server/startup.c:339
 #, c-format
+msgid "Could not write PID to file `%s': %s.\n"
+msgstr "Imposible escribir PID al fichero '%s': %s.\n"
+
+#: src/server/startup.c:443
 msgid ""
-"Received testbed message of type %u but unexpected size %u, expected %u\n"
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
 msgstr ""
+"se ejecuta en modo de depuración; gnunetd no sera un demonio y los mensajes "
+"de error serán escritos a través de stderr en vez de en un fichero de log"
 
-#: src/applications/testbed/testbed.c:1045
-msgid "No testbed URL given, not registered.\n"
-msgstr ""
+#: src/server/startup.c:456
+msgid "Starts the gnunetd daemon."
+msgstr "Arranca el demonio de gnunetd."
 
-#: src/applications/testbed/testbed.c:1054 src/transports/http.c:1455
+#: src/server/startup.c:470
 #, c-format
-msgid "Could not resolve name of HTTP proxy `%s'.\n"
-msgstr "Imposible resolver el nombre del proxy HTTP '%s'.\n"
+msgid "User `%s' not known, cannot change UID to it.\n"
+msgstr "Usuario '%s' desconocido, imposible cambiar la UID a él.\n"
 
-#: src/applications/testbed/testbed.c:1118
+#: src/server/startup.c:479
 #, c-format
-msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
-msgstr ""
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/applications/testbed/testbed.c:1154
+#: src/server/startup.c:580
+msgid "Invalid command-line arguments:\n"
+msgstr "Argumentos en la linea de comandos inválidos:\n"
+
+#: src/server/startup.c:583
 #, c-format
-msgid "Could not register testbed, host `%s' unknown\n"
+msgid "Argument %d: `%s'\n"
+msgstr "Argumento %d: '%s'\n"
+
+#: src/server/startup.c:589
+msgid "Invalid command-line arguments.\n"
+msgstr "Argumentos en la linea de comandos inválidos.\n"
+
+#: src/server/gnunetd.c:76
+#, c-format
+msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
+"La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
 
-#: src/applications/testbed/testbed.c:1177
+#: src/server/gnunetd.c:84
 #, c-format
-msgid "Failed to send HTTP request to host `%s': %s\n"
-msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+msgid "`%s' starting\n"
+msgstr "'%s' comenzando\n"
 
-#: src/applications/testbed/testbed.c:1230
+#: src/server/gnunetd.c:106
 #, c-format
-msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
-msgstr "Falló al mandar la petición HTTP '%s' al host '%s': %s\n"
+msgid "`%s' startup complete.\n"
+msgstr "'%s' comienzo completo.\n"
 
-#: src/applications/testbed/testbed.c:1269
-msgid "Exit register (error: no http response read).\n"
-msgstr "Saliendo del registro (error: no se leyó una respuesta de http).\n"
+#: src/server/gnunetd.c:111
+#, c-format
+msgid "`%s' is shutting down.\n"
+msgstr "'%s' se esta cerrando.\n"
 
-#: src/applications/testbed/testbed.c:1357
-msgid "allows construction of a P2P-testbed (incomplete)"
-msgstr ""
+#: src/server/core.c:115
+#, c-format
+msgid "Application module `%s' already initialized!\n"
+msgstr "¡El módulo de la aplicación '%s' ya esta inicializado!\n"
 
-#: src/applications/topology_default/topology.c:398
+#: src/server/core.c:168
 #, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
-msgstr ""
+msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
+msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
 
-#: src/applications/topology_f2f/topology.c:323
+#: src/server/core.c:215
 #, c-format
-msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
-msgstr ""
+msgid "Could not shutdown `%s': application not loaded\n"
+msgstr "Imposible apagar '%s': aplicación no cargada\n"
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/server/core.c:222
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr ""
+msgid "Could not shutdown application `%s': not initialized\n"
+msgstr "Imposible apagar la aplicación '%s': no inicializada\n"
 
-#: src/applications/topology_f2f/topology.c:358
-msgid "Syntax error in topology specification, skipping bytes.\n"
-msgstr ""
+#: src/server/core.c:231 src/server/core.c:420
+#, c-format
+msgid "Could not find '%s%s' method in library `%s'.\n"
+msgstr "Imposible encontrar el método '%s%s' en la biblioteca '%s'.\n"
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/server/core.c:398
 #, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
-msgid "probe network to the given DEPTH"
-msgstr ""
+#: src/server/core.c:499
+#, c-format
+msgid "Could not initialize application `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
-msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
-msgstr ""
+#: src/server/core.c:516
+#, c-format
+msgid "Could not properly shutdown application `%s'.\n"
+msgstr "Imposible apagar la aplicación '%s' adecuadamente.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
-msgid "use PRIO for the priority of the trace request"
-msgstr ""
+#: src/server/core.c:575
+msgid "FATAL: Identity plugin not found!\n"
+msgstr "FATAL: ¡Plugin de identidad no encontrado!\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
-msgid "wait DELAY seconds for replies"
-msgstr ""
+#: src/server/core.c:633
+#, c-format
+msgid "Could not properly unload service `%s'!\n"
+msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
-msgstr ""
+#: src/server/gnunet-transport-check.c:109
+#, c-format
+msgid "`%s': Could not create hello.\n"
+msgstr "'%s': Imposible crear saludo.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:222
+#: src/server/gnunet-transport-check.c:118
 #, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "'%s' no esta conectado a ningún par.\n"
+msgid "`%s': Could not connect.\n"
+msgstr "'%s': Imposible conectar.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:233
+#: src/server/gnunet-transport-check.c:148
 #, c-format
+msgid "`%s': Could not send.\n"
+msgstr "'%s': Imposible mandar.\n"
+
+#: src/server/gnunet-transport-check.c:168
+#, c-format
+msgid "`%s': Did not receive message within %llu ms.\n"
+msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
+
+#: src/server/gnunet-transport-check.c:182
+#, c-format
+msgid "`%s': Could not disconnect.\n"
+msgstr "'%s': Imposible desconectar.\n"
+
+#: src/server/gnunet-transport-check.c:189
+#, c-format
 msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
+"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
 msgstr ""
+"Transporte '%s' OK. Tomó %ums transmitir %d mensajes de %d bytes cada uno.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
+#: src/server/gnunet-transport-check.c:219
 #, c-format
-msgid "`%s' connected to `%s'.\n"
-msgstr "'%s' conectado a '%s'.\n"
+msgid " Transport %d is not being tested\n"
+msgstr " El transporte %d no esta siendo probado\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/server/gnunet-transport-check.c:230
 #, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+msgid ""
+"\n"
+"Contacting `%s'."
 msgstr ""
+"\n"
+"Contactando '%s'."
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
+#: src/server/gnunet-transport-check.c:253
 #, c-format
-msgid "Peer `%s' did not report back.\n"
-msgstr ""
+msgid " Connection failed\n"
+msgstr "Conexión fallida\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
-msgid "Could not send request to gnunetd.\n"
-msgstr ""
+#: src/server/gnunet-transport-check.c:259
+#, c-format
+msgid " Connection failed (bug?)\n"
+msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
+#: src/server/gnunet-transport-check.c:320
 #, c-format
-msgid "Received invalid `%s' message from `%s'.\n"
-msgstr ""
+msgid "No reply received within %llums.\n"
+msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/applications/tracekit/tracekit.c:243
-msgid "TRACEKIT: routing table full, trace request dropped\n"
+#: src/server/gnunet-transport-check.c:396
+msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:331
-#, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
+#: src/server/gnunet-transport-check.c:398
+msgid "send COUNT messages"
+msgstr "envia COUNT mensajes"
+
+#: src/server/gnunet-transport-check.c:400
+msgid "send messages with SIZE bytes payload"
+msgstr "manda mensajes con SIZE bytes payload"
+
+#: src/server/gnunet-transport-check.c:402
+msgid "specifies which TRANSPORT should be tested"
 msgstr ""
 
-#: src/applications/tracekit/tracekit.c:431
-msgid "allows mapping of the network topology"
+#: src/server/gnunet-transport-check.c:404
+msgid "specifies after how many MS to time-out"
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
+#: src/server/gnunet-transport-check.c:414
+msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
+#: src/server/gnunet-transport-check.c:565
+msgid "You must specify a non-empty set of transports to test!\n"
 msgstr ""
 
-#: src/applications/traffic/traffic.c:445
+#: src/server/gnunet-transport-check.c:570
 #, c-format
-msgid "# bytes transmitted of type %d"
-msgstr ""
+msgid "Testing transport(s) %s\n"
+msgstr "Probando transporte(s) %s\n"
 
-#: src/applications/traffic/traffic.c:465
+#: src/server/gnunet-transport-check.c:573
 #, c-format
-msgid "# bytes received of type %d"
-msgstr ""
+msgid "Available transport(s): %s\n"
+msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/applications/traffic/traffic.c:605
-msgid "tracks bandwidth utilization by gnunetd"
-msgstr ""
-
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/server/gnunet-transport-check.c:617
 #, c-format
-msgid "No transport of type %d known.\n"
+msgid ""
+"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:676
+#: src/server/tcpserver.c:422
 #, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
 msgstr ""
+"'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/applications/transport/transport.c:691
+#: src/server/tcpserver.c:688
 #, c-format
 msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
+"Malformed network specification in the configuration in section `%s' for "
+"entry `%s': %s\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:717
+#: src/server/tcpserver.c:798
 #, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
-msgstr "La biblioteca de transporte '%s' no provee la función '%s%s' 
requerida.\n"
+msgid "%s failed, message type %d already in use.\n"
+msgstr "%s falló, el mensaje del tipo %d ya está en uso.\n"
 
-#: src/applications/transport/transport.c:738
+#: src/server/handler.c:367
 #, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Yo soy el par '%s'.\n"
+msgid "Received corrupt message from peer `%s'in %s:%d.\n"
+msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/conf/conf.c:522 src/conf/recreate.c:135
+#: src/server/gnunet-peer-info.c:95
+msgid "Print information about GNUnet peers."
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
 #, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
-msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
+msgid "Could not get address of peer `%s'.\n"
+msgstr "Imposible obtener la dirección del par '%s'.\n"
 
-#: src/conf/conf.c:529
+#: src/server/gnunet-peer-info.c:153
+msgid "hello message invalid (signature invalid).\n"
+msgstr "mensaje de saludo inválido (firma no válida).\n"
+
+#: src/server/gnunet-peer-info.c:164
 #, c-format
-msgid "Configuration file `%s' created.\n"
-msgstr "Fichero de configuración '%s' creado.\n"
+msgid "Peer `%s' with trust %8u and address `%s'\n"
+msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/conf/confdata.c:93
+#: src/util/cron/cron.c:355
 #, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
-msgstr "%s: valor del símbolo '%s' no válido para %s\n"
+msgid ""
+"`%s' called with cron job not in queue, adding.  This may not be what you "
+"want.\n"
+msgstr ""
 
-#: src/conf/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
-msgstr "Lo siento, no hay ayuda disponible para esta opción.\n"
+#: src/util/crypto/hostkey_gcrypt.c:1031
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/conf/wizard.glade:10 src/conf/wizard.glade:259
-#: src/conf/wizard.glade:711 src/conf/wizard.glade:1436
-#: src/conf/wizard.glade:2217
-msgid "GNUnet configuration assistant"
-msgstr "Asistente de configuración de GNUnet"
+#: src/util/crypto/locking_gcrypt.c:47
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr ""
+"libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/conf/wizard.glade:56
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org\n";
-"and join our community at\n"
-"\thttps://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"The GNUnet team"
-msgstr "¡Bienvenido a GNUnet!\n"
-"\n"
-"Este asistente le preguntará unos datos básicos para configurar GNUnet.\n"
-"\n"
-"Por favor, visite nuestra página en\n"
-"\thttps://gnunet.org/drupal/\n";
-"\n"
-"Diviertase,\n"
-"\n"
-"El equipo de GNUnet"
+#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#, fuzzy, c-format
+msgid "Failed to parse interface data from `%s'.\n"
+msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/conf/wizard.glade:142 src/conf/wizard.glade:594
-#: src/conf/wizard.glade:1319 src/conf/wizard.glade:2581
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/conf/wizard.glade:217 src/conf/wizard.glade:669
-#: src/conf/wizard.glade:1394 src/conf/wizard.glade:1928
-#: src/conf/wizard.glade:2656
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/conf/wizard.glade:318
+#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
+#, c-format
 msgid ""
-"Enter information about your network connection here.\n"
-"\n"
-"The \"Network interface\" is the device that connects your computer to the "
-"internet. This is usually a modem, an ISDN card or a network card in case "
-"you are using DSL.\n"
-"\n"
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your "
-"IP-Address.\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, check the last option on this page. Leave it "
-"unchecked on direct connections through modems, ISDN cards and DNAT (also "
-"known as \"port forwarding\")."
+"No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
-"Introduce información acerca de tu conexión aquí.\n"
-"\n"
-"La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a Internet. 
"
-"Normalmente es un módem, una tarjeta de RDSI, un módem ADSL "
-"o una tarjeta de red en el caso de un router.\n"
-"\n"
-"Si tu proveedor siempre te da la misma dirección IP (una dirección IP "
-"\"estática\") introducelo en el campo \"Dirección IP\". Si tu dirección IP "
-"cambia (una dirección IP \"dinámica\") pero hay un nombre de dominio "
-"que siempre apunta a tu dirección IP actual (\"DNS dinámica\") también "
-"puedes introducirla aquí.\n"
-"En caso de duda deja el campo vacío. GNUnet intentara determinar "
-"tu dirección IP automaticamente.\n"
-"\n"
-"Si tu estas conectado a Internet a través de otro ordenador haciendo SNAT, "
-"a un router o a un \"cortafuegos de hardware\" y otros ordenadores no pueden "
-"conectar con tu ordenador marca la última opción en ésta página. Déjala sin "
-"marcar en conexiones directas a través de modems, tarjetas de RDSI y DNAT "
-"(también conocido como \"seguimiento de puertos\")."
 
-#: src/conf/wizard.glade:372
-msgid "Network interface:"
-msgstr "Interfaz de red:"
+#: src/util/os/semaphore.c:213
+#, c-format
+msgid "Can't create semaphore: %i"
+msgstr "Imposible crear un semáforo: %i"
 
-#: src/conf/wizard.glade:400
-msgid "IP-Address/Hostname:"
-msgstr "Dirección IP/Nombre del dominio"
-
-#: src/conf/wizard.glade:451
-msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
-msgstr "El ordenador no puede recibir conexiones entrantes (SNAT/Cortafuegos)"
-
-#: src/conf/wizard.glade:514
-msgid "Network connection"
-msgstr "Conexión de red"
-
-#: src/conf/wizard.glade:770
+#: src/util/os/dso.c:75
+#, c-format
 msgid ""
-"You can limit GNUnet's ressource usage here.\n"
-"\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you "
-"have a flatrate you can set it to the maximum speed of your internet "
-"connection.\n"
-"\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
-"to use."
+"Cannot determine plugin path, application must be installed in directory "
+"ending with `%s'.\n"
 msgstr ""
-"Puedes limitar el uso de recursos de GNUnet aquí.\n"
-"\n"
-"\"Limitación de ancho de banda\" es cuantos datos pueden ser mandados por 
segundo. Si "
-"tienes una tarifa plana puedes seleccionar la velocidad máxima de tu conexión 
a "
-"Internet.\n"
-"\n"
-"El \"Uso máximo de CPU\" es el porcentaje del tiempo de procesado que GNUnet "
-"puede usar."
 
-#: src/conf/wizard.glade:833
-msgid "Upstream (Bytes/s):"
-msgstr "Subida (Bytes/s):"
+#: src/util/os/dso.c:97
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "¡El mecanismo de iniciación de los plugins falló: %s!\n"
 
-#: src/conf/wizard.glade:883
-msgid "Downstream (Bytes/s):"
-msgstr "Bajada (Bytes/s):"
+#: src/util/os/dso.c:134
+#, fuzzy, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "'%s' falló en la biblioteca '%s' en %s:%d con un error: %s\n"
 
-#: src/conf/wizard.glade:942
-msgid "Bandwidth limitation"
-msgstr "Limitación del ancho de banda"
+#: src/util/os/dso.c:176
+#, fuzzy, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "'%s' falló al resolver el método '%s%s' en %s:%d con un error: %s\n"
 
-#: src/conf/wizard.glade:986
-msgid "Use denoted bandwidth for GNUnet"
-msgstr "Usa el ancho de banda marcado para GNUnet"
+#: src/util/os/cpustatus.c:274
+msgid "Cannot query the CPU usage (Windows NT).\n"
+msgstr ""
 
-#: src/conf/wizard.glade:1006
-msgid "Share denoted bandwidth with other applications"
-msgstr "Comparte el ancho de banda marcado con otras aplicaciones"
+#: src/util/os/cpustatus.c:293
+msgid "Cannot query the CPU usage (Win 9x)\n"
+msgstr ""
 
-#: src/conf/wizard.glade:1028
-msgid "Bandwidth sharing"
-msgstr "Ancho de banda compartido"
+#: src/util/os/installpath.c:172
+msgid ""
+"Cannot determine the path to the executable, your system may be broken or "
+"not supported.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:1071
-msgid "Max. CPU usage (%):"
-msgstr "Uso máximo de la CPU (%):"
+#: src/util/os/installpath.c:211
+msgid ""
+"GNUnet executables are not in a directory named 'bin'. This may signal a "
+"broken installation.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:1118
-msgid "CPU usage"
-msgstr "Uso de CPU"
+#: src/util/os/installpath.c:222
+msgid "Cannot determine the installation prefix. Unknown error.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:1164
-msgid "Load limitation"
-msgstr "Limitación de carga"
+#: src/util/network/tcpio.c:100
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
 
-#: src/conf/wizard.glade:1244 src/conf/wizard.glade:1778
-#: src/conf/wizard.glade:2506
-msgid "Back"
-msgstr "Atrás"
+#: src/util/network/tcpio.c:124
+msgid "Could not find valid value for HOST in section NETWORK."
+msgstr ""
 
-#: src/conf/wizard.glade:1495
-msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is "
-"useful if an adversary has access to your inserted content and you need to "
-"deny that the content is yours. With \"content migration\" on, the content "
-"could have \"migrated\" over the internet to your node without your "
-"knowledge.\n"
-"It also helps to spread popular content over different peers to enhance "
-"availability.\n"
-"\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, "
-"inserted and migrated content). Its maximum size can be specified below.\n"
-"\n"
-"If you are an experienced user, you may want to tweak your GNUnet "
-"installation using the enhanced configurator.\n"
-"\n"
-"After changing the configuration and/or updating GNUnet, it is sometimes "
-"required to run gnunet-update to update internal data structures. Depending "
-"on the changes made, this may take some time."
-msgstr "GNUnet es capaz de almacenar datos de otros pares en tu base de datos. 
Ésto es "
-"útil si un adversario tiene acceso a tu contenido y tu necesitas negar "
-"que ese contenido sea tuyo. Con la \"migración de contenido\" activada, tu 
contenido puede "
-"haber \"migrado\" por Internet hasta tu nodo sin tu conocimiento.\n"
-"Ésto también ayuda a difundir contenidos populares por diferentes pares para "
-"facilitar su disponibilidad.\n"
-"\n"
-"La base de datos de GNUnet contiene todos los datos que GNUnet genera 
(índices, "
-"contenido insertado y descargado). Su máximo tamaño puede ser especificado 
debajo.\n"
-"\n"
-"Si eres un usuario experimentado, puedes desear exprimir tu instalación de 
GNUnet "
-"usando la herramienta de configuración avanzada.\n"
-"\n"
-"Después de cambiar la configuración y/o actualizar GNUnet, a veces es"
-"necesario ejecutar gnunet-update para actualizar las estructuras de datos 
internas. "
-"Dependiendo de los cambios que se hayan hecho, ésto podrá tomar algún tiempo."
+#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
+#, fuzzy, c-format
+msgid "Cannot connect to %s:u: %s\n"
+msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/conf/wizard.glade:1541
-msgid "Store migrated content"
-msgstr "Almacena contenido migrado"
+#: src/util/network/tcpio.c:406
+#, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "¡'%s' falló, respuesta no válida!\n"
 
-#: src/conf/wizard.glade:1566
-msgid "Maximum datastore size (MB):"
-msgstr "Máximo tamaño de almacenamiento (MB):"
+#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
+#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Formato no válido para la IP: '%s'\n"
 
-#: src/conf/wizard.glade:1621
-msgid "Start the GNUnet background process on computer startup"
-msgstr "Arranca el demonio de GNUnet al encender el ordenador"
+#: src/util/network/ipcheck.c:156
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Notación de red no válida ('/%d' no es válido en IPv4 CIDR)."
 
-#: src/conf/wizard.glade:1642
-msgid "Open the enhanced configurator"
-msgstr "Abre el editor de configuración avanzado"
+#: src/util/network/ipcheck.c:217
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Notación de red no válida (no termina con ';': '%s')\n"
 
-#: src/conf/wizard.glade:1663
-msgid "Run gnunet-update"
-msgstr "Ejecutar gnunet-update"
+#: src/util/network/ipcheck.c:250
+#, c-format
+msgid "Wrong format `%s' for netmask: %s\n"
+msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
 
-#: src/conf/wizard.glade:1698 src/conf/wizard.glade:2426
-msgid "Other settings"
-msgstr "Otras configuraciones"
+#: src/util/network/ipcheck.c:265
+#, c-format
+msgid "Wrong format `%s' for network: %s\n"
+msgstr "Formato '%s' erróneo para la red: %s\n"
 
-#: src/conf/wizard.glade:1853
-msgid "Finish"
-msgstr "Finalizar"
+#: src/util/disk/storage.c:194
+#, fuzzy, c-format
+msgid "`%s' failed for drive `%s': %u\n"
+msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/conf/wizard.glade:1968
-msgid "Question"
-msgstr "Pregunta"
+#: src/util/disk/storage.c:240
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory\n"
+msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/conf/wizard.glade:2014
-msgid "Do you want to save your settings?"
-msgstr "¿Quieres guardar tu configuración?"
+#: src/util/disk/storage.c:279
+#, fuzzy, c-format
+msgid "Expected `%s' to be a regular file\n"
+msgstr "'%s' no es un fichero regular.\n"
 
-#: src/conf/wizard.glade:2065
-msgid "Yes"
-msgstr "Sí"
+#: src/util/disk/storage.c:486
+#, fuzzy, c-format
+msgid "expected `%s' to be a directory!\n"
+msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/conf/wizard.glade:2078
-msgid "No"
-msgstr "No"
+#: src/util/config_impl/impl.c:256
+#, c-format
+msgid "Syntax error in configuration file `%s' at line %d.\n"
+msgstr ""
+"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/conf/wizard.glade:2098 src/conf/wizard.glade:2696
-#: src/conf/wizard_curs.c:58 src/conf/wizard_util.c:120
-#: src/conf/wizard_util.c:163 src/util/configuration.c:522
-msgid "Error"
-msgstr "Error"
+#: src/util/config_impl/impl.c:412
+#, c-format
+msgid ""
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
+msgstr ""
 
-#: src/conf/wizard.glade:2144
-msgid "Unable to save configuration!"
-msgstr "Imposible guardar la configuración"
+#: src/util/config_impl/impl.c:424
+#, c-format
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
+msgstr ""
 
-#: src/conf/wizard.glade:2195 src/conf/wizard.glade:2793
-msgid "OK"
-msgstr "OK"
-
-#: src/conf/wizard.glade:2276
+#: src/util/config_impl/impl.c:494
+#, c-format
 msgid ""
-"Define the user and the group owning the GNUnet service here.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new user "
-"account and a new group under which the GNUnet service is started at system "
-"startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the fields empty to run GNUnet with system privileges."
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
-"Define el usuario y el grupo bajo el que correrán los servicios de GNUnet 
aquí.\n"
-"\n"
-"Por razones de seguridad, es una buena idea dejar que la configuración cree 
una "
-"nueva cuenta de usuario y un nuevo grupo bajo el cual el servicio de GNUnet 
es arrancado "
-"al iniciar el sistema.\n"
-"\n"
-"Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros ficheros 
que no sean los que posee. "
-"Ésto incluye los ficheros que quieras publicar en GNUnet. Tendrás que 
garantizar que "
-"el usuario especificado aquí posea permisos de lectura.\n"
-"\n"
-"Deja los campos vacíos para arrancar GNUnet con privilegios de sistema."
 
-#: src/conf/wizard.glade:2317
-msgid "Group:"
-msgstr "Grupo:"
+#: src/util/error/error.c:138 src/util/error/error.c:182
+msgid "DEBUG"
+msgstr "DEPURACIÓN"
 
-#: src/conf/wizard.glade:2389
-msgid "User account:"
-msgstr "Cuenta de usuario:"
+#: src/util/error/error.c:141 src/util/error/error.c:184
+msgid "STATUS"
+msgstr ""
 
-#: src/conf/wizard.glade:2742
-msgid "gnunet-update failed!"
-msgstr "¡gnunet-update falló!"
+#: src/util/error/error.c:144 src/util/error/error.c:186
+msgid "WARNING"
+msgstr "PELIGRO"
 
-#: src/conf/wizard.glade:2813
-msgid "Gtk GNUnet Configurator"
-msgstr "Configurador Gtk de GNUnet"
+#: src/util/error/error.c:147 src/util/error/error.c:188
+msgid "ERROR"
+msgstr "ERROR"
 
-#: src/conf/wizard.glade:2847
-msgid "_File"
-msgstr "_Fichero"
+#: src/util/error/error.c:150 src/util/error/error.c:190
+msgid "FATAL"
+msgstr "FATAL"
 
-#: src/conf/wizard.glade:2856 src/conf/wizard.glade:3189
-msgid "Load a config file"
-msgstr "Cargar un fichero de configuración"
+#: src/util/error/error.c:153 src/util/error/error.c:192
+msgid "USER"
+msgstr ""
 
-#: src/conf/wizard.glade:2857
-msgid "_Load"
-msgstr "_Cargar"
+#: src/util/error/error.c:156 src/util/error/error.c:194
+msgid "ADMIN"
+msgstr ""
 
-#: src/conf/wizard.glade:2879
-msgid "Save the config in .config"
-msgstr "Guardar la configuración en .config"
+#: src/util/error/error.c:159 src/util/error/error.c:196
+msgid "DEVELOPER"
+msgstr ""
 
-#: src/conf/wizard.glade:2880
-msgid "_Save"
-msgstr "_Guardar"
+#: src/util/error/error.c:162 src/util/error/error.c:198
+msgid "REQUEST"
+msgstr ""
 
-#: src/conf/wizard.glade:2908
-msgid "_Quit"
-msgstr "_Salir"
+#: src/util/error/error.c:165 src/util/error/error.c:200
+msgid "BULK"
+msgstr ""
 
-#: src/conf/wizard.glade:2934
-msgid "_Options"
-msgstr "_Opciones"
+#: src/util/error/error.c:168 src/util/error/error.c:202
+msgid "IMMEDIATE"
+msgstr ""
 
-#: src/conf/wizard.glade:2943
-msgid "Show name"
-msgstr "Mostrar el nombre"
+#: src/util/error/error.c:171
+msgid "ALL"
+msgstr ""
 
-#: src/conf/wizard.glade:2944
-msgid "Show _name"
-msgstr "Mostrar el _nombre"
+#: src/util/error/error.c:203
+msgid "NOTHING"
+msgstr "NADA"
 
-#: src/conf/wizard.glade:2954
-msgid "Show range (Y/M/N)"
-msgstr "Muestra el rango (Y/M/N)"
+#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#, fuzzy, c-format
+msgid "Invalid argument for `%s'.\n"
+msgstr "Argumento no válido: '%s'\n"
 
-#: src/conf/wizard.glade:2955
-msgid "Show _range"
-msgstr "Muestra el _rango"
+#: src/util/threads/mutex.c:136
+#, c-format
+msgid "Deadlock due to `%s'.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:2965
-msgid "Show value of the option"
-msgstr "Muestra el valor de la opción"
+#: src/util/threads/mutex.c:156
+#, fuzzy, c-format
+msgid "Permission denied for `%s'.\n"
+msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/conf/wizard.glade:2966
-msgid "Show _data"
-msgstr "Mostrar los _datos"
+#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
+#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
+#: src/util/threads/pthread.c:275
+#, fuzzy, c-format
+msgid "`%s' failed with error code %s: %s\n"
+msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/conf/wizard.glade:2982
-msgid "Show all options"
-msgstr "Mostrar todas las opciones"
+#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#, fuzzy, c-format
+msgid "`%s' failed with error code %d: %s\n"
+msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/conf/wizard.glade:2983
-msgid "Show all _options"
-msgstr "Mostrar todas las _opciones"
+#: src/util/loggers/memory.c:71
+msgid "Out of memory (for logging)"
+msgstr ""
 
-#: src/conf/wizard.glade:2997
-msgid "_Help"
-msgstr "_Ayuda"
+#: src/util/getopt/getopt.c:686
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/conf/wizard.glade:3006
-msgid "_Introduction"
-msgstr "_Introducción"
+#: src/util/getopt/getopt.c:710
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: la opción '--%s' no permite un argumento\n"
 
-#: src/conf/wizard.glade:3028
-msgid "_About"
-msgstr "_Acerca de"
+#: src/util/getopt/getopt.c:715
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: la opción '%c%s' no permite un argumento\n"
 
-#: src/conf/wizard.glade:3083
-msgid "Goes up of one level (single view)"
-msgstr "Sube un nivel (vista única)"
+#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: src/conf/wizard.glade:3126
-msgid "Up"
-msgstr "Arriba"
+#: src/util/getopt/getopt.c:762
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/conf/wizard.glade:3232
-msgid "Load"
-msgstr "Cargar"
+#: src/util/getopt/getopt.c:766
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/conf/wizard.glade:3276
-msgid "Save a config file"
-msgstr "Guardar un fichero de configuración"
+#: src/util/getopt/getopt.c:792
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opción ilegal -- %c\n"
 
-#: src/conf/wizard.glade:3319
-msgid "Save"
-msgstr "Guardar"
+#: src/util/getopt/getopt.c:795
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opción no válida -- %c\n"
 
-#: src/conf/wizard.glade:3382
-msgid "Single view"
-msgstr "Vista única"
+#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: la opción requiere un argumento --%c\n"
 
-#: src/conf/wizard.glade:3425
-msgid "Single"
-msgstr "Única"
+#: src/util/getopt/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: src/conf/wizard.glade:3469
-msgid "Split view"
-msgstr "Vista doble"
+#: src/util/getopt/getopt.c:890
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: la opción '-W %s' no permite un argumento\n"
 
-#: src/conf/wizard.glade:3512
-msgid "Split"
-msgstr "Doble"
+#: src/util/getopt/printhelp.c:49
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:3556
-msgid "Full view"
-msgstr "Vista completa"
+#: src/util/string/string.c:101
+msgid "ms"
+msgstr "ms"
 
-#: src/conf/wizard.glade:3599
-msgid "Full"
-msgstr "Completa"
+#: src/util/string/string.c:106
+msgid "s"
+msgstr "s"
 
-#: src/conf/wizard.glade:3662
-msgid "Collapse the whole tree in the right frame"
-msgstr "Contraer el árbol completo en el lateral izquierdo"
+#: src/util/string/string.c:109
+msgid "m"
+msgstr "m"
 
-#: src/conf/wizard.glade:3705
-msgid "Collapse"
-msgstr "Contraer"
+#: src/util/string/string.c:112
+msgid "h"
+msgstr "h"
 
-#: src/conf/wizard.glade:3749
-msgid "Expand the whole tree in the right frame"
-msgstr "Expandir el árbol entero en el lateral izquierdo"
+#: src/util/string/string.c:115
+msgid " days"
+msgstr " días"
 
-#: src/conf/wizard.glade:3792
-msgid "Expand"
-msgstr "Expandir"
+#: src/util/string/string.c:133
+msgid "b"
+msgstr "b"
 
-#: src/conf/wizard.glade:3935
-msgid ""
-"This is GNUnet's configuration interface.\n"
-"\n"
-"GNUnet's options are separated into categories. You can browse them in the "
-"left tree. If you click on one of the categories, its options are shown "
-"above. \n"
-"\n"
-"To change the value of an option, simply click on its value and enter a new "
-"value. To get additional information about a specific option, click on its "
-"description."
-msgstr ""
-"Ésta es la interfaz de configuración de GNUnet.\n"
-"\n"
-"Las opciones de GNUnet están separadas en categorías. Tu puedes explorarlas 
en "
-"el árbol de la izquierda. Si pulsas en una de las categorías las opciones son 
mostradas "
-"encima.\n"
-"\n"
-"Para cambiar el valor de una opción, simplemente pulsa en su valor e 
introduce "
-"uno nuevo. Para obtener información adicional acerca de una opción 
específica, pulsa "
-"en su descripción."
+#: src/util/string/string.c:138
+msgid "KiB"
+msgstr "KiB"
 
-#: src/conf/wizard.glade:3967
-msgid "Introduction"
-msgstr "Introducción"
+#: src/util/string/string.c:141
+msgid "MiB"
+msgstr "MiB"
 
-#: src/conf/wizard.glade:4043
+#: src/util/string/string.c:144
+msgid "GiB"
+msgstr "GiB"
+
+#: src/util/string/string.c:147
 #, fuzzy
-msgid ""
-"Welcome to GNUnet Setup.\n"
-"\n"
-"For each option, a blank box indicates the feature is disabled, and checked "
-"one indicates it is enabled.\n"
-"If you do not see an option that you believe should be present, try turning "
-"on Show All Options under the Options menu.\n"
-"\n"
-"Although there is no cross reference yet to help you figure out what other "
-"options must be enabled to support the option you are interested in, you can "
-"still view the help of a grayed-out option.\n"
-"\n"
-"Toggling Show Debug Info under the Options menu will show the dependencies, "
-"which you can then match by examining other options."
-msgstr "Bienvenido a la configuración de GNUnet.\n"
-"\n"
-"Para cada opción una caja en blanco indica que la opción está desactivada y "
-"una marcada indica que está activada.\n"
-"Si no ves una opción que crees que debería estar presente, prueba activando "
-"la opción \"Mostrar todas las opciones\" en el menú de \"Opciones\".\n"
-"\n"
-"Although·there·is·no·cross·reference·yet·to·help·you·figure·out·what·other·"
-"options·must·be·enabled·to·support·the·option·you·are·interested·in,·you·can·"
-"still·view·the·help·of·a·grayed-out·option.\n"
-"\n"
-"Toggling·Show·Debug·Info·under·the·Options·menu·will·show·the·dependencies,·"
-"which·you·can·then·match·by·examining·other·options."
+msgid "TiB"
+msgstr "KiB"
 
-#: src/conf/wizard.glade:4067
-msgid "gnunet-setup"
-msgstr "gnunet-setup"
-
-#: src/conf/wizard.glade:4068
-msgid "(C) 2001-2006 Christian Grothoff (and other contributing authors)"
-msgstr "C) 2001-2006 Christian Grothoff (y otros autores que han contribuido)"
-
-#: src/conf/wizard.glade:4069
-msgid "This is the configuration tool for GNUnet."
-msgstr "Esta es la herramienta de configuración de GNUnet."
-
-#: src/conf/wizard.glade:4070
-msgid ""
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"\t\t       Version 2, June 1991\n"
-"\n"
-" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
-"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-" Everyone is permitted to copy and distribute verbatim copies\n"
-" of this license document, but changing it is not allowed.\n"
-"\n"
-"\t\t\t    Preamble\n"
-"\n"
-"  The licenses for most software are designed to take away your\n"
-"freedom to share and change it.  By contrast, the GNU General Public\n"
-"License is intended to guarantee your freedom to share and change free\n"
-"software--to make sure the software is free for all its users.  This\n"
-"General Public License applies to most of the Free Software\n"
-"Foundation's software and to any other program whose authors commit to\n"
-"using it.  (Some other Free Software Foundation software is covered by\n"
-"the GNU Library General Public License instead.)  You can apply it to\n"
-"your programs, too.\n"
-"\n"
-"  When we speak of free software, we are referring to freedom, not\n"
-"price.  Our General Public Licenses are designed to make sure that you\n"
-"have the freedom to distribute copies of free software (and charge for\n"
-"this service if you wish), that you receive source code or can get it\n"
-"if you want it, that you can change the software or use pieces of it\n"
-"in new free programs; and that you know you can do these things.\n"
-"\n"
-"  To protect your rights, we need to make restrictions that forbid\n"
-"anyone to deny you these rights or to ask you to surrender the rights.\n"
-"These restrictions translate to certain responsibilities for you if you\n"
-"distribute copies of the software, or if you modify it.\n"
-"\n"
-"  For example, if you distribute copies of such a program, whether\n"
-"gratis or for a fee, you must give the recipients all the rights that\n"
-"you have.  You must make sure that they, too, receive or can get the\n"
-"source code.  And you must show them these terms so they know their\n"
-"rights.\n"
-"\n"
-"  We protect your rights with two steps: (1) copyright the software, and\n"
-"(2) offer you this license which gives you legal permission to copy,\n"
-"distribute and/or modify the software.\n"
-"\n"
-"  Also, for each author's protection and ours, we want to make certain\n"
-"that everyone understands that there is no warranty for this free\n"
-"software.  If the software is modified by someone else and passed on, we\n"
-"want its recipients to know that what they have is not the original, so\n"
-"that any problems introduced by others will not reflect on the original\n"
-"authors' reputations.\n"
-"\n"
-"  Finally, any free program is threatened constantly by software\n"
-"patents.  We wish to avoid the danger that redistributors of a free\n"
-"program will individually obtain patent licenses, in effect making the\n"
-"program proprietary.  To prevent this, we have made it clear that any\n"
-"patent must be licensed for everyone's free use or not licensed at all.\n"
-"\n"
-"  The precise terms and conditions for copying, distribution and\n"
-"modification follow.\n"
-"\n"
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
-"\n"
-"  0. This License applies to any program or other work which contains\n"
-"a notice placed by the copyright holder saying it may be distributed\n"
-"under the terms of this General Public License.  The \"Program\", below,\n"
-"refers to any such program or work, and a \"work based on the Program\"\n"
-"means either the Program or any derivative work under copyright law:\n"
-"that is to say, a work containing the Program or a portion of it,\n"
-"either verbatim or with modifications and/or translated into another\n"
-"language.  (Hereinafter, translation is included without limitation in\n"
-"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
-"\n"
-"Activities other than copying, distribution and modification are not\n"
-"covered by this License; they are outside its scope.  The act of\n"
-"running the Program is not restricted, and the output from the Program\n"
-"is covered only if its contents constitute a work based on the\n"
-"Program (independent of having been made by running the Program).\n"
-"Whether that is true depends on what the Program does.\n"
-"\n"
-"  1. You may copy and distribute verbatim copies of the Program's\n"
-"source code as you receive it, in any medium, provided that you\n"
-"conspicuously and appropriately publish on each copy an appropriate\n"
-"copyright notice and disclaimer of warranty; keep intact all the\n"
-"notices that refer to this License and to the absence of any warranty;\n"
-"and give any other recipients of the Program a copy of this License\n"
-"along with the Program.\n"
-"\n"
-"You may charge a fee for the physical act of transferring a copy, and\n"
-"you may at your option offer warranty protection in exchange for a fee.\n"
-"\n"
-"  2. You may modify your copy or copies of the Program or any portion\n"
-"of it, thus forming a work based on the Program, and copy and\n"
-"distribute such modifications or work under the terms of Section 1\n"
-"above, provided that you also meet all of these conditions:\n"
-"\n"
-"    a) You must cause the modified files to carry prominent notices\n"
-"    stating that you changed the files and the date of any change.\n"
-"\n"
-"    b) You must cause any work that you distribute or publish, that in\n"
-"    whole or in part contains or is derived from the Program or any\n"
-"    part thereof, to be licensed as a whole at no charge to all third\n"
-"    parties under the terms of this License.\n"
-"\n"
-"    c) If the modified program normally reads commands interactively\n"
-"    when run, you must cause it, when started running for such\n"
-"    interactive use in the most ordinary way, to print or display an\n"
-"    announcement including an appropriate copyright notice and a\n"
-"    notice that there is no warranty (or else, saying that you provide\n"
-"    a warranty) and that users may redistribute the program under\n"
-"    these conditions, and telling the user how to view a copy of this\n"
-"    License.  (Exception: if the Program itself is interactive but\n"
-"    does not normally print such an announcement, your work based on\n"
-"    the Program is not required to print an announcement.)\n"
-"\n"
-"These requirements apply to the modified work as a whole.  If\n"
-"identifiable sections of that work are not derived from the Program,\n"
-"and can be reasonably considered independent and separate works in\n"
-"themselves, then this License, and its terms, do not apply to those\n"
-"sections when you distribute them as separate works.  But when you\n"
-"distribute the same sections as part of a whole which is a work based\n"
-"on the Program, the distribution of the whole must be on the terms of\n"
-"this License, whose permissions for other licensees extend to the\n"
-"entire whole, and thus to each and every part regardless of who wrote it.\n"
-"\n"
-"Thus, it is not the intent of this section to claim rights or contest\n"
-"your rights to work written entirely by you; rather, the intent is to\n"
-"exercise the right to control the distribution of derivative or\n"
-"collective works based on the Program.\n"
-"\n"
-"In addition, mere aggregation of another work not based on the Program\n"
-"with the Program (or with a work based on the Program) on a volume of\n"
-"a storage or distribution medium does not bring the other work under\n"
-"the scope of this License.\n"
-"\n"
-"  3. You may copy and distribute the Program (or a work based on it,\n"
-"under Section 2) in object code or executable form under the terms of\n"
-"Sections 1 and 2 above provided that you also do one of the following:\n"
-"\n"
-"    a) Accompany it with the complete corresponding machine-readable\n"
-"    source code, which must be distributed under the terms of Sections\n"
-"    1 and 2 above on a medium customarily used for software interchange; "
-"or,\n"
-"\n"
-"    b) Accompany it with a written offer, valid for at least three\n"
-"    years, to give any third party, for a charge no more than your\n"
-"    cost of physically performing source distribution, a complete\n"
-"    machine-readable copy of the corresponding source code, to be\n"
-"    distributed under the terms of Sections 1 and 2 above on a medium\n"
-"    customarily used for software interchange; or,\n"
-"\n"
-"    c) Accompany it with the information you received as to the offer\n"
-"    to distribute corresponding source code.  (This alternative is\n"
-"    allowed only for noncommercial distribution and only if you\n"
-"    received the program in object code or executable form with such\n"
-"    an offer, in accord with Subsection b above.)\n"
-"\n"
-"The source code for a work means the preferred form of the work for\n"
-"making modifications to it.  For an executable work, complete source\n"
-"code means all the source code for all modules it contains, plus any\n"
-"associated interface definition files, plus the scripts used to\n"
-"control compilation and installation of the executable.  However, as a\n"
-"special exception, the source code distributed need not include\n"
-"anything that is normally distributed (in either source or binary\n"
-"form) with the major components (compiler, kernel, and so on) of the\n"
-"operating system on which the executable runs, unless that component\n"
-"itself accompanies the executable.\n"
-"\n"
-"If distribution of executable or object code is made by offering\n"
-"access to copy from a designated place, then offering equivalent\n"
-"access to copy the source code from the same place counts as\n"
-"distribution of the source code, even though third parties are not\n"
-"compelled to copy the source along with the object code.\n"
-"\n"
-"  4. You may not copy, modify, sublicense, or distribute the Program\n"
-"except as expressly provided under this License.  Any attempt\n"
-"otherwise to copy, modify, sublicense or distribute the Program is\n"
-"void, and will automatically terminate your rights under this License.\n"
-"However, parties who have received copies, or rights, from you under\n"
-"this License will not have their licenses terminated so long as such\n"
-"parties remain in full compliance.\n"
-"\n"
-"  5. You are not required to accept this License, since you have not\n"
-"signed it.  However, nothing else grants you permission to modify or\n"
-"distribute the Program or its derivative works.  These actions are\n"
-"prohibited by law if you do not accept this License.  Therefore, by\n"
-"modifying or distributing the Program (or any work based on the\n"
-"Program), you indicate your acceptance of this License to do so, and\n"
-"all its terms and conditions for copying, distributing or modifying\n"
-"the Program or works based on it.\n"
-"\n"
-"  6. Each time you redistribute the Program (or any work based on the\n"
-"Program), the recipient automatically receives a license from the\n"
-"original licensor to copy, distribute or modify the Program subject to\n"
-"these terms and conditions.  You may not impose any further\n"
-"restrictions on the recipients' exercise of the rights granted herein.\n"
-"You are not responsible for enforcing compliance by third parties to\n"
-"this License.\n"
-"\n"
-"  7. If, as a consequence of a court judgment or allegation of patent\n"
-"infringement or for any other reason (not limited to patent issues),\n"
-"conditions are imposed on you (whether by court order, agreement or\n"
-"otherwise) that contradict the conditions of this License, they do not\n"
-"excuse you from the conditions of this License.  If you cannot\n"
-"distribute so as to satisfy simultaneously your obligations under this\n"
-"License and any other pertinent obligations, then as a consequence you\n"
-"may not distribute the Program at all.  For example, if a patent\n"
-"license would not permit royalty-free redistribution of the Program by\n"
-"all those who receive copies directly or indirectly through you, then\n"
-"the only way you could satisfy both it and this License would be to\n"
-"refrain entirely from distribution of the Program.\n"
-"\n"
-"If any portion of this section is held invalid or unenforceable under\n"
-"any particular circumstance, the balance of the section is intended to\n"
-"apply and the section as a whole is intended to apply in other\n"
-"circumstances.\n"
-"\n"
-"It is not the purpose of this section to induce you to infringe any\n"
-"patents or other property right claims or to contest validity of any\n"
-"such claims; this section has the sole purpose of protecting the\n"
-"integrity of the free software distribution system, which is\n"
-"implemented by public license practices.  Many people have made\n"
-"generous contributions to the wide range of software distributed\n"
-"through that system in reliance on consistent application of that\n"
-"system; it is up to the author/donor to decide if he or she is willing\n"
-"to distribute software through any other system and a licensee cannot\n"
-"impose that choice.\n"
-"\n"
-"This section is intended to make thoroughly clear what is believed to\n"
-"be a consequence of the rest of this License.\n"
-"\n"
-"  8. If the distribution and/or use of the Program is restricted in\n"
-"certain countries either by patents or by copyrighted interfaces, the\n"
-"original copyright holder who places the Program under this License\n"
-"may add an explicit geographical distribution limitation excluding\n"
-"those countries, so that distribution is permitted only in or among\n"
-"countries not thus excluded.  In such case, this License incorporates\n"
-"the limitation as if written in the body of this License.\n"
-"\n"
-"  9. The Free Software Foundation may publish revised and/or new versions\n"
-"of the General Public License from time to time.  Such new versions will\n"
-"be similar in spirit to the present version, but may differ in detail to\n"
-"address new problems or concerns.\n"
-"\n"
-"Each version is given a distinguishing version number.  If the Program\n"
-"specifies a version number of this License which applies to it and \"any\n"
-"later version\", you have the option of following the terms and conditions\n"
-"either of that version or of any later version published by the Free\n"
-"Software Foundation.  If the Program does not specify a version number of\n"
-"this License, you may choose any version ever published by the Free "
-"Software\n"
-"Foundation.\n"
-"\n"
-"  10. If you wish to incorporate parts of the Program into other free\n"
-"programs whose distribution conditions are different, write to the author\n"
-"to ask for permission.  For software which is copyrighted by the Free\n"
-"Software Foundation, write to the Free Software Foundation; we sometimes\n"
-"make exceptions for this.  Our decision will be guided by the two goals\n"
-"of preserving the free status of all derivatives of our free software and\n"
-"of promoting the sharing and reuse of software generally.\n"
-"\n"
-"\t\t\t    NO WARRANTY\n"
-"\n"
-"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
-"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
-"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
-"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
-"EXPRESSED\n"
-"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
-"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
-"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
-"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
-"REPAIR OR CORRECTION.\n"
-"\n"
-"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
-"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
-"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
-"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
-"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
-"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
-"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
-"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
-"POSSIBILITY OF SUCH DAMAGES.\n"
-"\n"
-"\t\t     END OF TERMS AND CONDITIONS\n"
-"\n"
-"\t    How to Apply These Terms to Your New Programs\n"
-"\n"
-"  If you develop a new program, and you want it to be of the greatest\n"
-"possible use to the public, the best way to achieve this is to make it\n"
-"free software which everyone can redistribute and change under these terms.\n"
-"\n"
-"  To do so, attach the following notices to the program.  It is safest\n"
-"to attach them to the start of each source file to most effectively\n"
-"convey the exclusion of warranty; and each file should have at least\n"
-"the \"copyright\" line and a pointer to where the full notice is found.\n"
-"\n"
-"    <one line to give the program's name and a brief idea of what it does.>\n"
-"    Copyright (C) <year>  <name of author>\n"
-"\n"
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License as published by\n"
-"    the Free Software Foundation; either version 2 of the License, or\n"
-"    (at your option) any later version.\n"
-"\n"
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-"\n"
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
-"USA\n"
-"\n"
-"\n"
-"Also add information on how to contact you by electronic and paper mail.\n"
-"\n"
-"If the program is interactive, make it output a short notice like this\n"
-"when it starts in an interactive mode:\n"
-"\n"
-"    Gnomovision version 69, Copyright (C) year  name of author\n"
-"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
-"w'.\n"
-"    This is free software, and you are welcome to redistribute it\n"
-"    under certain conditions; type `show c' for details.\n"
-"\n"
-"The hypothetical commands `show w' and `show c' should show the appropriate\n"
-"parts of the General Public License.  Of course, the commands you use may\n"
-"be called something other than `show w' and `show c'; they could even be\n"
-"mouse-clicks or menu items--whatever suits your program.\n"
-"\n"
-"You should also get your employer (if you work as a programmer) or your\n"
-"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
-"necessary.  Here is a sample; alter the names:\n"
-"\n"
-"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
-"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
-"\n"
-"  <signature of Ty Coon>, 1 April 1989\n"
-"  Ty Coon, President of Vice\n"
-"\n"
-"This General Public License does not permit incorporating your program into\n"
-"proprietary programs.  If your program is a subroutine library, you may\n"
-"consider it more useful to permit linking proprietary applications with the\n"
-"library.  If this is what you want to do, use the GNU Library General\n"
-"Public License instead of this License.\n"
+#: src/util/string/string.c:267
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/conf/wizard.glade:4458
-msgid "Not for English ;-)"
-msgstr ""
-
-#: src/conf/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:82
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr "genera configuración para gnunetd, el demonio de GNUnet"
 
-#: src/conf/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:90
 msgid "Tool to setup GNUnet."
 msgstr "Herramienta de configuración de GNUnet."
 
-#: src/conf/gnunet-setup.c:91
+#: src/setup/gnunet-setup.c:91
 #, c-format
 msgid "Available MODEs:\n"
 msgstr "MODOs disponibles:\n"
 
-#: src/conf/gnunet-setup.c:92
+#: src/setup/gnunet-setup.c:92
 #, c-format
 msgid " config\t\ttext-based configuration\n"
 msgstr " configuración\t\tconfiguración basada en texto\n"
 
-#: src/conf/gnunet-setup.c:94
+#: src/setup/gnunet-setup.c:94
 #, c-format
 msgid " menuconfig\ttext-based menu\n"
 msgstr " menuconfig\tmenú basado en texto\n"
 
-#: src/conf/gnunet-setup.c:96
+#: src/setup/gnunet-setup.c:96
 #, c-format
 msgid " wizard-curses\tBasic text-based graphical configuration\n"
-msgstr " wizard-curses\t Configuración básica en modo gráfico pero basado en 
texto\n"
+msgstr ""
+" wizard-curses\t Configuración básica en modo gráfico pero basado en texto\n"
 
-#: src/conf/gnunet-setup.c:99
+#: src/setup/gnunet-setup.c:99
 #, c-format
 msgid " gconfig\tGTK configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/conf/gnunet-setup.c:100
+#: src/setup/gnunet-setup.c:100
 #, c-format
 msgid ""
 " wizard-gtk\tBasic GTK configuration\n"
@@ -3200,28 +3697,24 @@
 " wizard-gtk\tConfiguración GTK básica\n"
 "\n"
 
-#: src/conf/gnunet-setup.c:167
+#: src/setup/gnunet-setup.c:167
 #, c-format
 msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
-msgstr "gnunet-setup debe tener acceso de escritura al fichero de 
configuración '%s'\n"
+msgstr ""
+"gnunet-setup debe tener acceso de escritura al fichero de configuración '%"
+"s'\n"
 
-#: src/conf/gnunet-setup.c:176 src/server/gnunet-peer-info.c:113
-#: src/server/gnunet-transport-check.c:527 src/server/gnunet-update.c:152
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Argumentos inválidos: "
-
-#: src/conf/gnunet-setup.c:224
+#: src/setup/gnunet-setup.c:224
 msgid "No interface specified, using default\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/conf/gnunet-setup.c:237 src/conf/gnunet-setup.c:251
-#: src/conf/gnunet-setup.c:270 src/conf/gnunet-setup.c:281
+#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
+#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
 #, c-format
 msgid "`%s' is not available."
 msgstr "'%s' no esta disponible."
 
-#: src/conf/gnunet-setup.c:264 src/conf/gnunet-setup.c:275
+#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
 #, fuzzy, c-format
 msgid ""
 "Can only run wizard to configure gnunetd.\n"
@@ -3230,76 +3723,91 @@
 "Solo se puede arrancar wizard para configurar gnunetd.\n"
 "¿Te olvidaste de la opción %s'?\n"
 
-#: src/conf/gnunet-setup.c:285
+#: src/setup/gnunet-setup.c:285
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/conf/gnunet-win-tool.c:109
+#: src/setup/wizard_gtk.c:429
 #, c-format
+msgid "Unable to save configuration file `%s':"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
+msgid "Unable to create user account:"
+msgstr "Imposible crear la cuenta de usuario:"
+
+#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
+msgid "Unable to change startup process:"
+msgstr "Imposible cambiar el proceso de arranque:"
+
+#: src/setup/gnunet-win-tool.c:109
+#, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr "Servicio de GNUnet instalado satisfactoriamente.\n"
 
-#: src/conf/gnunet-win-tool.c:112 src/conf/gnunet-win-tool.c:139
+#: src/setup/gnunet-win-tool.c:112 src/setup/gnunet-win-tool.c:139
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr "Esta versión de Windows no soporta servicios.\n"
 
-#: src/conf/gnunet-win-tool.c:116 src/conf/gnunet-win-tool.c:143
+#: src/setup/gnunet-win-tool.c:116 src/setup/gnunet-win-tool.c:143
 #, fuzzy, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr "Error: imposible abrir el Service Control Manager: &s\n"
 
-#: src/conf/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:121
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr "Error: imposible crear el servicio: %s\n"
 
-#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:155
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Error desconocido.\n"
 
-#: src/conf/gnunet-win-tool.c:136
+#: src/setup/gnunet-win-tool.c:136
 #, c-format
 msgid "Service deleted.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/conf/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:148
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr "Error: imposible acceder al servicio: %s\n"
 
-#: src/conf/gnunet-win-tool.c:152
+#: src/setup/gnunet-win-tool.c:152
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr "Error: imposible borrar el servicio: %s\n"
 
-#: src/conf/wizard_gtk.c:429
+#: src/setup/conf.c:522 src/setup/recreate.c:135
 #, c-format
-msgid "Unable to save configuration file `%s':"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+msgid "Unable to save configuration file `%s': %s.\n"
+msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/conf/wizard_gtk.c:475 src/conf/wizard_curs.c:616
-msgid "Unable to create user account:"
-msgstr "Imposible crear la cuenta de usuario:"
+#: src/setup/conf.c:529
+#, c-format
+msgid "Configuration file `%s' created.\n"
+msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/conf/wizard_gtk.c:482 src/conf/wizard_curs.c:619
-msgid "Unable to change startup process:"
-msgstr "Imposible cambiar el proceso de arranque:"
+#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
+#: src/setup/wizard_util.c:193
+msgid "Error"
+msgstr "Error"
 
-#: src/conf/wizard_curs.c:116 src/conf/wizard_curs.c:131
-#: src/conf/wizard_curs.c:184 src/conf/wizard_curs.c:221
-#: src/conf/wizard_curs.c:251 src/conf/wizard_curs.c:277
-#: src/conf/wizard_curs.c:310 src/conf/wizard_curs.c:337
-#: src/conf/wizard_curs.c:369 src/conf/wizard_curs.c:394
-#: src/conf/wizard_curs.c:423 src/conf/wizard_curs.c:446
-#: src/conf/wizard_curs.c:501 src/conf/wizard_curs.c:563
-#: src/conf/wizard_curs.c:594 src/conf/wizard_curs.c:638
+#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
+#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
+#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
+#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
+#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
+#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
+#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
+#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
 msgid "GNUnet configuration"
 msgstr "Configuración de GNUnet"
 
-#: src/conf/wizard_curs.c:117
+#: src/setup/wizard_curs.c:117
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3317,7 +3825,8 @@
 msgstr ""
 "¡Bienvenido a GNUnet!\n"
 "\n"
-"Este asistente te preguntará unas cuestiones básicas para configurar 
GNUnet.\n"
+"Este asistente te preguntará unas cuestiones básicas para configurar "
+"GNUnet.\n"
 "\n"
 "Por favor, visita nuestra página en\n"
 "\thttp://gnunet.org/\n";
@@ -3328,48 +3837,49 @@
 "\n"
 "el equipo de GNUnet"
 
-#: src/conf/wizard_curs.c:132
+#: src/setup/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
-"Escoge la interfaz de red que conecta tu ordenador a Internet "
-"de la lista de abajo."
+"Escoge la interfaz de red que conecta tu ordenador a Internet de la lista de "
+"abajo."
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:191
-#: src/conf/wizard_curs.c:228 src/conf/wizard_curs.c:283
-#: src/conf/wizard_curs.c:315 src/conf/wizard_curs.c:375
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
+#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
+#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:192
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
 "you are using DSL."
 msgstr ""
-"La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a Internet. 
"
-"Normalmente es un módem, una tarjeta de RDSI o una tarjeta de red en el caso 
de "
-"los xDSL como el ADSL."
+"La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a "
+"Internet. Normalmente es un módem, una tarjeta de RDSI o una tarjeta de red "
+"en el caso de los xDSL como el ADSL."
 
-#: src/conf/wizard_curs.c:185
+#: src/setup/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 "¿Cuál es el nombre de la interfaz de red que conecta tu ordenador a Internet?"
 
-#: src/conf/wizard_curs.c:222
+#: src/setup/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
 "If in doubt, leave this empty."
 msgstr ""
-"¿Cuál es es la dirección pública IP o el nombre del dominio de éste 
ordenador?\n"
+"¿Cuál es es la dirección pública IP o el nombre del dominio de éste "
+"ordenador?\n"
 "\n"
 "En caso de duda, dejar este campo en blanco."
 
-#: src/conf/wizard_curs.c:229
+#: src/setup/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3379,13 +3889,14 @@
 "If in doubt, leave the field empty. GNUnet will then try to determine your "
 "IP-Address."
 msgstr ""
-"Si tu proveedor siempre te asigna la misma dirección IP (una IP \"estática\") 
"
-"introducela en el campo \"Dirección IP\". Si tu dirección IP cambia pero hay "
-"un nombre de dominio que siempre apunta a tu dirección IP actual "
-"(\"DNS dinámica\"), puedes introducirlo allí también.\n"
-"En caso de duda deja el campo en blanco. GNUnet intentará determinar tu 
dirección IP"
+"Si tu proveedor siempre te asigna la misma dirección IP (una IP \"estática"
+"\") introducela en el campo \"Dirección IP\". Si tu dirección IP cambia pero "
+"hay un nombre de dominio que siempre apunta a tu dirección IP actual (\"DNS "
+"dinámica\"), puedes introducirlo allí también.\n"
+"En caso de duda deja el campo en blanco. GNUnet intentará determinar tu "
+"dirección IP"
 
-#: src/conf/wizard_curs.c:252
+#: src/setup/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3397,16 +3908,17 @@
 msgstr ""
 "¿Tu máquina esta detrás de un NAT?\n"
 "\n"
-"Si tu estás conectado a Internet a través de otro ordenador haciendo SNAT, un 
router "
-"o un \"cortafuegos de hardware\" y otros ordenadores no pueden conectarse al 
tuyo a través "
-"de Internet directamente, responde \"si\" aquí. Responde \"no\" en conexiones 
directas "
-"a través de módems, tarjetas de RDSI y DNAT (también conocido como 
\"seguimiento de puertos\")."
+"Si tu estás conectado a Internet a través de otro ordenador haciendo SNAT, "
+"un router o un \"cortafuegos de hardware\" y otros ordenadores no pueden "
+"conectarse al tuyo a través de Internet directamente, responde \"si\" aquí. "
+"Responde \"no\" en conexiones directas a través de módems, tarjetas de RDSI "
+"y DNAT (también conocido como \"seguimiento de puertos\")."
 
-#: src/conf/wizard_curs.c:278
+#: src/setup/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr "¿Cuánta subida (Bytes/s) será usada por GNUnet?"
 
-#: src/conf/wizard_curs.c:283
+#: src/setup/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3418,17 +3930,17 @@
 msgstr ""
 "Puedes limitar el uso de recursos de GNUnet aquí.\n"
 "\n"
-"La \"subida\" es el canal de datos a través del cual los datos son *mandados* 
"
-"a Internet. El límite, o bien es el total máximo para este ordenador, o bien "
-"el que se le permita usar a GNUnet. Puedes especificar este valor más tarde. "
-"Si tienes una tarifa plana puedes configurarlo a la máxima velocidad de tu 
conexión "
-"a Internet."
+"La \"subida\" es el canal de datos a través del cual los datos son "
+"*mandados* a Internet. El límite, o bien es el total máximo para este "
+"ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar "
+"este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
+"máxima velocidad de tu conexión a Internet."
 
-#: src/conf/wizard_curs.c:310
+#: src/setup/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr "¿Cuánta bajada (Bytes/s) será usada por GNUnet?"
 
-#: src/conf/wizard_curs.c:316
+#: src/setup/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3440,13 +3952,13 @@
 msgstr ""
 "Puedes limitar el uso de recursos de GNUnet aquí.\n"
 "\n"
-"La \"bajada\" es el canal de datos a través del cuál los datos son 
*recibidos* "
-"de Internet. El límite, o bien es el total máximo de este ordenador, o bien "
-"el que se le permita usar a GNUnet. Puedes especificar este valor más tarde. "
-"Si tienes una tarifa plana puedes configurarlo a la máxima velocidad de tu 
conexión "
-"a Internet."
+"La \"bajada\" es el canal de datos a través del cuál los datos son "
+"*recibidos* de Internet. El límite, o bien es el total máximo de este "
+"ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar "
+"este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
+"máxima velocidad de tu conexión a Internet."
 
-#: src/conf/wizard_curs.c:338
+#: src/setup/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -3460,27 +3972,29 @@
 msgstr ""
 "¿Compartir el ancho de banda marcado con otras aplicaciones?\n"
 "\n"
-"Di \"sí\" aquí si no quieres que el resto del tráfico de la red no interfiera 
con las operaciones "
-"de GNUnet, pero aun quieres mantener el ancho de banda usado por GNUnet "
-"introducido en los pasos previos, o no puedes asegurar las máximas 
capacidades de "
-"tu conexión. \"No\" puede ser muy útil si otras aplicaciones crean mucho 
tráfico en tu LAN.  "
-"En ese caso no quieres limitar el tráfico que GNUnet puede crear en tu 
conexión "
-"a Internet cuando una LAN de alta velocidad es usada (por ejemplo bajo NFS)."
+"Di \"sí\" aquí si no quieres que el resto del tráfico de la red no "
+"interfiera con las operaciones de GNUnet, pero aun quieres mantener el ancho "
+"de banda usado por GNUnet introducido en los pasos previos, o no puedes "
+"asegurar las máximas capacidades de tu conexión. \"No\" puede ser muy útil "
+"si otras aplicaciones crean mucho tráfico en tu LAN.  En ese caso no quieres "
+"limitar el tráfico que GNUnet puede crear en tu conexión a Internet cuando "
+"una LAN de alta velocidad es usada (por ejemplo bajo NFS)."
 
-#: src/conf/wizard_curs.c:370
+#: src/setup/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr "¿Cuánta CPU (en %) podrá ser usada?"
 
-#: src/conf/wizard_curs.c:376
+#: src/setup/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
 "This is the percentage of processor time GNUnet is allowed to use."
-msgstr "Tu puedes limitar el uso de recursos de GNUnet aquí.\n"
+msgstr ""
+"Tu puedes limitar el uso de recursos de GNUnet aquí.\n"
 "\n"
 "Este es el porcentaje del tiempo del procesador que GNUnet puede usar."
 
-#: src/conf/wizard_curs.c:395
+#: src/setup/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -3494,15 +4008,15 @@
 msgstr ""
 "¿Almacena el contenido migrado?\n"
 "\n"
-"GNUnet puede almacenar datos de otros pares en tu ordenador. Esto "
-"es muy útil si un adversario accede a tu contenido insertado y necesitas 
negar "
-"que dicho contenido sea tuyo. Con la \"migración de contenidos\" activada, "
-"el contenido puede haber \"migrado\" a través de internet a tu nodo sin tu "
+"GNUnet puede almacenar datos de otros pares en tu ordenador. Esto es muy "
+"útil si un adversario accede a tu contenido insertado y necesitas negar que "
+"dicho contenido sea tuyo. Con la \"migración de contenidos\" activada, el "
+"contenido puede haber \"migrado\" a través de internet a tu nodo sin tu "
 "conocimiento.\n"
 "Ésto también ayuda a repartir contenido popular a través de diferentes pares "
 "para aumentar la disponibilidad."
 
-#: src/conf/wizard_curs.c:424
+#: src/setup/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -3514,7 +4028,7 @@
 "El almacenamiento de GNUnet contiene todos los datos que GNUnet genera "
 "(datos del índice, contenido insertado y migrado)."
 
-#: src/conf/wizard_curs.c:447
+#: src/setup/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -3522,13 +4036,13 @@
 "started when you turn on your computer. If you say \"no\" here, you have to "
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
-"¿Quieres arrancar GNUnet como un servicio de sistema?\nn"
-"\n"
-"Si dices \"sí\" aquí, el proceso en segundo plano de GNUnet sera 
automáticamente "
-"arrancado cuando enciendas tu ordenador. Si dices \"no\" aquí, "
-"tendrás que ejecutar GNUnet tu mismo cada vez que quieras usarlo."
+"¿Quieres arrancar GNUnet como un servicio de sistema?\n"
+"n\n"
+"Si dices \"sí\" aquí, el proceso en segundo plano de GNUnet sera "
+"automáticamente arrancado cuando enciendas tu ordenador. Si dices \"no\" "
+"aquí, tendrás que ejecutar GNUnet tu mismo cada vez que quieras usarlo."
 
-#: src/conf/wizard_curs.c:502
+#: src/setup/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -3545,19 +4059,19 @@
 msgstr ""
 "Define el usuario bajo el que correrán los servicios de GNUnet.\n"
 "\n"
-"Por razones de seguridad, es una buena idea dejar que la configuración cree 
una "
-"nueva cuenta de usuario bajo el cual el servicio de GNUnet es arrancado "
+"Por razones de seguridad, es una buena idea dejar que la configuración cree "
+"una nueva cuenta de usuario bajo el cual el servicio de GNUnet es arrancado "
 "al iniciar el sistema.\n"
 "\n"
-"Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros ficheros 
que no sean los que posee. "
-"Ésto incluye los ficheros que quieras publicar en GNUnet. Tendrás que 
garantizar que "
-"el usuario especificado aquí posea permisos de lectura.\n"
+"Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros ficheros "
+"que no sean los que posee. Ésto incluye los ficheros que quieras publicar en "
+"GNUnet. Tendrás que garantizar que el usuario especificado aquí posea "
+"permisos de lectura.\n"
 "\n"
-"Deja los campos vacíos para arrancar GNUnet con privilegios de sistema."
-"\n"
+"Deja los campos vacíos para arrancar GNUnet con privilegios de sistema.\n"
 "Usuario de GNUnet:"
 
-#: src/conf/wizard_curs.c:564
+#: src/setup/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -3573,1151 +4087,658 @@
 msgstr ""
 "Define el grupo bajo el que correrán los servicios de GNUnet aquí.\n"
 "\n"
-"Por razones de seguridad, es una buena idea dejar que la configuración cree 
un "
-"nuevo grupo para la cuenta de usuario creada.\n"
+"Por razones de seguridad, es una buena idea dejar que la configuración cree "
+"un nuevo grupo para la cuenta de usuario creada.\n"
 "\n"
 "Puedes especificar un grupo ya existente aquí.\n"
 "\n"
-"Sólo los miembros de este grupo esta autorizados a arrancar y parar el 
servidor "
-"de GNUnet y tener acceso a los datos del servidor de GNUnet.\n"
+"Sólo los miembros de este grupo esta autorizados a arrancar y parar el "
+"servidor de GNUnet y tener acceso a los datos del servidor de GNUnet.\n"
 "\n"
 "Grupo de GNUnet:"
 
-#: src/conf/wizard_curs.c:595
+#: src/setup/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
 "\n"
 "Do you want to start it after saving your configuration?"
-msgstr "Si eres un usuario experimentado, puedes desear exprimir tu 
instalación de GNUnet "
-"usando la herramienta de configuración avanzada.\n"
+msgstr ""
+"Si eres un usuario experimentado, puedes desear exprimir tu instalación de "
+"GNUnet usando la herramienta de configuración avanzada.\n"
 "\n"
 "¿Quieres arrancarla después de guardar tu configuración?"
 
-#: src/conf/wizard_curs.c:632
+#: src/setup/wizard_curs.c:632
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
 "\n"
 "Try again?"
-msgstr "Imposible guardar el fichero de configuración %s: %s.\n"
+msgstr ""
+"Imposible guardar el fichero de configuración %s: %s.\n"
 "\n"
 "¿Intentar de nuevo?"
 
-#: src/conf/wizard_util.c:89
+#: src/setup/confdata.c:93
+#, c-format
+msgid "%s: symbol value `%s' invalid for %s\n"
+msgstr "%s: valor del símbolo '%s' no válido para %s\n"
+
+#: src/setup/wizard_util.c:119
 msgid "Can't open Service Control Manager"
 msgstr "Imposible abrir el Service Control Manager"
 
-#: src/conf/wizard_util.c:94
+#: src/setup/wizard_util.c:124
 msgid "Can't create service"
 msgstr "Imposible crear el servicio"
 
-#: src/conf/wizard_util.c:99
+#: src/setup/wizard_util.c:129
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr "Error cambiando los permisos del directorio de GNUnet"
 
-#: src/conf/wizard_util.c:104
+#: src/setup/wizard_util.c:134
 msgid "Cannot write to the regisitry"
 msgstr "Imposible escribir en el registro"
 
-#: src/conf/wizard_util.c:107
+#: src/setup/wizard_util.c:137
 msgid "Can't access the service"
 msgstr "Imposible acceder al servicio"
 
-#: src/conf/wizard_util.c:111
+#: src/setup/wizard_util.c:141
 msgid "Can't delete the service"
 msgstr "Imposible borrar el servicio"
 
-#: src/conf/wizard_util.c:115
+#: src/setup/wizard_util.c:145
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/conf/wizard_util.c:146
+#: src/setup/wizard_util.c:176
 msgid "This version of Windows does not support multiple users."
 msgstr "Esta versión de Windows no permite usuarios múltiples"
 
-#: src/conf/wizard_util.c:150
+#: src/setup/wizard_util.c:180
 msgid "Error creating user"
 msgstr "Error creando usuario"
 
-#: src/conf/wizard_util.c:153
+#: src/setup/wizard_util.c:183
 msgid "Error accessing local security policy"
 msgstr "Error accediendo a la política de seguridad local"
 
-#: src/conf/wizard_util.c:156
+#: src/setup/wizard_util.c:186
 msgid "Error granting service right to user"
 msgstr "Error garantizando el servicio correcto al usuario"
 
-#: src/conf/wizard_util.c:159
+#: src/setup/wizard_util.c:189
 msgid "Unknown error while creating a new user"
 msgstr "Error desconocido mientras se creaba un nuevo usuario"
 
-#: src/server/connection.c:979
-#, c-format
-msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
-msgstr ""
+#: src/setup/gconf.c:73
+msgid "Sorry, no help is available for this option.\n"
+msgstr "Lo siento, no hay ayuda disponible para esta opción.\n"
 
-#: src/server/connection.c:986
-#, c-format
-msgid "Message details: %u: length %d, priority: %d\n"
-msgstr "Detalles del mensaje: %u: longitud %d, prioridad: %d\n"
-
-#: src/server/connection.c:2243
-#, c-format
-msgid "Message from `%s' discarded: invalid format.\n"
-msgstr "Mensaje de '%s' descartado: formato inválido.\n"
-
-#: src/server/connection.c:2309
-#, c-format
-msgid "Invalid sequence number %u <= %u, dropping message.\n"
-msgstr "Secuencia de números no válida %u <= %u, omitiendo mensaje.\n"
-
-#: src/server/connection.c:2324
-msgid "Message received more than one day old. Dropped.\n"
-msgstr "Mensajes recibidos de mas de un día de antigüedad. Omitidos.\n"
-
-#: src/server/connection.c:2690
-msgid "# outgoing messages dropped"
-msgstr "# mensajes salientes omitidos"
-
-#: src/server/connection.c:2692
-msgid "# bytes of outgoing messages dropped"
-msgstr "# bytes de mensajes salientes omitidos"
-
-#: src/server/connection.c:2694
-msgid "# connections closed (HANGUP sent)"
-msgstr ""
-
-#: src/server/connection.c:2695
-msgid "# bytes encrypted"
-msgstr "# bytes encriptados"
-
-#: src/server/connection.c:2696
-msgid "# bytes decrypted"
-msgstr "# bytes desencriptados"
-
-#: src/server/connection.c:2697
-msgid "# bytes noise sent"
-msgstr "# \"bytes-ruido\" mandados"
-
-#: src/server/core.c:114
-#, c-format
-msgid "Application module `%s' already initialized!\n"
-msgstr "¡El módulo de la aplicación '%s' ya esta inicializado!\n"
-
-#: src/server/core.c:167
-#, c-format
-msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
-msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
-
-#: src/server/core.c:214
-#, c-format
-msgid "Could not shutdown `%s': application not loaded\n"
-msgstr "Imposible apagar '%s': aplicación no cargada\n"
-
-#: src/server/core.c:221
-#, c-format
-msgid "Could not shutdown application `%s': not initialized\n"
-msgstr "Imposible apagar la aplicación '%s': no inicializada\n"
-
-#: src/server/core.c:230 src/server/core.c:419
-#, c-format
-msgid "Could not find '%s%s' method in library `%s'.\n"
-msgstr "Imposible encontrar el método '%s%s' en la biblioteca '%s'.\n"
-
-#: src/server/core.c:397
-#, c-format
-msgid "Could not release %p: service not loaded\n"
-msgstr ""
-
-#: src/server/core.c:475 src/server/gnunet-update.c:232
-msgid "No applications defined in configuration!\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
-
-#: src/server/core.c:498
-#, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/server/core.c:515
-#, c-format
-msgid "Could not properly shutdown application `%s'.\n"
-msgstr "Imposible apagar la aplicación '%s' adecuadamente.\n"
-
-#: src/server/core.c:574
-msgid "FATAL: Identity plugin not found!\n"
-msgstr "FATAL: ¡Plugin de identidad no encontrado!\n"
-
-#: src/server/core.c:632
-#, c-format
-msgid "Could not properly unload service `%s'!\n"
-msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
-
-#: src/server/gnunet-peer-info.c:95
-msgid "Print information about GNUnet peers."
-msgstr "Imprime información de los pares de GNUnet."
-
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
-#, c-format
-msgid "Could not get address of peer `%s'.\n"
-msgstr "Imposible obtener la dirección del par '%s'.\n"
-
-#: src/server/gnunet-peer-info.c:153
-msgid "hello message invalid (signature invalid).\n"
-msgstr "mensaje de saludo inválido (firma no válida).\n"
-
-#: src/server/gnunet-peer-info.c:164
-#, c-format
-msgid "Peer `%s' with trust %8u and address `%s'\n"
-msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
-
-#: src/server/gnunet-transport-check.c:109
-#, c-format
-msgid "`%s': Could not create hello.\n"
-msgstr "'%s': Imposible crear saludo.\n"
-
-#: src/server/gnunet-transport-check.c:118
-#, c-format
-msgid "`%s': Could not connect.\n"
-msgstr "'%s': Imposible conectar.\n"
-
-#: src/server/gnunet-transport-check.c:148
-#, c-format
-msgid "`%s': Could not send.\n"
-msgstr "'%s': Imposible mandar.\n"
-
-#: src/server/gnunet-transport-check.c:168
-#, c-format
-msgid "`%s': Did not receive message within %llu ms.\n"
-msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
-
-#: src/server/gnunet-transport-check.c:182
-#, c-format
-msgid "`%s': Could not disconnect.\n"
-msgstr "'%s': Imposible desconectar.\n"
-
-#: src/server/gnunet-transport-check.c:189
-#, c-format
-msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
-msgstr ""
-"Transporte '%s' OK. Tomó %ums transmitir %d mensajes de %d bytes cada uno.\n"
-
-#: src/server/gnunet-transport-check.c:219
-#, c-format
-msgid " Transport %d is not being tested\n"
-msgstr " El transporte %d no esta siendo probado\n"
-
-#: src/server/gnunet-transport-check.c:230
-#, c-format
-msgid ""
-"\n"
-"Contacting `%s'."
-msgstr ""
-"\n"
-"Contactando '%s'."
-
-#: src/server/gnunet-transport-check.c:253
-#, c-format
-msgid " Connection failed\n"
-msgstr "Conexión fallida\n"
-
-#: src/server/gnunet-transport-check.c:259
-#, c-format
-msgid " Connection failed (bug?)\n"
-msgstr "Conexión fallida (¿bug?)\n"
-
-#: src/server/gnunet-transport-check.c:320
-#, c-format
-msgid "No reply received within %llums.\n"
-msgstr "No se ha recibido una respuesta en %llums.\n"
-
-#: src/server/gnunet-transport-check.c:396
-msgid "ping peers from HOSTLISTURL that match transports"
-msgstr ""
-
-#: src/server/gnunet-transport-check.c:398
-msgid "send COUNT messages"
-msgstr "envia COUNT mensajes"
-
-#: src/server/gnunet-transport-check.c:400
-msgid "send messages with SIZE bytes payload"
-msgstr "manda mensajes con SIZE bytes payload"
-
-#: src/server/gnunet-transport-check.c:402
-msgid "specifies which TRANSPORT should be tested"
-msgstr ""
-
-#: src/server/gnunet-transport-check.c:404
-msgid "specifies after how many MS to time-out"
-msgstr ""
-
-#: src/server/gnunet-transport-check.c:407 src/server/gnunet-update.c:55
-#: src/server/startup.c:450
-msgid "run as user LOGIN"
-msgstr "ejecuta como el usuario LOGIN"
-
-#: src/server/gnunet-transport-check.c:414
-msgid "Tool to test if GNUnet transport services are operational."
-msgstr ""
-
-#: src/server/gnunet-transport-check.c:565
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr ""
-
-#: src/server/gnunet-transport-check.c:570
-#, c-format
-msgid "Testing transport(s) %s\n"
-msgstr "Probando transporte(s) %s\n"
-
-#: src/server/gnunet-transport-check.c:573
-#, c-format
-msgid "Available transport(s): %s\n"
-msgstr "Transporte(s) disponible(s): %s\n"
-
-#: src/server/gnunet-transport-check.c:617
-#, c-format
-msgid ""
-"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
-msgstr ""
-
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
-msgstr ""
-
-#: src/server/gnunet-update.c:58
-msgid "run in client mode (for getting client configuration values)"
-msgstr ""
-
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr ""
-
-#: src/server/gnunet-update.c:147
-#, c-format
-msgid "Option `%s' makes no sense without option `%s'."
-msgstr "La opción '%s' no tiene ningún sentido sin la opción '%s'."
-
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
-msgstr ""
-"\n"
-"Saliendo.\n"
-
-#: src/server/gnunet-update.c:249
-#, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Actualizando los datos del módulo '%s'\n"
-
-#: src/server/gnunet-update.c:253
-#, c-format
-msgid "Failed to update data for module `%s'\n"
+#: src/setup/glade_support.c:75
+#, fuzzy, c-format
+msgid "Failed to find handler for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/server/gnunet-update.c:309
-#, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Actualizados los datos para %d aplicaciones.\n"
+#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
+#, fuzzy, c-format
+msgid "Failed to open `%s'.\n"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/server/gnunetd.c:76
-#, c-format
-msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
-msgstr "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar 
'%s'!\n"
+#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
+#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/server/gnunetd.c:84
-#, c-format
-msgid "`%s' starting\n"
-msgstr "'%s' comenzando\n"
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
+#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/server/gnunetd.c:106
-#, c-format
-msgid "`%s' startup complete.\n"
-msgstr "'%s' comienzo completo.\n"
+#: src/include/gnunet_util_error.h:207
+#, fuzzy, c-format
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
-#: src/server/gnunetd.c:111
-#, c-format
-msgid "`%s' is shutting down.\n"
-msgstr "'%s' se esta cerrando.\n"
+#: src/include/gnunet_util_getopt.h:145
+msgid "print this help"
+msgstr "imprime esta ayuda"
 
-#: src/server/handler.c:367
-#, c-format
-msgid "Received corrupt message from peer `%s'in %s:%d.\n"
-msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
+#: src/include/gnunet_util_getopt.h:154
+msgid "print the version number"
+msgstr "imprime el número de versión"
 
-#: src/server/startup.c:196
-#, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr "La petición '%s' recibida del cliente esta mal formada.\n"
-
-#: src/server/startup.c:324
-#, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
+#: src/include/gnunet_util_getopt.h:160
+msgid "configure logging to use LOGRULES"
 msgstr ""
 
-#: src/server/startup.c:339
-#, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr "Imposible escribir PID al fichero '%s': %s.\n"
-
-#: src/server/startup.c:443
-msgid ""
-"run in debug mode; gnunetd will not daemonize and error messages will be "
-"written to stderr instead of a logfile"
+#: src/include/gnunet_util_getopt.h:166
+msgid "be verbose"
 msgstr ""
-"se ejecuta en modo de depuración; gnunetd no sera un demonio y los mensajes 
de error "
-"serán escritos a través de stderr en vez de en un fichero de log"
 
-#: src/server/startup.c:456
-msgid "Starts the gnunetd daemon."
-msgstr "Arranca el demonio de gnunetd."
+#: src/include/gnunet_util_getopt.h:172
+#, fuzzy
+msgid "use configuration file FILENAME"
+msgstr "usa el fichero de configuración FILENAME"
 
-#: src/server/startup.c:470
-#, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr "Usuario '%s' desconocido, imposible cambiar la UID a él.\n"
+#: src/include/gnunet_util_getopt.h:178
+#, fuzzy
+msgid "specify host on which gnunetd is running"
+msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
-#: src/server/startup.c:479
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
+#~ msgid "GNUnet configuration assistant"
+#~ msgstr "Asistente de configuración de GNUnet"
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
-msgstr "Argumentos en la linea de comandos inválidos:\n"
+#~ msgid ""
+#~ "Welcome to GNUnet!\n"
+#~ "\n"
+#~ "This assistant will ask you a few basic questions in order to configure "
+#~ "GNUnet.\n"
+#~ "\n"
+#~ "Please visit our homepage at\n"
+#~ "\thttp://gnunet.org\n";
+#~ "and join our community at\n"
+#~ "\thttps://gnunet.org/drupal/\n";
+#~ "\n"
+#~ "Have a lot of fun,\n"
+#~ "\n"
+#~ "The GNUnet team"
+#~ msgstr ""
+#~ "¡Bienvenido a GNUnet!\n"
+#~ "\n"
+#~ "Este asistente le preguntará unos datos básicos para configurar GNUnet.\n"
+#~ "\n"
+#~ "Por favor, visite nuestra página en\n"
+#~ "\thttps://gnunet.org/drupal/\n";
+#~ "\n"
+#~ "Diviertase,\n"
+#~ "\n"
+#~ "El equipo de GNUnet"
 
-#: src/server/startup.c:583
-#, c-format
-msgid "Argument %d: `%s'\n"
-msgstr "Argumento %d: '%s'\n"
+#~ msgid "Next"
+#~ msgstr "Siguiente"
 
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
-msgstr "Argumentos en la linea de comandos inválidos.\n"
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
 
-#: src/server/tcpserver.c:422
-#, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
-msgstr "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose 
actualmente?\n"
+#~ msgid ""
+#~ "Enter information about your network connection here.\n"
+#~ "\n"
+#~ "The \"Network interface\" is the device that connects your computer to "
+#~ "the internet. This is usually a modem, an ISDN card or a network card in "
+#~ "case you are using DSL.\n"
+#~ "\n"
+#~ "If your provider always assigns the same IP-Address to you (a \"static\" "
+#~ "IP-Address), enter it into the \"IP-Address\" field. If your IP-Address "
+#~ "changes every now and then (\"dynamic\" IP-Address) but there's a "
+#~ "hostname that always points to your actual IP-Address (\"Dynamic DNS\"), "
+#~ "you can also enter it here.\n"
+#~ "If in doubt, leave the field empty. GNUnet will then try to determine "
+#~ "your IP-Address.\n"
+#~ "\n"
+#~ "If you are connected to the internet through another computer doing SNAT, "
+#~ "a router or a \"hardware firewall\" and other computers on the internet "
+#~ "cannot connect to this computer, check the last option on this page. "
+#~ "Leave it unchecked on direct connections through modems, ISDN cards and "
+#~ "DNAT (also known as \"port forwarding\")."
+#~ msgstr ""
+#~ "Introduce información acerca de tu conexión aquí.\n"
+#~ "\n"
+#~ "La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a "
+#~ "Internet. Normalmente es un módem, una tarjeta de RDSI, un módem ADSL o "
+#~ "una tarjeta de red en el caso de un router.\n"
+#~ "\n"
+#~ "Si tu proveedor siempre te da la misma dirección IP (una dirección IP "
+#~ "\"estática\") introducelo en el campo \"Dirección IP\". Si tu dirección "
+#~ "IP cambia (una dirección IP \"dinámica\") pero hay un nombre de dominio "
+#~ "que siempre apunta a tu dirección IP actual (\"DNS dinámica\") también "
+#~ "puedes introducirla aquí.\n"
+#~ "En caso de duda deja el campo vacío. GNUnet intentara determinar tu "
+#~ "dirección IP automaticamente.\n"
+#~ "\n"
+#~ "Si tu estas conectado a Internet a través de otro ordenador haciendo "
+#~ "SNAT, a un router o a un \"cortafuegos de hardware\" y otros ordenadores "
+#~ "no pueden conectar con tu ordenador marca la última opción en ésta "
+#~ "página. Déjala sin marcar en conexiones directas a través de modems, "
+#~ "tarjetas de RDSI y DNAT (también conocido como \"seguimiento de puertos"
+#~ "\")."
 
-#: src/server/tcpserver.c:688
-#, c-format
-msgid ""
-"Malformed network specification in the configuration in section `%s' for "
-"entry `%s': %s\n"
-msgstr ""
+#~ msgid "Network interface:"
+#~ msgstr "Interfaz de red:"
 
-#: src/server/tcpserver.c:798
-#, c-format
-msgid "%s failed, message type %d already in use.\n"
-msgstr "%s falló, el mensaje del tipo %d ya está en uso.\n"
+#~ msgid "IP-Address/Hostname:"
+#~ msgstr "Dirección IP/Nombre del dominio"
 
-#: src/transports/ip6.c:60 src/util/configuration.c:925
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "Imposible encontrar la IP del host '%s': %s\n"
+#~ msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+#~ msgstr ""
+#~ "El ordenador no puede recibir conexiones entrantes (SNAT/Cortafuegos)"
 
-#: src/transports/ip6.c:100
-#, c-format
-msgid "Could not resolve `%s': %s\n"
-msgstr "Imposible resolver '%s': %s\n"
+#~ msgid "Network connection"
+#~ msgstr "Conexión de red"
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr "¡Falló al obtener mi dirección IPv6 (externa)!\n"
+#~ msgid ""
+#~ "You can limit GNUnet's ressource usage here.\n"
+#~ "\n"
+#~ "\"Bandwidth limitation\" is how much data may be sent per second. If you "
+#~ "have a flatrate you can set it to the maximum speed of your internet "
+#~ "connection.\n"
+#~ "\n"
+#~ "The \"Max. CPU usage\" is the percentage of processor time GNUnet is "
+#~ "allowed to use."
+#~ msgstr ""
+#~ "Puedes limitar el uso de recursos de GNUnet aquí.\n"
+#~ "\n"
+#~ "\"Limitación de ancho de banda\" es cuantos datos pueden ser mandados por "
+#~ "segundo. Si tienes una tarifa plana puedes seleccionar la velocidad "
+#~ "máxima de tu conexión a Internet.\n"
+#~ "\n"
+#~ "El \"Uso máximo de CPU\" es el porcentaje del tiempo de procesado que "
+#~ "GNUnet puede usar."
 
-#: src/transports/http.c:601
-msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
-msgstr "Esperada bienvenida en la conexión http, encontrada basura. Cerrando 
la conexión.\n"
+#~ msgid "Upstream (Bytes/s):"
+#~ msgstr "Subida (Bytes/s):"
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
-msgstr "%s: Conexión rechazada de una dirección de la \"lista negra\" 
%u.%u.%u.%u.\n"
+#~ msgid "Downstream (Bytes/s):"
+#~ msgstr "Bajada (Bytes/s):"
 
-#: src/transports/http.c:1101
-msgid "HTTP: Could not determine my public IP address.\n"
-msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
+#~ msgid "Bandwidth limitation"
+#~ msgstr "Limitación del ancho de banda"
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
-#: src/util/tcpio.c:188
-#, c-format
-msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
-msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
+#~ msgid "Use denoted bandwidth for GNUnet"
+#~ msgstr "Usa el ancho de banda marcado para GNUnet"
 
-#: src/transports/http.c:1333
-#, c-format
-msgid ""
-"Could not bind the HTTP listener to port %d. No transport service started.\n"
-msgstr ""
+#~ msgid "Share denoted bandwidth with other applications"
+#~ msgstr "Comparte el ancho de banda marcado con otras aplicaciones"
 
-#: src/transports/http.c:1478
-msgid "# bytes received via HTTP"
-msgstr "# bytes recibidos vía HTTP"
+#~ msgid "Bandwidth sharing"
+#~ msgstr "Ancho de banda compartido"
 
-#: src/transports/http.c:1480
-msgid "# bytes sent via HTTP"
-msgstr "# bytes mandados vía HTTP"
+#~ msgid "Max. CPU usage (%):"
+#~ msgstr "Uso máximo de la CPU (%):"
 
-#: src/transports/http.c:1482
-msgid "# bytes dropped by HTTP (outgoing)"
-msgstr "#bytes omitidos vía HTTP (salientes)"
+#~ msgid "CPU usage"
+#~ msgstr "Uso de CPU"
 
-#: src/transports/smtp.c:297
-#, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr "Imposible resolver el nombre del servidor de SMTP '%s': %s"
+#~ msgid "Load limitation"
+#~ msgstr "Limitación de carga"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
-#, c-format
-msgid ""
-"You must specify the name of a pipe for the SMTP transport in section `%s' "
-"under `%s'.\n"
-msgstr ""
+#~ msgid "Back"
+#~ msgstr "Atrás"
 
-#: src/transports/smtp.c:489
-msgid "Received malformed message via SMTP (size mismatch).\n"
-msgstr ""
+#~ msgid ""
+#~ "GNUnet is able to store data from other peers in your datastore. This is "
+#~ "useful if an adversary has access to your inserted content and you need "
+#~ "to deny that the content is yours. With \"content migration\" on, the "
+#~ "content could have \"migrated\" over the internet to your node without "
+#~ "your knowledge.\n"
+#~ "It also helps to spread popular content over different peers to enhance "
+#~ "availability.\n"
+#~ "\n"
+#~ "The GNUnet datastore contains all data that GNUnet generates (index data, "
+#~ "inserted and migrated content). Its maximum size can be specified below.\n"
+#~ "\n"
+#~ "If you are an experienced user, you may want to tweak your GNUnet "
+#~ "installation using the enhanced configurator.\n"
+#~ "\n"
+#~ "After changing the configuration and/or updating GNUnet, it is sometimes "
+#~ "required to run gnunet-update to update internal data structures. "
+#~ "Depending on the changes made, this may take some time."
+#~ msgstr ""
+#~ "GNUnet es capaz de almacenar datos de otros pares en tu base de datos. "
+#~ "Ésto es útil si un adversario tiene acceso a tu contenido y tu necesitas "
+#~ "negar que ese contenido sea tuyo. Con la \"migración de contenido\" "
+#~ "activada, tu contenido puede haber \"migrado\" por Internet hasta tu nodo "
+#~ "sin tu conocimiento.\n"
+#~ "Ésto también ayuda a difundir contenidos populares por diferentes pares "
+#~ "para facilitar su disponibilidad.\n"
+#~ "\n"
+#~ "La base de datos de GNUnet contiene todos los datos que GNUnet genera "
+#~ "(índices, contenido insertado y descargado). Su máximo tamaño puede ser "
+#~ "especificado debajo.\n"
+#~ "\n"
+#~ "Si eres un usuario experimentado, puedes desear exprimir tu instalación "
+#~ "de GNUnet usando la herramienta de configuración avanzada.\n"
+#~ "\n"
+#~ "Después de cambiar la configuración y/o actualizar GNUnet, a veces "
+#~ "esnecesario ejecutar gnunet-update para actualizar las estructuras de "
+#~ "datos internas. Dependiendo de los cambios que se hayan hecho, ésto podrá "
+#~ "tomar algún tiempo."
 
-#: src/transports/smtp.c:584
-msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
-msgstr ""
+#~ msgid "Store migrated content"
+#~ msgstr "Almacena contenido migrado"
 
-#: src/transports/smtp.c:591
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr ""
+#~ msgid "Maximum datastore size (MB):"
+#~ msgstr "Máximo tamaño de almacenamiento (MB):"
 
-#: src/transports/smtp.c:764
-#, c-format
-msgid "Sending E-mail to `%s' failed.\n"
-msgstr "Enviando un correo electrónico a '%s' se produjo un fallo.\n"
+#~ msgid "Start the GNUnet background process on computer startup"
+#~ msgstr "Arranca el demonio de GNUnet al encender el ordenador"
 
-#: src/transports/smtp.c:815
-#, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
-msgstr ""
+#~ msgid "Open the enhanced configurator"
+#~ msgstr "Abre el editor de configuración avanzado"
 
-#: src/transports/smtp.c:838
-#, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr ""
+#~ msgid "Run gnunet-update"
+#~ msgstr "Ejecutar gnunet-update"
 
-#: src/transports/smtp.c:844
-#, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr ""
+#~ msgid "Other settings"
+#~ msgstr "Otras configuraciones"
 
-#: src/transports/smtp.c:903
-#, c-format
-msgid "%.*s filter %s (SMTP)"
-msgstr ""
+#~ msgid "Finish"
+#~ msgstr "Finalizar"
 
-#: src/transports/smtp.c:932 src/transports/udp.c:722
-#: src/transports/udp6.c:699
-#, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
-msgstr ""
+#~ msgid "Question"
+#~ msgstr "Pregunta"
 
-#: src/transports/tcp.c:465
-#, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
-msgstr ""
+#~ msgid "Do you want to save your settings?"
+#~ msgstr "¿Quieres guardar tu configuración?"
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr ""
+#~ msgid "Unable to save configuration!"
+#~ msgstr "Imposible guardar la configuración"
 
-#: src/transports/tcp.c:1082
-msgid "Could not determine my public IP address.\n"
-msgstr ""
+#~ msgid "OK"
+#~ msgstr "OK"
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
-#, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr ""
+#~ msgid ""
+#~ "Define the user and the group owning the GNUnet service here.\n"
+#~ "\n"
+#~ "For security reasons, it is a good idea to let this setup create a new "
+#~ "user account and a new group under which the GNUnet service is started at "
+#~ "system startup.\n"
+#~ "\n"
+#~ "However, GNUnet may not be able to access files other than its own. This "
+#~ "includes files you want to publish in GNUnet. You'll have to grant read "
+#~ "permissions to the user specified below.\n"
+#~ "\n"
+#~ "Leave the fields empty to run GNUnet with system privileges."
+#~ msgstr ""
+#~ "Define el usuario y el grupo bajo el que correrán los servicios de GNUnet "
+#~ "aquí.\n"
+#~ "\n"
+#~ "Por razones de seguridad, es una buena idea dejar que la configuración "
+#~ "cree una nueva cuenta de usuario y un nuevo grupo bajo el cual el "
+#~ "servicio de GNUnet es arrancado al iniciar el sistema.\n"
+#~ "\n"
+#~ "Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros "
+#~ "ficheros que no sean los que posee. Ésto incluye los ficheros que quieras "
+#~ "publicar en GNUnet. Tendrás que garantizar que el usuario especificado "
+#~ "aquí posea permisos de lectura.\n"
+#~ "\n"
+#~ "Deja los campos vacíos para arrancar GNUnet con privilegios de sistema."
 
-#: src/transports/tcp.c:1449
-msgid "# bytes received via TCP"
-msgstr "# bytes recibidos por TCP"
+#~ msgid "Group:"
+#~ msgstr "Grupo:"
 
-#: src/transports/tcp.c:1451
-msgid "# bytes sent via TCP"
-msgstr "# bytes enviados por TCP"
+#~ msgid "User account:"
+#~ msgstr "Cuenta de usuario:"
 
-#: src/transports/tcp.c:1453
-msgid "# bytes dropped by TCP (outgoing)"
-msgstr "# bytes omitidos por TCP (salientes)"
+#~ msgid "gnunet-update failed!"
+#~ msgstr "¡gnunet-update falló!"
 
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr ""
+#~ msgid "Gtk GNUnet Configurator"
+#~ msgstr "Configurador Gtk de GNUnet"
 
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr ""
+#~ msgid "_File"
+#~ msgstr "_Fichero"
 
-#: src/transports/tcp6.c:657 src/transports/udp6.c:334
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr "%s: Conexión rechazada de una dirección de la \"lista negra\" %s.\n"
+#~ msgid "Load a config file"
+#~ msgstr "Cargar un fichero de configuración"
 
-#: src/transports/tcp6.c:958
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "Imposible determinar mi dirección IPv6 pública.\n"
+#~ msgid "_Load"
+#~ msgstr "_Cargar"
 
-#: src/transports/tcp6.c:1002
-#, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "'%s': servicio desconocido: %s\n"
+#~ msgid "Save the config in .config"
+#~ msgstr "Guardar la configuración en .config"
 
-#: src/transports/udp.c:145 src/transports/udp6.c:128
-#, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
-msgstr ""
+#~ msgid "_Save"
+#~ msgstr "_Guardar"
 
-#: src/transports/udp.c:179
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr ""
+#~ msgid "_Quit"
+#~ msgstr "_Salir"
 
-#: src/transports/udp.c:250
-#, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
+#~ msgid "_Options"
+#~ msgstr "_Opciones"
 
-#: src/transports/udp.c:307
-#, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr "Recibido mensaje UDP no válido del %u.%u.%u.%u:%u, omitiendo.\n"
+#~ msgid "Show name"
+#~ msgstr "Mostrar el nombre"
 
-#: src/transports/udp.c:332
-#, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
+#~ msgid "Show _name"
+#~ msgstr "Mostrar el _nombre"
 
-#: src/transports/udp.c:417
-msgid "UDP: Could not determine my public IP address.\n"
-msgstr "UDP: Imposible determinar mi dirección IP pública.\n"
+#~ msgid "Show range (Y/M/N)"
+#~ msgstr "Muestra el rango (Y/M/N)"
 
-#: src/transports/udp.c:551
-#, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
-msgstr "Falló al mandar el mensaje de tamaño %d a través de UDP a 
%u.%u.%u.%u:%u: %s\n"
+#~ msgid "Show _range"
+#~ msgstr "Muestra el _rango"
 
-#: src/transports/udp.c:707
-msgid "# bytes received via UDP"
-msgstr "# bytes recibidos vía UDP"
+#~ msgid "Show value of the option"
+#~ msgstr "Muestra el valor de la opción"
 
-#: src/transports/udp.c:709
-msgid "# bytes sent via UDP"
-msgstr "# bytes enviados vía UDP"
+#~ msgid "Show _data"
+#~ msgstr "Mostrar los _datos"
 
-#: src/transports/udp.c:711
-msgid "# bytes dropped by UDP (outgoing)"
-msgstr "# bytes omitidos por UDP (salientes)"
+#~ msgid "Show all options"
+#~ msgstr "Mostrar todas las opciones"
 
-#: src/transports/ip.c:124
-#, c-format
-msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
-msgstr ""
+#~ msgid "Show all _options"
+#~ msgstr "Mostrar todas las _opciones"
 
-#: src/transports/ip.c:149
-#, c-format
-msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
+#~ msgid "_Help"
+#~ msgstr "_Ayuda"
 
-#: src/transports/ip.c:193
-#, c-format
-msgid "Could not find an IP address for interface `%s'.\n"
-msgstr "Imposible obtener la dirección IP para la interfaz '%s'.\n"
+#~ msgid "_Introduction"
+#~ msgstr "_Introducción"
 
-#: src/transports/ip.c:203
-#, c-format
-msgid ""
-"There is more than one IP address specified for interface `%s'.\n"
-"GNUnet will use %u.%u.%u.%u.\n"
-msgstr ""
-"Hay más de una dirección IP especificada para la interfaz '%s'.\n"
-"GNUnet usará %u.%u.%u.%u.\n"
+#~ msgid "_About"
+#~ msgstr "_Acerca de"
 
-#: src/transports/ip.c:224
-#, c-format
-msgid "Could not resolve `%s' to determine our IP address: %s\n"
-msgstr "Imposible resolver '%s' para determinar nuestra dirección IP: %s\n"
+#~ msgid "Goes up of one level (single view)"
+#~ msgstr "Sube un nivel (vista única)"
 
-#: src/transports/ip.c:256
-#, c-format
-msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
-msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
+#~ msgid "Up"
+#~ msgstr "Arriba"
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
-msgstr "¡Falló al obtener mi dirección IP (externa)!\n"
+#~ msgid "Load"
+#~ msgstr "Cargar"
 
-#: src/transports/udp6.c:164
-#, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
-msgstr ""
+#~ msgid "Save a config file"
+#~ msgstr "Guardar un fichero de configuración"
 
-#: src/transports/udp6.c:235
-#, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
+#~ msgid "Save"
+#~ msgstr "Guardar"
 
-#: src/transports/udp6.c:290
-#, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
+#~ msgid "Single view"
+#~ msgstr "Vista única"
 
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr ""
+#~ msgid "Single"
+#~ msgstr "Única"
 
-#: src/transports/udp6.c:415
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr "UDP6: Imposible determinar mi dirección IPv6 pública.\n"
+#~ msgid "Split view"
+#~ msgstr "Vista doble"
 
-#: src/util/configuration.c:182
-#, c-format
-msgid "inlining configration file `%s'\n"
-msgstr ""
+#~ msgid "Split"
+#~ msgstr "Doble"
 
-#: src/util/configuration.c:186
-#, fuzzy, c-format
-msgid "Could not parse configuration file `%s'.\n"
-msgstr "Imposible pasar el fichero de configuración '%s'.\n"
+#~ msgid "Full view"
+#~ msgstr "Vista completa"
 
-#: src/util/configuration.c:222
-#, c-format
-msgid "Syntax error in configuration file `%s' at line %d.\n"
-msgstr "Error de sintaxis en el fichero de configuración '%s' en la linea 
%d.\n"
+#~ msgid "Full"
+#~ msgstr "Completa"
 
-#: src/util/configuration.c:515 src/util/configuration.c:524
-#, c-format
-msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
-msgstr "El fichero de configuración '%s' no ha sido encontrado.  ¡Ejecute 
gnunet-setup!\n"
+#~ msgid "Collapse the whole tree in the right frame"
+#~ msgstr "Contraer el árbol completo en el lateral izquierdo"
 
-#: src/util/configuration.c:521
-msgid ""
-"Configuration file not found. Please run GNUnet Setup (Client Configuration) "
-"first."
-msgstr ""
-"Fichero de configuración no encontrado. Por favor, ejecuta GNUnet Setup "
-"(Configuración del cliente) primero."
+#~ msgid "Collapse"
+#~ msgstr "Contraer"
 
-#: src/util/configuration.c:528
-#, c-format
-msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
-msgstr 
"El·fichero·de·configuración·'%s'·no·ha·sido·encontrado.··¡Ejecute·'gnunet-setup
 -d'!\n"
+#~ msgid "Expand the whole tree in the right frame"
+#~ msgstr "Expandir el árbol entero en el lateral izquierdo"
 
-#: src/util/configuration.c:532
-#, c-format
-msgid "Cannot open configuration file `%s'.\n"
-msgstr "Imposible abrir el fichero de configuración '%s'.\n"
+#~ msgid "Expand"
+#~ msgstr "Expandir"
 
-#: src/util/cron.c:189
-msgid "Stopping cron\n"
-msgstr "Deteniendo cron\n"
+#~ msgid ""
+#~ "This is GNUnet's configuration interface.\n"
+#~ "\n"
+#~ "GNUnet's options are separated into categories. You can browse them in "
+#~ "the left tree. If you click on one of the categories, its options are "
+#~ "shown above. \n"
+#~ "\n"
+#~ "To change the value of an option, simply click on its value and enter a "
+#~ "new value. To get additional information about a specific option, click "
+#~ "on its description."
+#~ msgstr ""
+#~ "Ésta es la interfaz de configuración de GNUnet.\n"
+#~ "\n"
+#~ "Las opciones de GNUnet están separadas en categorías. Tu puedes "
+#~ "explorarlas en el árbol de la izquierda. Si pulsas en una de las "
+#~ "categorías las opciones son mostradas encima.\n"
+#~ "\n"
+#~ "Para cambiar el valor de una opción, simplemente pulsa en su valor e "
+#~ "introduce uno nuevo. Para obtener información adicional acerca de una "
+#~ "opción específica, pulsa en su descripción."
 
-#: src/util/cron.c:199
-msgid "Cron stopped\n"
-msgstr "Cron detenido\n"
+#~ msgid "Introduction"
+#~ msgstr "Introducción"
 
-#: src/util/cron.c:348
-#, c-format
-msgid ""
-"`%s' called with cron job not in queue, adding.  This may not be what you "
-"want.\n"
-msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "Welcome to GNUnet Setup.\n"
+#~ "\n"
+#~ "For each option, a blank box indicates the feature is disabled, and "
+#~ "checked one indicates it is enabled.\n"
+#~ "If you do not see an option that you believe should be present, try "
+#~ "turning on Show All Options under the Options menu.\n"
+#~ "\n"
+#~ "Although there is no cross reference yet to help you figure out what "
+#~ "other options must be enabled to support the option you are interested "
+#~ "in, you can still view the help of a grayed-out option.\n"
+#~ "\n"
+#~ "Toggling Show Debug Info under the Options menu will show the "
+#~ "dependencies, which you can then match by examining other options."
+#~ msgstr ""
+#~ "Bienvenido a la configuración de GNUnet.\n"
+#~ "\n"
+#~ "Para cada opción una caja en blanco indica que la opción está desactivada "
+#~ "y una marcada indica que está activada.\n"
+#~ "Si no ves una opción que crees que debería estar presente, prueba "
+#~ "activando la opción \"Mostrar todas las opciones\" en el menú de "
+#~ "\"Opciones\".\n"
+#~ "\n"
+#~ 
"Although·there·is·no·cross·reference·yet·to·help·you·figure·out·what·other·options·must·be·enabled·to·support·the·option·you·are·interested·in,"
+#~ "·you·can·still·view·the·help·of·a·grayed-out·option.\n"
+#~ "\n"
+#~ 
"Toggling·Show·Debug·Info·under·the·Options·menu·will·show·the·dependencies,"
+#~ "·which·you·can·then·match·by·examining·other·options."
 
-#: src/util/dso.c:43
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "¡El mecanismo de iniciación de los plugins falló: %s!\n"
+#~ msgid "gnunet-setup"
+#~ msgstr "gnunet-setup"
 
-#: src/util/dso.c:98
-#, c-format
-msgid "`%s' failed for library `%s' at %s:%d with error: %s\n"
-msgstr "'%s' falló en la biblioteca '%s' en %s:%d con un error: %s\n"
+#~ msgid "(C) 2001-2006 Christian Grothoff (and other contributing authors)"
+#~ msgstr ""
+#~ "C) 2001-2006 Christian Grothoff (y otros autores que han contribuido)"
 
-#: src/util/dso.c:152
-#, c-format
-msgid "`%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
-msgstr "'%s' falló al resolver el método '%s%s' en %s:%d con un error: %s\n"
+#~ msgid "This is the configuration tool for GNUnet."
+#~ msgstr "Esta es la herramienta de configuración de GNUnet."
 
-#: src/util/getopt.c:641
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: la opción '%s' es ambigua\n"
+#, fuzzy
+#~ msgid "Could not parse configuration file `%s'.\n"
+#~ msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/util/getopt.c:665
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: la opción '--%s' no permite un argumento\n"
+#~ msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
+#~ msgstr ""
+#~ "El fichero de configuración '%s' no ha sido encontrado.  ¡Ejecute gnunet-"
+#~ "setup!\n"
 
-#: src/util/getopt.c:670
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: la opción '%c%s' no permite un argumento\n"
+#~ msgid ""
+#~ "Configuration file not found. Please run GNUnet Setup (Client "
+#~ "Configuration) first."
+#~ msgstr ""
+#~ "Fichero de configuración no encontrado. Por favor, ejecuta GNUnet Setup "
+#~ "(Configuración del cliente) primero."
 
-#: src/util/getopt.c:687 src/util/getopt.c:861
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: la opción '%s' requiere un argumento\n"
+#~ msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
+#~ msgstr ""
+#~ "El·fichero·de·configuración·'%s'·no·ha·sido·encontrado.··¡Ejecute·'gnunet-"
+#~ "setup -d'!\n"
 
-#: src/util/getopt.c:717
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opción no reconocida '--%s'\n"
+#~ msgid "Cannot open configuration file `%s'.\n"
+#~ msgstr "Imposible abrir el fichero de configuración '%s'.\n"
 
-#: src/util/getopt.c:721
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opción no reconocida '%c%s'\n"
+#~ msgid "Stopping cron\n"
+#~ msgstr "Deteniendo cron\n"
 
-#: src/util/getopt.c:747
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opción ilegal -- %c\n"
+#~ msgid "Cron stopped\n"
+#~ msgstr "Cron detenido\n"
 
-#: src/util/getopt.c:750
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opción no válida -- %c\n"
+#~ msgid "Shutdown complete.\n"
+#~ msgstr "Cierre completado.\n"
 
-#: src/util/getopt.c:780 src/util/getopt.c:910
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: la opción requiere un argumento --%c\n"
+#~ msgid "Caught signal %d.\n"
+#~ msgstr "Cogida señal %d.\n"
 
-#: src/util/getopt.c:827
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: la opción '-W %s' es ambigua\n"
+#~ msgid "Invalid network notation (additional characters: `%s')."
+#~ msgstr "Notación de red no válida (caracteres adicionales: '%s')."
 
-#: src/util/getopt.c:845
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: la opción '-W %s' no permite un argumento\n"
+#~ msgid "FAILURE"
+#~ msgstr "FALLO"
 
-#: src/util/hostkey_gcrypt.c:937
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
+#~ msgid "MESSAGE"
+#~ msgstr "MENSAJE"
 
-#: src/util/initialize.c:229
-msgid "Shutdown complete.\n"
-msgstr "Cierre completado.\n"
+#~ msgid "INFO"
+#~ msgstr "INFORMACIÓN"
 
-#: src/util/io.c:35
-#, c-format
-msgid "Caught signal %d.\n"
-msgstr "Cogida señal %d.\n"
+#~ msgid "CRON"
+#~ msgstr "CRON"
 
-#: src/util/random.c:38
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt no está en la versión esperada (se necesita la versión 
%s).\n"
+#~ msgid "EVERYTHING"
+#~ msgstr "TODO"
 
-#: src/util/ipcheck.c:100
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Formato no válido para la IP: '%s'\n"
+#~ msgid "Invalid LOGLEVEL `%s' specified.\n"
+#~ msgstr "LOGLEVEL inválido '%s' especificado.\n"
 
-#: src/util/ipcheck.c:150
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Notación de red no válida ('/%d' no es válido en IPv4 CIDR)."
+#~ msgid "Failure at %s:%d.\n"
+#~ msgstr "Fallo en %s:%d.\n"
 
-#: src/util/ipcheck.c:164
-#, c-format
-msgid "Invalid network notation (additional characters: `%s')."
-msgstr "Notación de red no válida (caracteres adicionales: '%s')."
+#~ msgid ""
+#~ "Cannot determine port of gnunetd server. Define in configuration file in "
+#~ "section `%s' under `%s'.\n"
+#~ msgstr ""
+#~ "Imposible determinar el puerto del servidor de gnunetd. Defínelo en el "
+#~ "fichero de configuración en la sección '%s' bajo '%s'.\n"
 
-#: src/util/ipcheck.c:235
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Notación de red no válida (no termina con ';': '%s')\n"
+#~ msgid ""
+#~ "Usage: %s\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Uso: %s\n"
+#~ "%s\n"
+#~ "\n"
 
-#: src/util/ipcheck.c:267
-#, c-format
-msgid "Wrong format `%s' for netmask: %s\n"
-msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
+#~ msgid "Invalid argument for `%s' at %s:%d.\n"
+#~ msgstr "Argumento no válido para '%s' en %s:%d.\n"
 
-#: src/util/ipcheck.c:281
-#, c-format
-msgid "Wrong format `%s' for network: %s\n"
-msgstr "Formato '%s' erróneo para la red: %s\n"
+#~ msgid "k"
+#~ msgstr "k"
 
-#: src/util/logging.c:90
-msgid "NOTHING"
-msgstr "NADA"
+#~ msgid "g"
+#~ msgstr "g"
 
-#: src/util/logging.c:91
-msgid "FATAL"
-msgstr "FATAL"
+#~ msgid "t"
+#~ msgstr "t"
 
-#: src/util/logging.c:92
-msgid "ERROR"
-msgstr "ERROR"
+#~ msgid "unknown"
+#~ msgstr "desconocido"
 
-#: src/util/logging.c:93
-msgid "FAILURE"
-msgstr "FALLO"
+#~ msgid "Bytes"
+#~ msgstr "Bytes"
 
-#: src/util/logging.c:94
-msgid "WARNING"
-msgstr "PELIGRO"
+#~ msgid "`%s' failed, other side closed connection.\n"
+#~ msgstr "'%s' falló, conexión cerrada en el otro lado.\n"
 
-#: src/util/logging.c:95
-msgid "MESSAGE"
-msgstr "MENSAJE"
-
-#: src/util/logging.c:96
-msgid "INFO"
-msgstr "INFORMACIÓN"
-
-#: src/util/logging.c:97
-msgid "DEBUG"
-msgstr "DEPURACIÓN"
-
-#: src/util/logging.c:98
-msgid "CRON"
-msgstr "CRON"
-
-#: src/util/logging.c:99
-msgid "EVERYTHING"
-msgstr "TODO"
-
-#: src/util/logging.c:285
-#, c-format
-msgid "Invalid LOGLEVEL `%s' specified.\n"
-msgstr "LOGLEVEL inválido '%s' especificado.\n"
-
-#: src/util/logging.c:377 src/util/logging.c:383
-#, c-format
-msgid "Failure at %s:%d.\n"
-msgstr "Fallo en %s:%d.\n"
-
-#: src/util/port.c:47
-#, c-format
-msgid ""
-"Cannot determine port of gnunetd server. Define in configuration file in "
-"section `%s' under `%s'.\n"
-msgstr ""
-"Imposible determinar el puerto del servidor de gnunetd. Defínelo en el 
fichero de configuración "
-"en la sección '%s' bajo '%s'.\n"
-
-#: src/util/printhelp.c:42
-#, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
-msgstr ""
-"Uso: %s\n"
-"%s\n"
-"\n"
-
-#: src/util/printhelp.c:45
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-
-#: src/util/semaphore.c:172 src/util/semaphore.c:198
-#, c-format
-msgid "Invalid argument for `%s' at %s:%d.\n"
-msgstr "Argumento no válido para '%s' en %s:%d.\n"
-
-#: src/util/semaphore.c:176
-#, c-format
-msgid "Deadlock due to `%s' at %s:%d.\n"
-msgstr ""
-
-#: src/util/semaphore.c:202
-#, c-format
-msgid "Permission denied for `%s' at %s:%d.\n"
-msgstr "Permiso denegado para '%s' en %s:%d.\n"
-
-#: src/util/semaphore.c:452 src/util/semaphore.c:459
-#, c-format
-msgid "`%s' failed with error code %s: %s"
-msgstr "'%s' falló con el código de error %s: %s"
-
-#: src/util/semaphore.c:466
-#, c-format
-msgid "`%s' failed with error code %d: %s"
-msgstr "'%s' falló con el código de error %d: %s"
-
-#: src/util/semaphore.c:604
-#, c-format
-msgid "Can't create semaphore: %i"
-msgstr "Imposible crear un semáforo: %i"
-
-#: src/util/state.c:86
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
-msgstr ""
-
-#: src/util/statuscalls.c:185
-#, fuzzy, c-format
-msgid "Failed to parse interface data from `%s' at %s:%d.\n"
-msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
-
-#: src/util/statuscalls.c:489
-msgid "Cannot query the CPU usage (Windows NT).\n"
-msgstr ""
-
-#: src/util/statuscalls.c:507
-msgid "Cannot query the CPU usage (Win 9x)\n"
-msgstr ""
-
-#: src/util/statuscalls.c:600
-#, c-format
-msgid ""
-"No network interfaces defined in configuration section `%s' under `%s'!\n"
-msgstr ""
-
-#: src/util/storage.c:212
-#, c-format
-msgid "`%s' failed for drive %s: %u\n"
-msgstr "'%s' falló para la unidad %s: %u\n"
-
-#: src/util/storage.c:310
-#, c-format
-msgid "`%s' is not a regular file.\n"
-msgstr "'%s' no es un fichero regular.\n"
-
-#: src/util/storage.c:564
-#, c-format
-msgid "`%s' expected `%s' to be a directory!\n"
-msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
-
-#: src/util/storage.c:670
-msgid "b"
-msgstr "b"
-
-#: src/util/storage.c:675
-msgid "k"
-msgstr "k"
-
-#: src/util/storage.c:678 src/util/timer.c:198
-msgid "m"
-msgstr "m"
-
-#: src/util/storage.c:681
-msgid "g"
-msgstr "g"
-
-#: src/util/storage.c:684
-msgid "t"
-msgstr "t"
-
-#: src/util/string.c:108
-msgid "unknown"
-msgstr "desconocido"
-
-#: src/util/string.c:111
-msgid "GiB"
-msgstr "GiB"
-
-#: src/util/string.c:114
-msgid "MiB"
-msgstr "MiB"
-
-#: src/util/string.c:117
-msgid "KiB"
-msgstr "KiB"
-
-#: src/util/string.c:120
-msgid "Bytes"
-msgstr "Bytes"
-
-#: src/util/tcp_return.c:51
-#, c-format
-msgid "`%s' failed, other side closed connection.\n"
-msgstr "'%s' falló, conexión cerrada en el otro lado.\n"
-
-#: src/util/tcp_return.c:58
-#, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "¡'%s' falló, respuesta no válida!\n"
-
-#: src/util/timer.c:190
-msgid "ms"
-msgstr "ms"
-
-#: src/util/timer.c:195
-msgid "s"
-msgstr "s"
-
-#: src/util/timer.c:201
-msgid "h"
-msgstr "h"
-
-#: src/util/timer.c:204
-msgid " days"
-msgstr " días"
-
-#: src/util/daemon.c:142
-#, c-format
-msgid "Attempted path to `%s' was `%s'.\n"
-msgstr "La ruta esperada a '%s' fue '%s'.\n"
-
-#: src/util/xmalloc.c:52
-#, c-format
-msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
-msgstr ""
-
-#: src/include/gnunet_util.h:167
-msgid "print this help"
-msgstr "imprime esta ayuda"
-
-#: src/include/gnunet_util.h:170
-msgid "set verbosity to LEVEL"
-msgstr ""
-
-#: src/include/gnunet_util.h:173
-#, fuzzy
-msgid "use configuration file FILENAME"
-msgstr "usa el fichero de configuración FILENAME"
-
-#: src/include/gnunet_util.h:176
-#, fuzzy
-msgid "specify host on which gnunetd is running"
-msgstr "especifica el host en el que gnunetd esta ejecutandose"
-
-#: src/include/gnunet_util.h:179
-msgid "print the version number"
-msgstr "imprime el número de versión"
-
-#: src/include/gnunet_util.h:182
-msgid "be verbose"
-msgstr ""
-
-#: src/include/gnunet_util.h:637 src/include/gnunet_util.h:639
-#, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr ""
-
-#: src/include/gnunet_util.h:1058 src/include/gnunet_util.h:1060
-#: src/include/gnunet_util.h:1067
-#, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
-msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
-
+#~ msgid "Attempted path to `%s' was `%s'.\n"
+#~ msgstr "La ruta esperada a '%s' fue '%s'.\n"

Modified: GNUnet/po/rw.po
===================================================================
--- GNUnet/po/rw.po     2006-07-23 17:07:38 UTC (rev 3129)
+++ GNUnet/po/rw.po     2006-07-24 23:05:12 UTC (rev 3130)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 09:13-0700\n"
+"POT-Creation-Date: 2006-07-24 16:55-0700\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -24,339 +24,457 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/transports/ip6.c:60
 #, fuzzy, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
-msgstr "Ubutumwa Bivuye Sibyo Isinya Sibyo"
+msgid "Could not find IP of host `%s': %s\n"
+msgstr "OYA Gushaka Bya Ubuturo"
 
-#: src/applications/advertising/advertising.c:167
+#: src/transports/ip6.c:100
+#, fuzzy, c-format
+msgid "Could not resolve `%s': %s\n"
+msgstr "OYA"
+
+#: src/transports/ip6.c:138
 #, fuzzy
+msgid "Failed to obtain my (external) IPv6 address!\n"
+msgstr "OYA Rusange Aderesi"
+
+#: src/transports/udp6.c:128 src/transports/udp.c:145
+#, fuzzy, c-format
 msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
-msgstr "Ubutumwa BYAKIRIWE Sibyo Igihe KURI"
+"Cannot determine port to bind to.  Define in configuration file in section `%"
+"s' under `%s' or in `%s' under %s/%s.\n"
+msgstr "Umuyoboro Kuri Kuri in Iboneza IDOSIYE in Icyiciro Cyangwa in"
 
-#: src/applications/advertising/advertising.c:176
+#: src/transports/udp6.c:164
 #, fuzzy, c-format
-msgid "hello advertisement for protocol %d received.\n"
-msgstr "kugirango Porotokole BYAKIRIWE"
+msgid "Failed to bind to UDP6 port %d.\n"
+msgstr "Kuri Kuri Umuyoboro"
 
-#: src/applications/advertising/advertising.c:295
-#, fuzzy
-msgid "Could not send hellos+PING, ping buffer full.\n"
-msgstr "OYA Kohereza"
+#: src/transports/udp6.c:235
+#, c-format
+msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:308
+#: src/transports/udp6.c:290
 #, fuzzy, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
-msgstr "`%s'Byanze kugirango Umuyoboro in amasogonda"
+msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/applications/advertising/advertising.c:460
+#: src/transports/udp6.c:321
 #, fuzzy, c-format
-msgid "Advertising my transport %d to selected peers.\n"
-msgstr "Kuri Byahiswemo"
+msgid "Packet received from %s:%d (UDP6) failed format check."
+msgstr "BYAKIRIWE Bivuye Byanze Imiterere Kugenzura..."
 
-#: src/applications/advertising/advertising.c:467
+#: src/transports/udp6.c:334 src/transports/tcp6.c:657
+#, fuzzy, c-format
+msgid "%s: Rejected connection from blacklisted address %s.\n"
+msgstr "Ukwihuza Bivuye Aderesi"
+
+#: src/transports/udp6.c:415
 #, fuzzy
-msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
-msgstr "Oya Ikindi Kuri RW"
+msgid "UDP6: Could not determine my public IPv6 address.\n"
+msgstr "OYA Rusange Aderesi"
 
-#: src/applications/advertising/advertising.c:569
+#: src/transports/udp6.c:699 src/transports/smtp.c:932
+#: src/transports/udp.c:722
 #, fuzzy, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
-msgstr "Bivuye Byarengeje igihe"
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgstr "kugirango ni Byo hasi OYA"
 
-#: src/applications/advertising/advertising.c:729
+#: src/transports/http.c:601
 #, fuzzy
-msgid "# Peer advertisements received"
-msgstr "#BYAKIRIWE"
+msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
+msgstr "Itegerejwe Urakaza neza ku HTTP Ukwihuza Ukwihuza"
 
-#: src/applications/advertising/advertising.c:730
-msgid "# Self advertisments transmitted"
+#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#, fuzzy, c-format
+msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\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"
+". Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/applications/advertising/advertising.c:731
-msgid "# Foreign advertisements forwarded"
-msgstr ""
+#: src/transports/http.c:1101
+#, fuzzy
+msgid "HTTP: Could not determine my public IP address.\n"
+msgstr "OYA Rusange Aderesi"
 
-#: src/applications/advertising/advertising.c:733
-#: src/applications/pingpong/pingpong.c:462
-msgid "# plaintext PING messages sent"
+#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#, 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"
+"."
 
-#: src/applications/advertising/advertising.c:737
-#: src/applications/session/connect.c:752
-#, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
-msgstr ""
+#: src/transports/http.c:1333
+#, fuzzy, c-format
+msgid ""
+"Could not bind the HTTP listener to port %d. No transport service started.\n"
+msgstr "OYA i Kuri Umuyoboro Serivisi"
 
-#: src/applications/advertising/advertising.c:756
+#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
+#, fuzzy, c-format
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "OYA Izina: Bya Porogisi"
+
+#: src/transports/http.c:1478
 #, fuzzy
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "Yahagaritswe ku Iboneza"
+msgid "# bytes received via HTTP"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/applications/advertising/advertising.c:776
-msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+#: src/transports/http.c:1480
+#, fuzzy
+msgid "# bytes sent via HTTP"
+msgstr "#Bayite Yoherejwe:"
+
+#: src/transports/http.c:1482
+msgid "# bytes dropped by HTTP (outgoing)"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:81
-#: src/applications/testbed/testbed.c:1079
+#: src/transports/smtp.c:297
 #, fuzzy, c-format
-msgid "Invalid URL `%s' (must begin with `%s')\n"
-msgstr "Na:"
+msgid "Could not resolve name of SMTP server `%s': %s"
+msgstr "OYA Izina: Bya Seriveri"
 
-#: src/applications/bootstrap_http/http.c:109
-#, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-msgstr ""
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
+#, fuzzy, c-format
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section `%s' "
+"under `%s'.\n"
+msgstr "i Izina: Bya a kugirango i in Icyiciro"
 
-#: src/applications/bootstrap_http/http.c:120
+#: src/transports/smtp.c:489
+#, fuzzy
+msgid "Received malformed message via SMTP (size mismatch).\n"
+msgstr "Ubutumwa Biturutse Ingano"
+
+#: src/transports/smtp.c:584
+#, fuzzy
+msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
+msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
+
+#: src/transports/smtp.c:591
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "`%s'Byanze ku Na: Ikosa"
+msgid "SMTP filter string to long, capped to `%s'\n"
+msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
 
-#: src/applications/bootstrap_http/http.c:132
+#: src/transports/smtp.c:764
 #, fuzzy, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
-msgstr "OYA Gufungura Urutonde Bya Aho kubariza Ubuturo Kitazwi"
+msgid "Sending E-mail to `%s' failed.\n"
+msgstr "E Ubutumwa Kuri Byanze"
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
+#: src/transports/smtp.c:815
 #, fuzzy, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "`%s'Kuri Byanze ku Na: Ikosa"
+msgid "SMTP server send unexpected response at %s:%d.\n"
+msgstr "Seriveri Kohereza ku"
 
-#: src/applications/bootstrap_http/http.c:217
+#: src/transports/smtp.c:838
 #, fuzzy, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "kugirango Byanze"
+msgid ""
+"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
+msgstr "OYA Kohereza Iyemeza kugirango Kubaza..."
 
-#: src/applications/bootstrap_http/http.c:252
+#: src/transports/smtp.c:844
 #, fuzzy, c-format
-msgid "Parsing hello from `%s' failed.\n"
-msgstr "Bivuye Byanze"
+msgid "Failed to send `%s' request to SMTP server.\n"
+msgstr "Kuri Kohereza Ubutumwa Kuri"
 
-#: src/applications/bootstrap_http/http.c:330
+#: src/transports/smtp.c:903
 #, fuzzy, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
-msgstr "OYA Izina: Bya Porogisi a Porogisi"
+msgid "%.*s filter %s (SMTP)"
+msgstr ""
+"%.*Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/applications/bootstrap_http/http.c:355
-#, fuzzy
-msgid "# hellos downloaded via http"
-msgstr "#KB Yimuwe ku"
+#: src/transports/tcp.c:465
+#, fuzzy, c-format
+msgid ""
+"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
 
-#: src/applications/chat/chat.c:87
+#: src/transports/tcp.c:499
+#, fuzzy, c-format
+msgid ""
+"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
+msgstr "Ubutumwa Bivuye Ukwihuza"
+
+#: src/transports/tcp.c:1082
 #, fuzzy
-msgid "Message received from peer is invalid.\n"
-msgstr "BYAKIRIWE Bivuye ni Sibyo"
+msgid "Could not determine my public IP address.\n"
+msgstr "OYA Rusange Aderesi"
 
-#: src/applications/chat/chat.c:134
+#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
+#, fuzzy, c-format
+msgid "Failed to start transport service on port %d.\n"
+msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
+
+#: src/transports/tcp.c:1449
 #, fuzzy
-msgid "Message received from client is invalid\n"
-msgstr "BYAKIRIWE Bivuye Umukiriya ni"
+msgid "# bytes received via TCP"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/applications/chat/chat.c:156
+#: src/transports/tcp.c:1451
 #, fuzzy
-msgid "Maximum number of chat clients reached.\n"
-msgstr "Umubare Bya"
+msgid "# bytes sent via TCP"
+msgstr "#Bayite Yoherejwe:"
 
-#: src/applications/chat/chat.c:160
+#: src/transports/tcp.c:1453
+msgid "# bytes dropped by TCP (outgoing)"
+msgstr ""
+
+#: src/transports/udp.c:179
 #, fuzzy, c-format
-msgid "Now %d of %d chat clients at this node.\n"
-msgstr "Bya ku iyi"
+msgid "Failed to bind to UDP port %d.\n"
+msgstr "Kuri Kuri Umuyoboro"
 
-#: src/applications/chat/chat.c:197
+#: src/transports/udp.c:250
 #, c-format
-msgid "`%s' registering handlers %d and %d\n"
+msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:212
-msgid "enables P2P-chat (incomplete)"
+#: src/transports/udp.c:307
+#, fuzzy, c-format
+msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
 msgstr ""
+"Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+". Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/applications/chat/gnunet-chat.c:82
-#, fuzzy
-msgid "specify nickname"
-msgstr "Irihimbano"
-
-#: src/applications/chat/gnunet-chat.c:87
-#, fuzzy
-msgid "Start GNUnet chat client."
-msgstr "Gutangira Umukiriya"
-
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:106
-#: src/conf/gnunet-setup.c:286 src/server/gnunet-peer-info.c:107
-#: src/server/gnunet-transport-check.c:521 src/server/gnunet-update.c:142
-#: src/server/startup.c:574
+#: src/transports/udp.c:332
 #, fuzzy, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
+msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
+msgstr ""
+"Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+". Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/applications/chat/gnunet-chat.c:151
-#: src/applications/fs/tools/gnunet-delete.c:142
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363 src/util/port.c:85
+#: src/transports/udp.c:417
 #, fuzzy
-msgid "Could not connect to gnunetd.\n"
-msgstr "OYA Kwihuza Kuri"
+msgid "UDP: Could not determine my public IP address.\n"
+msgstr "OYA Rusange Aderesi"
 
-#: src/applications/chat/gnunet-chat.c:155
+#: src/transports/udp.c:551
 #, fuzzy, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "a Irihimbano Gukoresha Ihitamo"
+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"
+"."
 
-#: src/applications/chat/gnunet-chat.c:182
+#: src/transports/udp.c:707
 #, fuzzy
-msgid "Could not send join message to gnunetd\n"
-msgstr "OYA Kohereza Ubutumwa Kuri"
+msgid "# bytes received via UDP"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
 
-#: src/applications/chat/gnunet-chat.c:191
+#: src/transports/udp.c:709
 #, fuzzy
-msgid "Could not send message to gnunetd\n"
-msgstr "OYA Kohereza Ubutumwa Kuri"
+msgid "# bytes sent via UDP"
+msgstr "#Bayite Yoherejwe:"
 
-#: src/applications/datastore/datastore.c:118
-#, fuzzy, c-format
-msgid "Availability test failed for `%s' at %s:%d.\n"
-msgstr "kugirango ku"
+#: src/transports/udp.c:711
+msgid "# bytes dropped by UDP (outgoing)"
+msgstr ""
 
-#: src/applications/datastore/datastore.c:142
+#: src/transports/ip.c:124
 #, fuzzy, c-format
-msgid "Database failed to delete `%s'.\n"
-msgstr "Kuri Ibikubiyemo"
-
-#: src/applications/datastore/filter.c:42
-#, fuzzy, c-format
 msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
-msgstr "bushyinguro kugirango Ibyatanzwe in Icyiciro"
+"Could not find interface `%s' in `%s', trying to find another interface.\n"
+msgstr "OYA Gushaka in Kuri Gushaka"
 
-#: src/applications/dht/module/cs.c:446
+#: src/transports/ip.c:149
 #, fuzzy, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "`%s'Byanze imbonerahamwe# OYA Byabonetse"
+msgid "Could not obtain IP for interface `%s' using `%s'.\n"
+msgstr "OYA kugirango ikoresha"
 
-#: src/applications/dht/module/cs.c:466
+#: src/transports/ip.c:193
 #, fuzzy, c-format
-msgid "`%s' failed.  Terminating connection to client.\n"
-msgstr "`%s'Byanze."
+msgid "Could not find an IP address for interface `%s'.\n"
+msgstr "OYA Gushaka Aderesi kugirango"
 
-#: src/applications/dht/module/cs.c:542
-#, fuzzy
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "Byanze Ukwihuza Kuri Umukiriya"
-
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/transports/ip.c:203
 #, fuzzy, c-format
-msgid "`%s' failed. Terminating connection to client.\n"
-msgstr "`%s'Byanze."
+msgid ""
+"There is more than one IP address specified for interface `%s'.\n"
+"GNUnet will use %u.%u.%u.%u.\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"
+". Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/transports/ip.c:224
 #, fuzzy, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Kuri Ibikubiyemo"
+msgid "Could not resolve `%s' to determine our IP address: %s\n"
+msgstr "OYA Kuri Aderesi"
 
-#: src/applications/dht/module/dht.c:946
-#, fuzzy, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr "Bitari ngombwa Umwanya BYAKIRIWE Bivuye"
+#: src/transports/ip.c:256
+#, c-format
+msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgstr ""
 
-#: src/applications/dht/module/dht.c:973
-#, fuzzy, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "OYA Gushaka in imbonerahamwe#"
+#: src/transports/ip.c:306
+msgid "Failed to obtain my (external) IP address!\n"
+msgstr ""
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
-#, fuzzy, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr "Kuri Bivuye"
+#: src/transports/tcp6.c:439
+#, fuzzy
+msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
 
-#: src/applications/dht/module/dht.c:1447
-#, fuzzy, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Kuri Bivuye"
+#: src/transports/tcp6.c:469
+#, fuzzy
+msgid ""
+"Received malformed message from tcp6-peer connection. Closing connection.\n"
+msgstr "Ubutumwa Bivuye Ukwihuza Ukwihuza"
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
-#, fuzzy, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "`%s'Na: Igihe cyarenze: hejuru 1. ISAHA"
+#: src/transports/tcp6.c:958
+#, fuzzy
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "OYA Rusange Aderesi"
 
-#: src/applications/dht/module/dht.c:1793
+#: src/transports/tcp6.c:1002
 #, fuzzy, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Kuri"
+msgid "`%s': unknown service: %s\n"
+msgstr "`%s':Kitazwi Serivisi"
 
-#: src/applications/dht/module/dht.c:1993
-#, fuzzy, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr "Kuri ku Mugenga imbonerahamwe#"
+#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/session/sessiontest.c:48
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:107
+#: src/applications/tbench/tbenchtest_udp.c:107
+#: src/applications/gap/gaptest.c:52
+#, fuzzy
+msgid "# of connected peers"
+msgstr "#Bya"
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
-#, fuzzy, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Kuri Bivuye"
+#: src/applications/dht/tools/dhttest2.c:128
+#: src/applications/session/sessiontest.c:118
+#: src/applications/tbench/tbenchtest.c:199
+#: src/applications/tbench/tbenchtest_udp.c:201
+#: src/applications/gap/gaptest.c:318
+#, c-format
+msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+msgstr ""
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
-#, fuzzy, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Sibyo"
-
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/session/sessiontest.c:133
+#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/tbench/tbenchtest_udp.c:122
+#: src/applications/gap/gaptest.c:330
 #, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
+msgid "Waiting for peers to connect (%u iterations left)...\n"
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:43
+#: src/applications/dht/tools/dht-query.c:39
 #, fuzzy
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "Kwemerera Bayite Bya Ububiko kugirango i imbonerahamwe#"
+msgid "query table called NAME"
+msgstr "Ikibazo# imbonerahamwe#"
 
-#: src/applications/dht/tools/dht-join.c:45
+#: src/applications/dht/tools/dht-query.c:41
 #, fuzzy
-msgid "join table called NAME"
-msgstr "imbonerahamwe#"
+msgid "allow TIME ms to process each command"
+msgstr "Kwemerera Kuri Komandi:"
 
-#: src/applications/dht/tools/dht-join.c:51
+#: src/applications/dht/tools/dht-query.c:46
 #, fuzzy
-msgid "Join a DHT."
-msgstr "a"
+msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
+msgstr "Kubona Gushyira Gukuraho... a imbonerahamwe#"
 
-#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/tbench/gnunet-tbench.c:124
 #: src/applications/tbench/gnunet-tbench.c:134
 #: src/applications/tbench/gnunet-tbench.c:147
@@ -367,6 +485,13 @@
 #: src/applications/tracekit/gnunet-tracekit.c:87
 #: src/applications/tracekit/gnunet-tracekit.c:122
 #: src/applications/tracekit/gnunet-tracekit.c:136
+#: src/applications/fs/tools/gnunet-pseudonym.c:120
+#: src/applications/fs/tools/gnunet-insert.c:315
+#: src/applications/fs/tools/gnunet-insert.c:461
+#: src/applications/fs/tools/gnunet-search.c:167
+#: src/applications/fs/tools/gnunet-search.c:183
+#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/fs/tools/gnunet-download.c:96
 #: src/server/gnunet-transport-check.c:448
 #: src/server/gnunet-transport-check.c:462
 #: src/server/gnunet-transport-check.c:479
@@ -375,60 +500,30 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "a Umubare Kuri i Ihitamo"
 
-#: src/applications/dht/tools/dht-join.c:115
-#, fuzzy
-msgid "Superflous arguments (ignored).\n"
-msgstr "ingingo"
-
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-query.c:99
+#: src/applications/dht/tools/dht-join.c:108
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546
+#: src/applications/stats/gnunet-stats.c:144
+#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tracekit/gnunet-tracekit.c:153
+#: src/applications/fs/tools/gnunet-pseudonym.c:232
+#: src/applications/fs/tools/gnunet-delete.c:111
+#: src/applications/fs/tools/gnunet-directory.c:190
+#: src/applications/fs/tools/gnunet-insert.c:532
+#: src/applications/fs/tools/gnunet-search.c:221
+#: src/applications/fs/tools/gnunet-download.c:130
+#: src/applications/fs/tools/gnunet-unindex.c:140
+#: src/applications/template/gnunet-template.c:87
+#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
+#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
+#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
 #, fuzzy, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "Kuri"
+msgid "Use --help to get a list of options.\n"
+msgstr "Ifashayobora Kuri Kubona a Urutonde Bya Amahitamo"
 
-#: src/applications/dht/tools/dht-join.c:132
-#, fuzzy, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Kuri Na: Urufunguzo"
-
-#: src/applications/dht/tools/dht-join.c:133
-#, fuzzy, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Kuri Na: Agaciro Bayite"
-
-#: src/applications/dht/tools/dht-join.c:211
-#: src/applications/dht/tools/dht-query.c:231
-#, fuzzy, c-format
-msgid "No table name specified, using `%s'.\n"
-msgstr "imbonerahamwe# Izina: ikoresha"
-
-#: src/applications/dht/tools/dht-join.c:236
-msgid "Error joining DHT.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:243
-#, fuzzy, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr "C Kuri"
-
-#: src/applications/dht/tools/dht-join.c:250
-msgid "Error leaving DHT.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-query.c:39
-#, fuzzy
-msgid "query table called NAME"
-msgstr "Ikibazo# imbonerahamwe#"
-
-#: src/applications/dht/tools/dht-query.c:41
-#, fuzzy
-msgid "allow TIME ms to process each command"
-msgstr "Kwemerera Kuri Komandi:"
-
-#: src/applications/dht/tools/dht-query.c:46
-#, fuzzy
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
-msgstr "Kubona Gushyira Gukuraho... a imbonerahamwe#"
-
 #: src/applications/dht/tools/dht-query.c:106
 #, fuzzy
 msgid "No commands specified.\n"
@@ -446,6 +541,12 @@
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)'Byanze"
 
+#: src/applications/dht/tools/dht-query.c:231
+#: src/applications/dht/tools/dht-join.c:211
+#, fuzzy, c-format
+msgid "No table name specified, using `%s'.\n"
+msgstr "imbonerahamwe# Izina: ikoresha"
+
 #: src/applications/dht/tools/dht-query.c:246
 #, fuzzy, c-format
 msgid "Failed to connect to gnunetd.\n"
@@ -526,1095 +627,281 @@
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Subiza Kuri"
 
-#: src/applications/dht/tools/dhttest2.c:50 src/applications/gap/gaptest.c:52
-#: src/applications/session/sessiontest.c:48
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:107
+#: src/applications/dht/tools/dht-join.c:43
 #, fuzzy
-msgid "# of connected peers"
-msgstr "#Bya"
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "Kwemerera Bayite Bya Ububiko kugirango i imbonerahamwe#"
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
-#: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:199
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr ""
-
-#: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/gap/gaptest.c:330
-#: src/applications/session/sessiontest.c:133
-#: src/applications/tbench/tbenchtest.c:122
-#, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr ""
-
-#: src/applications/fragmentation/fragmentation.c:557
+#: src/applications/dht/tools/dht-join.c:45
 #, fuzzy
-msgid "# messages defragmented"
-msgstr "#Ubutumwa"
+msgid "join table called NAME"
+msgstr "imbonerahamwe#"
 
-#: src/applications/fragmentation/fragmentation.c:558
+#: src/applications/dht/tools/dht-join.c:51
 #, fuzzy
-msgid "# messages fragmented"
-msgstr "#Ubutumwa"
+msgid "Join a DHT."
+msgstr "a"
 
-#: src/applications/fragmentation/fragmentation.c:559
-msgid "# fragments discarded"
-msgstr ""
-
-#: src/applications/fragmentation/fragmentation.c:569
-#, c-format
-msgid "`%s' registering handler %d\n"
-msgstr ""
-
-#: src/applications/fs/ecrs/download.c:125
-#, fuzzy, c-format
-msgid "Could not unlink temporary file `%s': %s\n"
-msgstr "OYA Kwandika Kuri IDOSIYE"
-
-#: src/applications/fs/ecrs/download.c:257
-#, fuzzy, c-format
-msgid "Write(%d, %p, %d) failed: %s\n"
-msgstr "`%s'%sByanze"
-
-#: src/applications/fs/ecrs/download.c:927
+#: src/applications/dht/tools/dht-join.c:115
 #, fuzzy
-msgid ""
-"Decrypted content does not match key. This is either a bug or a maliciously "
-"inserted file. Download aborted.\n"
-msgstr "Ibikubiyemo OYA BIHUYE Urufunguzo ni a Cyangwa a Byinjijwemo IDOSIYE"
+msgid "Superflous arguments (ignored).\n"
+msgstr "ingingo"
 
-#: src/applications/fs/ecrs/download.c:1104
+#: src/applications/dht/tools/dht-join.c:131
 #, fuzzy, c-format
-msgid ""
-"Content `%s' seems to be not available on the network (tried %u times).\n"
-msgstr "Kuri OYA Bihari ku i urusobe"
+msgid "Call to `%s' returns %d.\n"
+msgstr "Kuri"
 
-#: src/applications/fs/ecrs/meta.c:842
+#: src/applications/dht/tools/dht-join.c:132
 #, fuzzy, c-format
-msgid "Renaming of file `%s' to `%s' failed: %s\n"
-msgstr "Bya IDOSIYE Kuri Byanze"
+msgid "Call to `%s' with key `%s'.\n"
+msgstr "Kuri Na: Urufunguzo"
 
-#: src/applications/fs/ecrs/meta.c:850
+#: src/applications/dht/tools/dht-join.c:133
 #, fuzzy, c-format
-msgid "Could not rename file `%s' to `%s': file exists\n"
-msgstr "OYA Guhindura izina IDOSIYE Kuri IDOSIYE"
+msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+msgstr "Kuri Na: Agaciro Bayite"
 
-#: src/applications/fs/ecrs/namespace.c:45
-#, fuzzy, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
-msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+#: src/applications/dht/tools/dht-join.c:236
+msgid "Error joining DHT.\n"
+msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:133
+#: src/applications/dht/tools/dht-join.c:243
 #, fuzzy, c-format
-msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
-msgstr "Kurema IDOSIYE"
+msgid "Joined DHT.  Press CTRL-C to leave.\n"
+msgstr "C Kuri"
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
-#, fuzzy, c-format
-msgid "File `%s' does not contain a pseudonym.\n"
-msgstr "Idosiye OYA a"
+#: src/applications/dht/tools/dht-join.c:250
+msgid "Error leaving DHT.\n"
+msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/dht/module/dht.c:946
 #, fuzzy, c-format
-msgid "Format of pseudonym `%s' is invalid.\n"
-msgstr "Bya ni Sibyo Ijambobanga..."
+msgid "Malformed optional field `%s' received from peer `%s'.\n"
+msgstr "Bitari ngombwa Umwanya BYAKIRIWE Bivuye"
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/dht/module/dht.c:973
 #, fuzzy, c-format
-msgid "Format of file `%s' is invalid.\n"
-msgstr "Bya ni Sibyo Ijambobanga..."
+msgid "Could not find peer `%s' in routing table!\n"
+msgstr "OYA Gushaka in imbonerahamwe#"
 
-#: src/applications/fs/ecrs/search.c:160
-msgid "CHK URI not allowed for search.\n"
-msgstr ""
-
-#: src/applications/fs/ecrs/search.c:216
-msgid "LOC URI not allowed for search.\n"
-msgstr ""
-
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/dht/module/dht.c:1120
+#: src/applications/dht/module/dht.c:1135
 #, fuzzy, c-format
-msgid "`%s' is not a file.\n"
-msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
+msgid "Received malformed response to `%s' from peer `%s'.\n"
+msgstr "Kuri Bivuye"
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/dht/module/dht.c:1447
 #, fuzzy, c-format
-msgid "Cannot get size of file `%s'"
-msgstr "Gufungura Iboneza IDOSIYE"
+msgid "Invalid response to `%s' from peer `%s'.\n"
+msgstr "Kuri Bivuye"
 
-#: src/applications/fs/ecrs/upload.c:193
-#, fuzzy
-msgid "Failed to connect to gnunetd."
-msgstr "Kuri Kwihuza Kuri"
-
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/dht/module/dht.c:1603
+#: src/applications/dht/module/dht.c:2340
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
 #, fuzzy, c-format
-msgid "Cannot hash `%s'.\n"
-msgstr "Ibirimo"
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "`%s'Na: Igihe cyarenze: hejuru 1. ISAHA"
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/dht/module/dht.c:1793
 #, fuzzy, c-format
-msgid "Initialization for indexing file `%s' failed.\n"
-msgstr "Bya in IDOSIYE"
+msgid "Invalid response to `%s'.\n"
+msgstr "Kuri"
 
-#: src/applications/fs/ecrs/upload.c:227
+#: src/applications/dht/module/dht.c:1993
 #, fuzzy, c-format
-msgid "Indexing file `%s' failed. Trying to insert file...\n"
-msgstr "Itangira... Modire Byanze Umukiriya"
+msgid "Malformed response to `%s' on master table.\n"
+msgstr "Kuri ku Mugenga imbonerahamwe#"
 
-#: src/applications/fs/ecrs/upload.c:306
-#, c-format
-msgid "Indexing data failed at position %i.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/download.c:290
-#, fuzzy
-msgid "Download aborted."
-msgstr "/Byahiswemo"
-
-#: src/applications/fs/fsui/download.c:294
-#, fuzzy
-msgid "ECRS download failed (see logs)."
-msgstr "OYA Gufungura IDOSIYE"
-
-#: src/applications/fs/fsui/download.c:298
-#, fuzzy
-msgid "ECRS download suspending."
-msgstr "OYA Gufungura IDOSIYE"
-
-#: src/applications/fs/fsui/download.c:302
-#, fuzzy
-msgid "Unexpected download state."
-msgstr "Ibikubiyemo Ubwoko"
-
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-msgid "AND"
-msgstr ""
-
-#: src/applications/fs/fsui/file_info.c:66
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1044
+#: src/applications/dht/module/dht.c:2207
+#: src/applications/dht/module/dht.c:2507
 #, fuzzy, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s\n"
-msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+msgid "Invalid response to `%s' from `%s'\n"
+msgstr "Kuri Bivuye"
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/file_info.c:292
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
-msgstr ""
-
-#: src/applications/fs/fsui/fsui.c:189
-msgid "FSUI persistence: error restoring download\n"
-msgstr ""
-
-#: src/applications/fs/fsui/fsui.c:638
-#, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/helper.c:67
-#, fuzzy
-msgid "No keywords specified!\n"
-msgstr "Amagambo fatizo"
-
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
-msgstr ""
-
-#: src/applications/fs/fsui/namespace_info.c:604
-msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
-msgstr ""
-
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr ""
-
-#: src/applications/fs/fsui/unindex.c:85
-#, fuzzy
-msgid "Unindex failed."
-msgstr "/Idosiye IDOSIYE"
-
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
-#, fuzzy
-msgid "Upload failed."
-msgstr "/Idosiye IDOSIYE"
-
-#: src/applications/fs/fsui/upload.c:455
-msgid "Cannot upload directory without using recursion."
-msgstr ""
-
-#: src/applications/fs/module/fs.c:1184
+#: src/applications/dht/module/dht.c:2881
+#: src/applications/dht/module/dht.c:3021
+#: src/applications/dht/module/dht.c:3148
+#: src/applications/dht/module/dht.c:3282
 #, fuzzy, c-format
-msgid ""
-"You must specify a postive number for `%s' in the configuration in section `%"
-"s'.\n"
-msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
+msgid "Received invalid RPC `%s'.\n"
+msgstr "Sibyo"
 
-#: src/applications/fs/module/fs.c:1233
+#: src/applications/dht/module/dht.c:3160
+#: src/applications/dht/module/dht.c:3296
 #, c-format
-msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
+msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1270
-msgid "enables (anonymous) file-sharing"
-msgstr ""
-
-#: src/applications/fs/module/migration.c:224
-msgid "# blocks migrated"
-msgstr ""
-
-#: src/applications/fs/module/migration.c:225
-msgid "# on-demand block migration attempts"
-msgstr ""
-
-#: src/applications/fs/module/ondemand.c:305
-#, c-format
-msgid "Indexed file disappeared, deleting block for query `%s'\n"
-msgstr ""
-
-#: src/applications/fs/module/ondemand.c:393
-#, c-format
-msgid ""
-"Because the file `%s' has been unavailable for 3 days it got removed from "
-"your share.  Please unindex files before deleting them as the index now "
-"contains invalid references!\n"
-msgstr ""
-
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/dht/module/cs.c:446
 #, fuzzy, c-format
-msgid ""
-"Configuration file must specify directory for storage of FS data in section `"
-"%s' under `%s'.\n"
-msgstr "IDOSIYE bushyinguro kugirango Bya Ibyatanzwe in Icyiciro"
+msgid "`%s' failed: table not found!\n"
+msgstr "`%s'Byanze imbonerahamwe# OYA Byabonetse"
 
-#: src/applications/fs/module/ondemand.c:617
-#, c-format
-msgid ""
-"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
-msgstr ""
-
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1802
-#, fuzzy
-msgid "Failed to get traffic stats.\n"
-msgstr "Kuri Ikibazo# Ibyerekeye"
-
-#: src/applications/fs/tools/gnunet-delete.c:37
+#: src/applications/dht/module/cs.c:466
 #, fuzzy, c-format
-msgid "%8u of %8u bytes deleted."
-msgstr "%8uBya Bayite Cyasibwe"
+msgid "`%s' failed.  Terminating connection to client.\n"
+msgstr "`%s'Byanze."
 
-#: src/applications/fs/tools/gnunet-delete.c:52
+#: src/applications/dht/module/cs.c:542
 #, fuzzy
-msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-msgstr "i IDOSIYE Kuri Gusiba Bivuye IDOSIYE"
+msgid "sendAck failed.  Terminating connection to client.\n"
+msgstr "Byanze Ukwihuza Kuri Umukiriya"
 
-#: src/applications/fs/tools/gnunet-delete.c:61
-#, fuzzy
-msgid ""
-"Remove file from GNUnet.  The specified file is not removed\n"
-"from the filesystem but just from the local GNUnet datastore."
-msgstr "IDOSIYE Bivuye IDOSIYE ni OYA i Bivuye i"
-
-#: src/applications/fs/tools/gnunet-delete.c:139
-#, fuzzy
-msgid "You must specify a filename (option -f)\n"
-msgstr "a Izina ry'idosiye: Ihitamo F"
-
-#: src/applications/fs/tools/gnunet-delete.c:151
+#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
+#: src/applications/dht/module/cs.c:688
 #, fuzzy, c-format
-msgid ""
-"Error deleting file %s.\n"
-"Probably a few blocks were already missing from the database.\n"
-msgstr "IDOSIYE a Ibuze Bivuye i Ububikoshingiro"
+msgid "`%s' failed. Terminating connection to client.\n"
+msgstr "`%s'Byanze."
 
-#: src/applications/fs/tools/gnunet-directory.c:76
+#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
 #, fuzzy, c-format
-msgid "==> Directory `%s':\n"
-msgstr "==>ububiko"
+msgid "Failed to deliver `%s' message.\n"
+msgstr "Kuri Ibikubiyemo"
 
-#: src/applications/fs/tools/gnunet-directory.c:81
-#, c-format
-msgid "=\tError reading directory.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-directory.c:111
-#, fuzzy, c-format
-msgid "File format error (not a GNUnet directory?)\n"
-msgstr "IDOSIYE Cyangwa Sibyo Imiterere kugirango bushyinguro"
-
-#: src/applications/fs/tools/gnunet-directory.c:113
-#, fuzzy, c-format
-msgid "%d files found in directory.\n"
-msgstr "IDOSIYE Kuri bushyinguro"
-
-#: src/applications/fs/tools/gnunet-directory.c:131
+#: src/applications/chat/chat.c:87
 #, fuzzy
-msgid "remove all entries from the directory database and stop tracking URIs"
-msgstr "Gukuraho... Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
+msgid "Message received from peer is invalid.\n"
+msgstr "BYAKIRIWE Bivuye ni Sibyo"
 
-#: src/applications/fs/tools/gnunet-directory.c:133
+#: src/applications/chat/chat.c:134
 #, fuzzy
-msgid "list entries from the directory database"
-msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
+msgid "Message received from client is invalid\n"
+msgstr "BYAKIRIWE Bivuye Umukiriya ni"
 
-#: src/applications/fs/tools/gnunet-directory.c:136
+#: src/applications/chat/chat.c:156
 #, fuzzy
-msgid "start tracking entries for the directory database"
-msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
+msgid "Maximum number of chat clients reached.\n"
+msgstr "Umubare Bya"
 
-#: src/applications/fs/tools/gnunet-directory.c:140
-msgid "gnunet-directory [OPTIONS] [FILENAMES]"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-directory.c:141
-#, fuzzy
-msgid "Perform directory related operations."
-msgstr "bushyinguro Ibikorwa:"
-
-#: src/applications/fs/tools/gnunet-directory.c:206
+#: src/applications/chat/chat.c:160
 #, fuzzy, c-format
-msgid "Listed %d matching entries.\n"
-msgstr "Ibyinjijwe"
+msgid "Now %d of %d chat clients at this node.\n"
+msgstr "Bya ku iyi"
 
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Table.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Frame.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Graphic.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Calc.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Draw.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Chart.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Image.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Formula.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Impress.Settings.Level.text
-# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
-# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.OLEMisc.Settings.Level.text
-#: src/applications/fs/tools/gnunet-download.c:41
-#, fuzzy
-msgid "LEVEL"
-msgstr "urwego"
-
-#: src/applications/fs/tools/gnunet-download.c:42
-#: src/applications/fs/tools/gnunet-search.c:108
-#, fuzzy
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "Gushyiraho i Bya Mwakirizi"
-
-#: src/applications/fs/tools/gnunet-download.c:47
-#, fuzzy
-msgid "FILENAME"
-msgstr "Izina ry'idosiye"
-
-#: src/applications/fs/tools/gnunet-download.c:48
-#, fuzzy
-msgid "write the file to FILENAME"
-msgstr "Kwandika i IDOSIYE Kuri"
-
-#: src/applications/fs/tools/gnunet-download.c:50
-#, fuzzy
-msgid "download a GNUnet directory recursively"
-msgstr "Gufungura a bushyinguro"
-
-#: src/applications/fs/tools/gnunet-download.c:56
-#, fuzzy
-msgid "Download files from GNUnet."
-msgstr "Idosiye Bivuye"
-
-#: src/applications/fs/tools/gnunet-download.c:136
-#, fuzzy
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr "ingingo a"
-
-#: src/applications/fs/tools/gnunet-download.c:159
-#, fuzzy, c-format
-msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
-msgstr "ku Inyuma Bya Bayite"
-
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
+#: src/applications/chat/chat.c:197
 #, c-format
-msgid "Error downloading: %s\n"
+msgid "`%s' registering handlers %d and %d\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:191
-#, fuzzy, c-format
-msgid "Download of file `%s' complete.  Speed was %8.3f kilobyte per second.\n"
-msgstr "ISEGONDA"
-
-#: src/applications/fs/tools/gnunet-download.c:237
-#, fuzzy, c-format
-msgid "URI `%s' invalid for gnunet-download.\n"
-msgstr "Sibyo"
-
-#: src/applications/fs/tools/gnunet-download.c:288
-#, fuzzy, c-format
-msgid "File stored as `%s'.\n"
-msgstr "Idosiye Nka"
-
-#: src/applications/fs/tools/gnunet-insert.c:110
-#, fuzzy, c-format
-msgid "Created entry `%s' in namespace `%s'\n"
-msgstr "Ikiranga"
-
-#: src/applications/fs/tools/gnunet-insert.c:115
-#, fuzzy, c-format
-msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
+#: src/applications/chat/chat.c:212
+msgid "enables P2P-chat (incomplete)"
 msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
 
-#: src/applications/fs/tools/gnunet-insert.c:136
-#, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:150
-#, fuzzy, c-format
-msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
-msgstr "ku Inyuma Bya Bayite"
-
-#: src/applications/fs/tools/gnunet-insert.c:164
-#, fuzzy, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f kbps.\n"
-msgstr "ISEGONDA"
-
-#: src/applications/fs/tools/gnunet-insert.c:174
-#, fuzzy, c-format
-msgid "File `%s' has URI: %s\n"
-msgstr "Idosiye Nka"
-
-#: src/applications/fs/tools/gnunet-insert.c:187
-#, c-format
-msgid ""
-"\n"
-"Error uploading file: %s\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:206
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
+#: src/applications/chat/gnunet-chat.c:82
 #, fuzzy
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "Gushyiraho i Bya Mwakirizi"
+msgid "specify nickname"
+msgstr "Irihimbano"
 
-#: src/applications/fs/tools/gnunet-insert.c:209
+#: src/applications/chat/gnunet-chat.c:87
 #, fuzzy
-msgid ""
-"even if gnunetd is running on the local machine, force the creation of a "
-"copy instead of making a link to the GNUnet share directory"
-msgstr "NIBA ni ku i Kurema a Ihuza Bya a Gukoporora in i bushyinguro"
+msgid "Start GNUnet chat client."
+msgstr "Gutangira Umukiriya"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
-msgid ""
-"use libextractor to add additional direct references to directory entries"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:214
+#: src/applications/chat/gnunet-chat.c:151
+#: src/applications/tbench/gnunet-tbench.c:213
+#: src/applications/tracekit/gnunet-tracekit.c:363
+#: src/applications/fs/tools/gnunet-delete.c:142
 #, fuzzy
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
-msgstr ""
-"Gucapa Urutonde Bya Amagambo fatizo OYA Iyinjizamo Cyangwa gushyiraho "
-"umugereka"
+msgid "Could not connect to gnunetd.\n"
+msgstr "OYA Kwihuza Kuri"
 
-#: src/applications/fs/tools/gnunet-insert.c:218
-#, fuzzy
-msgid ""
-"set interval for availability of updates to SECONDS (for namespace "
-"insertions only)"
-msgstr "Gushyiraho Intera kugirango Ukuboneka Bya Kuri kugirango Amayongeramo"
+#: src/applications/chat/gnunet-chat.c:155
+#, fuzzy, c-format
+msgid "You must specify a nickname (use option `%s').\n"
+msgstr "a Irihimbano Gukoresha Ihitamo"
 
-#: src/applications/fs/tools/gnunet-insert.c:221
+#: src/applications/chat/gnunet-chat.c:182
 #, fuzzy
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
-msgstr ""
-"Kongeramo Ijambo- banze kugirango i Hejuru: urwego IDOSIYE Cyangwa "
-"bushyinguro iyi Ihitamo Igikubo Times"
+msgid "Could not send join message to gnunetd\n"
+msgstr "OYA Kohereza Ubutumwa Kuri"
 
-#: src/applications/fs/tools/gnunet-insert.c:224
+#: src/applications/chat/gnunet-chat.c:191
 #, fuzzy
-msgid ""
-"add an additional keyword for all files and directories (this option can be "
-"specified multiple times)"
-msgstr ""
-"Kongeramo Ijambo- banze kugirango Byose Idosiye Na ububiko bw'amaderese iyi "
-"Ihitamo Igikubo Times"
+msgid "Could not send message to gnunetd\n"
+msgstr "OYA Kohereza Ubutumwa Kuri"
 
-#: src/applications/fs/tools/gnunet-insert.c:228
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:230
-#, fuzzy
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
-msgstr ""
-"OYA Umubarendanga Iyinjizamo IDOSIYE in Bishunzwe: Ifishi in Ububikoshingiro"
-
-#: src/applications/fs/tools/gnunet-insert.c:233
-#, fuzzy
-msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
-msgstr "Bya Verisiyo Kuri in i kugirango Amayongeramo"
-
-#: src/applications/fs/tools/gnunet-insert.c:236
-#, fuzzy
-msgid "specify the priority of the content"
-msgstr "i By'ibanze Bya i Ibikubiyemo"
-
-#: src/applications/fs/tools/gnunet-insert.c:238
-#, fuzzy
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr "Tangaza i Idosiye i IDOSIYE"
-
-#: src/applications/fs/tools/gnunet-insert.c:240
-#, fuzzy
-msgid "process directories recursively"
-msgstr "ububiko bw'amaderese"
-
-#: src/applications/fs/tools/gnunet-insert.c:242
-#, fuzzy
-msgid ""
-"specifies this as an aperiodic but updated publication (for namespace "
-"insertions only)"
-msgstr "iyi Nka kugirango Amayongeramo"
-
-#: src/applications/fs/tools/gnunet-insert.c:245
-#, fuzzy
-msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
-msgstr "Gushyiraho i Bya iyi Verisiyo Bya i kugirango Amayongeramo"
-
-#: src/applications/fs/tools/gnunet-insert.c:248
-#, fuzzy
-msgid "specify creation time for SBlock (see man-page for format)"
-msgstr "Igihe kugirango Ipaji kugirango Imiterere"
-
-#: src/applications/fs/tools/gnunet-insert.c:250
-#, fuzzy
-msgid "ID of the previous version of the content (for namespace update only)"
-msgstr ""
-"Izina ry'idosiye: Bya i Bya a Ibanjirije Verisiyo Bya i Ibikubiyemo "
-"kugirango Amayongeramo"
-
-#: src/applications/fs/tools/gnunet-insert.c:257
-#, fuzzy
-msgid "Make files available to GNUnet for sharing."
-msgstr "Idosiye Bihari Kuri kugirango Bisangiwe"
-
-#: src/applications/fs/tools/gnunet-insert.c:344
+#: src/applications/advertising/advertising.c:161
 #, fuzzy, c-format
-msgid "You must pass a positive number to the `%s' option.\n"
-msgstr "a Umubare Kuri i Ihitamo"
+msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgstr "Ubutumwa Bivuye Sibyo Isinya Sibyo"
 
-#: src/applications/fs/tools/gnunet-insert.c:429
-#, c-format
-msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:537
-#: src/applications/fs/tools/gnunet-unindex.c:145
-#, fuzzy, c-format
-msgid "You must specify a list of files to insert.\n"
-msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-
-#: src/applications/fs/tools/gnunet-insert.c:541
-#, c-format
-msgid "Only one file or directory can be specified at a time.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-insert.c:545
-#, fuzzy, c-format
-msgid "You must specify a file or directory to upload.\n"
-msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-
-#: src/applications/fs/tools/gnunet-insert.c:595
-#, fuzzy, c-format
-msgid "Keywords for file `%s':\n"
-msgstr "kugirango IDOSIYE"
-
-#: src/applications/fs/tools/gnunet-insert.c:617
-#, fuzzy, c-format
-msgid "Could not access namespace `%s' (does not exist?).\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/applications/fs/tools/gnunet-insert.c:636
-#, fuzzy, c-format
-msgid "Parsing time failed. Use `%s' format.\n"
-msgstr "Igihe Byanze Imiterere"
-
-#: src/applications/fs/tools/gnunet-insert.c:649
-#: src/applications/fs/tools/gnunet-insert.c:653
-#: src/applications/fs/tools/gnunet-insert.c:657
-#: src/applications/fs/tools/gnunet-insert.c:661
-#: src/applications/fs/tools/gnunet-insert.c:666
-#, fuzzy, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
-msgstr "Oya Ihitamo"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:35
+#: src/applications/advertising/advertising.c:167
 #, fuzzy
-msgid "automate creation of a namespace by starting a collection"
-msgstr "Bya a ku a"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
-#, fuzzy
-msgid "create a new pseudonym under the given NICKNAME"
-msgstr "Gusiba i Na: i"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
-#, fuzzy
-msgid "delete the pseudonym with the given NICKNAME"
-msgstr "Gusiba i Na: i"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
-#, fuzzy
-msgid "end automated building of a namespace (ends collection)"
-msgstr "Impera Bya a"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
-#, fuzzy
 msgid ""
-"use the given keyword to advertise the namespace (use when creating a new "
-"pseudonym)"
-msgstr "Gukoresha i Ijambo- banze Kuri i Gukoresha Ryari: a Gishya"
+"hello message received invalid (expiration time over limit). Dropping.\n"
+msgstr "Ubutumwa BYAKIRIWE Sibyo Igihe KURI"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-#, fuzzy
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
-msgstr "i Ibigize Bya i Bya i Gukoresha Ryari: a Gishya"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
-#, fuzzy
-msgid ""
-"do not generate an advertisement for this namespace (use when creating a new "
-"pseudonym)"
-msgstr "OYA kugirango iyi Gukoresha Ryari: a Gishya"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
-#, fuzzy
-msgid "do not list the pseudonyms from the pseudonym database"
-msgstr "OYA Urutonde i Bivuye i Ububikoshingiro"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
-#, fuzzy
-msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr "Kuri i Bya i Ukoresha: i Gukoresha Ryari: a Gishya"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-#, fuzzy
-msgid ""
-"specify IDENTIFIER to be the address of the entrypoint to content in the "
-"namespace (use when creating a new pseudonym)"
-msgstr "Kuri i Aderesi Bya i Kuri Ibikubiyemo in i Gukoresha Ryari: a Gishya"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
-msgid "set the rating of a namespace"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-#, fuzzy
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr "Gukoresha Kuri i Ibikubiyemo Bya i Gukoresha Ryari: a Gishya"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-#, fuzzy
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"i Nka Aderesi Kirimo Birenzeho Ibisobanuro Ibyerekeye i Gukoresha Ryari: a "
-"Gishya"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-#, fuzzy
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr "Gishya Gusiba Cyangwa Urutonde"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#: src/applications/advertising/advertising.c:176
 #, fuzzy, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr "Inkoresha siyo"
+msgid "hello advertisement for protocol %d received.\n"
+msgstr "kugirango Porotokole BYAKIRIWE"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/conf/gnunet-setup.c:179 src/server/gnunet-peer-info.c:118
-#: src/server/gnunet-transport-check.c:532
+#: src/applications/advertising/advertising.c:295
 #, fuzzy
-msgid "Invalid arguments. Exiting.\n"
-msgstr "ingingo"
+msgid "Could not send hellos+PING, ping buffer full.\n"
+msgstr "OYA Kohereza"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
+#: src/applications/advertising/advertising.c:308
 #, fuzzy, c-format
-msgid "Namespace `%s' has rating %d.\n"
-msgstr "Igisubizo ni i"
+msgid "`%s' failed (%d, %u). Will not send PING.\n"
+msgstr "`%s'Byanze kugirango Umuyoboro in amasogonda"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#: src/applications/advertising/advertising.c:463
 #, fuzzy, c-format
-msgid "Namespace `%s' (%s) has rating %d.\n"
-msgstr "Igisubizo ni i"
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Kuri Byahiswemo"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
-#, fuzzy, c-format
-msgid "\tRating (after update): %d\n"
-msgstr "Nyuma"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
-#, fuzzy, c-format
-msgid "Collection stopped.\n"
-msgstr "Kyahagariswe"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
-#, c-format
-msgid "Failed to stop collection (not active?).\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
-#, fuzzy, c-format
-msgid "Pseudonym `%s' deleted.\n"
-msgstr "Cyasibwe"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
-#, fuzzy, c-format
-msgid "Error deleting pseudonym `%s' (does not exist?).\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
-#, c-format
-msgid "Started collection `%s'.\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
-#, fuzzy, c-format
-msgid "Failed to start collection.\n"
-msgstr "Kuri Kwihuza Kuri"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
-#, fuzzy, c-format
-msgid "Could not create namespace `%s' (exists?).\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
-#, c-format
-msgid "Namespace `%s' created (root: %s).\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
-#, fuzzy, c-format
-msgid "Could not access namespace information.\n"
-msgstr "OYA bushyinguro"
-
-#: src/applications/fs/tools/gnunet-search.c:114
+#: src/applications/advertising/advertising.c:470
 #, fuzzy
-msgid "exit after receiving LIMIT results"
-msgstr "Gusohoka Nyuma Ibisubizo ku"
-
-#: src/applications/fs/tools/gnunet-search.c:116
-#, fuzzy
-msgid "write encountered (decrypted) search results to FILENAME"
-msgstr "Kwandika Gushaka Ibisubizo ku Kuri i IDOSIYE"
-
-#: src/applications/fs/tools/gnunet-search.c:118
-#, fuzzy
-msgid "wait TIMEOUT seconds for search results before aborting"
-msgstr "Tegereza amasogonda kugirango Gushaka Ibisubizo ku Mbere"
-
-#: src/applications/fs/tools/gnunet-search.c:123
-#, fuzzy
-msgid "Search GNUnet for files."
-msgstr "kugirango Idosiye"
-
-#: src/applications/fs/tools/gnunet-search.c:227
-#, fuzzy
-msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-msgstr "ingingo a Ijambo- banze Cyangwa Ikiranga"
-
-#: src/applications/fs/tools/gnunet-search.c:278
-#, fuzzy, c-format
-msgid "Starting search failed. Consult logs.\n"
-msgstr "Kuri Kongeramo"
-
-#: src/applications/fs/tools/gnunet-search.c:353
-#, c-format
-msgid "Error converting arguments to URI!\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-unindex.c:50
-#, c-format
 msgid ""
-"%16llu of %16llu bytes unindexed (estimating %llu seconds to "
-"completion)                "
-msgstr ""
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
+msgstr "Oya Ikindi Kuri RW"
 
-#: src/applications/fs/tools/gnunet-unindex.c:61
-#, c-format
-msgid ""
-"\n"
-"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
-msgstr ""
-
-#: src/applications/fs/tools/gnunet-unindex.c:72
+#: src/applications/advertising/advertising.c:572
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Error unindexing file: %s\n"
-msgstr "Kuri IDOSIYE"
+msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+msgstr "Bivuye Byarengeje igihe"
 
-#: src/applications/fs/tools/gnunet-unindex.c:97
+#: src/applications/advertising/advertising.c:734
 #, fuzzy
-msgid "Unindex files."
-msgstr "#Idosiye"
-
-#: src/applications/fs/tools/gnunet-unindex.c:149
-#, fuzzy, c-format
-msgid "You must specify one and only one file to unindex.\n"
-msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
-
-# 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
-#: src/applications/fs/tools/gnunet-unindex.c:190
-#, fuzzy, c-format
-msgid "`%s' failed.  Is `%s' a file?\n"
-msgstr "`%s'ntabwo ari idosiye"
-
-#: src/applications/gap/gap.c:1617
-#, fuzzy, c-format
-msgid "GAP received invalid content from `%s'\n"
-msgstr "Sibyo Ubutumwa Bivuye"
-
-#: src/applications/gap/gap.c:1618
-msgid "myself"
-msgstr ""
-
-#: src/applications/gap/gap.c:1791
-msgid ""
-"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
-msgstr ""
-
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
-msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
-msgstr ""
-
-#: src/applications/gap/gap.c:2077
-#, fuzzy
-msgid "# gap requests total received"
+msgid "# Peer advertisements received"
 msgstr "#BYAKIRIWE"
 
-#: src/applications/gap/gap.c:2078
-msgid "# gap requests policy: immediate drop"
+#: src/applications/advertising/advertising.c:735
+msgid "# Self advertisments transmitted"
 msgstr ""
 
-#: src/applications/gap/gap.c:2079
-msgid "# gap requests policy: not routed"
+#: src/applications/advertising/advertising.c:736
+msgid "# Foreign advertisements forwarded"
 msgstr ""
 
-#: src/applications/gap/gap.c:2080
-msgid "# gap requests policy: not answered"
+#: src/applications/advertising/advertising.c:738
+#: src/applications/pingpong/pingpong.c:462
+msgid "# plaintext PING messages sent"
 msgstr ""
 
-#: src/applications/gap/gap.c:2081
-msgid "# gap requests processed: attempted add to RT"
+#: src/applications/advertising/advertising.c:742
+#: src/applications/session/connect.c:752
+#, c-format
+msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2082
-msgid "# gap requests processed: local result"
-msgstr ""
-
-#: src/applications/gap/gap.c:2083
-msgid "# gap routing successes (total)"
-msgstr ""
-
-#: src/applications/gap/gap.c:2084
-msgid "# gap requests dropped: collision in RT"
-msgstr ""
-
-#: src/applications/gap/gap.c:2085
-msgid "# gap requests forwarded (counting each peer)"
-msgstr ""
-
-#: src/applications/gap/gap.c:2086
-msgid "# gap duplicate requests (pending)"
-msgstr ""
-
-#: src/applications/gap/gap.c:2087
+#: src/applications/advertising/advertising.c:761
 #, fuzzy
-msgid "# gap duplicate requests that were re-tried"
-msgstr "#BYAKIRIWE"
+msgid "Network advertisements disabled by configuration!\n"
+msgstr "Yahagaritswe ku Iboneza"
 
-#: src/applications/gap/gap.c:2088
-msgid "# gap re-try ttl difference (cummulative)"
-msgstr ""
-
-#: src/applications/gap/gap.c:2089
-msgid "# gap reply duplicates"
-msgstr ""
-
-#: src/applications/gap/gap.c:2090
-#, fuzzy
-msgid "# gap spurious replies"
-msgstr "#hejuru Ibibazo BYAKIRIWE"
-
-#: src/applications/gap/gap.c:2091
-msgid "# gap routing slots currently in use"
-msgstr ""
-
-#: src/applications/gap/gap.c:2092
-msgid "# gap memory used for tracking seen content"
-msgstr ""
-
-#: src/applications/gap/gap.c:2093
-msgid "# gap memory used for tracking routing destinations"
-msgstr ""
-
-#: src/applications/gap/gap.c:2094
-msgid "# gap rewards pending"
-msgstr ""
-
-#: src/applications/gap/gap.c:2095
-#, fuzzy
-msgid "# gap response weights"
-msgstr "#hejuru Ibibazo BYAKIRIWE"
-
-#: src/applications/gap/gap.c:2112
+#: src/applications/advertising/advertising.c:781
 msgid ""
-"Traffic service failed to load; gap cannot ensure cover-traffic "
-"availability.\n"
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/topology_default/topology.c:398
 #, c-format
-msgid "`%s' registering handlers %d %d\n"
+msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
 msgstr ""
 
-#: src/applications/getoption/getoption.c:75
-#, c-format
-msgid "`%s' registering client handler %d\n"
-msgstr ""
-
-#: src/applications/getoption/getoption.c:82
-#, fuzzy
-msgid "allows clients to determine gnunetd's configuration"
-msgstr "Porogaramu in Iboneza"
-
-#: src/applications/identity/hostkey.c:119
-#, fuzzy, c-format
-msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
-msgstr "in IDOSIYE Byanze Imiterere Kugenzura... Gishya"
-
-#: src/applications/identity/hostkey.c:127
-#, fuzzy
-msgid "Creating new hostkey (this may take a while).\n"
-msgstr "Gishya iyi Gicurasi a"
-
-#: src/applications/identity/hostkey.c:130
-#, fuzzy
-msgid "Could not create hostkey!\n"
-msgstr "`%s':OYA Kurema"
-
-#: src/applications/identity/hostkey.c:139
-msgid "Done creating hostkey.\n"
-msgstr ""
-
-#: src/applications/identity/identity.c:329
-#, fuzzy, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr "Idosiye in bushyinguro OYA BIHUYE"
-
-#: src/applications/identity/identity.c:362
-#, fuzzy, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "%s`%s'Oya"
-
-#: src/applications/identity/identity.c:644
-#: src/applications/identity/identity.c:662
-#, fuzzy, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
-msgstr "IDOSIYE Sibyo Ibyatanzwe"
-
-#: src/applications/identity/identity.c:712
-#, fuzzy, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
-msgstr "Shyiraho Umutekano Ikindi OYA"
-
-#: src/applications/identity/identity.c:720
-#, fuzzy
-msgid "Signature failed verification: signature invalid.\n"
-msgstr "Ubutumwa Sibyo Isinya Sibyo"
-
 #: src/applications/pingpong/pingpong.c:120
 #: src/applications/pingpong/pingpong.c:179
 #: src/applications/pingpong/pingpong.c:227
@@ -1679,65 +966,69 @@
 msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/sqstore_sqlite/sqlite.c:44
+#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_mysql/mysql.c:137
+#: src/applications/sqstore_mysql/mysql.c:144
+#: src/applications/sqstore_mysql/mysql.c:386
+#: src/applications/sqstore_mysql/mysql.c:725
+#: src/applications/sqstore_mysql/mysql.c:740
+#: src/applications/sqstore_mysql/mysql.c:749
+#: src/applications/sqstore_mysql/mysql.c:773
+#: src/applications/sqstore_mysql/mysql.c:783
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:922
+#: src/applications/sqstore_mysql/mysql.c:932
+#: src/applications/sqstore_mysql/mysql.c:1004
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1053
+#: src/applications/sqstore_mysql/mysql.c:1067
+#: src/applications/kvstore_sqlite/kv_sqlite.c:43
+#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
 #, fuzzy, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be registered: another callback is already "
-"using this name (%p)\n"
-msgstr "%s::%s-OYA ni ikoresha iyi Izina:"
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "`%s'Byanze ku Na: Ikosa"
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
-#, fuzzy, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
-"under that name: %p\n"
-msgstr "%s::%s-OYA Izina:"
+#: src/applications/sqstore_sqlite/sqlite.c:139
+#, fuzzy
+msgid "Unable to initialize SQLite.\n"
+msgstr "Kuri gutangiza"
 
-#: src/applications/rpc/rpc.c:232
-#, fuzzy, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
-msgstr "%s::%s-OYA OYA"
-
-#: src/applications/rpc/rpc.c:279
-#, fuzzy, c-format
-msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
-msgstr "%s::%s-OYA OYA"
-
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
-#, fuzzy, c-format
-msgid "Invalid message of type %u received.  Dropping.\n"
-msgstr "Ubutumwa Bya Ubwoko BYAKIRIWE"
-
-#: src/applications/rpc/rpc.c:936
-#, fuzzy, c-format
-msgid "Dropping RPC request %u: message malformed.\n"
-msgstr "Kubaza... Ubutumwa"
-
-#: src/applications/rpc/rpc.c:1388
-#, fuzzy, c-format
-msgid "RPC not unregistered: %s:%p\n"
-msgstr "OYA"
-
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/sqstore_sqlite/sqlite.c:271
+#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_mysql/mysql.c:223
+#: src/applications/sqstore_mysql/mysql.c:800
 #, c-format
-msgid "`%s' registering handlers %d %d %d\n"
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/sqstore_sqlite/sqlite.c:272
+#: src/applications/sqstore_sqlite/sqlite.c:290
+#, fuzzy
+msgid "sqlite datastore"
+msgstr "#Bayite Bya BYAKIRIWE"
+
+#: src/applications/sqstore_sqlite/sqlite.c:1035
 #, fuzzy, c-format
-msgid "Failed to initialize `%s' service.\n"
-msgstr "Kuri gutangiza Serivisi"
+msgid ""
+"Configuration file must specify directory for storing FS data in section `%"
+"s' under `%s'.\n"
+msgstr "IDOSIYE bushyinguro kugirango Ibyatanzwe in Icyiciro"
 
-#: src/applications/rpc/rpc.c:1491
+#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1178
 #, fuzzy
-msgid "RPC async reply invalid.\n"
-msgstr "Subiza Sibyo"
+msgid "# bytes in datastore"
+msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/applications/rpc/rpc.c:1562
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
 #, fuzzy
-msgid "async RPC reply not received.\n"
-msgstr "Subiza OYA BYAKIRIWE"
+msgid "Could not initialize libgnunetutil!\n"
+msgstr "OYA gutangiza Modire"
 
 #: src/applications/session/connect.c:209
 #, fuzzy, c-format
@@ -1786,39 +1077,66 @@
 msgid "# sessions established"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:57
-#: src/util/hostkey_gcrypt.c:64 src/util/storage.c:659
-#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1042 src/include/gnunet_util.h:1049
-#: src/include/gnunet_util.h:1051
+#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "`%s'Byanze ku Na: Ikosa"
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
+msgstr "%s::%s-OYA ni ikoresha iyi Izina:"
 
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#, fuzzy, c-format
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
+msgstr "%s::%s-OYA Izina:"
+
+#: src/applications/rpc/rpc.c:232
+#, fuzzy, c-format
+msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
+msgstr "%s::%s-OYA OYA"
+
+#: src/applications/rpc/rpc.c:279
+#, fuzzy, c-format
+msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
+msgstr "%s::%s-OYA OYA"
+
+#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
+#: src/applications/rpc/rpc.c:1084
+#, fuzzy, c-format
+msgid "Invalid message of type %u received.  Dropping.\n"
+msgstr "Ubutumwa Bya Ubwoko BYAKIRIWE"
+
+#: src/applications/rpc/rpc.c:936
+#, fuzzy, c-format
+msgid "Dropping RPC request %u: message malformed.\n"
+msgstr "Kubaza... Ubutumwa"
+
+#: src/applications/rpc/rpc.c:1388
+#, fuzzy, c-format
+msgid "RPC not unregistered: %s:%p\n"
+msgstr "OYA"
+
+#: src/applications/rpc/rpc.c:1414
 #, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+msgid "`%s' registering handlers %d %d %d\n"
 msgstr ""
 
+#: src/applications/rpc/rpc.c:1435
+#, fuzzy, c-format
+msgid "Failed to initialize `%s' service.\n"
+msgstr "Kuri gutangiza Serivisi"
+
+#: src/applications/rpc/rpc.c:1491
+#, fuzzy
+msgid "RPC async reply invalid.\n"
+msgstr "Subiza Sibyo"
+
+#: src/applications/rpc/rpc.c:1562
+#, fuzzy
+msgid "async RPC reply not received.\n"
+msgstr "Subiza OYA BYAKIRIWE"
+
 #: src/applications/sqstore_mysql/mysql.c:224
 #: src/applications/sqstore_mysql/mysql.c:801
 #, fuzzy
@@ -1830,12 +1148,6 @@
 msgid "Query `%s' had no results.\n"
 msgstr "Oya Ibisubizo ku"
 
-#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-#, fuzzy
-msgid "# bytes in datastore"
-msgstr "#Bayite Bya BYAKIRIWE"
-
 #: src/applications/sqstore_mysql/mysql.c:1205
 #, fuzzy, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -1847,269 +1159,91 @@
 "configured properly!\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-#, fuzzy
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "OYA gutangiza Modire"
-
-#: src/applications/sqstore_sqlite/sqlite.c:139
-#, fuzzy
-msgid "Unable to initialize SQLite.\n"
-msgstr "Kuri gutangiza"
-
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
-#, fuzzy
-msgid "sqlite datastore"
-msgstr "#Bayite Bya BYAKIRIWE"
-
-#: src/applications/sqstore_sqlite/sqlite.c:1035
+#: src/applications/datastore/filter.c:42
 #, fuzzy, c-format
 msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
-msgstr "IDOSIYE bushyinguro kugirango Ibyatanzwe in Icyiciro"
+"Configuration must specify directory for FS data in section `%s' under `%"
+"s'.\n"
+msgstr "bushyinguro kugirango Ibyatanzwe in Icyiciro"
 
-#: src/applications/stats/clientapi.c:179
-#, fuzzy
-msgid "Uptime (seconds)"
-msgstr "amasogonda"
-
-#: src/applications/stats/gnunet-stats.c:61
-#: src/applications/testbed/commands.c:1130
+#: src/applications/datastore/datastore.c:118
 #, fuzzy, c-format
-msgid "Supported peer-to-peer messages:\n"
-msgstr "Kuri Ubutumwa"
+msgid "Availability test failed for `%s' at %s:%d.\n"
+msgstr "kugirango ku"
 
-#: src/applications/stats/gnunet-stats.c:64
-#: src/applications/testbed/commands.c:1132
+#: src/applications/datastore/datastore.c:142
 #, fuzzy, c-format
-msgid "Supported client-server messages:\n"
-msgstr "Umukiriya Seriveri Ubutumwa"
+msgid "Database failed to delete `%s'.\n"
+msgstr "Kuri Ibikubiyemo"
 
-#: src/applications/stats/gnunet-stats.c:94
-#, fuzzy
-msgid "prints supported protocol messages"
-msgstr "Porotokole Ubutumwa"
-
-#: src/applications/stats/gnunet-stats.c:99
-#, fuzzy
-msgid "Print statistics about GNUnet operations."
-msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
-
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/identity/hostkey.c:98
+#: src/applications/identity/identity.c:1086
+#: src/applications/fs/fsui/file_info.c:66
 #, fuzzy, c-format
-msgid "Error establishing connection with gnunetd.\n"
-msgstr "Zimya Iyemeza Bivuye"
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s\n"
+msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/identity/hostkey.c:119
 #, fuzzy, c-format
-msgid "Error reading information from gnunetd.\n"
-msgstr "Zimya Iyemeza Bivuye"
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+msgstr "in IDOSIYE Byanze Imiterere Kugenzura... Gishya"
 
-#: src/applications/stats/statistics.c:206
-#, fuzzy, c-format
-msgid "% of allowed network load (up)"
-msgstr "%Bya urusobe Ibirimo Hejuru"
-
-#: src/applications/stats/statistics.c:208
-#, fuzzy, c-format
-msgid "% of allowed network load (down)"
-msgstr "%Bya urusobe Ibirimo Hasi"
-
-#: src/applications/stats/statistics.c:210
-#, fuzzy, c-format
-msgid "% of allowed cpu load"
-msgstr "%Bya CPU Ibirimo"
-
-#: src/applications/stats/statistics.c:214
+#: src/applications/identity/hostkey.c:127
 #, fuzzy
-msgid "# bytes of noise received"
-msgstr "#Bayite Bya BYAKIRIWE"
+msgid "Creating new hostkey (this may take a while).\n"
+msgstr "Gishya iyi Gicurasi a"
 
-#: src/applications/stats/statistics.c:372
+#: src/applications/identity/hostkey.c:130
 #, fuzzy
-msgid "keeps statistics about gnunetd's operation"
-msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
+msgid "Could not create hostkey!\n"
+msgstr "`%s':OYA Kurema"
 
-#: src/applications/tbench/gnunet-tbench.c:95
-#, fuzzy
-msgid "output in gnuplot format"
-msgstr "Ibisohoka in Imiterere"
-
-#: src/applications/tbench/gnunet-tbench.c:98
-#, fuzzy
-msgid "number of iterations"
-msgstr "Umubare Bya Amasubiramo"
-
-#: src/applications/tbench/gnunet-tbench.c:100
-#, fuzzy
-msgid "number of messages to use per iteration"
-msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
-
-#: src/applications/tbench/gnunet-tbench.c:102
-#, fuzzy
-msgid "receiver host identifier (ENC file name)"
-msgstr "Mwakirizi Ubuturo Ikiranga IDOSIYE Izina:"
-
-#: src/applications/tbench/gnunet-tbench.c:104
-#, fuzzy
-msgid "message size"
-msgstr "Ubutumwa Ingano"
-
-#: src/applications/tbench/gnunet-tbench.c:106
-#, fuzzy
-msgid "sleep for SPACE ms after each a message block"
-msgstr "kugirango Nyuma Ubutumwa"
-
-#: src/applications/tbench/gnunet-tbench.c:108
-#, fuzzy
-msgid "time to wait for the completion of an iteration (in ms)"
-msgstr "Igihe Kuri Tegereza kugirango i Bya a"
-
-#: src/applications/tbench/gnunet-tbench.c:111
-#, fuzzy
-msgid "number of messages in a message block"
-msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
-
-#: src/applications/tbench/gnunet-tbench.c:115
-#, fuzzy
-msgid "Start GNUnet transport benchmarking tool."
-msgstr "Gutangira"
-
-#: src/applications/tbench/gnunet-tbench.c:225
-#, fuzzy
-msgid "You must specify a receiver!\n"
-msgstr "a Mwakirizi"
-
-#: src/applications/tbench/gnunet-tbench.c:228
-#, fuzzy, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
-msgstr "Mwakirizi ni OYA Byemewe Izina:"
-
-#: src/applications/tbench/gnunet-tbench.c:249
-#, fuzzy, c-format
-msgid "Time:\n"
-msgstr "Igihe:"
-
-# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
-#: src/applications/tbench/gnunet-tbench.c:250
-#, fuzzy, c-format
-msgid "\tmax      %llums\n"
-msgstr "Kinini-"
-
-# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
-#: src/applications/tbench/gnunet-tbench.c:252
-#, fuzzy, c-format
-msgid "\tmin      %llums\n"
-msgstr "Gito-"
-
-# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
-#: src/applications/tbench/gnunet-tbench.c:254
-#, fuzzy, c-format
-msgid "\tmean     %8.4fms\n"
-msgstr "Impuzandengo-"
-
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TP_STAT.RBT_VARIANT.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\datstat.src:DLG_DATA_STAT.RBT_VARIANT.text
-#: src/applications/tbench/gnunet-tbench.c:256
-#, fuzzy, c-format
-msgid "\tvariance %8.4fms\n"
-msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
-
-#: src/applications/tbench/gnunet-tbench.c:259
-#, c-format
-msgid "Loss:\n"
+#: src/applications/identity/hostkey.c:139
+msgid "Done creating hostkey.\n"
 msgstr ""
 
-# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/identity/identity.c:333
 #, fuzzy, c-format
-msgid "\tmax      %u\n"
-msgstr "Kinini-"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr "Idosiye in bushyinguro OYA BIHUYE"
 
-# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
-#: src/applications/tbench/gnunet-tbench.c:262
+#: src/applications/identity/identity.c:366
 #, fuzzy, c-format
-msgid "\tmin      %u\n"
-msgstr "Gito-"
+msgid "%s `%s' returned no known hosts!\n"
+msgstr "%s`%s'Oya"
 
-# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
-#: src/applications/tbench/gnunet-tbench.c:264
+#: src/applications/identity/identity.c:648
+#: src/applications/identity/identity.c:666
 #, fuzzy, c-format
-msgid "\tmean     %8.4f\n"
-msgstr "Impuzandengo-"
+msgid "Removed file `%s' containing invalid hello data.\n"
+msgstr "IDOSIYE Sibyo Ibyatanzwe"
 
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\attrib4.src:TP_STAT.RBT_VARIANT.text
-# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
-# sch/source\ui\dlg\datstat.src:DLG_DATA_STAT.RBT_VARIANT.text
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/identity/identity.c:716
 #, fuzzy, c-format
-msgid "\tvariance %8.4f\n"
-msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
+msgid "Signature failed verification: peer `%s' not known.\n"
+msgstr "Shyiraho Umutekano Ikindi OYA"
 
-#: src/applications/tbench/gnunet-tbench.c:275
-#, fuzzy, c-format
-msgid "Output format not known, this should not happen.\n"
-msgstr "Imiterere OYA iyi OYA"
+#: src/applications/identity/identity.c:724
+#, fuzzy
+msgid "Signature failed verification: signature invalid.\n"
+msgstr "Ubutumwa Sibyo Isinya Sibyo"
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/testbed/commands.c:1130
+#: src/applications/stats/gnunet-stats.c:61
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
-msgstr "OYA Akira i Ubutumwa Bivuye"
+msgid "Supported peer-to-peer messages:\n"
+msgstr "Kuri Ubutumwa"
 
-#: src/applications/tbench/tbench.c:448
-msgid "allows profiling of direct peer-to-peer connections"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:57
-#, c-format
-msgid "Using %u messages of size %u for %u times.\n"
-msgstr ""
-
-#: src/applications/tbench/tbenchtest.c:84
-#, 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
+#: src/applications/testbed/commands.c:1132
+#: src/applications/stats/gnunet-stats.c:64
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
-msgstr "Kuri Akira Kuri Ubutumwa Bivuye"
+msgid "Supported client-server messages:\n"
+msgstr "Umukiriya Seriveri Ubutumwa"
 
-#: src/applications/tbench/tbenchtest.c:211
-#, c-format
-msgid "Running benchmark...\n"
-msgstr ""
-
-#: src/applications/template/gnunet-template.c:70
-#, fuzzy
-msgid "helptext for -t"
-msgstr "kugirango T"
-
-#: src/applications/template/gnunet-template.c:75
-#, fuzzy
-msgid "Template for gnunet-clients."
-msgstr "kugirango"
-
-#: src/applications/template/template.c:61
-#, c-format
-msgid "`%s' registering client handler %d and %d\n"
-msgstr ""
-
 #: src/applications/testbed/gnunet-testbed.c:119
 #, fuzzy
 msgid "Start GNUnet-testbed helper."
@@ -2301,10 +1435,11 @@
 msgid "No testbed URL given, not registered.\n"
 msgstr "OYA"
 
-#: src/applications/testbed/testbed.c:1054 src/transports/http.c:1455
+#: src/applications/testbed/testbed.c:1079
+#: src/applications/bootstrap_http/http.c:81
 #, fuzzy, c-format
-msgid "Could not resolve name of HTTP proxy `%s'.\n"
-msgstr "OYA Izina: Bya Porogisi"
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "Na:"
 
 #: src/applications/testbed/testbed.c:1118
 #, fuzzy, c-format
@@ -2335,31 +1470,270 @@
 msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:398
+#: src/applications/transport/transport.c:483
+#: src/applications/transport/transport.c:491
+#, fuzzy, c-format
+msgid "No transport of type %d known.\n"
+msgstr "Bya Ubwoko"
+
+#: src/applications/transport/transport.c:676
+#, fuzzy, c-format
+msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
+msgstr "OYA Gushyiraho in Iboneza in Icyiciro Igenamiterere Kuri"
+
+#: src/applications/transport/transport.c:691
+#, fuzzy, c-format
+msgid ""
+"You should specify at least one transport service under option `%s' in "
+"section `%s'.\n"
+msgstr "ku Serivisi Ihitamo in Icyiciro"
+
+#: src/applications/transport/transport.c:717
+#, fuzzy, c-format
+msgid "Transport library `%s' did not provide required function '%s%s'.\n"
+msgstr "Isomero OYA Bya ngombwa Umumaro"
+
+#: src/applications/transport/transport.c:738
 #, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
+msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:323
+#: src/applications/fragmentation/fragmentation.c:557
+#, fuzzy
+msgid "# messages defragmented"
+msgstr "#Ubutumwa"
+
+#: src/applications/fragmentation/fragmentation.c:558
+#, fuzzy
+msgid "# messages fragmented"
+msgstr "#Ubutumwa"
+
+#: src/applications/fragmentation/fragmentation.c:559
+msgid "# fragments discarded"
+msgstr ""
+
+#: src/applications/fragmentation/fragmentation.c:569
+#, c-format
+msgid "`%s' registering handler %d\n"
+msgstr ""
+
+#: src/applications/stats/gnunet-stats.c:94
+#, fuzzy
+msgid "prints supported protocol messages"
+msgstr "Porotokole Ubutumwa"
+
+#: src/applications/stats/gnunet-stats.c:99
+#, fuzzy
+msgid "Print statistics about GNUnet operations."
+msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
+
+#: src/applications/stats/gnunet-stats.c:167
 #, fuzzy, c-format
-msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
-msgstr "Bihari in i Iboneza in Icyiciro"
+msgid "Error establishing connection with gnunetd.\n"
+msgstr "Zimya Iyemeza Bivuye"
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/applications/stats/gnunet-stats.c:181
 #, fuzzy, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
+msgid "Error reading information from gnunetd.\n"
+msgstr "Zimya Iyemeza Bivuye"
 
-#: src/applications/topology_f2f/topology.c:358
-msgid "Syntax error in topology specification, skipping bytes.\n"
+#: src/applications/stats/clientapi.c:179
+#, fuzzy
+msgid "Uptime (seconds)"
+msgstr "amasogonda"
+
+#: src/applications/stats/statistics.c:206
+#, fuzzy, c-format
+msgid "% of allowed network load (up)"
+msgstr "%Bya urusobe Ibirimo Hejuru"
+
+#: src/applications/stats/statistics.c:208
+#, fuzzy, c-format
+msgid "% of allowed network load (down)"
+msgstr "%Bya urusobe Ibirimo Hasi"
+
+#: src/applications/stats/statistics.c:210
+#, fuzzy, c-format
+msgid "% of allowed cpu load"
+msgstr "%Bya CPU Ibirimo"
+
+#: src/applications/stats/statistics.c:214
+#, fuzzy
+msgid "# bytes of noise received"
+msgstr "#Bayite Bya BYAKIRIWE"
+
+#: src/applications/stats/statistics.c:374
+#, fuzzy
+msgid "keeps statistics about gnunetd's operation"
+msgstr "Sitatisitiki Ibyerekeye Ibikorwa:"
+
+#: src/applications/tbench/gnunet-tbench.c:95
+#, fuzzy
+msgid "output in gnuplot format"
+msgstr "Ibisohoka in Imiterere"
+
+#: src/applications/tbench/gnunet-tbench.c:98
+#, fuzzy
+msgid "number of iterations"
+msgstr "Umubare Bya Amasubiramo"
+
+#: src/applications/tbench/gnunet-tbench.c:100
+#, fuzzy
+msgid "number of messages to use per iteration"
+msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
+
+#: src/applications/tbench/gnunet-tbench.c:102
+#, fuzzy
+msgid "receiver host identifier (ENC file name)"
+msgstr "Mwakirizi Ubuturo Ikiranga IDOSIYE Izina:"
+
+#: src/applications/tbench/gnunet-tbench.c:104
+#, fuzzy
+msgid "message size"
+msgstr "Ubutumwa Ingano"
+
+#: src/applications/tbench/gnunet-tbench.c:106
+#, fuzzy
+msgid "sleep for SPACE ms after each a message block"
+msgstr "kugirango Nyuma Ubutumwa"
+
+#: src/applications/tbench/gnunet-tbench.c:108
+#, fuzzy
+msgid "time to wait for the completion of an iteration (in ms)"
+msgstr "Igihe Kuri Tegereza kugirango i Bya a"
+
+#: src/applications/tbench/gnunet-tbench.c:111
+#, fuzzy
+msgid "number of messages in a message block"
+msgstr "Umubare Bya Ubutumwa Kuri Gukoresha"
+
+#: src/applications/tbench/gnunet-tbench.c:115
+#, fuzzy
+msgid "Start GNUnet transport benchmarking tool."
+msgstr "Gutangira"
+
+#: src/applications/tbench/gnunet-tbench.c:225
+#, fuzzy
+msgid "You must specify a receiver!\n"
+msgstr "a Mwakirizi"
+
+#: src/applications/tbench/gnunet-tbench.c:228
+#, fuzzy, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgstr "Mwakirizi ni OYA Byemewe Izina:"
+
+#: src/applications/tbench/gnunet-tbench.c:249
+#, fuzzy, c-format
+msgid "Time:\n"
+msgstr "Igihe:"
+
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
+#: src/applications/tbench/gnunet-tbench.c:250
+#, fuzzy, c-format
+msgid "\tmax      %llums\n"
+msgstr "Kinini-"
+
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
+#: src/applications/tbench/gnunet-tbench.c:252
+#, fuzzy, c-format
+msgid "\tmin      %llums\n"
+msgstr "Gito-"
+
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
+#: src/applications/tbench/gnunet-tbench.c:254
+#, fuzzy, c-format
+msgid "\tmean     %8.4fms\n"
+msgstr "Impuzandengo-"
+
+# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
+# sch/source\ui\dlg\attrib4.src:TP_STAT.RBT_VARIANT.text
+# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
+# sch/source\ui\dlg\datstat.src:DLG_DATA_STAT.RBT_VARIANT.text
+#: src/applications/tbench/gnunet-tbench.c:256
+#, fuzzy, c-format
+msgid "\tvariance %8.4fms\n"
+msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
+
+#: src/applications/tbench/gnunet-tbench.c:259
+#, c-format
+msgid "Loss:\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:370
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MAX.text
+#: src/applications/tbench/gnunet-tbench.c:260
 #, fuzzy, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
-msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
+msgid "\tmax      %u\n"
+msgstr "Kinini-"
 
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_MIN.text
+#: src/applications/tbench/gnunet-tbench.c:262
+#, fuzzy, c-format
+msgid "\tmin      %u\n"
+msgstr "Gito-"
+
+# sc/source\ui\dbgui\pivot.src:RID_SCDLG_PIVOT_LAYOUT.PIVOTSTR_AVG.text
+#: src/applications/tbench/gnunet-tbench.c:264
+#, fuzzy, c-format
+msgid "\tmean     %8.4f\n"
+msgstr "Impuzandengo-"
+
+# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
+# sch/source\ui\dlg\attrib4.src:TP_STAT.RBT_VARIANT.text
+# #-#-#-#-#  sch.pot (PACKAGE VERSION)  #-#-#-#-#
+# sch/source\ui\dlg\datstat.src:DLG_DATA_STAT.RBT_VARIANT.text
+#: src/applications/tbench/gnunet-tbench.c:266
+#, fuzzy, c-format
+msgid "\tvariance %8.4f\n"
+msgstr "Ubwikube kabiri bw'ihindagurika ku mpuzandengo"
+
+#: src/applications/tbench/gnunet-tbench.c:275
+#, fuzzy, c-format
+msgid "Output format not known, this should not happen.\n"
+msgstr "Imiterere OYA iyi OYA"
+
+#: src/applications/tbench/gnunet-tbench.c:279
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
+msgstr "OYA Akira i Ubutumwa Bivuye"
+
+#: src/applications/tbench/tbenchtest.c:57
+#: src/applications/tbench/tbenchtest_udp.c:57
+#, c-format
+msgid "Using %u messages of size %u for %u times.\n"
+msgstr ""
+
+#: src/applications/tbench/tbenchtest.c:84
+#: src/applications/tbench/tbenchtest_udp.c:84
+#, c-format
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
+msgstr ""
+
+#: src/applications/tbench/tbenchtest.c:89
+#: src/applications/tbench/tbenchtest_udp.c:89
+#, c-format
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+msgstr ""
+
+#: src/applications/tbench/tbenchtest.c:95
+#: src/applications/tbench/tbenchtest_udp.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:211
+#: src/applications/tbench/tbenchtest_udp.c:213
+#, c-format
+msgid "Running benchmark...\n"
+msgstr ""
+
+#: src/applications/tbench/tbench.c:448
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr ""
+
 #: src/applications/tracekit/gnunet-tracekit.c:101
 #, fuzzy
 msgid "probe network to the given DEPTH"
@@ -2440,1383 +1814,1615 @@
 msgid "allows mapping of the network topology"
 msgstr "urusobe"
 
-#: src/applications/traffic/clientapi.c:67
-#, fuzzy
-msgid "Failed to query gnunetd about traffic conditions.\n"
-msgstr "Kuri Ikibazo# Ibyerekeye"
+#: src/applications/gap/gap.c:1617
+#, fuzzy, c-format
+msgid "GAP received invalid content from `%s'\n"
+msgstr "Sibyo Ubutumwa Bivuye"
 
-#: src/applications/traffic/clientapi.c:74
-#, fuzzy
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr "OYA Akira Subiza Bivuye Ibyerekeye"
+#: src/applications/gap/gap.c:1618
+msgid "myself"
+msgstr ""
 
-#: src/applications/traffic/traffic.c:445
-#, fuzzy, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "#Bayite Bya Ubwoko"
+#: src/applications/gap/gap.c:1791
+msgid ""
+"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+msgstr ""
 
-#: src/applications/traffic/traffic.c:465
-#, fuzzy, c-format
-msgid "# bytes received of type %d"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
+#, fuzzy
+msgid "Failed to get traffic stats.\n"
+msgstr "Kuri Ikibazo# Ibyerekeye"
 
-#: src/applications/traffic/traffic.c:605
-msgid "tracks bandwidth utilization by gnunetd"
+#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
+#: src/applications/gap/gap.c:1819
+msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
 msgstr ""
 
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
-#, fuzzy, c-format
-msgid "No transport of type %d known.\n"
-msgstr "Bya Ubwoko"
+#: src/applications/gap/gap.c:2077
+#, fuzzy
+msgid "# gap requests total received"
+msgstr "#BYAKIRIWE"
 
-#: src/applications/transport/transport.c:676
-#, fuzzy, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
-msgstr "OYA Gushyiraho in Iboneza in Icyiciro Igenamiterere Kuri"
+#: src/applications/gap/gap.c:2078
+msgid "# gap requests policy: immediate drop"
+msgstr ""
 
-#: src/applications/transport/transport.c:691
-#, fuzzy, c-format
-msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
-msgstr "ku Serivisi Ihitamo in Icyiciro"
+#: src/applications/gap/gap.c:2079
+msgid "# gap requests policy: not routed"
+msgstr ""
 
-#: src/applications/transport/transport.c:717
-#, fuzzy, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
-msgstr "Isomero OYA Bya ngombwa Umumaro"
+#: src/applications/gap/gap.c:2080
+msgid "# gap requests policy: not answered"
+msgstr ""
 
-#: src/applications/transport/transport.c:738
-#, c-format
-msgid "I am peer `%s'.\n"
+#: src/applications/gap/gap.c:2081
+msgid "# gap requests processed: attempted add to RT"
 msgstr ""
 
-#: src/conf/conf.c:522 src/conf/recreate.c:135
-#, fuzzy, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
-msgstr "OYA Iboneza IDOSIYE"
+#: src/applications/gap/gap.c:2082
+msgid "# gap requests processed: local result"
+msgstr ""
 
-#: src/conf/conf.c:529
-#, fuzzy, c-format
-msgid "Configuration file `%s' created.\n"
-msgstr "Gufungura Iboneza IDOSIYE"
+#: src/applications/gap/gap.c:2083
+msgid "# gap routing successes (total)"
+msgstr ""
 
-#: src/conf/confdata.c:93
-#, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
+#: src/applications/gap/gap.c:2084
+msgid "# gap requests dropped: collision in RT"
 msgstr ""
 
-#: src/conf/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
+#: src/applications/gap/gap.c:2085
+msgid "# gap requests forwarded (counting each peer)"
 msgstr ""
 
-#: src/conf/wizard.glade:10 src/conf/wizard.glade:259
-#: src/conf/wizard.glade:711 src/conf/wizard.glade:1436
-#: src/conf/wizard.glade:2217
+#: src/applications/gap/gap.c:2086
+msgid "# gap duplicate requests (pending)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2087
 #, fuzzy
-msgid "GNUnet configuration assistant"
-msgstr "A bushyinguro"
+msgid "# gap duplicate requests that were re-tried"
+msgstr "#BYAKIRIWE"
 
-#: src/conf/wizard.glade:56
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org\n";
-"and join our community at\n"
-"\thttps://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"The GNUnet team"
+#: src/applications/gap/gap.c:2088
+msgid "# gap re-try ttl difference (cummulative)"
 msgstr ""
 
-#: src/conf/wizard.glade:142 src/conf/wizard.glade:594
-#: src/conf/wizard.glade:1319 src/conf/wizard.glade:2581
-msgid "Next"
+#: src/applications/gap/gap.c:2089
+msgid "# gap reply duplicates"
 msgstr ""
 
-#: src/conf/wizard.glade:217 src/conf/wizard.glade:669
-#: src/conf/wizard.glade:1394 src/conf/wizard.glade:1928
-#: src/conf/wizard.glade:2656
-msgid "Cancel"
-msgstr "Kureka"
+#: src/applications/gap/gap.c:2090
+#, fuzzy
+msgid "# gap spurious replies"
+msgstr "#hejuru Ibibazo BYAKIRIWE"
 
-#: src/conf/wizard.glade:318
-msgid ""
-"Enter information about your network connection here.\n"
-"\n"
-"The \"Network interface\" is the device that connects your computer to the "
-"internet. This is usually a modem, an ISDN card or a network card in case "
-"you are using DSL.\n"
-"\n"
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your "
-"IP-Address.\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, check the last option on this page. Leave it "
-"unchecked on direct connections through modems, ISDN cards and DNAT (also "
-"known as \"port forwarding\")."
+#: src/applications/gap/gap.c:2091
+msgid "# gap routing slots currently in use"
 msgstr ""
 
-#: src/conf/wizard.glade:372
-msgid "Network interface:"
+#: src/applications/gap/gap.c:2092
+msgid "# gap memory used for tracking seen content"
 msgstr ""
 
-#: src/conf/wizard.glade:400
-msgid "IP-Address/Hostname:"
+#: src/applications/gap/gap.c:2093
+msgid "# gap memory used for tracking routing destinations"
 msgstr ""
 
-#: src/conf/wizard.glade:451
-msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+#: src/applications/gap/gap.c:2094
+msgid "# gap rewards pending"
 msgstr ""
 
-#: src/conf/wizard.glade:514
-msgid "Network connection"
-msgstr ""
+#: src/applications/gap/gap.c:2095
+#, fuzzy
+msgid "# gap response weights"
+msgstr "#hejuru Ibibazo BYAKIRIWE"
 
-#: src/conf/wizard.glade:770
+#: src/applications/gap/gap.c:2112
 msgid ""
-"You can limit GNUnet's ressource usage here.\n"
-"\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you "
-"have a flatrate you can set it to the maximum speed of your internet "
-"connection.\n"
-"\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
-"to use."
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:833
-msgid "Upstream (Bytes/s):"
+#: src/applications/gap/gap.c:2143
+#, c-format
+msgid "`%s' registering handlers %d %d\n"
 msgstr ""
 
-#: src/conf/wizard.glade:883
-msgid "Downstream (Bytes/s):"
+#: src/applications/gap/pid_table.c:151
+msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/conf/wizard.glade:942
-msgid "Bandwidth limitation"
+#: src/applications/gap/pid_table.c:153
+msgid "# total RC of interned peer IDs in pid table"
 msgstr ""
 
-#: src/conf/wizard.glade:986
-msgid "Use denoted bandwidth for GNUnet"
+#: src/applications/getoption/getoption.c:75
+#, c-format
+msgid "`%s' registering client handler %d\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1006
-msgid "Share denoted bandwidth with other applications"
-msgstr ""
+#: src/applications/getoption/getoption.c:82
+#, fuzzy
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "Porogaramu in Iboneza"
 
-#: src/conf/wizard.glade:1028
-msgid "Bandwidth sharing"
-msgstr ""
+#: src/applications/fs/tools/gnunet-pseudonym.c:33
+#: src/applications/fs/tools/gnunet-insert.c:206
+#, fuzzy
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "Gushyiraho i Bya Mwakirizi"
 
-#: src/conf/wizard.glade:1071
-msgid "Max. CPU usage (%):"
-msgstr ""
+#: src/applications/fs/tools/gnunet-pseudonym.c:35
+#, fuzzy
+msgid "automate creation of a namespace by starting a collection"
+msgstr "Bya a ku a"
 
-#: src/conf/wizard.glade:1118
-msgid "CPU usage"
-msgstr ""
+#: src/applications/fs/tools/gnunet-pseudonym.c:38
+#, fuzzy
+msgid "create a new pseudonym under the given NICKNAME"
+msgstr "Gusiba i Na: i"
 
-#: src/conf/wizard.glade:1164
-msgid "Load limitation"
-msgstr ""
+#: src/applications/fs/tools/gnunet-pseudonym.c:40
+#, fuzzy
+msgid "delete the pseudonym with the given NICKNAME"
+msgstr "Gusiba i Na: i"
 
-#: src/conf/wizard.glade:1244 src/conf/wizard.glade:1778
-#: src/conf/wizard.glade:2506
-msgid "Back"
-msgstr ""
+#: src/applications/fs/tools/gnunet-pseudonym.c:42
+#, fuzzy
+msgid "end automated building of a namespace (ends collection)"
+msgstr "Impera Bya a"
 
-#: src/conf/wizard.glade:1495
+#: src/applications/fs/tools/gnunet-pseudonym.c:46
+#, fuzzy
 msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is "
-"useful if an adversary has access to your inserted content and you need to "
-"deny that the content is yours. With \"content migration\" on, the content "
-"could have \"migrated\" over the internet to your node without your "
-"knowledge.\n"
-"It also helps to spread popular content over different peers to enhance "
-"availability.\n"
-"\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, "
-"inserted and migrated content). Its maximum size can be specified below.\n"
-"\n"
-"If you are an experienced user, you may want to tweak your GNUnet "
-"installation using the enhanced configurator.\n"
-"\n"
-"After changing the configuration and/or updating GNUnet, it is sometimes "
-"required to run gnunet-update to update internal data structures. Depending "
-"on the changes made, this may take some time."
-msgstr ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
+msgstr "Gukoresha i Ijambo- banze Kuri i Gukoresha Ryari: a Gishya"
 
-#: src/conf/wizard.glade:1541
+#: src/applications/fs/tools/gnunet-pseudonym.c:48
 #, fuzzy
-msgid "Store migrated content"
-msgstr "#GUSHAKISHA Byinjijwemo Cyangwa Ibikubiyemo"
+msgid ""
+"specify that the contents of the namespace are of the given MIMETYPE (use "
+"when creating a new pseudonym)"
+msgstr "i Ibigize Bya i Bya i Gukoresha Ryari: a Gishya"
 
-#: src/conf/wizard.glade:1566
-msgid "Maximum datastore size (MB):"
-msgstr ""
+#: src/applications/fs/tools/gnunet-pseudonym.c:50
+#, fuzzy
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
+msgstr "OYA kugirango iyi Gukoresha Ryari: a Gishya"
 
-#: src/conf/wizard.glade:1621
-msgid "Start the GNUnet background process on computer startup"
-msgstr ""
+#: src/applications/fs/tools/gnunet-pseudonym.c:52
+#, fuzzy
+msgid "do not list the pseudonyms from the pseudonym database"
+msgstr "OYA Urutonde i Bivuye i Ububikoshingiro"
 
-#: src/conf/wizard.glade:1642
+#: src/applications/fs/tools/gnunet-pseudonym.c:54
 #, fuzzy
-msgid "Open the enhanced configurator"
-msgstr "A bushyinguro"
+msgid ""
+"specify NAME to be the realname of the user controlling the namespace (use "
+"when creating a new pseudonym)"
+msgstr "Kuri i Bya i Ukoresha: i Gukoresha Ryari: a Gishya"
 
-#: src/conf/wizard.glade:1663
-msgid "Run gnunet-update"
-msgstr ""
+#: src/applications/fs/tools/gnunet-pseudonym.c:56
+#, fuzzy
+msgid ""
+"specify IDENTIFIER to be the address of the entrypoint to content in the "
+"namespace (use when creating a new pseudonym)"
+msgstr "Kuri i Aderesi Bya i Kuri Ibikubiyemo in i Gukoresha Ryari: a Gishya"
 
-#: src/conf/wizard.glade:1698 src/conf/wizard.glade:2426
-msgid "Other settings"
+#: src/applications/fs/tools/gnunet-pseudonym.c:58
+msgid "set the rating of a namespace"
 msgstr ""
 
-#: src/conf/wizard.glade:1853
-msgid "Finish"
+#: src/applications/fs/tools/gnunet-pseudonym.c:60
+#, fuzzy
+msgid ""
+"use DESCRIPTION to describe the content of the namespace (use when creating "
+"a new pseudonym)"
+msgstr "Gukoresha Kuri i Ibikubiyemo Bya i Gukoresha Ryari: a Gishya"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:62
+#, fuzzy
+msgid ""
+"specify the given URI as an address that contains more information about the "
+"namespace (use when creating a new pseudonym)"
 msgstr ""
+"i Nka Aderesi Kirimo Birenzeho Ibisobanuro Ibyerekeye i Gukoresha Ryari: a "
+"Gishya"
 
-#: src/conf/wizard.glade:1968
+#: src/applications/fs/tools/gnunet-pseudonym.c:67
 #, fuzzy
-msgid "Question"
-msgstr "Insobanuramiterere"
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr "Gishya Gusiba Cyangwa Urutonde"
 
-#: src/conf/wizard.glade:2014
-msgid "Do you want to save your settings?"
+#: src/applications/fs/tools/gnunet-pseudonym.c:159
+#: src/applications/fs/tools/gnunet-pseudonym.c:164
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
+#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
+msgid "AND"
 msgstr ""
 
-#: src/conf/wizard.glade:2065
-#, fuzzy
-msgid "Yes"
-msgstr "Yego"
+#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#, fuzzy, c-format
+msgid "Invalid argument: `%s'\n"
+msgstr "Inkoresha siyo"
 
-#: src/conf/wizard.glade:2078
+#: src/applications/fs/tools/gnunet-pseudonym.c:241
+#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
+#: src/setup/gnunet-setup.c:179
 #, fuzzy
-msgid "No"
-msgstr "Oya."
+msgid "Invalid arguments. Exiting.\n"
+msgstr "ingingo"
 
-#: src/conf/wizard.glade:2098 src/conf/wizard.glade:2696
-#: src/conf/wizard_curs.c:58 src/conf/wizard_util.c:120
-#: src/conf/wizard_util.c:163 src/util/configuration.c:522
-msgid "Error"
-msgstr ""
+#: src/applications/fs/tools/gnunet-pseudonym.c:282
+#, fuzzy, c-format
+msgid "Namespace `%s' has rating %d.\n"
+msgstr "Igisubizo ni i"
 
-#: src/conf/wizard.glade:2144
-msgid "Unable to save configuration!"
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#, fuzzy, c-format
+msgid "Namespace `%s' (%s) has rating %d.\n"
+msgstr "Igisubizo ni i"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#, fuzzy, c-format
+msgid "\tRating (after update): %d\n"
+msgstr "Nyuma"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#, fuzzy, c-format
+msgid "Collection stopped.\n"
+msgstr "Kyahagariswe"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#, c-format
+msgid "Failed to stop collection (not active?).\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2195 src/conf/wizard.glade:2793
-msgid "OK"
+#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#, fuzzy, c-format
+msgid "Pseudonym `%s' deleted.\n"
+msgstr "Cyasibwe"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#, fuzzy, c-format
+msgid "Error deleting pseudonym `%s' (does not exist?).\n"
 msgstr ""
+"Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/conf/wizard.glade:2276
-msgid ""
-"Define the user and the group owning the GNUnet service here.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new user "
-"account and a new group under which the GNUnet service is started at system "
-"startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the fields empty to run GNUnet with system privileges."
+#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#, c-format
+msgid "Started collection `%s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2317
-msgid "Group:"
+#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#, fuzzy, c-format
+msgid "Failed to start collection.\n"
+msgstr "Kuri Kwihuza Kuri"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#, fuzzy, c-format
+msgid "Could not create namespace `%s' (exists?).\n"
 msgstr ""
+"Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/conf/wizard.glade:2389
-msgid "User account:"
+#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#, c-format
+msgid "Namespace `%s' created (root: %s).\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2742
+#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#, fuzzy, c-format
+msgid "Could not access namespace information.\n"
+msgstr "OYA bushyinguro"
+
+#: src/applications/fs/tools/gnunet-delete.c:37
+#, fuzzy, c-format
+msgid "%8u of %8u bytes deleted."
+msgstr "%8uBya Bayite Cyasibwe"
+
+#: src/applications/fs/tools/gnunet-delete.c:52
 #, fuzzy
-msgid "gnunet-update failed!"
-msgstr "/Idosiye IDOSIYE"
+msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
+msgstr "i IDOSIYE Kuri Gusiba Bivuye IDOSIYE"
 
-#: src/conf/wizard.glade:2813
+#: src/applications/fs/tools/gnunet-delete.c:61
 #, fuzzy
-msgid "Gtk GNUnet Configurator"
-msgstr "A bushyinguro"
+msgid ""
+"Remove file from GNUnet.  The specified file is not removed\n"
+"from the filesystem but just from the local GNUnet datastore."
+msgstr "IDOSIYE Bivuye IDOSIYE ni OYA i Bivuye i"
 
-#: src/conf/wizard.glade:2847
+#: src/applications/fs/tools/gnunet-delete.c:139
 #, fuzzy
-msgid "_File"
-msgstr "/Idosiye"
+msgid "You must specify a filename (option -f)\n"
+msgstr "a Izina ry'idosiye: Ihitamo F"
 
-#: src/conf/wizard.glade:2856 src/conf/wizard.glade:3189
-msgid "Load a config file"
-msgstr ""
+#: src/applications/fs/tools/gnunet-delete.c:151
+#, fuzzy, c-format
+msgid ""
+"Error deleting file %s.\n"
+"Probably a few blocks were already missing from the database.\n"
+msgstr "IDOSIYE a Ibuze Bivuye i Ububikoshingiro"
 
-#: src/conf/wizard.glade:2857
-msgid "_Load"
-msgstr ""
+#: src/applications/fs/tools/gnunet-directory.c:76
+#, fuzzy, c-format
+msgid "==> Directory `%s':\n"
+msgstr "==>ububiko"
 
-#: src/conf/wizard.glade:2879
-msgid "Save the config in .config"
+#: src/applications/fs/tools/gnunet-directory.c:81
+#, c-format
+msgid "=\tError reading directory.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2880
-msgid "_Save"
-msgstr ""
+#: src/applications/fs/tools/gnunet-directory.c:111
+#, fuzzy, c-format
+msgid "File format error (not a GNUnet directory?)\n"
+msgstr "IDOSIYE Cyangwa Sibyo Imiterere kugirango bushyinguro"
 
-#: src/conf/wizard.glade:2908
+#: src/applications/fs/tools/gnunet-directory.c:113
+#, fuzzy, c-format
+msgid "%d files found in directory.\n"
+msgstr "IDOSIYE Kuri bushyinguro"
+
+#: src/applications/fs/tools/gnunet-directory.c:131
 #, fuzzy
-msgid "_Quit"
-msgstr "/Idosiye"
+msgid "remove all entries from the directory database and stop tracking URIs"
+msgstr "Gukuraho... Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/conf/wizard.glade:2934
+#: src/applications/fs/tools/gnunet-directory.c:133
 #, fuzzy
-msgid "_Options"
-msgstr "ibirindiro"
+msgid "list entries from the directory database"
+msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/conf/wizard.glade:2943
-msgid "Show name"
-msgstr ""
+#: src/applications/fs/tools/gnunet-directory.c:136
+#, fuzzy
+msgid "start tracking entries for the directory database"
+msgstr "Urutonde Byose Ibyinjijwe Bivuye i bushyinguro Ububikoshingiro"
 
-#: src/conf/wizard.glade:2944
-msgid "Show _name"
+#: src/applications/fs/tools/gnunet-directory.c:140
+msgid "gnunet-directory [OPTIONS] [FILENAMES]"
 msgstr ""
 
-#: src/conf/wizard.glade:2954
-msgid "Show range (Y/M/N)"
-msgstr ""
+#: src/applications/fs/tools/gnunet-directory.c:141
+#, fuzzy
+msgid "Perform directory related operations."
+msgstr "bushyinguro Ibikorwa:"
 
-#: src/conf/wizard.glade:2955
-msgid "Show _range"
+#: src/applications/fs/tools/gnunet-directory.c:206
+#, fuzzy, c-format
+msgid "Listed %d matching entries.\n"
+msgstr "Ibyinjijwe"
+
+#: src/applications/fs/tools/gnunet-insert.c:110
+#, fuzzy, c-format
+msgid "Created entry `%s' in namespace `%s'\n"
+msgstr "Ikiranga"
+
+#: src/applications/fs/tools/gnunet-insert.c:115
+#, fuzzy, c-format
+msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
 msgstr ""
+"Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/conf/wizard.glade:2965
-msgid "Show value of the option"
+#: src/applications/fs/tools/gnunet-insert.c:136
+#, c-format
+msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2966
-msgid "Show _data"
+#: src/applications/fs/tools/gnunet-insert.c:150
+#, fuzzy, c-format
+msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
+msgstr "ku Inyuma Bya Bayite"
+
+#: src/applications/fs/tools/gnunet-insert.c:164
+#, fuzzy, c-format
+msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
+msgstr "ISEGONDA"
+
+#: src/applications/fs/tools/gnunet-insert.c:174
+#, fuzzy, c-format
+msgid "File `%s' has URI: %s\n"
+msgstr "Idosiye Nka"
+
+#: src/applications/fs/tools/gnunet-insert.c:187
+#, c-format
+msgid ""
+"\n"
+"Error uploading file: %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2982
-msgid "Show all options"
+#: src/applications/fs/tools/gnunet-insert.c:209
+#, fuzzy
+msgid ""
+"even if gnunetd is running on the local machine, force the creation of a "
+"copy instead of making a link to the GNUnet share directory"
+msgstr "NIBA ni ku i Kurema a Ihuza Bya a Gukoporora in i bushyinguro"
+
+#: src/applications/fs/tools/gnunet-insert.c:212
+msgid ""
+"use libextractor to add additional direct references to directory entries"
 msgstr ""
 
-#: src/conf/wizard.glade:2983
-msgid "Show all _options"
+#: src/applications/fs/tools/gnunet-insert.c:214
+#, fuzzy
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
+"Gucapa Urutonde Bya Amagambo fatizo OYA Iyinjizamo Cyangwa gushyiraho "
+"umugereka"
 
-# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/conf/wizard.glade:2997
+#: src/applications/fs/tools/gnunet-insert.c:218
 #, fuzzy
-msgid "_Help"
-msgstr "/Kugoboka"
+msgid ""
+"set interval for availability of updates to SECONDS (for namespace "
+"insertions only)"
+msgstr "Gushyiraho Intera kugirango Ukuboneka Bya Kuri kugirango Amayongeramo"
 
-#: src/conf/wizard.glade:3006
-msgid "_Introduction"
+#: src/applications/fs/tools/gnunet-insert.c:221
+#, fuzzy
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
 msgstr ""
+"Kongeramo Ijambo- banze kugirango i Hejuru: urwego IDOSIYE Cyangwa "
+"bushyinguro iyi Ihitamo Igikubo Times"
 
-# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
-#: src/conf/wizard.glade:3028
+#: src/applications/fs/tools/gnunet-insert.c:224
 #, fuzzy
-msgid "_About"
-msgstr "Ibyerekeye"
+msgid ""
+"add an additional keyword for all files and directories (this option can be "
+"specified multiple times)"
+msgstr ""
+"Kongeramo Ijambo- banze kugirango Byose Idosiye Na ububiko bw'amaderese iyi "
+"Ihitamo Igikubo Times"
 
-#: src/conf/wizard.glade:3083
-msgid "Goes up of one level (single view)"
+#: src/applications/fs/tools/gnunet-insert.c:228
+msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/conf/wizard.glade:3126
-msgid "Up"
+#: src/applications/fs/tools/gnunet-insert.c:230
+#, fuzzy
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
+"OYA Umubarendanga Iyinjizamo IDOSIYE in Bishunzwe: Ifishi in Ububikoshingiro"
 
-#: src/conf/wizard.glade:3232
-msgid "Load"
+#: src/applications/fs/tools/gnunet-insert.c:233
+#, fuzzy
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr "Bya Verisiyo Kuri in i kugirango Amayongeramo"
+
+#: src/applications/fs/tools/gnunet-insert.c:236
+#, fuzzy
+msgid "specify the priority of the content"
+msgstr "i By'ibanze Bya i Ibikubiyemo"
+
+#: src/applications/fs/tools/gnunet-insert.c:238
+#, fuzzy
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
+msgstr "Tangaza i Idosiye i IDOSIYE"
+
+#: src/applications/fs/tools/gnunet-insert.c:240
+#, fuzzy
+msgid "process directories recursively"
+msgstr "ububiko bw'amaderese"
+
+#: src/applications/fs/tools/gnunet-insert.c:242
+#, fuzzy
+msgid ""
+"specifies this as an aperiodic but updated publication (for namespace "
+"insertions only)"
+msgstr "iyi Nka kugirango Amayongeramo"
+
+#: src/applications/fs/tools/gnunet-insert.c:245
+#, fuzzy
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+msgstr "Gushyiraho i Bya iyi Verisiyo Bya i kugirango Amayongeramo"
+
+#: src/applications/fs/tools/gnunet-insert.c:248
+#, fuzzy
+msgid "specify creation time for SBlock (see man-page for format)"
+msgstr "Igihe kugirango Ipaji kugirango Imiterere"
+
+#: src/applications/fs/tools/gnunet-insert.c:250
+#, fuzzy
+msgid "ID of the previous version of the content (for namespace update only)"
 msgstr ""
+"Izina ry'idosiye: Bya i Bya a Ibanjirije Verisiyo Bya i Ibikubiyemo "
+"kugirango Amayongeramo"
 
-#: src/conf/wizard.glade:3276
-msgid "Save a config file"
+#: src/applications/fs/tools/gnunet-insert.c:257
+#, fuzzy
+msgid "Make files available to GNUnet for sharing."
+msgstr "Idosiye Bihari Kuri kugirango Bisangiwe"
+
+#: src/applications/fs/tools/gnunet-insert.c:344
+#, fuzzy, c-format
+msgid "You must pass a positive number to the `%s' option.\n"
+msgstr "a Umubare Kuri i Ihitamo"
+
+#: src/applications/fs/tools/gnunet-insert.c:429
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3319
-msgid "Save"
+#: src/applications/fs/tools/gnunet-insert.c:537
+#: src/applications/fs/tools/gnunet-unindex.c:145
+#, fuzzy, c-format
+msgid "You must specify a list of files to insert.\n"
+msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
+
+#: src/applications/fs/tools/gnunet-insert.c:541
+#, c-format
+msgid "Only one file or directory can be specified at a time.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3382
-msgid "Single view"
+#: src/applications/fs/tools/gnunet-insert.c:545
+#, fuzzy, c-format
+msgid "You must specify a file or directory to upload.\n"
+msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
+
+#: src/applications/fs/tools/gnunet-insert.c:595
+#, fuzzy, c-format
+msgid "Keywords for file `%s':\n"
+msgstr "kugirango IDOSIYE"
+
+#: src/applications/fs/tools/gnunet-insert.c:617
+#, fuzzy, c-format
+msgid "Could not access namespace `%s' (does not exist?).\n"
 msgstr ""
+"Project- Id- Version: basctl\n"
+"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
+"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
+"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
+"Content- Type: text/ plain; charset= UTF- 8\n"
+"Content- Transfer- Encoding: 8bit\n"
+"X- Generator: KBabel 1. 0\n"
+"."
 
-#: src/conf/wizard.glade:3425
+#: src/applications/fs/tools/gnunet-insert.c:636
+#, fuzzy, c-format
+msgid "Parsing time failed. Use `%s' format.\n"
+msgstr "Igihe Byanze Imiterere"
+
+#: src/applications/fs/tools/gnunet-insert.c:649
+#: src/applications/fs/tools/gnunet-insert.c:653
+#: src/applications/fs/tools/gnunet-insert.c:657
+#: src/applications/fs/tools/gnunet-insert.c:661
+#: src/applications/fs/tools/gnunet-insert.c:666
+#, fuzzy, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
+msgstr "Oya Ihitamo"
+
+#: src/applications/fs/tools/gnunet-search.c:108
+#: src/applications/fs/tools/gnunet-download.c:42
 #, fuzzy
-msgid "Single"
-msgstr "Idosiye "
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "Gushyiraho i Bya Mwakirizi"
 
-#: src/conf/wizard.glade:3469
-msgid "Split view"
-msgstr ""
+#: src/applications/fs/tools/gnunet-search.c:114
+#, fuzzy
+msgid "exit after receiving LIMIT results"
+msgstr "Gusohoka Nyuma Ibisubizo ku"
 
-#: src/conf/wizard.glade:3512
-msgid "Split"
-msgstr ""
+#: src/applications/fs/tools/gnunet-search.c:116
+#, fuzzy
+msgid "write encountered (decrypted) search results to FILENAME"
+msgstr "Kwandika Gushaka Ibisubizo ku Kuri i IDOSIYE"
 
-#: src/conf/wizard.glade:3556
+#: src/applications/fs/tools/gnunet-search.c:118
 #, fuzzy
-msgid "Full view"
-msgstr "Iyinjizamo"
+msgid "wait TIMEOUT seconds for search results before aborting"
+msgstr "Tegereza amasogonda kugirango Gushaka Ibisubizo ku Mbere"
 
-#: src/conf/wizard.glade:3599
-msgid "Full"
-msgstr ""
+#: src/applications/fs/tools/gnunet-search.c:123
+#, fuzzy
+msgid "Search GNUnet for files."
+msgstr "kugirango Idosiye"
 
-#: src/conf/wizard.glade:3662
-msgid "Collapse the whole tree in the right frame"
+#: src/applications/fs/tools/gnunet-search.c:227
+#, fuzzy
+msgid "Not enough arguments. You must specify a keyword or identifier.\n"
+msgstr "ingingo a Ijambo- banze Cyangwa Ikiranga"
+
+#: src/applications/fs/tools/gnunet-search.c:278
+#, fuzzy, c-format
+msgid "Starting search failed. Consult logs.\n"
+msgstr "Kuri Kongeramo"
+
+#: src/applications/fs/tools/gnunet-search.c:353
+#, c-format
+msgid "Error converting arguments to URI!\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3705
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Table.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Frame.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.WriterObject.Graphic.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Calc.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Draw.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Chart.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Image.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Formula.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.Impress.Settings.Level.text
+# #-#-#-#-#  officecfg.pot (PACKAGE VERSION)  #-#-#-#-#
+# 
officecfg/registry\schema\org\openoffice\Office\Writer.xcs:....Insert.Caption.OfficeObject.OLEMisc.Settings.Level.text
+#: src/applications/fs/tools/gnunet-download.c:41
 #, fuzzy
-msgid "Collapse"
-msgstr "Gufunga"
+msgid "LEVEL"
+msgstr "urwego"
 
-#: src/conf/wizard.glade:3749
-msgid "Expand the whole tree in the right frame"
+#: src/applications/fs/tools/gnunet-download.c:47
+#, fuzzy
+msgid "FILENAME"
+msgstr "Izina ry'idosiye"
+
+#: src/applications/fs/tools/gnunet-download.c:48
+#, fuzzy
+msgid "write the file to FILENAME"
+msgstr "Kwandika i IDOSIYE Kuri"
+
+#: src/applications/fs/tools/gnunet-download.c:50
+#, fuzzy
+msgid "download a GNUnet directory recursively"
+msgstr "Gufungura a bushyinguro"
+
+#: src/applications/fs/tools/gnunet-download.c:56
+#, fuzzy
+msgid "Download files from GNUnet."
+msgstr "Idosiye Bivuye"
+
+#: src/applications/fs/tools/gnunet-download.c:136
+#, fuzzy
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr "ingingo a"
+
+#: src/applications/fs/tools/gnunet-download.c:159
+#, fuzzy, c-format
+msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
+msgstr "ku Inyuma Bya Bayite"
+
+#: src/applications/fs/tools/gnunet-download.c:172
+#: src/applications/fs/tools/gnunet-download.c:183
+#, c-format
+msgid "Error downloading: %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3792
-msgid "Expand"
+#: src/applications/fs/tools/gnunet-download.c:191
+#, fuzzy, c-format
+msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
+msgstr "ISEGONDA"
+
+#: src/applications/fs/tools/gnunet-download.c:237
+#, fuzzy, c-format
+msgid "URI `%s' invalid for gnunet-download.\n"
+msgstr "Sibyo"
+
+#: src/applications/fs/tools/gnunet-download.c:288
+#, fuzzy, c-format
+msgid "File stored as `%s'.\n"
+msgstr "Idosiye Nka"
+
+#: src/applications/fs/tools/gnunet-unindex.c:50
+#, c-format
+msgid ""
+"%16llu of %16llu bytes unindexed (estimating %llu seconds to "
+"completion)                "
 msgstr ""
 
-#: src/conf/wizard.glade:3935
+#: src/applications/fs/tools/gnunet-unindex.c:61
+#, fuzzy, c-format
 msgid ""
-"This is GNUnet's configuration interface.\n"
 "\n"
-"GNUnet's options are separated into categories. You can browse them in the "
-"left tree. If you click on one of the categories, its options are shown "
-"above. \n"
+"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
+msgstr "ku Inyuma Bya Bayite"
+
+#: src/applications/fs/tools/gnunet-unindex.c:72
+#, fuzzy, c-format
+msgid ""
 "\n"
-"To change the value of an option, simply click on its value and enter a new "
-"value. To get additional information about a specific option, click on its "
-"description."
+"Error unindexing file: %s\n"
+msgstr "Kuri IDOSIYE"
+
+#: src/applications/fs/tools/gnunet-unindex.c:97
+#, fuzzy
+msgid "Unindex files."
+msgstr "#Idosiye"
+
+#: src/applications/fs/tools/gnunet-unindex.c:149
+#, fuzzy, c-format
+msgid "You must specify one and only one file to unindex.\n"
+msgstr "a Urutonde Bya Idosiye Kuri Kongeramo"
+
+# 
uui/source\ids.src:RID_UUI_ERRHDL.(ERRCODE_UUI_IO_NOTAFILE_&_ERRCODE_RES_MASK).text
+#: src/applications/fs/tools/gnunet-unindex.c:190
+#, fuzzy, c-format
+msgid "`%s' failed.  Is `%s' a file?\n"
+msgstr "`%s'ntabwo ari idosiye"
+
+#: src/applications/fs/module/ondemand.c:305
+#, c-format
+msgid "Indexed file disappeared, deleting block for query `%s'\n"
 msgstr ""
 
-#: src/conf/wizard.glade:3967
-msgid "Introduction"
+#: src/applications/fs/module/ondemand.c:393
+#, c-format
+msgid ""
+"Because the file `%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!\n"
 msgstr ""
 
-#: src/conf/wizard.glade:4043
+#: src/applications/fs/module/ondemand.c:419
+#, fuzzy, c-format
 msgid ""
-"Welcome to GNUnet Setup.\n"
-"\n"
-"For each option, a blank box indicates the feature is disabled, and checked "
-"one indicates it is enabled.\n"
-"If you do not see an option that you believe should be present, try turning "
-"on Show All Options under the Options menu.\n"
-"\n"
-"Although there is no cross reference yet to help you figure out what other "
-"options must be enabled to support the option you are interested in, you can "
-"still view the help of a grayed-out option.\n"
-"\n"
-"Toggling Show Debug Info under the Options menu will show the dependencies, "
-"which you can then match by examining other options."
+"Configuration file must specify directory for storage of FS data in section `"
+"%s' under `%s'.\n"
+msgstr "IDOSIYE bushyinguro kugirango Bya Ibyatanzwe in Icyiciro"
+
+#: src/applications/fs/module/ondemand.c:617
+#, c-format
+msgid ""
+"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:4067
-msgid "gnunet-setup"
+#: src/applications/fs/module/fs.c:1184
+#, fuzzy, c-format
+msgid ""
+"You must specify a postive number for `%s' in the configuration in section `%"
+"s'.\n"
+msgstr "a Umubare kugirango in i Iboneza in Icyiciro"
+
+#: src/applications/fs/module/fs.c:1233
+#, c-format
+msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/conf/wizard.glade:4068
-msgid "(C) 2001-2006 Christian Grothoff (and other contributing authors)"
+#: src/applications/fs/module/fs.c:1270
+msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/conf/wizard.glade:4069
-msgid "This is the configuration tool for GNUnet."
+#: src/applications/fs/module/migration.c:224
+msgid "# blocks migrated"
 msgstr ""
 
-#: src/conf/wizard.glade:4070
-msgid ""
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"\t\t       Version 2, June 1991\n"
-"\n"
-" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
-"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-" Everyone is permitted to copy and distribute verbatim copies\n"
-" of this license document, but changing it is not allowed.\n"
-"\n"
-"\t\t\t    Preamble\n"
-"\n"
-"  The licenses for most software are designed to take away your\n"
-"freedom to share and change it.  By contrast, the GNU General Public\n"
-"License is intended to guarantee your freedom to share and change free\n"
-"software--to make sure the software is free for all its users.  This\n"
-"General Public License applies to most of the Free Software\n"
-"Foundation's software and to any other program whose authors commit to\n"
-"using it.  (Some other Free Software Foundation software is covered by\n"
-"the GNU Library General Public License instead.)  You can apply it to\n"
-"your programs, too.\n"
-"\n"
-"  When we speak of free software, we are referring to freedom, not\n"
-"price.  Our General Public Licenses are designed to make sure that you\n"
-"have the freedom to distribute copies of free software (and charge for\n"
-"this service if you wish), that you receive source code or can get it\n"
-"if you want it, that you can change the software or use pieces of it\n"
-"in new free programs; and that you know you can do these things.\n"
-"\n"
-"  To protect your rights, we need to make restrictions that forbid\n"
-"anyone to deny you these rights or to ask you to surrender the rights.\n"
-"These restrictions translate to certain responsibilities for you if you\n"
-"distribute copies of the software, or if you modify it.\n"
-"\n"
-"  For example, if you distribute copies of such a program, whether\n"
-"gratis or for a fee, you must give the recipients all the rights that\n"
-"you have.  You must make sure that they, too, receive or can get the\n"
-"source code.  And you must show them these terms so they know their\n"
-"rights.\n"
-"\n"
-"  We protect your rights with two steps: (1) copyright the software, and\n"
-"(2) offer you this license which gives you legal permission to copy,\n"
-"distribute and/or modify the software.\n"
-"\n"
-"  Also, for each author's protection and ours, we want to make certain\n"
-"that everyone understands that there is no warranty for this free\n"
-"software.  If the software is modified by someone else and passed on, we\n"
-"want its recipients to know that what they have is not the original, so\n"
-"that any problems introduced by others will not reflect on the original\n"
-"authors' reputations.\n"
-"\n"
-"  Finally, any free program is threatened constantly by software\n"
-"patents.  We wish to avoid the danger that redistributors of a free\n"
-"program will individually obtain patent licenses, in effect making the\n"
-"program proprietary.  To prevent this, we have made it clear that any\n"
-"patent must be licensed for everyone's free use or not licensed at all.\n"
-"\n"
-"  The precise terms and conditions for copying, distribution and\n"
-"modification follow.\n"
-"\n"
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
-"\n"
-"  0. This License applies to any program or other work which contains\n"
-"a notice placed by the copyright holder saying it may be distributed\n"
-"under the terms of this General Public License.  The \"Program\", below,\n"
-"refers to any such program or work, and a \"work based on the Program\"\n"
-"means either the Program or any derivative work under copyright law:\n"
-"that is to say, a work containing the Program or a portion of it,\n"
-"either verbatim or with modifications and/or translated into another\n"
-"language.  (Hereinafter, translation is included without limitation in\n"
-"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
-"\n"
-"Activities other than copying, distribution and modification are not\n"
-"covered by this License; they are outside its scope.  The act of\n"
-"running the Program is not restricted, and the output from the Program\n"
-"is covered only if its contents constitute a work based on the\n"
-"Program (independent of having been made by running the Program).\n"
-"Whether that is true depends on what the Program does.\n"
-"\n"
-"  1. You may copy and distribute verbatim copies of the Program's\n"
-"source code as you receive it, in any medium, provided that you\n"
-"conspicuously and appropriately publish on each copy an appropriate\n"
-"copyright notice and disclaimer of warranty; keep intact all the\n"
-"notices that refer to this License and to the absence of any warranty;\n"
-"and give any other recipients of the Program a copy of this License\n"
-"along with the Program.\n"
-"\n"
-"You may charge a fee for the physical act of transferring a copy, and\n"
-"you may at your option offer warranty protection in exchange for a fee.\n"
-"\n"
-"  2. You may modify your copy or copies of the Program or any portion\n"
-"of it, thus forming a work based on the Program, and copy and\n"
-"distribute such modifications or work under the terms of Section 1\n"
-"above, provided that you also meet all of these conditions:\n"
-"\n"
-"    a) You must cause the modified files to carry prominent notices\n"
-"    stating that you changed the files and the date of any change.\n"
-"\n"
-"    b) You must cause any work that you distribute or publish, that in\n"
-"    whole or in part contains or is derived from the Program or any\n"
-"    part thereof, to be licensed as a whole at no charge to all third\n"
-"    parties under the terms of this License.\n"
-"\n"
-"    c) If the modified program normally reads commands interactively\n"
-"    when run, you must cause it, when started running for such\n"
-"    interactive use in the most ordinary way, to print or display an\n"
-"    announcement including an appropriate copyright notice and a\n"
-"    notice that there is no warranty (or else, saying that you provide\n"
-"    a warranty) and that users may redistribute the program under\n"
-"    these conditions, and telling the user how to view a copy of this\n"
-"    License.  (Exception: if the Program itself is interactive but\n"
-"    does not normally print such an announcement, your work based on\n"
-"    the Program is not required to print an announcement.)\n"
-"\n"
-"These requirements apply to the modified work as a whole.  If\n"
-"identifiable sections of that work are not derived from the Program,\n"
-"and can be reasonably considered independent and separate works in\n"
-"themselves, then this License, and its terms, do not apply to those\n"
-"sections when you distribute them as separate works.  But when you\n"
-"distribute the same sections as part of a whole which is a work based\n"
-"on the Program, the distribution of the whole must be on the terms of\n"
-"this License, whose permissions for other licensees extend to the\n"
-"entire whole, and thus to each and every part regardless of who wrote it.\n"
-"\n"
-"Thus, it is not the intent of this section to claim rights or contest\n"
-"your rights to work written entirely by you; rather, the intent is to\n"
-"exercise the right to control the distribution of derivative or\n"
-"collective works based on the Program.\n"
-"\n"
-"In addition, mere aggregation of another work not based on the Program\n"
-"with the Program (or with a work based on the Program) on a volume of\n"
-"a storage or distribution medium does not bring the other work under\n"
-"the scope of this License.\n"
-"\n"
-"  3. You may copy and distribute the Program (or a work based on it,\n"
-"under Section 2) in object code or executable form under the terms of\n"
-"Sections 1 and 2 above provided that you also do one of the following:\n"
-"\n"
-"    a) Accompany it with the complete corresponding machine-readable\n"
-"    source code, which must be distributed under the terms of Sections\n"
-"    1 and 2 above on a medium customarily used for software interchange; "
-"or,\n"
-"\n"
-"    b) Accompany it with a written offer, valid for at least three\n"
-"    years, to give any third party, for a charge no more than your\n"
-"    cost of physically performing source distribution, a complete\n"
-"    machine-readable copy of the corresponding source code, to be\n"
-"    distributed under the terms of Sections 1 and 2 above on a medium\n"
-"    customarily used for software interchange; or,\n"
-"\n"
-"    c) Accompany it with the information you received as to the offer\n"
-"    to distribute corresponding source code.  (This alternative is\n"
-"    allowed only for noncommercial distribution and only if you\n"
-"    received the program in object code or executable form with such\n"
-"    an offer, in accord with Subsection b above.)\n"
-"\n"
-"The source code for a work means the preferred form of the work for\n"
-"making modifications to it.  For an executable work, complete source\n"
-"code means all the source code for all modules it contains, plus any\n"
-"associated interface definition files, plus the scripts used to\n"
-"control compilation and installation of the executable.  However, as a\n"
-"special exception, the source code distributed need not include\n"
-"anything that is normally distributed (in either source or binary\n"
-"form) with the major components (compiler, kernel, and so on) of the\n"
-"operating system on which the executable runs, unless that component\n"
-"itself accompanies the executable.\n"
-"\n"
-"If distribution of executable or object code is made by offering\n"
-"access to copy from a designated place, then offering equivalent\n"
-"access to copy the source code from the same place counts as\n"
-"distribution of the source code, even though third parties are not\n"
-"compelled to copy the source along with the object code.\n"
-"\n"
-"  4. You may not copy, modify, sublicense, or distribute the Program\n"
-"except as expressly provided under this License.  Any attempt\n"
-"otherwise to copy, modify, sublicense or distribute the Program is\n"
-"void, and will automatically terminate your rights under this License.\n"
-"However, parties who have received copies, or rights, from you under\n"
-"this License will not have their licenses terminated so long as such\n"
-"parties remain in full compliance.\n"
-"\n"
-"  5. You are not required to accept this License, since you have not\n"
-"signed it.  However, nothing else grants you permission to modify or\n"
-"distribute the Program or its derivative works.  These actions are\n"
-"prohibited by law if you do not accept this License.  Therefore, by\n"
-"modifying or distributing the Program (or any work based on the\n"
-"Program), you indicate your acceptance of this License to do so, and\n"
-"all its terms and conditions for copying, distributing or modifying\n"
-"the Program or works based on it.\n"
-"\n"
-"  6. Each time you redistribute the Program (or any work based on the\n"
-"Program), the recipient automatically receives a license from the\n"
-"original licensor to copy, distribute or modify the Program subject to\n"
-"these terms and conditions.  You may not impose any further\n"
-"restrictions on the recipients' exercise of the rights granted herein.\n"
-"You are not responsible for enforcing compliance by third parties to\n"
-"this License.\n"
-"\n"
-"  7. If, as a consequence of a court judgment or allegation of patent\n"
-"infringement or for any other reason (not limited to patent issues),\n"
-"conditions are imposed on you (whether by court order, agreement or\n"
-"otherwise) that contradict the conditions of this License, they do not\n"
-"excuse you from the conditions of this License.  If you cannot\n"
-"distribute so as to satisfy simultaneously your obligations under this\n"
-"License and any other pertinent obligations, then as a consequence you\n"
-"may not distribute the Program at all.  For example, if a patent\n"
-"license would not permit royalty-free redistribution of the Program by\n"
-"all those who receive copies directly or indirectly through you, then\n"
-"the only way you could satisfy both it and this License would be to\n"
-"refrain entirely from distribution of the Program.\n"
-"\n"
-"If any portion of this section is held invalid or unenforceable under\n"
-"any particular circumstance, the balance of the section is intended to\n"
-"apply and the section as a whole is intended to apply in other\n"
-"circumstances.\n"
-"\n"
-"It is not the purpose of this section to induce you to infringe any\n"
-"patents or other property right claims or to contest validity of any\n"
-"such claims; this section has the sole purpose of protecting the\n"
-"integrity of the free software distribution system, which is\n"
-"implemented by public license practices.  Many people have made\n"
-"generous contributions to the wide range of software distributed\n"
-"through that system in reliance on consistent application of that\n"
-"system; it is up to the author/donor to decide if he or she is willing\n"
-"to distribute software through any other system and a licensee cannot\n"
-"impose that choice.\n"
-"\n"
-"This section is intended to make thoroughly clear what is believed to\n"
-"be a consequence of the rest of this License.\n"
-"\n"
-"  8. If the distribution and/or use of the Program is restricted in\n"
-"certain countries either by patents or by copyrighted interfaces, the\n"
-"original copyright holder who places the Program under this License\n"
-"may add an explicit geographical distribution limitation excluding\n"
-"those countries, so that distribution is permitted only in or among\n"
-"countries not thus excluded.  In such case, this License incorporates\n"
-"the limitation as if written in the body of this License.\n"
-"\n"
-"  9. The Free Software Foundation may publish revised and/or new versions\n"
-"of the General Public License from time to time.  Such new versions will\n"
-"be similar in spirit to the present version, but may differ in detail to\n"
-"address new problems or concerns.\n"
-"\n"
-"Each version is given a distinguishing version number.  If the Program\n"
-"specifies a version number of this License which applies to it and \"any\n"
-"later version\", you have the option of following the terms and conditions\n"
-"either of that version or of any later version published by the Free\n"
-"Software Foundation.  If the Program does not specify a version number of\n"
-"this License, you may choose any version ever published by the Free "
-"Software\n"
-"Foundation.\n"
-"\n"
-"  10. If you wish to incorporate parts of the Program into other free\n"
-"programs whose distribution conditions are different, write to the author\n"
-"to ask for permission.  For software which is copyrighted by the Free\n"
-"Software Foundation, write to the Free Software Foundation; we sometimes\n"
-"make exceptions for this.  Our decision will be guided by the two goals\n"
-"of preserving the free status of all derivatives of our free software and\n"
-"of promoting the sharing and reuse of software generally.\n"
-"\n"
-"\t\t\t    NO WARRANTY\n"
-"\n"
-"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
-"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
-"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
-"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
-"EXPRESSED\n"
-"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
-"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
-"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
-"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
-"REPAIR OR CORRECTION.\n"
-"\n"
-"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
-"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
-"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
-"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
-"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
-"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
-"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
-"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
-"POSSIBILITY OF SUCH DAMAGES.\n"
-"\n"
-"\t\t     END OF TERMS AND CONDITIONS\n"
-"\n"
-"\t    How to Apply These Terms to Your New Programs\n"
-"\n"
-"  If you develop a new program, and you want it to be of the greatest\n"
-"possible use to the public, the best way to achieve this is to make it\n"
-"free software which everyone can redistribute and change under these terms.\n"
-"\n"
-"  To do so, attach the following notices to the program.  It is safest\n"
-"to attach them to the start of each source file to most effectively\n"
-"convey the exclusion of warranty; and each file should have at least\n"
-"the \"copyright\" line and a pointer to where the full notice is found.\n"
-"\n"
-"    <one line to give the program's name and a brief idea of what it does.>\n"
-"    Copyright (C) <year>  <name of author>\n"
-"\n"
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License as published by\n"
-"    the Free Software Foundation; either version 2 of the License, or\n"
-"    (at your option) any later version.\n"
-"\n"
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-"\n"
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
-"USA\n"
-"\n"
-"\n"
-"Also add information on how to contact you by electronic and paper mail.\n"
-"\n"
-"If the program is interactive, make it output a short notice like this\n"
-"when it starts in an interactive mode:\n"
-"\n"
-"    Gnomovision version 69, Copyright (C) year  name of author\n"
-"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
-"w'.\n"
-"    This is free software, and you are welcome to redistribute it\n"
-"    under certain conditions; type `show c' for details.\n"
-"\n"
-"The hypothetical commands `show w' and `show c' should show the appropriate\n"
-"parts of the General Public License.  Of course, the commands you use may\n"
-"be called something other than `show w' and `show c'; they could even be\n"
-"mouse-clicks or menu items--whatever suits your program.\n"
-"\n"
-"You should also get your employer (if you work as a programmer) or your\n"
-"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
-"necessary.  Here is a sample; alter the names:\n"
-"\n"
-"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
-"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
-"\n"
-"  <signature of Ty Coon>, 1 April 1989\n"
-"  Ty Coon, President of Vice\n"
-"\n"
-"This General Public License does not permit incorporating your program into\n"
-"proprietary programs.  If your program is a subroutine library, you may\n"
-"consider it more useful to permit linking proprietary applications with the\n"
-"library.  If this is what you want to do, use the GNU Library General\n"
-"Public License instead of this License.\n"
+#: src/applications/fs/module/migration.c:225
+msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/conf/wizard.glade:4458
-msgid "Not for English ;-)"
+#: src/applications/fs/fsui/namespace_info.c:583
+msgid "Publication interval for periodic publication changed."
 msgstr ""
 
-#: src/conf/gnunet-setup.c:82
-msgid "generate configuration for gnunetd, the GNUnet daemon"
+#: src/applications/fs/fsui/namespace_info.c:604
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:90
-msgid "Tool to setup GNUnet."
+#: src/applications/fs/fsui/search.c:245
+msgid "This search is already pending!\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:91
+#: src/applications/fs/fsui/fsui.c:189
+msgid "FSUI persistence: error restoring download\n"
+msgstr ""
+
+#: src/applications/fs/fsui/fsui.c:638
 #, c-format
-msgid "Available MODEs:\n"
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:92
-#, fuzzy, c-format
-msgid " config\t\ttext-based configuration\n"
-msgstr "A bushyinguro"
+#: src/applications/fs/fsui/download.c:290
+#, fuzzy
+msgid "Download aborted."
+msgstr "/Byahiswemo"
 
-#: src/conf/gnunet-setup.c:94
-#, c-format
-msgid " menuconfig\ttext-based menu\n"
+#: src/applications/fs/fsui/download.c:294
+#, fuzzy
+msgid "ECRS download failed (see logs)."
+msgstr "OYA Gufungura IDOSIYE"
+
+#: src/applications/fs/fsui/download.c:298
+#, fuzzy
+msgid "ECRS download suspending."
+msgstr "OYA Gufungura IDOSIYE"
+
+#: src/applications/fs/fsui/download.c:302
+#, fuzzy
+msgid "Unexpected download state."
+msgstr "Ibikubiyemo Ubwoko"
+
+#: src/applications/fs/fsui/unindex.c:85
+#, fuzzy
+msgid "Unindex failed."
+msgstr "/Idosiye IDOSIYE"
+
+#: src/applications/fs/fsui/helper.c:67
+#, fuzzy
+msgid "No keywords specified!\n"
+msgstr "Amagambo fatizo"
+
+#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:448
+#, fuzzy
+msgid "Upload failed."
+msgstr "/Idosiye IDOSIYE"
+
+#: src/applications/fs/fsui/upload.c:455
+msgid "Cannot upload directory without using recursion."
 msgstr ""
 
-#: src/conf/gnunet-setup.c:96
+#: src/applications/fs/fsui/file_info.c:93
+msgid "Collecting file identifiers disabled.\n"
+msgstr ""
+
+#: src/applications/fs/fsui/file_info.c:282
 #, c-format
-msgid " wizard-curses\tBasic text-based graphical configuration\n"
+msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/conf/gnunet-setup.c:99
-#, fuzzy, c-format
-msgid " gconfig\tGTK configuration\n"
-msgstr "A bushyinguro"
+#: src/applications/fs/ecrs/search.c:160
+msgid "CHK URI not allowed for search.\n"
+msgstr ""
 
-#: src/conf/gnunet-setup.c:100
-#, c-format
-msgid ""
-" wizard-gtk\tBasic GTK configuration\n"
-"\n"
+#: src/applications/fs/ecrs/search.c:216
+msgid "LOC URI not allowed for search.\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:167
+#: src/applications/fs/ecrs/download.c:125
 #, fuzzy, c-format
-msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
-msgstr "OYA Iboneza IDOSIYE"
+msgid "Could not unlink temporary file `%s': %s\n"
+msgstr "OYA Kwandika Kuri IDOSIYE"
 
-#: src/conf/gnunet-setup.c:176 src/server/gnunet-peer-info.c:113
-#: src/server/gnunet-transport-check.c:527 src/server/gnunet-update.c:152
+#: src/applications/fs/ecrs/download.c:257
 #, fuzzy, c-format
-msgid "Invalid arguments: "
-msgstr "ingingo"
+msgid "Write(%d, %p, %d) failed: %s\n"
+msgstr "`%s'%sByanze"
 
-#: src/conf/gnunet-setup.c:224
+#: src/applications/fs/ecrs/download.c:935
 #, fuzzy
-msgid "No interface specified, using default\n"
-msgstr "imbonerahamwe# Izina: ikoresha"
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
+msgstr "Ibikubiyemo OYA BIHUYE Urufunguzo ni a Cyangwa a Byinjijwemo IDOSIYE"
 
-#: src/conf/gnunet-setup.c:237 src/conf/gnunet-setup.c:251
-#: src/conf/gnunet-setup.c:270 src/conf/gnunet-setup.c:281
+#: src/applications/fs/ecrs/download.c:1112
 #, fuzzy, c-format
-msgid "`%s' is not available."
+msgid ""
+"Content `%s' seems to be not available on the network (tried %u times).\n"
+msgstr "Kuri OYA Bihari ku i urusobe"
+
+#: src/applications/fs/ecrs/upload.c:180
+#, fuzzy, c-format
+msgid "`%s' is not a file.\n"
 msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
 
-#: src/conf/gnunet-setup.c:264 src/conf/gnunet-setup.c:275
+#: src/applications/fs/ecrs/upload.c:186
+#, fuzzy, c-format
+msgid "Cannot get size of file `%s'"
+msgstr "Gufungura Iboneza IDOSIYE"
+
+#: src/applications/fs/ecrs/upload.c:193
+#, fuzzy
+msgid "Failed to connect to gnunetd."
+msgstr "Kuri Kwihuza Kuri"
+
+#: src/applications/fs/ecrs/upload.c:203
+#, fuzzy, c-format
+msgid "Cannot hash `%s'.\n"
+msgstr "Ibirimo"
+
+#: src/applications/fs/ecrs/upload.c:221
+#, fuzzy, c-format
+msgid "Initialization for indexing file `%s' failed.\n"
+msgstr "Bya in IDOSIYE"
+
+#: src/applications/fs/ecrs/upload.c:227
+#, fuzzy, c-format
+msgid "Indexing file `%s' failed. Trying to insert file...\n"
+msgstr "Itangira... Modire Byanze Umukiriya"
+
+#: src/applications/fs/ecrs/upload.c:306
 #, c-format
+msgid "Indexing data failed at position %i.\n"
+msgstr ""
+
+#: src/applications/fs/ecrs/meta.c:842
+#, fuzzy, c-format
+msgid "Renaming of file `%s' to `%s' failed: %s\n"
+msgstr "Bya IDOSIYE Kuri Byanze"
+
+#: src/applications/fs/ecrs/meta.c:850
+#, fuzzy, c-format
+msgid "Could not rename file `%s' to `%s': file exists\n"
+msgstr "OYA Guhindura izina IDOSIYE Kuri IDOSIYE"
+
+#: src/applications/fs/ecrs/namespace.c:45
+#, fuzzy, c-format
 msgid ""
-"Can only run wizard to configure gnunetd.\n"
-"Did you forget the `%s' option?\n"
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s.\n"
+msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+
+#: src/applications/fs/ecrs/namespace.c:133
+#, fuzzy, c-format
+msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
+msgstr "Kurema IDOSIYE"
+
+#: src/applications/fs/ecrs/namespace.c:307
+#: src/applications/fs/ecrs/namespace.c:383
+#: src/applications/fs/ecrs/namespace.c:528
+#, fuzzy, c-format
+msgid "File `%s' does not contain a pseudonym.\n"
+msgstr "Idosiye OYA a"
+
+#: src/applications/fs/ecrs/namespace.c:318
+#: src/applications/fs/ecrs/namespace.c:394
+#, fuzzy, c-format
+msgid "Format of pseudonym `%s' is invalid.\n"
+msgstr "Bya ni Sibyo Ijambobanga..."
+
+#: src/applications/fs/ecrs/namespace.c:538
+#: src/applications/fs/ecrs/namespace.c:548
+#, fuzzy, c-format
+msgid "Format of file `%s' is invalid.\n"
+msgstr "Bya ni Sibyo Ijambobanga..."
+
+#: src/applications/topology_f2f/topology.c:323
+#, fuzzy, c-format
+msgid ""
+"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+msgstr "Bihari in i Iboneza in Icyiciro"
+
+#: src/applications/topology_f2f/topology.c:342
+#, fuzzy, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
+
+#: src/applications/topology_f2f/topology.c:358
+msgid "Syntax error in topology specification, skipping bytes.\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:285
+#: src/applications/topology_f2f/topology.c:370
 #, fuzzy, c-format
-msgid "Unknown operation `%s'\n"
-msgstr "Imiterere Verisiyo"
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
 
-#: src/conf/gnunet-win-tool.c:109
+#: src/applications/template/template.c:61
 #, c-format
-msgid "GNUnet service installed successfully.\n"
+msgid "`%s' registering client handler %d and %d\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:112 src/conf/gnunet-win-tool.c:139
+#: src/applications/template/gnunet-template.c:70
+#: src/applications/vpn/gnunet-vpn.c:72
+#, fuzzy
+msgid "helptext for -t"
+msgstr "kugirango T"
+
+#: src/applications/template/gnunet-template.c:75
+#, fuzzy
+msgid "Template for gnunet-clients."
+msgstr "kugirango"
+
+#: src/applications/bootstrap_http/http.c:109
 #, c-format
-msgid "This version of Windows doesn't support services.\n"
+msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:116 src/conf/gnunet-win-tool.c:143
+#: src/applications/bootstrap_http/http.c:120
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: `%s'.\n"
+msgstr "`%s'Byanze ku Na: Ikosa"
+
+#: src/applications/bootstrap_http/http.c:132
+#, fuzzy, c-format
+msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+msgstr "OYA Gufungura Urutonde Bya Aho kubariza Ubuturo Kitazwi"
+
+#: src/applications/bootstrap_http/http.c:155
+#: src/applications/bootstrap_http/http.c:181
+#, fuzzy, c-format
+msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+msgstr "`%s'Kuri Byanze ku Na: Ikosa"
+
+#: src/applications/bootstrap_http/http.c:217
+#, fuzzy, c-format
+msgid "Parsing HTTP response for URL `%s' failed.\n"
+msgstr "kugirango Byanze"
+
+#: src/applications/bootstrap_http/http.c:252
+#, fuzzy, c-format
+msgid "Parsing hello from `%s' failed.\n"
+msgstr "Bivuye Byanze"
+
+#: src/applications/bootstrap_http/http.c:330
+#, fuzzy, c-format
+msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+msgstr "OYA Izina: Bya Porogisi a Porogisi"
+
+#: src/applications/bootstrap_http/http.c:355
+#, fuzzy
+msgid "# hellos downloaded via http"
+msgstr "#KB Yimuwe ku"
+
+#: src/applications/traffic/traffic.c:445
+#, fuzzy, c-format
+msgid "# bytes transmitted of type %d"
+msgstr "#Bayite Bya Ubwoko"
+
+#: src/applications/traffic/traffic.c:465
+#, fuzzy, c-format
+msgid "# bytes received of type %d"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
+
+#: src/applications/traffic/clientapi.c:67
+#, fuzzy
+msgid "Failed to query gnunetd about traffic conditions.\n"
+msgstr "Kuri Ikibazo# Ibyerekeye"
+
+#: src/applications/traffic/clientapi.c:74
+#, fuzzy
+msgid "Did not receive reply from gnunetd about traffic conditions.\n"
+msgstr "OYA Akira Subiza Bivuye Ibyerekeye"
+
+#: src/applications/kvstore_sqlite/kv_sqlite.c:181
+#, fuzzy, c-format
+msgid ""
+"Configuration file must specify directory for storing data in section `%s' "
+"under `%s'.\n"
+msgstr "IDOSIYE bushyinguro kugirango Ibyatanzwe in Icyiciro"
+
+#: src/applications/kvstore_sqlite/kv_sqlite.c:264
+#, fuzzy
+msgid "Unable to initialize SQLite KVStore.\n"
+msgstr "Kuri gutangiza"
+
+#: src/applications/vpn/gnunet-vpn.c:77
+msgid "VPN over GNUnet."
+msgstr ""
+
+#: src/applications/vpn/vpn.c:315
 #, c-format
-msgid "Error: can't open Service Control Manager: %s\n"
+msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:121
+#: src/applications/vpn/vpn.c:323
 #, c-format
-msgid "Error: can't create service: %s\n"
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
-#, fuzzy, c-format
-msgid "Unknown error.\n"
-msgstr "Verisiyo"
+#: src/applications/vpn/vpn.c:351
+#, c-format
+msgid "Inserting route from peer %d in route table at location %d\n"
+msgstr ""
 
-#: src/conf/gnunet-win-tool.c:136
-#, fuzzy, c-format
-msgid "Service deleted.\n"
-msgstr "/Byahiswemo"
+#: src/applications/vpn/vpn.c:400
+#, c-format
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+msgstr ""
 
-#: src/conf/gnunet-win-tool.c:148
+#: src/applications/vpn/vpn.c:404
 #, c-format
-msgid "Error: can't access service: %s\n"
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:152
+#: src/applications/vpn/vpn.c:414
 #, c-format
-msgid "Error: can't delete service: %s\n"
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/conf/wizard_gtk.c:429
-#, fuzzy, c-format
-msgid "Unable to save configuration file `%s':"
-msgstr "OYA Iboneza IDOSIYE"
+#: src/applications/vpn/vpn.c:474
+#, c-format
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+msgstr ""
 
-#: src/conf/wizard_gtk.c:475 src/conf/wizard_curs.c:616
-msgid "Unable to create user account:"
+#: src/applications/vpn/vpn.c:478
+#, c-format
+msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/conf/wizard_gtk.c:482 src/conf/wizard_curs.c:619
-msgid "Unable to change startup process:"
+#: src/applications/vpn/vpn.c:505
+#, c-format
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:116 src/conf/wizard_curs.c:131
-#: src/conf/wizard_curs.c:184 src/conf/wizard_curs.c:221
-#: src/conf/wizard_curs.c:251 src/conf/wizard_curs.c:277
-#: src/conf/wizard_curs.c:310 src/conf/wizard_curs.c:337
-#: src/conf/wizard_curs.c:369 src/conf/wizard_curs.c:394
-#: src/conf/wizard_curs.c:423 src/conf/wizard_curs.c:446
-#: src/conf/wizard_curs.c:501 src/conf/wizard_curs.c:563
-#: src/conf/wizard_curs.c:594 src/conf/wizard_curs.c:638
-#, fuzzy
-msgid "GNUnet configuration"
-msgstr "A bushyinguro"
+#: src/applications/vpn/vpn.c:513
+#, c-format
+msgid "Cannot set tunnel name to %s because of %s\n"
+msgstr ""
 
-#: src/conf/wizard_curs.c:117
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org/\n";
-"and join our community at\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"the GNUnet team"
+#: src/applications/vpn/vpn.c:517
+#, c-format
+msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:132
-msgid ""
-"Choose the network interface that connects your computer to the internet "
-"from the list below."
+#: src/applications/vpn/vpn.c:555
+#, c-format
+msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:191
-#: src/conf/wizard_curs.c:228 src/conf/wizard_curs.c:283
-#: src/conf/wizard_curs.c:315 src/conf/wizard_curs.c:375
-#, fuzzy
-msgid "Help"
-msgstr "/Kugoboka"
+#: src/applications/vpn/vpn.c:559
+#, c-format
+msgid "Cannot set socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:192
-msgid ""
-"The \"Network interface\" is the device that connects your computer to the "
-"internet. This is usually a modem, an ISDN card or a network card in case "
-"you are using DSL."
+#: src/applications/vpn/vpn.c:566
+#, c-format
+msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:185
-msgid ""
-"What is the name of the network interface that connects your computer to the "
-"Internet?"
+#: src/applications/vpn/vpn.c:571
+#, c-format
+msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:222
-msgid ""
-"What is this computer's public IP address or hostname?\n"
-"\n"
-"If in doubt, leave this empty."
+#: src/applications/vpn/vpn.c:579
+#, c-format
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:229
-msgid ""
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your "
-"IP-Address."
+#: src/applications/vpn/vpn.c:591
+#, fuzzy, c-format
+msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
+msgstr "OYA Gushaka Aderesi kugirango"
+
+#: src/applications/vpn/vpn.c:602
+#, c-format
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:252
+#: src/applications/vpn/vpn.c:614
+#, fuzzy, c-format
+msgid "Cannot add route IPv6 address for gnu%s because %s\n"
+msgstr "OYA Gushaka Aderesi kugirango"
+
+#: src/applications/vpn/vpn.c:646
 msgid ""
-"Is this machine behind NAT?\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
-"connections through modems, ISDN cards and DNAT (also known as \"port "
-"forwarding\")."
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:278
-msgid "How much upstream (Bytes/s) may be used?"
+#: src/applications/vpn/vpn.c:692
+#, c-format
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:283
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"upstream\" is the data channel through which data is *sent* to the "
-"internet. The limit is either the total maximum for this computer or how "
-"much GNUnet itself is allowed to use. You can specify that later. If you "
-"have a flatrate, you can set it to the maximum speed of your internet "
-"connection."
+#: src/applications/vpn/vpn.c:754
+#, c-format
+msgid "RFC4193 --- whitelist of peer %x\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:310
-msgid "How much downstream (Bytes/s) may be used?"
+#: src/applications/vpn/vpn.c:772
+msgid "RFC4193 Thread exiting\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:316
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"The \"downstream\" is the data channel through which data is *received* from "
-"the internet. The limit is either the total maximum for this computer or how "
-"much GNUnet itself is allowed to use. You can specify that later. If you "
-"have a flatrate you can set it to the maximum speed of your internet "
-"connection."
+#: src/applications/vpn/vpn.c:812
+msgid "VPN IP src not anonymous. drop..\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:338
-msgid ""
-"Share denoted bandwidth with other applications?\n"
-"\n"
-"Say \"yes\" here, if you don't want other network traffic to interfere with "
-"GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to "
-"values entered in the previous steps, or if you can't reliably measure the "
-"maximum capabilities of your connection. \"No\" can be very useful if other "
-"applications are causing a lot of traffic on your LAN.  In this case, you do "
-"not want to limit the traffic that GNUnet can inflict on your internet "
-"connection whenever your high-speed LAN gets used (e.g. by NFS)."
+#: src/applications/vpn/vpn.c:816
+msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:370
-msgid "How much CPU (in %) may be used?"
+#: src/applications/vpn/vpn.c:822
+msgid "VPN Received, not anonymous, drop.\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:376
-msgid ""
-"You can limit GNUnet's resource usage here.\n"
-"\n"
-"This is the percentage of processor time GNUnet is allowed to use."
+#: src/applications/vpn/vpn.c:825
+#, fuzzy, c-format
+msgid "VPN Received unknown IP version %d...\n"
+msgstr "Subiza Bya Kitazwi Ubwoko"
+
+#: src/applications/vpn/vpn.c:835
+#, c-format
+msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:395
-msgid ""
-"Store migrated content?\n"
-"\n"
-"GNUnet is able to store data from other peers in your datastore. This is "
-"useful if an adversary has access to your inserted content and you need to "
-"deny that the content is yours. With \"content migration\" on, the content "
-"could have \"migrated\" over the internet to your node without your "
-"knowledge.\n"
-"It also helps to spread popular content over different peers to enhance "
-"availability."
+#: src/applications/vpn/vpn.c:854
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:424
-msgid ""
-"What's the maximum datastore size in MB?\n"
-"\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, "
-"inserted and migrated content)."
+#: src/applications/vpn/vpn.c:869
+#, c-format
+msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:447
-msgid ""
-"Do you want to launch GNUnet as a system service?\n"
-"\n"
-"If you say \"yes\" here, the GNUnet background process will be automatically "
-"started when you turn on your computer. If you say \"no\" here, you have to "
-"launch GNUnet yourself each time you want to use it."
+#: src/applications/vpn/vpn.c:885
+#, fuzzy
+msgid "Receive route request\n"
+msgstr "Gikora"
+
+#: src/applications/vpn/vpn.c:890
+#, c-format
+msgid "Prepare route announcement level %d\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:502
-msgid ""
-"Define the user owning the GNUnet service.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new user "
-"account under which the GNUnet service is started at system startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the fields empty to run GNUnet with system privileges.\n"
-"\n"
-"GNUnet user:"
+#: src/applications/vpn/vpn.c:901
+#, c-format
+msgid "Send route announcement %d with route announce\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:564
-msgid ""
-"Define the group owning the GNUnet service.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new group "
-"for the chosen user account.\n"
-"\n"
-"You can also specify a already existant group here.\n"
-"\n"
-"Only members of this group will be allowed to start and stop the the GNUnet "
-"server and have access to GNUnet server data.\n"
-"\n"
-"GNUnet group:"
+#: src/applications/vpn/vpn.c:907
+#, c-format
+msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:595
-msgid ""
-"If you are an experienced user, you may want to tweak your GNUnet "
-"installation using the enhanced configurator.\n"
-"\n"
-"Do you want to start it after saving your configuration?"
+#: src/applications/vpn/vpn.c:923
+#, fuzzy
+msgid "Receive route announce.\n"
+msgstr "Subiza Bya Kitazwi Ubwoko"
+
+#: src/applications/vpn/vpn.c:927
+msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/conf/wizard_curs.c:632
+#: src/applications/vpn/vpn.c:931
 #, fuzzy, c-format
-msgid ""
-"Unable to save configuration file %s: %s.\n"
-"\n"
-"Try again?"
-msgstr "Gufungura Iboneza IDOSIYE"
+msgid "Inserting with hops %d\n"
+msgstr "Uburyo"
 
-#: src/conf/wizard_util.c:89
-msgid "Can't open Service Control Manager"
+#: src/applications/vpn/vpn.c:945
+#, c-format
+msgid "Request level %d from peer %d\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:94
-msgid "Can't create service"
+#: src/applications/vpn/vpn.c:960
+#, c-format
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:99
-msgid "Error changing the permissions of the GNUnet directory"
+#: src/applications/vpn/vpn.c:998
+msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:104
-msgid "Cannot write to the regisitry"
+#: src/applications/vpn/vpn.c:1013
+msgid "realise add routes\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:107
-msgid "Can't access the service"
+#: src/applications/vpn/vpn.c:1058
+msgid "realise pull routes\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:111
-msgid "Can't delete the service"
+#: src/applications/vpn/vpn.c:1104
+msgid "realise copy table\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:115
+#: src/applications/vpn/vpn.c:1161
 #, fuzzy
-msgid "Unknown error"
-msgstr "Verisiyo"
+msgid "Yes"
+msgstr "Yego"
 
-#: src/conf/wizard_util.c:146
-msgid "This version of Windows does not support multiple users."
+#: src/applications/vpn/vpn.c:1161
+#, fuzzy
+msgid "No"
+msgstr "Oya."
+
+#: src/applications/vpn/vpn.c:1324
+#, c-format
+msgid "`%s' initialising RFC4913 module  %d and %d\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:150
-#, fuzzy
-msgid "Error creating user"
-msgstr "Ivugurura Verisiyo"
+#: src/applications/vpn/vpn.c:1325
+#, c-format
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
+msgstr ""
 
-#: src/conf/wizard_util.c:153
-msgid "Error accessing local security policy"
+#: src/applications/vpn/vpn.c:1361
+msgid "enables IPv6 over GNUnet (incomplete)"
 msgstr ""
 
-#: src/conf/wizard_util.c:156
-msgid "Error granting service right to user"
+#: src/applications/vpn/vpn.c:1383
+msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/conf/wizard_util.c:159
-msgid "Unknown error while creating a new user"
+#: src/applications/vpn/vpn.c:1394
+msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/server/connection.c:979
+#: src/applications/vpn/vpn.c:1405
+#, c-format
+msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgstr ""
+
+#: src/applications/state/state.c:85
 #, fuzzy, c-format
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
+msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+
+#: src/server/gnunet-update.c:50
+#, fuzzy
+msgid "print a value from the configuration file to stdout"
+msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
+
+#: src/server/gnunet-update.c:55 src/server/startup.c:450
+#: src/server/gnunet-transport-check.c:407
+#, fuzzy
+msgid "run as user LOGIN"
+msgstr "Gukoresha Nka Ukoresha:"
+
+#: src/server/gnunet-update.c:58
+#, fuzzy
+msgid "run in client mode (for getting client configuration values)"
+msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
+
+#: src/server/gnunet-update.c:64
+#, fuzzy
+msgid "Updates GNUnet datastructures after version change."
+msgstr "Nyuma Verisiyo Guhindura>>"
+
+#: src/server/gnunet-update.c:147
+#, fuzzy, c-format
+msgid "Option `%s' makes no sense without option `%s'."
+msgstr "Oya Ihitamo"
+
+#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
+#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
+#, fuzzy, c-format
+msgid "Invalid arguments: "
+msgstr "ingingo"
+
+#: src/server/gnunet-update.c:155
+#, c-format
+msgid ""
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: src/server/gnunet-update.c:232 src/server/core.c:476
+#, fuzzy
+msgid "No applications defined in configuration!\n"
+msgstr "Porogaramu in Iboneza"
+
+#: src/server/gnunet-update.c:249
+#, fuzzy, c-format
+msgid "Updating data for module `%s'\n"
+msgstr "Ibyatanzwe kugirango Modire"
+
+#: src/server/gnunet-update.c:253
+#, fuzzy, c-format
+msgid "Failed to update data for module `%s'\n"
+msgstr "Kuri Kuvugurura Ibyatanzwe kugirango Modire"
+
+#: src/server/gnunet-update.c:309
+#, fuzzy, c-format
+msgid "Updated data for %d applications.\n"
+msgstr "Ibyatanzwe kugirango Porogaramu"
+
+#: src/server/connection.c:983
+#, fuzzy, c-format
 msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
 msgstr "`%s'Byahiswemo Inyuma Bya Ubutumwa"
 
-#: src/server/connection.c:986
+#: src/server/connection.c:990
 #, fuzzy, c-format
 msgid "Message details: %u: length %d, priority: %d\n"
 msgstr "Birambuye Uburebure By'ibanze"
 
-#: src/server/connection.c:2243
+#: src/server/connection.c:2254
 #, fuzzy, c-format
 msgid "Message from `%s' discarded: invalid format.\n"
 msgstr "Bivuye Sibyo Imiterere"
 
-#: src/server/connection.c:2309
+#: src/server/connection.c:2325
 #, fuzzy, c-format
 msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr "Umubare Bya"
 
-#: src/server/connection.c:2324
+#: src/server/connection.c:2340
 #, fuzzy
 msgid "Message received more than one day old. Dropped.\n"
 msgstr "BYAKIRIWE Birenzeho UMUNSI ki/ bishaje"
 
-#: src/server/connection.c:2690
+#: src/server/connection.c:2708
 #, fuzzy
 msgid "# outgoing messages dropped"
 msgstr "#Ubutumwa"
 
-#: src/server/connection.c:2692
+#: src/server/connection.c:2712
 #, fuzzy
 msgid "# bytes of outgoing messages dropped"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/connection.c:2694
+#: src/server/connection.c:2714
 msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/server/connection.c:2695
+#: src/server/connection.c:2717
 #, fuzzy
 msgid "# bytes encrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2696
+#: src/server/connection.c:2721
 #, fuzzy
+msgid "# bytes transmitted"
+msgstr "#Bayite Bya Ubwoko"
+
+#: src/server/connection.c:2725
+#, fuzzy
+msgid "# bytes received"
+msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+
+#: src/server/connection.c:2727
+#, fuzzy
 msgid "# bytes decrypted"
 msgstr "#Bayite"
 
-#: src/server/connection.c:2697
+#: src/server/connection.c:2728
 #, fuzzy
 msgid "# bytes noise sent"
 msgstr "#Bayite Bya BYAKIRIWE"
 
-#: src/server/core.c:114
+#: src/server/startup.c:196
 #, fuzzy, c-format
+msgid "The `%s' request received from client is malformed.\n"
+msgstr "Kubaza... BYAKIRIWE Bivuye Umukiriya ni"
+
+#: src/server/startup.c:324
+#, fuzzy, c-format
+msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
+msgstr "a Izina: kugirango i IDOSIYE in Icyiciro"
+
+#: src/server/startup.c:339
+#, fuzzy, c-format
+msgid "Could not write PID to file `%s': %s.\n"
+msgstr "OYA Kwandika Kuri IDOSIYE"
+
+#: src/server/startup.c:443
+#, fuzzy
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
+msgstr "Gukoresha in Kosora amakosa Ubwoko OYA Na Ikosa Ubutumwa Kuri Bya a"
+
+#: src/server/startup.c:456
+#, fuzzy
+msgid "Starts the gnunetd daemon."
+msgstr "i"
+
+#: src/server/startup.c:470
+#, fuzzy, c-format
+msgid "User `%s' not known, cannot change UID to it.\n"
+msgstr "OYA Guhindura>> Kuri"
+
+#: src/server/startup.c:479
+#, fuzzy, c-format
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Guhindura>> Ukoresha: Itsinda Kuri"
+
+#: src/server/startup.c:580
+#, fuzzy
+msgid "Invalid command-line arguments:\n"
+msgstr "Komandi: Umurongo ingingo"
+
+#: src/server/startup.c:583
+#, c-format
+msgid "Argument %d: `%s'\n"
+msgstr ""
+
+#: src/server/startup.c:589
+#, fuzzy
+msgid "Invalid command-line arguments.\n"
+msgstr "Komandi: Umurongo ingingo"
+
+#: src/server/gnunetd.c:76
+#, fuzzy, c-format
+msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
+msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
+
+#: src/server/gnunetd.c:84
+#, c-format
+msgid "`%s' starting\n"
+msgstr ""
+
+#: src/server/gnunetd.c:106
+#, fuzzy, c-format
+msgid "`%s' startup complete.\n"
+msgstr "`%s'Byuzuye"
+
+#: src/server/gnunetd.c:111
+#, fuzzy, c-format
+msgid "`%s' is shutting down.\n"
+msgstr "`%s'ni Hasi"
+
+#: src/server/core.c:115
+#, fuzzy, c-format
 msgid "Application module `%s' already initialized!\n"
 msgstr "Modire"
 
-#: src/server/core.c:167
+#: src/server/core.c:168
 #, c-format
 msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/server/core.c:214
+#: src/server/core.c:215
 #, fuzzy, c-format
 msgid "Could not shutdown `%s': application not loaded\n"
 msgstr "OYA Zimya Porogaramu OYA"
 
-#: src/server/core.c:221
+#: src/server/core.c:222
 #, fuzzy, c-format
 msgid "Could not shutdown application `%s': not initialized\n"
 msgstr "OYA Zimya Porogaramu OYA"
 
-#: src/server/core.c:230 src/server/core.c:419
+#: src/server/core.c:231 src/server/core.c:420
 #, fuzzy, c-format
 msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr "OYA Gushaka Uburyo in Isomero"
 
-#: src/server/core.c:397
+#: src/server/core.c:398
 #, fuzzy, c-format
 msgid "Could not release %p: service not loaded\n"
 msgstr "OYA Serivisi OYA"
 
-#: src/server/core.c:475 src/server/gnunet-update.c:232
-#, fuzzy
-msgid "No applications defined in configuration!\n"
-msgstr "Porogaramu in Iboneza"
-
-#: src/server/core.c:498
+#: src/server/core.c:499
 #, fuzzy, c-format
 msgid "Could not initialize application `%s'\n"
 msgstr "OYA gutangiza Porogaramu"
 
-#: src/server/core.c:515
+#: src/server/core.c:516
 #, fuzzy, c-format
 msgid "Could not properly shutdown application `%s'.\n"
 msgstr "OYA Zimya Porogaramu"
 
-#: src/server/core.c:574
+#: src/server/core.c:575
 msgid "FATAL: Identity plugin not found!\n"
 msgstr ""
 
-#: src/server/core.c:632
+#: src/server/core.c:633
 #, fuzzy, c-format
 msgid "Could not properly unload service `%s'!\n"
 msgstr "OYA Kureka gufungura Serivisi"
 
-#: src/server/gnunet-peer-info.c:95
-#, fuzzy
-msgid "Print information about GNUnet peers."
-msgstr "Ibisobanuro Ibyerekeye"
-
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
-#, fuzzy, c-format
-msgid "Could not get address of peer `%s'.\n"
-msgstr "OYA Kubona Aderesi Bya"
-
-#: src/server/gnunet-peer-info.c:153
-#, fuzzy
-msgid "hello message invalid (signature invalid).\n"
-msgstr "Ubutumwa Sibyo Isinya Sibyo"
-
-#: src/server/gnunet-peer-info.c:164
-#, fuzzy, c-format
-msgid "Peer `%s' with trust %8u and address `%s'\n"
-msgstr "Na: Na Aderesi"
-
 #: src/server/gnunet-transport-check.c:109
 #, fuzzy, c-format
 msgid "`%s': Could not create hello.\n"
@@ -3899,12 +3505,6 @@
 msgid "specifies after how many MS to time-out"
 msgstr "Nyuma Kuri Igihe Inyuma"
 
-#: src/server/gnunet-transport-check.c:407 src/server/gnunet-update.c:55
-#: src/server/startup.c:450
-#, fuzzy
-msgid "run as user LOGIN"
-msgstr "Gukoresha Nka Ukoresha:"
-
 #: src/server/gnunet-transport-check.c:414
 #, fuzzy
 msgid "Tool to test if GNUnet transport services are operational."
@@ -3931,125 +3531,6 @@
 "%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr "%dInyuma Bya Times"
 
-#: src/server/gnunet-update.c:50
-#, fuzzy
-msgid "print a value from the configuration file to stdout"
-msgstr "Gucapa a Agaciro Bivuye i Iboneza IDOSIYE Kuri"
-
-#: src/server/gnunet-update.c:58
-#, fuzzy
-msgid "run in client mode (for getting client configuration values)"
-msgstr "Gukoresha in Ukoresha: Ubwoko kugirango Ukoresha: Iboneza Uduciro"
-
-#: src/server/gnunet-update.c:64
-#, fuzzy
-msgid "Updates GNUnet datastructures after version change."
-msgstr "Nyuma Verisiyo Guhindura>>"
-
-#: src/server/gnunet-update.c:147
-#, fuzzy, c-format
-msgid "Option `%s' makes no sense without option `%s'."
-msgstr "Oya Ihitamo"
-
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
-msgstr ""
-
-#: src/server/gnunet-update.c:249
-#, fuzzy, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Ibyatanzwe kugirango Modire"
-
-#: src/server/gnunet-update.c:253
-#, fuzzy, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Kuri Kuvugurura Ibyatanzwe kugirango Modire"
-
-#: src/server/gnunet-update.c:309
-#, fuzzy, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Ibyatanzwe kugirango Porogaramu"
-
-#: src/server/gnunetd.c:76
-#, fuzzy, c-format
-msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
-msgstr "Cyangwa Verisiyo Byahinduwe Kuri Gukoresha"
-
-#: src/server/gnunetd.c:84
-#, c-format
-msgid "`%s' starting\n"
-msgstr ""
-
-#: src/server/gnunetd.c:106
-#, fuzzy, c-format
-msgid "`%s' startup complete.\n"
-msgstr "`%s'Byuzuye"
-
-#: src/server/gnunetd.c:111
-#, fuzzy, c-format
-msgid "`%s' is shutting down.\n"
-msgstr "`%s'ni Hasi"
-
-#: src/server/handler.c:367
-#, fuzzy, c-format
-msgid "Received corrupt message from peer `%s'in %s:%d.\n"
-msgstr "Ubutumwa Bivuye in"
-
-#: src/server/startup.c:196
-#, fuzzy, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr "Kubaza... BYAKIRIWE Bivuye Umukiriya ni"
-
-#: src/server/startup.c:324
-#, fuzzy, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
-msgstr "a Izina: kugirango i IDOSIYE in Icyiciro"
-
-#: src/server/startup.c:339
-#, fuzzy, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr "OYA Kwandika Kuri IDOSIYE"
-
-#: src/server/startup.c:443
-#, fuzzy
-msgid ""
-"run in debug mode; gnunetd will not daemonize and error messages will be "
-"written to stderr instead of a logfile"
-msgstr "Gukoresha in Kosora amakosa Ubwoko OYA Na Ikosa Ubutumwa Kuri Bya a"
-
-#: src/server/startup.c:456
-#, fuzzy
-msgid "Starts the gnunetd daemon."
-msgstr "i"
-
-#: src/server/startup.c:470
-#, fuzzy, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr "OYA Guhindura>> Kuri"
-
-#: src/server/startup.c:479
-#, fuzzy, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Guhindura>> Ukoresha: Itsinda Kuri"
-
-#: src/server/startup.c:580
-#, fuzzy
-msgid "Invalid command-line arguments:\n"
-msgstr "Komandi: Umurongo ingingo"
-
-#: src/server/startup.c:583
-#, c-format
-msgid "Argument %d: `%s'\n"
-msgstr ""
-
-#: src/server/startup.c:589
-#, fuzzy
-msgid "Invalid command-line arguments.\n"
-msgstr "Komandi: Umurongo ingingo"
-
 #: src/server/tcpserver.c:422
 #, fuzzy, c-format
 msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
@@ -4067,248 +3548,123 @@
 msgid "%s failed, message type %d already in use.\n"
 msgstr "%sByanze Ubutumwa Ubwoko in Gukoresha"
 
-#: src/transports/ip6.c:60 src/util/configuration.c:925
+#: src/server/handler.c:367
 #, fuzzy, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "OYA Gushaka Bya Ubuturo"
+msgid "Received corrupt message from peer `%s'in %s:%d.\n"
+msgstr "Ubutumwa Bivuye in"
 
-#: src/transports/ip6.c:100
-#, fuzzy, c-format
-msgid "Could not resolve `%s': %s\n"
-msgstr "OYA"
-
-#: src/transports/ip6.c:138
+#: src/server/gnunet-peer-info.c:95
 #, fuzzy
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr "OYA Rusange Aderesi"
+msgid "Print information about GNUnet peers."
+msgstr "Ibisobanuro Ibyerekeye"
 
-#: src/transports/http.c:601
-#, fuzzy
-msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
-msgstr "Itegerejwe Urakaza neza ku HTTP Ukwihuza Ukwihuza"
-
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
 #, fuzzy, c-format
-msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\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"
-". 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 "Could not get address of peer `%s'.\n"
+msgstr "OYA Kubona Aderesi Bya"
 
-#: src/transports/http.c:1101
+#: src/server/gnunet-peer-info.c:153
 #, fuzzy
-msgid "HTTP: Could not determine my public IP address.\n"
-msgstr "OYA Rusange Aderesi"
+msgid "hello message invalid (signature invalid).\n"
+msgstr "Ubutumwa Sibyo Isinya Sibyo"
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
-#: src/util/tcpio.c:188
+#: src/server/gnunet-peer-info.c:164
 #, 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 "Peer `%s' with trust %8u and address `%s'\n"
+msgstr "Na: Na Aderesi"
 
-#: src/transports/http.c:1333
+#: src/util/cron/cron.c:355
 #, fuzzy, c-format
 msgid ""
-"Could not bind the HTTP listener to port %d. No transport service started.\n"
-msgstr "OYA i Kuri Umuyoboro Serivisi"
+"`%s' called with cron job not in queue, adding.  This may not be what you "
+"want.\n"
+msgstr "`%s'Na: OYA in Umurongo Wongera Gicurasi OYA"
 
-#: src/transports/http.c:1478
-#, fuzzy
-msgid "# bytes received via HTTP"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
-
-#: src/transports/http.c:1480
-#, fuzzy
-msgid "# bytes sent via HTTP"
-msgstr "#Bayite Yoherejwe:"
-
-#: src/transports/http.c:1482
-msgid "# bytes dropped by HTTP (outgoing)"
-msgstr ""
-
-#: src/transports/smtp.c:297
+#: src/util/crypto/hostkey_gcrypt.c:1031
 #, fuzzy, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr "OYA Izina: Bya Seriveri"
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "Isinya Byanze ku"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
+#: src/util/crypto/locking_gcrypt.c:47
 #, fuzzy, c-format
-msgid ""
-"You must specify the name of a pipe for the SMTP transport in section `%s' "
-"under `%s'.\n"
-msgstr "i Izina: Bya a kugirango i in Icyiciro"
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "OYA i Ikitezwe: Verisiyo Verisiyo ni Bya ngombwa"
 
-#: src/transports/smtp.c:489
-#, fuzzy
-msgid "Received malformed message via SMTP (size mismatch).\n"
-msgstr "Ubutumwa Biturutse Ingano"
-
-#: src/transports/smtp.c:584
-#, fuzzy
-msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
-msgstr "Muyunguruzi... kugirango E Ubutumwa Kurema"
-
-#: src/transports/smtp.c:591
+#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
 #, fuzzy, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr "Muyunguruzi... Ikurikiranyanyuguti Kuri Kuri"
+msgid "Failed to parse interface data from `%s'.\n"
+msgstr "Kuri Ibyatanzwe Bivuye ku"
 
-#: src/transports/smtp.c:764
+#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
 #, fuzzy, c-format
-msgid "Sending E-mail to `%s' failed.\n"
-msgstr "E Ubutumwa Kuri Byanze"
-
-#: src/transports/smtp.c:815
-#, fuzzy, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
-msgstr "Seriveri Kohereza ku"
-
-#: src/transports/smtp.c:838
-#, fuzzy, c-format
 msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr "OYA Kohereza Iyemeza kugirango Kubaza..."
+"No network interfaces defined in configuration section `%s' under `%s'!\n"
+msgstr "urusobe in Iboneza Icyiciro"
 
-#: src/transports/smtp.c:844
-#, fuzzy, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr "Kuri Kohereza Ubutumwa Kuri"
+#: src/util/os/semaphore.c:213
+#, c-format
+msgid "Can't create semaphore: %i"
+msgstr ""
 
-#: src/transports/smtp.c:903
-#, fuzzy, c-format
-msgid "%.*s filter %s (SMTP)"
+#: src/util/os/dso.c:75
+#, c-format
+msgid ""
+"Cannot determine plugin path, application must be installed in directory "
+"ending with `%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"
-"."
 
-#: src/transports/smtp.c:932 src/transports/udp.c:722
-#: src/transports/udp6.c:699
+#: src/util/os/dso.c:97
 #, fuzzy, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
-msgstr "kugirango ni Byo hasi OYA"
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Bya Byanze"
 
-#: src/transports/tcp.c:465
+#: src/util/os/dso.c:134
 #, fuzzy, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
-msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "`%s'Byanze kugirango Isomero ku Na: Ikosa"
 
-#: src/transports/tcp.c:499
+#: src/util/os/dso.c:176
 #, fuzzy, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza"
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "`%s'Byanze Kuri Uburyo ku Na: Ikosa"
 
-#: src/transports/tcp.c:1082
+#: src/util/os/cpustatus.c:274
 #, fuzzy
-msgid "Could not determine my public IP address.\n"
-msgstr "OYA Rusange Aderesi"
+msgid "Cannot query the CPU usage (Windows NT).\n"
+msgstr "Ikibazo# i Ikoresha:"
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
-#, fuzzy, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr "Kuri Gutangira Serivisi ku Umuyoboro"
-
-#: src/transports/tcp.c:1449
+#: src/util/os/cpustatus.c:293
 #, fuzzy
-msgid "# bytes received via TCP"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+msgid "Cannot query the CPU usage (Win 9x)\n"
+msgstr "Ikibazo# i Ikoresha:"
 
-#: src/transports/tcp.c:1451
-#, fuzzy
-msgid "# bytes sent via TCP"
-msgstr "#Bayite Yoherejwe:"
-
-#: src/transports/tcp.c:1453
-msgid "# bytes dropped by TCP (outgoing)"
+#: src/util/os/installpath.c:172
+msgid ""
+"Cannot determine the path to the executable, your system may be broken or "
+"not supported.\n"
 msgstr ""
 
-#: src/transports/tcp6.c:439
-#, fuzzy
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr "Itegerejwe Urakaza neza Ubutumwa ku Ukwihuza"
-
-#: src/transports/tcp6.c:469
-#, fuzzy
+#: src/util/os/installpath.c:211
 msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr "Ubutumwa Bivuye Ukwihuza Ukwihuza"
+"GNUnet executables are not in a directory named 'bin'. This may signal a "
+"broken installation.\n"
+msgstr ""
 
-#: src/transports/tcp6.c:657 src/transports/udp6.c:334
-#, fuzzy, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr "Ukwihuza Bivuye Aderesi"
+#: src/util/os/installpath.c:222
+msgid "Cannot determine the installation prefix. Unknown error.\n"
+msgstr ""
 
-#: src/transports/tcp6.c:958
-#, fuzzy
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "OYA Rusange Aderesi"
+#: src/util/network/tcpio.c:100
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
 
-#: src/transports/tcp6.c:1002
-#, fuzzy, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "`%s':Kitazwi Serivisi"
-
-#: src/transports/udp.c:145 src/transports/udp6.c:128
-#, fuzzy, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
-msgstr "Umuyoboro Kuri Kuri in Iboneza IDOSIYE in Icyiciro Cyangwa in"
-
-#: src/transports/udp.c:179
-#, fuzzy, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Kuri Kuri Umuyoboro"
-
-#: src/transports/udp.c:250
-#, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
+#: src/util/network/tcpio.c:124
+msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/transports/udp.c:307
+#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
 #, fuzzy, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+msgid "Cannot connect to %s:u: %s\n"
 msgstr ""
 "Project- Id- Version: basctl\n"
 "POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
@@ -4326,585 +3682,874 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: src/transports/udp.c:332
+#: src/util/network/tcpio.c:406
 #, fuzzy, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
-"Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-". Project- Id- Version: basctl\n"
-"POT- Creation- Date: 2003- 12- 07 17: 13+ 02\n"
-"PO- Revision- Date: 2004- 11- 04 10: 13- 0700\n"
-"Last- Translator: Language- Team:< en@ li. org> MIME- Version: 1. 0\n"
-"Content- Type: text/ plain; charset= UTF- 8\n"
-"Content- Transfer- Encoding: 8bit\n"
-"X- Generator: KBabel 1. 0\n"
-"."
+msgid "`%s' failed, reply invalid!\n"
+msgstr "`%s'Byanze Subiza Sibyo"
 
-#: src/transports/udp.c:417
-#, fuzzy
-msgid "UDP: Could not determine my public IP address.\n"
-msgstr "OYA Rusange Aderesi"
+#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
+#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#, fuzzy, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Imiterere kugirango"
 
-#: src/transports/udp.c:551
+#: src/util/network/ipcheck.c:156
 #, 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 "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "urusobe ni OYA By'amategeko in"
 
-#: src/transports/udp.c:707
-#, fuzzy
-msgid "# bytes received via UDP"
-msgstr "#Bayite BYAKIRIWE Bya Ubwoko"
+#: src/util/network/ipcheck.c:217
+#, fuzzy, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "urusobe OYA Impera Na:"
 
-#: src/transports/udp.c:709
-#, fuzzy
-msgid "# bytes sent via UDP"
-msgstr "#Bayite Yoherejwe:"
+#: src/util/network/ipcheck.c:250
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask: %s\n"
+msgstr "Imiterere kugirango"
 
-#: src/transports/udp.c:711
-msgid "# bytes dropped by UDP (outgoing)"
-msgstr ""
+#: src/util/network/ipcheck.c:265
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network: %s\n"
+msgstr "Imiterere kugirango urusobe"
 
-#: src/transports/ip.c:124
+#: src/util/disk/storage.c:194
 #, fuzzy, c-format
-msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
-msgstr "OYA Gushaka in Kuri Gushaka"
+msgid "`%s' failed for drive `%s': %u\n"
+msgstr "`%s'Byanze kugirango Porogaramu- shoboza"
 
-#: src/transports/ip.c:149
+#: src/util/disk/storage.c:240
 #, fuzzy, c-format
-msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-msgstr "OYA kugirango ikoresha"
+msgid "Expected `%s' to be a directory\n"
+msgstr "`%s'Ikitezwe: Kuri a bushyinguro"
 
-#: src/transports/ip.c:193
+#: src/util/disk/storage.c:279
 #, fuzzy, c-format
-msgid "Could not find an IP address for interface `%s'.\n"
-msgstr "OYA Gushaka Aderesi kugirango"
+msgid "Expected `%s' to be a regular file\n"
+msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
 
-#: src/transports/ip.c:203
+#: src/util/disk/storage.c:486
 #, fuzzy, c-format
-msgid ""
-"There is more than one IP address specified for interface `%s'.\n"
-"GNUnet will use %u.%u.%u.%u.\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"
-". 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 "expected `%s' to be a directory!\n"
+msgstr "`%s'Ikitezwe: Kuri a bushyinguro"
 
-#: src/transports/ip.c:224
+#: src/util/config_impl/impl.c:256
 #, fuzzy, c-format
-msgid "Could not resolve `%s' to determine our IP address: %s\n"
-msgstr "OYA Kuri Aderesi"
+msgid "Syntax error in configuration file `%s' at line %d.\n"
+msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
 
-#: src/transports/ip.c:256
+#: src/util/config_impl/impl.c:412
 #, c-format
-msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgid ""
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
+#: src/util/config_impl/impl.c:424
+#, c-format
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
 msgstr ""
 
-#: src/transports/udp6.c:164
-#, fuzzy, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
-msgstr "Kuri Kuri Umuyoboro"
-
-#: src/transports/udp6.c:235
+#: src/util/config_impl/impl.c:494
 #, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/transports/udp6.c:290
-#, fuzzy, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr "Sibyo Ubutumwa Bivuye"
+#: src/util/error/error.c:138 src/util/error/error.c:182
+msgid "DEBUG"
+msgstr ""
 
-#: src/transports/udp6.c:321
-#, fuzzy, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr "BYAKIRIWE Bivuye Byanze Imiterere Kugenzura..."
+#: src/util/error/error.c:141 src/util/error/error.c:184
+msgid "STATUS"
+msgstr ""
 
-#: src/transports/udp6.c:415
-#, fuzzy
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr "OYA Rusange Aderesi"
+#: src/util/error/error.c:144 src/util/error/error.c:186
+msgid "WARNING"
+msgstr ""
 
-#: src/util/configuration.c:182
-#, fuzzy, c-format
-msgid "inlining configration file `%s'\n"
-msgstr "IDOSIYE"
+#: src/util/error/error.c:147 src/util/error/error.c:188
+msgid "ERROR"
+msgstr ""
 
-#: src/util/configuration.c:186
-#, fuzzy, c-format
-msgid "Could not parse configuration file `%s'.\n"
-msgstr "OYA Iboneza IDOSIYE"
+#: src/util/error/error.c:150 src/util/error/error.c:190
+msgid "FATAL"
+msgstr ""
 
-#: src/util/configuration.c:222
-#, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %d.\n"
-msgstr "Ikosa in Iboneza IDOSIYE ku Umurongo"
+#: src/util/error/error.c:153 src/util/error/error.c:192
+#, fuzzy
+msgid "USER"
+msgstr "Umubare"
 
-#: src/util/configuration.c:515 src/util/configuration.c:524
-#, c-format
-msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
+#: src/util/error/error.c:156 src/util/error/error.c:194
+msgid "ADMIN"
 msgstr ""
 
-#: src/util/configuration.c:521
-#, fuzzy
-msgid ""
-"Configuration file not found. Please run GNUnet Setup (Client Configuration) "
-"first."
+#: src/util/error/error.c:159 src/util/error/error.c:196
+msgid "DEVELOPER"
 msgstr ""
-"IDOSIYE OYA Byabonetse Kuri Kurema i Mburabuzi Iboneza IDOSIYE ku Ahantu"
 
-#: src/util/configuration.c:528
-#, fuzzy, c-format
-msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
-msgstr "Gufungura Iboneza IDOSIYE"
+#: src/util/error/error.c:162 src/util/error/error.c:198
+msgid "REQUEST"
+msgstr ""
 
-#: src/util/configuration.c:532
-#, fuzzy, c-format
-msgid "Cannot open configuration file `%s'.\n"
-msgstr "Gufungura Iboneza IDOSIYE"
+#: src/util/error/error.c:165 src/util/error/error.c:200
+msgid "BULK"
+msgstr ""
 
-#: src/util/cron.c:189
-msgid "Stopping cron\n"
+#: src/util/error/error.c:168 src/util/error/error.c:202
+msgid "IMMEDIATE"
 msgstr ""
 
-#: src/util/cron.c:199
-msgid "Cron stopped\n"
+#: src/util/error/error.c:171
+msgid "ALL"
 msgstr ""
 
-#: src/util/cron.c:348
+#: src/util/error/error.c:203
+msgid "NOTHING"
+msgstr ""
+
+#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
 #, fuzzy, c-format
-msgid ""
-"`%s' called with cron job not in queue, adding.  This may not be what you "
-"want.\n"
-msgstr "`%s'Na: OYA in Umurongo Wongera Gicurasi OYA"
+msgid "Invalid argument for `%s'.\n"
+msgstr "Inkoresha siyo"
 
-#: src/util/dso.c:43
+#: src/util/threads/mutex.c:136
 #, fuzzy, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Bya Byanze"
+msgid "Deadlock due to `%s'.\n"
+msgstr "Kuri ku"
 
-#: src/util/dso.c:98
+#: src/util/threads/mutex.c:156
 #, fuzzy, c-format
-msgid "`%s' failed for library `%s' at %s:%d with error: %s\n"
-msgstr "`%s'Byanze kugirango Isomero ku Na: Ikosa"
+msgid "Permission denied for `%s'.\n"
+msgstr "kugirango ku"
 
-#: src/util/dso.c:152
+#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
+#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
+#: src/util/threads/pthread.c:275
 #, fuzzy, c-format
-msgid "`%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
-msgstr "`%s'Byanze Kuri Uburyo ku Na: Ikosa"
+msgid "`%s' failed with error code %s: %s\n"
+msgstr "`%s'Byanze ku Na: Ikosa"
 
-#: src/util/getopt.c:641
+#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
 #, fuzzy, c-format
+msgid "`%s' failed with error code %d: %s\n"
+msgstr "`%s'Byanze ku Na: Ikosa"
+
+#: src/util/loggers/memory.c:71
+msgid "Out of memory (for logging)"
+msgstr ""
+
+#: src/util/getopt/getopt.c:686
+#, fuzzy, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: src/util/getopt.c:665
+#: src/util/getopt/getopt.c:710
 #, fuzzy, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s:Ihitamo OYA Kwemerera"
 
-#: src/util/getopt.c:670
+#: src/util/getopt/getopt.c:715
 #, fuzzy, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s:Ihitamo OYA Kwemerera"
 
-#: src/util/getopt.c:687 src/util/getopt.c:861
+#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
 #, fuzzy, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt.c:717
+#: src/util/getopt/getopt.c:762
 #, fuzzy, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt.c:721
+#: src/util/getopt/getopt.c:766
 #, fuzzy, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt.c:747
+#: src/util/getopt/getopt.c:792
 #, fuzzy, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt.c:750
+#: src/util/getopt/getopt.c:795
 #, fuzzy, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s:Sibyo Ihitamo"
 
-#: src/util/getopt.c:780 src/util/getopt.c:910
+#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s:Ihitamo"
 
-#: src/util/getopt.c:827
+#: src/util/getopt/getopt.c:872
 #, fuzzy, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s:Ihitamo ni"
 
-#: src/util/getopt.c:845
+#: src/util/getopt/getopt.c:890
 #, fuzzy, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s:Ihitamo OYA Kwemerera"
 
-#: src/util/hostkey_gcrypt.c:937
+#: src/util/getopt/printhelp.c:49
 #, fuzzy, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "Isinya Byanze ku"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr "kugirango Amahitamo kugirango Amahitamo"
 
-#: src/util/initialize.c:229
-#, fuzzy
-msgid "Shutdown complete.\n"
-msgstr "Byuzuye"
+#: src/util/string/string.c:101
+msgid "ms"
+msgstr ""
 
-#: src/util/io.c:35
-#, c-format
-msgid "Caught signal %d.\n"
+#: src/util/string/string.c:106
+msgid "s"
 msgstr ""
 
-#: src/util/random.c:38
-#, fuzzy, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "OYA i Ikitezwe: Verisiyo Verisiyo ni Bya ngombwa"
+#: src/util/string/string.c:109
+msgid "m"
+msgstr ""
 
-#: src/util/ipcheck.c:100
-#, fuzzy, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Imiterere kugirango"
+#: src/util/string/string.c:112
+msgid "h"
+msgstr ""
 
-#: src/util/ipcheck.c:150
-#, fuzzy, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "urusobe ni OYA By'amategeko in"
+#: src/util/string/string.c:115
+#, fuzzy
+msgid " days"
+msgstr "7 Iminsi"
 
-#: src/util/ipcheck.c:164
-#, fuzzy, c-format
-msgid "Invalid network notation (additional characters: `%s')."
-msgstr "urusobe Inyuguti"
-
-#: src/util/ipcheck.c:235
-#, fuzzy, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "urusobe OYA Impera Na:"
-
-#: src/util/ipcheck.c:267
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask: %s\n"
-msgstr "Imiterere kugirango"
-
-#: src/util/ipcheck.c:281
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network: %s\n"
-msgstr "Imiterere kugirango urusobe"
-
-#: src/util/logging.c:90
-msgid "NOTHING"
+#: src/util/string/string.c:133
+msgid "b"
 msgstr ""
 
-#: src/util/logging.c:91
-msgid "FATAL"
+#: src/util/string/string.c:138
+msgid "KiB"
 msgstr ""
 
-#: src/util/logging.c:92
-msgid "ERROR"
+#: src/util/string/string.c:141
+msgid "MiB"
 msgstr ""
 
-#: src/util/logging.c:93
-msgid "FAILURE"
+#: src/util/string/string.c:144
+msgid "GiB"
 msgstr ""
 
-#: src/util/logging.c:94
-msgid "WARNING"
+#: src/util/string/string.c:147
+msgid "TiB"
 msgstr ""
 
-#: src/util/logging.c:95
-msgid "MESSAGE"
+#: src/util/string/string.c:267
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/logging.c:96
-msgid "INFO"
+#: src/setup/gnunet-setup.c:82
+msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/util/logging.c:97
-msgid "DEBUG"
+#: src/setup/gnunet-setup.c:90
+msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/util/logging.c:98
-msgid "CRON"
+#: src/setup/gnunet-setup.c:91
+#, c-format
+msgid "Available MODEs:\n"
 msgstr ""
 
-#: src/util/logging.c:99
-msgid "EVERYTHING"
+#: src/setup/gnunet-setup.c:92
+#, fuzzy, c-format
+msgid " config\t\ttext-based configuration\n"
+msgstr "A bushyinguro"
+
+#: src/setup/gnunet-setup.c:94
+#, c-format
+msgid " menuconfig\ttext-based menu\n"
 msgstr ""
 
-#: src/util/logging.c:285
+#: src/setup/gnunet-setup.c:96
 #, c-format
-msgid "Invalid LOGLEVEL `%s' specified.\n"
+msgid " wizard-curses\tBasic text-based graphical configuration\n"
 msgstr ""
 
-#: src/util/logging.c:377 src/util/logging.c:383
+#: src/setup/gnunet-setup.c:99
 #, fuzzy, c-format
-msgid "Failure at %s:%d.\n"
-msgstr "ku"
+msgid " gconfig\tGTK configuration\n"
+msgstr "A bushyinguro"
 
-#: src/util/port.c:47
-#, fuzzy, c-format
+#: src/setup/gnunet-setup.c:100
+#, c-format
 msgid ""
-"Cannot determine port of gnunetd server. Define in configuration file in "
-"section `%s' under `%s'.\n"
-msgstr "Umuyoboro Bya Seriveri in Iboneza IDOSIYE in Icyiciro"
+" wizard-gtk\tBasic GTK configuration\n"
+"\n"
+msgstr ""
 
-#: src/util/printhelp.c:42
+#: src/setup/gnunet-setup.c:167
 #, fuzzy, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
-msgstr "Ikoresha:"
+msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
+msgstr "OYA Iboneza IDOSIYE"
 
-#: src/util/printhelp.c:45
+#: src/setup/gnunet-setup.c:224
+#, fuzzy
+msgid "No interface specified, using default\n"
+msgstr "imbonerahamwe# Izina: ikoresha"
+
+#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
+#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
 #, fuzzy, c-format
+msgid "`%s' is not available."
+msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
+
+#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
+#, c-format
 msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "kugirango Amahitamo kugirango Amahitamo"
+"Can only run wizard to configure gnunetd.\n"
+"Did you forget the `%s' option?\n"
+msgstr ""
 
-#: src/util/semaphore.c:172 src/util/semaphore.c:198
+#: src/setup/gnunet-setup.c:285
 #, fuzzy, c-format
-msgid "Invalid argument for `%s' at %s:%d.\n"
-msgstr "kugirango ku"
+msgid "Unknown operation `%s'\n"
+msgstr "Imiterere Verisiyo"
 
-#: src/util/semaphore.c:176
+#: src/setup/wizard_gtk.c:429
 #, fuzzy, c-format
-msgid "Deadlock due to `%s' at %s:%d.\n"
-msgstr "Kuri ku"
+msgid "Unable to save configuration file `%s':"
+msgstr "OYA Iboneza IDOSIYE"
 
-#: src/util/semaphore.c:202
-#, fuzzy, c-format
-msgid "Permission denied for `%s' at %s:%d.\n"
-msgstr "kugirango ku"
+#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
+msgid "Unable to create user account:"
+msgstr ""
 
-#: src/util/semaphore.c:452 src/util/semaphore.c:459
+#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
+msgid "Unable to change startup process:"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:109
+#, c-format
+msgid "GNUnet service installed successfully.\n"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:112 src/setup/gnunet-win-tool.c:139
+#, c-format
+msgid "This version of Windows doesn't support services.\n"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:116 src/setup/gnunet-win-tool.c:143
+#, c-format
+msgid "Error: can't open Service Control Manager: %s\n"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:121
+#, c-format
+msgid "Error: can't create service: %s\n"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:155
 #, fuzzy, c-format
-msgid "`%s' failed with error code %s: %s"
-msgstr "`%s'Byanze ku Na: Ikosa"
+msgid "Unknown error.\n"
+msgstr "Verisiyo"
 
-#: src/util/semaphore.c:466
+#: src/setup/gnunet-win-tool.c:136
 #, fuzzy, c-format
-msgid "`%s' failed with error code %d: %s"
-msgstr "`%s'Byanze ku Na: Ikosa"
+msgid "Service deleted.\n"
+msgstr "/Byahiswemo"
 
-#: src/util/semaphore.c:604
+#: src/setup/gnunet-win-tool.c:148
 #, c-format
-msgid "Can't create semaphore: %i"
+msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/util/state.c:86
+#: src/setup/gnunet-win-tool.c:152
+#, c-format
+msgid "Error: can't delete service: %s\n"
+msgstr ""
+
+#: src/setup/conf.c:522 src/setup/recreate.c:135
 #, fuzzy, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
-msgstr "IDOSIYE a bushyinguro kugirango Kuri Ibyatanzwe"
+msgid "Unable to save configuration file `%s': %s.\n"
+msgstr "OYA Iboneza IDOSIYE"
 
-#: src/util/statuscalls.c:185
+#: src/setup/conf.c:529
 #, fuzzy, c-format
-msgid "Failed to parse interface data from `%s' at %s:%d.\n"
-msgstr "Kuri Ibyatanzwe Bivuye ku"
+msgid "Configuration file `%s' created.\n"
+msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/util/statuscalls.c:489
+#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
+#: src/setup/wizard_util.c:193
+msgid "Error"
+msgstr ""
+
+#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
+#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
+#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
+#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
+#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
+#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
+#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
+#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
 #, fuzzy
-msgid "Cannot query the CPU usage (Windows NT).\n"
-msgstr "Ikibazo# i Ikoresha:"
+msgid "GNUnet configuration"
+msgstr "A bushyinguro"
 
-#: src/util/statuscalls.c:507
+#: src/setup/wizard_curs.c:117
+msgid ""
+"Welcome to GNUnet!\n"
+"\n"
+"This assistant will ask you a few basic questions in order to configure "
+"GNUnet.\n"
+"\n"
+"Please visit our homepage at\n"
+"\thttp://gnunet.org/\n";
+"and join our community at\n"
+"\thttp://gnunet.org/drupal/\n";
+"\n"
+"Have a lot of fun,\n"
+"\n"
+"the GNUnet team"
+msgstr ""
+
+#: src/setup/wizard_curs.c:132
+msgid ""
+"Choose the network interface that connects your computer to the internet "
+"from the list below."
+msgstr ""
+
+# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
+#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
+#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
 #, fuzzy
-msgid "Cannot query the CPU usage (Win 9x)\n"
-msgstr "Ikibazo# i Ikoresha:"
+msgid "Help"
+msgstr "/Kugoboka"
 
-#: src/util/statuscalls.c:600
-#, fuzzy, c-format
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
 msgid ""
-"No network interfaces defined in configuration section `%s' under `%s'!\n"
-msgstr "urusobe in Iboneza Icyiciro"
+"The \"Network interface\" is the device that connects your computer to the "
+"internet. This is usually a modem, an ISDN card or a network card in case "
+"you are using DSL."
+msgstr ""
 
-#: src/util/storage.c:212
-#, fuzzy, c-format
-msgid "`%s' failed for drive %s: %u\n"
-msgstr "`%s'Byanze kugirango Porogaramu- shoboza"
+#: src/setup/wizard_curs.c:185
+msgid ""
+"What is the name of the network interface that connects your computer to the "
+"Internet?"
+msgstr ""
 
-#: src/util/storage.c:310
-#, fuzzy, c-format
-msgid "`%s' is not a regular file.\n"
-msgstr "`%s'ni OYA a Ibisanzwe IDOSIYE"
+#: src/setup/wizard_curs.c:222
+msgid ""
+"What is this computer's public IP address or hostname?\n"
+"\n"
+"If in doubt, leave this empty."
+msgstr ""
 
-#: src/util/storage.c:564
-#, fuzzy, c-format
-msgid "`%s' expected `%s' to be a directory!\n"
-msgstr "`%s'Ikitezwe: Kuri a bushyinguro"
+#: src/setup/wizard_curs.c:229
+msgid ""
+"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
+"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
+"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
+"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
+"enter it here.\n"
+"If in doubt, leave the field empty. GNUnet will then try to determine your "
+"IP-Address."
+msgstr ""
 
-#: src/util/storage.c:670
-msgid "b"
+#: src/setup/wizard_curs.c:252
+msgid ""
+"Is this machine behind NAT?\n"
+"\n"
+"If you are connected to the internet through another computer doing SNAT, a "
+"router or a \"hardware firewall\" and other computers on the internet cannot "
+"connect to this computer, say \"yes\" here. Answer \"no\" on direct "
+"connections through modems, ISDN cards and DNAT (also known as \"port "
+"forwarding\")."
 msgstr ""
 
-#: src/util/storage.c:675
-#, fuzzy
-msgid "k"
-msgstr "Oke"
+#: src/setup/wizard_curs.c:278
+msgid "How much upstream (Bytes/s) may be used?"
+msgstr ""
 
-#: src/util/storage.c:678 src/util/timer.c:198
-msgid "m"
+#: src/setup/wizard_curs.c:283
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"upstream\" is the data channel through which data is *sent* to the "
+"internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate, you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 
-#: src/util/storage.c:681
-msgid "g"
+#: src/setup/wizard_curs.c:310
+msgid "How much downstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/util/storage.c:684
-msgid "t"
+#: src/setup/wizard_curs.c:316
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"The \"downstream\" is the data channel through which data is *received* from "
+"the internet. The limit is either the total maximum for this computer or how "
+"much GNUnet itself is allowed to use. You can specify that later. If you "
+"have a flatrate you can set it to the maximum speed of your internet "
+"connection."
 msgstr ""
 
-#: src/util/string.c:108
-msgid "unknown"
-msgstr "itazwi"
+#: src/setup/wizard_curs.c:338
+msgid ""
+"Share denoted bandwidth with other applications?\n"
+"\n"
+"Say \"yes\" here, if you don't want other network traffic to interfere with "
+"GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage to "
+"values entered in the previous steps, or if you can't reliably measure the "
+"maximum capabilities of your connection. \"No\" can be very useful if other "
+"applications are causing a lot of traffic on your LAN.  In this case, you do "
+"not want to limit the traffic that GNUnet can inflict on your internet "
+"connection whenever your high-speed LAN gets used (e.g. by NFS)."
+msgstr ""
 
-#: src/util/string.c:111
-msgid "GiB"
+#: src/setup/wizard_curs.c:370
+msgid "How much CPU (in %) may be used?"
 msgstr ""
 
-#: src/util/string.c:114
-msgid "MiB"
+#: src/setup/wizard_curs.c:376
+msgid ""
+"You can limit GNUnet's resource usage here.\n"
+"\n"
+"This is the percentage of processor time GNUnet is allowed to use."
 msgstr ""
 
-#: src/util/string.c:117
-msgid "KiB"
+#: src/setup/wizard_curs.c:395
+msgid ""
+"Store migrated content?\n"
+"\n"
+"GNUnet is able to store data from other peers in your datastore. This is "
+"useful if an adversary has access to your inserted content and you need to "
+"deny that the content is yours. With \"content migration\" on, the content "
+"could have \"migrated\" over the internet to your node without your "
+"knowledge.\n"
+"It also helps to spread popular content over different peers to enhance "
+"availability."
 msgstr ""
 
-#: src/util/string.c:120
-msgid "Bytes"
+#: src/setup/wizard_curs.c:424
+msgid ""
+"What's the maximum datastore size in MB?\n"
+"\n"
+"The GNUnet datastore contains all data that GNUnet generates (index data, "
+"inserted and migrated content)."
 msgstr ""
 
-#: src/util/tcp_return.c:51
-#, fuzzy, c-format
-msgid "`%s' failed, other side closed connection.\n"
-msgstr "`%s'Byanze Ikindi Ukwihuza"
+#: src/setup/wizard_curs.c:447
+msgid ""
+"Do you want to launch GNUnet as a system service?\n"
+"\n"
+"If you say \"yes\" here, the GNUnet background process will be automatically "
+"started when you turn on your computer. If you say \"no\" here, you have to "
+"launch GNUnet yourself each time you want to use it."
+msgstr ""
 
-#: src/util/tcp_return.c:58
+#: src/setup/wizard_curs.c:502
+msgid ""
+"Define the user owning the GNUnet service.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new user "
+"account under which the GNUnet service is started at system startup.\n"
+"\n"
+"However, GNUnet may not be able to access files other than its own. This "
+"includes files you want to publish in GNUnet. You'll have to grant read "
+"permissions to the user specified below.\n"
+"\n"
+"Leave the fields empty to run GNUnet with system privileges.\n"
+"\n"
+"GNUnet user:"
+msgstr ""
+
+#: src/setup/wizard_curs.c:564
+msgid ""
+"Define the group owning the GNUnet service.\n"
+"\n"
+"For security reasons, it is a good idea to let this setup create a new group "
+"for the chosen user account.\n"
+"\n"
+"You can also specify a already existant group here.\n"
+"\n"
+"Only members of this group will be allowed to start and stop the the GNUnet "
+"server and have access to GNUnet server data.\n"
+"\n"
+"GNUnet group:"
+msgstr ""
+
+#: src/setup/wizard_curs.c:595
+msgid ""
+"If you are an experienced user, you may want to tweak your GNUnet "
+"installation using the enhanced configurator.\n"
+"\n"
+"Do you want to start it after saving your configuration?"
+msgstr ""
+
+#: src/setup/wizard_curs.c:632
 #, fuzzy, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "`%s'Byanze Subiza Sibyo"
+msgid ""
+"Unable to save configuration file %s: %s.\n"
+"\n"
+"Try again?"
+msgstr "Gufungura Iboneza IDOSIYE"
 
-#: src/util/timer.c:190
-msgid "ms"
+#: src/setup/confdata.c:93
+#, c-format
+msgid "%s: symbol value `%s' invalid for %s\n"
 msgstr ""
 
-#: src/util/timer.c:195
-msgid "s"
+#: src/setup/wizard_util.c:119
+msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/util/timer.c:201
-msgid "h"
+#: src/setup/wizard_util.c:124
+msgid "Can't create service"
 msgstr ""
 
-#: src/util/timer.c:204
+#: src/setup/wizard_util.c:129
+msgid "Error changing the permissions of the GNUnet directory"
+msgstr ""
+
+#: src/setup/wizard_util.c:134
+msgid "Cannot write to the regisitry"
+msgstr ""
+
+#: src/setup/wizard_util.c:137
+msgid "Can't access the service"
+msgstr ""
+
+#: src/setup/wizard_util.c:141
+msgid "Can't delete the service"
+msgstr ""
+
+#: src/setup/wizard_util.c:145
 #, fuzzy
-msgid " days"
-msgstr "7 Iminsi"
+msgid "Unknown error"
+msgstr "Verisiyo"
 
-#: src/util/daemon.c:142
+#: src/setup/wizard_util.c:176
+msgid "This version of Windows does not support multiple users."
+msgstr ""
+
+#: src/setup/wizard_util.c:180
+#, fuzzy
+msgid "Error creating user"
+msgstr "Ivugurura Verisiyo"
+
+#: src/setup/wizard_util.c:183
+msgid "Error accessing local security policy"
+msgstr ""
+
+#: src/setup/wizard_util.c:186
+msgid "Error granting service right to user"
+msgstr ""
+
+#: src/setup/wizard_util.c:189
+msgid "Unknown error while creating a new user"
+msgstr ""
+
+#: src/setup/gconf.c:73
+msgid "Sorry, no help is available for this option.\n"
+msgstr ""
+
+#: src/setup/glade_support.c:75
 #, fuzzy, c-format
-msgid "Attempted path to `%s' was `%s'.\n"
-msgstr "Inzira Kuri"
+msgid "Failed to find handler for `%s'\n"
+msgstr "Kuri Ibirimo Ububikoshingiro Isomero"
 
-#: src/util/xmalloc.c:52
+#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
 #, fuzzy, c-format
-msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
-msgstr "Binini Bayite ku"
+msgid "Failed to open `%s'.\n"
+msgstr "Idosiye Nka"
 
-#: src/include/gnunet_util.h:167
+#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
+#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr "Byanze ku"
+
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
+#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "`%s'Byanze ku Na: Ikosa"
+
+#: src/include/gnunet_util_error.h:207
+#, fuzzy, c-format
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr "`%s'Byanze ku IDOSIYE ku Na: Ikosa"
+
+#: src/include/gnunet_util_getopt.h:145
 #, fuzzy
 msgid "print this help"
 msgstr "Gucapa iyi Ifashayobora"
 
-#: src/include/gnunet_util.h:170
+#: src/include/gnunet_util_getopt.h:154
 #, fuzzy
-msgid "set verbosity to LEVEL"
-msgstr "Gushyiraho Kuri"
+msgid "print the version number"
+msgstr "Gucapa i Verisiyo Umubare"
 
-#: src/include/gnunet_util.h:173
+#: src/include/gnunet_util_getopt.h:160
+msgid "configure logging to use LOGRULES"
+msgstr ""
+
+#: src/include/gnunet_util_getopt.h:166
+msgid "be verbose"
+msgstr ""
+
+#: src/include/gnunet_util_getopt.h:172
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "Gukoresha Iboneza IDOSIYE"
 
-#: src/include/gnunet_util.h:176
+#: src/include/gnunet_util_getopt.h:178
 #, fuzzy
 msgid "specify host on which gnunetd is running"
 msgstr "Ubuturo ku ni"
 
-#: src/include/gnunet_util.h:179
 #, fuzzy
-msgid "print the version number"
-msgstr "Gucapa i Verisiyo Umubare"
+#~ msgid "GNUnet configuration assistant"
+#~ msgstr "A bushyinguro"
 
-#: src/include/gnunet_util.h:182
-msgid "be verbose"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Kureka"
 
-#: src/include/gnunet_util.h:637 src/include/gnunet_util.h:639
-#, fuzzy, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr "Byanze ku"
+#, fuzzy
+#~ msgid "Store migrated content"
+#~ msgstr "#GUSHAKISHA Byinjijwemo Cyangwa Ibikubiyemo"
 
-#: src/include/gnunet_util.h:1058 src/include/gnunet_util.h:1060
-#: src/include/gnunet_util.h:1067
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
-msgstr "`%s'Byanze ku IDOSIYE ku Na: Ikosa"
+#, fuzzy
+#~ msgid "Open the enhanced configurator"
+#~ msgstr "A bushyinguro"
 
 #, fuzzy
+#~ msgid "Question"
+#~ msgstr "Insobanuramiterere"
+
+#, fuzzy
+#~ msgid "gnunet-update failed!"
+#~ msgstr "/Idosiye IDOSIYE"
+
+#, fuzzy
+#~ msgid "Gtk GNUnet Configurator"
+#~ msgstr "A bushyinguro"
+
+#, fuzzy
+#~ msgid "_File"
+#~ msgstr "/Idosiye"
+
+#, fuzzy
+#~ msgid "_Quit"
+#~ msgstr "/Idosiye"
+
+#, fuzzy
+#~ msgid "_Options"
+#~ msgstr "ibirindiro"
+
+# sfx2/source\appl\newhelp.src:STR_HELP_WINDOW_TITLE.text
+#, fuzzy
+#~ msgid "_Help"
+#~ msgstr "/Kugoboka"
+
+# offmgr/source\offapp\intro\intro.hrc:TEXT_DEFAULTABOUT.text
+#, fuzzy
+#~ msgid "_About"
+#~ msgstr "Ibyerekeye"
+
+#, fuzzy
+#~ msgid "Single"
+#~ msgstr "Idosiye "
+
+#, fuzzy
+#~ msgid "Full view"
+#~ msgstr "Iyinjizamo"
+
+#, fuzzy
+#~ msgid "Collapse"
+#~ msgstr "Gufunga"
+
+#, fuzzy
+#~ msgid "inlining configration file `%s'\n"
+#~ msgstr "IDOSIYE"
+
+#, fuzzy
+#~ msgid "Could not parse configuration file `%s'.\n"
+#~ msgstr "OYA Iboneza IDOSIYE"
+
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file not found. Please run GNUnet Setup (Client "
+#~ "Configuration) first."
+#~ msgstr ""
+#~ "IDOSIYE OYA Byabonetse Kuri Kurema i Mburabuzi Iboneza IDOSIYE ku Ahantu"
+
+#, fuzzy
+#~ msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
+#~ msgstr "Gufungura Iboneza IDOSIYE"
+
+#, fuzzy
+#~ msgid "Cannot open configuration file `%s'.\n"
+#~ msgstr "Gufungura Iboneza IDOSIYE"
+
+#, fuzzy
+#~ msgid "Shutdown complete.\n"
+#~ msgstr "Byuzuye"
+
+#, fuzzy
+#~ msgid "Invalid network notation (additional characters: `%s')."
+#~ msgstr "urusobe Inyuguti"
+
+#, fuzzy
+#~ msgid "Failure at %s:%d.\n"
+#~ msgstr "ku"
+
+#, fuzzy
+#~ msgid ""
+#~ "Cannot determine port of gnunetd server. Define in configuration file in "
+#~ "section `%s' under `%s'.\n"
+#~ msgstr "Umuyoboro Bya Seriveri in Iboneza IDOSIYE in Icyiciro"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr "Ikoresha:"
+
+#, fuzzy
+#~ msgid "Invalid argument for `%s' at %s:%d.\n"
+#~ msgstr "kugirango ku"
+
+#, fuzzy
+#~ msgid "k"
+#~ msgstr "Oke"
+
+#~ msgid "unknown"
+#~ msgstr "itazwi"
+
+#, fuzzy
+#~ msgid "`%s' failed, other side closed connection.\n"
+#~ msgstr "`%s'Byanze Ikindi Ukwihuza"
+
+#, fuzzy
+#~ msgid "Attempted path to `%s' was `%s'.\n"
+#~ msgstr "Inzira Kuri"
+
+#, fuzzy
+#~ msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
+#~ msgstr "Binini Bayite ku"
+
+#, fuzzy
+#~ msgid "set verbosity to LEVEL"
+#~ msgstr "Gushyiraho Kuri"
+
+#, fuzzy
 #~ msgid "Not connected to gnunetd."
 #~ msgstr "OYA Kwihuza Kuri"
 
@@ -5366,10 +5011,6 @@
 #~ msgstr "ingano"
 
 #, fuzzy
-#~ msgid "active requests"
-#~ msgstr "Gikora"
-
-#, fuzzy
 #~ msgid "retrie per active request"
 #~ msgstr "Gikora Kubaza..."
 
@@ -5489,10 +5130,6 @@
 #~ msgstr "Izina ry'idosiye:"
 
 #, fuzzy
-#~ msgid "Insertion method:"
-#~ msgstr "Uburyo"
-
-#, fuzzy
 #~ msgid "Keyword(s) used for directory"
 #~ msgstr "S kugirango bushyinguro"
 
@@ -6722,10 +6359,6 @@
 #~ msgstr "Bya IDOSIYE Byanze"
 
 #, fuzzy
-#~ msgid "NUMBER"
-#~ msgstr "Umubare"
-
-#, fuzzy
 #~ msgid ""
 #~ "specifies the NUMBER of files that maybe downloaded in parallel for a "
 #~ "recursive download"
@@ -6753,10 +6386,6 @@
 #~ msgstr "Sibyo"
 
 #, fuzzy
-#~ msgid "Received reply of unknown type %d.\n"
-#~ msgstr "Subiza Bya Kitazwi Ubwoko"
-
-#, fuzzy
 #~ msgid "only search the namespace identified by HEX"
 #~ msgstr "Gushaka i ku"
 

Modified: GNUnet/po/sv.po
===================================================================
--- GNUnet/po/sv.po     2006-07-23 17:07:38 UTC (rev 3129)
+++ GNUnet/po/sv.po     2006-07-24 23:05:12 UTC (rev 3130)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 09:13-0700\n"
+"POT-Creation-Date: 2006-07-24 16:55-0700\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -15,321 +15,327 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/transports/ip6.c:60
 #, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:167
-msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
+#: src/transports/ip6.c:100
+#, c-format
+msgid "Could not resolve `%s': %s\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/transports/ip6.c:138
+msgid "Failed to obtain my (external) IPv6 address!\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:176
+#: src/transports/udp6.c:128 src/transports/udp.c:145
 #, c-format
-msgid "hello advertisement for protocol %d received.\n"
+msgid ""
+"Cannot determine port to bind to.  Define in configuration file in section `%"
+"s' under `%s' or in `%s' under %s/%s.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:295
-msgid "Could not send hellos+PING, ping buffer full.\n"
-msgstr ""
+#: src/transports/udp6.c:164
+#, c-format
+msgid "Failed to bind to UDP6 port %d.\n"
+msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/applications/advertising/advertising.c:308
+#: src/transports/udp6.c:235
 #, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
-msgstr "\"%s\" misslyckades (%d, %u). Kommer inte skicka PING.\n"
+msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:460
+#: src/transports/udp6.c:290
 #, c-format
-msgid "Advertising my transport %d to selected peers.\n"
-msgstr "Annonserar min transport %d till valda ändpunkter.\n"
+msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+msgstr ""
 
-#: src/applications/advertising/advertising.c:467
-msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+#: src/transports/udp6.c:321
+#, c-format
+msgid "Packet received from %s:%d (UDP6) failed format check."
 msgstr ""
 
-#: src/applications/advertising/advertising.c:569
+#: src/transports/udp6.c:334 src/transports/tcp6.c:657
 #, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+msgid "%s: Rejected connection from blacklisted address %s.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:729
-msgid "# Peer advertisements received"
+#: src/transports/udp6.c:415
+msgid "UDP6: Could not determine my public IPv6 address.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:730
-msgid "# Self advertisments transmitted"
+#: src/transports/udp6.c:699 src/transports/smtp.c:932
+#: src/transports/udp.c:722
+#, c-format
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:731
-msgid "# Foreign advertisements forwarded"
+#: src/transports/http.c:601
+msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
 msgstr ""
 
-#: src/applications/advertising/advertising.c:733
-#: src/applications/pingpong/pingpong.c:462
-msgid "# plaintext PING messages sent"
-msgstr "# PING-meddelanden i klartext skickade"
-
-#: src/applications/advertising/advertising.c:737
-#: src/applications/session/connect.c:752
+#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
 #, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
-msgstr "\"%s\" registrerar handtag %d (klartext och kryptotext)\n"
+msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
+msgstr "%s: Vägrade anslutning från svartlistad adress %u.%u.%u.%u.\n"
 
-#: src/applications/advertising/advertising.c:756
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+#: src/transports/http.c:1101
+msgid "HTTP: Could not determine my public IP address.\n"
+msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
 
-#: src/applications/advertising/advertising.c:776
+#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#, c-format
+msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/transports/http.c:1333
+#, c-format
 msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+"Could not bind the HTTP listener to port %d. No transport service started.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:81
-#: src/applications/testbed/testbed.c:1079
+#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
 #, c-format
-msgid "Invalid URL `%s' (must begin with `%s')\n"
-msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\".\n"
 
-#: src/applications/bootstrap_http/http.c:109
-#, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-msgstr ""
+#: src/transports/http.c:1478
+msgid "# bytes received via HTTP"
+msgstr "# byte mottagna via HTTP"
 
-#: src/applications/bootstrap_http/http.c:120
+#: src/transports/http.c:1480
+msgid "# bytes sent via HTTP"
+msgstr "# byte skickade via HTTP"
+
+#: src/transports/http.c:1482
+msgid "# bytes dropped by HTTP (outgoing)"
+msgstr "# byte kastade via HTTP (utgående)"
+
+#: src/transports/smtp.c:297
 #, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "Could not resolve name of SMTP server `%s': %s"
+msgstr "Kunde inte slå upp namnet för SMTP-server \"%s\": %s"
 
-#: src/applications/bootstrap_http/http.c:132
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
 #, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section `%s' "
+"under `%s'.\n"
 msgstr ""
+"Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" under "
+"\"%s\".\n"
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
+#: src/transports/smtp.c:489
+msgid "Received malformed message via SMTP (size mismatch).\n"
+msgstr ""
+
+#: src/transports/smtp.c:584
+msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
+msgstr ""
+
+# capped är inte ett bra ord IMHO
+#: src/transports/smtp.c:591
 #, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
+msgid "SMTP filter string to long, capped to `%s'\n"
+msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
-#: src/applications/bootstrap_http/http.c:217
+#: src/transports/smtp.c:764
 #, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
+msgid "Sending E-mail to `%s' failed.\n"
+msgstr "Sändning av e-post till \"%s\" misslyckades.\n"
 
-#: src/applications/bootstrap_http/http.c:252
+#: src/transports/smtp.c:815
 #, c-format
-msgid "Parsing hello from `%s' failed.\n"
+msgid "SMTP server send unexpected response at %s:%d.\n"
 msgstr ""
 
-#: src/applications/bootstrap_http/http.c:330
+#: src/transports/smtp.c:838
 #, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
-msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\". Försöker utan proxy.\n"
+msgid ""
+"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
+msgstr ""
 
-#: src/applications/bootstrap_http/http.c:355
-msgid "# hellos downloaded via http"
+#: src/transports/smtp.c:844
+#, c-format
+msgid "Failed to send `%s' request to SMTP server.\n"
 msgstr ""
 
-#: src/applications/chat/chat.c:87
-msgid "Message received from peer is invalid.\n"
-msgstr "Meddelande mottaget från motpart är ogiltig.\n"
+#: src/transports/smtp.c:903
+#, c-format
+msgid "%.*s filter %s (SMTP)"
+msgstr "%.*s filter %s (SMTP)"
 
-#: src/applications/chat/chat.c:134
-msgid "Message received from client is invalid\n"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/applications/chat/chat.c:156
-msgid "Maximum number of chat clients reached.\n"
-msgstr "Maximalt antal chattklienter uppnått.\n"
-
-#: src/applications/chat/chat.c:160
+#: src/transports/tcp.c:465
 #, 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"
+msgid ""
+"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:197
+#: src/transports/tcp.c:499
 #, c-format
-msgid "`%s' registering handlers %d and %d\n"
-msgstr "\"%s\" registrerar handtagen %d och %d\n"
+msgid ""
+"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
+msgstr ""
 
-#: src/applications/chat/chat.c:212
-msgid "enables P2P-chat (incomplete)"
-msgstr "aktiverar P2P-chatt (ej komplett)"
+#: src/transports/tcp.c:1082
+msgid "Could not determine my public IP address.\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
-msgstr "ange smeknamn"
+#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
+#, c-format
+msgid "Failed to start transport service on port %d.\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
-msgstr "Starta GNUnets chattklient."
+#: src/transports/tcp.c:1449
+msgid "# bytes received via TCP"
+msgstr "# byte mottogs via TCP"
 
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:106
-#: src/conf/gnunet-setup.c:286 src/server/gnunet-peer-info.c:107
-#: src/server/gnunet-transport-check.c:521 src/server/gnunet-update.c:142
-#: src/server/startup.c:574
-#, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Använd --help för att få en lista på flaggor.\n"
+#: src/transports/tcp.c:1451
+msgid "# bytes sent via TCP"
+msgstr "# byte skickades via TCP"
 
-#: src/applications/chat/gnunet-chat.c:151
-#: src/applications/fs/tools/gnunet-delete.c:142
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363 src/util/port.c:85
-msgid "Could not connect to gnunetd.\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
+#: src/transports/tcp.c:1453
+msgid "# bytes dropped by TCP (outgoing)"
+msgstr "# byte kastade via TCP (utgående)"
 
-#: src/applications/chat/gnunet-chat.c:155
+#: src/transports/udp.c:179
 #, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "Du måste ange ett smeknamn (använd flagga \"%s\").\n"
+msgid "Failed to bind to UDP port %d.\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
+#: src/transports/udp.c:250
+#, c-format
+msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
 msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:191
-msgid "Could not send message to gnunetd\n"
-msgstr "Kunde inte skicka meddelande till gnunetd\n"
-
-#: src/applications/datastore/datastore.c:118
+#: src/transports/udp.c:307
 #, c-format
-msgid "Availability test failed for `%s' at %s:%d.\n"
-msgstr "Tillgänglighetstest misslyckades för \"%s\" vid %s:%d.\n"
+msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+msgstr ""
 
-#: src/applications/datastore/datastore.c:142
+#: src/transports/udp.c:332
 #, c-format
-msgid "Database failed to delete `%s'.\n"
-msgstr "Databas misslyckades att ta bort \"%s\".\n"
+msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
+msgstr ""
 
-#: src/applications/datastore/filter.c:42
-#, c-format
-msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
+#: src/transports/udp.c:417
+msgid "UDP: Could not determine my public IP address.\n"
 msgstr ""
 
-#: src/applications/dht/module/cs.c:446
+#: src/transports/udp.c:551
 #, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
+msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
+msgstr ""
 
-#: src/applications/dht/module/cs.c:466
-#, c-format
-msgid "`%s' failed.  Terminating connection to client.\n"
-msgstr "\"%s\" misslyckades.  Terminerar anslutning till klient.\n"
+#: src/transports/udp.c:707
+msgid "# bytes received via UDP"
+msgstr "# byte mottagna via UDP"
 
-#: src/applications/dht/module/cs.c:542
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "sendAck misslyckades.  Terminerar anslutning till klient.\n"
+#: src/transports/udp.c:709
+msgid "# bytes sent via UDP"
+msgstr "# byte skickade via UDP"
 
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
-#, c-format
-msgid "`%s' failed. Terminating connection to client.\n"
-msgstr "\"%s\" misslyckades. Terminerar anslutning till klient.\n"
+#: src/transports/udp.c:711
+msgid "# bytes dropped by UDP (outgoing)"
+msgstr "# byte kastade via UDP (utgående)"
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/transports/ip.c:124
 #, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid ""
+"Could not find interface `%s' in `%s', trying to find another interface.\n"
+msgstr ""
 
-#: src/applications/dht/module/dht.c:946
+#: src/transports/ip.c:149
 #, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
+msgid "Could not obtain IP for interface `%s' using `%s'.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:973
+#: src/transports/ip.c:193
 #, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+msgid "Could not find an IP address for interface `%s'.\n"
+msgstr ""
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
+#: src/transports/ip.c:203
 #, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
+msgid ""
+"There is more than one IP address specified for interface `%s'.\n"
+"GNUnet will use %u.%u.%u.%u.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:1447
+#: src/transports/ip.c:224
 #, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
+msgid "Could not resolve `%s' to determine our IP address: %s\n"
+msgstr ""
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#: src/transports/ip.c:256
 #, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
+msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgstr ""
 
-#: src/applications/dht/module/dht.c:1793
-#, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Ogiltigt svar på \"%s\".\n"
+#: src/transports/ip.c:306
+msgid "Failed to obtain my (external) IP address!\n"
+msgstr ""
 
-#: src/applications/dht/module/dht.c:1993
-#, c-format
-msgid "Malformed response to `%s' on master table.\n"
+#: src/transports/tcp6.c:439
+msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
 msgstr ""
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
+#: src/transports/tcp6.c:469
+msgid ""
+"Received malformed message from tcp6-peer connection. Closing connection.\n"
+msgstr ""
+
+#: src/transports/tcp6.c:958
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+
+#: src/transports/tcp6.c:1002
 #, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
+msgid "`%s': unknown service: %s\n"
+msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
+#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/session/sessiontest.c:48
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:107
+#: src/applications/tbench/tbenchtest_udp.c:107
+#: src/applications/gap/gaptest.c:52
+msgid "# of connected peers"
+msgstr "# av anslutna parter"
+
+#: src/applications/dht/tools/dhttest2.c:128
+#: src/applications/session/sessiontest.c:118
+#: src/applications/tbench/tbenchtest.c:199
+#: src/applications/tbench/tbenchtest_udp.c:201
+#: src/applications/gap/gaptest.c:318
 #, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Mottog ogiltig RPC \"%s\".\n"
+msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+msgstr "Väntar på att gnunetd ska starta (%u iterationer kvar)...\n"
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
+#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/session/sessiontest.c:133
+#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/tbench/tbenchtest_udp.c:122
+#: src/applications/gap/gaptest.c:330
 #, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
-msgstr ""
+msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "tillåt STORLEK byte av minne för lokaltabellen"
+#: src/applications/dht/tools/dht-query.c:39
+msgid "query table called NAME"
+msgstr "fråga tabell kallad NAME"
 
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
-msgstr ""
+#: src/applications/dht/tools/dht-query.c:41
+msgid "allow TIME ms to process each command"
+msgstr "tillåt TID ms för behandling av varje kommando"
 
-#: src/applications/dht/tools/dht-join.c:51
-msgid "Join a DHT."
+#: src/applications/dht/tools/dht-query.c:46
+msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
 msgstr ""
 
-#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/tbench/gnunet-tbench.c:124
 #: src/applications/tbench/gnunet-tbench.c:134
 #: src/applications/tbench/gnunet-tbench.c:147
@@ -340,6 +346,13 @@
 #: src/applications/tracekit/gnunet-tracekit.c:87
 #: src/applications/tracekit/gnunet-tracekit.c:122
 #: src/applications/tracekit/gnunet-tracekit.c:136
+#: src/applications/fs/tools/gnunet-pseudonym.c:120
+#: src/applications/fs/tools/gnunet-insert.c:315
+#: src/applications/fs/tools/gnunet-insert.c:461
+#: src/applications/fs/tools/gnunet-search.c:167
+#: src/applications/fs/tools/gnunet-search.c:183
+#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/fs/tools/gnunet-download.c:96
 #: src/server/gnunet-transport-check.c:448
 #: src/server/gnunet-transport-check.c:462
 #: src/server/gnunet-transport-check.c:479
@@ -348,56 +361,30 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
-msgstr "Onödiga argument (ignorerade).\n"
-
-#: src/applications/dht/tools/dht-join.c:131
+#: src/applications/dht/tools/dht-query.c:99
+#: src/applications/dht/tools/dht-join.c:108
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546
+#: src/applications/stats/gnunet-stats.c:144
+#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tracekit/gnunet-tracekit.c:153
+#: src/applications/fs/tools/gnunet-pseudonym.c:232
+#: src/applications/fs/tools/gnunet-delete.c:111
+#: src/applications/fs/tools/gnunet-directory.c:190
+#: src/applications/fs/tools/gnunet-insert.c:532
+#: src/applications/fs/tools/gnunet-search.c:221
+#: src/applications/fs/tools/gnunet-download.c:130
+#: src/applications/fs/tools/gnunet-unindex.c:140
+#: src/applications/template/gnunet-template.c:87
+#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
+#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
+#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
 #, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "Anrop till \"%s\" returnerade %d.\n"
+msgid "Use --help to get a list of options.\n"
+msgstr "Använd --help för att få en lista på flaggor.\n"
 
-#: src/applications/dht/tools/dht-join.c:132
-#, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
-
-#: src/applications/dht/tools/dht-join.c:133
-#, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Anrop till \"%s\" med värde \"%.*s\" (%d byte).\n"
-
-#: src/applications/dht/tools/dht-join.c:211
-#: src/applications/dht/tools/dht-query.c:231
-#, c-format
-msgid "No table name specified, using `%s'.\n"
-msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
-
-#: src/applications/dht/tools/dht-join.c:236
-msgid "Error joining DHT.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:243
-#, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr ""
-
-#: src/applications/dht/tools/dht-join.c:250
-msgid "Error leaving DHT.\n"
-msgstr "Fel vid lämning av DHT.\n"
-
-#: src/applications/dht/tools/dht-query.c:39
-msgid "query table called NAME"
-msgstr "fråga tabell kallad NAME"
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-msgstr "tillåt TID ms för behandling av varje kommando"
-
-#: src/applications/dht/tools/dht-query.c:46
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
-msgstr ""
-
 #: src/applications/dht/tools/dht-query.c:106
 msgid "No commands specified.\n"
 msgstr "Inga kommandon angivna.\n"
@@ -414,6 +401,12 @@
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "\"%s(%s,%s)\" misslyckades.\n"
 
+#: src/applications/dht/tools/dht-query.c:231
+#: src/applications/dht/tools/dht-join.c:211
+#, c-format
+msgid "No table name specified, using `%s'.\n"
+msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
+
 #: src/applications/dht/tools/dht-query.c:246
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
@@ -492,614 +485,1203 @@
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Oväntat svar till \"%s\" operation.\n"
 
-#: src/applications/dht/tools/dhttest2.c:50 src/applications/gap/gaptest.c:52
-#: src/applications/session/sessiontest.c:48
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:107
-msgid "# of connected peers"
-msgstr "# av anslutna parter"
+#: src/applications/dht/tools/dht-join.c:43
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "tillåt STORLEK byte av minne för lokaltabellen"
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
-#: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:199
+#: src/applications/dht/tools/dht-join.c:45
+msgid "join table called NAME"
+msgstr ""
+
+#: src/applications/dht/tools/dht-join.c:51
+msgid "Join a DHT."
+msgstr ""
+
+#: src/applications/dht/tools/dht-join.c:115
+msgid "Superflous arguments (ignored).\n"
+msgstr "Onödiga argument (ignorerade).\n"
+
+#: src/applications/dht/tools/dht-join.c:131
 #, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Väntar på att gnunetd ska starta (%u iterationer kvar)...\n"
+msgid "Call to `%s' returns %d.\n"
+msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/gap/gaptest.c:330
-#: src/applications/session/sessiontest.c:133
-#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/dht/tools/dht-join.c:132
 #, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
+msgid "Call to `%s' with key `%s'.\n"
+msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
-#: src/applications/fragmentation/fragmentation.c:557
-msgid "# messages defragmented"
+#: src/applications/dht/tools/dht-join.c:133
+#, c-format
+msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+msgstr "Anrop till \"%s\" med värde \"%.*s\" (%d byte).\n"
+
+#: src/applications/dht/tools/dht-join.c:236
+msgid "Error joining DHT.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:558
-msgid "# messages fragmented"
+#: src/applications/dht/tools/dht-join.c:243
+#, c-format
+msgid "Joined DHT.  Press CTRL-C to leave.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:559
-msgid "# fragments discarded"
+#: src/applications/dht/tools/dht-join.c:250
+msgid "Error leaving DHT.\n"
+msgstr "Fel vid lämning av DHT.\n"
+
+#: src/applications/dht/module/dht.c:946
+#, c-format
+msgid "Malformed optional field `%s' received from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/dht/module/dht.c:973
 #, c-format
-msgid "`%s' registering handler %d\n"
-msgstr "\"%s\" registrerar handtag %d\n"
+msgid "Could not find peer `%s' in routing table!\n"
+msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/dht/module/dht.c:1120
+#: src/applications/dht/module/dht.c:1135
 #, c-format
-msgid "Could not unlink temporary file `%s': %s\n"
+msgid "Received malformed response to `%s' from peer `%s'.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/download.c:257
+#: src/applications/dht/module/dht.c:1447
 #, c-format
-msgid "Write(%d, %p, %d) failed: %s\n"
-msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
+msgid "Invalid response to `%s' from peer `%s'.\n"
+msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
 
-#: src/applications/fs/ecrs/download.c:927
-msgid ""
-"Decrypted content does not match key. This is either a bug or a maliciously "
-"inserted file. Download aborted.\n"
-msgstr ""
-"Dekrypterat innehåll stämmer inte med nyckeln. Det är antingen ett fel eller "
-"en fil inlagd med onda avsikter. Hämtning avbruten.\n"
+#: src/applications/dht/module/dht.c:1603
+#: src/applications/dht/module/dht.c:2340
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
+#, c-format
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
 
-#: src/applications/fs/ecrs/download.c:1104
+#: src/applications/dht/module/dht.c:1793
 #, c-format
-msgid ""
-"Content `%s' seems to be not available on the network (tried %u times).\n"
+msgid "Invalid response to `%s'.\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/applications/dht/module/dht.c:1993
+#, c-format
+msgid "Malformed response to `%s' on master table.\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/meta.c:842
+#: src/applications/dht/module/dht.c:2207
+#: src/applications/dht/module/dht.c:2507
 #, c-format
-msgid "Renaming of file `%s' to `%s' failed: %s\n"
-msgstr "Namnbyte på fil \"%s\" till \"%s\" misslyckades: %s\n"
+msgid "Invalid response to `%s' from `%s'\n"
+msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
 
-#: src/applications/fs/ecrs/meta.c:850
+#: src/applications/dht/module/dht.c:2881
+#: src/applications/dht/module/dht.c:3021
+#: src/applications/dht/module/dht.c:3148
+#: src/applications/dht/module/dht.c:3282
 #, c-format
-msgid "Could not rename file `%s' to `%s': file exists\n"
-msgstr "Kunde inte byta namn på fil \"%s\" till \"%s\": filen existerar\n"
+msgid "Received invalid RPC `%s'.\n"
+msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/dht/module/dht.c:3160
+#: src/applications/dht/module/dht.c:3296
 #, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
+msgid "RPC for `%s' received for table that we do not participate in!\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/namespace.c:133
+#: src/applications/dht/module/cs.c:446
 #, c-format
-msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
-msgstr "Kan inte skapa pseudonym \"%s\", filen \"%s\" existerar.\n"
+msgid "`%s' failed: table not found!\n"
+msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/dht/module/cs.c:466
 #, c-format
-msgid "File `%s' does not contain a pseudonym.\n"
-msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
+msgid "`%s' failed.  Terminating connection to client.\n"
+msgstr "\"%s\" misslyckades.  Terminerar anslutning till klient.\n"
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/dht/module/cs.c:542
+msgid "sendAck failed.  Terminating connection to client.\n"
+msgstr "sendAck misslyckades.  Terminerar anslutning till klient.\n"
+
+#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
+#: src/applications/dht/module/cs.c:688
 #, c-format
-msgid "Format of pseudonym `%s' is invalid.\n"
-msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
+msgid "`%s' failed. Terminating connection to client.\n"
+msgstr "\"%s\" misslyckades. Terminerar anslutning till klient.\n"
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
 #, c-format
-msgid "Format of file `%s' is invalid.\n"
-msgstr "Formatet på filen \"%s\" är ogiltig.\n"
+msgid "Failed to deliver `%s' message.\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/applications/fs/ecrs/search.c:160
-msgid "CHK URI not allowed for search.\n"
-msgstr "CHK URI tillåts inte för sökning.\n"
+#: src/applications/chat/chat.c:87
+msgid "Message received from peer is invalid.\n"
+msgstr "Meddelande mottaget från motpart är ogiltig.\n"
 
-#: src/applications/fs/ecrs/search.c:216
-msgid "LOC URI not allowed for search.\n"
-msgstr "LOC URI tillåts inte för sökning.\n"
+#: src/applications/chat/chat.c:134
+msgid "Message received from client is invalid\n"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/chat/chat.c:156
+msgid "Maximum number of chat clients reached.\n"
+msgstr "Maximalt antal chattklienter uppnått.\n"
+
+#: src/applications/chat/chat.c:160
 #, c-format
-msgid "`%s' is not a file.\n"
-msgstr "\"%s\" är inte en fil.\n"
+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/fs/ecrs/upload.c:186
+#: src/applications/chat/chat.c:197
 #, c-format
-msgid "Cannot get size of file `%s'"
-msgstr "Kan inte hämta storlek på fil \"%s\""
+msgid "`%s' registering handlers %d and %d\n"
+msgstr "\"%s\" registrerar handtagen %d och %d\n"
 
-#: src/applications/fs/ecrs/upload.c:193
-#, fuzzy
-msgid "Failed to connect to gnunetd."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/applications/chat/chat.c:212
+msgid "enables P2P-chat (incomplete)"
+msgstr "aktiverar P2P-chatt (ej komplett)"
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/chat/gnunet-chat.c:82
+msgid "specify nickname"
+msgstr "ange smeknamn"
+
+#: src/applications/chat/gnunet-chat.c:87
+msgid "Start GNUnet chat client."
+msgstr "Starta GNUnets chattklient."
+
+#: src/applications/chat/gnunet-chat.c:151
+#: src/applications/tbench/gnunet-tbench.c:213
+#: src/applications/tracekit/gnunet-tracekit.c:363
+#: src/applications/fs/tools/gnunet-delete.c:142
+msgid "Could not connect to gnunetd.\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/applications/chat/gnunet-chat.c:155
 #, c-format
-msgid "Cannot hash `%s'.\n"
+msgid "You must specify a nickname (use option `%s').\n"
+msgstr "Du måste ange ett smeknamn (använd flagga \"%s\").\n"
+
+#: src/applications/chat/gnunet-chat.c:182
+msgid "Could not send join message to gnunetd\n"
 msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:221
+#: src/applications/chat/gnunet-chat.c:191
+msgid "Could not send message to gnunetd\n"
+msgstr "Kunde inte skicka meddelande till gnunetd\n"
+
+#: src/applications/advertising/advertising.c:161
 #, c-format
-msgid "Initialization for indexing file `%s' failed.\n"
-msgstr "Initiering av indexering av fil \"%s\" misslyckades.\n"
+msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:227
+#: src/applications/advertising/advertising.c:167
+msgid ""
+"hello message received invalid (expiration time over limit). Dropping.\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:176
 #, 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"
+msgid "hello advertisement for protocol %d received.\n"
+msgstr ""
 
-#: src/applications/fs/ecrs/upload.c:306
+#: src/applications/advertising/advertising.c:295
+msgid "Could not send hellos+PING, ping buffer full.\n"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:308
 #, c-format
-msgid "Indexing data failed at position %i.\n"
-msgstr "Indexering av data misslyckades vid position %i.\n"
+msgid "`%s' failed (%d, %u). Will not send PING.\n"
+msgstr "\"%s\" misslyckades (%d, %u). Kommer inte skicka PING.\n"
 
-#: src/applications/fs/fsui/download.c:290
-msgid "Download aborted."
-msgstr "Nedladdning avbruten."
+#: src/applications/advertising/advertising.c:463
+#, c-format
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Annonserar min transport %d till valda ändpunkter.\n"
 
-#: src/applications/fs/fsui/download.c:294
-msgid "ECRS download failed (see logs)."
+#: src/applications/advertising/advertising.c:470
+msgid ""
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:298
-msgid "ECRS download suspending."
+#: src/applications/advertising/advertising.c:572
+#, c-format
+msgid "Removing hello from peer `%s' (expired %ds ago).\n"
 msgstr ""
 
-#: src/applications/fs/fsui/download.c:302
-msgid "Unexpected download state."
+#: src/applications/advertising/advertising.c:734
+msgid "# Peer advertisements received"
 msgstr ""
 
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-msgid "AND"
-msgstr "OCH"
+#: src/applications/advertising/advertising.c:735
+msgid "# Self advertisments transmitted"
+msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:66
-#: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1044
+#: src/applications/advertising/advertising.c:736
+msgid "# Foreign advertisements forwarded"
+msgstr ""
+
+#: src/applications/advertising/advertising.c:738
+#: src/applications/pingpong/pingpong.c:462
+msgid "# plaintext PING messages sent"
+msgstr "# PING-meddelanden i klartext skickade"
+
+#: src/applications/advertising/advertising.c:742
+#: src/applications/session/connect.c:752
 #, c-format
+msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
+msgstr "\"%s\" registrerar handtag %d (klartext och kryptotext)\n"
+
+#: src/applications/advertising/advertising.c:761
+msgid "Network advertisements disabled by configuration!\n"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/applications/advertising/advertising.c:781
 msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s\n"
+"ensures that this peer is known by other peers and discovers other peers"
 msgstr ""
-"Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
-"under %s%s\n"
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
+#: src/applications/topology_default/topology.c:398
+#, c-format
+msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
 msgstr ""
 
-#: src/applications/fs/fsui/file_info.c:292
+#: src/applications/pingpong/pingpong.c:120
+#: src/applications/pingpong/pingpong.c:179
+#: src/applications/pingpong/pingpong.c:227
+#: src/applications/pingpong/pingpong.c:292
 #, c-format
-msgid "Deleted corrupt URI database in `%s'."
+msgid "Received malformed `%s' message. Dropping.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:189
-msgid "FSUI persistence: error restoring download\n"
+#: src/applications/pingpong/pingpong.c:130
+msgid "Received ping for another peer. Dropping.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/pingpong/pingpong.c:187
+msgid "Received PING not destined for us!\n"
+msgstr "Mottog PING som ej var ämnat för oss!\n"
+
+#: src/applications/pingpong/pingpong.c:267
+#: src/applications/pingpong/pingpong.c:325
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
+msgstr ""
+
+#: src/applications/pingpong/pingpong.c:366
+msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+msgstr "Kan inte skapa PING, tabell är full. Försök att öka MAX_PING_PONG.\n"
+
+#: src/applications/pingpong/pingpong.c:452
+msgid "# encrypted PONG messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/applications/pingpong/pingpong.c:454
+msgid "# plaintext PONG messages received"
+msgstr "# klartext PONG-meddelanden mottagna"
+
+#: src/applications/pingpong/pingpong.c:456
+msgid "# encrypted PING messages received"
+msgstr "# krypterade PING-meddelanden mottagna"
+
+#: src/applications/pingpong/pingpong.c:458
+msgid "# PING messages created"
+msgstr "# PING-meddelanden skapade"
+
+#: src/applications/pingpong/pingpong.c:460
+msgid "# encrypted PONG messages sent"
+msgstr "# krypterade PONG-meddelanden skickade"
+
+#: src/applications/pingpong/pingpong.c:464
+msgid "# encrypted PING messages sent"
+msgstr "# krypterade PING-meddelanden skickade"
+
+#: src/applications/pingpong/pingpong.c:473
 #, c-format
-msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+msgstr "\"%s\" registrerar handtag %d %d (klartext och kryptotext)\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:44
+#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_mysql/mysql.c:137
+#: src/applications/sqstore_mysql/mysql.c:144
+#: src/applications/sqstore_mysql/mysql.c:386
+#: src/applications/sqstore_mysql/mysql.c:725
+#: src/applications/sqstore_mysql/mysql.c:740
+#: src/applications/sqstore_mysql/mysql.c:749
+#: src/applications/sqstore_mysql/mysql.c:773
+#: src/applications/sqstore_mysql/mysql.c:783
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:922
+#: src/applications/sqstore_mysql/mysql.c:932
+#: src/applications/sqstore_mysql/mysql.c:1004
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1053
+#: src/applications/sqstore_mysql/mysql.c:1067
+#: src/applications/kvstore_sqlite/kv_sqlite.c:43
+#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:139
+msgid "Unable to initialize SQLite.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:271
+#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_mysql/mysql.c:223
+#: src/applications/sqstore_mysql/mysql.c:800
+#, c-format
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
-msgstr "Inga nyckelord angivna!\n"
+#: src/applications/sqstore_sqlite/sqlite.c:272
+#: src/applications/sqstore_sqlite/sqlite.c:290
+msgid "sqlite datastore"
+msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
-msgstr "Publiseringsintervall för periodisk publisering har ändrats."
+#: src/applications/sqstore_sqlite/sqlite.c:1035
+#, c-format
+msgid ""
+"Configuration file must specify directory for storing FS data in section `%"
+"s' under `%s'.\n"
+msgstr ""
 
-#: src/applications/fs/fsui/namespace_info.c:604
+#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1178
+msgid "# bytes in datastore"
+msgstr ""
+
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
+msgid "Could not initialize libgnunetutil!\n"
+msgstr "Kunde inte initiera libgnunetutil!\n"
+
+#: src/applications/session/connect.c:209
+#, c-format
+msgid "Session key from peer `%s' could not be verified.\n"
+msgstr ""
+
+#: src/applications/session/connect.c:246
+msgid "Cannot encrypt sessionkey, other peer not known!\n"
+msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
+
+#: src/applications/session/connect.c:523
+#, c-format
+msgid "Invalid `%s' message received from peer `%s'.\n"
+msgstr ""
+
+#: src/applications/session/connect.c:532
+#, c-format
+msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
+msgstr ""
+
+#: src/applications/session/connect.c:587
 msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
+"Error parsing encrypted session key, given message part size is invalid.\n"
 msgstr ""
 
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
+#: src/applications/session/connect.c:597
+#, c-format
+msgid "Unknown type in embedded message: %u (size: %u)\n"
 msgstr ""
 
-#: src/applications/fs/fsui/unindex.c:85
-msgid "Unindex failed."
-msgstr "Avindexering misslyckades."
+#: src/applications/session/connect.c:742
+msgid "# session keys sent"
+msgstr "# sessionsnycklar skickade"
 
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
-#, fuzzy
-msgid "Upload failed."
-msgstr "Uppladdning misslyckades.\n"
+#: src/applications/session/connect.c:744
+msgid "# session keys rejected"
+msgstr "# sessionnycklar vägrade"
 
-#: src/applications/fs/fsui/upload.c:455
-msgid "Cannot upload directory without using recursion."
+#: src/applications/session/connect.c:746
+msgid "# session keys accepted"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/applications/session/connect.c:748
+msgid "# sessions established"
+msgstr "# sessioner etablerade"
+
+#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#, c-format
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1184
+#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
 #, c-format
 msgid ""
-"You must specify a postive number for `%s' in the configuration in section `%"
-"s'.\n"
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
 msgstr ""
-"Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
-"\".\n"
 
-#: src/applications/fs/module/fs.c:1233
+#: src/applications/rpc/rpc.c:232
 #, c-format
-msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
+msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
+msgstr "%s::%s - RPC %s:%p kunde inte avregistreras: hittades inte\n"
+
+#: src/applications/rpc/rpc.c:279
+#, c-format
+msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
 msgstr ""
 
-#: src/applications/fs/module/fs.c:1270
-msgid "enables (anonymous) file-sharing"
-msgstr "aktiverar (anonym) fildelning"
+#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
+#: src/applications/rpc/rpc.c:1084
+#, c-format
+msgid "Invalid message of type %u received.  Dropping.\n"
+msgstr ""
 
-#: src/applications/fs/module/migration.c:224
-msgid "# blocks migrated"
+#: src/applications/rpc/rpc.c:936
+#, c-format
+msgid "Dropping RPC request %u: message malformed.\n"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:225
-msgid "# on-demand block migration attempts"
+#: src/applications/rpc/rpc.c:1388
+#, c-format
+msgid "RPC not unregistered: %s:%p\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/rpc/rpc.c:1414
 #, c-format
-msgid "Indexed file disappeared, deleting block for query `%s'\n"
-msgstr "Indexerad fil försvann, tar bort block för fråga \"%s\"\n"
+msgid "`%s' registering handlers %d %d %d\n"
+msgstr "\"%s\" registrerar handtag %d %d %d\n"
 
-#: src/applications/fs/module/ondemand.c:393
+#: src/applications/rpc/rpc.c:1435
 #, c-format
-msgid ""
-"Because the file `%s' has been unavailable for 3 days it got removed from "
-"your share.  Please unindex files before deleting them as the index now "
-"contains invalid references!\n"
+msgid "Failed to initialize `%s' service.\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/applications/rpc/rpc.c:1491
+msgid "RPC async reply invalid.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/rpc/rpc.c:1562
+msgid "async RPC reply not received.\n"
+msgstr ""
+
+#: src/applications/sqstore_mysql/mysql.c:224
+#: src/applications/sqstore_mysql/mysql.c:801
+msgid "mysql datastore"
+msgstr ""
+
+#: src/applications/sqstore_mysql/mysql.c:1107
 #, c-format
-msgid ""
-"Configuration file must specify directory for storage of FS data in section `"
-"%s' under `%s'.\n"
+msgid "Query `%s' had no results.\n"
 msgstr ""
 
-#: src/applications/fs/module/ondemand.c:617
+#: src/applications/sqstore_mysql/mysql.c:1205
 #, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
+
+#: src/applications/sqstore_mysql/mysql.c:1223
 msgid ""
-"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
 msgstr ""
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1802
-msgid "Failed to get traffic stats.\n"
+#: src/applications/datastore/filter.c:42
+#, c-format
+msgid ""
+"Configuration must specify directory for FS data in section `%s' under `%"
+"s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-delete.c:37
+#: src/applications/datastore/datastore.c:118
 #, c-format
-msgid "%8u of %8u bytes deleted."
-msgstr "%8u av %8u byte togs bort."
+msgid "Availability test failed for `%s' at %s:%d.\n"
+msgstr "Tillgänglighetstest misslyckades för \"%s\" vid %s:%d.\n"
 
-#: src/applications/fs/tools/gnunet-delete.c:52
-msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
+#: src/applications/datastore/datastore.c:142
+#, c-format
+msgid "Database failed to delete `%s'.\n"
+msgstr "Databas misslyckades att ta bort \"%s\".\n"
+
+#: src/applications/identity/hostkey.c:98
+#: src/applications/identity/identity.c:1086
+#: src/applications/fs/fsui/file_info.c:66
+#, c-format
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s\n"
 msgstr ""
-"ange filen att ta bort från GNUnet (obligatorisk, filen måste existera)"
+"Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
+"under %s%s\n"
 
-#: src/applications/fs/tools/gnunet-delete.c:61
+#: src/applications/identity/hostkey.c:119
+#, c-format
 msgid ""
-"Remove file from GNUnet.  The specified file is not removed\n"
-"from the filesystem but just from the local GNUnet datastore."
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
-"Ta bort fil från GNUnet.  Den angivna filen tas inte bort från\n"
-"filsystemet utan bara från det lokala GNUnet-datalagret."
+"Existerande värdnyckel i filen \"%s\" felade vid formatkontroll, skapar en "
+"ny värdnyckel.\n"
 
-#: src/applications/fs/tools/gnunet-delete.c:139
-msgid "You must specify a filename (option -f)\n"
-msgstr "Du måste ange ett filnamn (flagga -f)\n"
+#: src/applications/identity/hostkey.c:127
+msgid "Creating new hostkey (this may take a while).\n"
+msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/applications/fs/tools/gnunet-delete.c:151
+#: src/applications/identity/hostkey.c:130
+msgid "Could not create hostkey!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/applications/identity/hostkey.c:139
+msgid "Done creating hostkey.\n"
+msgstr "Klar med skapandet av värdnyckel.\n"
+
+#: src/applications/identity/identity.c:333
 #, c-format
 msgid ""
-"Error deleting file %s.\n"
-"Probably a few blocks were already missing from the database.\n"
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:76
+#: src/applications/identity/identity.c:366
 #, c-format
-msgid "==> Directory `%s':\n"
-msgstr "==> Katalog \"%s\":\n"
+msgid "%s `%s' returned no known hosts!\n"
+msgstr "%s \"%s\" returnerade inga kända värdar!\n"
 
-#: src/applications/fs/tools/gnunet-directory.c:81
+#: src/applications/identity/identity.c:648
+#: src/applications/identity/identity.c:666
 #, c-format
-msgid "=\tError reading directory.\n"
-msgstr "=\tFel vid läsning av katalog.\n"
+msgid "Removed file `%s' containing invalid hello data.\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:111
+#: src/applications/identity/identity.c:716
+#, fuzzy, c-format
+msgid "Signature failed verification: peer `%s' not known.\n"
+msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
+
+#: src/applications/identity/identity.c:724
+msgid "Signature failed verification: signature invalid.\n"
+msgstr ""
+
+#: src/applications/testbed/commands.c:1130
+#: src/applications/stats/gnunet-stats.c:61
 #, c-format
-msgid "File format error (not a GNUnet directory?)\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+msgid "Supported peer-to-peer messages:\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:113
+#: src/applications/testbed/commands.c:1132
+#: src/applications/stats/gnunet-stats.c:64
 #, c-format
-msgid "%d files found in directory.\n"
-msgstr "%d filer hittades i katalog.\n"
+msgid "Supported client-server messages:\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:131
-msgid "remove all entries from the directory database and stop tracking URIs"
+#: src/applications/testbed/gnunet-testbed.c:119
+msgid "Start GNUnet-testbed helper."
+msgstr "Starta hjälpprogrammet GNUnet-testbed."
+
+#: src/applications/testbed/gnunet-testbed.c:183
+#, c-format
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:133
-msgid "list entries from the directory database"
+#: src/applications/testbed/gnunet-testbed.c:282
+#, c-format
+msgid "Could not execute `%s': %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:325
+msgid "No client service started. Trying again in 30 seconds.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:136
-msgid "start tracking entries for the directory database"
+#: src/applications/testbed/gnunet-testbed.c:348
+#, c-format
+msgid ""
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:140
-msgid "gnunet-directory [OPTIONS] [FILENAMES]"
-msgstr "gnunet-directory [FLAGGOR] [FILNAMN]"
+#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#, c-format
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:141
-msgid "Perform directory related operations."
-msgstr "Genomför katalogrelaterade operationer."
+#: src/applications/testbed/gnunet-testbed.c:428
+#, c-format
+msgid "Protocol violation on socket. Expected command.\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-directory.c:206
+#: src/applications/testbed/gnunet-testbed.c:467
 #, c-format
-msgid "Listed %d matching entries.\n"
-msgstr "Listade %d matchande poster.\n"
+msgid "Command `%s' not found!\n"
+msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
-msgstr "NIVÅ"
+#: src/applications/testbed/gnunet-testbed.c:540
+msgid "Start GNUnet testbed controller."
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:42
-#: src/applications/fs/tools/gnunet-search.c:108
-msgid "set the desired LEVEL of receiver-anonymity"
+#: src/applications/testbed/gnunet-testbed.c:594
+#, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
-msgstr "FILNAMN"
+#: src/applications/testbed/testbed.c:50
+msgid "Could not send acknowledgement back to client.\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
-msgstr "skriv filen till FILNAMN"
+#: src/applications/testbed/testbed.c:60
+#, c-format
+msgid "Received unknown testbed message of type %u.\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:50
-msgid "download a GNUnet directory recursively"
-msgstr "hämta en GNUnet-katalog rekursivt"
+#: src/applications/testbed/testbed.c:78
+#: src/applications/testbed/testbed.c:807
+#, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
+msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
-msgstr "Ladda ner filer från GNUnet."
+#: src/applications/testbed/testbed.c:85
+#, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
+msgstr "storlek på \"%s\" meddelande är fel. Ignorerar.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+#: src/applications/testbed/testbed.c:137
+#, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
 msgstr ""
-"Inte tillräckligt med argument. Du måste ange en URI till en GNUnet-fil\n"
 
-#: src/applications/fs/tools/gnunet-download.c:159
+#: src/applications/testbed/testbed.c:215
+#: src/applications/testbed/testbed.c:256
+#: src/applications/testbed/testbed.c:359
+#: src/applications/testbed/testbed.c:366
+#: src/applications/testbed/testbed.c:403
+#: src/applications/testbed/testbed.c:410
 #, c-format
-msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
-msgstr "Hämtning av fil \"%s\" vid %16llu av %16llu byte (%8.3f kbps)\n"
+msgid "received invalid `%s' message\n"
+msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
+#: src/applications/testbed/testbed.c:231
+#: src/applications/testbed/testbed.c:271
 #, c-format
-msgid "Error downloading: %s\n"
-msgstr "Fel vid nedladdning: %s\n"
+msgid "received invalid `%s' message (empty module name)\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-download.c:191
+#: src/applications/testbed/testbed.c:238
 #, c-format
-msgid "Download of file `%s' complete.  Speed was %8.3f kilobyte per second.\n"
+msgid "loading module `%s' failed.  Notifying client.\n"
 msgstr ""
-"Hämtning av fil \"%s\" färdig.  Hastigheten var %8.3f kilobyte per sekund.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:237
+#: src/applications/testbed/testbed.c:278
+msgid "unloading module failed.  Notifying client.\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:539
 #, c-format
-msgid "URI `%s' invalid for gnunet-download.\n"
-msgstr "URI \"%s\" ogiltig för gnunet-download.\n"
+msgid "`%s' %s failed: %s\n"
+msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/applications/fs/tools/gnunet-download.c:288
+#: src/applications/testbed/testbed.c:625
 #, c-format
-msgid "File stored as `%s'.\n"
-msgstr "Fil lagrad som \"%s\".\n"
+msgid "received invalid `%s' message: %s.\n"
+msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:110
+#: src/applications/testbed/testbed.c:817
 #, c-format
-msgid "Created entry `%s' in namespace `%s'\n"
-msgstr "Skapade post \"%s\" i namnrymd \"%s\"\n"
+msgid "'..' is not allowed in file name (%s).\n"
+msgstr "\"..\" tillåts inte i filnamn (%s).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:115
+#: src/applications/testbed/testbed.c:826
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:833
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:841
+msgid "Upload refused!"
+msgstr "Uppladdning vägrades!"
+
+#: src/applications/testbed/testbed.c:867
 #, c-format
-msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
+msgid "Invalid message received at %s:%d."
+msgstr "Ogiltigt meddelande mottogs den %s:%d."
+
+#: src/applications/testbed/testbed.c:985
+#, c-format
+msgid "received invalid testbed message of size %u\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:136
+#: src/applications/testbed/testbed.c:1002
 #, c-format
-msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
-msgstr "%16llu av %16llu byte inlagda (uppskattar %s till färdigställd)\n"
+msgid ""
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:150
+#: src/applications/testbed/testbed.c:1045
+msgid "No testbed URL given, not registered.\n"
+msgstr ""
+
+#: src/applications/testbed/testbed.c:1079
+#: src/applications/bootstrap_http/http.c:81
 #, c-format
-msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
+
+#: src/applications/testbed/testbed.c:1118
+#, c-format
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
 msgstr ""
-"Uppladdning av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:164
+#: src/applications/testbed/testbed.c:1154
 #, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f kbps.\n"
+msgid "Could not register testbed, host `%s' unknown\n"
 msgstr ""
-"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:174
+#: src/applications/testbed/testbed.c:1177
 #, c-format
-msgid "File `%s' has URI: %s\n"
-msgstr "Fil \"%s\" har URI: %s\n"
+msgid "Failed to send HTTP request to host `%s': %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:187
+#: src/applications/testbed/testbed.c:1230
 #, c-format
-msgid ""
-"\n"
-"Error uploading file: %s\n"
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran \"%s\" till värd \"%s\": %s\n"
+
+#: src/applications/testbed/testbed.c:1269
+msgid "Exit register (error: no http response read).\n"
 msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:206
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-msgid "set the desired LEVEL of sender-anonymity"
+#: src/applications/testbed/testbed.c:1357
+msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:209
-msgid ""
-"even if gnunetd is running on the local machine, force the creation of a "
-"copy instead of making a link to the GNUnet share directory"
+#: src/applications/transport/transport.c:483
+#: src/applications/transport/transport.c:491
+#, c-format
+msgid "No transport of type %d known.\n"
+msgstr "Ingen transport av typ %d är känd.\n"
+
+#: src/applications/transport/transport.c:676
+#, c-format
+msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
 msgstr ""
-"även om gnunetd körs på den lokala maskinen, tvinga fram skapandet av en "
-"kopia istället för att göra en länk till GNUnets utdelade katalog"
 
-#: src/applications/fs/tools/gnunet-insert.c:212
+#: src/applications/transport/transport.c:691
+#, c-format
 msgid ""
-"use libextractor to add additional direct references to directory entries"
+"You should specify at least one transport service under option `%s' in "
+"section `%s'.\n"
 msgstr ""
-"använd libextractor för att lägga till ytterligare direktreferenser till "
-"katalogposter"
 
-#: src/applications/fs/tools/gnunet-insert.c:214
-msgid ""
-"print list of extracted keywords that would be used, but do not perform "
-"upload"
+#: src/applications/transport/transport.c:717
+#, c-format
+msgid "Transport library `%s' did not provide required function '%s%s'.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:218
-msgid ""
-"set interval for availability of updates to SECONDS (for namespace "
-"insertions only)"
+#: src/applications/transport/transport.c:738
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
+
+#: src/applications/fragmentation/fragmentation.c:557
+msgid "# messages defragmented"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:221
-msgid ""
-"add an additional keyword for the top-level file or directory (this option "
-"can be specified multiple times)"
+#: src/applications/fragmentation/fragmentation.c:558
+msgid "# messages fragmented"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:224
-msgid ""
-"add an additional keyword for all files and directories (this option can be "
-"specified multiple times)"
+#: src/applications/fragmentation/fragmentation.c:559
+msgid "# fragments discarded"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:228
-msgid "set the meta-data for the given TYPE to the given VALUE"
+#: src/applications/fragmentation/fragmentation.c:569
+#, c-format
+msgid "`%s' registering handler %d\n"
+msgstr "\"%s\" registrerar handtag %d\n"
+
+#: src/applications/stats/gnunet-stats.c:94
+msgid "prints supported protocol messages"
+msgstr "skriver ut stödda protokollmeddelanden"
+
+#: src/applications/stats/gnunet-stats.c:99
+msgid "Print statistics about GNUnet operations."
+msgstr "Skriv ut statistik om GNUnet-operationer."
+
+#: src/applications/stats/gnunet-stats.c:167
+#, c-format
+msgid "Error establishing connection with gnunetd.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:230
-msgid ""
-"do not index, perform full insertion (stores entire file in encrypted form "
-"in GNUnet database)"
+#: src/applications/stats/gnunet-stats.c:181
+#, c-format
+msgid "Error reading information from gnunetd.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:233
+#: src/applications/stats/clientapi.c:179
+msgid "Uptime (seconds)"
+msgstr "Upptid (sekunder)"
+
+#: src/applications/stats/statistics.c:206
+#, c-format
+msgid "% of allowed network load (up)"
+msgstr ""
+
+#: src/applications/stats/statistics.c:208
+#, c-format
+msgid "% of allowed network load (down)"
+msgstr ""
+
+#: src/applications/stats/statistics.c:210
+#, c-format
+msgid "% of allowed cpu load"
+msgstr ""
+
+#: src/applications/stats/statistics.c:214
+msgid "# bytes of noise received"
+msgstr ""
+
+#: src/applications/stats/statistics.c:374
+msgid "keeps statistics about gnunetd's operation"
+msgstr "behåller statistik om gnunetds operation"
+
+#: src/applications/tbench/gnunet-tbench.c:95
+msgid "output in gnuplot format"
+msgstr "utdata i gnuplot-format"
+
+#: src/applications/tbench/gnunet-tbench.c:98
+msgid "number of iterations"
+msgstr "antal iterationer"
+
+#: src/applications/tbench/gnunet-tbench.c:100
+msgid "number of messages to use per iteration"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/applications/tbench/gnunet-tbench.c:102
+msgid "receiver host identifier (ENC file name)"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:104
+msgid "message size"
+msgstr "meddelandestorlek"
+
+#: src/applications/tbench/gnunet-tbench.c:106
+msgid "sleep for SPACE ms after each a message block"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:108
+msgid "time to wait for the completion of an iteration (in ms)"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:111
+msgid "number of messages in a message block"
+msgstr "antal meddelanden i ett meddelandeblock"
+
+#: src/applications/tbench/gnunet-tbench.c:115
+msgid "Start GNUnet transport benchmarking tool."
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:225
+msgid "You must specify a receiver!\n"
+msgstr "Du måste ange en mottagare!\n"
+
+#: src/applications/tbench/gnunet-tbench.c:228
+#, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:249
+#, c-format
+msgid "Time:\n"
+msgstr "Tid:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:250
+#, c-format
+msgid "\tmax      %llums\n"
+msgstr "\tmax      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:252
+#, c-format
+msgid "\tmin      %llums\n"
+msgstr "\tmin      %llums\n"
+
+#: src/applications/tbench/gnunet-tbench.c:254
+#, c-format
+msgid "\tmean     %8.4fms\n"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:256
+#, c-format
+msgid "\tvariance %8.4fms\n"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:259
+#, c-format
+msgid "Loss:\n"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:260
+#, c-format
+msgid "\tmax      %u\n"
+msgstr "\tmax      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:262
+#, c-format
+msgid "\tmin      %u\n"
+msgstr "\tmin      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:264
+#, c-format
+msgid "\tmean     %8.4f\n"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:266
+#, c-format
+msgid "\tvariance %8.4f\n"
+msgstr ""
+
+#: src/applications/tbench/gnunet-tbench.c:275
+#, c-format
+msgid "Output format not known, this should not happen.\n"
+msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
+
+#: src/applications/tbench/gnunet-tbench.c:279
+#, c-format
 msgid ""
-"specify ID of an updated version to be published in the future (for "
-"namespace insertions only)"
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:236
-msgid "specify the priority of the content"
-msgstr "ange prioritet för innehållet"
+#: src/applications/tbench/tbenchtest.c:57
+#: src/applications/tbench/tbenchtest_udp.c:57
+#, c-format
+msgid "Using %u messages of size %u for %u times.\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:238
-msgid "publish the files under the pseudonym NAME (place file into namespace)"
+#: src/applications/tbench/tbenchtest.c:84
+#: src/applications/tbench/tbenchtest_udp.c:84
+#, c-format
+msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:240
-msgid "process directories recursively"
-msgstr "bearbeta kataloger rekursivt"
+#: src/applications/tbench/tbenchtest.c:89
+#: src/applications/tbench/tbenchtest_udp.c:89
+#, c-format
+msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:242
+#: src/applications/tbench/tbenchtest.c:95
+#: src/applications/tbench/tbenchtest_udp.c:95
+#, c-format
 msgid ""
-"specifies this as an aperiodic but updated publication (for namespace "
-"insertions only)"
+"\n"
+"Failed to receive reply from gnunetd.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:245
+#: src/applications/tbench/tbenchtest.c:211
+#: src/applications/tbench/tbenchtest_udp.c:213
+#, c-format
+msgid "Running benchmark...\n"
+msgstr ""
+
+#: src/applications/tbench/tbench.c:448
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:101
+msgid "probe network to the given DEPTH"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:103
 msgid ""
-"set the ID of this version of the publication (for namespace insertions only)"
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:248
-msgid "specify creation time for SBlock (see man-page for format)"
+#: src/applications/tracekit/gnunet-tracekit.c:107
+msgid "use PRIO for the priority of the trace request"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:250
-msgid "ID of the previous version of the content (for namespace update only)"
+#: src/applications/tracekit/gnunet-tracekit.c:110
+msgid "wait DELAY seconds for replies"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:257
-msgid "Make files available to GNUnet for sharing."
-msgstr "Gör filer tillgängliga via utdelning till GNUnet."
+#: src/applications/tracekit/gnunet-tracekit.c:114
+msgid "Trace GNUnet network topology."
+msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/applications/fs/tools/gnunet-insert.c:344
+#: src/applications/tracekit/gnunet-tracekit.c:222
 #, c-format
-msgid "You must pass a positive number to the `%s' option.\n"
-msgstr ""
+msgid "`%s' is not connected to any peer.\n"
+msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:429
+#: src/applications/tracekit/gnunet-tracekit.c:233
 #, c-format
 msgid ""
-"Unknown metadata type in metadata option `%s'.  Using metadata type "
-"`unknown' instead.\n"
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:537
-#: src/applications/fs/tools/gnunet-unindex.c:145
+#: src/applications/tracekit/gnunet-tracekit.c:260
 #, c-format
-msgid "You must specify a list of files to insert.\n"
-msgstr "Du måste ange en lista av filer att lägga in.\n"
+msgid "`%s' connected to `%s'.\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:541
+#: src/applications/tracekit/gnunet-tracekit.c:275
 #, c-format
-msgid "Only one file or directory can be specified at a time.\n"
-msgstr "Endast en fil eller katalog kan anges samtidigt.\n"
+msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:545
+#: src/applications/tracekit/gnunet-tracekit.c:298
 #, c-format
-msgid "You must specify a file or directory to upload.\n"
-msgstr "Du måste ange en fil eller katalog att ladda upp.\n"
+msgid "Peer `%s' did not report back.\n"
+msgstr "Motpart \"%s\" rapporterade inte tillbaka.\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:595
+#: src/applications/tracekit/gnunet-tracekit.c:387
+msgid "Could not send request to gnunetd.\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#: src/applications/tracekit/tracekit.c:62
+#: src/applications/tracekit/tracekit.c:186
 #, c-format
-msgid "Keywords for file `%s':\n"
-msgstr "Nyckelord för fil \"%s\":\n"
+msgid "Received invalid `%s' message from `%s'.\n"
+msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:617
+#: src/applications/tracekit/tracekit.c:243
+msgid "TRACEKIT: routing table full, trace request dropped\n"
+msgstr ""
+
+#: src/applications/tracekit/tracekit.c:331
 #, c-format
-msgid "Could not access namespace `%s' (does not exist?).\n"
+msgid "TRACEKIT: received invalid `%s' message\n"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:636
+#: src/applications/tracekit/tracekit.c:431
+msgid "allows mapping of the network topology"
+msgstr "tillåter kartläggning av nätverkstopologin"
+
+#: src/applications/gap/gap.c:1617
+#, fuzzy, c-format
+msgid "GAP received invalid content from `%s'\n"
+msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
+#: src/applications/gap/gap.c:1618
+msgid "myself"
+msgstr ""
+
+#: src/applications/gap/gap.c:1791
+msgid ""
+"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+msgstr ""
+
+#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
+msgid "Failed to get traffic stats.\n"
+msgstr ""
+
+#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
+#: src/applications/gap/gap.c:1819
+msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
+msgstr ""
+
+#: src/applications/gap/gap.c:2077
+msgid "# gap requests total received"
+msgstr ""
+
+#: src/applications/gap/gap.c:2078
+msgid "# gap requests policy: immediate drop"
+msgstr ""
+
+#: src/applications/gap/gap.c:2079
+msgid "# gap requests policy: not routed"
+msgstr ""
+
+#: src/applications/gap/gap.c:2080
+msgid "# gap requests policy: not answered"
+msgstr ""
+
+#: src/applications/gap/gap.c:2081
+msgid "# gap requests processed: attempted add to RT"
+msgstr ""
+
+#: src/applications/gap/gap.c:2082
+msgid "# gap requests processed: local result"
+msgstr ""
+
+#: src/applications/gap/gap.c:2083
+msgid "# gap routing successes (total)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2084
+msgid "# gap requests dropped: collision in RT"
+msgstr ""
+
+#: src/applications/gap/gap.c:2085
+msgid "# gap requests forwarded (counting each peer)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2086
+msgid "# gap duplicate requests (pending)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2087
+msgid "# gap duplicate requests that were re-tried"
+msgstr ""
+
+#: src/applications/gap/gap.c:2088
+msgid "# gap re-try ttl difference (cummulative)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2089
+msgid "# gap reply duplicates"
+msgstr ""
+
+#: src/applications/gap/gap.c:2090
+msgid "# gap spurious replies"
+msgstr ""
+
+#: src/applications/gap/gap.c:2091
+msgid "# gap routing slots currently in use"
+msgstr ""
+
+#: src/applications/gap/gap.c:2092
+msgid "# gap memory used for tracking seen content"
+msgstr ""
+
+#: src/applications/gap/gap.c:2093
+msgid "# gap memory used for tracking routing destinations"
+msgstr ""
+
+#: src/applications/gap/gap.c:2094
+msgid "# gap rewards pending"
+msgstr ""
+
+#: src/applications/gap/gap.c:2095
+msgid "# gap response weights"
+msgstr ""
+
+#: src/applications/gap/gap.c:2112
+msgid ""
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
+msgstr ""
+
+#: src/applications/gap/gap.c:2143
 #, c-format
-msgid "Parsing time failed. Use `%s' format.\n"
+msgid "`%s' registering handlers %d %d\n"
+msgstr "\"%s\" registrerar handtag %d %d\n"
+
+#: src/applications/gap/pid_table.c:151
+msgid "# distinct interned peer IDs in pid table"
 msgstr ""
 
-#: src/applications/fs/tools/gnunet-insert.c:649
-#: src/applications/fs/tools/gnunet-insert.c:653
-#: src/applications/fs/tools/gnunet-insert.c:657
-#: src/applications/fs/tools/gnunet-insert.c:661
-#: src/applications/fs/tools/gnunet-insert.c:666
+#: src/applications/gap/pid_table.c:153
+msgid "# total RC of interned peer IDs in pid table"
+msgstr ""
+
+#: src/applications/getoption/getoption.c:75
 #, c-format
-msgid "Option `%s' makes no sense without option `%s'.\n"
+msgid "`%s' registering client handler %d\n"
+msgstr "\"%s\" registrerar klienthandtag %d\n"
+
+#: src/applications/getoption/getoption.c:82
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "tillåter klienter att fastställa gnunetds konfiguration"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:33
+#: src/applications/fs/tools/gnunet-insert.c:206
+msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:35
@@ -1174,14 +1756,24 @@
 "Skapa nya pseudonymer, ta bort pseudonymer eller lista existerande "
 "pseudonymer."
 
+#: src/applications/fs/tools/gnunet-pseudonym.c:159
+#: src/applications/fs/tools/gnunet-pseudonym.c:164
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
+#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
+msgid "AND"
+msgstr "OCH"
+
 #: src/applications/fs/tools/gnunet-pseudonym.c:239
 #, c-format
 msgid "Invalid argument: `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
 #: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/conf/gnunet-setup.c:179 src/server/gnunet-peer-info.c:118
-#: src/server/gnunet-transport-check.c:532
+#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
+#: src/setup/gnunet-setup.c:179
 msgid "Invalid arguments. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
@@ -1245,6 +1837,268 @@
 msgid "Could not access namespace information.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
+#: src/applications/fs/tools/gnunet-delete.c:37
+#, c-format
+msgid "%8u of %8u bytes deleted."
+msgstr "%8u av %8u byte togs bort."
+
+#: src/applications/fs/tools/gnunet-delete.c:52
+msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
+msgstr ""
+"ange filen att ta bort från GNUnet (obligatorisk, filen måste existera)"
+
+#: src/applications/fs/tools/gnunet-delete.c:61
+msgid ""
+"Remove file from GNUnet.  The specified file is not removed\n"
+"from the filesystem but just from the local GNUnet datastore."
+msgstr ""
+"Ta bort fil från GNUnet.  Den angivna filen tas inte bort från\n"
+"filsystemet utan bara från det lokala GNUnet-datalagret."
+
+#: src/applications/fs/tools/gnunet-delete.c:139
+msgid "You must specify a filename (option -f)\n"
+msgstr "Du måste ange ett filnamn (flagga -f)\n"
+
+#: src/applications/fs/tools/gnunet-delete.c:151
+#, c-format
+msgid ""
+"Error deleting file %s.\n"
+"Probably a few blocks were already missing from the database.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-directory.c:76
+#, c-format
+msgid "==> Directory `%s':\n"
+msgstr "==> Katalog \"%s\":\n"
+
+#: src/applications/fs/tools/gnunet-directory.c:81
+#, c-format
+msgid "=\tError reading directory.\n"
+msgstr "=\tFel vid läsning av katalog.\n"
+
+#: src/applications/fs/tools/gnunet-directory.c:111
+#, c-format
+msgid "File format error (not a GNUnet directory?)\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/applications/fs/tools/gnunet-directory.c:113
+#, c-format
+msgid "%d files found in directory.\n"
+msgstr "%d filer hittades i katalog.\n"
+
+#: src/applications/fs/tools/gnunet-directory.c:131
+msgid "remove all entries from the directory database and stop tracking URIs"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-directory.c:133
+msgid "list entries from the directory database"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-directory.c:136
+msgid "start tracking entries for the directory database"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-directory.c:140
+msgid "gnunet-directory [OPTIONS] [FILENAMES]"
+msgstr "gnunet-directory [FLAGGOR] [FILNAMN]"
+
+#: src/applications/fs/tools/gnunet-directory.c:141
+msgid "Perform directory related operations."
+msgstr "Genomför katalogrelaterade operationer."
+
+#: src/applications/fs/tools/gnunet-directory.c:206
+#, c-format
+msgid "Listed %d matching entries.\n"
+msgstr "Listade %d matchande poster.\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:110
+#, c-format
+msgid "Created entry `%s' in namespace `%s'\n"
+msgstr "Skapade post \"%s\" i namnrymd \"%s\"\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:115
+#, c-format
+msgid "Failed to add entry to namespace `%s' (does it exist?)\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:136
+#, c-format
+msgid "%16llu of %16llu bytes inserted (estimating %s to completion)\n"
+msgstr "%16llu av %16llu byte inlagda (uppskattar %s till färdigställd)\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:150
+#, fuzzy, c-format
+msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
+msgstr ""
+"Uppladdning av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:164
+#, fuzzy, c-format
+msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
+msgstr ""
+"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:174
+#, c-format
+msgid "File `%s' has URI: %s\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:187
+#, c-format
+msgid ""
+"\n"
+"Error uploading file: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:209
+msgid ""
+"even if gnunetd is running on the local machine, force the creation of a "
+"copy instead of making a link to the GNUnet share directory"
+msgstr ""
+"även om gnunetd körs på den lokala maskinen, tvinga fram skapandet av en "
+"kopia istället för att göra en länk till GNUnets utdelade katalog"
+
+#: src/applications/fs/tools/gnunet-insert.c:212
+msgid ""
+"use libextractor to add additional direct references to directory entries"
+msgstr ""
+"använd libextractor för att lägga till ytterligare direktreferenser till "
+"katalogposter"
+
+#: src/applications/fs/tools/gnunet-insert.c:214
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:218
+msgid ""
+"set interval for availability of updates to SECONDS (for namespace "
+"insertions only)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:221
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:224
+msgid ""
+"add an additional keyword for all files and directories (this option can be "
+"specified multiple times)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:228
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:230
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:233
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:236
+msgid "specify the priority of the content"
+msgstr "ange prioritet för innehållet"
+
+#: src/applications/fs/tools/gnunet-insert.c:238
+msgid "publish the files under the pseudonym NAME (place file into namespace)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:240
+msgid "process directories recursively"
+msgstr "bearbeta kataloger rekursivt"
+
+#: src/applications/fs/tools/gnunet-insert.c:242
+msgid ""
+"specifies this as an aperiodic but updated publication (for namespace "
+"insertions only)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:245
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:248
+msgid "specify creation time for SBlock (see man-page for format)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:250
+msgid "ID of the previous version of the content (for namespace update only)"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:257
+msgid "Make files available to GNUnet for sharing."
+msgstr "Gör filer tillgängliga via utdelning till GNUnet."
+
+#: src/applications/fs/tools/gnunet-insert.c:344
+#, c-format
+msgid "You must pass a positive number to the `%s' option.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:429
+#, c-format
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:537
+#: src/applications/fs/tools/gnunet-unindex.c:145
+#, c-format
+msgid "You must specify a list of files to insert.\n"
+msgstr "Du måste ange en lista av filer att lägga in.\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:541
+#, c-format
+msgid "Only one file or directory can be specified at a time.\n"
+msgstr "Endast en fil eller katalog kan anges samtidigt.\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:545
+#, c-format
+msgid "You must specify a file or directory to upload.\n"
+msgstr "Du måste ange en fil eller katalog att ladda upp.\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:595
+#, c-format
+msgid "Keywords for file `%s':\n"
+msgstr "Nyckelord för fil \"%s\":\n"
+
+#: src/applications/fs/tools/gnunet-insert.c:617
+#, c-format
+msgid "Could not access namespace `%s' (does not exist?).\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:636
+#, c-format
+msgid "Parsing time failed. Use `%s' format.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-insert.c:649
+#: src/applications/fs/tools/gnunet-insert.c:653
+#: src/applications/fs/tools/gnunet-insert.c:657
+#: src/applications/fs/tools/gnunet-insert.c:661
+#: src/applications/fs/tools/gnunet-insert.c:666
+#, c-format
+msgid "Option `%s' makes no sense without option `%s'.\n"
+msgstr ""
+
+#: src/applications/fs/tools/gnunet-search.c:108
+#: src/applications/fs/tools/gnunet-download.c:42
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr ""
+
 #: src/applications/fs/tools/gnunet-search.c:114
 msgid "exit after receiving LIMIT results"
 msgstr ""
@@ -1277,6 +2131,58 @@
 msgid "Error converting arguments to URI!\n"
 msgstr ""
 
+#: src/applications/fs/tools/gnunet-download.c:41
+msgid "LEVEL"
+msgstr "NIVÅ"
+
+#: src/applications/fs/tools/gnunet-download.c:47
+msgid "FILENAME"
+msgstr "FILNAMN"
+
+#: src/applications/fs/tools/gnunet-download.c:48
+msgid "write the file to FILENAME"
+msgstr "skriv filen till FILNAMN"
+
+#: src/applications/fs/tools/gnunet-download.c:50
+msgid "download a GNUnet directory recursively"
+msgstr "hämta en GNUnet-katalog rekursivt"
+
+#: src/applications/fs/tools/gnunet-download.c:56
+msgid "Download files from GNUnet."
+msgstr "Ladda ner filer från GNUnet."
+
+#: src/applications/fs/tools/gnunet-download.c:136
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr ""
+"Inte tillräckligt med argument. Du måste ange en URI till en GNUnet-fil\n"
+
+#: src/applications/fs/tools/gnunet-download.c:159
+#, fuzzy, c-format
+msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
+msgstr "Hämtning av fil \"%s\" vid %16llu av %16llu byte (%8.3f kbps)\n"
+
+#: src/applications/fs/tools/gnunet-download.c:172
+#: src/applications/fs/tools/gnunet-download.c:183
+#, c-format
+msgid "Error downloading: %s\n"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/applications/fs/tools/gnunet-download.c:191
+#, fuzzy, c-format
+msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
+msgstr ""
+"Hämtning av fil \"%s\" färdig.  Hastigheten var %8.3f kilobyte per sekund.\n"
+
+#: src/applications/fs/tools/gnunet-download.c:237
+#, c-format
+msgid "URI `%s' invalid for gnunet-download.\n"
+msgstr "URI \"%s\" ogiltig för gnunet-download.\n"
+
+#: src/applications/fs/tools/gnunet-download.c:288
+#, c-format
+msgid "File stored as `%s'.\n"
+msgstr "Fil lagrad som \"%s\".\n"
+
 #: src/applications/fs/tools/gnunet-unindex.c:50
 #, c-format
 msgid ""
@@ -1287,10 +2193,10 @@
 "färdigställd)                "
 
 #: src/applications/fs/tools/gnunet-unindex.c:61
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "\n"
-"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
+"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "\n"
 "Avindexering av \"%s\" klar, %llu byte tog %llu sekunder (%8.3f kbps).\n"
@@ -1318,1775 +2224,1367 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "\"%s\" misslyckades.  Är \"%s\" en fil?\n"
 
-#: src/applications/gap/gap.c:1617
-#, fuzzy, c-format
-msgid "GAP received invalid content from `%s'\n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+#: src/applications/fs/module/ondemand.c:305
+#, c-format
+msgid "Indexed file disappeared, deleting block for query `%s'\n"
+msgstr "Indexerad fil försvann, tar bort block för fråga \"%s\"\n"
 
-#: src/applications/gap/gap.c:1618
-msgid "myself"
+#: src/applications/fs/module/ondemand.c:393
+#, c-format
+msgid ""
+"Because the file `%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1791
+#: src/applications/fs/module/ondemand.c:419
+#, c-format
 msgid ""
-"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+"Configuration file must specify directory for storage of FS data in section `"
+"%s' under `%s'.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
-msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
+#: src/applications/fs/module/ondemand.c:617
+#, c-format
+msgid ""
+"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2077
-msgid "# gap requests total received"
+#: src/applications/fs/module/fs.c:1184
+#, c-format
+msgid ""
+"You must specify a postive number for `%s' in the configuration in section `%"
+"s'.\n"
 msgstr ""
+"Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
+"\".\n"
 
-#: src/applications/gap/gap.c:2078
-msgid "# gap requests policy: immediate drop"
+#: src/applications/fs/module/fs.c:1233
+#, c-format
+msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2079
-msgid "# gap requests policy: not routed"
-msgstr ""
+#: src/applications/fs/module/fs.c:1270
+msgid "enables (anonymous) file-sharing"
+msgstr "aktiverar (anonym) fildelning"
 
-#: src/applications/gap/gap.c:2080
-msgid "# gap requests policy: not answered"
+#: src/applications/fs/module/migration.c:224
+msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/gap/gap.c:2081
-msgid "# gap requests processed: attempted add to RT"
+#: src/applications/fs/module/migration.c:225
+msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/gap/gap.c:2082
-msgid "# gap requests processed: local result"
-msgstr ""
+#: src/applications/fs/fsui/namespace_info.c:583
+msgid "Publication interval for periodic publication changed."
+msgstr "Publiseringsintervall för periodisk publisering har ändrats."
 
-#: src/applications/gap/gap.c:2083
-msgid "# gap routing successes (total)"
+#: src/applications/fs/fsui/namespace_info.c:604
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2084
-msgid "# gap requests dropped: collision in RT"
+#: src/applications/fs/fsui/search.c:245
+msgid "This search is already pending!\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2085
-msgid "# gap requests forwarded (counting each peer)"
+#: src/applications/fs/fsui/fsui.c:189
+msgid "FSUI persistence: error restoring download\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2086
-msgid "# gap duplicate requests (pending)"
+#: src/applications/fs/fsui/fsui.c:638
+#, c-format
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2087
-msgid "# gap duplicate requests that were re-tried"
-msgstr ""
+#: src/applications/fs/fsui/download.c:290
+msgid "Download aborted."
+msgstr "Nedladdning avbruten."
 
-#: src/applications/gap/gap.c:2088
-msgid "# gap re-try ttl difference (cummulative)"
+#: src/applications/fs/fsui/download.c:294
+msgid "ECRS download failed (see logs)."
 msgstr ""
 
-#: src/applications/gap/gap.c:2089
-msgid "# gap reply duplicates"
+#: src/applications/fs/fsui/download.c:298
+msgid "ECRS download suspending."
 msgstr ""
 
-#: src/applications/gap/gap.c:2090
-msgid "# gap spurious replies"
+#: src/applications/fs/fsui/download.c:302
+msgid "Unexpected download state."
 msgstr ""
 
-#: src/applications/gap/gap.c:2091
-msgid "# gap routing slots currently in use"
+#: src/applications/fs/fsui/unindex.c:85
+msgid "Unindex failed."
+msgstr "Avindexering misslyckades."
+
+#: src/applications/fs/fsui/helper.c:67
+msgid "No keywords specified!\n"
+msgstr "Inga nyckelord angivna!\n"
+
+#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:448
+#, fuzzy
+msgid "Upload failed."
+msgstr "Uppladdning misslyckades.\n"
+
+#: src/applications/fs/fsui/upload.c:455
+msgid "Cannot upload directory without using recursion."
 msgstr ""
 
-#: src/applications/gap/gap.c:2092
-msgid "# gap memory used for tracking seen content"
+#: src/applications/fs/fsui/file_info.c:93
+msgid "Collecting file identifiers disabled.\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2093
-msgid "# gap memory used for tracking routing destinations"
+#: src/applications/fs/fsui/file_info.c:282
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/gap/gap.c:2094
-msgid "# gap rewards pending"
+#: src/applications/fs/ecrs/search.c:160
+msgid "CHK URI not allowed for search.\n"
+msgstr "CHK URI tillåts inte för sökning.\n"
+
+#: src/applications/fs/ecrs/search.c:216
+msgid "LOC URI not allowed for search.\n"
+msgstr "LOC URI tillåts inte för sökning.\n"
+
+#: src/applications/fs/ecrs/download.c:125
+#, c-format
+msgid "Could not unlink temporary file `%s': %s\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2095
-msgid "# gap response weights"
+#: src/applications/fs/ecrs/download.c:257
+#, c-format
+msgid "Write(%d, %p, %d) failed: %s\n"
+msgstr "Skrivning(%d, %p, %d) misslyckades: %s\n"
+
+#: src/applications/fs/ecrs/download.c:935
+msgid ""
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
 msgstr ""
+"Dekrypterat innehåll stämmer inte med nyckeln. Det är antingen ett fel eller "
+"en fil inlagd med onda avsikter. Hämtning avbruten.\n"
 
-#: src/applications/gap/gap.c:2112
+#: src/applications/fs/ecrs/download.c:1112
+#, c-format
 msgid ""
-"Traffic service failed to load; gap cannot ensure cover-traffic "
-"availability.\n"
+"Content `%s' seems to be not available on the network (tried %u times).\n"
 msgstr ""
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/fs/ecrs/upload.c:180
 #, c-format
-msgid "`%s' registering handlers %d %d\n"
-msgstr "\"%s\" registrerar handtag %d %d\n"
+msgid "`%s' is not a file.\n"
+msgstr "\"%s\" är inte en fil.\n"
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/fs/ecrs/upload.c:186
 #, c-format
-msgid "`%s' registering client handler %d\n"
-msgstr "\"%s\" registrerar klienthandtag %d\n"
+msgid "Cannot get size of file `%s'"
+msgstr "Kan inte hämta storlek på fil \"%s\""
 
-#: src/applications/getoption/getoption.c:82
-msgid "allows clients to determine gnunetd's configuration"
-msgstr "tillåter klienter att fastställa gnunetds konfiguration"
+#: src/applications/fs/ecrs/upload.c:193
+#, fuzzy
+msgid "Failed to connect to gnunetd."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/applications/identity/hostkey.c:119
+#: src/applications/fs/ecrs/upload.c:203
 #, c-format
-msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+msgid "Cannot hash `%s'.\n"
 msgstr ""
-"Existerande värdnyckel i filen \"%s\" felade vid formatkontroll, skapar en "
-"ny värdnyckel.\n"
 
-#: src/applications/identity/hostkey.c:127
-msgid "Creating new hostkey (this may take a while).\n"
-msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
+#: src/applications/fs/ecrs/upload.c:221
+#, c-format
+msgid "Initialization for indexing file `%s' failed.\n"
+msgstr "Initiering av indexering av fil \"%s\" misslyckades.\n"
 
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+#: src/applications/fs/ecrs/upload.c:227
+#, 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/identity/hostkey.c:139
-msgid "Done creating hostkey.\n"
-msgstr "Klar med skapandet av värdnyckel.\n"
+#: src/applications/fs/ecrs/upload.c:306
+#, c-format
+msgid "Indexing data failed at position %i.\n"
+msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/applications/identity/identity.c:329
+#: src/applications/fs/ecrs/meta.c:842
 #, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
+msgid "Renaming of file `%s' to `%s' failed: %s\n"
+msgstr "Namnbyte på fil \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: src/applications/identity/identity.c:362
+#: src/applications/fs/ecrs/meta.c:850
 #, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "%s \"%s\" returnerade inga kända värdar!\n"
+msgid "Could not rename file `%s' to `%s': file exists\n"
+msgstr "Kunde inte byta namn på fil \"%s\" till \"%s\": filen existerar\n"
 
-#: src/applications/identity/identity.c:644
-#: src/applications/identity/identity.c:662
+#: src/applications/fs/ecrs/namespace.c:45
 #, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s.\n"
 msgstr ""
 
-#: src/applications/identity/identity.c:712
-#, fuzzy, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
-msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
+#: src/applications/fs/ecrs/namespace.c:133
+#, c-format
+msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
+msgstr "Kan inte skapa pseudonym \"%s\", filen \"%s\" existerar.\n"
 
-#: src/applications/identity/identity.c:720
-msgid "Signature failed verification: signature invalid.\n"
-msgstr ""
+#: src/applications/fs/ecrs/namespace.c:307
+#: src/applications/fs/ecrs/namespace.c:383
+#: src/applications/fs/ecrs/namespace.c:528
+#, c-format
+msgid "File `%s' does not contain a pseudonym.\n"
+msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/applications/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
+#: src/applications/fs/ecrs/namespace.c:318
+#: src/applications/fs/ecrs/namespace.c:394
 #, c-format
-msgid "Received malformed `%s' message. Dropping.\n"
-msgstr ""
+msgid "Format of pseudonym `%s' is invalid.\n"
+msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/applications/pingpong/pingpong.c:130
-msgid "Received ping for another peer. Dropping.\n"
-msgstr ""
+#: src/applications/fs/ecrs/namespace.c:538
+#: src/applications/fs/ecrs/namespace.c:548
+#, c-format
+msgid "Format of file `%s' is invalid.\n"
+msgstr "Formatet på filen \"%s\" är ogiltig.\n"
 
-#: src/applications/pingpong/pingpong.c:187
-msgid "Received PING not destined for us!\n"
-msgstr "Mottog PING som ej var ämnat för oss!\n"
-
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/topology_f2f/topology.c:323
+#, c-format
 msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+"Need to have list of friends in configuration under `%s' in section `%s'.\n"
 msgstr ""
 
-#: src/applications/pingpong/pingpong.c:366
-msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
-msgstr "Kan inte skapa PING, tabell är full. Försök att öka MAX_PING_PONG.\n"
+#: src/applications/topology_f2f/topology.c:342
+#, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/applications/pingpong/pingpong.c:452
-msgid "# encrypted PONG messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/applications/topology_f2f/topology.c:358
+msgid "Syntax error in topology specification, skipping bytes.\n"
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:454
-msgid "# plaintext PONG messages received"
-msgstr "# klartext PONG-meddelanden mottagna"
+#: src/applications/topology_f2f/topology.c:370
+#, c-format
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgstr ""
 
-#: src/applications/pingpong/pingpong.c:456
-msgid "# encrypted PING messages received"
-msgstr "# krypterade PING-meddelanden mottagna"
+#: src/applications/template/template.c:61
+#, c-format
+msgid "`%s' registering client handler %d and %d\n"
+msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
 
-#: src/applications/pingpong/pingpong.c:458
-msgid "# PING messages created"
-msgstr "# PING-meddelanden skapade"
+#: src/applications/template/gnunet-template.c:70
+#: src/applications/vpn/gnunet-vpn.c:72
+msgid "helptext for -t"
+msgstr "hjälptext för -t"
 
-#: src/applications/pingpong/pingpong.c:460
-msgid "# encrypted PONG messages sent"
-msgstr "# krypterade PONG-meddelanden skickade"
+#: src/applications/template/gnunet-template.c:75
+msgid "Template for gnunet-clients."
+msgstr "Mall för gnunet-clients."
 
-#: src/applications/pingpong/pingpong.c:464
-msgid "# encrypted PING messages sent"
-msgstr "# krypterade PING-meddelanden skickade"
-
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/bootstrap_http/http.c:109
 #, c-format
-msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
-msgstr "\"%s\" registrerar handtag %d %d (klartext och kryptotext)\n"
+msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+msgstr ""
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#: src/applications/bootstrap_http/http.c:120
 #, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be registered: another callback is already "
-"using this name (%p)\n"
-msgstr ""
+msgid "`%s' failed at %s:%d with error: `%s'.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#: src/applications/bootstrap_http/http.c:132
 #, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
-"under that name: %p\n"
+msgid "Could not download list of peer contacts, host `%s' unknown.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:232
+#: src/applications/bootstrap_http/http.c:155
+#: src/applications/bootstrap_http/http.c:181
 #, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
-msgstr "%s::%s - RPC %s:%p kunde inte avregistreras: hittades inte\n"
+msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/bootstrap_http/http.c:217
 #, c-format
-msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
-msgstr ""
+msgid "Parsing HTTP response for URL `%s' failed.\n"
+msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
+#: src/applications/bootstrap_http/http.c:252
 #, c-format
-msgid "Invalid message of type %u received.  Dropping.\n"
+msgid "Parsing hello from `%s' failed.\n"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:936
+#: src/applications/bootstrap_http/http.c:330
 #, c-format
-msgid "Dropping RPC request %u: message malformed.\n"
-msgstr ""
+msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\". Försöker utan proxy.\n"
 
-#: src/applications/rpc/rpc.c:1388
-#, c-format
-msgid "RPC not unregistered: %s:%p\n"
+#: src/applications/bootstrap_http/http.c:355
+msgid "# hellos downloaded via http"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/traffic/traffic.c:445
 #, c-format
-msgid "`%s' registering handlers %d %d %d\n"
-msgstr "\"%s\" registrerar handtag %d %d %d\n"
+msgid "# bytes transmitted of type %d"
+msgstr "# byte skickade av typen %d"
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/traffic/traffic.c:465
 #, c-format
-msgid "Failed to initialize `%s' service.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+msgid "# bytes received of type %d"
+msgstr "# byte mottagna av typen %d"
 
-#: src/applications/rpc/rpc.c:1491
-msgid "RPC async reply invalid.\n"
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
 msgstr ""
 
-#: src/applications/rpc/rpc.c:1562
-msgid "async RPC reply not received.\n"
+#: src/applications/traffic/clientapi.c:67
+msgid "Failed to query gnunetd about traffic conditions.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:209
-#, c-format
-msgid "Session key from peer `%s' could not be verified.\n"
+#: src/applications/traffic/clientapi.c:74
+msgid "Did not receive reply from gnunetd about traffic conditions.\n"
 msgstr ""
 
-#: src/applications/session/connect.c:246
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
-msgstr "Kan inte kryptera sessionsnyckel, andra parten är inte känd!\n"
+#: src/applications/kvstore_sqlite/kv_sqlite.c:181
+#, fuzzy, c-format
+msgid ""
+"Configuration file must specify directory for storing data in section `%s' "
+"under `%s'.\n"
+msgstr ""
+"Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
+"under %s\\%s.\n"
 
-#: src/applications/session/connect.c:523
-#, c-format
-msgid "Invalid `%s' message received from peer `%s'.\n"
+#: src/applications/kvstore_sqlite/kv_sqlite.c:264
+#, fuzzy
+msgid "Unable to initialize SQLite KVStore.\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/applications/vpn/gnunet-vpn.c:77
+msgid "VPN over GNUnet."
 msgstr ""
 
-#: src/applications/session/connect.c:532
+#: src/applications/vpn/vpn.c:315
 #, c-format
-msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
+msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/session/connect.c:587
-msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
+#: src/applications/vpn/vpn.c:323
+#, c-format
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
 msgstr ""
 
-#: src/applications/session/connect.c:597
+#: src/applications/vpn/vpn.c:351
 #, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
+msgid "Inserting route from peer %d in route table at location %d\n"
 msgstr ""
 
-#: src/applications/session/connect.c:742
-msgid "# session keys sent"
-msgstr "# sessionsnycklar skickade"
-
-#: src/applications/session/connect.c:744
-msgid "# session keys rejected"
-msgstr "# sessionnycklar vägrade"
-
-#: src/applications/session/connect.c:746
-msgid "# session keys accepted"
-msgstr "# sessionsnycklar accepterade"
-
-#: src/applications/session/connect.c:748
-msgid "# sessions established"
-msgstr "# sessioner etablerade"
-
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:57
-#: src/util/hostkey_gcrypt.c:64 src/util/storage.c:659
-#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1042 src/include/gnunet_util.h:1049
-#: src/include/gnunet_util.h:1051
+#: src/applications/vpn/vpn.c:400
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/vpn/vpn.c:404
 #, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
-msgid "mysql datastore"
+#: src/applications/vpn/vpn.c:414
+#, c-format
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1107
+#: src/applications/vpn/vpn.c:474
 #, c-format
-msgid "Query `%s' had no results.\n"
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
-msgid "# bytes in datastore"
+#: src/applications/vpn/vpn.c:478
+#, c-format
+msgid "Cannot open tunnel device because of %s"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1205
+#: src/applications/vpn/vpn.c:505
 #, 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"
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1223
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
+#: src/applications/vpn/vpn.c:513
+#, c-format
+msgid "Cannot set tunnel name to %s because of %s\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "Kunde inte initiera libgnunetutil!\n"
-
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
-msgid "sqlite datastore"
+#: src/applications/vpn/vpn.c:517
+#, c-format
+msgid "Configured tunnel name to %s\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1035
+#: src/applications/vpn/vpn.c:555
 #, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
+msgid "Cannot get socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/clientapi.c:179
-msgid "Uptime (seconds)"
-msgstr "Upptid (sekunder)"
-
-#: src/applications/stats/gnunet-stats.c:61
-#: src/applications/testbed/commands.c:1130
+#: src/applications/vpn/vpn.c:559
 #, c-format
-msgid "Supported peer-to-peer messages:\n"
+msgid "Cannot set socket flags for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:64
-#: src/applications/testbed/commands.c:1132
+#: src/applications/vpn/vpn.c:566
 #, c-format
-msgid "Supported client-server messages:\n"
+msgid "Cannot set MTU for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:94
-msgid "prints supported protocol messages"
-msgstr "skriver ut stödda protokollmeddelanden"
-
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
-msgstr "Skriv ut statistik om GNUnet-operationer."
-
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/vpn/vpn.c:571
 #, c-format
-msgid "Error establishing connection with gnunetd.\n"
+msgid "Cannot get interface index for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/vpn/vpn.c:579
 #, c-format
-msgid "Error reading information from gnunetd.\n"
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:206
+#: src/applications/vpn/vpn.c:591
 #, c-format
-msgid "% of allowed network load (up)"
+msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:208
+#: src/applications/vpn/vpn.c:602
 #, c-format
-msgid "% of allowed network load (down)"
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:210
+#: src/applications/vpn/vpn.c:614
 #, c-format
-msgid "% of allowed cpu load"
+msgid "Cannot add route IPv6 address for gnu%s because %s\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:214
-msgid "# bytes of noise received"
+#: src/applications/vpn/vpn.c:646
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
 msgstr ""
 
-#: src/applications/stats/statistics.c:372
-msgid "keeps statistics about gnunetd's operation"
-msgstr "behåller statistik om gnunetds operation"
+#: src/applications/vpn/vpn.c:692
+#, c-format
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:95
-msgid "output in gnuplot format"
-msgstr "utdata i gnuplot-format"
+#: src/applications/vpn/vpn.c:754
+#, c-format
+msgid "RFC4193 --- whitelist of peer %x\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:98
-msgid "number of iterations"
-msgstr "antal iterationer"
+#: src/applications/vpn/vpn.c:772
+msgid "RFC4193 Thread exiting\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:100
-msgid "number of messages to use per iteration"
-msgstr "antal meddelanden att använda per iteration"
+#: src/applications/vpn/vpn.c:812
+msgid "VPN IP src not anonymous. drop..\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:102
-msgid "receiver host identifier (ENC file name)"
+#: src/applications/vpn/vpn.c:816
+msgid "VPN IP not anonymous, drop.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:104
-msgid "message size"
-msgstr "meddelandestorlek"
+#: src/applications/vpn/vpn.c:822
+msgid "VPN Received, not anonymous, drop.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:106
-msgid "sleep for SPACE ms after each a message block"
+#: src/applications/vpn/vpn.c:825
+#, c-format
+msgid "VPN Received unknown IP version %d...\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:108
-msgid "time to wait for the completion of an iteration (in ms)"
+#: src/applications/vpn/vpn.c:835
+#, c-format
+msgid "<- GNUnet(%d) : %s\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:111
-msgid "number of messages in a message block"
-msgstr "antal meddelanden i ett meddelandeblock"
-
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
+#: src/applications/vpn/vpn.c:854
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:225
-msgid "You must specify a receiver!\n"
-msgstr "Du måste ange en mottagare!\n"
-
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/vpn/vpn.c:869
 #, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:249
-#, c-format
-msgid "Time:\n"
-msgstr "Tid:\n"
+#: src/applications/vpn/vpn.c:885
+msgid "Receive route request\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:250
+#: src/applications/vpn/vpn.c:890
 #, c-format
-msgid "\tmax      %llums\n"
-msgstr "\tmax      %llums\n"
+msgid "Prepare route announcement level %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/vpn/vpn.c:901
 #, c-format
-msgid "\tmin      %llums\n"
-msgstr "\tmin      %llums\n"
+msgid "Send route announcement %d with route announce\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:254
+#: src/applications/vpn/vpn.c:907
 #, c-format
-msgid "\tmean     %8.4fms\n"
+msgid "Send outside table info %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:256
-#, c-format
-msgid "\tvariance %8.4fms\n"
+#: src/applications/vpn/vpn.c:923
+msgid "Receive route announce.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:259
-#, c-format
-msgid "Loss:\n"
+#: src/applications/vpn/vpn.c:927
+msgid "Going to try insert route into local table.\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/vpn/vpn.c:931
 #, c-format
-msgid "\tmax      %u\n"
-msgstr "\tmax      %u\n"
+msgid "Inserting with hops %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:262
+#: src/applications/vpn/vpn.c:945
 #, c-format
-msgid "\tmin      %u\n"
-msgstr "\tmin      %u\n"
+msgid "Request level %d from peer %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:264
+#: src/applications/vpn/vpn.c:960
 #, c-format
-msgid "\tmean     %8.4f\n"
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:266
-#, c-format
-msgid "\tvariance %8.4f\n"
+#: src/applications/vpn/vpn.c:998
+msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:275
-#, c-format
-msgid "Output format not known, this should not happen.\n"
-msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
+#: src/applications/vpn/vpn.c:1013
+msgid "realise add routes\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:279
-#, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+#: src/applications/vpn/vpn.c:1058
+msgid "realise pull routes\n"
 msgstr ""
 
-#: src/applications/tbench/tbench.c:448
-msgid "allows profiling of direct peer-to-peer connections"
+#: src/applications/vpn/vpn.c:1104
+msgid "realise copy table\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:57
+#: src/applications/vpn/vpn.c:1161
+msgid "Yes"
+msgstr "Ja"
+
+#: src/applications/vpn/vpn.c:1161
+msgid "No"
+msgstr "Nej"
+
+#: src/applications/vpn/vpn.c:1324
+#, fuzzy, c-format
+msgid "`%s' initialising RFC4913 module  %d and %d\n"
+msgstr "\"%s\" registrerar handtagen %d och %d\n"
+
+#: src/applications/vpn/vpn.c:1325
 #, c-format
-msgid "Using %u messages of size %u for %u times.\n"
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:84
-#, c-format
-msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
+#: src/applications/vpn/vpn.c:1361
+#, fuzzy
+msgid "enables IPv6 over GNUnet (incomplete)"
+msgstr "aktiverar P2P-chatt (ej komplett)"
+
+#: src/applications/vpn/vpn.c:1383
+msgid "RFC4193 Waiting for tun thread to end\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:89
-#, c-format
-msgid "Loss:  max %16u  min %16u  mean %12.3f  variance %12.3f\n"
+#: src/applications/vpn/vpn.c:1394
+msgid "RFC4193 The tun thread has ended\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:95
+#: src/applications/vpn/vpn.c:1405
 #, c-format
-msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:211
+#: src/applications/state/state.c:85
 #, c-format
-msgid "Running benchmark...\n"
+msgid ""
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
 msgstr ""
+"Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
+"under %s\\%s.\n"
 
-#: src/applications/template/gnunet-template.c:70
-msgid "helptext for -t"
-msgstr "hjälptext för -t"
+#: src/server/gnunet-update.c:50
+msgid "print a value from the configuration file to stdout"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
-msgstr "Mall för gnunet-clients."
+#: src/server/gnunet-update.c:55 src/server/startup.c:450
+#: src/server/gnunet-transport-check.c:407
+msgid "run as user LOGIN"
+msgstr "kör som användare LOGIN"
 
-#: src/applications/template/template.c:61
-#, c-format
-msgid "`%s' registering client handler %d and %d\n"
-msgstr "\"%s\" registrerar klienthandtagen %d och %d\n"
+#: src/server/gnunet-update.c:58
+msgid "run in client mode (for getting client configuration values)"
+msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
 
-#: src/applications/testbed/gnunet-testbed.c:119
-msgid "Start GNUnet-testbed helper."
-msgstr "Starta hjälpprogrammet GNUnet-testbed."
+#: src/server/gnunet-update.c:64
+msgid "Updates GNUnet datastructures after version change."
+msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
 
-#: src/applications/testbed/gnunet-testbed.c:183
+#: src/server/gnunet-update.c:147
 #, c-format
-msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgid "Option `%s' makes no sense without option `%s'."
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:282
+#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
+#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
 #, c-format
-msgid "Could not execute `%s': %s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
+msgid "Invalid arguments: "
+msgstr "Ogiltiga argument: "
 
-#: src/applications/testbed/gnunet-testbed.c:325
-msgid "No client service started. Trying again in 30 seconds.\n"
-msgstr ""
-
-#: src/applications/testbed/gnunet-testbed.c:348
+#: src/server/gnunet-update.c:155
 #, c-format
 msgid ""
-"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
-"Trying again in %d seconds...\n"
+"\n"
+"Exiting.\n"
 msgstr ""
+"\n"
+"Avslutar.\n"
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
-#, c-format
-msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
-msgstr ""
+#: src/server/gnunet-update.c:232 src/server/core.c:476
+msgid "No applications defined in configuration!\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/applications/testbed/gnunet-testbed.c:428
+#: src/server/gnunet-update.c:249
 #, c-format
-msgid "Protocol violation on socket. Expected command.\n"
-msgstr ""
+msgid "Updating data for module `%s'\n"
+msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/applications/testbed/gnunet-testbed.c:467
+#: src/server/gnunet-update.c:253
 #, c-format
-msgid "Command `%s' not found!\n"
-msgstr "Kommando \"%s\" hittades inte!\n"
-
-#: src/applications/testbed/gnunet-testbed.c:540
-msgid "Start GNUnet testbed controller."
+msgid "Failed to update data for module `%s'\n"
 msgstr ""
 
-#: src/applications/testbed/gnunet-testbed.c:594
+#: src/server/gnunet-update.c:309
 #, c-format
-msgid "Malformed entry in the configuration in section %s under %s: %s\n"
-msgstr ""
+msgid "Updated data for %d applications.\n"
+msgstr "Uppdaterade data för %d program.\n"
 
-#: src/applications/testbed/testbed.c:50
-msgid "Could not send acknowledgement back to client.\n"
-msgstr ""
-
-#: src/applications/testbed/testbed.c:60
+#: src/server/connection.c:983
 #, c-format
-msgid "Received unknown testbed message of type %u.\n"
-msgstr ""
+msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
+msgstr "\"%s\" valda %d av %d meddelanden (MTU: %d).\n"
 
-#: src/applications/testbed/testbed.c:78
-#: src/applications/testbed/testbed.c:807
+#: src/server/connection.c:990
 #, c-format
-msgid "size of `%s' message is too short. Ignoring.\n"
-msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
+msgid "Message details: %u: length %d, priority: %d\n"
+msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
 
-#: src/applications/testbed/testbed.c:85
+#: src/server/connection.c:2254
 #, c-format
-msgid "size of `%s' message is wrong. Ignoring.\n"
-msgstr "storlek på \"%s\" meddelande är fel. Ignorerar.\n"
+msgid "Message from `%s' discarded: invalid format.\n"
+msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
 
-#: src/applications/testbed/testbed.c:137
+#: src/server/connection.c:2325
 #, c-format
-msgid "TESTBED could not generate hello message for protocol %u\n"
+msgid "Invalid sequence number %u <= %u, dropping message.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:215
-#: src/applications/testbed/testbed.c:256
-#: src/applications/testbed/testbed.c:359
-#: src/applications/testbed/testbed.c:366
-#: src/applications/testbed/testbed.c:403
-#: src/applications/testbed/testbed.c:410
-#, c-format
-msgid "received invalid `%s' message\n"
-msgstr "mottog ogiltigt \"%s\" meddelande\n"
+#: src/server/connection.c:2340
+msgid "Message received more than one day old. Dropped.\n"
+msgstr ""
 
-#: src/applications/testbed/testbed.c:231
-#: src/applications/testbed/testbed.c:271
-#, c-format
-msgid "received invalid `%s' message (empty module name)\n"
+#: src/server/connection.c:2708
+msgid "# outgoing messages dropped"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:238
-#, c-format
-msgid "loading module `%s' failed.  Notifying client.\n"
+#: src/server/connection.c:2712
+msgid "# bytes of outgoing messages dropped"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:278
-msgid "unloading module failed.  Notifying client.\n"
+#: src/server/connection.c:2714
+msgid "# connections closed (HANGUP sent)"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:539
-#, c-format
-msgid "`%s' %s failed: %s\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
+#: src/server/connection.c:2717
+msgid "# bytes encrypted"
+msgstr "# byte krypterade"
 
-#: src/applications/testbed/testbed.c:625
-#, c-format
-msgid "received invalid `%s' message: %s.\n"
-msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+#: src/server/connection.c:2721
+#, fuzzy
+msgid "# bytes transmitted"
+msgstr "# byte skickade av typen %d"
 
-#: src/applications/testbed/testbed.c:817
-#, c-format
-msgid "'..' is not allowed in file name (%s).\n"
-msgstr "\"..\" tillåts inte i filnamn (%s).\n"
+#: src/server/connection.c:2725
+#, fuzzy
+msgid "# bytes received"
+msgstr "# byte mottogs via TCP"
 
-#: src/applications/testbed/testbed.c:826
-msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+#: src/server/connection.c:2727
+msgid "# bytes decrypted"
+msgstr "# byte dekrypterade"
+
+#: src/server/connection.c:2728
+msgid "# bytes noise sent"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:833
-msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+#: src/server/startup.c:196
+#, c-format
+msgid "The `%s' request received from client is malformed.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:841
-msgid "Upload refused!"
-msgstr "Uppladdning vägrades!"
-
-#: src/applications/testbed/testbed.c:867
+#: src/server/startup.c:324
 #, c-format
-msgid "Invalid message received at %s:%d."
-msgstr "Ogiltigt meddelande mottogs den %s:%d."
+msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
+msgstr "Du måste ange ett namn för PID-filen i sektion \"%s\" under \"%s\".\n"
 
-#: src/applications/testbed/testbed.c:985
+#: src/server/startup.c:339
 #, c-format
-msgid "received invalid testbed message of size %u\n"
+msgid "Could not write PID to file `%s': %s.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1002
-#, c-format
+#: src/server/startup.c:443
 msgid ""
-"Received testbed message of type %u but unexpected size %u, expected %u\n"
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1045
-msgid "No testbed URL given, not registered.\n"
+#: src/server/startup.c:456
+msgid "Starts the gnunetd daemon."
+msgstr "Startar gnunetd-demonen."
+
+#: src/server/startup.c:470
+#, c-format
+msgid "User `%s' not known, cannot change UID to it.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1054 src/transports/http.c:1455
+#: src/server/startup.c:479
 #, c-format
-msgid "Could not resolve name of HTTP proxy `%s'.\n"
-msgstr "Kunde inte slå upp namn för HTTP-proxy \"%s\".\n"
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/applications/testbed/testbed.c:1118
+#: src/server/startup.c:580
+msgid "Invalid command-line arguments:\n"
+msgstr "Ogiltiga kommandoradsargument:\n"
+
+#: src/server/startup.c:583
 #, c-format
-msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
-msgstr ""
+msgid "Argument %d: `%s'\n"
+msgstr "Argument %d: \"%s\"\n"
 
-#: src/applications/testbed/testbed.c:1154
+#: src/server/startup.c:589
+msgid "Invalid command-line arguments.\n"
+msgstr "Ogiltiga kommandoradsargument.\n"
+
+#: src/server/gnunetd.c:76
 #, c-format
-msgid "Could not register testbed, host `%s' unknown\n"
+msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
+"Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
 
-#: src/applications/testbed/testbed.c:1177
+#: src/server/gnunetd.c:84
 #, c-format
-msgid "Failed to send HTTP request to host `%s': %s\n"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+msgid "`%s' starting\n"
+msgstr "\"%s\" startar\n"
 
-#: src/applications/testbed/testbed.c:1230
+#: src/server/gnunetd.c:106
 #, c-format
-msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
-msgstr "Misslyckades att skicka HTTP-begäran \"%s\" till värd \"%s\": %s\n"
+msgid "`%s' startup complete.\n"
+msgstr "\"%s\" uppstart klar.\n"
 
-#: src/applications/testbed/testbed.c:1269
-msgid "Exit register (error: no http response read).\n"
+#: src/server/gnunetd.c:111
+#, c-format
+msgid "`%s' is shutting down.\n"
 msgstr ""
 
-#: src/applications/testbed/testbed.c:1357
-msgid "allows construction of a P2P-testbed (incomplete)"
+#: src/server/core.c:115
+#, c-format
+msgid "Application module `%s' already initialized!\n"
 msgstr ""
 
-#: src/applications/topology_default/topology.c:398
+#: src/server/core.c:168
 #, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
+msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:323
+#: src/server/core.c:215
 #, c-format
-msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+msgid "Could not shutdown `%s': application not loaded\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/server/core.c:222
 #, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/applications/topology_f2f/topology.c:358
-msgid "Syntax error in topology specification, skipping bytes.\n"
+msgid "Could not shutdown application `%s': not initialized\n"
 msgstr ""
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/server/core.c:231 src/server/core.c:420
 #, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgid "Could not find '%s%s' method in library `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
-msgid "probe network to the given DEPTH"
+#: src/server/core.c:398
+#, c-format
+msgid "Could not release %p: service not loaded\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:103
-msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+#: src/server/core.c:499
+#, c-format
+msgid "Could not initialize application `%s'\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
-msgid "use PRIO for the priority of the trace request"
+#: src/server/core.c:516
+#, c-format
+msgid "Could not properly shutdown application `%s'.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:110
-msgid "wait DELAY seconds for replies"
+#: src/server/core.c:575
+msgid "FATAL: Identity plugin not found!\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
-msgstr "Spåra GNUnets nätverkstopologi."
-
-#: src/applications/tracekit/gnunet-tracekit.c:222
+#: src/server/core.c:633
 #, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
+msgid "Could not properly unload service `%s'!\n"
+msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:233
+#: src/server/gnunet-transport-check.c:109
 #, c-format
-msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
+msgid "`%s': Could not create hello.\n"
 msgstr ""
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
+#: src/server/gnunet-transport-check.c:118
 #, c-format
-msgid "`%s' connected to `%s'.\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+msgid "`%s': Could not connect.\n"
+msgstr "\"%s\": Kunde inte ansluta.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/server/gnunet-transport-check.c:148
 #, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
-msgstr ""
+msgid "`%s': Could not send.\n"
+msgstr "\"%s\": Kunde inte skicka.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
+#: src/server/gnunet-transport-check.c:168
 #, c-format
-msgid "Peer `%s' did not report back.\n"
-msgstr "Motpart \"%s\" rapporterade inte tillbaka.\n"
+msgid "`%s': Did not receive message within %llu ms.\n"
+msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
-msgid "Could not send request to gnunetd.\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
-
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
+#: src/server/gnunet-transport-check.c:182
 #, c-format
-msgid "Received invalid `%s' message from `%s'.\n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+msgid "`%s': Could not disconnect.\n"
+msgstr "\"%s\": Kunde inte koppla ned.\n"
 
-#: src/applications/tracekit/tracekit.c:243
-msgid "TRACEKIT: routing table full, trace request dropped\n"
-msgstr ""
-
-#: src/applications/tracekit/tracekit.c:331
+#: src/server/gnunet-transport-check.c:189
 #, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
+msgid ""
+"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
 msgstr ""
+"\"%s\" transport OK.  Det tog %ums att överföra %d meddelanden på %d byte "
+"styck.\n"
 
-#: src/applications/tracekit/tracekit.c:431
-msgid "allows mapping of the network topology"
-msgstr "tillåter kartläggning av nätverkstopologin"
+#: src/server/gnunet-transport-check.c:219
+#, fuzzy, c-format
+msgid " Transport %d is not being tested\n"
+msgstr " Transport %d ej tillgänglig\n"
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
+#: src/server/gnunet-transport-check.c:230
+#, c-format
+msgid ""
+"\n"
+"Contacting `%s'."
 msgstr ""
+"\n"
+"Kontaktar \"%s\"."
 
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr ""
+#: src/server/gnunet-transport-check.c:253
+#, c-format
+msgid " Connection failed\n"
+msgstr " Anslutning misslyckades\n"
 
-#: src/applications/traffic/traffic.c:445
+#: src/server/gnunet-transport-check.c:259
 #, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "# byte skickade av typen %d"
+msgid " Connection failed (bug?)\n"
+msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/applications/traffic/traffic.c:465
+#: src/server/gnunet-transport-check.c:320
 #, c-format
-msgid "# bytes received of type %d"
-msgstr "# byte mottagna av typen %d"
+msgid "No reply received within %llums.\n"
+msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/applications/traffic/traffic.c:605
-msgid "tracks bandwidth utilization by gnunetd"
+#: src/server/gnunet-transport-check.c:396
+msgid "ping peers from HOSTLISTURL that match transports"
 msgstr ""
 
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
-#, c-format
-msgid "No transport of type %d known.\n"
-msgstr "Ingen transport av typ %d är känd.\n"
+#: src/server/gnunet-transport-check.c:398
+msgid "send COUNT messages"
+msgstr "skicka ANTAL meddelanden"
 
-#: src/applications/transport/transport.c:676
-#, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
-msgstr ""
+#: src/server/gnunet-transport-check.c:400
+msgid "send messages with SIZE bytes payload"
+msgstr "skicka meddelanden med STORLEK bytes nyttolast"
 
-#: src/applications/transport/transport.c:691
-#, c-format
-msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
+#: src/server/gnunet-transport-check.c:402
+msgid "specifies which TRANSPORT should be tested"
+msgstr "anger vilken TRANSPORT som ska testas"
+
+#: src/server/gnunet-transport-check.c:404
+msgid "specifies after how many MS to time-out"
+msgstr "anger timeout efter antal MS"
+
+#: src/server/gnunet-transport-check.c:414
+msgid "Tool to test if GNUnet transport services are operational."
 msgstr ""
 
-#: src/applications/transport/transport.c:717
+#: src/server/gnunet-transport-check.c:565
+msgid "You must specify a non-empty set of transports to test!\n"
+msgstr "Du måste ange en icke-tom uppsättning av transporter att testa!\n"
+
+#: src/server/gnunet-transport-check.c:570
 #, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
-msgstr ""
+msgid "Testing transport(s) %s\n"
+msgstr "Testar transport(er) %s\n"
 
-#: src/applications/transport/transport.c:738
+#: src/server/gnunet-transport-check.c:573
 #, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Jag är ändpunkt \"%s\".\n"
+msgid "Available transport(s): %s\n"
+msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/conf/conf.c:522 src/conf/recreate.c:135
+#: src/server/gnunet-transport-check.c:617
 #, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
+msgid ""
+"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
 msgstr ""
 
-#: src/conf/conf.c:529
+#: src/server/tcpserver.c:422
 #, c-format
-msgid "Configuration file `%s' created.\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
+msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/conf/confdata.c:93
+#: src/server/tcpserver.c:688
 #, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
-msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
-
-#: src/conf/gconf.c:73
-msgid "Sorry, no help is available for this option.\n"
-msgstr "Tyvärr, ingen hjälp är tillgänglig för den här flaggan.\n"
-
-#: src/conf/wizard.glade:10 src/conf/wizard.glade:259
-#: src/conf/wizard.glade:711 src/conf/wizard.glade:1436
-#: src/conf/wizard.glade:2217
-msgid "GNUnet configuration assistant"
+msgid ""
+"Malformed network specification in the configuration in section `%s' for "
+"entry `%s': %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:56
-#, fuzzy
-msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org\n";
-"and join our community at\n"
-"\thttps://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"The GNUnet team"
+#: src/server/tcpserver.c:798
+#, c-format
+msgid "%s failed, message type %d already in use.\n"
 msgstr ""
-"Välkommen till GNUnet!\n"
-"\n"
-"Denna assistant kommer att fråga dig några enkla frågor för att konfigurera "
-"GNUnet.\n"
-"\n"
-"Vänligen besök på webbplats på\n"
-"\thttp://gnunet.org/\n";
-"och gå med i vår gemenskap på\n"
-"\thttp://gnunet.org/drupal/\n";
-"\n"
-"Ha det så kul,\n"
-"\n"
-"the GNUnet team"
 
-#: src/conf/wizard.glade:142 src/conf/wizard.glade:594
-#: src/conf/wizard.glade:1319 src/conf/wizard.glade:2581
-msgid "Next"
-msgstr "Nästa"
+#: src/server/handler.c:367
+#, c-format
+msgid "Received corrupt message from peer `%s'in %s:%d.\n"
+msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/conf/wizard.glade:217 src/conf/wizard.glade:669
-#: src/conf/wizard.glade:1394 src/conf/wizard.glade:1928
-#: src/conf/wizard.glade:2656
-msgid "Cancel"
-msgstr "Avbryt"
+#: src/server/gnunet-peer-info.c:95
+msgid "Print information about GNUnet peers."
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/conf/wizard.glade:318
-msgid ""
-"Enter information about your network connection here.\n"
-"\n"
-"The \"Network interface\" is the device that connects your computer to the "
-"internet. This is usually a modem, an ISDN card or a network card in case "
-"you are using DSL.\n"
-"\n"
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your "
-"IP-Address.\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, check the last option on this page. Leave it "
-"unchecked on direct connections through modems, ISDN cards and DNAT (also "
-"known as \"port forwarding\")."
+#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
+#, c-format
+msgid "Could not get address of peer `%s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:372
-msgid "Network interface:"
-msgstr "Nätverksgränssnitt:"
-
-#: src/conf/wizard.glade:400
-msgid "IP-Address/Hostname:"
-msgstr "IP-adress/Värdnamn:"
-
-#: src/conf/wizard.glade:451
-msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+#: src/server/gnunet-peer-info.c:153
+msgid "hello message invalid (signature invalid).\n"
 msgstr ""
 
-#: src/conf/wizard.glade:514
-msgid "Network connection"
-msgstr "Nätverksanslutning"
+#: src/server/gnunet-peer-info.c:164
+#, c-format
+msgid "Peer `%s' with trust %8u and address `%s'\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/conf/wizard.glade:770
+#: src/util/cron/cron.c:355
+#, c-format
 msgid ""
-"You can limit GNUnet's ressource usage here.\n"
-"\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you "
-"have a flatrate you can set it to the maximum speed of your internet "
-"connection.\n"
-"\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
-"to use."
+"`%s' called with cron job not in queue, adding.  This may not be what you "
+"want.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:833
-msgid "Upstream (Bytes/s):"
+#: src/util/crypto/hostkey_gcrypt.c:1031
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/conf/wizard.glade:883
-msgid "Downstream (Bytes/s):"
-msgstr ""
+#: src/util/crypto/locking_gcrypt.c:47
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/conf/wizard.glade:942
-msgid "Bandwidth limitation"
-msgstr "Bandbreddsbegränsning"
+#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#, fuzzy, c-format
+msgid "Failed to parse interface data from `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conf/wizard.glade:986
-msgid "Use denoted bandwidth for GNUnet"
+#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
+#, c-format
+msgid ""
+"No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
+"Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
+"\"!\n"
 
-#: src/conf/wizard.glade:1006
-msgid "Share denoted bandwidth with other applications"
+#: src/util/os/semaphore.c:213
+#, c-format
+msgid "Can't create semaphore: %i"
+msgstr "Kan inte skapa semafor: %i"
+
+#: src/util/os/dso.c:75
+#, c-format
+msgid ""
+"Cannot determine plugin path, application must be installed in directory "
+"ending with `%s'.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1028
-msgid "Bandwidth sharing"
-msgstr "Bandbreddsdelning"
+#: src/util/os/dso.c:97
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/conf/wizard.glade:1071
-msgid "Max. CPU usage (%):"
-msgstr "Max. CPU-användning (%):"
+#: src/util/os/dso.c:134
+#, fuzzy, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/conf/wizard.glade:1118
-msgid "CPU usage"
-msgstr "CPU-användning"
+#: src/util/os/dso.c:176
+#, fuzzy, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/conf/wizard.glade:1164
-msgid "Load limitation"
-msgstr ""
+#: src/util/os/cpustatus.c:274
+msgid "Cannot query the CPU usage (Windows NT).\n"
+msgstr "Kan inte fråga efter CPU-användning (Windows NT).\n"
 
-#: src/conf/wizard.glade:1244 src/conf/wizard.glade:1778
-#: src/conf/wizard.glade:2506
-msgid "Back"
-msgstr "Tillbaka"
+#: src/util/os/cpustatus.c:293
+msgid "Cannot query the CPU usage (Win 9x)\n"
+msgstr "Kan inte fråga efter CPU-användning (Win 9x).\n"
 
-#: src/conf/wizard.glade:1495
+#: src/util/os/installpath.c:172
 msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is "
-"useful if an adversary has access to your inserted content and you need to "
-"deny that the content is yours. With \"content migration\" on, the content "
-"could have \"migrated\" over the internet to your node without your "
-"knowledge.\n"
-"It also helps to spread popular content over different peers to enhance "
-"availability.\n"
-"\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, "
-"inserted and migrated content). Its maximum size can be specified below.\n"
-"\n"
-"If you are an experienced user, you may want to tweak your GNUnet "
-"installation using the enhanced configurator.\n"
-"\n"
-"After changing the configuration and/or updating GNUnet, it is sometimes "
-"required to run gnunet-update to update internal data structures. Depending "
-"on the changes made, this may take some time."
+"Cannot determine the path to the executable, your system may be broken or "
+"not supported.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1541
-msgid "Store migrated content"
+#: src/util/os/installpath.c:211
+msgid ""
+"GNUnet executables are not in a directory named 'bin'. This may signal a "
+"broken installation.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1566
-msgid "Maximum datastore size (MB):"
+#: src/util/os/installpath.c:222
+msgid "Cannot determine the installation prefix. Unknown error.\n"
 msgstr ""
 
-#: src/conf/wizard.glade:1621
-msgid "Start the GNUnet background process on computer startup"
+#: src/util/network/tcpio.c:100
+msgid "Could not find valid value for PORT in section NETWORK."
 msgstr ""
 
-#: src/conf/wizard.glade:1642
-msgid "Open the enhanced configurator"
+#: src/util/network/tcpio.c:124
+msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
 
-#: src/conf/wizard.glade:1663
-msgid "Run gnunet-update"
-msgstr "Kör gnunet-update"
+#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
+#, fuzzy, c-format
+msgid "Cannot connect to %s:u: %s\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/conf/wizard.glade:1698 src/conf/wizard.glade:2426
-msgid "Other settings"
-msgstr "Andra inställningar"
+#: src/util/network/tcpio.c:406
+#, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
 
-#: src/conf/wizard.glade:1853
-msgid "Finish"
-msgstr "Slutför"
+#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
+#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/conf/wizard.glade:1968
-msgid "Question"
-msgstr "Fråga"
+#: src/util/network/ipcheck.c:156
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/conf/wizard.glade:2014
-msgid "Do you want to save your settings?"
-msgstr "Vill du spara dina inställningar?"
+#: src/util/network/ipcheck.c:217
+#, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/conf/wizard.glade:2065
-msgid "Yes"
-msgstr "Ja"
+#: src/util/network/ipcheck.c:250
+#, c-format
+msgid "Wrong format `%s' for netmask: %s\n"
+msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/conf/wizard.glade:2078
-msgid "No"
-msgstr "Nej"
+#: src/util/network/ipcheck.c:265
+#, c-format
+msgid "Wrong format `%s' for network: %s\n"
+msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/conf/wizard.glade:2098 src/conf/wizard.glade:2696
-#: src/conf/wizard_curs.c:58 src/conf/wizard_util.c:120
-#: src/conf/wizard_util.c:163 src/util/configuration.c:522
-msgid "Error"
-msgstr "Fel"
+# drive = hard drive ?
+#: src/util/disk/storage.c:194
+#, fuzzy, c-format
+msgid "`%s' failed for drive `%s': %u\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/conf/wizard.glade:2144
-msgid "Unable to save configuration!"
-msgstr "Kunde inte spara konfiguration!"
+#: src/util/disk/storage.c:240
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory\n"
+msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/conf/wizard.glade:2195 src/conf/wizard.glade:2793
-msgid "OK"
-msgstr "OK"
+#: src/util/disk/storage.c:279
+#, fuzzy, c-format
+msgid "Expected `%s' to be a regular file\n"
+msgstr "\"%s\" är inte en vanlig fil.\n"
 
-#: src/conf/wizard.glade:2276
+#: src/util/disk/storage.c:486
+#, fuzzy, c-format
+msgid "expected `%s' to be a directory!\n"
+msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
+
+#: src/util/config_impl/impl.c:256
+#, c-format
+msgid "Syntax error in configuration file `%s' at line %d.\n"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+
+#: src/util/config_impl/impl.c:412
+#, c-format
 msgid ""
-"Define the user and the group owning the GNUnet service here.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new user "
-"account and a new group under which the GNUnet service is started at system "
-"startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the fields empty to run GNUnet with system privileges."
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
 msgstr ""
 
-#: src/conf/wizard.glade:2317
-msgid "Group:"
-msgstr "Grupp:"
+#: src/util/config_impl/impl.c:424
+#, c-format
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
+msgstr ""
 
-#: src/conf/wizard.glade:2389
-msgid "User account:"
-msgstr "Användarkonto:"
+#: src/util/config_impl/impl.c:494
+#, c-format
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
+msgstr ""
 
-#: src/conf/wizard.glade:2742
-msgid "gnunet-update failed!"
-msgstr "gnunet-update misslyckades!"
+#: src/util/error/error.c:138 src/util/error/error.c:182
+msgid "DEBUG"
+msgstr "FELSÖKNING"
 
-#: src/conf/wizard.glade:2813
-msgid "Gtk GNUnet Configurator"
+#: src/util/error/error.c:141 src/util/error/error.c:184
+msgid "STATUS"
 msgstr ""
 
-#: src/conf/wizard.glade:2847
-msgid "_File"
-msgstr "_Fil"
+#: src/util/error/error.c:144 src/util/error/error.c:186
+msgid "WARNING"
+msgstr "VARNING"
 
-#: src/conf/wizard.glade:2856 src/conf/wizard.glade:3189
-msgid "Load a config file"
-msgstr "Läs in en konfigurationsfil"
+#: src/util/error/error.c:147 src/util/error/error.c:188
+msgid "ERROR"
+msgstr "FEL"
 
-#: src/conf/wizard.glade:2857
-msgid "_Load"
-msgstr "_Läs in"
+#: src/util/error/error.c:150 src/util/error/error.c:190
+msgid "FATAL"
+msgstr "ÖDESDIGER"
 
-#: src/conf/wizard.glade:2879
-msgid "Save the config in .config"
-msgstr "Spara konfigurationen i .config"
+#: src/util/error/error.c:153 src/util/error/error.c:192
+msgid "USER"
+msgstr ""
 
-#: src/conf/wizard.glade:2880
-msgid "_Save"
-msgstr "_Spara"
+#: src/util/error/error.c:156 src/util/error/error.c:194
+msgid "ADMIN"
+msgstr ""
 
-#: src/conf/wizard.glade:2908
-msgid "_Quit"
-msgstr "_Avsluta"
+#: src/util/error/error.c:159 src/util/error/error.c:196
+msgid "DEVELOPER"
+msgstr ""
 
-#: src/conf/wizard.glade:2934
-msgid "_Options"
-msgstr "_Alternativ"
+#: src/util/error/error.c:162 src/util/error/error.c:198
+msgid "REQUEST"
+msgstr ""
 
-#: src/conf/wizard.glade:2943
-msgid "Show name"
-msgstr "Visa namn"
+#: src/util/error/error.c:165 src/util/error/error.c:200
+msgid "BULK"
+msgstr ""
 
-#: src/conf/wizard.glade:2944
-msgid "Show _name"
-msgstr "Visa _namn"
+#: src/util/error/error.c:168 src/util/error/error.c:202
+msgid "IMMEDIATE"
+msgstr ""
 
-#: src/conf/wizard.glade:2954
-msgid "Show range (Y/M/N)"
-msgstr "Visa omfång (Y/M/N)"
+#: src/util/error/error.c:171
+msgid "ALL"
+msgstr ""
 
-#: src/conf/wizard.glade:2955
-msgid "Show _range"
-msgstr "Visa _omfång"
+#: src/util/error/error.c:203
+msgid "NOTHING"
+msgstr "INGET"
 
-#: src/conf/wizard.glade:2965
-msgid "Show value of the option"
-msgstr "Visa värde av alternativet"
+#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#, fuzzy, c-format
+msgid "Invalid argument for `%s'.\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/conf/wizard.glade:2966
-msgid "Show _data"
-msgstr "Visa _data"
+#: src/util/threads/mutex.c:136
+#, c-format
+msgid "Deadlock due to `%s'.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:2982
-msgid "Show all options"
-msgstr "Visa alla alternativ"
+#: src/util/threads/mutex.c:156
+#, fuzzy, c-format
+msgid "Permission denied for `%s'.\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/conf/wizard.glade:2983
-msgid "Show all _options"
-msgstr "Visa alla a_lternativ"
+#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
+#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
+#: src/util/threads/pthread.c:275
+#, fuzzy, c-format
+msgid "`%s' failed with error code %s: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/conf/wizard.glade:2997
-msgid "_Help"
-msgstr "_Hjälp"
+#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#, fuzzy, c-format
+msgid "`%s' failed with error code %d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/conf/wizard.glade:3006
-msgid "_Introduction"
-msgstr "_Introduktion"
+#: src/util/loggers/memory.c:71
+msgid "Out of memory (for logging)"
+msgstr ""
 
-#: src/conf/wizard.glade:3028
-msgid "_About"
-msgstr "_Om"
+#: src/util/getopt/getopt.c:686
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/conf/wizard.glade:3083
-msgid "Goes up of one level (single view)"
-msgstr "Går upp en nivå (enkel vy)"
+#: src/util/getopt/getopt.c:710
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
 
-#: src/conf/wizard.glade:3126
-msgid "Up"
-msgstr "Upp"
+#: src/util/getopt/getopt.c:715
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
 
-#: src/conf/wizard.glade:3232
-msgid "Load"
-msgstr "Läs in"
+#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/conf/wizard.glade:3276
-msgid "Save a config file"
-msgstr "Spara en konfigurationsfil"
+#: src/util/getopt/getopt.c:762
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/conf/wizard.glade:3319
-msgid "Save"
-msgstr "Spara"
+#: src/util/getopt/getopt.c:766
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/conf/wizard.glade:3382
-msgid "Single view"
-msgstr "Enkel vy"
+#: src/util/getopt/getopt.c:792
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/conf/wizard.glade:3425
-msgid "Single"
-msgstr "Enkel"
+#: src/util/getopt/getopt.c:795
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/conf/wizard.glade:3469
-msgid "Split view"
-msgstr "Dela vy"
+#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/conf/wizard.glade:3512
-msgid "Split"
-msgstr "Dela"
+#: src/util/getopt/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/conf/wizard.glade:3556
-msgid "Full view"
-msgstr "Full vy"
+#: src/util/getopt/getopt.c:890
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
-#: src/conf/wizard.glade:3599
-msgid "Full"
-msgstr "Full"
-
-#: src/conf/wizard.glade:3662
-msgid "Collapse the whole tree in the right frame"
+#: src/util/getopt/printhelp.c:49
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
+"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
+"korta flaggor.\n"
 
-#: src/conf/wizard.glade:3705
-msgid "Collapse"
-msgstr "Fäll in"
+#: src/util/string/string.c:101
+msgid "ms"
+msgstr "ms"
 
-#: src/conf/wizard.glade:3749
-msgid "Expand the whole tree in the right frame"
-msgstr ""
+#: src/util/string/string.c:106
+msgid "s"
+msgstr "s"
 
-#: src/conf/wizard.glade:3792
-msgid "Expand"
-msgstr "Expandera"
+#: src/util/string/string.c:109
+msgid "m"
+msgstr "m"
 
-#: src/conf/wizard.glade:3935
-msgid ""
-"This is GNUnet's configuration interface.\n"
-"\n"
-"GNUnet's options are separated into categories. You can browse them in the "
-"left tree. If you click on one of the categories, its options are shown "
-"above. \n"
-"\n"
-"To change the value of an option, simply click on its value and enter a new "
-"value. To get additional information about a specific option, click on its "
-"description."
-msgstr ""
+#: src/util/string/string.c:112
+msgid "h"
+msgstr "h"
 
-#: src/conf/wizard.glade:3967
-#, fuzzy
-msgid "Introduction"
-msgstr "_Introduktion"
+#: src/util/string/string.c:115
+msgid " days"
+msgstr " dagar"
 
-#: src/conf/wizard.glade:4043
-msgid ""
-"Welcome to GNUnet Setup.\n"
-"\n"
-"For each option, a blank box indicates the feature is disabled, and checked "
-"one indicates it is enabled.\n"
-"If you do not see an option that you believe should be present, try turning "
-"on Show All Options under the Options menu.\n"
-"\n"
-"Although there is no cross reference yet to help you figure out what other "
-"options must be enabled to support the option you are interested in, you can "
-"still view the help of a grayed-out option.\n"
-"\n"
-"Toggling Show Debug Info under the Options menu will show the dependencies, "
-"which you can then match by examining other options."
+#: src/util/string/string.c:133
+msgid "b"
+msgstr "b"
+
+#: src/util/string/string.c:138
+msgid "KiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4067
-#, fuzzy
-msgid "gnunet-setup"
-msgstr "Kör gnunet-update"
-
-#: src/conf/wizard.glade:4068
-msgid "(C) 2001-2006 Christian Grothoff (and other contributing authors)"
+#: src/util/string/string.c:141
+msgid "MiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4069
-msgid "This is the configuration tool for GNUnet."
+#: src/util/string/string.c:144
+msgid "GiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4070
-msgid ""
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"\t\t       Version 2, June 1991\n"
-"\n"
-" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
-"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-" Everyone is permitted to copy and distribute verbatim copies\n"
-" of this license document, but changing it is not allowed.\n"
-"\n"
-"\t\t\t    Preamble\n"
-"\n"
-"  The licenses for most software are designed to take away your\n"
-"freedom to share and change it.  By contrast, the GNU General Public\n"
-"License is intended to guarantee your freedom to share and change free\n"
-"software--to make sure the software is free for all its users.  This\n"
-"General Public License applies to most of the Free Software\n"
-"Foundation's software and to any other program whose authors commit to\n"
-"using it.  (Some other Free Software Foundation software is covered by\n"
-"the GNU Library General Public License instead.)  You can apply it to\n"
-"your programs, too.\n"
-"\n"
-"  When we speak of free software, we are referring to freedom, not\n"
-"price.  Our General Public Licenses are designed to make sure that you\n"
-"have the freedom to distribute copies of free software (and charge for\n"
-"this service if you wish), that you receive source code or can get it\n"
-"if you want it, that you can change the software or use pieces of it\n"
-"in new free programs; and that you know you can do these things.\n"
-"\n"
-"  To protect your rights, we need to make restrictions that forbid\n"
-"anyone to deny you these rights or to ask you to surrender the rights.\n"
-"These restrictions translate to certain responsibilities for you if you\n"
-"distribute copies of the software, or if you modify it.\n"
-"\n"
-"  For example, if you distribute copies of such a program, whether\n"
-"gratis or for a fee, you must give the recipients all the rights that\n"
-"you have.  You must make sure that they, too, receive or can get the\n"
-"source code.  And you must show them these terms so they know their\n"
-"rights.\n"
-"\n"
-"  We protect your rights with two steps: (1) copyright the software, and\n"
-"(2) offer you this license which gives you legal permission to copy,\n"
-"distribute and/or modify the software.\n"
-"\n"
-"  Also, for each author's protection and ours, we want to make certain\n"
-"that everyone understands that there is no warranty for this free\n"
-"software.  If the software is modified by someone else and passed on, we\n"
-"want its recipients to know that what they have is not the original, so\n"
-"that any problems introduced by others will not reflect on the original\n"
-"authors' reputations.\n"
-"\n"
-"  Finally, any free program is threatened constantly by software\n"
-"patents.  We wish to avoid the danger that redistributors of a free\n"
-"program will individually obtain patent licenses, in effect making the\n"
-"program proprietary.  To prevent this, we have made it clear that any\n"
-"patent must be licensed for everyone's free use or not licensed at all.\n"
-"\n"
-"  The precise terms and conditions for copying, distribution and\n"
-"modification follow.\n"
-"\n"
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
-"\n"
-"  0. This License applies to any program or other work which contains\n"
-"a notice placed by the copyright holder saying it may be distributed\n"
-"under the terms of this General Public License.  The \"Program\", below,\n"
-"refers to any such program or work, and a \"work based on the Program\"\n"
-"means either the Program or any derivative work under copyright law:\n"
-"that is to say, a work containing the Program or a portion of it,\n"
-"either verbatim or with modifications and/or translated into another\n"
-"language.  (Hereinafter, translation is included without limitation in\n"
-"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
-"\n"
-"Activities other than copying, distribution and modification are not\n"
-"covered by this License; they are outside its scope.  The act of\n"
-"running the Program is not restricted, and the output from the Program\n"
-"is covered only if its contents constitute a work based on the\n"
-"Program (independent of having been made by running the Program).\n"
-"Whether that is true depends on what the Program does.\n"
-"\n"
-"  1. You may copy and distribute verbatim copies of the Program's\n"
-"source code as you receive it, in any medium, provided that you\n"
-"conspicuously and appropriately publish on each copy an appropriate\n"
-"copyright notice and disclaimer of warranty; keep intact all the\n"
-"notices that refer to this License and to the absence of any warranty;\n"
-"and give any other recipients of the Program a copy of this License\n"
-"along with the Program.\n"
-"\n"
-"You may charge a fee for the physical act of transferring a copy, and\n"
-"you may at your option offer warranty protection in exchange for a fee.\n"
-"\n"
-"  2. You may modify your copy or copies of the Program or any portion\n"
-"of it, thus forming a work based on the Program, and copy and\n"
-"distribute such modifications or work under the terms of Section 1\n"
-"above, provided that you also meet all of these conditions:\n"
-"\n"
-"    a) You must cause the modified files to carry prominent notices\n"
-"    stating that you changed the files and the date of any change.\n"
-"\n"
-"    b) You must cause any work that you distribute or publish, that in\n"
-"    whole or in part contains or is derived from the Program or any\n"
-"    part thereof, to be licensed as a whole at no charge to all third\n"
-"    parties under the terms of this License.\n"
-"\n"
-"    c) If the modified program normally reads commands interactively\n"
-"    when run, you must cause it, when started running for such\n"
-"    interactive use in the most ordinary way, to print or display an\n"
-"    announcement including an appropriate copyright notice and a\n"
-"    notice that there is no warranty (or else, saying that you provide\n"
-"    a warranty) and that users may redistribute the program under\n"
-"    these conditions, and telling the user how to view a copy of this\n"
-"    License.  (Exception: if the Program itself is interactive but\n"
-"    does not normally print such an announcement, your work based on\n"
-"    the Program is not required to print an announcement.)\n"
-"\n"
-"These requirements apply to the modified work as a whole.  If\n"
-"identifiable sections of that work are not derived from the Program,\n"
-"and can be reasonably considered independent and separate works in\n"
-"themselves, then this License, and its terms, do not apply to those\n"
-"sections when you distribute them as separate works.  But when you\n"
-"distribute the same sections as part of a whole which is a work based\n"
-"on the Program, the distribution of the whole must be on the terms of\n"
-"this License, whose permissions for other licensees extend to the\n"
-"entire whole, and thus to each and every part regardless of who wrote it.\n"
-"\n"
-"Thus, it is not the intent of this section to claim rights or contest\n"
-"your rights to work written entirely by you; rather, the intent is to\n"
-"exercise the right to control the distribution of derivative or\n"
-"collective works based on the Program.\n"
-"\n"
-"In addition, mere aggregation of another work not based on the Program\n"
-"with the Program (or with a work based on the Program) on a volume of\n"
-"a storage or distribution medium does not bring the other work under\n"
-"the scope of this License.\n"
-"\n"
-"  3. You may copy and distribute the Program (or a work based on it,\n"
-"under Section 2) in object code or executable form under the terms of\n"
-"Sections 1 and 2 above provided that you also do one of the following:\n"
-"\n"
-"    a) Accompany it with the complete corresponding machine-readable\n"
-"    source code, which must be distributed under the terms of Sections\n"
-"    1 and 2 above on a medium customarily used for software interchange; "
-"or,\n"
-"\n"
-"    b) Accompany it with a written offer, valid for at least three\n"
-"    years, to give any third party, for a charge no more than your\n"
-"    cost of physically performing source distribution, a complete\n"
-"    machine-readable copy of the corresponding source code, to be\n"
-"    distributed under the terms of Sections 1 and 2 above on a medium\n"
-"    customarily used for software interchange; or,\n"
-"\n"
-"    c) Accompany it with the information you received as to the offer\n"
-"    to distribute corresponding source code.  (This alternative is\n"
-"    allowed only for noncommercial distribution and only if you\n"
-"    received the program in object code or executable form with such\n"
-"    an offer, in accord with Subsection b above.)\n"
-"\n"
-"The source code for a work means the preferred form of the work for\n"
-"making modifications to it.  For an executable work, complete source\n"
-"code means all the source code for all modules it contains, plus any\n"
-"associated interface definition files, plus the scripts used to\n"
-"control compilation and installation of the executable.  However, as a\n"
-"special exception, the source code distributed need not include\n"
-"anything that is normally distributed (in either source or binary\n"
-"form) with the major components (compiler, kernel, and so on) of the\n"
-"operating system on which the executable runs, unless that component\n"
-"itself accompanies the executable.\n"
-"\n"
-"If distribution of executable or object code is made by offering\n"
-"access to copy from a designated place, then offering equivalent\n"
-"access to copy the source code from the same place counts as\n"
-"distribution of the source code, even though third parties are not\n"
-"compelled to copy the source along with the object code.\n"
-"\n"
-"  4. You may not copy, modify, sublicense, or distribute the Program\n"
-"except as expressly provided under this License.  Any attempt\n"
-"otherwise to copy, modify, sublicense or distribute the Program is\n"
-"void, and will automatically terminate your rights under this License.\n"
-"However, parties who have received copies, or rights, from you under\n"
-"this License will not have their licenses terminated so long as such\n"
-"parties remain in full compliance.\n"
-"\n"
-"  5. You are not required to accept this License, since you have not\n"
-"signed it.  However, nothing else grants you permission to modify or\n"
-"distribute the Program or its derivative works.  These actions are\n"
-"prohibited by law if you do not accept this License.  Therefore, by\n"
-"modifying or distributing the Program (or any work based on the\n"
-"Program), you indicate your acceptance of this License to do so, and\n"
-"all its terms and conditions for copying, distributing or modifying\n"
-"the Program or works based on it.\n"
-"\n"
-"  6. Each time you redistribute the Program (or any work based on the\n"
-"Program), the recipient automatically receives a license from the\n"
-"original licensor to copy, distribute or modify the Program subject to\n"
-"these terms and conditions.  You may not impose any further\n"
-"restrictions on the recipients' exercise of the rights granted herein.\n"
-"You are not responsible for enforcing compliance by third parties to\n"
-"this License.\n"
-"\n"
-"  7. If, as a consequence of a court judgment or allegation of patent\n"
-"infringement or for any other reason (not limited to patent issues),\n"
-"conditions are imposed on you (whether by court order, agreement or\n"
-"otherwise) that contradict the conditions of this License, they do not\n"
-"excuse you from the conditions of this License.  If you cannot\n"
-"distribute so as to satisfy simultaneously your obligations under this\n"
-"License and any other pertinent obligations, then as a consequence you\n"
-"may not distribute the Program at all.  For example, if a patent\n"
-"license would not permit royalty-free redistribution of the Program by\n"
-"all those who receive copies directly or indirectly through you, then\n"
-"the only way you could satisfy both it and this License would be to\n"
-"refrain entirely from distribution of the Program.\n"
-"\n"
-"If any portion of this section is held invalid or unenforceable under\n"
-"any particular circumstance, the balance of the section is intended to\n"
-"apply and the section as a whole is intended to apply in other\n"
-"circumstances.\n"
-"\n"
-"It is not the purpose of this section to induce you to infringe any\n"
-"patents or other property right claims or to contest validity of any\n"
-"such claims; this section has the sole purpose of protecting the\n"
-"integrity of the free software distribution system, which is\n"
-"implemented by public license practices.  Many people have made\n"
-"generous contributions to the wide range of software distributed\n"
-"through that system in reliance on consistent application of that\n"
-"system; it is up to the author/donor to decide if he or she is willing\n"
-"to distribute software through any other system and a licensee cannot\n"
-"impose that choice.\n"
-"\n"
-"This section is intended to make thoroughly clear what is believed to\n"
-"be a consequence of the rest of this License.\n"
-"\n"
-"  8. If the distribution and/or use of the Program is restricted in\n"
-"certain countries either by patents or by copyrighted interfaces, the\n"
-"original copyright holder who places the Program under this License\n"
-"may add an explicit geographical distribution limitation excluding\n"
-"those countries, so that distribution is permitted only in or among\n"
-"countries not thus excluded.  In such case, this License incorporates\n"
-"the limitation as if written in the body of this License.\n"
-"\n"
-"  9. The Free Software Foundation may publish revised and/or new versions\n"
-"of the General Public License from time to time.  Such new versions will\n"
-"be similar in spirit to the present version, but may differ in detail to\n"
-"address new problems or concerns.\n"
-"\n"
-"Each version is given a distinguishing version number.  If the Program\n"
-"specifies a version number of this License which applies to it and \"any\n"
-"later version\", you have the option of following the terms and conditions\n"
-"either of that version or of any later version published by the Free\n"
-"Software Foundation.  If the Program does not specify a version number of\n"
-"this License, you may choose any version ever published by the Free "
-"Software\n"
-"Foundation.\n"
-"\n"
-"  10. If you wish to incorporate parts of the Program into other free\n"
-"programs whose distribution conditions are different, write to the author\n"
-"to ask for permission.  For software which is copyrighted by the Free\n"
-"Software Foundation, write to the Free Software Foundation; we sometimes\n"
-"make exceptions for this.  Our decision will be guided by the two goals\n"
-"of preserving the free status of all derivatives of our free software and\n"
-"of promoting the sharing and reuse of software generally.\n"
-"\n"
-"\t\t\t    NO WARRANTY\n"
-"\n"
-"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
-"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
-"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
-"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
-"EXPRESSED\n"
-"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
-"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
-"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
-"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
-"REPAIR OR CORRECTION.\n"
-"\n"
-"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
-"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
-"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
-"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
-"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
-"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
-"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
-"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
-"POSSIBILITY OF SUCH DAMAGES.\n"
-"\n"
-"\t\t     END OF TERMS AND CONDITIONS\n"
-"\n"
-"\t    How to Apply These Terms to Your New Programs\n"
-"\n"
-"  If you develop a new program, and you want it to be of the greatest\n"
-"possible use to the public, the best way to achieve this is to make it\n"
-"free software which everyone can redistribute and change under these terms.\n"
-"\n"
-"  To do so, attach the following notices to the program.  It is safest\n"
-"to attach them to the start of each source file to most effectively\n"
-"convey the exclusion of warranty; and each file should have at least\n"
-"the \"copyright\" line and a pointer to where the full notice is found.\n"
-"\n"
-"    <one line to give the program's name and a brief idea of what it does.>\n"
-"    Copyright (C) <year>  <name of author>\n"
-"\n"
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License as published by\n"
-"    the Free Software Foundation; either version 2 of the License, or\n"
-"    (at your option) any later version.\n"
-"\n"
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-"\n"
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
-"USA\n"
-"\n"
-"\n"
-"Also add information on how to contact you by electronic and paper mail.\n"
-"\n"
-"If the program is interactive, make it output a short notice like this\n"
-"when it starts in an interactive mode:\n"
-"\n"
-"    Gnomovision version 69, Copyright (C) year  name of author\n"
-"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
-"w'.\n"
-"    This is free software, and you are welcome to redistribute it\n"
-"    under certain conditions; type `show c' for details.\n"
-"\n"
-"The hypothetical commands `show w' and `show c' should show the appropriate\n"
-"parts of the General Public License.  Of course, the commands you use may\n"
-"be called something other than `show w' and `show c'; they could even be\n"
-"mouse-clicks or menu items--whatever suits your program.\n"
-"\n"
-"You should also get your employer (if you work as a programmer) or your\n"
-"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
-"necessary.  Here is a sample; alter the names:\n"
-"\n"
-"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
-"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
-"\n"
-"  <signature of Ty Coon>, 1 April 1989\n"
-"  Ty Coon, President of Vice\n"
-"\n"
-"This General Public License does not permit incorporating your program into\n"
-"proprietary programs.  If your program is a subroutine library, you may\n"
-"consider it more useful to permit linking proprietary applications with the\n"
-"library.  If this is what you want to do, use the GNU Library General\n"
-"Public License instead of this License.\n"
+#: src/util/string/string.c:147
+msgid "TiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4458
-msgid "Not for English ;-)"
+#: src/util/string/string.c:267
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:82
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:90
 msgid "Tool to setup GNUnet."
 msgstr "Verktyg för att ställa in GNUnet."
 
-#: src/conf/gnunet-setup.c:91
+#: src/setup/gnunet-setup.c:91
 #, c-format
 msgid "Available MODEs:\n"
 msgstr "Tillgängliga lägen:\n"
 
-#: src/conf/gnunet-setup.c:92
+#: src/setup/gnunet-setup.c:92
 #, c-format
 msgid " config\t\ttext-based configuration\n"
 msgstr " config\t\ttextbaserad konfiguration\n"
 
-#: src/conf/gnunet-setup.c:94
+#: src/setup/gnunet-setup.c:94
 #, c-format
 msgid " menuconfig\ttext-based menu\n"
 msgstr " menuconfig\ttextbaserad meny\n"
 
-#: src/conf/gnunet-setup.c:96
+#: src/setup/gnunet-setup.c:96
 #, c-format
 msgid " wizard-curses\tBasic text-based graphical configuration\n"
 msgstr " wizard-curses\tEnkel textbaserad grafisk konfiguration\n"
 
-#: src/conf/gnunet-setup.c:99
+#: src/setup/gnunet-setup.c:99
 #, c-format
 msgid " gconfig\tGTK configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/conf/gnunet-setup.c:100
+#: src/setup/gnunet-setup.c:100
 #, c-format
 msgid ""
 " wizard-gtk\tBasic GTK configuration\n"
@@ -3095,28 +3593,22 @@
 " wizard-gtk\tEnkel GTK-konfiguration\n"
 "\n"
 
-#: src/conf/gnunet-setup.c:167
+#: src/setup/gnunet-setup.c:167
 #, c-format
 msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
 msgstr "gnunet-setup måste ha skrivrättighet till konfigurationsfilen \"%s\"\n"
 
-#: src/conf/gnunet-setup.c:176 src/server/gnunet-peer-info.c:113
-#: src/server/gnunet-transport-check.c:527 src/server/gnunet-update.c:152
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Ogiltiga argument: "
-
-#: src/conf/gnunet-setup.c:224
+#: src/setup/gnunet-setup.c:224
 msgid "No interface specified, using default\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:237 src/conf/gnunet-setup.c:251
-#: src/conf/gnunet-setup.c:270 src/conf/gnunet-setup.c:281
+#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
+#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
 #, c-format
 msgid "`%s' is not available."
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/conf/gnunet-setup.c:264 src/conf/gnunet-setup.c:275
+#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
 #, c-format
 msgid ""
 "Can only run wizard to configure gnunetd.\n"
@@ -3125,76 +3617,91 @@
 "Kan endast köra vägvisaren för att konfigurera gnunetd.\n"
 "Glömde du flaggan \"%s\"?\n"
 
-#: src/conf/gnunet-setup.c:285
+#: src/setup/gnunet-setup.c:285
 #, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/conf/gnunet-win-tool.c:109
+#: src/setup/wizard_gtk.c:429
 #, c-format
+msgid "Unable to save configuration file `%s':"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
+msgid "Unable to create user account:"
+msgstr "Kunde inte skapa användarkonto:"
+
+#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
+msgid "Unable to change startup process:"
+msgstr ""
+
+#: src/setup/gnunet-win-tool.c:109
+#, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:112 src/conf/gnunet-win-tool.c:139
+#: src/setup/gnunet-win-tool.c:112 src/setup/gnunet-win-tool.c:139
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr "Denna version av Windows har inte stöd för tjänster.\n"
 
-#: src/conf/gnunet-win-tool.c:116 src/conf/gnunet-win-tool.c:143
+#: src/setup/gnunet-win-tool.c:116 src/setup/gnunet-win-tool.c:143
 #, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:121
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr "Fel: kan inte skapa tjänst: %s\n"
 
-#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:155
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Okänt fel.\n"
 
-#: src/conf/gnunet-win-tool.c:136
+#: src/setup/gnunet-win-tool.c:136
 #, c-format
 msgid "Service deleted.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/conf/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:148
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr ""
 
-#: src/conf/gnunet-win-tool.c:152
+#: src/setup/gnunet-win-tool.c:152
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr "Fel: kan inte ta bort tjänst: %s\n"
 
-#: src/conf/wizard_gtk.c:429
+#: src/setup/conf.c:522 src/setup/recreate.c:135
 #, c-format
-msgid "Unable to save configuration file `%s':"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Unable to save configuration file `%s': %s.\n"
+msgstr ""
 
-#: src/conf/wizard_gtk.c:475 src/conf/wizard_curs.c:616
-msgid "Unable to create user account:"
-msgstr "Kunde inte skapa användarkonto:"
+#: src/setup/conf.c:529
+#, c-format
+msgid "Configuration file `%s' created.\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/conf/wizard_gtk.c:482 src/conf/wizard_curs.c:619
-msgid "Unable to change startup process:"
-msgstr ""
+#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
+#: src/setup/wizard_util.c:193
+msgid "Error"
+msgstr "Fel"
 
-#: src/conf/wizard_curs.c:116 src/conf/wizard_curs.c:131
-#: src/conf/wizard_curs.c:184 src/conf/wizard_curs.c:221
-#: src/conf/wizard_curs.c:251 src/conf/wizard_curs.c:277
-#: src/conf/wizard_curs.c:310 src/conf/wizard_curs.c:337
-#: src/conf/wizard_curs.c:369 src/conf/wizard_curs.c:394
-#: src/conf/wizard_curs.c:423 src/conf/wizard_curs.c:446
-#: src/conf/wizard_curs.c:501 src/conf/wizard_curs.c:563
-#: src/conf/wizard_curs.c:594 src/conf/wizard_curs.c:638
+#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
+#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
+#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
+#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
+#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
+#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
+#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
+#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
 msgid "GNUnet configuration"
 msgstr "GNUnet-konfiguration"
 
-#: src/conf/wizard_curs.c:117
+#: src/setup/wizard_curs.c:117
 msgid ""
 "Welcome to GNUnet!\n"
 "\n"
@@ -3224,39 +3731,39 @@
 "\n"
 "the GNUnet team"
 
-#: src/conf/wizard_curs.c:132
+#: src/setup/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:191
-#: src/conf/wizard_curs.c:228 src/conf/wizard_curs.c:283
-#: src/conf/wizard_curs.c:315 src/conf/wizard_curs.c:375
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
+#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
+#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
 msgid "Help"
 msgstr "Hjälp"
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:192
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
 "you are using DSL."
 msgstr ""
 
-#: src/conf/wizard_curs.c:185
+#: src/setup/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:222
+#: src/setup/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
 "If in doubt, leave this empty."
 msgstr ""
 
-#: src/conf/wizard_curs.c:229
+#: src/setup/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3267,7 +3774,7 @@
 "IP-Address."
 msgstr ""
 
-#: src/conf/wizard_curs.c:252
+#: src/setup/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3278,11 +3785,11 @@
 "forwarding\")."
 msgstr ""
 
-#: src/conf/wizard_curs.c:278
+#: src/setup/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:283
+#: src/setup/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3293,11 +3800,11 @@
 "connection."
 msgstr ""
 
-#: src/conf/wizard_curs.c:310
+#: src/setup/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:316
+#: src/setup/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3308,7 +3815,7 @@
 "connection."
 msgstr ""
 
-#: src/conf/wizard_curs.c:338
+#: src/setup/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -3321,11 +3828,11 @@
 "connection whenever your high-speed LAN gets used (e.g. by NFS)."
 msgstr ""
 
-#: src/conf/wizard_curs.c:370
+#: src/setup/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr "Hur mycket CPU (i %) får användas?"
 
-#: src/conf/wizard_curs.c:376
+#: src/setup/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3335,7 +3842,7 @@
 "\n"
 "Det här är det procenttal som GNUnet tillåts använda av processortiden."
 
-#: src/conf/wizard_curs.c:395
+#: src/setup/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -3348,7 +3855,7 @@
 "availability."
 msgstr ""
 
-#: src/conf/wizard_curs.c:424
+#: src/setup/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -3356,7 +3863,7 @@
 "inserted and migrated content)."
 msgstr ""
 
-#: src/conf/wizard_curs.c:447
+#: src/setup/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -3365,7 +3872,7 @@
 "launch GNUnet yourself each time you want to use it."
 msgstr ""
 
-#: src/conf/wizard_curs.c:502
+#: src/setup/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -3381,7 +3888,7 @@
 "GNUnet user:"
 msgstr ""
 
-#: src/conf/wizard_curs.c:564
+#: src/setup/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -3396,7 +3903,7 @@
 "GNUnet group:"
 msgstr ""
 
-#: src/conf/wizard_curs.c:595
+#: src/setup/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -3404,7 +3911,7 @@
 "Do you want to start it after saving your configuration?"
 msgstr ""
 
-#: src/conf/wizard_curs.c:632
+#: src/setup/wizard_curs.c:632
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -3412,1128 +3919,391 @@
 "Try again?"
 msgstr ""
 
-#: src/conf/wizard_util.c:89
+#: src/setup/confdata.c:93
+#, c-format
+msgid "%s: symbol value `%s' invalid for %s\n"
+msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
+
+#: src/setup/wizard_util.c:119
 msgid "Can't open Service Control Manager"
 msgstr ""
 
-#: src/conf/wizard_util.c:94
+#: src/setup/wizard_util.c:124
 msgid "Can't create service"
 msgstr "Kan inte skapa tjänst"
 
-#: src/conf/wizard_util.c:99
+#: src/setup/wizard_util.c:129
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr "Fel vid ändring av rättigheterna på GNUnet-katalogen"
 
-#: src/conf/wizard_util.c:104
+#: src/setup/wizard_util.c:134
 msgid "Cannot write to the regisitry"
 msgstr "Kan inte skriva till registret"
 
-#: src/conf/wizard_util.c:107
+#: src/setup/wizard_util.c:137
 msgid "Can't access the service"
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/conf/wizard_util.c:111
+#: src/setup/wizard_util.c:141
 msgid "Can't delete the service"
 msgstr "Kan inte ta bort tjänsten"
 
-#: src/conf/wizard_util.c:115
+#: src/setup/wizard_util.c:145
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/conf/wizard_util.c:146
+#: src/setup/wizard_util.c:176
 msgid "This version of Windows does not support multiple users."
 msgstr "Denna version för Windows har inte stöd för flera användare."
 
-#: src/conf/wizard_util.c:150
+#: src/setup/wizard_util.c:180
 msgid "Error creating user"
 msgstr "Fel vid skapandet av användare"
 
-#: src/conf/wizard_util.c:153
+#: src/setup/wizard_util.c:183
 msgid "Error accessing local security policy"
 msgstr "Fel vid åtkomst av lokal säkerhetspolicy"
 
-#: src/conf/wizard_util.c:156
+#: src/setup/wizard_util.c:186
 msgid "Error granting service right to user"
 msgstr ""
 
-#: src/conf/wizard_util.c:159
+#: src/setup/wizard_util.c:189
 msgid "Unknown error while creating a new user"
 msgstr "Okänt fel vid skapandet av ny användare"
 
-#: src/server/connection.c:979
-#, c-format
-msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
-msgstr "\"%s\" valda %d av %d meddelanden (MTU: %d).\n"
+#: src/setup/gconf.c:73
+msgid "Sorry, no help is available for this option.\n"
+msgstr "Tyvärr, ingen hjälp är tillgänglig för den här flaggan.\n"
 
-#: src/server/connection.c:986
-#, c-format
-msgid "Message details: %u: length %d, priority: %d\n"
-msgstr "Detaljer om meddelande: %u: längd %d, prioritet: %d\n"
+#: src/setup/glade_support.c:75
+#, fuzzy, c-format
+msgid "Failed to find handler for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/server/connection.c:2243
-#, c-format
-msgid "Message from `%s' discarded: invalid format.\n"
-msgstr "Meddelande från \"%s\" kastades bort: ogiltigt format.\n"
+#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
+#, fuzzy, c-format
+msgid "Failed to open `%s'.\n"
+msgstr "Fil lagrad som \"%s\".\n"
 
-#: src/server/connection.c:2309
-#, c-format
-msgid "Invalid sequence number %u <= %u, dropping message.\n"
-msgstr ""
+#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
+#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/server/connection.c:2324
-msgid "Message received more than one day old. Dropped.\n"
-msgstr ""
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
+#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/server/connection.c:2690
-msgid "# outgoing messages dropped"
-msgstr ""
-
-#: src/server/connection.c:2692
-msgid "# bytes of outgoing messages dropped"
-msgstr ""
-
-#: src/server/connection.c:2694
-msgid "# connections closed (HANGUP sent)"
-msgstr ""
-
-#: src/server/connection.c:2695
-msgid "# bytes encrypted"
-msgstr "# byte krypterade"
-
-#: src/server/connection.c:2696
-msgid "# bytes decrypted"
-msgstr "# byte dekrypterade"
-
-#: src/server/connection.c:2697
-msgid "# bytes noise sent"
-msgstr ""
-
-#: src/server/core.c:114
-#, c-format
-msgid "Application module `%s' already initialized!\n"
-msgstr ""
-
-#: src/server/core.c:167
-#, c-format
-msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
-msgstr ""
-
-#: src/server/core.c:214
-#, c-format
-msgid "Could not shutdown `%s': application not loaded\n"
-msgstr ""
-
-#: src/server/core.c:221
-#, c-format
-msgid "Could not shutdown application `%s': not initialized\n"
-msgstr ""
-
-#: src/server/core.c:230 src/server/core.c:419
-#, c-format
-msgid "Could not find '%s%s' method in library `%s'.\n"
-msgstr ""
-
-#: src/server/core.c:397
-#, c-format
-msgid "Could not release %p: service not loaded\n"
-msgstr ""
-
-#: src/server/core.c:475 src/server/gnunet-update.c:232
-msgid "No applications defined in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#: src/server/core.c:498
-#, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr ""
-
-#: src/server/core.c:515
-#, c-format
-msgid "Could not properly shutdown application `%s'.\n"
-msgstr ""
-
-#: src/server/core.c:574
-msgid "FATAL: Identity plugin not found!\n"
-msgstr ""
-
-#: src/server/core.c:632
-#, c-format
-msgid "Could not properly unload service `%s'!\n"
-msgstr ""
-
-#: src/server/gnunet-peer-info.c:95
-msgid "Print information about GNUnet peers."
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
-#, c-format
-msgid "Could not get address of peer `%s'.\n"
-msgstr ""
-
-#: src/server/gnunet-peer-info.c:153
-msgid "hello message invalid (signature invalid).\n"
-msgstr ""
-
-#: src/server/gnunet-peer-info.c:164
-#, c-format
-msgid "Peer `%s' with trust %8u and address `%s'\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
-
-#: src/server/gnunet-transport-check.c:109
-#, c-format
-msgid "`%s': Could not create hello.\n"
-msgstr ""
-
-#: src/server/gnunet-transport-check.c:118
-#, c-format
-msgid "`%s': Could not connect.\n"
-msgstr "\"%s\": Kunde inte ansluta.\n"
-
-#: src/server/gnunet-transport-check.c:148
-#, c-format
-msgid "`%s': Could not send.\n"
-msgstr "\"%s\": Kunde inte skicka.\n"
-
-#: src/server/gnunet-transport-check.c:168
-#, c-format
-msgid "`%s': Did not receive message within %llu ms.\n"
-msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
-
-#: src/server/gnunet-transport-check.c:182
-#, c-format
-msgid "`%s': Could not disconnect.\n"
-msgstr "\"%s\": Kunde inte koppla ned.\n"
-
-#: src/server/gnunet-transport-check.c:189
-#, c-format
-msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
-msgstr ""
-"\"%s\" transport OK.  Det tog %ums att överföra %d meddelanden på %d byte "
-"styck.\n"
-
-#: src/server/gnunet-transport-check.c:219
+#: src/include/gnunet_util_error.h:207
 #, fuzzy, c-format
-msgid " Transport %d is not being tested\n"
-msgstr " Transport %d ej tillgänglig\n"
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/server/gnunet-transport-check.c:230
-#, c-format
-msgid ""
-"\n"
-"Contacting `%s'."
-msgstr ""
-"\n"
-"Kontaktar \"%s\"."
+#: src/include/gnunet_util_getopt.h:145
+msgid "print this help"
+msgstr "skriv ut denna hjälp"
 
-#: src/server/gnunet-transport-check.c:253
-#, c-format
-msgid " Connection failed\n"
-msgstr " Anslutning misslyckades\n"
+#: src/include/gnunet_util_getopt.h:154
+msgid "print the version number"
+msgstr "skriv ut versionsnummer"
 
-#: src/server/gnunet-transport-check.c:259
-#, c-format
-msgid " Connection failed (bug?)\n"
-msgstr " Anslutning misslyckades (fel?)\n"
-
-#: src/server/gnunet-transport-check.c:320
-#, c-format
-msgid "No reply received within %llums.\n"
-msgstr "Inget svar mottaget inom %llums.\n"
-
-#: src/server/gnunet-transport-check.c:396
-msgid "ping peers from HOSTLISTURL that match transports"
+#: src/include/gnunet_util_getopt.h:160
+msgid "configure logging to use LOGRULES"
 msgstr ""
 
-#: src/server/gnunet-transport-check.c:398
-msgid "send COUNT messages"
-msgstr "skicka ANTAL meddelanden"
+#: src/include/gnunet_util_getopt.h:166
+msgid "be verbose"
+msgstr "var informativ"
 
-#: src/server/gnunet-transport-check.c:400
-msgid "send messages with SIZE bytes payload"
-msgstr "skicka meddelanden med STORLEK bytes nyttolast"
+#: src/include/gnunet_util_getopt.h:172
+msgid "use configuration file FILENAME"
+msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/server/gnunet-transport-check.c:402
-msgid "specifies which TRANSPORT should be tested"
-msgstr "anger vilken TRANSPORT som ska testas"
+#: src/include/gnunet_util_getopt.h:178
+msgid "specify host on which gnunetd is running"
+msgstr "ange värd på vilken gnunetd körs"
 
-#: src/server/gnunet-transport-check.c:404
-msgid "specifies after how many MS to time-out"
-msgstr "anger timeout efter antal MS"
+#, fuzzy
+#~ msgid ""
+#~ "Welcome to GNUnet!\n"
+#~ "\n"
+#~ "This assistant will ask you a few basic questions in order to configure "
+#~ "GNUnet.\n"
+#~ "\n"
+#~ "Please visit our homepage at\n"
+#~ "\thttp://gnunet.org\n";
+#~ "and join our community at\n"
+#~ "\thttps://gnunet.org/drupal/\n";
+#~ "\n"
+#~ "Have a lot of fun,\n"
+#~ "\n"
+#~ "The GNUnet team"
+#~ msgstr ""
+#~ "Välkommen till GNUnet!\n"
+#~ "\n"
+#~ "Denna assistant kommer att fråga dig några enkla frågor för att "
+#~ "konfigurera GNUnet.\n"
+#~ "\n"
+#~ "Vänligen besök på webbplats på\n"
+#~ "\thttp://gnunet.org/\n";
+#~ "och gå med i vår gemenskap på\n"
+#~ "\thttp://gnunet.org/drupal/\n";
+#~ "\n"
+#~ "Ha det så kul,\n"
+#~ "\n"
+#~ "the GNUnet team"
 
-#: src/server/gnunet-transport-check.c:407 src/server/gnunet-update.c:55
-#: src/server/startup.c:450
-msgid "run as user LOGIN"
-msgstr "kör som användare LOGIN"
+#~ msgid "Next"
+#~ msgstr "Nästa"
 
-#: src/server/gnunet-transport-check.c:414
-msgid "Tool to test if GNUnet transport services are operational."
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
 
-#: src/server/gnunet-transport-check.c:565
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr "Du måste ange en icke-tom uppsättning av transporter att testa!\n"
+#~ msgid "Network interface:"
+#~ msgstr "Nätverksgränssnitt:"
 
-#: src/server/gnunet-transport-check.c:570
-#, c-format
-msgid "Testing transport(s) %s\n"
-msgstr "Testar transport(er) %s\n"
+#~ msgid "IP-Address/Hostname:"
+#~ msgstr "IP-adress/Värdnamn:"
 
-#: src/server/gnunet-transport-check.c:573
-#, c-format
-msgid "Available transport(s): %s\n"
-msgstr "Tillgängliga transport(er): %s\n"
+#~ msgid "Network connection"
+#~ msgstr "Nätverksanslutning"
 
-#: src/server/gnunet-transport-check.c:617
-#, c-format
-msgid ""
-"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
-msgstr ""
+#~ msgid "Bandwidth limitation"
+#~ msgstr "Bandbreddsbegränsning"
 
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+#~ msgid "Bandwidth sharing"
+#~ msgstr "Bandbreddsdelning"
 
-#: src/server/gnunet-update.c:58
-msgid "run in client mode (for getting client configuration values)"
-msgstr "kör i klientläge (för att hämta värden från klientkonfiguration)"
+#~ msgid "Max. CPU usage (%):"
+#~ msgstr "Max. CPU-användning (%):"
 
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
+#~ msgid "CPU usage"
+#~ msgstr "CPU-användning"
 
-#: src/server/gnunet-update.c:147
-#, c-format
-msgid "Option `%s' makes no sense without option `%s'."
-msgstr ""
+#~ msgid "Back"
+#~ msgstr "Tillbaka"
 
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
-msgstr ""
-"\n"
-"Avslutar.\n"
+#~ msgid "Run gnunet-update"
+#~ msgstr "Kör gnunet-update"
 
-#: src/server/gnunet-update.c:249
-#, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Uppdaterar data för modul \"%s\"\n"
+#~ msgid "Other settings"
+#~ msgstr "Andra inställningar"
 
-#: src/server/gnunet-update.c:253
-#, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr ""
+#~ msgid "Finish"
+#~ msgstr "Slutför"
 
-#: src/server/gnunet-update.c:309
-#, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Uppdaterade data för %d program.\n"
+#~ msgid "Question"
+#~ msgstr "Fråga"
 
-#: src/server/gnunetd.c:76
-#, c-format
-msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
-msgstr ""
-"Konfiguration eller version av GNUnet ändrad.  Du behöver köra \"%s\"!\n"
+#~ msgid "Do you want to save your settings?"
+#~ msgstr "Vill du spara dina inställningar?"
 
-#: src/server/gnunetd.c:84
-#, c-format
-msgid "`%s' starting\n"
-msgstr "\"%s\" startar\n"
+#~ msgid "Unable to save configuration!"
+#~ msgstr "Kunde inte spara konfiguration!"
 
-#: src/server/gnunetd.c:106
-#, c-format
-msgid "`%s' startup complete.\n"
-msgstr "\"%s\" uppstart klar.\n"
+#~ msgid "OK"
+#~ msgstr "OK"
 
-#: src/server/gnunetd.c:111
-#, c-format
-msgid "`%s' is shutting down.\n"
-msgstr ""
+#~ msgid "Group:"
+#~ msgstr "Grupp:"
 
-#: src/server/handler.c:367
-#, c-format
-msgid "Received corrupt message from peer `%s'in %s:%d.\n"
-msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+#~ msgid "User account:"
+#~ msgstr "Användarkonto:"
 
-#: src/server/startup.c:196
-#, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr ""
+#~ msgid "gnunet-update failed!"
+#~ msgstr "gnunet-update misslyckades!"
 
-#: src/server/startup.c:324
-#, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
-msgstr "Du måste ange ett namn för PID-filen i sektion \"%s\" under \"%s\".\n"
+#~ msgid "_File"
+#~ msgstr "_Fil"
 
-#: src/server/startup.c:339
-#, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr ""
+#~ msgid "Load a config file"
+#~ msgstr "Läs in en konfigurationsfil"
 
-#: src/server/startup.c:443
-msgid ""
-"run in debug mode; gnunetd will not daemonize and error messages will be "
-"written to stderr instead of a logfile"
-msgstr ""
+#~ msgid "_Load"
+#~ msgstr "_Läs in"
 
-#: src/server/startup.c:456
-msgid "Starts the gnunetd daemon."
-msgstr "Startar gnunetd-demonen."
+#~ msgid "Save the config in .config"
+#~ msgstr "Spara konfigurationen i .config"
 
-#: src/server/startup.c:470
-#, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr ""
+#~ msgid "_Save"
+#~ msgstr "_Spara"
 
-#: src/server/startup.c:479
-#, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+#~ msgid "_Quit"
+#~ msgstr "_Avsluta"
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
-msgstr "Ogiltiga kommandoradsargument:\n"
+#~ msgid "_Options"
+#~ msgstr "_Alternativ"
 
-#: src/server/startup.c:583
-#, c-format
-msgid "Argument %d: `%s'\n"
-msgstr "Argument %d: \"%s\"\n"
+#~ msgid "Show name"
+#~ msgstr "Visa namn"
 
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
-msgstr "Ogiltiga kommandoradsargument.\n"
+#~ msgid "Show _name"
+#~ msgstr "Visa _namn"
 
-#: src/server/tcpserver.c:422
-#, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
-msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
+#~ msgid "Show range (Y/M/N)"
+#~ msgstr "Visa omfång (Y/M/N)"
 
-#: src/server/tcpserver.c:688
-#, c-format
-msgid ""
-"Malformed network specification in the configuration in section `%s' for "
-"entry `%s': %s\n"
-msgstr ""
+#~ msgid "Show _range"
+#~ msgstr "Visa _omfång"
 
-#: src/server/tcpserver.c:798
-#, c-format
-msgid "%s failed, message type %d already in use.\n"
-msgstr ""
+#~ msgid "Show value of the option"
+#~ msgstr "Visa värde av alternativet"
 
-#: src/transports/ip6.c:60 src/util/configuration.c:925
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr ""
+#~ msgid "Show _data"
+#~ msgstr "Visa _data"
 
-#: src/transports/ip6.c:100
-#, c-format
-msgid "Could not resolve `%s': %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
+#~ msgid "Show all options"
+#~ msgstr "Visa alla alternativ"
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr ""
+#~ msgid "Show all _options"
+#~ msgstr "Visa alla a_lternativ"
 
-#: src/transports/http.c:601
-msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
-msgstr ""
+#~ msgid "_Help"
+#~ msgstr "_Hjälp"
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
-msgstr "%s: Vägrade anslutning från svartlistad adress %u.%u.%u.%u.\n"
+#~ msgid "_Introduction"
+#~ msgstr "_Introduktion"
 
-#: src/transports/http.c:1101
-msgid "HTTP: Could not determine my public IP address.\n"
-msgstr "HTTP: Kunde inte fastställa min publika IP-adress.\n"
+#~ msgid "_About"
+#~ msgstr "_Om"
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
-#: src/util/tcpio.c:188
-#, 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"
+#~ msgid "Goes up of one level (single view)"
+#~ msgstr "Går upp en nivå (enkel vy)"
 
-#: src/transports/http.c:1333
-#, c-format
-msgid ""
-"Could not bind the HTTP listener to port %d. No transport service started.\n"
-msgstr ""
+#~ msgid "Up"
+#~ msgstr "Upp"
 
-#: src/transports/http.c:1478
-msgid "# bytes received via HTTP"
-msgstr "# byte mottagna via HTTP"
+#~ msgid "Load"
+#~ msgstr "Läs in"
 
-#: src/transports/http.c:1480
-msgid "# bytes sent via HTTP"
-msgstr "# byte skickade via HTTP"
+#~ msgid "Save a config file"
+#~ msgstr "Spara en konfigurationsfil"
 
-#: src/transports/http.c:1482
-msgid "# bytes dropped by HTTP (outgoing)"
-msgstr "# byte kastade via HTTP (utgående)"
+#~ msgid "Save"
+#~ msgstr "Spara"
 
-#: src/transports/smtp.c:297
-#, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr "Kunde inte slå upp namnet för SMTP-server \"%s\": %s"
+#~ msgid "Single view"
+#~ msgstr "Enkel vy"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
-#, c-format
-msgid ""
-"You must specify the name of a pipe for the SMTP transport in section `%s' "
-"under `%s'.\n"
-msgstr ""
-"Du måste ange ett namn på röret för SMTP-transporten i sektion \"%s\" under "
-"\"%s\".\n"
+#~ msgid "Single"
+#~ msgstr "Enkel"
 
-#: src/transports/smtp.c:489
-msgid "Received malformed message via SMTP (size mismatch).\n"
-msgstr ""
+#~ msgid "Split view"
+#~ msgstr "Dela vy"
 
-#: src/transports/smtp.c:584
-msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
-msgstr ""
+#~ msgid "Split"
+#~ msgstr "Dela"
 
-# capped är inte ett bra ord IMHO
-#: src/transports/smtp.c:591
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
+#~ msgid "Full view"
+#~ msgstr "Full vy"
 
-#: src/transports/smtp.c:764
-#, c-format
-msgid "Sending E-mail to `%s' failed.\n"
-msgstr "Sändning av e-post till \"%s\" misslyckades.\n"
+#~ msgid "Full"
+#~ msgstr "Full"
 
-#: src/transports/smtp.c:815
-#, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
-msgstr ""
+#~ msgid "Collapse"
+#~ msgstr "Fäll in"
 
-#: src/transports/smtp.c:838
-#, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr ""
+#~ msgid "Expand"
+#~ msgstr "Expandera"
 
-#: src/transports/smtp.c:844
-#, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr ""
+#, fuzzy
+#~ msgid "Introduction"
+#~ msgstr "_Introduktion"
 
-#: src/transports/smtp.c:903
-#, c-format
-msgid "%.*s filter %s (SMTP)"
-msgstr "%.*s filter %s (SMTP)"
+#, fuzzy
+#~ msgid "gnunet-setup"
+#~ msgstr "Kör gnunet-update"
 
-#: src/transports/smtp.c:932 src/transports/udp.c:722
-#: src/transports/udp6.c:699
-#, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
-msgstr ""
+#~ msgid "Could not parse configuration file `%s'.\n"
+#~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/transports/tcp.c:465
-#, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
-msgstr ""
+#~ msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
+#~ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör gnunet-setup!\n"
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr ""
+#~ msgid ""
+#~ "Configuration file not found. Please run GNUnet Setup (Client "
+#~ "Configuration) first."
+#~ msgstr ""
+#~ "Konfigurationsfil hittades inte. Vänligen kör konfigurationen för GNUnet "
+#~ "(klientkonfiguration) först."
 
-#: src/transports/tcp.c:1082
-msgid "Could not determine my public IP address.\n"
-msgstr ""
+#~ msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
+#~ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
-#, c-format
-msgid "Failed to start transport service on port %d.\n"
-msgstr ""
+#~ msgid "Cannot open configuration file `%s'.\n"
+#~ msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/transports/tcp.c:1449
-msgid "# bytes received via TCP"
-msgstr "# byte mottogs via TCP"
+#~ msgid "Cron stopped\n"
+#~ msgstr "Cron stoppad\n"
 
-#: src/transports/tcp.c:1451
-msgid "# bytes sent via TCP"
-msgstr "# byte skickades via TCP"
+#~ msgid "Shutdown complete.\n"
+#~ msgstr "Nedstängning klar.\n"
 
-#: src/transports/tcp.c:1453
-msgid "# bytes dropped by TCP (outgoing)"
-msgstr "# byte kastade via TCP (utgående)"
+#~ msgid "Caught signal %d.\n"
+#~ msgstr "Fångade signal %d.\n"
 
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr ""
+#~ msgid "Invalid network notation (additional characters: `%s')."
+#~ msgstr "Ogiltig nätverksnotation (ytterligare tecken: \"%s\")."
 
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr ""
+#~ msgid "FAILURE"
+#~ msgstr "MISSLYCKANDE"
 
-#: src/transports/tcp6.c:657 src/transports/udp6.c:334
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr ""
+#~ msgid "MESSAGE"
+#~ msgstr "MEDDELANDE"
 
-#: src/transports/tcp6.c:958
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+#~ msgid "INFO"
+#~ msgstr "INFO"
 
-#: src/transports/tcp6.c:1002
-#, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "\"%s\": okänd tjänst: %s\n"
+#~ msgid "CRON"
+#~ msgstr "CRON"
 
-#: src/transports/udp.c:145 src/transports/udp6.c:128
-#, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
-msgstr ""
+#~ msgid "EVERYTHING"
+#~ msgstr "ALLT"
 
-#: src/transports/udp.c:179
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
+#~ msgid "Invalid LOGLEVEL `%s' specified.\n"
+#~ msgstr "Ogiltig LOGGNIVÅ \"%s\" angiven.\n"
 
-#: src/transports/udp.c:250
-#, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
+#~ msgid "Failure at %s:%d.\n"
+#~ msgstr "Fel vid %s:%d.\n"
 
-#: src/transports/udp.c:307
-#, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr ""
+#~ msgid ""
+#~ "Usage: %s\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Användning: %s\n"
+#~ "%s\n"
+#~ "\n"
 
-#: src/transports/udp.c:332
-#, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
+#~ msgid "k"
+#~ msgstr "k"
 
-#: src/transports/udp.c:417
-msgid "UDP: Could not determine my public IP address.\n"
-msgstr ""
+#~ msgid "g"
+#~ msgstr "g"
 
-#: src/transports/udp.c:551
-#, c-format
-msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
-msgstr ""
+#~ msgid "t"
+#~ msgstr "t"
 
-#: src/transports/udp.c:707
-msgid "# bytes received via UDP"
-msgstr "# byte mottagna via UDP"
-
-#: src/transports/udp.c:709
-msgid "# bytes sent via UDP"
-msgstr "# byte skickade via UDP"
-
-#: src/transports/udp.c:711
-msgid "# bytes dropped by UDP (outgoing)"
-msgstr "# byte kastade via UDP (utgående)"
-
-#: src/transports/ip.c:124
-#, c-format
-msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
-msgstr ""
-
-#: src/transports/ip.c:149
-#, c-format
-msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-msgstr ""
-
-#: src/transports/ip.c:193
-#, c-format
-msgid "Could not find an IP address for interface `%s'.\n"
-msgstr ""
-
-#: src/transports/ip.c:203
-#, c-format
-msgid ""
-"There is more than one IP address specified for interface `%s'.\n"
-"GNUnet will use %u.%u.%u.%u.\n"
-msgstr ""
-
-#: src/transports/ip.c:224
-#, c-format
-msgid "Could not resolve `%s' to determine our IP address: %s\n"
-msgstr ""
-
-#: src/transports/ip.c:256
-#, c-format
-msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
-msgstr ""
-
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
-msgstr ""
-
-#: src/transports/udp6.c:164
-#, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
-msgstr "Misslyckades att binda till UDP6-port %d.\n"
-
-#: src/transports/udp6.c:235
-#, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp6.c:290
-#, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr ""
-
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr ""
-
-#: src/transports/udp6.c:415
-msgid "UDP6: Could not determine my public IPv6 address.\n"
-msgstr ""
-
-#: src/util/configuration.c:182
-#, c-format
-msgid "inlining configration file `%s'\n"
-msgstr ""
-
-#: src/util/configuration.c:186
-#, c-format
-msgid "Could not parse configuration file `%s'.\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/util/configuration.c:222
-#, c-format
-msgid "Syntax error in configuration file `%s' at line %d.\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
-
-#: src/util/configuration.c:515 src/util/configuration.c:524
-#, c-format
-msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
-msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör gnunet-setup!\n"
-
-#: src/util/configuration.c:521
-msgid ""
-"Configuration file not found. Please run GNUnet Setup (Client Configuration) "
-"first."
-msgstr ""
-"Konfigurationsfil hittades inte. Vänligen kör konfigurationen för GNUnet "
-"(klientkonfiguration) först."
-
-#: src/util/configuration.c:528
-#, c-format
-msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
-msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
-
-#: src/util/configuration.c:532
-#, c-format
-msgid "Cannot open configuration file `%s'.\n"
-msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
-
-#: src/util/cron.c:189
-msgid "Stopping cron\n"
-msgstr ""
-
-#: src/util/cron.c:199
-msgid "Cron stopped\n"
-msgstr "Cron stoppad\n"
-
-#: src/util/cron.c:348
-#, c-format
-msgid ""
-"`%s' called with cron job not in queue, adding.  This may not be what you "
-"want.\n"
-msgstr ""
-
-#: src/util/dso.c:43
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
-
-#: src/util/dso.c:98
-#, c-format
-msgid "`%s' failed for library `%s' at %s:%d with error: %s\n"
-msgstr ""
-
-#: src/util/dso.c:152
-#, c-format
-msgid "`%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
-msgstr ""
-
-#: src/util/getopt.c:641
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/util/getopt.c:665
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
-
-#: src/util/getopt.c:670
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
-
-#: src/util/getopt.c:687 src/util/getopt.c:861
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flagga \"%s\" kräver ett argument\n"
-
-#: src/util/getopt.c:717
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
-
-#: src/util/getopt.c:721
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: okänd flagga \"%c%s\"\n"
-
-#: src/util/getopt.c:747
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: otillåten flagga -- %c\n"
-
-#: src/util/getopt.c:750
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ogiltig flagga -- %c\n"
-
-#: src/util/getopt.c:780 src/util/getopt.c:910
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flagga kräver ett argument -- %c\n"
-
-#: src/util/getopt.c:827
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flagga \"-W %s\" är tvetydig\n"
-
-#: src/util/getopt.c:845
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
-
-#: src/util/hostkey_gcrypt.c:937
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr ""
-
-#: src/util/initialize.c:229
-msgid "Shutdown complete.\n"
-msgstr "Nedstängning klar.\n"
-
-#: src/util/io.c:35
-#, c-format
-msgid "Caught signal %d.\n"
-msgstr "Fångade signal %d.\n"
-
-#: src/util/random.c:38
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
-
-#: src/util/ipcheck.c:100
-#, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Ogiltigt format för IP: \"%s\"\n"
-
-#: src/util/ipcheck.c:150
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
-
-#: src/util/ipcheck.c:164
-#, c-format
-msgid "Invalid network notation (additional characters: `%s')."
-msgstr "Ogiltig nätverksnotation (ytterligare tecken: \"%s\")."
-
-#: src/util/ipcheck.c:235
-#, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
-
-#: src/util/ipcheck.c:267
-#, c-format
-msgid "Wrong format `%s' for netmask: %s\n"
-msgstr "Fel format \"%s\" för nätmask: %s\n"
-
-#: src/util/ipcheck.c:281
-#, c-format
-msgid "Wrong format `%s' for network: %s\n"
-msgstr "Fel format \"%s\" för nätverk: %s\n"
-
-#: src/util/logging.c:90
-msgid "NOTHING"
-msgstr "INGET"
-
-#: src/util/logging.c:91
-msgid "FATAL"
-msgstr "ÖDESDIGER"
-
-#: src/util/logging.c:92
-msgid "ERROR"
-msgstr "FEL"
-
-#: src/util/logging.c:93
-msgid "FAILURE"
-msgstr "MISSLYCKANDE"
-
-#: src/util/logging.c:94
-msgid "WARNING"
-msgstr "VARNING"
-
-#: src/util/logging.c:95
-msgid "MESSAGE"
-msgstr "MEDDELANDE"
-
-#: src/util/logging.c:96
-msgid "INFO"
-msgstr "INFO"
-
-#: src/util/logging.c:97
-msgid "DEBUG"
-msgstr "FELSÖKNING"
-
-#: src/util/logging.c:98
-msgid "CRON"
-msgstr "CRON"
-
-#: src/util/logging.c:99
-msgid "EVERYTHING"
-msgstr "ALLT"
-
-#: src/util/logging.c:285
-#, c-format
-msgid "Invalid LOGLEVEL `%s' specified.\n"
-msgstr "Ogiltig LOGGNIVÅ \"%s\" angiven.\n"
-
-#: src/util/logging.c:377 src/util/logging.c:383
-#, c-format
-msgid "Failure at %s:%d.\n"
-msgstr "Fel vid %s:%d.\n"
-
-#: src/util/port.c:47
-#, c-format
-msgid ""
-"Cannot determine port of gnunetd server. Define in configuration file in "
-"section `%s' under `%s'.\n"
-msgstr ""
-
-#: src/util/printhelp.c:42
-#, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
-msgstr ""
-"Användning: %s\n"
-"%s\n"
-"\n"
-
-#: src/util/printhelp.c:45
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr ""
-"Argument som är obligatoriska för långa flaggor är också obligatoriska för "
-"korta flaggor.\n"
-
-#: src/util/semaphore.c:172 src/util/semaphore.c:198
-#, c-format
-msgid "Invalid argument for `%s' at %s:%d.\n"
-msgstr ""
-
-#: src/util/semaphore.c:176
-#, c-format
-msgid "Deadlock due to `%s' at %s:%d.\n"
-msgstr ""
-
-#: src/util/semaphore.c:202
-#, c-format
-msgid "Permission denied for `%s' at %s:%d.\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/util/semaphore.c:452 src/util/semaphore.c:459
-#, fuzzy, c-format
-msgid "`%s' failed with error code %s: %s"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/util/semaphore.c:466
-#, fuzzy, c-format
-msgid "`%s' failed with error code %d: %s"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/util/semaphore.c:604
-#, c-format
-msgid "Can't create semaphore: %i"
-msgstr "Kan inte skapa semafor: %i"
-
-#: src/util/state.c:86
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
-msgstr ""
-"Konfigurationsfil måste ange en katalog för GNUnet att lagra motpartsdata "
-"under %s\\%s.\n"
-
-#: src/util/statuscalls.c:185
-#, c-format
-msgid "Failed to parse interface data from `%s' at %s:%d.\n"
-msgstr ""
-
-#: src/util/statuscalls.c:489
-msgid "Cannot query the CPU usage (Windows NT).\n"
-msgstr "Kan inte fråga efter CPU-användning (Windows NT).\n"
-
-#: src/util/statuscalls.c:507
-msgid "Cannot query the CPU usage (Win 9x)\n"
-msgstr "Kan inte fråga efter CPU-användning (Win 9x).\n"
-
-#: src/util/statuscalls.c:600
-#, c-format
-msgid ""
-"No network interfaces defined in configuration section `%s' under `%s'!\n"
-msgstr ""
-"Inga nätverksgränssnitt angivna i konfigurationssektionen \"%s\" under \"%s"
-"\"!\n"
-
-# drive = hard drive ?
-#: src/util/storage.c:212
-#, c-format
-msgid "`%s' failed for drive %s: %u\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
-
-#: src/util/storage.c:310
-#, c-format
-msgid "`%s' is not a regular file.\n"
-msgstr "\"%s\" är inte en vanlig fil.\n"
-
-#: src/util/storage.c:564
-#, c-format
-msgid "`%s' expected `%s' to be a directory!\n"
-msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
-
-#: src/util/storage.c:670
-msgid "b"
-msgstr "b"
-
-#: src/util/storage.c:675
-msgid "k"
-msgstr "k"
-
-#: src/util/storage.c:678 src/util/timer.c:198
-msgid "m"
-msgstr "m"
-
-#: src/util/storage.c:681
-msgid "g"
-msgstr "g"
-
-#: src/util/storage.c:684
-msgid "t"
-msgstr "t"
-
-#: src/util/string.c:108
 #, fuzzy
-msgid "unknown"
-msgstr "Okänt fel"
+#~ msgid "unknown"
+#~ msgstr "Okänt fel"
 
-#: src/util/string.c:111
-msgid "GiB"
-msgstr ""
+#~ msgid "`%s' failed, other side closed connection.\n"
+#~ msgstr "\"%s\" misslyckades, andra sidan har stängt anslutningen.\n"
 
-#: src/util/string.c:114
-msgid "MiB"
-msgstr ""
+#~ msgid "Attempted path to `%s' was `%s'.\n"
+#~ msgstr "Försökt sökväg till \"%s\" var \"%s\".\n"
 
-#: src/util/string.c:117
-msgid "KiB"
-msgstr ""
+#~ msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
+#~ msgstr "Icke-förväntad mycket stor allokering (%u byte) vid %s:%d!\n"
 
-#: src/util/string.c:120
-msgid "Bytes"
-msgstr ""
+#~ msgid "set verbosity to LEVEL"
+#~ msgstr "sätt informationsnivå till NIVÅ"
 
-#: src/util/tcp_return.c:51
-#, c-format
-msgid "`%s' failed, other side closed connection.\n"
-msgstr "\"%s\" misslyckades, andra sidan har stängt anslutningen.\n"
-
-#: src/util/tcp_return.c:58
-#, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "\"%s\" misslyckades, svar ogiltigt!\n"
-
-#: src/util/timer.c:190
-msgid "ms"
-msgstr "ms"
-
-#: src/util/timer.c:195
-msgid "s"
-msgstr "s"
-
-#: src/util/timer.c:201
-msgid "h"
-msgstr "h"
-
-#: src/util/timer.c:204
-msgid " days"
-msgstr " dagar"
-
-#: src/util/daemon.c:142
-#, c-format
-msgid "Attempted path to `%s' was `%s'.\n"
-msgstr "Försökt sökväg till \"%s\" var \"%s\".\n"
-
-#: src/util/xmalloc.c:52
-#, c-format
-msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
-msgstr "Icke-förväntad mycket stor allokering (%u byte) vid %s:%d!\n"
-
-#: src/include/gnunet_util.h:167
-msgid "print this help"
-msgstr "skriv ut denna hjälp"
-
-#: src/include/gnunet_util.h:170
-msgid "set verbosity to LEVEL"
-msgstr "sätt informationsnivå till NIVÅ"
-
-#: src/include/gnunet_util.h:173
-msgid "use configuration file FILENAME"
-msgstr "använd konfigurationsfil FILNAMN"
-
-#: src/include/gnunet_util.h:176
-msgid "specify host on which gnunetd is running"
-msgstr "ange värd på vilken gnunetd körs"
-
-#: src/include/gnunet_util.h:179
-msgid "print the version number"
-msgstr "skriv ut versionsnummer"
-
-#: src/include/gnunet_util.h:182
-msgid "be verbose"
-msgstr "var informativ"
-
-#: src/include/gnunet_util.h:637 src/include/gnunet_util.h:639
-#, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr ""
-
-#: src/include/gnunet_util.h:1058 src/include/gnunet_util.h:1060
-#: src/include/gnunet_util.h:1067
-#, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
-msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
-
 #~ msgid "Not connected to gnunetd."
 #~ msgstr "Ej ansluten till gnunetd."
 

Modified: GNUnet/po/vi.po
===================================================================
--- GNUnet/po/vi.po     2006-07-23 17:07:38 UTC (rev 3129)
+++ GNUnet/po/vi.po     2006-07-24 23:05:12 UTC (rev 3130)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0pre4\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-05-20 09:13-0700\n"
+"POT-Creation-Date: 2006-07-24 16:55-0700\n"
 "PO-Revision-Date: 2005-07-05 21:18+0400\n"
 "Last-Translator: Phan Vinh Thinh <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -15,329 +15,341 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
-#: src/applications/advertising/advertising.c:161
+#: src/transports/ip6.c:60
 #, fuzzy, c-format
-msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
-msgstr "Thông báo HELO từ '%s' bị sai (sai chữ ký). Đang bỏ đi.\n"
+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/applications/advertising/advertising.c:167
-#, fuzzy
-msgid ""
-"hello message received invalid (expiration time over limit). Dropping.\n"
-msgstr "Thông báo HELO nhận được bị sai (vượt quá thời hạn). Đang bỏ đi.\n"
-
-#: src/applications/advertising/advertising.c:176
+#: src/transports/ip6.c:100
 #, fuzzy, c-format
-msgid "hello advertisement for protocol %d received.\n"
-msgstr "Nhận được quảng cáo HELO cho giao thức %d.\n"
+msgid "Could not resolve `%s': %s\n"
+msgstr "Không tìm thấy '%s': %s\n"
 
-#: src/applications/advertising/advertising.c:295
-#, fuzzy
-msgid "Could not send hellos+PING, ping buffer full.\n"
-msgstr "Không gửi được các HELO+PING, đầy bộ đệm ping.\n"
+#: src/transports/ip6.c:138
+msgid "Failed to obtain my (external) IPv6 address!\n"
+msgstr "Không lấy được địa chỉ IPv6 (ngoài) của tôi!\n"
 
-#: src/applications/advertising/advertising.c:308
+#: src/transports/udp6.c:128 src/transports/udp.c:145
 #, fuzzy, c-format
-msgid "`%s' failed (%d, %u). Will not send PING.\n"
-msgstr "'%s' thất bại (%d, %u). Sẽ không gửi PING.\n"
+msgid ""
+"Cannot determine port to bind to.  Define in configuration file in section `%"
+"s' under `%s' or in `%s' under %s/%s.\n"
+msgstr ""
+"Không nhận ra cổng để kết gắn tới.  Hãy xác định trong tập tin cấu hình phần "
+"'%s' dưới '%s' hoặc phần '%s' dưới %s/%s.\n"
 
-#: src/applications/advertising/advertising.c:460
+#: src/transports/udp6.c:164
 #, c-format
-msgid "Advertising my transport %d to selected peers.\n"
-msgstr "Đang quảng cáo giao thông %d tới các đầu peer đã chọn.\n"
+msgid "Failed to bind to UDP6 port %d.\n"
+msgstr "Kết gắn bind tới cổng UDP6 %d không thành công.\n"
 
-#: src/applications/advertising/advertising.c:467
-msgid ""
-"Announcing ourselves pointless: no other peers are known to us so far.\n"
+#: src/transports/udp6.c:235
+#, c-format
+msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
 msgstr ""
-"Đang tự thông báo sự vô nghĩa: chúng ta không còn biết đến một đầu peer "
-"nào.\n"
 
-#: src/applications/advertising/advertising.c:569
-#, fuzzy, c-format
-msgid "Removing hello from peer `%s' (expired %ds ago).\n"
-msgstr "Đang xóa bỏ HELO từ đầu peer '%s' (đã hết hạn %dgiây).\n"
+#: src/transports/udp6.c:290
+#, c-format
+msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
+msgstr "Nhận được thông báo UDP6 sai từ %s: %d, đang loại bỏ.\n"
 
-#: src/applications/advertising/advertising.c:729
-msgid "# Peer advertisements received"
-msgstr "# Nhận được quảng cáo của đầu peer"
+#: src/transports/udp6.c:321
+#, c-format
+msgid "Packet received from %s:%d (UDP6) failed format check."
+msgstr "Kiểm tra định dạng gói nhận được từ %s:%d (UDP6) thất bại."
 
-#: src/applications/advertising/advertising.c:730
-msgid "# Self advertisments transmitted"
-msgstr "# Đã truyền tải tự quảng cáo"
+#: src/transports/udp6.c:334 src/transports/tcp6.c:657
+#, c-format
+msgid "%s: Rejected connection from blacklisted address %s.\n"
+msgstr "%s: Nhả ra kết nối có trong danh sách đen từ địa chỉ %s.\n"
 
-#: src/applications/advertising/advertising.c:731
-msgid "# Foreign advertisements forwarded"
-msgstr "# Đã chuyển tiếp quàng cáo ngoài"
+#: src/transports/udp6.c:415
+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/applications/advertising/advertising.c:733
-#: src/applications/pingpong/pingpong.c:462
-msgid "# plaintext PING messages sent"
-msgstr "# đã gửi các thông báo PING dạng văn bản thông thường"
-
-#: src/applications/advertising/advertising.c:737
-#: src/applications/session/connect.c:752
+#: src/transports/udp6.c:699 src/transports/smtp.c:932
+#: src/transports/udp.c:722
 #, fuzzy, c-format
-msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
-msgstr ""
-"'%s' đăng ký trình điều khiển %d (văn bản thông thường và văn bản mã hóa)\n"
+msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
+msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
 
-#: src/applications/advertising/advertising.c:756
-msgid "Network advertisements disabled by configuration!\n"
-msgstr "Tắt quàng cáo trong mạng bằng cấu hình!\n"
+#: src/transports/http.c:601
+msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
+msgstr "Mong chào mừng từ kết nối http, nhận được rác. Đang đóng kết nối.\n"
 
-#: src/applications/advertising/advertising.c:776
+#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
+#, c-format
+msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
+msgstr "%s: Nhả ra kết nối có trong danh sách đen từ %u.%u.%u.%u.\n"
+
+#: src/transports/http.c:1101
+msgid "HTTP: Could not determine my public IP address.\n"
+msgstr "HTTP: Không nhận ra địa chỉ IP công cộng của tôi.\n"
+
+#: src/transports/http.c:1177 src/transports/tcp.c:1150
+#, c-format
+msgid "Cannot connect to %u.%u.%u.%u:%u: %s\n"
+msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
+
+#: src/transports/http.c:1333
+#, c-format
 msgid ""
-"ensures that this peer is known by other peers and discovers other peers"
+"Could not bind the HTTP listener to port %d. No transport service started.\n"
 msgstr ""
+"Không kết gắn được trình nghe HTTP tới cổng %d. Dịch vụ truyền tải chưa "
+"chạy.\n"
 
-#: src/applications/bootstrap_http/http.c:81
-#: src/applications/testbed/testbed.c:1079
+#: src/transports/http.c:1455 src/applications/testbed/testbed.c:1054
 #, fuzzy, c-format
-msgid "Invalid URL `%s' (must begin with `%s')\n"
-msgstr "URL sai '%s' (phải bắt đầu với '%s')\n"
+msgid "Could not resolve name of HTTP proxy `%s'.\n"
+msgstr "Không tìm được tên của proxy HTTP '%s'.\n"
 
-#: src/applications/bootstrap_http/http.c:109
-#, c-format
-msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-msgstr "Cổng sai \"%s\" nằm trong xác định danh sách máy, đang thử cổng %d.\n"
+#: src/transports/http.c:1478
+msgid "# bytes received via HTTP"
+msgstr "# byte nhận được qua HTTP"
 
-#: src/applications/bootstrap_http/http.c:120
+#: src/transports/http.c:1480
+msgid "# bytes sent via HTTP"
+msgstr "# byte gửi qua HTTP"
+
+#: src/transports/http.c:1482
+msgid "# bytes dropped by HTTP (outgoing)"
+msgstr "# byte loại bỏ bởi HTTP (đi ra)"
+
+#: src/transports/smtp.c:297
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: `%s'.\n"
-msgstr "'%s' thất bại tại %s:%d với lỗi: '%s'.\n"
+msgid "Could not resolve name of SMTP server `%s': %s"
+msgstr "Không tìm thấy tên của máy chủ SMTP '%s': %s"
 
-#: src/applications/bootstrap_http/http.c:132
+#: src/transports/smtp.c:416 src/transports/smtp.c:877
 #, fuzzy, c-format
-msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+msgid ""
+"You must specify the name of a pipe for the SMTP transport in section `%s' "
+"under `%s'.\n"
 msgstr ""
-"Không tải xuống được danh sách liên hệ các đầu peer, máy '%s' không rõ.\n"
+"Người dùng phải chỉ ra tên của ống pipe cho truyền tải SMTP trong phần '%s' "
+"dưới '%s'.\n"
 
-#: src/applications/bootstrap_http/http.c:155
-#: src/applications/bootstrap_http/http.c:181
-#, fuzzy, c-format
-msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
-msgstr "'%s' tới '%s' thất bại tại %s:%d với lỗi: %s\n"
+#: src/transports/smtp.c:489
+msgid "Received malformed message via SMTP (size mismatch).\n"
+msgstr "Nhận được thông báo bị hỏng qua SMTP (kích thước không tương ứng).\n"
 
-#: src/applications/bootstrap_http/http.c:217
+#: src/transports/smtp.c:584
+msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
+msgstr "Không chỉ ra đầu lọc cho E-mail, không tạo được quảng cáo SMTP.\n"
+
+#: src/transports/smtp.c:591
 #, fuzzy, c-format
-msgid "Parsing HTTP response for URL `%s' failed.\n"
-msgstr "Phân tích câu trả lời HTTP cho URL '%s' không thành công.\n"
+msgid "SMTP filter string to long, capped to `%s'\n"
+msgstr "Đầu lọc SMTP quá dài, đổi thành '%s'\n"
 
-#: src/applications/bootstrap_http/http.c:252
+#: src/transports/smtp.c:764
 #, fuzzy, c-format
-msgid "Parsing hello from `%s' failed.\n"
-msgstr "Phân tích HELO từ '%s' không thành công.\n"
+msgid "Sending E-mail to `%s' failed.\n"
+msgstr "Gửi E-mail tới '%s' thất bại.\n"
 
-#: src/applications/bootstrap_http/http.c:330
+#: src/transports/smtp.c:815
+#, c-format
+msgid "SMTP server send unexpected response at %s:%d.\n"
+msgstr "Máy chủ SMTP gửi cầu trả lời không mong đợi tại %s: %d.\n"
+
+#: src/transports/smtp.c:838
+#, c-format
+msgid ""
+"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
+msgstr ""
+
+#: src/transports/smtp.c:844
 #, fuzzy, c-format
-msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
-msgstr "Không tìm thấy tên của HTTP proxy '%s'. Đang thử không dùng proxy.\n"
+msgid "Failed to send `%s' request to SMTP server.\n"
+msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
 
-#: src/applications/bootstrap_http/http.c:355
-#, fuzzy
-msgid "# hellos downloaded via http"
-msgstr "# đã tải xuống HELO qua http"
+#: src/transports/smtp.c:903
+#, c-format
+msgid "%.*s filter %s (SMTP)"
+msgstr "%.*s đầu lọc %s (SMTP)"
 
-#: src/applications/chat/chat.c:87
-msgid "Message received from peer is invalid.\n"
-msgstr "Thông báo nhận được từ một đầu là sai.\n"
+#: src/transports/tcp.c:465
+#, c-format
+msgid ""
+"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
+msgstr ""
+"Mong đợi chào mừng trên kết nối tcp, nhận được rác (%u, %u). Đang đóng.\n"
 
-#: src/applications/chat/chat.c:134
-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/transports/tcp.c:499
+#, c-format
+msgid ""
+"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
+msgstr ""
+"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
+"đóng.\n"
 
-#: src/applications/chat/chat.c:156
-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/transports/tcp.c:1082
+msgid "Could not determine my public IP address.\n"
+msgstr "Không nhận ra địa chỉ IP công cộng của tôi.\n"
 
-#: src/applications/chat/chat.c:160
+#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
 #, 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"
+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/applications/chat/chat.c:197
-#, 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/transports/tcp.c:1449
+msgid "# bytes received via TCP"
+msgstr "# byte nhận được qua TCP"
 
-#: src/applications/chat/chat.c:212
-msgid "enables P2P-chat (incomplete)"
-msgstr ""
+#: src/transports/tcp.c:1451
+msgid "# bytes sent via TCP"
+msgstr "# Byte gửi qua TCP"
 
-#: src/applications/chat/gnunet-chat.c:82
-msgid "specify nickname"
-msgstr "chỉ ra tên nick"
+#: src/transports/tcp.c:1453
+msgid "# bytes dropped by TCP (outgoing)"
+msgstr "# byte loại đi bởi TCP (đi ra)"
 
-#: src/applications/chat/gnunet-chat.c:87
-msgid "Start GNUnet chat client."
-msgstr "Chạy máy khách chát của GNUnet."
+#: src/transports/udp.c:179
+#, c-format
+msgid "Failed to bind to UDP port %d.\n"
+msgstr "Không kết gắn được tới cổng UDP %d.\n"
 
-#: src/applications/chat/gnunet-chat.c:93
-#: src/applications/dht/tools/dht-join.c:108
-#: src/applications/dht/tools/dht-query.c:99
-#: src/applications/fs/tools/gnunet-delete.c:111
-#: src/applications/fs/tools/gnunet-directory.c:190
-#: src/applications/fs/tools/gnunet-download.c:130
-#: src/applications/fs/tools/gnunet-insert.c:532
-#: src/applications/fs/tools/gnunet-pseudonym.c:232
-#: src/applications/fs/tools/gnunet-search.c:221
-#: src/applications/fs/tools/gnunet-unindex.c:140
-#: src/applications/stats/gnunet-stats.c:144
-#: src/applications/tbench/gnunet-tbench.c:189
-#: src/applications/template/gnunet-template.c:87
-#: src/applications/testbed/gnunet-testbed.c:125
-#: src/applications/testbed/gnunet-testbed.c:546
-#: src/applications/tracekit/gnunet-tracekit.c:153 src/conf/gnunet-setup.c:106
-#: src/conf/gnunet-setup.c:286 src/server/gnunet-peer-info.c:107
-#: src/server/gnunet-transport-check.c:521 src/server/gnunet-update.c:142
-#: src/server/startup.c:574
+#: src/transports/udp.c:250
 #, c-format
-msgid "Use --help to get a list of options.\n"
-msgstr "Dùng --help để xem danh sách các tùy chọn.\n"
+msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
+msgstr ""
 
-#: src/applications/chat/gnunet-chat.c:151
-#: src/applications/fs/tools/gnunet-delete.c:142
-#: src/applications/tbench/gnunet-tbench.c:213
-#: src/applications/tracekit/gnunet-tracekit.c:363 src/util/port.c:85
-msgid "Could not connect to gnunetd.\n"
-msgstr "Không kết nối được tới gnunetd.\n"
+#: src/transports/udp.c:307
+#, c-format
+msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
+msgstr "Nhận được thông báo UDP sai từ %u.%u.%u.%u:%u, đang loại bỏ.\n"
 
-#: src/applications/chat/gnunet-chat.c:155
-#, fuzzy, c-format
-msgid "You must specify a nickname (use option `%s').\n"
-msgstr "Người dùng phải chỉ ra một tên nick (dùng tùy chọn '%s').\n"
+#: src/transports/udp.c:332
+#, c-format
+msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
+msgstr ""
+"Kiểm tra định dạng gói nhận được từ %u.%u.%u.%u:%u (UDP) không thành công.\n"
 
-#: src/applications/chat/gnunet-chat.c:182
-msgid "Could not send join message to gnunetd\n"
-msgstr "Không gửi được thông báo nhập join tới gnunetd\n"
+#: src/transports/udp.c:417
+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/applications/chat/gnunet-chat.c:191
-msgid "Could not send message to gnunetd\n"
-msgstr "Không gửi được thông báo tới gnunetd\n"
+#: src/transports/udp.c:551
+#, 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/applications/datastore/datastore.c:118
-#, fuzzy, c-format
-msgid "Availability test failed for `%s' at %s:%d.\n"
-msgstr "Thử khả năng cho '%s' không thành công tại %s: %d.\n"
+#: src/transports/udp.c:707
+msgid "# bytes received via UDP"
+msgstr "# byte nhận được qua UDP"
 
-#: src/applications/datastore/datastore.c:142
-#, fuzzy, c-format
-msgid "Database failed to delete `%s'.\n"
-msgstr "Cơ sở dữ liệu xóa %s không thành công.\n"
+#: src/transports/udp.c:709
+msgid "# bytes sent via UDP"
+msgstr "# byte gửi qua UDP"
 
-#: src/applications/datastore/filter.c:42
+#: src/transports/udp.c:711
+msgid "# bytes dropped by UDP (outgoing)"
+msgstr "# byte loại bỏ bởi UDP (đi ra)"
+
+#: src/transports/ip.c:124
 #, fuzzy, c-format
 msgid ""
-"Configuration must specify directory for FS data in section `%s' under `%"
-"s'.\n"
+"Could not find interface `%s' in `%s', trying to find another interface.\n"
 msgstr ""
-"Trong phần '%s' dưới '%s' của cấu hình phải chỉ ra thư mục cho dữ liệu FS.\n"
+"Không tìm thấy giao diện '%s' trong '%s', đang thử kết gắn tới giao diện "
+"khác.\n"
 
-#: src/applications/dht/module/cs.c:446
+#: src/transports/ip.c:149
 #, fuzzy, c-format
-msgid "`%s' failed: table not found!\n"
-msgstr "'%s' không thành công: không tìm thấy bảng!\n"
+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/applications/dht/module/cs.c:466
+#: src/transports/ip.c:193
 #, fuzzy, c-format
-msgid "`%s' failed.  Terminating connection to client.\n"
-msgstr "'%s' không thành công.  Đang ngắt kết nối tới máy khách.\n"
+msgid "Could not find an IP address for interface `%s'.\n"
+msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
-#: src/applications/dht/module/cs.c:542
-msgid "sendAck failed.  Terminating connection to client.\n"
-msgstr "Gửi sendAck không thành công.  Ngắt kết nối tới máy khách.\n"
-
-#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
-#: src/applications/dht/module/cs.c:688
+#: src/transports/ip.c:203
 #, fuzzy, c-format
-msgid "`%s' failed. Terminating connection to client.\n"
-msgstr "'%s' không thành công. Ngắt kết nối tới máy khách.\n"
+msgid ""
+"There is more than one IP address specified for interface `%s'.\n"
+"GNUnet will use %u.%u.%u.%u.\n"
+msgstr ""
+"Có vài địa chỉ IP chỉ ra cho giao diện '%s'.\n"
+"GNUnet sẽ dùng %u.%u.%u.%u.\n"
 
-#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#: src/transports/ip.c:224
 #, fuzzy, c-format
-msgid "Failed to deliver `%s' message.\n"
-msgstr "Phân phát tin nhắn '%s' không thành công.\n"
+msgid "Could not resolve `%s' to determine our IP address: %s\n"
+msgstr "Không tìm thấy '%s' để nhận ra địa chỉ IP của chúng ta: %s\n"
 
-#: src/applications/dht/module/dht.c:946
-#, fuzzy, c-format
-msgid "Malformed optional field `%s' received from peer `%s'.\n"
-msgstr "Nhận được vùng không bắt buộc '%s' bị hỏng từ dầu peer '%s'.\n"
+#: src/transports/ip.c:256
+#, c-format
+msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
+msgstr "GNUnet bây giờ sử dụng địa chỉ IP %u.%u.%u.%u.\n"
 
-#: src/applications/dht/module/dht.c:973
-#, fuzzy, c-format
-msgid "Could not find peer `%s' in routing table!\n"
-msgstr "Không tìm thấy đầu peer '%s' trong bảng định tuyến!\n"
+#: src/transports/ip.c:306
+msgid "Failed to obtain my (external) IP address!\n"
+msgstr "Lấy địa chỉ IP (ngoài) của tôi không thành công!\n"
 
-#: src/applications/dht/module/dht.c:1120
-#: src/applications/dht/module/dht.c:1135
-#, fuzzy, c-format
-msgid "Received malformed response to `%s' from peer `%s'.\n"
-msgstr "Nhận được câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
+#: src/transports/tcp6.c:439
+msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
+msgstr "Mong chào mừng từ kết nối tcp, nhận được rác. Đang đóng.\n"
 
-#: src/applications/dht/module/dht.c:1447
-#, fuzzy, c-format
-msgid "Invalid response to `%s' from peer `%s'.\n"
-msgstr "Câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
+#: src/transports/tcp6.c:469
+msgid ""
+"Received malformed message from tcp6-peer connection. Closing connection.\n"
+msgstr ""
+"Nhận được thông báo bị hỏng từ kết nối tcp6-đầu peer. Đang đóng kết nối.\n"
 
-#: src/applications/dht/module/dht.c:1603
-#: src/applications/dht/module/dht.c:2340
-#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
-#, fuzzy, c-format
-msgid "`%s' called with timeout above 1 hour (bug?)\n"
-msgstr "đã gọi '%s' với thời gian chờ lớn hơn 1 giờ (lỗi bug?)\n"
+#: src/transports/tcp6.c:958
+msgid "Could not determine my public IPv6 address.\n"
+msgstr "Không nhận ra địa chỉ IPv6 của tôi.\n"
 
-#: src/applications/dht/module/dht.c:1793
+#: src/transports/tcp6.c:1002
 #, fuzzy, c-format
-msgid "Invalid response to `%s'.\n"
-msgstr "Câu trả lời không đúng tới '%s'.\n"
+msgid "`%s': unknown service: %s\n"
+msgstr "'%s': không rõ dịch vụ: %s\n"
 
-#: src/applications/dht/module/dht.c:1993
-#, fuzzy, c-format
-msgid "Malformed response to `%s' on master table.\n"
-msgstr "Câu trả lời bị hỏng tới '%s' trên bảng chính.\n"
+#: src/applications/dht/tools/dhttest2.c:50
+#: src/applications/session/sessiontest.c:48
+#: src/applications/stats/statistics.c:212
+#: src/applications/tbench/tbenchtest.c:107
+#: src/applications/tbench/tbenchtest_udp.c:107
+#: src/applications/gap/gaptest.c:52
+msgid "# of connected peers"
+msgstr "# của các đầu đã kết nối"
 
-#: src/applications/dht/module/dht.c:2207
-#: src/applications/dht/module/dht.c:2507
-#, fuzzy, c-format
-msgid "Invalid response to `%s' from `%s'\n"
-msgstr "Câu trả lời không đúng tới '%s' từ '%s'\n"
+#: src/applications/dht/tools/dhttest2.c:128
+#: src/applications/session/sessiontest.c:118
+#: src/applications/tbench/tbenchtest.c:199
+#: src/applications/tbench/tbenchtest_udp.c:201
+#: src/applications/gap/gaptest.c:318
+#, c-format
+msgid "Waiting for gnunetd to start (%u iterations left)...\n"
+msgstr "Đang chờ chạy gnunetd (còn %u lần thử)...\n"
 
-#: src/applications/dht/module/dht.c:2881
-#: src/applications/dht/module/dht.c:3021
-#: src/applications/dht/module/dht.c:3148
-#: src/applications/dht/module/dht.c:3282
-#, fuzzy, c-format
-msgid "Received invalid RPC `%s'.\n"
-msgstr "Nhận được RPC sai '%s'.\n"
+#: src/applications/dht/tools/dhttest2.c:140
+#: src/applications/session/sessiontest.c:133
+#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/tbench/tbenchtest_udp.c:122
+#: src/applications/gap/gaptest.c:330
+#, c-format
+msgid "Waiting for peers to connect (%u iterations left)...\n"
+msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
 
-#: src/applications/dht/module/dht.c:3160
-#: src/applications/dht/module/dht.c:3296
-#, fuzzy, c-format
-msgid "RPC for `%s' received for table that we do not participate in!\n"
-msgstr "Nhận được RPC cho '%s' cho bảng chúng ta không có phần trong đó!\n"
+#: src/applications/dht/tools/dht-query.c:39
+msgid "query table called NAME"
+msgstr "hỏi bảng có tên NAME"
 
-#: src/applications/dht/tools/dht-join.c:43
-msgid "allow SIZE bytes of memory for the local table"
-msgstr "cho phép SIZE byte bộ nhớ cho bảng nội bộ"
+#: src/applications/dht/tools/dht-query.c:41
+msgid "allow TIME ms to process each command"
+msgstr "cho phép TIME mili giây để tiến hành mỗi câu lệnh"
 
-#: src/applications/dht/tools/dht-join.c:45
-msgid "join table called NAME"
-msgstr "nhập bảng có tên TÊN"
+#: src/applications/dht/tools/dht-query.c:46
+msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
+msgstr "Hỏi (nhận KEY, đặt KEY VALUE, xoá bỏ KEY VALUE) một bảng DHT."
 
-#: src/applications/dht/tools/dht-join.c:51
-msgid "Join a DHT."
-msgstr "Nhập một DHT."
-
-#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/dht/tools/dht-query.c:84
-#: src/applications/fs/tools/gnunet-download.c:96
-#: src/applications/fs/tools/gnunet-insert.c:315
-#: src/applications/fs/tools/gnunet-insert.c:461
-#: src/applications/fs/tools/gnunet-pseudonym.c:120
-#: src/applications/fs/tools/gnunet-search.c:167
-#: src/applications/fs/tools/gnunet-search.c:183
-#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/dht/tools/dht-join.c:85
 #: src/applications/tbench/gnunet-tbench.c:124
 #: src/applications/tbench/gnunet-tbench.c:134
 #: src/applications/tbench/gnunet-tbench.c:147
@@ -348,6 +360,13 @@
 #: src/applications/tracekit/gnunet-tracekit.c:87
 #: src/applications/tracekit/gnunet-tracekit.c:122
 #: src/applications/tracekit/gnunet-tracekit.c:136
+#: src/applications/fs/tools/gnunet-pseudonym.c:120
+#: src/applications/fs/tools/gnunet-insert.c:315
+#: src/applications/fs/tools/gnunet-insert.c:461
+#: src/applications/fs/tools/gnunet-search.c:167
+#: src/applications/fs/tools/gnunet-search.c:183
+#: src/applications/fs/tools/gnunet-search.c:204
+#: src/applications/fs/tools/gnunet-download.c:96
 #: src/server/gnunet-transport-check.c:448
 #: src/server/gnunet-transport-check.c:462
 #: src/server/gnunet-transport-check.c:479
@@ -356,56 +375,30 @@
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Người dùng phải đưa một số vào tùy chọn '%s'.\n"
 
-#: src/applications/dht/tools/dht-join.c:115
-msgid "Superflous arguments (ignored).\n"
-msgstr "Tham số thừa (lờ đi).\n"
-
-#: src/applications/dht/tools/dht-join.c:131
-#, fuzzy, c-format
-msgid "Call to `%s' returns %d.\n"
-msgstr "Gọi tới '%s' trả lại %d.\n"
-
-#: src/applications/dht/tools/dht-join.c:132
-#, fuzzy, c-format
-msgid "Call to `%s' with key `%s'.\n"
-msgstr "Gọi tới '%s' với chìa khóa '%s'.\n"
-
-#: src/applications/dht/tools/dht-join.c:133
-#, fuzzy, c-format
-msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
-msgstr "Gọi tới '%s' với giá trị '%.*s' (%d byte).\n"
-
-#: src/applications/dht/tools/dht-join.c:211
-#: src/applications/dht/tools/dht-query.c:231
-#, fuzzy, c-format
-msgid "No table name specified, using `%s'.\n"
-msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
-
-#: src/applications/dht/tools/dht-join.c:236
-msgid "Error joining DHT.\n"
-msgstr "Lỗi nhập DHT.\n"
-
-#: src/applications/dht/tools/dht-join.c:243
+#: src/applications/dht/tools/dht-query.c:99
+#: src/applications/dht/tools/dht-join.c:108
+#: src/applications/chat/gnunet-chat.c:93
+#: src/applications/testbed/gnunet-testbed.c:125
+#: src/applications/testbed/gnunet-testbed.c:546
+#: src/applications/stats/gnunet-stats.c:144
+#: src/applications/tbench/gnunet-tbench.c:189
+#: src/applications/tracekit/gnunet-tracekit.c:153
+#: src/applications/fs/tools/gnunet-pseudonym.c:232
+#: src/applications/fs/tools/gnunet-delete.c:111
+#: src/applications/fs/tools/gnunet-directory.c:190
+#: src/applications/fs/tools/gnunet-insert.c:532
+#: src/applications/fs/tools/gnunet-search.c:221
+#: src/applications/fs/tools/gnunet-download.c:130
+#: src/applications/fs/tools/gnunet-unindex.c:140
+#: src/applications/template/gnunet-template.c:87
+#: src/applications/vpn/gnunet-vpn.c:89 src/server/gnunet-update.c:142
+#: src/server/startup.c:574 src/server/gnunet-transport-check.c:521
+#: src/server/gnunet-peer-info.c:107 src/util/getopt/getopt.c:1072
+#: src/setup/gnunet-setup.c:106 src/setup/gnunet-setup.c:286
 #, c-format
-msgid "Joined DHT.  Press CTRL-C to leave.\n"
-msgstr "Đã nhập DHT.  Nhấn CTRL-C để dời khỏi.\n"
+msgid "Use --help to get a list of options.\n"
+msgstr "Dùng --help để xem danh sách các tùy chọn.\n"
 
-#: src/applications/dht/tools/dht-join.c:250
-msgid "Error leaving DHT.\n"
-msgstr "Lỗi dời khỏi DHT.\n"
-
-#: src/applications/dht/tools/dht-query.c:39
-msgid "query table called NAME"
-msgstr "hỏi bảng có tên NAME"
-
-#: src/applications/dht/tools/dht-query.c:41
-msgid "allow TIME ms to process each command"
-msgstr "cho phép TIME mili giây để tiến hành mỗi câu lệnh"
-
-#: src/applications/dht/tools/dht-query.c:46
-msgid "Query (get KEY, put KEY VALUE, remove KEY VALUE) a DHT table."
-msgstr "Hỏi (nhận KEY, đặt KEY VALUE, xoá bỏ KEY VALUE) một bảng DHT."
-
 #: src/applications/dht/tools/dht-query.c:106
 msgid "No commands specified.\n"
 msgstr "Chưa chỉ ra câu lệnh.\n"
@@ -422,6 +415,12 @@
 msgid "'%s(%s,%s)' failed.\n"
 msgstr "'%s(%s,%s)' thất bại.\n"
 
+#: src/applications/dht/tools/dht-query.c:231
+#: src/applications/dht/tools/dht-join.c:211
+#, fuzzy, c-format
+msgid "No table name specified, using `%s'.\n"
+msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
+
 #: src/applications/dht/tools/dht-query.c:246
 #, c-format
 msgid "Failed to connect to gnunetd.\n"
@@ -500,186 +499,543 @@
 msgid "Unexpected reply to `%s' operation.\n"
 msgstr "Câu trả lời không mong đợi tới thao tác '%s'.\n"
 
-#: src/applications/dht/tools/dhttest2.c:50 src/applications/gap/gaptest.c:52
-#: src/applications/session/sessiontest.c:48
-#: src/applications/stats/statistics.c:212
-#: src/applications/tbench/tbenchtest.c:107
-msgid "# of connected peers"
-msgstr "# của các đầu đã kết nối"
+#: src/applications/dht/tools/dht-join.c:43
+msgid "allow SIZE bytes of memory for the local table"
+msgstr "cho phép SIZE byte bộ nhớ cho bảng nội bộ"
 
-#: src/applications/dht/tools/dhttest2.c:128
-#: src/applications/gap/gaptest.c:318
-#: src/applications/session/sessiontest.c:118
-#: src/applications/tbench/tbenchtest.c:199
-#, c-format
-msgid "Waiting for gnunetd to start (%u iterations left)...\n"
-msgstr "Đang chờ chạy gnunetd (còn %u lần thử)...\n"
+#: src/applications/dht/tools/dht-join.c:45
+msgid "join table called NAME"
+msgstr "nhập bảng có tên TÊN"
 
-#: src/applications/dht/tools/dhttest2.c:140
-#: src/applications/gap/gaptest.c:330
-#: src/applications/session/sessiontest.c:133
-#: src/applications/tbench/tbenchtest.c:122
+#: src/applications/dht/tools/dht-join.c:51
+msgid "Join a DHT."
+msgstr "Nhập một DHT."
+
+#: src/applications/dht/tools/dht-join.c:115
+msgid "Superflous arguments (ignored).\n"
+msgstr "Tham số thừa (lờ đi).\n"
+
+#: src/applications/dht/tools/dht-join.c:131
+#, fuzzy, c-format
+msgid "Call to `%s' returns %d.\n"
+msgstr "Gọi tới '%s' trả lại %d.\n"
+
+#: src/applications/dht/tools/dht-join.c:132
+#, fuzzy, c-format
+msgid "Call to `%s' with key `%s'.\n"
+msgstr "Gọi tới '%s' với chìa khóa '%s'.\n"
+
+#: src/applications/dht/tools/dht-join.c:133
+#, fuzzy, c-format
+msgid "Call to `%s' with value '%.*s' (%d bytes).\n"
+msgstr "Gọi tới '%s' với giá trị '%.*s' (%d byte).\n"
+
+#: src/applications/dht/tools/dht-join.c:236
+msgid "Error joining DHT.\n"
+msgstr "Lỗi nhập DHT.\n"
+
+#: src/applications/dht/tools/dht-join.c:243
 #, c-format
-msgid "Waiting for peers to connect (%u iterations left)...\n"
-msgstr "Đang chờ kết nối các đầu (còn %u lần thử)...\n"
+msgid "Joined DHT.  Press CTRL-C to leave.\n"
+msgstr "Đã nhập DHT.  Nhấn CTRL-C để dời khỏi.\n"
 
-#: src/applications/fragmentation/fragmentation.c:557
-msgid "# messages defragmented"
-msgstr "# thông báo đã gom lại"
+#: src/applications/dht/tools/dht-join.c:250
+msgid "Error leaving DHT.\n"
+msgstr "Lỗi dời khỏi DHT.\n"
 
-#: src/applications/fragmentation/fragmentation.c:558
-msgid "# messages fragmented"
-msgstr "# thông báo đã phân mảnh"
+#: src/applications/dht/module/dht.c:946
+#, fuzzy, c-format
+msgid "Malformed optional field `%s' received from peer `%s'.\n"
+msgstr "Nhận được vùng không bắt buộc '%s' bị hỏng từ dầu peer '%s'.\n"
 
-#: src/applications/fragmentation/fragmentation.c:559
-msgid "# fragments discarded"
-msgstr "# các mảnh bị loại bỏ"
+#: src/applications/dht/module/dht.c:973
+#, fuzzy, c-format
+msgid "Could not find peer `%s' in routing table!\n"
+msgstr "Không tìm thấy đầu peer '%s' trong bảng định tuyến!\n"
 
-#: src/applications/fragmentation/fragmentation.c:569
+#: src/applications/dht/module/dht.c:1120
+#: src/applications/dht/module/dht.c:1135
 #, fuzzy, c-format
-msgid "`%s' registering handler %d\n"
-msgstr "'%s' đăng ký trình điều khiển %d\n"
+msgid "Received malformed response to `%s' from peer `%s'.\n"
+msgstr "Nhận được câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
 
-#: src/applications/fs/ecrs/download.c:125
+#: src/applications/dht/module/dht.c:1447
 #, fuzzy, c-format
-msgid "Could not unlink temporary file `%s': %s\n"
-msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
+msgid "Invalid response to `%s' from peer `%s'.\n"
+msgstr "Câu trả lời không đúng tới '%s' từ đầu peer '%s'.\n"
 
-#: src/applications/fs/ecrs/download.c:257
+#: src/applications/dht/module/dht.c:1603
+#: src/applications/dht/module/dht.c:2340
+#: src/applications/dht/module/dht.c:2613 src/applications/rpc/rpc.c:1267
 #, fuzzy, c-format
-msgid "Write(%d, %p, %d) failed: %s\n"
-msgstr "'%s' %s không thành công: %s\n"
+msgid "`%s' called with timeout above 1 hour (bug?)\n"
+msgstr "đã gọi '%s' với thời gian chờ lớn hơn 1 giờ (lỗi bug?)\n"
 
-#: src/applications/fs/ecrs/download.c:927
-msgid ""
-"Decrypted content does not match key. This is either a bug or a maliciously "
-"inserted file. Download aborted.\n"
+#: src/applications/dht/module/dht.c:1793
+#, fuzzy, c-format
+msgid "Invalid response to `%s'.\n"
+msgstr "Câu trả lời không đúng tới '%s'.\n"
+
+#: src/applications/dht/module/dht.c:1993
+#, fuzzy, c-format
+msgid "Malformed response to `%s' on master table.\n"
+msgstr "Câu trả lời bị hỏng tới '%s' trên bảng chính.\n"
+
+#: src/applications/dht/module/dht.c:2207
+#: src/applications/dht/module/dht.c:2507
+#, fuzzy, c-format
+msgid "Invalid response to `%s' from `%s'\n"
+msgstr "Câu trả lời không đúng tới '%s' từ '%s'\n"
+
+#: src/applications/dht/module/dht.c:2881
+#: src/applications/dht/module/dht.c:3021
+#: src/applications/dht/module/dht.c:3148
+#: src/applications/dht/module/dht.c:3282
+#, fuzzy, c-format
+msgid "Received invalid RPC `%s'.\n"
+msgstr "Nhận được RPC sai '%s'.\n"
+
+#: src/applications/dht/module/dht.c:3160
+#: src/applications/dht/module/dht.c:3296
+#, fuzzy, c-format
+msgid "RPC for `%s' received for table that we do not participate in!\n"
+msgstr "Nhận được RPC cho '%s' cho bảng chúng ta không có phần trong đó!\n"
+
+#: src/applications/dht/module/cs.c:446
+#, fuzzy, c-format
+msgid "`%s' failed: table not found!\n"
+msgstr "'%s' không thành công: không tìm thấy bảng!\n"
+
+#: src/applications/dht/module/cs.c:466
+#, fuzzy, c-format
+msgid "`%s' failed.  Terminating connection to client.\n"
+msgstr "'%s' không thành công.  Đang ngắt kết nối tới máy khách.\n"
+
+#: src/applications/dht/module/cs.c:542
+msgid "sendAck failed.  Terminating connection to client.\n"
+msgstr "Gửi sendAck không thành công.  Ngắt kết nối tới máy khách.\n"
+
+#: src/applications/dht/module/cs.c:661 src/applications/dht/module/cs.c:679
+#: src/applications/dht/module/cs.c:688
+#, fuzzy, c-format
+msgid "`%s' failed. Terminating connection to client.\n"
+msgstr "'%s' không thành công. Ngắt kết nối tới máy khách.\n"
+
+#: src/applications/dht/module/cs.c:808 src/applications/dht/module/cs.c:861
+#, fuzzy, c-format
+msgid "Failed to deliver `%s' message.\n"
+msgstr "Phân phát tin nhắn '%s' không thành công.\n"
+
+#: src/applications/chat/chat.c:87
+msgid "Message received from peer is invalid.\n"
+msgstr "Thông báo nhận được từ một đầu là sai.\n"
+
+#: src/applications/chat/chat.c:134
+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:156
+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:160
+#, 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:197
+#, 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:212
+msgid "enables P2P-chat (incomplete)"
 msgstr ""
-"Nội dung đã giải mã không tương ứng chìa khóa. Đây là một lỗi bug hoặc một "
-"tập tin chèn vào với ý xấu. Dừng tải xuống.\n"
 
-#: src/applications/fs/ecrs/download.c:1104
+#: src/applications/chat/gnunet-chat.c:82
+msgid "specify nickname"
+msgstr "chỉ ra tên nick"
+
+#: src/applications/chat/gnunet-chat.c:87
+msgid "Start GNUnet chat client."
+msgstr "Chạy máy khách chát của GNUnet."
+
+#: src/applications/chat/gnunet-chat.c:151
+#: src/applications/tbench/gnunet-tbench.c:213
+#: src/applications/tracekit/gnunet-tracekit.c:363
+#: src/applications/fs/tools/gnunet-delete.c:142
+msgid "Could not connect to gnunetd.\n"
+msgstr "Không kết nối được tới gnunetd.\n"
+
+#: src/applications/chat/gnunet-chat.c:155
 #, fuzzy, c-format
+msgid "You must specify a nickname (use option `%s').\n"
+msgstr "Người dùng phải chỉ ra một tên nick (dùng tùy chọn '%s').\n"
+
+#: src/applications/chat/gnunet-chat.c:182
+msgid "Could not send join message to gnunetd\n"
+msgstr "Không gửi được thông báo nhập join tới gnunetd\n"
+
+#: src/applications/chat/gnunet-chat.c:191
+msgid "Could not send message to gnunetd\n"
+msgstr "Không gửi được thông báo tới gnunetd\n"
+
+#: src/applications/advertising/advertising.c:161
+#, fuzzy, c-format
+msgid "hello message from `%s' invalid (signature invalid). Dropping.\n"
+msgstr "Thông báo HELO từ '%s' bị sai (sai chữ ký). Đang bỏ đi.\n"
+
+#: src/applications/advertising/advertising.c:167
+#, fuzzy
 msgid ""
-"Content `%s' seems to be not available on the network (tried %u times).\n"
-msgstr "Nội dung '%s' có vẻ không có trên mạng.\n"
+"hello message received invalid (expiration time over limit). Dropping.\n"
+msgstr "Thông báo HELO nhận được bị sai (vượt quá thời hạn). Đang bỏ đi.\n"
 
-#: src/applications/fs/ecrs/meta.c:842
+#: src/applications/advertising/advertising.c:176
 #, fuzzy, c-format
-msgid "Renaming of file `%s' to `%s' failed: %s\n"
-msgstr "Đổi tên tập tin '%s' thành '%s' thất bại: %s\n"
+msgid "hello advertisement for protocol %d received.\n"
+msgstr "Nhận được quảng cáo HELO cho giao thức %d.\n"
 
-#: src/applications/fs/ecrs/meta.c:850
+#: src/applications/advertising/advertising.c:295
+#, fuzzy
+msgid "Could not send hellos+PING, ping buffer full.\n"
+msgstr "Không gửi được các HELO+PING, đầy bộ đệm ping.\n"
+
+#: src/applications/advertising/advertising.c:308
 #, fuzzy, c-format
-msgid "Could not rename file `%s' to `%s': file exists\n"
-msgstr "Không đổi tên được tập tin '%s' thành '%s': tập tin tồn tại\n"
+msgid "`%s' failed (%d, %u). Will not send PING.\n"
+msgstr "'%s' thất bại (%d, %u). Sẽ không gửi PING.\n"
 
-#: src/applications/fs/ecrs/namespace.c:45
+#: src/applications/advertising/advertising.c:463
 #, c-format
+msgid "Advertising my transport %d to selected peers.\n"
+msgstr "Đang quảng cáo giao thông %d tới các đầu peer đã chọn.\n"
+
+#: src/applications/advertising/advertising.c:470
 msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s%s.\n"
+"Announcing ourselves pointless: no other peers are known to us so far.\n"
 msgstr ""
-"Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-peer "
-"dưới %s%s.\n"
+"Đang tự thông báo sự vô nghĩa: chúng ta không còn biết đến một đầu peer "
+"nào.\n"
 
-#: src/applications/fs/ecrs/namespace.c:133
+#: src/applications/advertising/advertising.c:572
 #, fuzzy, c-format
-msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
-msgstr "Không tạo được tên hiệu '%s', tập tin '%s' tồn tại.\n"
+msgid "Removing hello from peer `%s' (expired %ds ago).\n"
+msgstr "Đang xóa bỏ HELO từ đầu peer '%s' (đã hết hạn %dgiây).\n"
 
-#: src/applications/fs/ecrs/namespace.c:307
-#: src/applications/fs/ecrs/namespace.c:383
-#: src/applications/fs/ecrs/namespace.c:528
+#: src/applications/advertising/advertising.c:734
+msgid "# Peer advertisements received"
+msgstr "# Nhận được quảng cáo của đầu peer"
+
+#: src/applications/advertising/advertising.c:735
+msgid "# Self advertisments transmitted"
+msgstr "# Đã truyền tải tự quảng cáo"
+
+#: src/applications/advertising/advertising.c:736
+msgid "# Foreign advertisements forwarded"
+msgstr "# Đã chuyển tiếp quàng cáo ngoài"
+
+#: src/applications/advertising/advertising.c:738
+#: src/applications/pingpong/pingpong.c:462
+msgid "# plaintext PING messages sent"
+msgstr "# đã gửi các thông báo PING dạng văn bản thông thường"
+
+#: src/applications/advertising/advertising.c:742
+#: src/applications/session/connect.c:752
 #, 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"
+msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
+msgstr ""
+"'%s' đăng ký trình điều khiển %d (văn bản thông thường và văn bản mã hóa)\n"
 
-#: src/applications/fs/ecrs/namespace.c:318
-#: src/applications/fs/ecrs/namespace.c:394
+#: src/applications/advertising/advertising.c:761
+msgid "Network advertisements disabled by configuration!\n"
+msgstr "Tắt quàng cáo trong mạng bằng cấu hình!\n"
+
+#: src/applications/advertising/advertising.c:781
+msgid ""
+"ensures that this peer is known by other peers and discovers other peers"
+msgstr ""
+
+#: src/applications/topology_default/topology.c:398
 #, fuzzy, c-format
-msgid "Format of pseudonym `%s' is invalid.\n"
-msgstr "Định dạng của tên hiệu '%s' sai.\n"
+msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
+msgstr "Phiên bản không tương ứng ('%s' và '%s'), hãy chạy gnunet-update!\n"
 
-#: src/applications/fs/ecrs/namespace.c:538
-#: src/applications/fs/ecrs/namespace.c:548
+#: src/applications/pingpong/pingpong.c:120
+#: src/applications/pingpong/pingpong.c:179
+#: src/applications/pingpong/pingpong.c:227
+#: src/applications/pingpong/pingpong.c:292
 #, fuzzy, c-format
-msgid "Format of file `%s' is invalid.\n"
-msgstr "Định dạng của tập tin '%s' sai.\n"
+msgid "Received malformed `%s' message. Dropping.\n"
+msgstr "Nhận được thông báo '%s' hỏng. Đang bỏ đi.\n"
 
-#: src/applications/fs/ecrs/search.c:160
-msgid "CHK URI not allowed for search.\n"
-msgstr "Không cho phép tìm kiếm CHK URI.\n"
+#: src/applications/pingpong/pingpong.c:130
+msgid "Received ping for another peer. Dropping.\n"
+msgstr "Nhận được ping cho đầu peer khác. Đang bỏ đi.\n"
 
-#: src/applications/fs/ecrs/search.c:216
-msgid "LOC URI not allowed for search.\n"
-msgstr "Không cho phép tìm kiếm LOC URI.\n"
+#: src/applications/pingpong/pingpong.c:187
+msgid "Received PING not destined for us!\n"
+msgstr "Nhận được PING không dành cho chúng ta!\n"
 
-#: src/applications/fs/ecrs/upload.c:180
+#: src/applications/pingpong/pingpong.c:267
+#: src/applications/pingpong/pingpong.c:325
+msgid ""
+"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
+"constant.\n"
+msgstr ""
+"Không tương ứng được PONG đối với bất kỳ PING. Hãy thử tăng hằng số "
+"MAX_PING_PONG.\n"
+
+#: src/applications/pingpong/pingpong.c:366
+msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
+msgstr "Không tạo được PING, bảng đầy. Hãy thử tăng MAX_PING_PONG.\n"
+
+#: src/applications/pingpong/pingpong.c:452
+msgid "# encrypted PONG messages received"
+msgstr "# nhận được thông báo PONG đã mã hóa"
+
+#: src/applications/pingpong/pingpong.c:454
+msgid "# plaintext PONG messages received"
+msgstr "# nhận được thông báo PONG dạng văn bản thường"
+
+#: src/applications/pingpong/pingpong.c:456
+msgid "# encrypted PING messages received"
+msgstr "# nhận được thông báo PING đã mã hóa"
+
+#: src/applications/pingpong/pingpong.c:458
+msgid "# PING messages created"
+msgstr "# đã tạo tin nhắn PING"
+
+#: src/applications/pingpong/pingpong.c:460
+msgid "# encrypted PONG messages sent"
+msgstr "# đã gửi thông báo PONG đã mã hóa"
+
+#: src/applications/pingpong/pingpong.c:464
+msgid "# encrypted PING messages sent"
+msgstr "# đã gửi các thông báo PING mã hóa"
+
+#: src/applications/pingpong/pingpong.c:473
 #, 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"
+msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
+msgstr ""
+"'%s' đăng ký trình điều khiển %d %d (văn bản thông thường và văn bản mã "
+"hóa)\n"
 
-#: src/applications/fs/ecrs/upload.c:186
+#: src/applications/sqstore_sqlite/sqlite.c:44
+#: src/applications/sqstore_sqlite/sqlite.c:51
+#: src/applications/sqstore_mysql/mysql.c:137
+#: src/applications/sqstore_mysql/mysql.c:144
+#: src/applications/sqstore_mysql/mysql.c:386
+#: src/applications/sqstore_mysql/mysql.c:725
+#: src/applications/sqstore_mysql/mysql.c:740
+#: src/applications/sqstore_mysql/mysql.c:749
+#: src/applications/sqstore_mysql/mysql.c:773
+#: src/applications/sqstore_mysql/mysql.c:783
+#: src/applications/sqstore_mysql/mysql.c:837
+#: src/applications/sqstore_mysql/mysql.c:922
+#: src/applications/sqstore_mysql/mysql.c:932
+#: src/applications/sqstore_mysql/mysql.c:1004
+#: src/applications/sqstore_mysql/mysql.c:1013
+#: src/applications/sqstore_mysql/mysql.c:1053
+#: src/applications/sqstore_mysql/mysql.c:1067
+#: src/applications/kvstore_sqlite/kv_sqlite.c:43
+#: src/applications/kvstore_sqlite/kv_sqlite.c:50
+#: src/util/crypto/symcipher_gcrypt.c:46 src/util/crypto/symcipher_gcrypt.c:53
+#: src/util/crypto/hostkey_gcrypt.c:63 src/util/crypto/hostkey_gcrypt.c:70
 #, fuzzy, c-format
-msgid "Cannot get size of file `%s'"
-msgstr "Không mở được tập tin cấu hình '%s'\n"
+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/fs/ecrs/upload.c:193
+#: src/applications/sqstore_sqlite/sqlite.c:139
+msgid "Unable to initialize SQLite.\n"
+msgstr "Không chạy được SQLite.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:271
+#: src/applications/sqstore_sqlite/sqlite.c:289
+#: src/applications/sqstore_mysql/mysql.c:223
+#: src/applications/sqstore_mysql/mysql.c:800
+#, c-format
+msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+msgstr ""
+
+#: src/applications/sqstore_sqlite/sqlite.c:272
+#: src/applications/sqstore_sqlite/sqlite.c:290
+msgid "sqlite datastore"
+msgstr ""
+
+#: src/applications/sqstore_sqlite/sqlite.c:1035
+#, fuzzy, c-format
+msgid ""
+"Configuration file must specify directory for storing FS data in section `%"
+"s' under `%s'.\n"
+msgstr ""
+"Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần '%s' dưới "
+"'%s'.\n"
+
+#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/sqstore_mysql/mysql.c:1178
 #, fuzzy
-msgid "Failed to connect to gnunetd."
-msgstr "Kết nối tới gnunetd không thành công.\n"
+msgid "# bytes in datastore"
+msgstr "# byte nhận được do nhiễu đường truyền"
 
-#: src/applications/fs/ecrs/upload.c:203
+#: src/applications/sqstore_sqlite/sqlitetest.c:260
+#: src/applications/sqstore_mysql/mysqltest.c:251
+#: src/applications/kvstore_sqlite/kv_sqlitetest.c:102
+msgid "Could not initialize libgnunetutil!\n"
+msgstr "Không chạy được libgnunetutil!\n"
+
+#: src/applications/session/connect.c:209
 #, fuzzy, c-format
-msgid "Cannot hash `%s'.\n"
-msgstr "Không hash được '%s'.\n"
+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/fs/ecrs/upload.c:221
+#: src/applications/session/connect.c:246
+msgid "Cannot encrypt sessionkey, other peer not known!\n"
+msgstr ""
+"Không mã hóa được chìa khóa buổi làm việc, không biết đến đầu peer khác!\n"
+
+#: src/applications/session/connect.c:523
 #, 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"
+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/fs/ecrs/upload.c:227
+#: src/applications/session/connect.c:532
 #, 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"
+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/fs/ecrs/upload.c:306
+#: src/applications/session/connect.c:587
+msgid ""
+"Error parsing encrypted session key, given message part size is invalid.\n"
+msgstr ""
+"Lỗi phân tích chìa khóa buổi làm việc đã mã hóa, kích thước của phần thông "
+"báo đưa ra là sai.\n"
+
+#: src/applications/session/connect.c:597
 #, 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"
+msgid "Unknown type in embedded message: %u (size: %u)\n"
+msgstr ""
 
-#: src/applications/fs/fsui/download.c:290
-msgid "Download aborted."
-msgstr "Dừng tải xuống."
+#: src/applications/session/connect.c:742
+msgid "# session keys sent"
+msgstr "# đã gửi các phím buổi làm việc"
 
-#: src/applications/fs/fsui/download.c:294
-msgid "ECRS download failed (see logs)."
-msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
+#: src/applications/session/connect.c:744
+msgid "# session keys rejected"
+msgstr "# đã nhả ra các phím buổi làm việc"
 
-#: src/applications/fs/fsui/download.c:298
-#, fuzzy
-msgid "ECRS download suspending."
-msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
+#: src/applications/session/connect.c:746
+msgid "# session keys accepted"
+msgstr "# đã chấp nhận các phím buổi làm việc"
 
-#: src/applications/fs/fsui/download.c:302
-msgid "Unexpected download state."
+#: src/applications/session/connect.c:748
+msgid "# sessions established"
+msgstr "# đã thiết lập buổi làm việc"
+
+#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
+#, c-format
+msgid ""
+"%s::%s - RPC %s:%p could not be registered: another callback is already "
+"using this name (%p)\n"
 msgstr ""
+"%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã dùng tên này (%"
+"p)\n"
 
-#: src/applications/fs/fsui/downloadtest.c:239
-#: src/applications/fs/fsui/fsuitest.c:167
-#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
-#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
-#: src/applications/fs/fsui/searchtest.c:143
-#: src/applications/fs/tools/gnunet-pseudonym.c:159
-#: src/applications/fs/tools/gnunet-pseudonym.c:164
-msgid "AND"
-msgstr "VÀ"
+#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
+#, c-format
+msgid ""
+"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+"under that name: %p\n"
+msgstr ""
+"%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã đăng ký dưới tên "
+"đó (%p)\n"
 
-#: src/applications/fs/fsui/file_info.c:66
+#: src/applications/rpc/rpc.c:232
+#, c-format
+msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
+msgstr "%s::%s - RPC %s:%p không đăng ký được: không tìm thấy\n"
+
+#: src/applications/rpc/rpc.c:279
+#, c-format
+msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
+msgstr "%s::%s - async RPC %s:%p không đăng ký được: không tìm thấy\n"
+
+#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
+#: src/applications/rpc/rpc.c:1084
+#, c-format
+msgid "Invalid message of type %u received.  Dropping.\n"
+msgstr "Nhận được thông báo sai của dạng %u.  Đang bỏ đi.\n"
+
+#: src/applications/rpc/rpc.c:936
+#, c-format
+msgid "Dropping RPC request %u: message malformed.\n"
+msgstr "Đang bỏ đi yêu cầu RPC %u: thông báo hỏng.\n"
+
+#: src/applications/rpc/rpc.c:1388
+#, c-format
+msgid "RPC not unregistered: %s:%p\n"
+msgstr "Chưa bỏ đăng ký RPC: %s: %p\n"
+
+#: src/applications/rpc/rpc.c:1414
+#, fuzzy, c-format
+msgid "`%s' registering handlers %d %d %d\n"
+msgstr "'%s' đăng ký trình điều khiển %d %d %d\n"
+
+#: src/applications/rpc/rpc.c:1435
+#, fuzzy, c-format
+msgid "Failed to initialize `%s' service.\n"
+msgstr "Chạy dịch vụ '%s' không thành công.\n"
+
+#: src/applications/rpc/rpc.c:1491
+msgid "RPC async reply invalid.\n"
+msgstr "Câu trả lời async của RPC sai.\n"
+
+#: src/applications/rpc/rpc.c:1562
+msgid "async RPC reply not received.\n"
+msgstr "Không nhận được câu trả lời async của RPC.\n"
+
+#: src/applications/sqstore_mysql/mysql.c:224
+#: src/applications/sqstore_mysql/mysql.c:801
+msgid "mysql datastore"
+msgstr ""
+
+#: src/applications/sqstore_mysql/mysql.c:1107
+#, fuzzy, c-format
+msgid "Query `%s' had no results.\n"
+msgstr "Câu hỏi '%s' không có kết quả.\n"
+
+#: src/applications/sqstore_mysql/mysql.c:1205
+#, fuzzy, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Đang thử dùng tập tin '%s' cho cấu hình MySQL.\n"
+
+#: src/applications/sqstore_mysql/mysql.c:1223
+msgid ""
+"Failed to load MySQL database module.  Check that MySQL is running and "
+"configured properly!\n"
+msgstr ""
+
+#: src/applications/datastore/filter.c:42
+#, fuzzy, c-format
+msgid ""
+"Configuration must specify directory for FS data in section `%s' under `%"
+"s'.\n"
+msgstr ""
+"Trong phần '%s' dưới '%s' của cấu hình phải chỉ ra thư mục cho dữ liệu FS.\n"
+
+#: src/applications/datastore/datastore.c:118
+#, fuzzy, c-format
+msgid "Availability test failed for `%s' at %s:%d.\n"
+msgstr "Thử khả năng cho '%s' không thành công tại %s: %d.\n"
+
+#: src/applications/datastore/datastore.c:142
+#, fuzzy, c-format
+msgid "Database failed to delete `%s'.\n"
+msgstr "Cơ sở dữ liệu xóa %s không thành công.\n"
+
 #: src/applications/identity/hostkey.c:98
-#: src/applications/identity/identity.c:1044
+#: src/applications/identity/identity.c:1086
+#: src/applications/fs/fsui/file_info.c:66
 #, c-format
 msgid ""
 "Configuration file must specify a directory for GNUnet to store per-peer "
@@ -688,121 +1044,871 @@
 "Tập tin cấu hình phải chỉ ra thư mục cho GNUnet để chứa dữ liệu per-peer "
 "dưới %s%s\n"
 
-#: src/applications/fs/fsui/file_info.c:93
-msgid "Collecting file identifiers disabled.\n"
-msgstr "Tắt bỏ thu thập tên tập tin.\n"
-
-#: src/applications/fs/fsui/file_info.c:292
-#, c-format
-msgid "Deleted corrupt URI database in `%s'."
+#: src/applications/identity/hostkey.c:119
+#, fuzzy, c-format
+msgid ""
+"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
 msgstr ""
+"Kiểm tra chìa khóa máy có trong '%s' không thành công, đang tạo chìa khóa "
+"máy mới.\n"
 
-#: src/applications/fs/fsui/fsui.c:189
-msgid "FSUI persistence: error restoring download\n"
-msgstr "FSUI: lỗi phục hồi tải xuống\n"
+#: src/applications/identity/hostkey.c:127
+msgid "Creating new hostkey (this may take a while).\n"
+msgstr "Đang tạo chìa khóa máy mới (có thể cần một chút thời gian).\n"
 
-#: src/applications/fs/fsui/fsui.c:638
+#: src/applications/identity/hostkey.c:130
+msgid "Could not create hostkey!\n"
+msgstr "Không tạo được chìa khóa máy!\n"
+
+#: src/applications/identity/hostkey.c:139
+msgid "Done creating hostkey.\n"
+msgstr "Đã tạo xong chìa khóa máy.\n"
+
+#: src/applications/identity/identity.c:333
 #, 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"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
 
-#: src/applications/fs/fsui/helper.c:67
-msgid "No keywords specified!\n"
-msgstr "Chưa chỉ ra từ khóa!\n"
+#: src/applications/identity/identity.c:366
+#, fuzzy, c-format
+msgid "%s `%s' returned no known hosts!\n"
+msgstr "%s '%s' không trả lại máy biết đến!\n"
 
-#: src/applications/fs/fsui/namespace_info.c:583
-msgid "Publication interval for periodic publication changed."
+#: src/applications/identity/identity.c:648
+#: src/applications/identity/identity.c:666
+#, fuzzy, c-format
+msgid "Removed file `%s' containing invalid hello data.\n"
+msgstr "Xóa bỏ tập tin '%s' chứa dữ liệu HELO sai.\n"
+
+#: src/applications/identity/identity.c:716
+#, fuzzy, c-format
+msgid "Signature failed verification: peer `%s' not known.\n"
 msgstr ""
-"Đã thay đổi khoảng thời gian giữa các lần đưa ra chia sẻ cho chia sẻ định kỳ."
+"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/fs/fsui/namespace_info.c:604
+#: src/applications/identity/identity.c:724
+#, fuzzy
+msgid "Signature failed verification: signature invalid.\n"
+msgstr "Thông báo HELO sai (sai chữ ký).\n"
+
+#: src/applications/testbed/commands.c:1130
+#: src/applications/stats/gnunet-stats.c:61
+#, c-format
+msgid "Supported peer-to-peer messages:\n"
+msgstr "Thông báo Peer to Peer được hỗ trợ:\n"
+
+#: src/applications/testbed/commands.c:1132
+#: src/applications/stats/gnunet-stats.c:64
+#, c-format
+msgid "Supported client-server messages:\n"
+msgstr "Thông báo máy khách-máy chủ hỗ trợ:\n"
+
+#: src/applications/testbed/gnunet-testbed.c:119
+msgid "Start GNUnet-testbed helper."
+msgstr "Chạy chương trình trợ giúp Start GNUnet-testbed."
+
+#: src/applications/testbed/gnunet-testbed.c:183
+#, c-format
+msgid "Cannot connect to LOOPBACK port %d: %s\n"
+msgstr "Không kết nối được tới cổng quay lại LOOPBACK %d: %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:282
+#, fuzzy, c-format
+msgid "Could not execute `%s': %s\n"
+msgstr "Không thực hiện được '%s': %s\n"
+
+#: src/applications/testbed/gnunet-testbed.c:325
+msgid "No client service started. Trying again in 30 seconds.\n"
+msgstr "Chưa chạy dịch vụ máy khách. Hãy thử lại sau 30 giây.\n"
+
+#: src/applications/testbed/gnunet-testbed.c:348
+#, c-format
 msgid ""
-"Publishing update for periodically updated content more than a week ahead of "
-"schedule.\n"
+"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
+"Trying again in %d seconds...\n"
 msgstr ""
-"Đang đưa ra các cập nhật cho nội dung cập nhật thường xuyên trước một tuần "
-"so với lịch.\n"
+"Lỗi (%s) kết gắn bind trình nghe TCP vào cổng %d. Chưa chạy dịch vụ proxy.\n"
+"Hãy thử lại sau %d giây...\n"
 
-#: src/applications/fs/fsui/search.c:245
-msgid "This search is already pending!\n"
-msgstr "Tìm kiếm này đang chờ đợi!\n"
+#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
+#, c-format
+msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
+msgstr "Đã nhả ra kết nối chưa xác thực từ %u.%u.%u.%u.\n"
 
-#: src/applications/fs/fsui/unindex.c:85
-#, fuzzy
-msgid "Unindex failed."
-msgstr "Bỏ đánh chỉ mục thất bại.\n"
+#: src/applications/testbed/gnunet-testbed.c:428
+#, c-format
+msgid "Protocol violation on socket. Expected command.\n"
+msgstr "Xâm phạm giao thức trên socket. Đã mong đợi câu lệnh.\n"
 
-#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
-#: src/applications/fs/fsui/upload.c:448
-#, fuzzy
-msgid "Upload failed."
-msgstr "Tải lên thất bại.\n"
+#: src/applications/testbed/gnunet-testbed.c:467
+#, fuzzy, c-format
+msgid "Command `%s' not found!\n"
+msgstr "Không tìm thấy câu lệnh '%s'!\n"
 
-#: src/applications/fs/fsui/upload.c:455
-#, fuzzy
-msgid "Cannot upload directory without using recursion."
-msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
+#: src/applications/testbed/gnunet-testbed.c:540
+msgid "Start GNUnet testbed controller."
+msgstr "Chạy trình điều khiển testbed của GNUnet."
 
-#: src/applications/fs/module/fs.c:1184
+#: src/applications/testbed/gnunet-testbed.c:594
+#, c-format
+msgid "Malformed entry in the configuration in section %s under %s: %s\n"
+msgstr "Mục có định dạng sai trong phần %s dưới %s của cấu hình: %s\n"
+
+#: src/applications/testbed/testbed.c:50
+msgid "Could not send acknowledgement back to client.\n"
+msgstr "Không gửi được câu trả lời đã biết ack trở lại cho máy khách.\n"
+
+#: src/applications/testbed/testbed.c:60
+#, c-format
+msgid "Received unknown testbed message of type %u.\n"
+msgstr "Nhận được thông báo testbed không rõ dạng %u.\n"
+
+#: src/applications/testbed/testbed.c:78
+#: src/applications/testbed/testbed.c:807
 #, fuzzy, c-format
+msgid "size of `%s' message is too short. Ignoring.\n"
+msgstr "kích thước của thông báo '%s' quá ngắn. Đang lờ đi.\n"
+
+#: src/applications/testbed/testbed.c:85
+#, fuzzy, c-format
+msgid "size of `%s' message is wrong. Ignoring.\n"
+msgstr "kích thước của thông báo '%s' bị sai. Đang lờ đi.\n"
+
+#: src/applications/testbed/testbed.c:137
+#, fuzzy, c-format
+msgid "TESTBED could not generate hello message for protocol %u\n"
+msgstr "TESTBED không tạo được thông báo HELO cho giao thức %u\n"
+
+#: src/applications/testbed/testbed.c:215
+#: src/applications/testbed/testbed.c:256
+#: src/applications/testbed/testbed.c:359
+#: src/applications/testbed/testbed.c:366
+#: src/applications/testbed/testbed.c:403
+#: src/applications/testbed/testbed.c:410
+#, fuzzy, c-format
+msgid "received invalid `%s' message\n"
+msgstr "nhận được thông báo sai '%s'\n"
+
+#: src/applications/testbed/testbed.c:231
+#: src/applications/testbed/testbed.c:271
+#, fuzzy, c-format
+msgid "received invalid `%s' message (empty module name)\n"
+msgstr "nhận được thông báo '%s' sai (tên môđun rỗng)\n"
+
+#: src/applications/testbed/testbed.c:238
+#, fuzzy, c-format
+msgid "loading module `%s' failed.  Notifying client.\n"
+msgstr "nạp môđun '%s' không thành công.  Đang cho máy khách biết.\n"
+
+#: src/applications/testbed/testbed.c:278
+msgid "unloading module failed.  Notifying client.\n"
+msgstr "hủy nạp môđun không thành công.  Đang cho máy khách biết.\n"
+
+#: src/applications/testbed/testbed.c:539
+#, fuzzy, c-format
+msgid "`%s' %s failed: %s\n"
+msgstr "'%s' %s không thành công: %s\n"
+
+#: src/applications/testbed/testbed.c:625
+#, fuzzy, c-format
+msgid "received invalid `%s' message: %s.\n"
+msgstr "nhận được thông báo '%s' sai: %s.\n"
+
+#: src/applications/testbed/testbed.c:817
+#, c-format
+msgid "'..' is not allowed in file name (%s).\n"
+msgstr "không cho phép '..' trong tên tập tin (%s).\n"
+
+#: src/applications/testbed/testbed.c:826
+msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
+msgstr "Tên tập tin rỗng cho thông báo UPLOAD_FILE là sai!\n"
+
+#: src/applications/testbed/testbed.c:833
+msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+msgstr ""
+"Tên tập tin cho thông báo UPLOAD_FILE không phải là kết thúc rỗng (sai)!\n"
+
+#: src/applications/testbed/testbed.c:841
+msgid "Upload refused!"
+msgstr "Từ chối tải lên!"
+
+#: src/applications/testbed/testbed.c:867
+#, c-format
+msgid "Invalid message received at %s:%d."
+msgstr "Nhận được thông báo sai tại %s: %d."
+
+#: src/applications/testbed/testbed.c:985
+#, c-format
+msgid "received invalid testbed message of size %u\n"
+msgstr "nhận được thông báo testbed sai với kích thước %u\n"
+
+#: src/applications/testbed/testbed.c:1002
+#, c-format
 msgid ""
-"You must specify a postive number for `%s' in the configuration in section `%"
-"s'.\n"
+"Received testbed message of type %u but unexpected size %u, expected %u\n"
 msgstr ""
-"Người dùng phải chỉ ra một số dương cho '%s' trong phần '%s' của cấu hình.\n"
+"Nhận được thông báo testbed dạng %u nhưng kích thước không mong đợi %u, mong "
+"đợi %u\n"
 
-#: src/applications/fs/module/fs.c:1233
+#: src/applications/testbed/testbed.c:1045
+msgid "No testbed URL given, not registered.\n"
+msgstr "Chưa đưa ra URL của testbed, không đăng ký.\n"
+
+#: src/applications/testbed/testbed.c:1079
+#: src/applications/bootstrap_http/http.c:81
 #, fuzzy, c-format
-msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
-msgstr "'%s' đăng ký trình điều khiển máy khách %d %d %d %d %d %d %d %d %d\n"
+msgid "Invalid URL `%s' (must begin with `%s')\n"
+msgstr "URL sai '%s' (phải bắt đầu với '%s')\n"
 
-#: src/applications/fs/module/fs.c:1270
-msgid "enables (anonymous) file-sharing"
+#: src/applications/testbed/testbed.c:1118
+#, fuzzy, c-format
+msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
+msgstr "URL http lỗi: '%s' tại '%s'.  Chưa đăng ký máy khách testbed.\n"
+
+#: src/applications/testbed/testbed.c:1154
+#, fuzzy, c-format
+msgid "Could not register testbed, host `%s' unknown\n"
+msgstr "Không đăng ký được testbed, máy '%s' không rõ\n"
+
+#: src/applications/testbed/testbed.c:1177
+#, fuzzy, c-format
+msgid "Failed to send HTTP request to host `%s': %s\n"
+msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
+
+#: src/applications/testbed/testbed.c:1230
+#, fuzzy, c-format
+msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
+msgstr "Gửi yêu cầu HTTP '%s' tới máy '%s' không thành công: %s\n"
+
+#: src/applications/testbed/testbed.c:1269
+msgid "Exit register (error: no http response read).\n"
+msgstr "Thoát trình đăng ký (lỗi: không đọc được câu trả lời http).\n"
+
+#: src/applications/testbed/testbed.c:1357
+msgid "allows construction of a P2P-testbed (incomplete)"
 msgstr ""
 
-#: src/applications/fs/module/migration.c:224
-msgid "# blocks migrated"
+#: src/applications/transport/transport.c:483
+#: src/applications/transport/transport.c:491
+#, c-format
+msgid "No transport of type %d known.\n"
+msgstr "Không biết đến giao thông dạng %d.\n"
+
+#: src/applications/transport/transport.c:676
+#, fuzzy, c-format
+msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
 msgstr ""
+"Chưa đặt tùy chọn '%s' trong phần '%s' của cấu hình, đang đặt thành %dm.\n"
 
-#: src/applications/fs/module/migration.c:225
-msgid "# on-demand block migration attempts"
+#: src/applications/transport/transport.c:691
+#, fuzzy, c-format
+msgid ""
+"You should specify at least one transport service under option `%s' in "
+"section `%s'.\n"
 msgstr ""
+"Người dùng phải chỉ ra ít nhất một dịch vụ giao thông dưới tùy chọn '%s' "
+"trong phần '%s'.\n"
 
-#: src/applications/fs/module/ondemand.c:305
+#: src/applications/transport/transport.c:717
 #, fuzzy, c-format
-msgid "Indexed file disappeared, deleting block for query `%s'\n"
-msgstr "Tập tin đã đánh chỉ mục biến mất, đang xóa khối cho yêu cầu '%s'\n"
+msgid "Transport library `%s' did not provide required function '%s%s'.\n"
+msgstr "Thư viện giao thông '%s' không cung cấp chức năng yêu cầu '%s%s'.\n"
 
-#: src/applications/fs/module/ondemand.c:393
+#: src/applications/transport/transport.c:738
 #, fuzzy, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Tôi là một đầu peer '%s'.\n"
+
+#: src/applications/fragmentation/fragmentation.c:557
+msgid "# messages defragmented"
+msgstr "# thông báo đã gom lại"
+
+#: src/applications/fragmentation/fragmentation.c:558
+msgid "# messages fragmented"
+msgstr "# thông báo đã phân mảnh"
+
+#: src/applications/fragmentation/fragmentation.c:559
+msgid "# fragments discarded"
+msgstr "# các mảnh bị loại bỏ"
+
+#: src/applications/fragmentation/fragmentation.c:569
+#, fuzzy, c-format
+msgid "`%s' registering handler %d\n"
+msgstr "'%s' đăng ký trình điều khiển %d\n"
+
+#: src/applications/stats/gnunet-stats.c:94
+msgid "prints supported protocol messages"
+msgstr "in các thông báo giao thức hỗ trợ"
+
+#: src/applications/stats/gnunet-stats.c:99
+msgid "Print statistics about GNUnet operations."
+msgstr "In thống kê về các thao tác của GNUnet."
+
+#: src/applications/stats/gnunet-stats.c:167
+#, c-format
+msgid "Error establishing connection with gnunetd.\n"
+msgstr "Lỗi thiết lập kết nối với gnunetd.\n"
+
+#: src/applications/stats/gnunet-stats.c:181
+#, c-format
+msgid "Error reading information from gnunetd.\n"
+msgstr "Lỗi đọc thông tin từ gnunetd.\n"
+
+#: src/applications/stats/clientapi.c:179
+msgid "Uptime (seconds)"
+msgstr "Đã chạy (giây)"
+
+#: src/applications/stats/statistics.c:206
+#, c-format
+msgid "% of allowed network load (up)"
+msgstr "% o tải mạng cho phép (lên)"
+
+#: src/applications/stats/statistics.c:208
+#, c-format
+msgid "% of allowed network load (down)"
+msgstr "% o tải mạng cho phép (xuống)"
+
+#: src/applications/stats/statistics.c:210
+#, c-format
+msgid "% of allowed cpu load"
+msgstr "% o tải cho phép của cpu"
+
+#: src/applications/stats/statistics.c:214
+msgid "# bytes of noise received"
+msgstr "# byte nhận được do nhiễu đường truyền"
+
+#: src/applications/stats/statistics.c:374
+#, fuzzy
+msgid "keeps statistics about gnunetd's operation"
+msgstr "In thống kê về các thao tác của GNUnet."
+
+#: src/applications/tbench/gnunet-tbench.c:95
+msgid "output in gnuplot format"
+msgstr "kết quả ở dạng gnuplot"
+
+#: src/applications/tbench/gnunet-tbench.c:98
+msgid "number of iterations"
+msgstr "số lần làm lại"
+
+#: src/applications/tbench/gnunet-tbench.c:100
+msgid "number of messages to use per iteration"
+msgstr "số thông báo dùng cho mỗi lần làm lại"
+
+#: src/applications/tbench/gnunet-tbench.c:102
+msgid "receiver host identifier (ENC file name)"
+msgstr "trình nhận tên máy (tên tập tin ENC)"
+
+#: src/applications/tbench/gnunet-tbench.c:104
+msgid "message size"
+msgstr "kích thước thông báo"
+
+#: src/applications/tbench/gnunet-tbench.c:106
+msgid "sleep for SPACE ms after each a message block"
+msgstr "ngủ SPACE miligiây sau mỗi khối tin nhắn"
+
+#: src/applications/tbench/gnunet-tbench.c:108
+msgid "time to wait for the completion of an iteration (in ms)"
+msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
+
+#: src/applications/tbench/gnunet-tbench.c:111
+msgid "number of messages in a message block"
+msgstr "số thông báo trong một khối tin nhắn"
+
+#: src/applications/tbench/gnunet-tbench.c:115
+msgid "Start GNUnet transport benchmarking tool."
+msgstr "Chạy công cụ kiểm tra truyền tải của GNUnet."
+
+#: src/applications/tbench/gnunet-tbench.c:225
+msgid "You must specify a receiver!\n"
+msgstr "Người dùng phải chỉ ra một trình nhận!\n"
+
+#: src/applications/tbench/gnunet-tbench.c:228
+#, fuzzy, c-format
+msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
+msgstr "Chỉ ra ID của trình nhận sai ('%s' không phải là một tên đúng).\n"
+
+#: src/applications/tbench/gnunet-tbench.c:249
+#, c-format
+msgid "Time:\n"
+msgstr "Thời gian:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:250
+#, c-format
+msgid "\tmax      %llums\n"
+msgstr "\tmax      %llu miligiây\n"
+
+#: src/applications/tbench/gnunet-tbench.c:252
+#, c-format
+msgid "\tmin      %llums\n"
+msgstr "\tmin      %llu miligiây\n"
+
+#: src/applications/tbench/gnunet-tbench.c:254
+#, c-format
+msgid "\tmean     %8.4fms\n"
+msgstr "\tý nghĩa   %8.4f miligiây\n"
+
+#: src/applications/tbench/gnunet-tbench.c:256
+#, c-format
+msgid "\tvariance %8.4fms\n"
+msgstr "\tkhác nhau %8.4f miligiây\n"
+
+#: src/applications/tbench/gnunet-tbench.c:259
+#, c-format
+msgid "Loss:\n"
+msgstr "Mất:\n"
+
+#: src/applications/tbench/gnunet-tbench.c:260
+#, c-format
+msgid "\tmax      %u\n"
+msgstr "\tmax      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:262
+#, c-format
+msgid "\tmin      %u\n"
+msgstr "\tmin      %u\n"
+
+#: src/applications/tbench/gnunet-tbench.c:264
+#, c-format
+msgid "\tmean     %8.4f\n"
+msgstr "\tý nghĩa   %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:266
+#, c-format
+msgid "\tvariance %8.4f\n"
+msgstr "\tkhác nhau %8.4f\n"
+
+#: src/applications/tbench/gnunet-tbench.c:275
+#, c-format
+msgid "Output format not known, this should not happen.\n"
+msgstr "Định dạng kết quả không rõ, điều này không nên xảy ra.\n"
+
+#: src/applications/tbench/gnunet-tbench.c:279
+#, c-format
 msgid ""
-"Because the file `%s' has been unavailable for 3 days it got removed from "
-"your share.  Please unindex files before deleting them as the index now "
-"contains invalid references!\n"
+"\n"
+"Did not receive the message from gnunetd. Is gnunetd running?\n"
 msgstr ""
-"Vì không có tập tin '%s' trong 3 ngày nên đã xóa bỏ nó khỏi chia sẻ.  Xin "
-"hãy bỏ chỉ mục các tập tin trước khi xóa chúng vì chỉ mục hiện thời chứa các "
-"liên kết sai!"
+"\n"
+"Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
-#: src/applications/fs/module/ondemand.c:419
+#: src/applications/tbench/tbenchtest.c:57
+#: src/applications/tbench/tbenchtest_udp.c:57
+#, 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:84
+#: src/applications/tbench/tbenchtest_udp.c:84
+#, 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
+#: src/applications/tbench/tbenchtest_udp.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
+#: src/applications/tbench/tbenchtest_udp.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:211
+#: src/applications/tbench/tbenchtest_udp.c:213
+#, c-format
+msgid "Running benchmark...\n"
+msgstr "Đang chạy thử mức độ (benchmark)...\n"
+
+#: src/applications/tbench/tbench.c:448
+msgid "allows profiling of direct peer-to-peer connections"
+msgstr ""
+
+#: src/applications/tracekit/gnunet-tracekit.c:101
+msgid "probe network to the given DEPTH"
+msgstr "thử mạng tới độ sâu DEPTH đưa ra"
+
+#: src/applications/tracekit/gnunet-tracekit.c:103
+msgid ""
+"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+msgstr ""
+"chỉ ra định dạng kết quả; 0 - dạng người dùng dễ đọc, 1 - dấu chấm, 2 - vcg"
+
+#: src/applications/tracekit/gnunet-tracekit.c:107
+msgid "use PRIO for the priority of the trace request"
+msgstr "dùng PRIO làm ưu tiên của yêu cầu theo dấu vết trace"
+
+#: src/applications/tracekit/gnunet-tracekit.c:110
+msgid "wait DELAY seconds for replies"
+msgstr "chờ các câu trả lời DELAY giây"
+
+#: src/applications/tracekit/gnunet-tracekit.c:114
+msgid "Trace GNUnet network topology."
+msgstr "Theo dấu vết trace hình học của mạng GNUnet."
+
+#: src/applications/tracekit/gnunet-tracekit.c:222
 #, fuzzy, c-format
+msgid "`%s' is not connected to any peer.\n"
+msgstr "'%s' chưa kết nối tới bất kỳ đầu peer nào.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:233
+#, c-format
 msgid ""
-"Configuration file must specify directory for storage of FS data in section `"
-"%s' under `%s'.\n"
+"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
+"vcg.\n"
 msgstr ""
-"Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu FS trong phần '%s' dưới "
-"'%s'.\n"
+"Định dạng bị sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm, 2 cho vcg.\n"
 
-#: src/applications/fs/module/ondemand.c:617
+#: src/applications/tracekit/gnunet-tracekit.c:260
 #, fuzzy, c-format
+msgid "`%s' connected to `%s'.\n"
+msgstr "'%s' kết nối tới '%s'.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:275
+#, c-format
+msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
+msgstr "Định dạng sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:298
+#, fuzzy, c-format
+msgid "Peer `%s' did not report back.\n"
+msgstr "Đầu peer '%s' chưa báo cáo lại.\n"
+
+#: src/applications/tracekit/gnunet-tracekit.c:387
+msgid "Could not send request to gnunetd.\n"
+msgstr "Không gửi được yêu cầu tới gnunetd.\n"
+
+#: src/applications/tracekit/tracekit.c:62
+#: src/applications/tracekit/tracekit.c:186
+#, fuzzy, c-format
+msgid "Received invalid `%s' message from `%s'.\n"
+msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
+
+#: src/applications/tracekit/tracekit.c:243
+msgid "TRACEKIT: routing table full, trace request dropped\n"
+msgstr "TRACEKIT: bảng định tuyến đầy, bỏ đi yêu cầu theo vết trace\n"
+
+#: src/applications/tracekit/tracekit.c:331
+#, fuzzy, c-format
+msgid "TRACEKIT: received invalid `%s' message\n"
+msgstr "TRACEKIT: nhận được thông báo sai '%s'\n"
+
+#: src/applications/tracekit/tracekit.c:431
+#, fuzzy
+msgid "allows mapping of the network topology"
+msgstr "Theo dấu vết trace hình học của mạng GNUnet."
+
+#: src/applications/gap/gap.c:1617
+#, fuzzy, c-format
+msgid "GAP received invalid content from `%s'\n"
+msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
+
+#: src/applications/gap/gap.c:1618
+msgid "myself"
+msgstr ""
+
+#: src/applications/gap/gap.c:1791
 msgid ""
-"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
-msgstr "Khối ODB đã bỏ chỉ mục '%s' từ %llu không có trong kho dữ liệu.\n"
+"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+msgstr ""
+"Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải.  Đang nhả ra "
+"yêu cầu.\n"
 
-#: src/applications/fs/module/anonymity.c:65 src/applications/gap/gap.c:1802
+#: src/applications/gap/gap.c:1802 src/applications/fs/module/anonymity.c:65
 msgid "Failed to get traffic stats.\n"
 msgstr "Lấy các thông tin truyền tải không thành công.\n"
 
+#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
+#: src/applications/gap/gap.c:1819
+msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
+msgstr "Không thể thỏa mãn mức độ dấu tên mong muốn, đang lờ đi yêu cầu.\n"
+
+#: src/applications/gap/gap.c:2077
+#, fuzzy
+msgid "# gap requests total received"
+msgstr "# nhận được yêu cầu theo vết trace p2p"
+
+#: src/applications/gap/gap.c:2078
+msgid "# gap requests policy: immediate drop"
+msgstr ""
+
+#: src/applications/gap/gap.c:2079
+msgid "# gap requests policy: not routed"
+msgstr ""
+
+#: src/applications/gap/gap.c:2080
+msgid "# gap requests policy: not answered"
+msgstr ""
+
+#: src/applications/gap/gap.c:2081
+msgid "# gap requests processed: attempted add to RT"
+msgstr ""
+
+#: src/applications/gap/gap.c:2082
+msgid "# gap requests processed: local result"
+msgstr ""
+
+#: src/applications/gap/gap.c:2083
+msgid "# gap routing successes (total)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2084
+msgid "# gap requests dropped: collision in RT"
+msgstr ""
+
+#: src/applications/gap/gap.c:2085
+msgid "# gap requests forwarded (counting each peer)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2086
+msgid "# gap duplicate requests (pending)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2087
+#, fuzzy
+msgid "# gap duplicate requests that were re-tried"
+msgstr "# nhận được yêu cầu theo vết trace p2p"
+
+#: src/applications/gap/gap.c:2088
+msgid "# gap re-try ttl difference (cummulative)"
+msgstr ""
+
+#: src/applications/gap/gap.c:2089
+msgid "# gap reply duplicates"
+msgstr ""
+
+#: src/applications/gap/gap.c:2090
+msgid "# gap spurious replies"
+msgstr ""
+
+#: src/applications/gap/gap.c:2091
+msgid "# gap routing slots currently in use"
+msgstr ""
+
+#: src/applications/gap/gap.c:2092
+msgid "# gap memory used for tracking seen content"
+msgstr ""
+
+#: src/applications/gap/gap.c:2093
+msgid "# gap memory used for tracking routing destinations"
+msgstr ""
+
+#: src/applications/gap/gap.c:2094
+msgid "# gap rewards pending"
+msgstr ""
+
+#: src/applications/gap/gap.c:2095
+msgid "# gap response weights"
+msgstr ""
+
+#: src/applications/gap/gap.c:2112
+msgid ""
+"Traffic service failed to load; gap cannot ensure cover-traffic "
+"availability.\n"
+msgstr ""
+"Nạp dịch vụ truyền tải không thành công; lỗ hổng không thể chắc chắn khả "
+"năng truyền tải.\n"
+
+#: src/applications/gap/gap.c:2143
+#, fuzzy, c-format
+msgid "`%s' registering handlers %d %d\n"
+msgstr "'%s' đăng ký trình điều khiển %d %d\n"
+
+#: src/applications/gap/pid_table.c:151
+msgid "# distinct interned peer IDs in pid table"
+msgstr ""
+
+#: src/applications/gap/pid_table.c:153
+msgid "# total RC of interned peer IDs in pid table"
+msgstr ""
+
+#: src/applications/getoption/getoption.c:75
+#, fuzzy, c-format
+msgid "`%s' registering client handler %d\n"
+msgstr "'%s' đăng ký trình điều khiển máy khách %d\n"
+
+#: src/applications/getoption/getoption.c:82
+#, fuzzy
+msgid "allows clients to determine gnunetd's configuration"
+msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:33
+#: src/applications/fs/tools/gnunet-insert.c:206
+msgid "set the desired LEVEL of sender-anonymity"
+msgstr "đặt LEVEL (CẤPĐỘ) mong muốn của người gửi giấu tên"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:35
+msgid "automate creation of a namespace by starting a collection"
+msgstr "tự động tạo một không gian tên bằng cách bắt đầu một thu thập"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:38
+msgid "create a new pseudonym under the given NICKNAME"
+msgstr "tạo một tên hiệu mới dưới NICKNAME đưa ra"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:40
+msgid "delete the pseudonym with the given NICKNAME"
+msgstr "xóa tên hiệu với TÊNNICK đưa ra"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:42
+msgid "end automated building of a namespace (ends collection)"
+msgstr "kết thúc việc tự động xây dựng một không gian tên (kết thúc thu thập)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:46
+msgid ""
+"use the given keyword to advertise the namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"sử dụng từ khóa đưa ra để quảng cáo không gian tên (dùng khi tạo một tên "
+"hiệu mới)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:48
+msgid ""
+"specify that the contents of the namespace are of the given MIMETYPE (use "
+"when creating a new pseudonym)"
+msgstr ""
+"cho biết rằng nội dung của không gian tên có dạng MIMETYPE (dùng khi tạo một "
+"tên hiệu mới)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:50
+msgid ""
+"do not generate an advertisement for this namespace (use when creating a new "
+"pseudonym)"
+msgstr ""
+"không tạo một quảng cáo cho không gian tên này (dùng khi tạo một tên hiệu "
+"mới)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:52
+msgid "do not list the pseudonyms from the pseudonym database"
+msgstr "không liệt kê tên hiệu từ cơ sở dữ liệu tên hiệu"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:54
+msgid ""
+"specify NAME to be the realname of the user controlling the namespace (use "
+"when creating a new pseudonym)"
+msgstr ""
+"dùng NAME làm tên thật của điều khiển không gian tên của người dùng (dùng "
+"khi tạo một tên hiệu mới)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:56
+msgid ""
+"specify IDENTIFIER to be the address of the entrypoint to content in the "
+"namespace (use when creating a new pseudonym)"
+msgstr ""
+"dùng IDENTIFIER làm địa chỉ của điểm chỉ tới nội dung trong không gian tên "
+"(dùng khi tạo một tên hiệu mới)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:58
+msgid "set the rating of a namespace"
+msgstr "đặt xếp hạng của một không gian tên"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:60
+msgid ""
+"use DESCRIPTION to describe the content of the namespace (use when creating "
+"a new pseudonym)"
+msgstr ""
+"dùng DESCRIPTION để mô tả nội dung của không gian tên (dùng khi tạo một tên "
+"hiệu mới)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:62
+msgid ""
+"specify the given URI as an address that contains more information about the "
+"namespace (use when creating a new pseudonym)"
+msgstr ""
+"dùng URI đưa ra làm địa chỉ chứa thêm thông tin về không gian tên (dùng khi "
+"tạo một tên hiệu mới)"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:67
+msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+msgstr "Tạo tên hiệu mới, xóa tên hiệu hoặc liệt kê các tên hiệu có."
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:159
+#: src/applications/fs/tools/gnunet-pseudonym.c:164
+#: src/applications/fs/fsui/searchtest.c:143
+#: src/applications/fs/fsui/fsuitest.c:167
+#: src/applications/fs/fsui/downloadtest.c:239
+#: src/applications/fs/fsui/helper.c:116 src/applications/fs/fsui/helper.c:121
+#: src/applications/fs/fsui/helper.c:124 src/applications/fs/fsui/helper.c:128
+msgid "AND"
+msgstr "VÀ"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:239
+#, fuzzy, c-format
+msgid "Invalid argument: `%s'\n"
+msgstr "Tham số sai: '%s'\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:241
+#: src/server/gnunet-transport-check.c:532 src/server/gnunet-peer-info.c:118
+#: src/setup/gnunet-setup.c:179
+msgid "Invalid arguments. Exiting.\n"
+msgstr "Tham số sai. Đang thoát.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:282
+#, fuzzy, c-format
+msgid "Namespace `%s' has rating %d.\n"
+msgstr "Không gian tên '%s' có xếp hạng %d.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:286
+#, fuzzy, c-format
+msgid "Namespace `%s' (%s) has rating %d.\n"
+msgstr "Không gian tên '%s' (%s) có xếp hạng %d.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:319
+#, c-format
+msgid "\tRating (after update): %d\n"
+msgstr "\tXếp hạng (sau cập nhật): %d\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:359
+#, c-format
+msgid "Collection stopped.\n"
+msgstr "Dừng thu thập.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:361
+#, c-format
+msgid "Failed to stop collection (not active?).\n"
+msgstr "Dừng thu thập không thành công (không hoạt động?).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:369
+#, fuzzy, c-format
+msgid "Pseudonym `%s' deleted.\n"
+msgstr "Đã xóa tên hiệu '%s'.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:373
+#, fuzzy, c-format
+msgid "Error deleting pseudonym `%s' (does not exist?).\n"
+msgstr "Lỗi xóa tên hiệu '%s' (không tồn tại?).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:426
+#, fuzzy, c-format
+msgid "Started collection `%s'.\n"
+msgstr "Bắt đầu thu thập '%s'.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:429
+#, c-format
+msgid "Failed to start collection.\n"
+msgstr "Bắt đầu thu thập không thành công.\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:473
+#, fuzzy, c-format
+msgid "Could not create namespace `%s' (exists?).\n"
+msgstr "Không tạo được không gian tên '%s' (đã có?).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:478
+#, fuzzy, c-format
+msgid "Namespace `%s' created (root: %s).\n"
+msgstr "Đã tạo không gian tên '%s' (gốc: %s).\n"
+
+#: src/applications/fs/tools/gnunet-pseudonym.c:504
+#, c-format
+msgid "Could not access namespace information.\n"
+msgstr "Không truy cập được thông tin của không gian tên.\n"
+
 #: src/applications/fs/tools/gnunet-delete.c:37
 #, c-format
 msgid "%8u of %8u bytes deleted."
@@ -878,62 +1984,6 @@
 msgid "Listed %d matching entries.\n"
 msgstr "Đã liệt kê %d mục tương ứng.\n"
 
-#: src/applications/fs/tools/gnunet-download.c:41
-msgid "LEVEL"
-msgstr "CẤPĐỘ"
-
-#: src/applications/fs/tools/gnunet-download.c:42
-#: src/applications/fs/tools/gnunet-search.c:108
-msgid "set the desired LEVEL of receiver-anonymity"
-msgstr "đặt CẤPĐỘ mong muốn của người nhận giấu tên"
-
-#: src/applications/fs/tools/gnunet-download.c:47
-msgid "FILENAME"
-msgstr "TÊNTẬPTIN"
-
-#: src/applications/fs/tools/gnunet-download.c:48
-msgid "write the file to FILENAME"
-msgstr "ghi tập tin vào TÊNTẬPTIN"
-
-#: src/applications/fs/tools/gnunet-download.c:50
-msgid "download a GNUnet directory recursively"
-msgstr "tải xuống đệ quy một thư mục GNUnet"
-
-#: src/applications/fs/tools/gnunet-download.c:56
-msgid "Download files from GNUnet."
-msgstr "Tải tập tin từ GNUnet."
-
-#: src/applications/fs/tools/gnunet-download.c:136
-msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-msgstr "Không đủ tham số. Người dùng phải chỉ ra một URI tập tin của GNUnet\n"
-
-#: src/applications/fs/tools/gnunet-download.c:159
-#, fuzzy, c-format
-msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f kbps)\n"
-msgstr "Tải xuống tập tin '%s' tại %16llu vượt quá %16llu byte (%8.3f kbps)\n"
-
-#: src/applications/fs/tools/gnunet-download.c:172
-#: src/applications/fs/tools/gnunet-download.c:183
-#, c-format
-msgid "Error downloading: %s\n"
-msgstr "Lỗi tải xuống: %s\n"
-
-#: src/applications/fs/tools/gnunet-download.c:191
-#, fuzzy, c-format
-msgid "Download of file `%s' complete.  Speed was %8.3f kilobyte per second.\n"
-msgstr ""
-"Hoàn thành tải xuống tập tin '%s'.  Tốc độ là %8.3f kilô byte một giây.\n"
-
-#: src/applications/fs/tools/gnunet-download.c:237
-#, fuzzy, c-format
-msgid "URI `%s' invalid for gnunet-download.\n"
-msgstr "Sai URI '%s' cho gnunet-download.\n"
-
-#: src/applications/fs/tools/gnunet-download.c:288
-#, fuzzy, c-format
-msgid "File stored as `%s'.\n"
-msgstr "Tập tin chứa với tên '%s'.\n"
-
 #: src/applications/fs/tools/gnunet-insert.c:110
 #, fuzzy, c-format
 msgid "Created entry `%s' in namespace `%s'\n"
@@ -951,12 +2001,12 @@
 
 #: src/applications/fs/tools/gnunet-insert.c:150
 #, fuzzy, c-format
-msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
+msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr "Hoàn thành tải lên '%s', %llu byte trong %llu giây (%8.3f kbps).\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:164
 #, fuzzy, c-format
-msgid "Upload of `%s' complete, current average speed is %8.3f kbps.\n"
+msgid "Upload of `%s' complete, current average speed is %8.3f KiB/s.\n"
 msgstr "Hoàn thành tải lên '%s', tốc độ trung bình hiện thời là %8.3f kbps.\n"
 
 #: src/applications/fs/tools/gnunet-insert.c:174
@@ -973,11 +2023,6 @@
 "\n"
 "Lỗi tải lên tập tin: %s\n"
 
-#: src/applications/fs/tools/gnunet-insert.c:206
-#: src/applications/fs/tools/gnunet-pseudonym.c:33
-msgid "set the desired LEVEL of sender-anonymity"
-msgstr "đặt LEVEL (CẤPĐỘ) mong muốn của người gửi giấu tên"
-
 #: src/applications/fs/tools/gnunet-insert.c:209
 msgid ""
 "even if gnunetd is running on the local machine, force the creation of a "
@@ -1134,161 +2179,11 @@
 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-pseudonym.c:35
-msgid "automate creation of a namespace by starting a collection"
-msgstr "tự động tạo một không gian tên bằng cách bắt đầu một thu thập"
+#: src/applications/fs/tools/gnunet-search.c:108
+#: src/applications/fs/tools/gnunet-download.c:42
+msgid "set the desired LEVEL of receiver-anonymity"
+msgstr "đặt CẤPĐỘ mong muốn của người nhận giấu tên"
 
-#: src/applications/fs/tools/gnunet-pseudonym.c:38
-msgid "create a new pseudonym under the given NICKNAME"
-msgstr "tạo một tên hiệu mới dưới NICKNAME đưa ra"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:40
-msgid "delete the pseudonym with the given NICKNAME"
-msgstr "xóa tên hiệu với TÊNNICK đưa ra"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:42
-msgid "end automated building of a namespace (ends collection)"
-msgstr "kết thúc việc tự động xây dựng một không gian tên (kết thúc thu thập)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:46
-msgid ""
-"use the given keyword to advertise the namespace (use when creating a new "
-"pseudonym)"
-msgstr ""
-"sử dụng từ khóa đưa ra để quảng cáo không gian tên (dùng khi tạo một tên "
-"hiệu mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:48
-msgid ""
-"specify that the contents of the namespace are of the given MIMETYPE (use "
-"when creating a new pseudonym)"
-msgstr ""
-"cho biết rằng nội dung của không gian tên có dạng MIMETYPE (dùng khi tạo một "
-"tên hiệu mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:50
-msgid ""
-"do not generate an advertisement for this namespace (use when creating a new "
-"pseudonym)"
-msgstr ""
-"không tạo một quảng cáo cho không gian tên này (dùng khi tạo một tên hiệu "
-"mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:52
-msgid "do not list the pseudonyms from the pseudonym database"
-msgstr "không liệt kê tên hiệu từ cơ sở dữ liệu tên hiệu"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:54
-msgid ""
-"specify NAME to be the realname of the user controlling the namespace (use "
-"when creating a new pseudonym)"
-msgstr ""
-"dùng NAME làm tên thật của điều khiển không gian tên của người dùng (dùng "
-"khi tạo một tên hiệu mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:56
-msgid ""
-"specify IDENTIFIER to be the address of the entrypoint to content in the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"dùng IDENTIFIER làm địa chỉ của điểm chỉ tới nội dung trong không gian tên "
-"(dùng khi tạo một tên hiệu mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:58
-msgid "set the rating of a namespace"
-msgstr "đặt xếp hạng của một không gian tên"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:60
-msgid ""
-"use DESCRIPTION to describe the content of the namespace (use when creating "
-"a new pseudonym)"
-msgstr ""
-"dùng DESCRIPTION để mô tả nội dung của không gian tên (dùng khi tạo một tên "
-"hiệu mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:62
-msgid ""
-"specify the given URI as an address that contains more information about the "
-"namespace (use when creating a new pseudonym)"
-msgstr ""
-"dùng URI đưa ra làm địa chỉ chứa thêm thông tin về không gian tên (dùng khi "
-"tạo một tên hiệu mới)"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:67
-msgid "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
-msgstr "Tạo tên hiệu mới, xóa tên hiệu hoặc liệt kê các tên hiệu có."
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:239
-#, fuzzy, c-format
-msgid "Invalid argument: `%s'\n"
-msgstr "Tham số sai: '%s'\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:241
-#: src/conf/gnunet-setup.c:179 src/server/gnunet-peer-info.c:118
-#: src/server/gnunet-transport-check.c:532
-msgid "Invalid arguments. Exiting.\n"
-msgstr "Tham số sai. Đang thoát.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:282
-#, fuzzy, c-format
-msgid "Namespace `%s' has rating %d.\n"
-msgstr "Không gian tên '%s' có xếp hạng %d.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:286
-#, fuzzy, c-format
-msgid "Namespace `%s' (%s) has rating %d.\n"
-msgstr "Không gian tên '%s' (%s) có xếp hạng %d.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:319
-#, c-format
-msgid "\tRating (after update): %d\n"
-msgstr "\tXếp hạng (sau cập nhật): %d\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:359
-#, c-format
-msgid "Collection stopped.\n"
-msgstr "Dừng thu thập.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:361
-#, c-format
-msgid "Failed to stop collection (not active?).\n"
-msgstr "Dừng thu thập không thành công (không hoạt động?).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:369
-#, fuzzy, c-format
-msgid "Pseudonym `%s' deleted.\n"
-msgstr "Đã xóa tên hiệu '%s'.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:373
-#, fuzzy, c-format
-msgid "Error deleting pseudonym `%s' (does not exist?).\n"
-msgstr "Lỗi xóa tên hiệu '%s' (không tồn tại?).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:426
-#, fuzzy, c-format
-msgid "Started collection `%s'.\n"
-msgstr "Bắt đầu thu thập '%s'.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:429
-#, c-format
-msgid "Failed to start collection.\n"
-msgstr "Bắt đầu thu thập không thành công.\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:473
-#, fuzzy, c-format
-msgid "Could not create namespace `%s' (exists?).\n"
-msgstr "Không tạo được không gian tên '%s' (đã có?).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:478
-#, fuzzy, c-format
-msgid "Namespace `%s' created (root: %s).\n"
-msgstr "Đã tạo không gian tên '%s' (gốc: %s).\n"
-
-#: src/applications/fs/tools/gnunet-pseudonym.c:504
-#, c-format
-msgid "Could not access namespace information.\n"
-msgstr "Không truy cập được thông tin của không gian tên.\n"
-
 #: src/applications/fs/tools/gnunet-search.c:114
 msgid "exit after receiving LIMIT results"
 msgstr "thoát sau khi nhận được kết quả GIỚIHẠN"
@@ -1319,6 +2214,57 @@
 msgid "Error converting arguments to URI!\n"
 msgstr "Lỗi chuyển đổi tham số tới URI!\n"
 
+#: src/applications/fs/tools/gnunet-download.c:41
+msgid "LEVEL"
+msgstr "CẤPĐỘ"
+
+#: src/applications/fs/tools/gnunet-download.c:47
+msgid "FILENAME"
+msgstr "TÊNTẬPTIN"
+
+#: src/applications/fs/tools/gnunet-download.c:48
+msgid "write the file to FILENAME"
+msgstr "ghi tập tin vào TÊNTẬPTIN"
+
+#: src/applications/fs/tools/gnunet-download.c:50
+msgid "download a GNUnet directory recursively"
+msgstr "tải xuống đệ quy một thư mục GNUnet"
+
+#: src/applications/fs/tools/gnunet-download.c:56
+msgid "Download files from GNUnet."
+msgstr "Tải tập tin từ GNUnet."
+
+#: src/applications/fs/tools/gnunet-download.c:136
+msgid "Not enough arguments. You must specify a GNUnet file URI\n"
+msgstr "Không đủ tham số. Người dùng phải chỉ ra một URI tập tin của GNUnet\n"
+
+#: src/applications/fs/tools/gnunet-download.c:159
+#, fuzzy, c-format
+msgid "Download of file `%s' at %16llu out of %16llu bytes (%8.3f KiB/s)\n"
+msgstr "Tải xuống tập tin '%s' tại %16llu vượt quá %16llu byte (%8.3f kbps)\n"
+
+#: src/applications/fs/tools/gnunet-download.c:172
+#: src/applications/fs/tools/gnunet-download.c:183
+#, c-format
+msgid "Error downloading: %s\n"
+msgstr "Lỗi tải xuống: %s\n"
+
+#: src/applications/fs/tools/gnunet-download.c:191
+#, fuzzy, c-format
+msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
+msgstr ""
+"Hoàn thành tải xuống tập tin '%s'.  Tốc độ là %8.3f kilô byte một giây.\n"
+
+#: src/applications/fs/tools/gnunet-download.c:237
+#, fuzzy, c-format
+msgid "URI `%s' invalid for gnunet-download.\n"
+msgstr "Sai URI '%s' cho gnunet-download.\n"
+
+#: src/applications/fs/tools/gnunet-download.c:288
+#, fuzzy, c-format
+msgid "File stored as `%s'.\n"
+msgstr "Tập tin chứa với tên '%s'.\n"
+
 #: src/applications/fs/tools/gnunet-unindex.c:50
 #, c-format
 msgid ""
@@ -1332,7 +2278,7 @@
 #, fuzzy, c-format
 msgid ""
 "\n"
-"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f kbps).\n"
+"Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 msgstr ""
 "\n"
 "Hoàn thành bỏ chỉ mục của '%s', %llu byte sau %llu giây (%8.3f kbps).\n"
@@ -1360,1966 +2306,1504 @@
 msgid "`%s' failed.  Is `%s' a file?\n"
 msgstr "'%s' thất bại.  '%s' là một tập tin?\n"
 
-#: src/applications/gap/gap.c:1617
+#: src/applications/fs/module/ondemand.c:305
 #, fuzzy, c-format
-msgid "GAP received invalid content from `%s'\n"
-msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
+msgid "Indexed file disappeared, deleting block for query `%s'\n"
+msgstr "Tập tin đã đánh chỉ mục biến mất, đang xóa khối cho yêu cầu '%s'\n"
 
-#: src/applications/gap/gap.c:1618
-msgid "myself"
+#: src/applications/fs/module/ondemand.c:393
+#, fuzzy, c-format
+msgid ""
+"Because the file `%s' has been unavailable for 3 days it got removed from "
+"your share.  Please unindex files before deleting them as the index now "
+"contains invalid references!\n"
 msgstr ""
+"Vì không có tập tin '%s' trong 3 ngày nên đã xóa bỏ nó khỏi chia sẻ.  Xin "
+"hãy bỏ chỉ mục các tập tin trước khi xóa chúng vì chỉ mục hiện thời chứa các "
+"liên kết sai!"
 
-#: src/applications/gap/gap.c:1791
+#: src/applications/fs/module/ondemand.c:419
+#, fuzzy, c-format
 msgid ""
-"Cover traffic requested but traffic service not loaded.  Rejecting request.\n"
+"Configuration file must specify directory for storage of FS data in section `"
+"%s' under `%s'.\n"
 msgstr ""
-"Đã yêu cầu che truyền tải nhưng chưa nạp dịch vụ truyền tải.  Đang nhả ra "
-"yêu cầu.\n"
+"Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu FS trong phần '%s' dưới "
+"'%s'.\n"
 
-#: src/applications/gap/gap.c:1808 src/applications/gap/gap.c:1813
-#: src/applications/gap/gap.c:1819
-msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
-msgstr "Không thể thỏa mãn mức độ dấu tên mong muốn, đang lờ đi yêu cầu.\n"
+#: src/applications/fs/module/ondemand.c:617
+#, fuzzy, c-format
+msgid ""
+"Unindexed ODB block `%s' from offset %llu already missing from datastore.\n"
+msgstr "Khối ODB đã bỏ chỉ mục '%s' từ %llu không có trong kho dữ liệu.\n"
 
-#: src/applications/gap/gap.c:2077
-#, fuzzy
-msgid "# gap requests total received"
-msgstr "# nhận được yêu cầu theo vết trace p2p"
-
-#: src/applications/gap/gap.c:2078
-msgid "# gap requests policy: immediate drop"
+#: src/applications/fs/module/fs.c:1184
+#, fuzzy, c-format
+msgid ""
+"You must specify a postive number for `%s' in the configuration in section `%"
+"s'.\n"
 msgstr ""
+"Người dùng phải chỉ ra một số dương cho '%s' trong phần '%s' của cấu hình.\n"
 
-#: src/applications/gap/gap.c:2079
-msgid "# gap requests policy: not routed"
-msgstr ""
+#: src/applications/fs/module/fs.c:1233
+#, fuzzy, c-format
+msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d %d\n"
+msgstr "'%s' đăng ký trình điều khiển máy khách %d %d %d %d %d %d %d %d %d\n"
 
-#: src/applications/gap/gap.c:2080
-msgid "# gap requests policy: not answered"
+#: src/applications/fs/module/fs.c:1270
+msgid "enables (anonymous) file-sharing"
 msgstr ""
 
-#: src/applications/gap/gap.c:2081
-msgid "# gap requests processed: attempted add to RT"
+#: src/applications/fs/module/migration.c:224
+msgid "# blocks migrated"
 msgstr ""
 
-#: src/applications/gap/gap.c:2082
-msgid "# gap requests processed: local result"
+#: src/applications/fs/module/migration.c:225
+msgid "# on-demand block migration attempts"
 msgstr ""
 
-#: src/applications/gap/gap.c:2083
-msgid "# gap routing successes (total)"
+#: src/applications/fs/fsui/namespace_info.c:583
+msgid "Publication interval for periodic publication changed."
 msgstr ""
+"Đã thay đổi khoảng thời gian giữa các lần đưa ra chia sẻ cho chia sẻ định kỳ."
 
-#: src/applications/gap/gap.c:2084
-msgid "# gap requests dropped: collision in RT"
+#: src/applications/fs/fsui/namespace_info.c:604
+msgid ""
+"Publishing update for periodically updated content more than a week ahead of "
+"schedule.\n"
 msgstr ""
+"Đang đưa ra các cập nhật cho nội dung cập nhật thường xuyên trước một tuần "
+"so với lịch.\n"
 
-#: src/applications/gap/gap.c:2085
-msgid "# gap requests forwarded (counting each peer)"
-msgstr ""
+#: src/applications/fs/fsui/search.c:245
+msgid "This search is already pending!\n"
+msgstr "Tìm kiếm này đang chờ đợi!\n"
 
-#: src/applications/gap/gap.c:2086
-msgid "# gap duplicate requests (pending)"
-msgstr ""
+#: src/applications/fs/fsui/fsui.c:189
+msgid "FSUI persistence: error restoring download\n"
+msgstr "FSUI: lỗi phục hồi tải xuống\n"
 
-#: src/applications/gap/gap.c:2087
+#: src/applications/fs/fsui/fsui.c:638
+#, fuzzy, c-format
+msgid "FSUI state file `%s' had syntax error at offset %u.\n"
+msgstr "Tập tin trạng thái FSUI '%s' có lỗi cú pháp tại vùng %u.\n"
+
+#: src/applications/fs/fsui/download.c:290
+msgid "Download aborted."
+msgstr "Dừng tải xuống."
+
+#: src/applications/fs/fsui/download.c:294
+msgid "ECRS download failed (see logs)."
+msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
+
+#: src/applications/fs/fsui/download.c:298
 #, fuzzy
-msgid "# gap duplicate requests that were re-tried"
-msgstr "# nhận được yêu cầu theo vết trace p2p"
+msgid "ECRS download suspending."
+msgstr "Tải xuống ECRS thất bại (hãy xem các bản ghi log)."
 
-#: src/applications/gap/gap.c:2088
-msgid "# gap re-try ttl difference (cummulative)"
+#: src/applications/fs/fsui/download.c:302
+msgid "Unexpected download state."
 msgstr ""
 
-#: src/applications/gap/gap.c:2089
-msgid "# gap reply duplicates"
-msgstr ""
+#: src/applications/fs/fsui/unindex.c:85
+#, fuzzy
+msgid "Unindex failed."
+msgstr "Bỏ đánh chỉ mục thất bại.\n"
 
-#: src/applications/gap/gap.c:2090
-msgid "# gap spurious replies"
-msgstr ""
+#: src/applications/fs/fsui/helper.c:67
+msgid "No keywords specified!\n"
+msgstr "Chưa chỉ ra từ khóa!\n"
 
-#: src/applications/gap/gap.c:2091
-msgid "# gap routing slots currently in use"
-msgstr ""
+#: src/applications/fs/fsui/upload.c:276 src/applications/fs/fsui/upload.c:411
+#: src/applications/fs/fsui/upload.c:448
+#, fuzzy
+msgid "Upload failed."
+msgstr "Tải lên thất bại.\n"
 
-#: src/applications/gap/gap.c:2092
-msgid "# gap memory used for tracking seen content"
-msgstr ""
+#: src/applications/fs/fsui/upload.c:455
+#, fuzzy
+msgid "Cannot upload directory without using recursion."
+msgstr "Không tải lên được thư mục khi không dùng đệ quy.\n"
 
-#: src/applications/gap/gap.c:2093
-msgid "# gap memory used for tracking routing destinations"
-msgstr ""
+#: src/applications/fs/fsui/file_info.c:93
+msgid "Collecting file identifiers disabled.\n"
+msgstr "Tắt bỏ thu thập tên tập tin.\n"
 
-#: src/applications/gap/gap.c:2094
-msgid "# gap rewards pending"
+#: src/applications/fs/fsui/file_info.c:282
+#, c-format
+msgid "Deleted corrupt URI database in `%s'."
 msgstr ""
 
-#: src/applications/gap/gap.c:2095
-msgid "# gap response weights"
-msgstr ""
+#: src/applications/fs/ecrs/search.c:160
+msgid "CHK URI not allowed for search.\n"
+msgstr "Không cho phép tìm kiếm CHK URI.\n"
 
-#: src/applications/gap/gap.c:2112
-msgid ""
-"Traffic service failed to load; gap cannot ensure cover-traffic "
-"availability.\n"
-msgstr ""
-"Nạp dịch vụ truyền tải không thành công; lỗ hổng không thể chắc chắn khả "
-"năng truyền tải.\n"
+#: src/applications/fs/ecrs/search.c:216
+msgid "LOC URI not allowed for search.\n"
+msgstr "Không cho phép tìm kiếm LOC URI.\n"
 
-#: src/applications/gap/gap.c:2143
+#: src/applications/fs/ecrs/download.c:125
 #, fuzzy, c-format
-msgid "`%s' registering handlers %d %d\n"
-msgstr "'%s' đăng ký trình điều khiển %d %d\n"
+msgid "Could not unlink temporary file `%s': %s\n"
+msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
 
-#: src/applications/getoption/getoption.c:75
+#: src/applications/fs/ecrs/download.c:257
 #, fuzzy, c-format
-msgid "`%s' registering client handler %d\n"
-msgstr "'%s' đăng ký trình điều khiển máy khách %d\n"
+msgid "Write(%d, %p, %d) failed: %s\n"
+msgstr "'%s' %s không thành công: %s\n"
 
-#: src/applications/getoption/getoption.c:82
-#, fuzzy
-msgid "allows clients to determine gnunetd's configuration"
-msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
-
-#: src/applications/identity/hostkey.c:119
-#, fuzzy, c-format
+#: src/applications/fs/ecrs/download.c:935
 msgid ""
-"Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+"Decrypted content does not match key. This is either a bug or a maliciously "
+"inserted file. Download aborted.\n"
 msgstr ""
-"Kiểm tra chìa khóa máy có trong '%s' không thành công, đang tạo chìa khóa "
-"máy mới.\n"
+"Nội dung đã giải mã không tương ứng chìa khóa. Đây là một lỗi bug hoặc một "
+"tập tin chèn vào với ý xấu. Dừng tải xuống.\n"
 
-#: src/applications/identity/hostkey.c:127
-msgid "Creating new hostkey (this may take a while).\n"
-msgstr "Đang tạo chìa khóa máy mới (có thể cần một chút thời gian).\n"
-
-#: src/applications/identity/hostkey.c:130
-msgid "Could not create hostkey!\n"
-msgstr "Không tạo được chìa khóa máy!\n"
-
-#: src/applications/identity/hostkey.c:139
-msgid "Done creating hostkey.\n"
-msgstr "Đã tạo xong chìa khóa máy.\n"
-
-#: src/applications/identity/identity.c:329
+#: src/applications/fs/ecrs/download.c:1112
 #, fuzzy, c-format
 msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"Tập tin '%s' trong thư mục '%s' không tương ứng quy ước tên. Đã xóa bỏ.\n"
+"Content `%s' seems to be not available on the network (tried %u times).\n"
+msgstr "Nội dung '%s' có vẻ không có trên mạng.\n"
 
-#: src/applications/identity/identity.c:362
+#: src/applications/fs/ecrs/upload.c:180
 #, fuzzy, c-format
-msgid "%s `%s' returned no known hosts!\n"
-msgstr "%s '%s' không trả lại máy biết đến!\n"
+msgid "`%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/identity/identity.c:644
-#: src/applications/identity/identity.c:662
+#: src/applications/fs/ecrs/upload.c:186
 #, fuzzy, c-format
-msgid "Removed file `%s' containing invalid hello data.\n"
-msgstr "Xóa bỏ tập tin '%s' chứa dữ liệu HELO sai.\n"
+msgid "Cannot get size of file `%s'"
+msgstr "Không mở được tập tin cấu hình '%s'\n"
 
-#: src/applications/identity/identity.c:712
+#: src/applications/fs/ecrs/upload.c:193
+#, fuzzy
+msgid "Failed to connect to gnunetd."
+msgstr "Kết nối tới gnunetd không thành công.\n"
+
+#: src/applications/fs/ecrs/upload.c:203
 #, fuzzy, c-format
-msgid "Signature failed verification: peer `%s' not known.\n"
-msgstr ""
-"Không mã hóa được chìa khóa buổi làm việc, không biết đến đầu peer khác!\n"
+msgid "Cannot hash `%s'.\n"
+msgstr "Không hash được '%s'.\n"
 
-#: src/applications/identity/identity.c:720
-#, fuzzy
-msgid "Signature failed verification: signature invalid.\n"
-msgstr "Thông báo HELO sai (sai chữ ký).\n"
+#: src/applications/fs/ecrs/upload.c:221
+#, 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/pingpong/pingpong.c:120
-#: src/applications/pingpong/pingpong.c:179
-#: src/applications/pingpong/pingpong.c:227
-#: src/applications/pingpong/pingpong.c:292
+#: src/applications/fs/ecrs/upload.c:227
 #, fuzzy, c-format
-msgid "Received malformed `%s' message. Dropping.\n"
-msgstr "Nhận được thông báo '%s' hỏng. Đang bỏ đi.\n"
+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/pingpong/pingpong.c:130
-msgid "Received ping for another peer. Dropping.\n"
-msgstr "Nhận được ping cho đầu peer khác. Đang bỏ đi.\n"
+#: src/applications/fs/ecrs/upload.c:306
+#, c-format
+msgid "Indexing data failed at position %i.\n"
+msgstr "Đánh chỉ mục dữ liệu thất bại tại vị trí %i.\n"
 
-#: src/applications/pingpong/pingpong.c:187
-msgid "Received PING not destined for us!\n"
-msgstr "Nhận được PING không dành cho chúng ta!\n"
+#: src/applications/fs/ecrs/meta.c:842
+#, fuzzy, c-format
+msgid "Renaming of file `%s' to `%s' failed: %s\n"
+msgstr "Đổi tên tập tin '%s' thành '%s' thất bại: %s\n"
 
-#: src/applications/pingpong/pingpong.c:267
-#: src/applications/pingpong/pingpong.c:325
+#: src/applications/fs/ecrs/meta.c:850
+#, fuzzy, c-format
+msgid "Could not rename file `%s' to `%s': file exists\n"
+msgstr "Không đổi tên được tập tin '%s' thành '%s': tập tin tồn tại\n"
+
+#: src/applications/fs/ecrs/namespace.c:45
+#, c-format
 msgid ""
-"Could not match PONG against any PING. Try increasing MAX_PING_PONG "
-"constant.\n"
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s%s.\n"
 msgstr ""
-"Không tương ứng được PONG đối với bất kỳ PING. Hãy thử tăng hằng số "
-"MAX_PING_PONG.\n"
+"Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-peer "
+"dưới %s%s.\n"
 
-#: src/applications/pingpong/pingpong.c:366
-msgid "Cannot create PING, table full. Try increasing MAX_PING_PONG.\n"
-msgstr "Không tạo được PING, bảng đầy. Hãy thử tăng MAX_PING_PONG.\n"
+#: src/applications/fs/ecrs/namespace.c:133
+#, fuzzy, c-format
+msgid "Cannot create pseudonym `%s', file `%s' exists.\n"
+msgstr "Không tạo được tên hiệu '%s', tập tin '%s' tồn tại.\n"
 
-#: src/applications/pingpong/pingpong.c:452
-msgid "# encrypted PONG messages received"
-msgstr "# nhận được thông báo PONG đã mã hóa"
+#: src/applications/fs/ecrs/namespace.c:307
+#: src/applications/fs/ecrs/namespace.c:383
+#: src/applications/fs/ecrs/namespace.c:528
+#, fuzzy, c-format
+msgid "File `%s' does not contain a pseudonym.\n"
+msgstr "Tập tin '%s' không chứa một tên hiệu.\n"
 
-#: src/applications/pingpong/pingpong.c:454
-msgid "# plaintext PONG messages received"
-msgstr "# nhận được thông báo PONG dạng văn bản thường"
+#: src/applications/fs/ecrs/namespace.c:318
+#: src/applications/fs/ecrs/namespace.c:394
+#, fuzzy, c-format
+msgid "Format of pseudonym `%s' is invalid.\n"
+msgstr "Định dạng của tên hiệu '%s' sai.\n"
 
-#: src/applications/pingpong/pingpong.c:456
-msgid "# encrypted PING messages received"
-msgstr "# nhận được thông báo PING đã mã hóa"
+#: src/applications/fs/ecrs/namespace.c:538
+#: src/applications/fs/ecrs/namespace.c:548
+#, fuzzy, c-format
+msgid "Format of file `%s' is invalid.\n"
+msgstr "Định dạng của tập tin '%s' sai.\n"
 
-#: src/applications/pingpong/pingpong.c:458
-msgid "# PING messages created"
-msgstr "# đã tạo tin nhắn PING"
+#: src/applications/topology_f2f/topology.c:323
+#, fuzzy, c-format
+msgid ""
+"Need to have list of friends in configuration under `%s' in section `%s'.\n"
+msgstr "Cần có danh sách bạn bè dưới '%s' của phần '%s' trong cấu hình.\n"
 
-#: src/applications/pingpong/pingpong.c:460
-msgid "# encrypted PONG messages sent"
-msgstr "# đã gửi thông báo PONG đã mã hóa"
+#: src/applications/topology_f2f/topology.c:342
+#, fuzzy, c-format
+msgid "Failed to read friends list from `%s'\n"
+msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
 
-#: src/applications/pingpong/pingpong.c:464
-msgid "# encrypted PING messages sent"
-msgstr "# đã gửi các thông báo PING mã hóa"
+#: src/applications/topology_f2f/topology.c:358
+msgid "Syntax error in topology specification, skipping bytes.\n"
+msgstr "Lỗi cú pháp trong sự xác định địa hình học, bỏ qua byte.\n"
 
-#: src/applications/pingpong/pingpong.c:473
+#: src/applications/topology_f2f/topology.c:370
 #, fuzzy, c-format
-msgid "`%s' registering handlers %d %d (plaintext and ciphertext)\n"
-msgstr ""
-"'%s' đăng ký trình điều khiển %d %d (văn bản thông thường và văn bản mã "
-"hóa)\n"
+msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
+msgstr "Lỗi cú pháp trong sự xác định địa hình, bỏ qua các byte '%s'.\n"
 
-#: src/applications/rpc/rpc.c:129 src/applications/rpc/rpc.c:169
-#, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be registered: another callback is already "
-"using this name (%p)\n"
-msgstr ""
-"%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã dùng tên này (%"
-"p)\n"
+#: src/applications/template/template.c:61
+#, fuzzy, c-format
+msgid "`%s' registering client handler %d and %d\n"
+msgstr "'%s' đang đăng ký trình điều khiển máy khách %d và %d\n"
 
-#: src/applications/rpc/rpc.c:211 src/applications/rpc/rpc.c:258
-#, c-format
-msgid ""
-"%s::%s - RPC %s:%p could not be unregistered: another callback registered "
-"under that name: %p\n"
-msgstr ""
-"%s::%s - RPC %s:%p không đăng ký được: một gọi lại khác đã đăng ký dưới tên "
-"đó (%p)\n"
+#: src/applications/template/gnunet-template.c:70
+#: src/applications/vpn/gnunet-vpn.c:72
+msgid "helptext for -t"
+msgstr "trợ giúp cho -t"
 
-#: src/applications/rpc/rpc.c:232
-#, c-format
-msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
-msgstr "%s::%s - RPC %s:%p không đăng ký được: không tìm thấy\n"
+#: src/applications/template/gnunet-template.c:75
+msgid "Template for gnunet-clients."
+msgstr "Biểu mẫu cho gnunet-clients."
 
-#: src/applications/rpc/rpc.c:279
+#: src/applications/bootstrap_http/http.c:109
 #, c-format
-msgid "%s::%s - async RPC %s:%p could not be unregistered: not found\n"
-msgstr "%s::%s - async RPC %s:%p không đăng ký được: không tìm thấy\n"
+msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
+msgstr "Cổng sai \"%s\" nằm trong xác định danh sách máy, đang thử cổng %d.\n"
 
-#: src/applications/rpc/rpc.c:871 src/applications/rpc/rpc.c:1002
-#: src/applications/rpc/rpc.c:1084
-#, c-format
-msgid "Invalid message of type %u received.  Dropping.\n"
-msgstr "Nhận được thông báo sai của dạng %u.  Đang bỏ đi.\n"
+#: src/applications/bootstrap_http/http.c:120
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: `%s'.\n"
+msgstr "'%s' thất bại tại %s:%d với lỗi: '%s'.\n"
 
-#: src/applications/rpc/rpc.c:936
-#, c-format
-msgid "Dropping RPC request %u: message malformed.\n"
-msgstr "Đang bỏ đi yêu cầu RPC %u: thông báo hỏng.\n"
-
-#: src/applications/rpc/rpc.c:1388
-#, c-format
-msgid "RPC not unregistered: %s:%p\n"
-msgstr "Chưa bỏ đăng ký RPC: %s: %p\n"
-
-#: src/applications/rpc/rpc.c:1414
+#: src/applications/bootstrap_http/http.c:132
 #, fuzzy, c-format
-msgid "`%s' registering handlers %d %d %d\n"
-msgstr "'%s' đăng ký trình điều khiển %d %d %d\n"
+msgid "Could not download list of peer contacts, host `%s' unknown.\n"
+msgstr ""
+"Không tải xuống được danh sách liên hệ các đầu peer, máy '%s' không rõ.\n"
 
-#: src/applications/rpc/rpc.c:1435
+#: src/applications/bootstrap_http/http.c:155
+#: src/applications/bootstrap_http/http.c:181
 #, fuzzy, c-format
-msgid "Failed to initialize `%s' service.\n"
-msgstr "Chạy dịch vụ '%s' không thành công.\n"
+msgid "`%s' to `%s' failed at %s:%d with error: %s\n"
+msgstr "'%s' tới '%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/applications/rpc/rpc.c:1491
-msgid "RPC async reply invalid.\n"
-msgstr "Câu trả lời async của RPC sai.\n"
-
-#: src/applications/rpc/rpc.c:1562
-msgid "async RPC reply not received.\n"
-msgstr "Không nhận được câu trả lời async của RPC.\n"
-
-#: src/applications/session/connect.c:209
+#: src/applications/bootstrap_http/http.c:217
 #, 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"
+msgid "Parsing HTTP response for URL `%s' failed.\n"
+msgstr "Phân tích câu trả lời HTTP cho URL '%s' không thành công.\n"
 
-#: src/applications/session/connect.c:246
-msgid "Cannot encrypt sessionkey, other peer not known!\n"
-msgstr ""
-"Không mã hóa được chìa khóa buổi làm việc, không biết đến đầu peer khác!\n"
-
-#: src/applications/session/connect.c:523
+#: src/applications/bootstrap_http/http.c:252
 #, 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"
+msgid "Parsing hello from `%s' failed.\n"
+msgstr "Phân tích HELO từ '%s' không thành công.\n"
 
-#: src/applications/session/connect.c:532
+#: src/applications/bootstrap_http/http.c:330
 #, 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"
+msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
+msgstr "Không tìm thấy tên của HTTP proxy '%s'. Đang thử không dùng proxy.\n"
 
-#: src/applications/session/connect.c:587
-msgid ""
-"Error parsing encrypted session key, given message part size is invalid.\n"
-msgstr ""
-"Lỗi phân tích chìa khóa buổi làm việc đã mã hóa, kích thước của phần thông "
-"báo đưa ra là sai.\n"
+#: src/applications/bootstrap_http/http.c:355
+#, fuzzy
+msgid "# hellos downloaded via http"
+msgstr "# đã tải xuống HELO qua http"
 
-#: src/applications/session/connect.c:597
+#: src/applications/traffic/traffic.c:445
 #, c-format
-msgid "Unknown type in embedded message: %u (size: %u)\n"
-msgstr ""
+msgid "# bytes transmitted of type %d"
+msgstr "# byte đã truyền của dạng %d"
 
-#: src/applications/session/connect.c:742
-msgid "# session keys sent"
-msgstr "# đã gửi các phím buổi làm việc"
+#: src/applications/traffic/traffic.c:465
+#, c-format
+msgid "# bytes received of type %d"
+msgstr "# byte nhận được của dạng %d"
 
-#: src/applications/session/connect.c:744
-msgid "# session keys rejected"
-msgstr "# đã nhả ra các phím buổi làm việc"
+#: src/applications/traffic/traffic.c:605
+msgid "tracks bandwidth utilization by gnunetd"
+msgstr ""
 
-#: src/applications/session/connect.c:746
-msgid "# session keys accepted"
-msgstr "# đã chấp nhận các phím buổi làm việc"
+#: src/applications/traffic/clientapi.c:67
+msgid "Failed to query gnunetd about traffic conditions.\n"
+msgstr "Lỗi khi hỏi gnunetd về các điều khoản truyền tải.\n"
 
-#: src/applications/session/connect.c:748
-msgid "# sessions established"
-msgstr "# đã thiết lập buổi làm việc"
+#: src/applications/traffic/clientapi.c:74
+msgid "Did not receive reply from gnunetd about traffic conditions.\n"
+msgstr "Không nhận được câu trả lời từ gnunetd về các điều khoản truyền tải.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:137
-#: src/applications/sqstore_mysql/mysql.c:144
-#: src/applications/sqstore_mysql/mysql.c:386
-#: src/applications/sqstore_mysql/mysql.c:725
-#: src/applications/sqstore_mysql/mysql.c:740
-#: src/applications/sqstore_mysql/mysql.c:749
-#: src/applications/sqstore_mysql/mysql.c:773
-#: src/applications/sqstore_mysql/mysql.c:783
-#: src/applications/sqstore_mysql/mysql.c:837
-#: src/applications/sqstore_mysql/mysql.c:922
-#: src/applications/sqstore_mysql/mysql.c:932
-#: src/applications/sqstore_mysql/mysql.c:1004
-#: src/applications/sqstore_mysql/mysql.c:1013
-#: src/applications/sqstore_mysql/mysql.c:1053
-#: src/applications/sqstore_mysql/mysql.c:1067
-#: src/applications/sqstore_sqlite/sqlite.c:44
-#: src/applications/sqstore_sqlite/sqlite.c:51 src/util/hostkey_gcrypt.c:57
-#: src/util/hostkey_gcrypt.c:64 src/util/storage.c:659
-#: src/util/symcipher_gcrypt.c:47 src/util/symcipher_gcrypt.c:54
-#: src/include/gnunet_util.h:1042 src/include/gnunet_util.h:1049
-#: src/include/gnunet_util.h:1051
+#: src/applications/kvstore_sqlite/kv_sqlite.c:181
 #, fuzzy, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
-msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
-
-#: src/applications/sqstore_mysql/mysql.c:223
-#: src/applications/sqstore_mysql/mysql.c:800
-#: src/applications/sqstore_sqlite/sqlite.c:271
-#: src/applications/sqstore_sqlite/sqlite.c:289
-#, c-format
-msgid "Invalid data in %s.  Trying to fix (by deletion).\n"
+msgid ""
+"Configuration file must specify directory for storing data in section `%s' "
+"under `%s'.\n"
 msgstr ""
+"Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần '%s' dưới "
+"'%s'.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:224
-#: src/applications/sqstore_mysql/mysql.c:801
-msgid "mysql datastore"
-msgstr ""
-
-#: src/applications/sqstore_mysql/mysql.c:1107
-#, fuzzy, c-format
-msgid "Query `%s' had no results.\n"
-msgstr "Câu hỏi '%s' không có kết quả.\n"
-
-#: src/applications/sqstore_mysql/mysql.c:1178
-#: src/applications/sqstore_sqlite/sqlite.c:1072
+#: src/applications/kvstore_sqlite/kv_sqlite.c:264
 #, fuzzy
-msgid "# bytes in datastore"
-msgstr "# byte nhận được do nhiễu đường truyền"
+msgid "Unable to initialize SQLite KVStore.\n"
+msgstr "Không chạy được SQLite.\n"
 
-#: src/applications/sqstore_mysql/mysql.c:1205
-#, 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/vpn/gnunet-vpn.c:77
+msgid "VPN over GNUnet."
+msgstr ""
 
-#: src/applications/sqstore_mysql/mysql.c:1223
-msgid ""
-"Failed to load MySQL database module.  Check that MySQL is running and "
-"configured properly!\n"
+#: src/applications/vpn/vpn.c:315
+#, c-format
+msgid "Not storing route to myself from peer %d\n"
 msgstr ""
 
-#: src/applications/sqstore_mysql/mysqltest.c:251
-#: src/applications/sqstore_sqlite/sqlitetest.c:260
-msgid "Could not initialize libgnunetutil!\n"
-msgstr "Không chạy được libgnunetutil!\n"
+#: src/applications/vpn/vpn.c:323
+#, c-format
+msgid "Duplicate route to node from peer %d, choosing minimum hops"
+msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:139
-msgid "Unable to initialize SQLite.\n"
-msgstr "Không chạy được SQLite.\n"
+#: src/applications/vpn/vpn.c:351
+#, c-format
+msgid "Inserting route from peer %d in route table at location %d\n"
+msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:272
-#: src/applications/sqstore_sqlite/sqlite.c:290
-msgid "sqlite datastore"
+#: src/applications/vpn/vpn.c:400
+#, c-format
+msgid "RFC4193 Frame length %d is too big for GNUnet!\n"
 msgstr ""
 
-#: src/applications/sqstore_sqlite/sqlite.c:1035
-#, fuzzy, c-format
-msgid ""
-"Configuration file must specify directory for storing FS data in section `%"
-"s' under `%s'.\n"
+#: src/applications/vpn/vpn.c:404
+#, c-format
+msgid "RFC4193 Frame length %d too small\n"
 msgstr ""
-"Tập tin cấu hình phải chỉ ra thư mục để chứa dữ liệu PS trong phần '%s' dưới "
-"'%s'.\n"
 
-#: src/applications/stats/clientapi.c:179
-msgid "Uptime (seconds)"
-msgstr "Đã chạy (giây)"
+#: src/applications/vpn/vpn.c:414
+#, c-format
+msgid "RFC4193 Ethertype %x and IP version %x do not match!\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:61
-#: src/applications/testbed/commands.c:1130
+#: src/applications/vpn/vpn.c:474
 #, c-format
-msgid "Supported peer-to-peer messages:\n"
-msgstr "Thông báo Peer to Peer được hỗ trợ:\n"
+msgid "RFC4193 Going to try and make a tunnel in slot %d\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:64
-#: src/applications/testbed/commands.c:1132
+#: src/applications/vpn/vpn.c:478
 #, c-format
-msgid "Supported client-server messages:\n"
-msgstr "Thông báo máy khách-máy chủ hỗ trợ:\n"
+msgid "Cannot open tunnel device because of %s"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:94
-msgid "prints supported protocol messages"
-msgstr "in các thông báo giao thức hỗ trợ"
+#: src/applications/vpn/vpn.c:505
+#, c-format
+msgid "RFC4193 Create skips gnu%d as we are already using it\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:99
-msgid "Print statistics about GNUnet operations."
-msgstr "In thống kê về các thao tác của GNUnet."
+#: src/applications/vpn/vpn.c:513
+#, c-format
+msgid "Cannot set tunnel name to %s because of %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:167
+#: src/applications/vpn/vpn.c:517
 #, c-format
-msgid "Error establishing connection with gnunetd.\n"
-msgstr "Lỗi thiết lập kết nối với gnunetd.\n"
+msgid "Configured tunnel name to %s\n"
+msgstr ""
 
-#: src/applications/stats/gnunet-stats.c:181
+#: src/applications/vpn/vpn.c:555
 #, c-format
-msgid "Error reading information from gnunetd.\n"
-msgstr "Lỗi đọc thông tin từ gnunetd.\n"
+msgid "Cannot get socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:206
+#: src/applications/vpn/vpn.c:559
 #, c-format
-msgid "% of allowed network load (up)"
-msgstr "% o tải mạng cho phép (lên)"
+msgid "Cannot set socket flags for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:208
+#: src/applications/vpn/vpn.c:566
 #, c-format
-msgid "% of allowed network load (down)"
-msgstr "% o tải mạng cho phép (xuống)"
+msgid "Cannot set MTU for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:210
+#: src/applications/vpn/vpn.c:571
 #, c-format
-msgid "% of allowed cpu load"
-msgstr "% o tải cho phép của cpu"
+msgid "Cannot get interface index for gnu%d because %s\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:214
-msgid "# bytes of noise received"
-msgstr "# byte nhận được do nhiễu đường truyền"
+#: src/applications/vpn/vpn.c:579
+#, c-format
+msgid "IPv6 ifaddr gnu%d - %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
 
-#: src/applications/stats/statistics.c:372
-#, fuzzy
-msgid "keeps statistics about gnunetd's operation"
-msgstr "In thống kê về các thao tác của GNUnet."
+#: src/applications/vpn/vpn.c:591
+#, fuzzy, c-format
+msgid "Cannot set interface IPv6 address for gnu%d because %s\n"
+msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:95
-msgid "output in gnuplot format"
-msgstr "kết quả ở dạng gnuplot"
+#: src/applications/vpn/vpn.c:602
+#, c-format
+msgid "IPv6 route gnu%d - destination %x:%x:%x:%x:%x:%x:%x:%x/%d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:98
-msgid "number of iterations"
-msgstr "số lần làm lại"
+#: src/applications/vpn/vpn.c:614
+#, fuzzy, c-format
+msgid "Cannot add route IPv6 address for gnu%s because %s\n"
+msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:100
-msgid "number of messages to use per iteration"
-msgstr "số thông báo dùng cho mỗi lần làm lại"
+#: src/applications/vpn/vpn.c:646
+msgid ""
+"RFC4193 We have run out of memory and so I can't store a tunnel for this "
+"peer.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:102
-msgid "receiver host identifier (ENC file name)"
-msgstr "trình nhận tên máy (tên tập tin ENC)"
+#: src/applications/vpn/vpn.c:692
+#, c-format
+msgid "RFC4193 Thread running (frame %d tunnel %d f2f %d) ...\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:104
-msgid "message size"
-msgstr "kích thước thông báo"
+#: src/applications/vpn/vpn.c:754
+#, c-format
+msgid "RFC4193 --- whitelist of peer %x\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:106
-msgid "sleep for SPACE ms after each a message block"
-msgstr "ngủ SPACE miligiây sau mỗi khối tin nhắn"
+#: src/applications/vpn/vpn.c:772
+msgid "RFC4193 Thread exiting\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:108
-msgid "time to wait for the completion of an iteration (in ms)"
-msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
+#: src/applications/vpn/vpn.c:812
+msgid "VPN IP src not anonymous. drop..\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:111
-msgid "number of messages in a message block"
-msgstr "số thông báo trong một khối tin nhắn"
+#: src/applications/vpn/vpn.c:816
+msgid "VPN IP not anonymous, drop.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:115
-msgid "Start GNUnet transport benchmarking tool."
-msgstr "Chạy công cụ kiểm tra truyền tải của GNUnet."
+#: src/applications/vpn/vpn.c:822
+msgid "VPN Received, not anonymous, drop.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:225
-msgid "You must specify a receiver!\n"
-msgstr "Người dùng phải chỉ ra một trình nhận!\n"
-
-#: src/applications/tbench/gnunet-tbench.c:228
+#: src/applications/vpn/vpn.c:825
 #, fuzzy, c-format
-msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
-msgstr "Chỉ ra ID của trình nhận sai ('%s' không phải là một tên đúng).\n"
+msgid "VPN Received unknown IP version %d...\n"
+msgstr "Nhận được thông báo testbed không rõ dạng %u.\n"
 
-#: src/applications/tbench/gnunet-tbench.c:249
+#: src/applications/vpn/vpn.c:835
 #, c-format
-msgid "Time:\n"
-msgstr "Thời gian:\n"
+msgid "<- GNUnet(%d) : %s\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:250
-#, c-format
-msgid "\tmax      %llums\n"
-msgstr "\tmax      %llu miligiây\n"
+#: src/applications/vpn/vpn.c:854
+msgid "Could not write the tunnelled IP to the OS... Did to setup a tunnel?\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:252
+#: src/applications/vpn/vpn.c:869
 #, c-format
-msgid "\tmin      %llums\n"
-msgstr "\tmin      %llu miligiây\n"
+msgid "RFC4193 -- non-vpn node hangs up. close down gnu%d (%d in %d)\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:254
-#, c-format
-msgid "\tmean     %8.4fms\n"
-msgstr "\tý nghĩa   %8.4f miligiây\n"
+#: src/applications/vpn/vpn.c:885
+msgid "Receive route request\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:256
+#: src/applications/vpn/vpn.c:890
 #, c-format
-msgid "\tvariance %8.4fms\n"
-msgstr "\tkhác nhau %8.4f miligiây\n"
+msgid "Prepare route announcement level %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:259
+#: src/applications/vpn/vpn.c:901
 #, c-format
-msgid "Loss:\n"
-msgstr "Mất:\n"
+msgid "Send route announcement %d with route announce\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:260
+#: src/applications/vpn/vpn.c:907
 #, c-format
-msgid "\tmax      %u\n"
-msgstr "\tmax      %u\n"
+msgid "Send outside table info %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:262
-#, c-format
-msgid "\tmin      %u\n"
-msgstr "\tmin      %u\n"
+#: src/applications/vpn/vpn.c:923
+msgid "Receive route announce.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:264
-#, c-format
-msgid "\tmean     %8.4f\n"
-msgstr "\tý nghĩa   %8.4f\n"
+#: src/applications/vpn/vpn.c:927
+msgid "Going to try insert route into local table.\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:266
+#: src/applications/vpn/vpn.c:931
 #, c-format
-msgid "\tvariance %8.4f\n"
-msgstr "\tkhác nhau %8.4f\n"
+msgid "Inserting with hops %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:275
+#: src/applications/vpn/vpn.c:945
 #, c-format
-msgid "Output format not known, this should not happen.\n"
-msgstr "Định dạng kết quả không rõ, điều này không nên xảy ra.\n"
+msgid "Request level %d from peer %d\n"
+msgstr ""
 
-#: src/applications/tbench/gnunet-tbench.c:279
+#: src/applications/vpn/vpn.c:960
 #, c-format
-msgid ""
-"\n"
-"Did not receive the message from gnunetd. Is gnunetd running?\n"
+msgid "Receive table limit on peer reached %d\n"
 msgstr ""
-"\n"
-"Không nhận được thông báo từ gnunetd. gnunetd đang chạy?\n"
 
-#: src/applications/tbench/tbench.c:448
-msgid "allows profiling of direct peer-to-peer connections"
+#: src/applications/vpn/vpn.c:998
+msgid "realise alloc ram\n"
 msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:57
-#, 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/vpn/vpn.c:1013
+msgid "realise add routes\n"
+msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:84
+#: src/applications/vpn/vpn.c:1058
+msgid "realise pull routes\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1104
+msgid "realise copy table\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1161
+msgid "Yes"
+msgstr "Có"
+
+#: src/applications/vpn/vpn.c:1161
+msgid "No"
+msgstr "Không"
+
+#: src/applications/vpn/vpn.c:1324
+#, fuzzy, c-format
+msgid "`%s' initialising RFC4913 module  %d and %d\n"
+msgstr "'%s' đăng ký trình điều khiển %d và %d\n"
+
+#: src/applications/vpn/vpn.c:1325
 #, 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"
+msgid "RFC4193 my First 4 hex digits of host id are %x\n"
+msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:89
+#: src/applications/vpn/vpn.c:1361
+msgid "enables IPv6 over GNUnet (incomplete)"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1383
+msgid "RFC4193 Waiting for tun thread to end\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1394
+msgid "RFC4193 The tun thread has ended\n"
+msgstr ""
+
+#: src/applications/vpn/vpn.c:1405
 #, 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"
+msgid "RFC4193 Closing tunnel %d fd %d\n"
+msgstr ""
 
-#: src/applications/tbench/tbenchtest.c:95
+#: src/applications/state/state.c:85
 #, c-format
 msgid ""
-"\n"
-"Failed to receive reply from gnunetd.\n"
+"Configuration file must specify a directory for GNUnet to store per-peer "
+"data under %s\\%s.\n"
 msgstr ""
-"\n"
-"Không nhận thành công câu trả lời từ gnunetd.\n"
+"Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-peer "
+"dưới %s\\%s.\n"
 
-#: src/applications/tbench/tbenchtest.c:211
-#, c-format
-msgid "Running benchmark...\n"
-msgstr "Đang chạy thử mức độ (benchmark)...\n"
+#: src/server/gnunet-update.c:50
+msgid "print a value from the configuration file to stdout"
+msgstr "in một giá trị từ tập tin cấu hình ra stdout"
 
-#: src/applications/template/gnunet-template.c:70
-msgid "helptext for -t"
-msgstr "trợ giúp cho -t"
+#: src/server/gnunet-update.c:55 src/server/startup.c:450
+#: src/server/gnunet-transport-check.c:407
+msgid "run as user LOGIN"
+msgstr "chạy dưới người dùng LOGIN"
 
-#: src/applications/template/gnunet-template.c:75
-msgid "Template for gnunet-clients."
-msgstr "Biểu mẫu cho gnunet-clients."
+#: src/server/gnunet-update.c:58
+#, fuzzy
+msgid "run in client mode (for getting client configuration values)"
+msgstr "chạy trong chế độ người dùng (để lấy giá trị cấu hình của người dùng)"
 
-#: src/applications/template/template.c:61
+#: src/server/gnunet-update.c:64
+msgid "Updates GNUnet datastructures after version change."
+msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
+
+#: src/server/gnunet-update.c:147
 #, fuzzy, c-format
-msgid "`%s' registering client handler %d and %d\n"
-msgstr "'%s' đang đăng ký trình điều khiển máy khách %d và %d\n"
+msgid "Option `%s' makes no sense without option `%s'."
+msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'."
 
-#: src/applications/testbed/gnunet-testbed.c:119
-msgid "Start GNUnet-testbed helper."
-msgstr "Chạy chương trình trợ giúp Start GNUnet-testbed."
+#: src/server/gnunet-update.c:152 src/server/gnunet-transport-check.c:527
+#: src/server/gnunet-peer-info.c:113 src/setup/gnunet-setup.c:176
+#, c-format
+msgid "Invalid arguments: "
+msgstr "Tham số sai: "
 
-#: src/applications/testbed/gnunet-testbed.c:183
+#: src/server/gnunet-update.c:155
 #, c-format
-msgid "Cannot connect to LOOPBACK port %d: %s\n"
-msgstr "Không kết nối được tới cổng quay lại LOOPBACK %d: %s\n"
+msgid ""
+"\n"
+"Exiting.\n"
+msgstr ""
+"\n"
+"Đang thoát.\n"
 
-#: src/applications/testbed/gnunet-testbed.c:282
+#: src/server/gnunet-update.c:232 src/server/core.c:476
+msgid "No applications defined in configuration!\n"
+msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
+
+#: src/server/gnunet-update.c:249
 #, fuzzy, c-format
-msgid "Could not execute `%s': %s\n"
-msgstr "Không thực hiện được '%s': %s\n"
+msgid "Updating data for module `%s'\n"
+msgstr "Đang cập nhật dữ liệu cho môđun '%s'\n"
 
-#: src/applications/testbed/gnunet-testbed.c:325
-msgid "No client service started. Trying again in 30 seconds.\n"
-msgstr "Chưa chạy dịch vụ máy khách. Hãy thử lại sau 30 giây.\n"
+#: src/server/gnunet-update.c:253
+#, fuzzy, c-format
+msgid "Failed to update data for module `%s'\n"
+msgstr "Cập nhật dữ liệu cho môđun '%s' không thành công\n"
 
-#: src/applications/testbed/gnunet-testbed.c:348
+#: src/server/gnunet-update.c:309
 #, c-format
-msgid ""
-"Error (%s) binding the TCP listener to port %d. No proxy service started.\n"
-"Trying again in %d seconds...\n"
-msgstr ""
-"Lỗi (%s) kết gắn bind trình nghe TCP vào cổng %d. Chưa chạy dịch vụ proxy.\n"
-"Hãy thử lại sau %d giây...\n"
+msgid "Updated data for %d applications.\n"
+msgstr "Cập nhật dữ liệu cho %d ứng dụng.\n"
 
-#: src/applications/testbed/gnunet-testbed.c:415 src/server/tcpserver.c:515
-#, c-format
-msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
-msgstr "Đã nhả ra kết nối chưa xác thực từ %u.%u.%u.%u.\n"
+#: src/server/connection.c:983
+#, fuzzy, c-format
+msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
+msgstr "'%s' đã chọn %d vượt quá %d thông báo (MTU: %d).\n"
 
-#: src/applications/testbed/gnunet-testbed.c:428
+#: src/server/connection.c:990
 #, c-format
-msgid "Protocol violation on socket. Expected command.\n"
-msgstr "Xâm phạm giao thức trên socket. Đã mong đợi câu lệnh.\n"
+msgid "Message details: %u: length %d, priority: %d\n"
+msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
 
-#: src/applications/testbed/gnunet-testbed.c:467
+#: src/server/connection.c:2254
 #, fuzzy, c-format
-msgid "Command `%s' not found!\n"
-msgstr "Không tìm thấy câu lệnh '%s'!\n"
+msgid "Message from `%s' discarded: invalid format.\n"
+msgstr "Bỏ đi thông báo từ '%s': định dạng sai.\n"
 
-#: src/applications/testbed/gnunet-testbed.c:540
-msgid "Start GNUnet testbed controller."
-msgstr "Chạy trình điều khiển testbed của GNUnet."
-
-#: src/applications/testbed/gnunet-testbed.c:594
+#: src/server/connection.c:2325
 #, c-format
-msgid "Malformed entry in the configuration in section %s under %s: %s\n"
-msgstr "Mục có định dạng sai trong phần %s dưới %s của cấu hình: %s\n"
+msgid "Invalid sequence number %u <= %u, dropping message.\n"
+msgstr "Số của chuỗi sai %u <= %u, đang bỏ đi thông báo.\n"
 
-#: src/applications/testbed/testbed.c:50
-msgid "Could not send acknowledgement back to client.\n"
-msgstr "Không gửi được câu trả lời đã biết ack trở lại cho máy khách.\n"
+#: src/server/connection.c:2340
+msgid "Message received more than one day old. Dropped.\n"
+msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/applications/testbed/testbed.c:60
-#, c-format
-msgid "Received unknown testbed message of type %u.\n"
-msgstr "Nhận được thông báo testbed không rõ dạng %u.\n"
+#: src/server/connection.c:2708
+msgid "# outgoing messages dropped"
+msgstr "# thông báo đi ra đã loại bỏ"
 
-#: src/applications/testbed/testbed.c:78
-#: src/applications/testbed/testbed.c:807
-#, fuzzy, c-format
-msgid "size of `%s' message is too short. Ignoring.\n"
-msgstr "kích thước của thông báo '%s' quá ngắn. Đang lờ đi.\n"
+#: src/server/connection.c:2712
+msgid "# bytes of outgoing messages dropped"
+msgstr "# byte của các thông báo đi ra đã loại bỏ"
 
-#: src/applications/testbed/testbed.c:85
-#, fuzzy, c-format
-msgid "size of `%s' message is wrong. Ignoring.\n"
-msgstr "kích thước của thông báo '%s' bị sai. Đang lờ đi.\n"
+#: src/server/connection.c:2714
+msgid "# connections closed (HANGUP sent)"
+msgstr "# các kết nối đã đóng (gửi HANGUP)"
 
-#: src/applications/testbed/testbed.c:137
-#, fuzzy, c-format
-msgid "TESTBED could not generate hello message for protocol %u\n"
-msgstr "TESTBED không tạo được thông báo HELO cho giao thức %u\n"
+#: src/server/connection.c:2717
+#, fuzzy
+msgid "# bytes encrypted"
+msgstr "# byte nhận được của dạng %d"
 
-#: src/applications/testbed/testbed.c:215
-#: src/applications/testbed/testbed.c:256
-#: src/applications/testbed/testbed.c:359
-#: src/applications/testbed/testbed.c:366
-#: src/applications/testbed/testbed.c:403
-#: src/applications/testbed/testbed.c:410
+#: src/server/connection.c:2721
+#, fuzzy
+msgid "# bytes transmitted"
+msgstr "# byte đã truyền của dạng %d"
+
+#: src/server/connection.c:2725
+#, fuzzy
+msgid "# bytes received"
+msgstr "# byte nhận được qua TCP"
+
+#: src/server/connection.c:2727
+#, fuzzy
+msgid "# bytes decrypted"
+msgstr "# byte nhận được của dạng %d"
+
+#: src/server/connection.c:2728
+#, fuzzy
+msgid "# bytes noise sent"
+msgstr "# byte nhận được do nhiễu đường truyền"
+
+#: src/server/startup.c:196
 #, fuzzy, c-format
-msgid "received invalid `%s' message\n"
-msgstr "nhận được thông báo sai '%s'\n"
+msgid "The `%s' request received from client is malformed.\n"
+msgstr "Yêu cầu '%s' nhận được từ máy khác là hỏng.\n"
 
-#: src/applications/testbed/testbed.c:231
-#: src/applications/testbed/testbed.c:271
+#: src/server/startup.c:324
 #, fuzzy, c-format
-msgid "received invalid `%s' message (empty module name)\n"
-msgstr "nhận được thông báo '%s' sai (tên môđun rỗng)\n"
+msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
+msgstr ""
+"Người dùng phải chỉ ra một tên cho tập tin PID trong phần '%s' dưới '%s'.\n"
 
-#: src/applications/testbed/testbed.c:238
+#: src/server/startup.c:339
 #, fuzzy, c-format
-msgid "loading module `%s' failed.  Notifying client.\n"
-msgstr "nạp môđun '%s' không thành công.  Đang cho máy khách biết.\n"
+msgid "Could not write PID to file `%s': %s.\n"
+msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
 
-#: src/applications/testbed/testbed.c:278
-msgid "unloading module failed.  Notifying client.\n"
-msgstr "hủy nạp môđun không thành công.  Đang cho máy khách biết.\n"
+#: src/server/startup.c:443
+msgid ""
+"run in debug mode; gnunetd will not daemonize and error messages will be "
+"written to stderr instead of a logfile"
+msgstr ""
+"chạy trong chế độ tìm sửa lỗi debug; gnunetd sẽ không tạo daemon và sẽ ghi "
+"thông báo lỗi ra stderr thay vì vào một tập tin bản ghi log"
 
-#: src/applications/testbed/testbed.c:539
+#: src/server/startup.c:456
+msgid "Starts the gnunetd daemon."
+msgstr "Chạy daemon gnunetd."
+
+#: src/server/startup.c:470
 #, fuzzy, c-format
-msgid "`%s' %s failed: %s\n"
-msgstr "'%s' %s không thành công: %s\n"
+msgid "User `%s' not known, cannot change UID to it.\n"
+msgstr "Người dùng '%s' không rõ, không thay đổi được UID thành nó."
 
-#: src/applications/testbed/testbed.c:625
+#: src/server/startup.c:479
 #, fuzzy, c-format
-msgid "received invalid `%s' message: %s.\n"
-msgstr "nhận được thông báo '%s' sai: %s.\n"
+msgid "Cannot change user/group to `%s': %s\n"
+msgstr "Không thay đổi được người dùng/nhóm thành '%s': %s"
 
-#: src/applications/testbed/testbed.c:817
-#, c-format
-msgid "'..' is not allowed in file name (%s).\n"
-msgstr "không cho phép '..' trong tên tập tin (%s).\n"
+#: src/server/startup.c:580
+msgid "Invalid command-line arguments:\n"
+msgstr "Sai tham số dòng lệnh:\n"
 
-#: src/applications/testbed/testbed.c:826
-msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
-msgstr "Tên tập tin rỗng cho thông báo UPLOAD_FILE là sai!\n"
+#: src/server/startup.c:583
+#, fuzzy, c-format
+msgid "Argument %d: `%s'\n"
+msgstr "Tham số %d: '%s'\n"
 
-#: src/applications/testbed/testbed.c:833
-msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
+#: src/server/startup.c:589
+msgid "Invalid command-line arguments.\n"
+msgstr "Sai tham số dòng lệnh.\n"
+
+#: src/server/gnunetd.c:76
+#, fuzzy, c-format
+msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
 msgstr ""
-"Tên tập tin cho thông báo UPLOAD_FILE không phải là kết thúc rỗng (sai)!\n"
+"Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
 
-#: src/applications/testbed/testbed.c:841
-msgid "Upload refused!"
-msgstr "Từ chối tải lên!"
+#: src/server/gnunetd.c:84
+#, fuzzy, c-format
+msgid "`%s' starting\n"
+msgstr "'%s' đang khởi động\n"
 
-#: src/applications/testbed/testbed.c:867
-#, c-format
-msgid "Invalid message received at %s:%d."
-msgstr "Nhận được thông báo sai tại %s: %d."
+#: src/server/gnunetd.c:106
+#, fuzzy, c-format
+msgid "`%s' startup complete.\n"
+msgstr "'%s' khởi động thành công.\n"
 
-#: src/applications/testbed/testbed.c:985
-#, c-format
-msgid "received invalid testbed message of size %u\n"
-msgstr "nhận được thông báo testbed sai với kích thước %u\n"
+#: src/server/gnunetd.c:111
+#, fuzzy, c-format
+msgid "`%s' is shutting down.\n"
+msgstr "'%s' đang tắt.\n"
 
-#: src/applications/testbed/testbed.c:1002
-#, c-format
-msgid ""
-"Received testbed message of type %u but unexpected size %u, expected %u\n"
-msgstr ""
-"Nhận được thông báo testbed dạng %u nhưng kích thước không mong đợi %u, mong "
-"đợi %u\n"
+#: src/server/core.c:115
+#, fuzzy, c-format
+msgid "Application module `%s' already initialized!\n"
+msgstr "Đã chạy môđun ứng dụng '%s'!\n"
 
-#: src/applications/testbed/testbed.c:1045
-msgid "No testbed URL given, not registered.\n"
-msgstr "Chưa đưa ra URL của testbed, không đăng ký.\n"
+#: src/server/core.c:168
+#, fuzzy, c-format
+msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
+msgstr "Nạp plugin '%s' không thành công tại %s: %d.  Đang bỏ nạp plugin.\n"
 
-#: src/applications/testbed/testbed.c:1054 src/transports/http.c:1455
+#: src/server/core.c:215
 #, fuzzy, c-format
-msgid "Could not resolve name of HTTP proxy `%s'.\n"
-msgstr "Không tìm được tên của proxy HTTP '%s'.\n"
+msgid "Could not shutdown `%s': application not loaded\n"
+msgstr "Không tắt được '%s': chưa nạp ứng dụng\n"
 
-#: src/applications/testbed/testbed.c:1118
+#: src/server/core.c:222
 #, fuzzy, c-format
-msgid "Malformed http URL: `%s' at `%s'.  Testbed-client not registered.\n"
-msgstr "URL http lỗi: '%s' tại '%s'.  Chưa đăng ký máy khách testbed.\n"
+msgid "Could not shutdown application `%s': not initialized\n"
+msgstr "Không tắt được ứng dụng '%s': chưa chạy\n"
 
-#: src/applications/testbed/testbed.c:1154
+#: src/server/core.c:231 src/server/core.c:420
 #, fuzzy, c-format
-msgid "Could not register testbed, host `%s' unknown\n"
-msgstr "Không đăng ký được testbed, máy '%s' không rõ\n"
+msgid "Could not find '%s%s' method in library `%s'.\n"
+msgstr "Không tìm thấy phương pháp '%s%s' trong thư viện '%s'.\n"
 
-#: src/applications/testbed/testbed.c:1177
+#: src/server/core.c:398
+#, c-format
+msgid "Could not release %p: service not loaded\n"
+msgstr "Không phát hành được %p: chưa nạp dịch vụ\n"
+
+#: src/server/core.c:499
 #, fuzzy, c-format
-msgid "Failed to send HTTP request to host `%s': %s\n"
-msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
+msgid "Could not initialize application `%s'\n"
+msgstr "Không chạy được ứng dụng '%s'\n"
 
-#: src/applications/testbed/testbed.c:1230
+#: src/server/core.c:516
 #, fuzzy, c-format
-msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
-msgstr "Gửi yêu cầu HTTP '%s' tới máy '%s' không thành công: %s\n"
+msgid "Could not properly shutdown application `%s'.\n"
+msgstr "Không tắt đúng được ứng dụng '%s'.\n"
 
-#: src/applications/testbed/testbed.c:1269
-msgid "Exit register (error: no http response read).\n"
-msgstr "Thoát trình đăng ký (lỗi: không đọc được câu trả lời http).\n"
+#: src/server/core.c:575
+msgid "FATAL: Identity plugin not found!\n"
+msgstr "LỖI NẶNG: Không tìm thấy plugin đồng nhất!\n"
 
-#: src/applications/testbed/testbed.c:1357
-msgid "allows construction of a P2P-testbed (incomplete)"
-msgstr ""
+#: src/server/core.c:633
+#, fuzzy, c-format
+msgid "Could not properly unload service `%s'!\n"
+msgstr "Không hủy nạp đúng được dịch vụ '%s'!\n"
 
-#: src/applications/topology_default/topology.c:398
+#: src/server/gnunet-transport-check.c:109
 #, fuzzy, c-format
-msgid "Version mismatch (`%s' vs. '%*.s'), run gnunet-update!\n"
-msgstr "Phiên bản không tương ứng ('%s' và '%s'), hãy chạy gnunet-update!\n"
+msgid "`%s': Could not create hello.\n"
+msgstr "'%s': Không tạo được HELO.\n"
 
-#: src/applications/topology_f2f/topology.c:323
+#: src/server/gnunet-transport-check.c:118
 #, fuzzy, c-format
-msgid ""
-"Need to have list of friends in configuration under `%s' in section `%s'.\n"
-msgstr "Cần có danh sách bạn bè dưới '%s' của phần '%s' trong cấu hình.\n"
+msgid "`%s': Could not connect.\n"
+msgstr "'%s': Không kết nối được.\n"
 
-#: src/applications/topology_f2f/topology.c:342
+#: src/server/gnunet-transport-check.c:148
 #, fuzzy, c-format
-msgid "Failed to read friends list from `%s'\n"
-msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
+msgid "`%s': Could not send.\n"
+msgstr "'%s': Không gửi được.\n"
 
-#: src/applications/topology_f2f/topology.c:358
-msgid "Syntax error in topology specification, skipping bytes.\n"
-msgstr "Lỗi cú pháp trong sự xác định địa hình học, bỏ qua byte.\n"
+#: src/server/gnunet-transport-check.c:168
+#, fuzzy, c-format
+msgid "`%s': Did not receive message within %llu ms.\n"
+msgstr "'%s': Không nhận được thông báo trong %llu mili giây.\n"
 
-#: src/applications/topology_f2f/topology.c:370
+#: src/server/gnunet-transport-check.c:182
 #, fuzzy, c-format
-msgid "Syntax error in topology specification, skipping bytes `%s'.\n"
-msgstr "Lỗi cú pháp trong sự xác định địa hình, bỏ qua các byte '%s'.\n"
+msgid "`%s': Could not disconnect.\n"
+msgstr "'%s': Không ngắt kết nối được.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:101
-msgid "probe network to the given DEPTH"
-msgstr "thử mạng tới độ sâu DEPTH đưa ra"
-
-#: src/applications/tracekit/gnunet-tracekit.c:103
+#: src/server/gnunet-transport-check.c:189
+#, fuzzy, c-format
 msgid ""
-"specify output format; 0 for human readable output, 1 for dot, 2 for vcg"
+"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
 msgstr ""
-"chỉ ra định dạng kết quả; 0 - dạng người dùng dễ đọc, 1 - dấu chấm, 2 - vcg"
+"'%s' truyền tải OK.  Cần %umiligiây để truyền đi %d thông báo với %d byte "
+"mỗi cái.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:107
-msgid "use PRIO for the priority of the trace request"
-msgstr "dùng PRIO làm ưu tiên của yêu cầu theo dấu vết trace"
-
-#: src/applications/tracekit/gnunet-tracekit.c:110
-msgid "wait DELAY seconds for replies"
-msgstr "chờ các câu trả lời DELAY giây"
-
-#: src/applications/tracekit/gnunet-tracekit.c:114
-msgid "Trace GNUnet network topology."
-msgstr "Theo dấu vết trace hình học của mạng GNUnet."
-
-#: src/applications/tracekit/gnunet-tracekit.c:222
+#: src/server/gnunet-transport-check.c:219
 #, fuzzy, c-format
-msgid "`%s' is not connected to any peer.\n"
-msgstr "'%s' chưa kết nối tới bất kỳ đầu peer nào.\n"
+msgid " Transport %d is not being tested\n"
+msgstr " Giao thông %d là không thể\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:233
-#, c-format
+#: src/server/gnunet-transport-check.c:230
+#, fuzzy, c-format
 msgid ""
-"Format specification invalid. Use 0 for user-readable, 1 for dot, 2 for "
-"vcg.\n"
+"\n"
+"Contacting `%s'."
 msgstr ""
-"Định dạng bị sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm, 2 cho vcg.\n"
+"\n"
+"Đang liên hệ '%s'."
 
-#: src/applications/tracekit/gnunet-tracekit.c:260
-#, fuzzy, c-format
-msgid "`%s' connected to `%s'.\n"
-msgstr "'%s' kết nối tới '%s'.\n"
+#: src/server/gnunet-transport-check.c:253
+#, c-format
+msgid " Connection failed\n"
+msgstr " Kết nối không thành công\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:275
+#: src/server/gnunet-transport-check.c:259
 #, c-format
-msgid "Format specification invalid. Use 0 for user-readable, 1 for dot\n"
-msgstr "Định dạng sai. Dùng 0 cho người dùng dễ đọc, 1 cho chấm\n"
+msgid " Connection failed (bug?)\n"
+msgstr " Kết nối thất bại (lỗi bug?)\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:298
-#, fuzzy, c-format
-msgid "Peer `%s' did not report back.\n"
-msgstr "Đầu peer '%s' chưa báo cáo lại.\n"
+#: src/server/gnunet-transport-check.c:320
+#, c-format
+msgid "No reply received within %llums.\n"
+msgstr "Không nhận được trả lời trong %llu miligiây.\n"
 
-#: src/applications/tracekit/gnunet-tracekit.c:387
-msgid "Could not send request to gnunetd.\n"
-msgstr "Không gửi được yêu cầu tới gnunetd.\n"
+#: src/server/gnunet-transport-check.c:396
+msgid "ping peers from HOSTLISTURL that match transports"
+msgstr "ping các đầu peer từ HOSTLISTURL tương ứng với truyền tải"
 
-#: src/applications/tracekit/tracekit.c:62
-#: src/applications/tracekit/tracekit.c:186
-#, fuzzy, c-format
-msgid "Received invalid `%s' message from `%s'.\n"
-msgstr "Nhận được thông báo sai '%s' từ '%s'.\n"
+#: src/server/gnunet-transport-check.c:398
+msgid "send COUNT messages"
+msgstr "gửi COUNT thông báo"
 
-#: src/applications/tracekit/tracekit.c:243
-msgid "TRACEKIT: routing table full, trace request dropped\n"
-msgstr "TRACEKIT: bảng định tuyến đầy, bỏ đi yêu cầu theo vết trace\n"
+#: src/server/gnunet-transport-check.c:400
+msgid "send messages with SIZE bytes payload"
+msgstr "gửi các thông báo với SIZE byte nạp trả"
 
-#: src/applications/tracekit/tracekit.c:331
-#, fuzzy, c-format
-msgid "TRACEKIT: received invalid `%s' message\n"
-msgstr "TRACEKIT: nhận được thông báo sai '%s'\n"
+#: src/server/gnunet-transport-check.c:402
+msgid "specifies which TRANSPORT should be tested"
+msgstr "chỉ ra TRANSPORT cần được thử nghiệm"
 
-#: src/applications/tracekit/tracekit.c:431
-#, fuzzy
-msgid "allows mapping of the network topology"
-msgstr "Theo dấu vết trace hình học của mạng GNUnet."
+#: src/server/gnunet-transport-check.c:404
+msgid "specifies after how many MS to time-out"
+msgstr "chỉ ra hết thời gian chờ sau bao nhiên MS"
 
-#: src/applications/traffic/clientapi.c:67
-msgid "Failed to query gnunetd about traffic conditions.\n"
-msgstr "Lỗi khi hỏi gnunetd về các điều khoản truyền tải.\n"
+#: src/server/gnunet-transport-check.c:414
+msgid "Tool to test if GNUnet transport services are operational."
+msgstr ""
+"Công cụ để thử nghiệm xem dịch vụ truyền tải GNUnet có hoạt động không."
 
-#: src/applications/traffic/clientapi.c:74
-msgid "Did not receive reply from gnunetd about traffic conditions.\n"
-msgstr "Không nhận được câu trả lời từ gnunetd về các điều khoản truyền tải.\n"
+#: src/server/gnunet-transport-check.c:565
+msgid "You must specify a non-empty set of transports to test!\n"
+msgstr ""
+"Người dùng phải chỉ ra một bộ không rỗng của truyền tải để thử nghiệm!\n"
 
-#: src/applications/traffic/traffic.c:445
+#: src/server/gnunet-transport-check.c:570
 #, c-format
-msgid "# bytes transmitted of type %d"
-msgstr "# byte đã truyền của dạng %d"
+msgid "Testing transport(s) %s\n"
+msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/applications/traffic/traffic.c:465
+#: src/server/gnunet-transport-check.c:573
 #, c-format
-msgid "# bytes received of type %d"
-msgstr "# byte nhận được của dạng %d"
+msgid "Available transport(s): %s\n"
+msgstr "(Các) truyền tải có: %s\n"
 
-#: src/applications/traffic/traffic.c:605
-msgid "tracks bandwidth utilization by gnunetd"
-msgstr ""
-
-#: src/applications/transport/transport.c:483
-#: src/applications/transport/transport.c:491
+#: src/server/gnunet-transport-check.c:617
 #, c-format
-msgid "No transport of type %d known.\n"
-msgstr "Không biết đến giao thông dạng %d.\n"
+msgid ""
+"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
+msgstr "đã kết nối thành công %d từ %d đầu peer (có %d lần truyền tải).\n"
 
-#: src/applications/transport/transport.c:676
+#: src/server/tcpserver.c:422
 #, fuzzy, c-format
-msgid "Option `%s' not set in configuration in section `%s', setting to %dm.\n"
-msgstr ""
-"Chưa đặt tùy chọn '%s' trong phần '%s' của cấu hình, đang đặt thành %dm.\n"
+msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
+msgstr "'%s' thất bại cho cổng %d: %s. Sẽ thử lại trong %d giây.\n"
 
-#: src/applications/transport/transport.c:691
+#: src/server/tcpserver.c:688
 #, fuzzy, c-format
 msgid ""
-"You should specify at least one transport service under option `%s' in "
-"section `%s'.\n"
+"Malformed network specification in the configuration in section `%s' for "
+"entry `%s': %s\n"
 msgstr ""
-"Người dùng phải chỉ ra ít nhất một dịch vụ giao thông dưới tùy chọn '%s' "
-"trong phần '%s'.\n"
+"Sự xác định mạng không đúng trong phần '%s' của cấu hình cho mục '%s': %s\n"
 
-#: src/applications/transport/transport.c:717
-#, fuzzy, c-format
-msgid "Transport library `%s' did not provide required function '%s%s'.\n"
-msgstr "Thư viện giao thông '%s' không cung cấp chức năng yêu cầu '%s%s'.\n"
+#: src/server/tcpserver.c:798
+#, c-format
+msgid "%s failed, message type %d already in use.\n"
+msgstr "%s thất bại, dạng thông báo %d đã sử dụng.\n"
 
-#: src/applications/transport/transport.c:738
+#: src/server/handler.c:367
 #, fuzzy, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Tôi là một đầu peer '%s'.\n"
+msgid "Received corrupt message from peer `%s'in %s:%d.\n"
+msgstr "Nhận được thông báo không đúng từ đầu peer '%s' trong '%s': %d.\n"
 
-#: src/conf/conf.c:522 src/conf/recreate.c:135
-#, fuzzy, c-format
-msgid "Unable to save configuration file `%s': %s.\n"
-msgstr "Không ghi được các tập tin cấu hình: %s.\n"
+#: src/server/gnunet-peer-info.c:95
+msgid "Print information about GNUnet peers."
+msgstr "In thông tin về các đầu peer của GNUnet."
 
-#: src/conf/conf.c:529
+#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
 #, fuzzy, c-format
-msgid "Configuration file `%s' created.\n"
-msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
+msgid "Could not get address of peer `%s'.\n"
+msgstr "Không nhận được địa chỉ của đầu peer '%s'.\n"
 
-#: src/conf/confdata.c:93
-#, c-format
-msgid "%s: symbol value `%s' invalid for %s\n"
-msgstr ""
-
-#: src/conf/gconf.c:73
+#: src/server/gnunet-peer-info.c:153
 #, fuzzy
-msgid "Sorry, no help is available for this option.\n"
-msgstr "Rất tiếc, chưa có trợ giúp cho tùy chọn này."
+msgid "hello message invalid (signature invalid).\n"
+msgstr "Thông báo HELO sai (sai chữ ký).\n"
 
-#: src/conf/wizard.glade:10 src/conf/wizard.glade:259
-#: src/conf/wizard.glade:711 src/conf/wizard.glade:1436
-#: src/conf/wizard.glade:2217
-msgid "GNUnet configuration assistant"
-msgstr "Trình giúp cấu hình GNUnet"
+#: src/server/gnunet-peer-info.c:164
+#, fuzzy, c-format
+msgid "Peer `%s' with trust %8u and address `%s'\n"
+msgstr "Đầu peer '%s' với tin tưởng %8u và địa chỉ '%s'\n"
 
-#: src/conf/wizard.glade:56
-#, fuzzy
+#: src/util/cron/cron.c:355
+#, fuzzy, c-format
 msgid ""
-"Welcome to GNUnet!\n"
-"\n"
-"This assistant will ask you a few basic questions in order to configure "
-"GNUnet.\n"
-"\n"
-"Please visit our homepage at\n"
-"\thttp://gnunet.org\n";
-"and join our community at\n"
-"\thttps://gnunet.org/drupal/\n";
-"\n"
-"Have a lot of fun,\n"
-"\n"
-"The GNUnet team"
+"`%s' called with cron job not in queue, adding.  This may not be what you "
+"want.\n"
 msgstr ""
-"Xin chào mừng tới GNUnet!\n"
-"\n"
-"Trình giúp đỡ này sẽ hỏi bạn vài câu cơ bản để cấu hình GNUnet.\n"
-"\n"
-"Xin hãy thăm trang chủ của chúng tôi tại\n"
-"\thttp://www.gnunet.org\n";
-"và tham gia cộng đồng tại\n"
-"\thttp://www.gnunet.org/drupal/\n";
-"\n"
-"Chúc có nhiều niềm vui,\n"
-"\n"
-"đội GNUnet"
+"'%s' gọi với công việc cron không trong hàng đợi, đang thêm.  Đây có thể "
+"không phải cái người dùng muốn.\n"
 
-#: src/conf/wizard.glade:142 src/conf/wizard.glade:594
-#: src/conf/wizard.glade:1319 src/conf/wizard.glade:2581
-msgid "Next"
-msgstr "Tiếp"
+#: src/util/crypto/hostkey_gcrypt.c:1031
+#, c-format
+msgid "RSA signature verification failed at %s:%d: %s\n"
+msgstr "Kiểm tra chữ ký RSA thất bại tại %s:%d: %s\n"
 
-#: src/conf/wizard.glade:217 src/conf/wizard.glade:669
-#: src/conf/wizard.glade:1394 src/conf/wizard.glade:1928
-#: src/conf/wizard.glade:2656
-msgid "Cancel"
-msgstr "Dừng"
+#: src/util/crypto/locking_gcrypt.c:47
+#, c-format
+msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/conf/wizard.glade:318
+#: src/util/os/statuscalls.c:159 src/util/os/statuscalls.c:236
+#, fuzzy, c-format
+msgid "Failed to parse interface data from `%s'.\n"
+msgstr "Thất bại khi phân tích dữ liệu giao diện từ '%s' tại %s:%d.\n"
+
+#: src/util/os/statuscalls.c:282 src/util/os/statuscalls.c:291
+#, fuzzy, c-format
 msgid ""
-"Enter information about your network connection here.\n"
-"\n"
-"The \"Network interface\" is the device that connects your computer to the "
-"internet. This is usually a modem, an ISDN card or a network card in case "
-"you are using DSL.\n"
-"\n"
-"If your provider always assigns the same IP-Address to you (a \"static\" IP-"
-"Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
-"every now and then (\"dynamic\" IP-Address) but there's a hostname that "
-"always points to your actual IP-Address (\"Dynamic DNS\"), you can also "
-"enter it here.\n"
-"If in doubt, leave the field empty. GNUnet will then try to determine your "
-"IP-Address.\n"
-"\n"
-"If you are connected to the internet through another computer doing SNAT, a "
-"router or a \"hardware firewall\" and other computers on the internet cannot "
-"connect to this computer, check the last option on this page. Leave it "
-"unchecked on direct connections through modems, ISDN cards and DNAT (also "
-"known as \"port forwarding\")."
+"No network interfaces defined in configuration section `%s' under `%s'!\n"
 msgstr ""
-"Nhập thông tin về kết nối mạng tại đây.\n"
-"\n"
-"\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là "
-"một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL.\n"
-"\n"
-"Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
-"\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
-"đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn luôn "
-"chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập nó ở "
-"đây.\n"
-"Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
-"chỉ IP. \n"
-"Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
-"router hay một \"phần cứng tường lửa\" và các máy khác trong internet không "
-"thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối "
-"thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
+"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/conf/wizard.glade:372
-msgid "Network interface:"
-msgstr "Giao diện mạng:"
+#: src/util/os/semaphore.c:213
+#, c-format
+msgid "Can't create semaphore: %i"
+msgstr "Không tạo được đèn tín hiệu: %i"
 
-#: src/conf/wizard.glade:400
-msgid "IP-Address/Hostname:"
-msgstr "Địa chỉ IP/Tên máy:"
-
-#: src/conf/wizard.glade:451
-msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
-msgstr "Máy không thể nhận được kết nối đi vào (SNAT/Firewall)"
-
-#: src/conf/wizard.glade:514
-msgid "Network connection"
-msgstr "Kết nối mạng"
-
-#: src/conf/wizard.glade:770
+#: src/util/os/dso.c:75
+#, c-format
 msgid ""
-"You can limit GNUnet's ressource usage here.\n"
-"\n"
-"\"Bandwidth limitation\" is how much data may be sent per second. If you "
-"have a flatrate you can set it to the maximum speed of your internet "
-"connection.\n"
-"\n"
-"The \"Max. CPU usage\" is the percentage of processor time GNUnet is allowed "
-"to use."
+"Cannot determine plugin path, application must be installed in directory "
+"ending with `%s'.\n"
 msgstr ""
-"Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
-"\n"
-"\"Giới hạn băng thông\" cho biết bao nhiêu dữ liệu có thể gửi mỗi giây. Nếu "
-"có một tốc độ đều thì có thể đặt thành tốc độ lớn nhất của kết nối "
-"internet.\n"
-"\n"
-"\"Sử dụng CPU lớn nhất\" là phần trăm thời gian của bộ xử lý cho phép GNUnet "
-"sử dụng."
 
-#: src/conf/wizard.glade:833
-msgid "Upstream (Bytes/s):"
-msgstr "Đi ra (Byte/giây):"
+#: src/util/os/dso.c:97
+#, c-format
+msgid "Initialization of plugin mechanism failed: %s!\n"
+msgstr "Chạy cơ chế plugin không thành công: %s!\n"
 
-#: src/conf/wizard.glade:883
-msgid "Downstream (Bytes/s):"
-msgstr "Đi vào (Byte/giây):"
+#: src/util/os/dso.c:134
+#, fuzzy, c-format
+msgid "`%s' failed for library `%s' with error: %s\n"
+msgstr "'%s' thất bại cho thư viện '%s' tại %s:%d với lỗi: %s\n"
 
-#: src/conf/wizard.glade:942
-msgid "Bandwidth limitation"
-msgstr "Giới hạn băng thông"
+#: src/util/os/dso.c:176
+#, fuzzy, c-format
+msgid "`%s' failed to resolve method '%s' with error: %s\n"
+msgstr ""
+"'%s' thất bại khi giải quyết phương pháp '%s%s' tại %s:%d với lỗi: %s\n"
 
-#: src/conf/wizard.glade:986
-msgid "Use denoted bandwidth for GNUnet"
-msgstr "Sử dụng băng thông chỉ ra cho GNUnet"
+#: src/util/os/cpustatus.c:274
+msgid "Cannot query the CPU usage (Windows NT).\n"
+msgstr "Không hỏi được sự sử dụng CPU (Windows NT).\n"
 
-#: src/conf/wizard.glade:1006
-msgid "Share denoted bandwidth with other applications"
-msgstr "Chia sẻ băng thông chỉ ra với các ứng dụng khác"
+#: src/util/os/cpustatus.c:293
+msgid "Cannot query the CPU usage (Win 9x)\n"
+msgstr "Không hỏi được sự sử dụng CPU (Windows 9x).\n"
 
-#: src/conf/wizard.glade:1028
-msgid "Bandwidth sharing"
-msgstr "Chia sẻ băng thông"
+#: src/util/os/installpath.c:172
+msgid ""
+"Cannot determine the path to the executable, your system may be broken or "
+"not supported.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:1071
-msgid "Max. CPU usage (%):"
-msgstr "Sử dụng CPU lớn nhất (%):"
+#: src/util/os/installpath.c:211
+msgid ""
+"GNUnet executables are not in a directory named 'bin'. This may signal a "
+"broken installation.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:1118
-msgid "CPU usage"
-msgstr "Sử dụng CPU"
+#: src/util/os/installpath.c:222
+msgid "Cannot determine the installation prefix. Unknown error.\n"
+msgstr ""
 
-#: src/conf/wizard.glade:1164
-msgid "Load limitation"
-msgstr "Giới hạn nạp"
+#: src/util/network/tcpio.c:100
+msgid "Could not find valid value for PORT in section NETWORK."
+msgstr ""
 
-#: src/conf/wizard.glade:1244 src/conf/wizard.glade:1778
-#: src/conf/wizard.glade:2506
-msgid "Back"
-msgstr "Quay lại"
-
-#: src/conf/wizard.glade:1495
-#, fuzzy
-msgid ""
-"GNUnet is able to store data from other peers in your datastore. This is "
-"useful if an adversary has access to your inserted content and you need to "
-"deny that the content is yours. With \"content migration\" on, the content "
-"could have \"migrated\" over the internet to your node without your "
-"knowledge.\n"
-"It also helps to spread popular content over different peers to enhance "
-"availability.\n"
-"\n"
-"The GNUnet datastore contains all data that GNUnet generates (index data, "
-"inserted and migrated content). Its maximum size can be specified below.\n"
-"\n"
-"If you are an experienced user, you may want to tweak your GNUnet "
-"installation using the enhanced configurator.\n"
-"\n"
-"After changing the configuration and/or updating GNUnet, it is sometimes "
-"required to run gnunet-update to update internal data structures. Depending "
-"on the changes made, this may take some time."
+#: src/util/network/tcpio.c:124
+msgid "Could not find valid value for HOST in section NETWORK."
 msgstr ""
-"GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ liệu. "
-"Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã chèn và "
-"người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật dùng, nội dung "
-"có thể \"nhập\" qua internet tới nút của người dùng mà người dùng không "
-"biết.\n"
-"Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để dễ "
-"dàng truy cập.\n"
-"Kho dữ liệu GNUnet chứa mọi dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, nội dung "
-"chèn và nhập vào). Có thể chỉ ra kích thước lớn nhất ở dưới\n"
-"\n"
-"Nếu là một người dùng có kinh nghiệm, bạn có thể chỉnh sửa cài đặt GNUnet "
-"của mình bằng trình cấu hình nâng cấp."
 
-#: src/conf/wizard.glade:1541
-msgid "Store migrated content"
-msgstr "Chứa nội dung đã nhập"
+#: src/util/network/tcpio.c:240 src/util/network/tcpio.c:268
+#, fuzzy, c-format
+msgid "Cannot connect to %s:u: %s\n"
+msgstr "Không kết nối được tới %u.%u.%u.%u:%u: %s\n"
 
-#: src/conf/wizard.glade:1566
-msgid "Maximum datastore size (MB):"
-msgstr "Kích thước kho dữ liệu lớn nhất (MB):"
+#: src/util/network/tcpio.c:406
+#, fuzzy, c-format
+msgid "`%s' failed, reply invalid!\n"
+msgstr "'%s' thất bại, câu trả lời sai!\n"
 
-#: src/conf/wizard.glade:1621
-msgid "Start the GNUnet background process on computer startup"
-msgstr "Chạy tiến trình GNUnet trong nền sau khi khởi động máy tính"
+#: src/util/network/ipcheck.c:104 src/util/network/ipcheck.c:132
+#: src/util/network/ipcheck.c:164 src/util/network/ipcheck.c:172
+#, fuzzy, c-format
+msgid "Invalid format for IP: `%s'\n"
+msgstr "Định dạng sai cho IP: '%s'\n"
 
-#: src/conf/wizard.glade:1642
-msgid "Open the enhanced configurator"
-msgstr "Mở trình cấu hình nâng cao"
+#: src/util/network/ipcheck.c:156
+#, c-format
+msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
+msgstr "Ký hiệu mạng sai ('/%d' không hợp lệ trong CIDR IPv4)."
 
-#: src/conf/wizard.glade:1663
-msgid "Run gnunet-update"
-msgstr ""
+#: src/util/network/ipcheck.c:217
+#, fuzzy, c-format
+msgid "Invalid network notation (does not end with ';': `%s')\n"
+msgstr "Ký hiệu mạng sai (không kết thúc với ';': '%s')\n"
 
-#: src/conf/wizard.glade:1698 src/conf/wizard.glade:2426
-msgid "Other settings"
-msgstr "Thiết lập khác"
+#: src/util/network/ipcheck.c:250
+#, fuzzy, c-format
+msgid "Wrong format `%s' for netmask: %s\n"
+msgstr "Định dạng sai '%s' cho mặt nạ mạng: %s\n"
 
-#: src/conf/wizard.glade:1853
-msgid "Finish"
-msgstr "Kết thúc"
+#: src/util/network/ipcheck.c:265
+#, fuzzy, c-format
+msgid "Wrong format `%s' for network: %s\n"
+msgstr "Định dạng sai '%s' cho mạng: %s\n"
 
-#: src/conf/wizard.glade:1968
-msgid "Question"
-msgstr "Câu hỏi"
+#: src/util/disk/storage.c:194
+#, fuzzy, c-format
+msgid "`%s' failed for drive `%s': %u\n"
+msgstr "'%s' thất bại cho ổ %s: %u\n"
 
-#: src/conf/wizard.glade:2014
-msgid "Do you want to save your settings?"
-msgstr "Ghi thiết lập?"
+#: src/util/disk/storage.c:240
+#, fuzzy, c-format
+msgid "Expected `%s' to be a directory\n"
+msgstr "'%s' mong đợi '%s' là một thư mục!\n"
 
-#: src/conf/wizard.glade:2065
-msgid "Yes"
-msgstr "Có"
+#: src/util/disk/storage.c:279
+#, fuzzy, c-format
+msgid "Expected `%s' to be a regular file\n"
+msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/conf/wizard.glade:2078
-msgid "No"
-msgstr "Không"
+#: src/util/disk/storage.c:486
+#, fuzzy, c-format
+msgid "expected `%s' to be a directory!\n"
+msgstr "'%s' mong đợi '%s' là một thư mục!\n"
 
-#: src/conf/wizard.glade:2098 src/conf/wizard.glade:2696
-#: src/conf/wizard_curs.c:58 src/conf/wizard_util.c:120
-#: src/conf/wizard_util.c:163 src/util/configuration.c:522
-msgid "Error"
-msgstr "Lỗi"
+#: src/util/config_impl/impl.c:256
+#, fuzzy, c-format
+msgid "Syntax error in configuration file `%s' at line %d.\n"
+msgstr "Lỗi cú pháp trong tập tin cấu hình '%s' trên dòng %d.\n"
 
-#: src/conf/wizard.glade:2144
-msgid "Unable to save configuration!"
-msgstr "Không ghi được thiết lập!"
+#: src/util/config_impl/impl.c:412
+#, c-format
+msgid ""
+"Configuration value '%llu' for '%s' in section '%s' is out of legal bounds [%"
+"llu,%llu]\n"
+msgstr ""
 
-#: src/conf/wizard.glade:2195 src/conf/wizard.glade:2793
-msgid "OK"
-msgstr "Ừ"
+#: src/util/config_impl/impl.c:424
+#, c-format
+msgid "Configuration value '%s' for '%s' in section '%s' should be a number\n"
+msgstr ""
 
-#: src/conf/wizard.glade:2276
+#: src/util/config_impl/impl.c:494
+#, c-format
 msgid ""
-"Define the user and the group owning the GNUnet service here.\n"
-"\n"
-"For security reasons, it is a good idea to let this setup create a new user "
-"account and a new group under which the GNUnet service is started at system "
-"startup.\n"
-"\n"
-"However, GNUnet may not be able to access files other than its own. This "
-"includes files you want to publish in GNUnet. You'll have to grant read "
-"permissions to the user specified below.\n"
-"\n"
-"Leave the fields empty to run GNUnet with system privileges."
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
-"Xác định người dùng và nhóm sở hữu dịch vụ GNUnet ở đây.\n"
-"\n"
-"Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng và một nhóm mới "
-"sở hữu dịch vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
-"\n"
-"Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao gồm "
-"các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho phép "
-"người dùng chỉ ra dưới đây quyền đọc chúng.\n"
-"\n"
-"Để trống để chạy GNUnet với quyền hệ thống."
 
-#: src/conf/wizard.glade:2317
-msgid "Group:"
-msgstr "Nhóm:"
+#: src/util/error/error.c:138 src/util/error/error.c:182
+msgid "DEBUG"
+msgstr "TÌMLỖI"
 
-#: src/conf/wizard.glade:2389
-msgid "User account:"
-msgstr "Tài khoản người dùng:"
-
-#: src/conf/wizard.glade:2742
-msgid "gnunet-update failed!"
+#: src/util/error/error.c:141 src/util/error/error.c:184
+msgid "STATUS"
 msgstr ""
 
-#: src/conf/wizard.glade:2813
-msgid "Gtk GNUnet Configurator"
-msgstr "Trình cấu hình Gtk của GNUnet"
+#: src/util/error/error.c:144 src/util/error/error.c:186
+msgid "WARNING"
+msgstr "CẢNH BÁO"
 
-#: src/conf/wizard.glade:2847
-msgid "_File"
-msgstr "_Tập tin"
+#: src/util/error/error.c:147 src/util/error/error.c:188
+msgid "ERROR"
+msgstr "LỖI"
 
-#: src/conf/wizard.glade:2856 src/conf/wizard.glade:3189
-msgid "Load a config file"
-msgstr "Nạp một tập tin cấu hình"
+#: src/util/error/error.c:150 src/util/error/error.c:190
+msgid "FATAL"
+msgstr "LỖI NẶNG"
 
-#: src/conf/wizard.glade:2857
-msgid "_Load"
-msgstr "_Nạp"
+#: src/util/error/error.c:153 src/util/error/error.c:192
+msgid "USER"
+msgstr ""
 
-#: src/conf/wizard.glade:2879
-msgid "Save the config in .config"
-msgstr "Ghi cấu hình vào .config"
+#: src/util/error/error.c:156 src/util/error/error.c:194
+msgid "ADMIN"
+msgstr ""
 
-#: src/conf/wizard.glade:2880
-msgid "_Save"
-msgstr "_Ghi"
+#: src/util/error/error.c:159 src/util/error/error.c:196
+msgid "DEVELOPER"
+msgstr ""
 
-#: src/conf/wizard.glade:2908
-msgid "_Quit"
-msgstr "Th_oát"
+#: src/util/error/error.c:162 src/util/error/error.c:198
+msgid "REQUEST"
+msgstr ""
 
-#: src/conf/wizard.glade:2934
-msgid "_Options"
-msgstr "Tùy _chọn"
+#: src/util/error/error.c:165 src/util/error/error.c:200
+msgid "BULK"
+msgstr ""
 
-#: src/conf/wizard.glade:2943
-msgid "Show name"
-msgstr "Hiển thị tên"
+#: src/util/error/error.c:168 src/util/error/error.c:202
+msgid "IMMEDIATE"
+msgstr ""
 
-#: src/conf/wizard.glade:2944
-msgid "Show _name"
-msgstr "_Hiện tên"
+#: src/util/error/error.c:171
+msgid "ALL"
+msgstr ""
 
-#: src/conf/wizard.glade:2954
-msgid "Show range (Y/M/N)"
-msgstr "Hiển thị xếp hạng (Y/M/N)"
+#: src/util/error/error.c:203
+msgid "NOTHING"
+msgstr "KHÔNGCÓGÌ"
 
-#: src/conf/wizard.glade:2955
-msgid "Show _range"
-msgstr "Hiện _xếp hạng"
+#: src/util/threads/mutex.c:131 src/util/threads/mutex.c:151
+#, fuzzy, c-format
+msgid "Invalid argument for `%s'.\n"
+msgstr "Tham số sai: '%s'\n"
 
-#: src/conf/wizard.glade:2965
-msgid "Show value of the option"
-msgstr "Hiển thị giá trị của tùy chọn"
+#: src/util/threads/mutex.c:136
+#, fuzzy, c-format
+msgid "Deadlock due to `%s'.\n"
+msgstr "Khóa chết theo '%s' tại %s: %d.\n"
 
-#: src/conf/wizard.glade:2966
-msgid "Show _data"
-msgstr "Hiển thị _dữ liệu"
+#: src/util/threads/mutex.c:156
+#, fuzzy, c-format
+msgid "Permission denied for `%s'.\n"
+msgstr "Không đủ quyền hạn cho '%s' tại %s:%d.\n"
 
-#: src/conf/wizard.glade:2982
-msgid "Show all options"
-msgstr "Hiển thị mọi tùy chọn"
+#: src/util/threads/pthread.c:138 src/util/threads/pthread.c:146
+#: src/util/threads/pthread.c:153 src/util/threads/pthread.c:267
+#: src/util/threads/pthread.c:275
+#, fuzzy, c-format
+msgid "`%s' failed with error code %s: %s\n"
+msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/conf/wizard.glade:2983
-msgid "Show all _options"
-msgstr "Hiển thị mọi _tùy chọn"
+#: src/util/threads/pthread.c:160 src/util/threads/pthread.c:283
+#, fuzzy, c-format
+msgid "`%s' failed with error code %d: %s\n"
+msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/conf/wizard.glade:2997
-msgid "_Help"
-msgstr "Trợ _giúp"
+#: src/util/loggers/memory.c:71
+msgid "Out of memory (for logging)"
+msgstr ""
 
-#: src/conf/wizard.glade:3006
-msgid "_Introduction"
-msgstr "_Giới thiệu"
+#: src/util/getopt/getopt.c:686
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: tùy chọn '%s' không rõ ràng\n"
 
-#: src/conf/wizard.glade:3028
-msgid "_About"
-msgstr "_Nói về"
+#: src/util/getopt/getopt.c:710
+#, c-format
+msgid "%s: option `--%s' does not allow an argument\n"
+msgstr "%s: tùy chọn `--%s' không cho phép một tham số\n"
 
-#: src/conf/wizard.glade:3083
-msgid "Goes up of one level (single view)"
-msgstr "Đi lên một mức độ (xem đơn)"
+#: src/util/getopt/getopt.c:715
+#, c-format
+msgid "%s: option `%c%s' does not allow an argument\n"
+msgstr "%s: tùy chọn `%c%s' không cho phép một tham số\n"
 
-#: src/conf/wizard.glade:3126
-msgid "Up"
-msgstr "Lên"
+#: src/util/getopt/getopt.c:732 src/util/getopt/getopt.c:906
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: tùy chọn `%s' cần một tham số\n"
 
-#: src/conf/wizard.glade:3232
-msgid "Load"
-msgstr "Nạp"
+#: src/util/getopt/getopt.c:762
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: tùy chọn không nhận ra `--%s'\n"
 
-#: src/conf/wizard.glade:3276
-msgid "Save a config file"
-msgstr "Ghi một tập tin cấu hình"
+#: src/util/getopt/getopt.c:766
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: tùy chọn không nhận ra `%c%s'\n"
 
-#: src/conf/wizard.glade:3319
-msgid "Save"
-msgstr "Ghi"
+#: src/util/getopt/getopt.c:792
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/conf/wizard.glade:3382
-msgid "Single view"
-msgstr "Xem đơn"
+#: src/util/getopt/getopt.c:795
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: tùy chọn sai -- %c\n"
 
-#: src/conf/wizard.glade:3425
-msgid "Single"
-msgstr "Đơn"
+#: src/util/getopt/getopt.c:825 src/util/getopt/getopt.c:955
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: tùy chọn cần một tham số -- %c\n"
 
-#: src/conf/wizard.glade:3469
-msgid "Split view"
-msgstr "Xem kép"
+#: src/util/getopt/getopt.c:872
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: tùy chọn `-W %s' không rõ ràng\n"
 
-#: src/conf/wizard.glade:3512
-msgid "Split"
-msgstr "Chia"
+#: src/util/getopt/getopt.c:890
+#, c-format
+msgid "%s: option `-W %s' does not allow an argument\n"
+msgstr "%s: tùy chọn `-W %s' không cho phép một tham số\n"
 
-#: src/conf/wizard.glade:3556
-msgid "Full view"
-msgstr "Xem đầy đủ"
+#: src/util/getopt/printhelp.c:49
+#, c-format
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr "Tham số cho tùy chọn dài cũng là tham số cho tùy chọn ngắn.\n"
 
-#: src/conf/wizard.glade:3599
-msgid "Full"
-msgstr "Đầy đủ"
+#: src/util/string/string.c:101
+msgid "ms"
+msgstr "mili giây"
 
-#: src/conf/wizard.glade:3662
-msgid "Collapse the whole tree in the right frame"
-msgstr "Cuộn lên toàn bộ cây trong khung bên phải"
+#: src/util/string/string.c:106
+msgid "s"
+msgstr "giây"
 
-#: src/conf/wizard.glade:3705
-msgid "Collapse"
-msgstr "Cuộn lên"
+#: src/util/string/string.c:109
+msgid "m"
+msgstr "phút"
 
-#: src/conf/wizard.glade:3749
-msgid "Expand the whole tree in the right frame"
-msgstr "Mở ra toàn bộ cây trong khung bên phải"
+#: src/util/string/string.c:112
+msgid "h"
+msgstr "giờ"
 
-#: src/conf/wizard.glade:3792
-msgid "Expand"
-msgstr "Mở ra"
+#: src/util/string/string.c:115
+msgid " days"
+msgstr " ngày"
 
-#: src/conf/wizard.glade:3935
-msgid ""
-"This is GNUnet's configuration interface.\n"
-"\n"
-"GNUnet's options are separated into categories. You can browse them in the "
-"left tree. If you click on one of the categories, its options are shown "
-"above. \n"
-"\n"
-"To change the value of an option, simply click on its value and enter a new "
-"value. To get additional information about a specific option, click on its "
-"description."
+#: src/util/string/string.c:133
+msgid "b"
 msgstr ""
 
-#: src/conf/wizard.glade:3967
-#, fuzzy
-msgid "Introduction"
-msgstr "_Giới thiệu"
-
-#: src/conf/wizard.glade:4043
-msgid ""
-"Welcome to GNUnet Setup.\n"
-"\n"
-"For each option, a blank box indicates the feature is disabled, and checked "
-"one indicates it is enabled.\n"
-"If you do not see an option that you believe should be present, try turning "
-"on Show All Options under the Options menu.\n"
-"\n"
-"Although there is no cross reference yet to help you figure out what other "
-"options must be enabled to support the option you are interested in, you can "
-"still view the help of a grayed-out option.\n"
-"\n"
-"Toggling Show Debug Info under the Options menu will show the dependencies, "
-"which you can then match by examining other options."
+#: src/util/string/string.c:138
+msgid "KiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4067
-msgid "gnunet-setup"
+#: src/util/string/string.c:141
+msgid "MiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4068
-msgid "(C) 2001-2006 Christian Grothoff (and other contributing authors)"
+#: src/util/string/string.c:144
+msgid "GiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4069
-msgid "This is the configuration tool for GNUnet."
+#: src/util/string/string.c:147
+msgid "TiB"
 msgstr ""
 
-#: src/conf/wizard.glade:4070
-msgid ""
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"\t\t       Version 2, June 1991\n"
-"\n"
-" Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n"
-"     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA\n"
-" Everyone is permitted to copy and distribute verbatim copies\n"
-" of this license document, but changing it is not allowed.\n"
-"\n"
-"\t\t\t    Preamble\n"
-"\n"
-"  The licenses for most software are designed to take away your\n"
-"freedom to share and change it.  By contrast, the GNU General Public\n"
-"License is intended to guarantee your freedom to share and change free\n"
-"software--to make sure the software is free for all its users.  This\n"
-"General Public License applies to most of the Free Software\n"
-"Foundation's software and to any other program whose authors commit to\n"
-"using it.  (Some other Free Software Foundation software is covered by\n"
-"the GNU Library General Public License instead.)  You can apply it to\n"
-"your programs, too.\n"
-"\n"
-"  When we speak of free software, we are referring to freedom, not\n"
-"price.  Our General Public Licenses are designed to make sure that you\n"
-"have the freedom to distribute copies of free software (and charge for\n"
-"this service if you wish), that you receive source code or can get it\n"
-"if you want it, that you can change the software or use pieces of it\n"
-"in new free programs; and that you know you can do these things.\n"
-"\n"
-"  To protect your rights, we need to make restrictions that forbid\n"
-"anyone to deny you these rights or to ask you to surrender the rights.\n"
-"These restrictions translate to certain responsibilities for you if you\n"
-"distribute copies of the software, or if you modify it.\n"
-"\n"
-"  For example, if you distribute copies of such a program, whether\n"
-"gratis or for a fee, you must give the recipients all the rights that\n"
-"you have.  You must make sure that they, too, receive or can get the\n"
-"source code.  And you must show them these terms so they know their\n"
-"rights.\n"
-"\n"
-"  We protect your rights with two steps: (1) copyright the software, and\n"
-"(2) offer you this license which gives you legal permission to copy,\n"
-"distribute and/or modify the software.\n"
-"\n"
-"  Also, for each author's protection and ours, we want to make certain\n"
-"that everyone understands that there is no warranty for this free\n"
-"software.  If the software is modified by someone else and passed on, we\n"
-"want its recipients to know that what they have is not the original, so\n"
-"that any problems introduced by others will not reflect on the original\n"
-"authors' reputations.\n"
-"\n"
-"  Finally, any free program is threatened constantly by software\n"
-"patents.  We wish to avoid the danger that redistributors of a free\n"
-"program will individually obtain patent licenses, in effect making the\n"
-"program proprietary.  To prevent this, we have made it clear that any\n"
-"patent must be licensed for everyone's free use or not licensed at all.\n"
-"\n"
-"  The precise terms and conditions for copying, distribution and\n"
-"modification follow.\n"
-"\n"
-"\t\t    GNU GENERAL PUBLIC LICENSE\n"
-"   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n"
-"\n"
-"  0. This License applies to any program or other work which contains\n"
-"a notice placed by the copyright holder saying it may be distributed\n"
-"under the terms of this General Public License.  The \"Program\", below,\n"
-"refers to any such program or work, and a \"work based on the Program\"\n"
-"means either the Program or any derivative work under copyright law:\n"
-"that is to say, a work containing the Program or a portion of it,\n"
-"either verbatim or with modifications and/or translated into another\n"
-"language.  (Hereinafter, translation is included without limitation in\n"
-"the term \"modification\".)  Each licensee is addressed as \"you\".\n"
-"\n"
-"Activities other than copying, distribution and modification are not\n"
-"covered by this License; they are outside its scope.  The act of\n"
-"running the Program is not restricted, and the output from the Program\n"
-"is covered only if its contents constitute a work based on the\n"
-"Program (independent of having been made by running the Program).\n"
-"Whether that is true depends on what the Program does.\n"
-"\n"
-"  1. You may copy and distribute verbatim copies of the Program's\n"
-"source code as you receive it, in any medium, provided that you\n"
-"conspicuously and appropriately publish on each copy an appropriate\n"
-"copyright notice and disclaimer of warranty; keep intact all the\n"
-"notices that refer to this License and to the absence of any warranty;\n"
-"and give any other recipients of the Program a copy of this License\n"
-"along with the Program.\n"
-"\n"
-"You may charge a fee for the physical act of transferring a copy, and\n"
-"you may at your option offer warranty protection in exchange for a fee.\n"
-"\n"
-"  2. You may modify your copy or copies of the Program or any portion\n"
-"of it, thus forming a work based on the Program, and copy and\n"
-"distribute such modifications or work under the terms of Section 1\n"
-"above, provided that you also meet all of these conditions:\n"
-"\n"
-"    a) You must cause the modified files to carry prominent notices\n"
-"    stating that you changed the files and the date of any change.\n"
-"\n"
-"    b) You must cause any work that you distribute or publish, that in\n"
-"    whole or in part contains or is derived from the Program or any\n"
-"    part thereof, to be licensed as a whole at no charge to all third\n"
-"    parties under the terms of this License.\n"
-"\n"
-"    c) If the modified program normally reads commands interactively\n"
-"    when run, you must cause it, when started running for such\n"
-"    interactive use in the most ordinary way, to print or display an\n"
-"    announcement including an appropriate copyright notice and a\n"
-"    notice that there is no warranty (or else, saying that you provide\n"
-"    a warranty) and that users may redistribute the program under\n"
-"    these conditions, and telling the user how to view a copy of this\n"
-"    License.  (Exception: if the Program itself is interactive but\n"
-"    does not normally print such an announcement, your work based on\n"
-"    the Program is not required to print an announcement.)\n"
-"\n"
-"These requirements apply to the modified work as a whole.  If\n"
-"identifiable sections of that work are not derived from the Program,\n"
-"and can be reasonably considered independent and separate works in\n"
-"themselves, then this License, and its terms, do not apply to those\n"
-"sections when you distribute them as separate works.  But when you\n"
-"distribute the same sections as part of a whole which is a work based\n"
-"on the Program, the distribution of the whole must be on the terms of\n"
-"this License, whose permissions for other licensees extend to the\n"
-"entire whole, and thus to each and every part regardless of who wrote it.\n"
-"\n"
-"Thus, it is not the intent of this section to claim rights or contest\n"
-"your rights to work written entirely by you; rather, the intent is to\n"
-"exercise the right to control the distribution of derivative or\n"
-"collective works based on the Program.\n"
-"\n"
-"In addition, mere aggregation of another work not based on the Program\n"
-"with the Program (or with a work based on the Program) on a volume of\n"
-"a storage or distribution medium does not bring the other work under\n"
-"the scope of this License.\n"
-"\n"
-"  3. You may copy and distribute the Program (or a work based on it,\n"
-"under Section 2) in object code or executable form under the terms of\n"
-"Sections 1 and 2 above provided that you also do one of the following:\n"
-"\n"
-"    a) Accompany it with the complete corresponding machine-readable\n"
-"    source code, which must be distributed under the terms of Sections\n"
-"    1 and 2 above on a medium customarily used for software interchange; "
-"or,\n"
-"\n"
-"    b) Accompany it with a written offer, valid for at least three\n"
-"    years, to give any third party, for a charge no more than your\n"
-"    cost of physically performing source distribution, a complete\n"
-"    machine-readable copy of the corresponding source code, to be\n"
-"    distributed under the terms of Sections 1 and 2 above on a medium\n"
-"    customarily used for software interchange; or,\n"
-"\n"
-"    c) Accompany it with the information you received as to the offer\n"
-"    to distribute corresponding source code.  (This alternative is\n"
-"    allowed only for noncommercial distribution and only if you\n"
-"    received the program in object code or executable form with such\n"
-"    an offer, in accord with Subsection b above.)\n"
-"\n"
-"The source code for a work means the preferred form of the work for\n"
-"making modifications to it.  For an executable work, complete source\n"
-"code means all the source code for all modules it contains, plus any\n"
-"associated interface definition files, plus the scripts used to\n"
-"control compilation and installation of the executable.  However, as a\n"
-"special exception, the source code distributed need not include\n"
-"anything that is normally distributed (in either source or binary\n"
-"form) with the major components (compiler, kernel, and so on) of the\n"
-"operating system on which the executable runs, unless that component\n"
-"itself accompanies the executable.\n"
-"\n"
-"If distribution of executable or object code is made by offering\n"
-"access to copy from a designated place, then offering equivalent\n"
-"access to copy the source code from the same place counts as\n"
-"distribution of the source code, even though third parties are not\n"
-"compelled to copy the source along with the object code.\n"
-"\n"
-"  4. You may not copy, modify, sublicense, or distribute the Program\n"
-"except as expressly provided under this License.  Any attempt\n"
-"otherwise to copy, modify, sublicense or distribute the Program is\n"
-"void, and will automatically terminate your rights under this License.\n"
-"However, parties who have received copies, or rights, from you under\n"
-"this License will not have their licenses terminated so long as such\n"
-"parties remain in full compliance.\n"
-"\n"
-"  5. You are not required to accept this License, since you have not\n"
-"signed it.  However, nothing else grants you permission to modify or\n"
-"distribute the Program or its derivative works.  These actions are\n"
-"prohibited by law if you do not accept this License.  Therefore, by\n"
-"modifying or distributing the Program (or any work based on the\n"
-"Program), you indicate your acceptance of this License to do so, and\n"
-"all its terms and conditions for copying, distributing or modifying\n"
-"the Program or works based on it.\n"
-"\n"
-"  6. Each time you redistribute the Program (or any work based on the\n"
-"Program), the recipient automatically receives a license from the\n"
-"original licensor to copy, distribute or modify the Program subject to\n"
-"these terms and conditions.  You may not impose any further\n"
-"restrictions on the recipients' exercise of the rights granted herein.\n"
-"You are not responsible for enforcing compliance by third parties to\n"
-"this License.\n"
-"\n"
-"  7. If, as a consequence of a court judgment or allegation of patent\n"
-"infringement or for any other reason (not limited to patent issues),\n"
-"conditions are imposed on you (whether by court order, agreement or\n"
-"otherwise) that contradict the conditions of this License, they do not\n"
-"excuse you from the conditions of this License.  If you cannot\n"
-"distribute so as to satisfy simultaneously your obligations under this\n"
-"License and any other pertinent obligations, then as a consequence you\n"
-"may not distribute the Program at all.  For example, if a patent\n"
-"license would not permit royalty-free redistribution of the Program by\n"
-"all those who receive copies directly or indirectly through you, then\n"
-"the only way you could satisfy both it and this License would be to\n"
-"refrain entirely from distribution of the Program.\n"
-"\n"
-"If any portion of this section is held invalid or unenforceable under\n"
-"any particular circumstance, the balance of the section is intended to\n"
-"apply and the section as a whole is intended to apply in other\n"
-"circumstances.\n"
-"\n"
-"It is not the purpose of this section to induce you to infringe any\n"
-"patents or other property right claims or to contest validity of any\n"
-"such claims; this section has the sole purpose of protecting the\n"
-"integrity of the free software distribution system, which is\n"
-"implemented by public license practices.  Many people have made\n"
-"generous contributions to the wide range of software distributed\n"
-"through that system in reliance on consistent application of that\n"
-"system; it is up to the author/donor to decide if he or she is willing\n"
-"to distribute software through any other system and a licensee cannot\n"
-"impose that choice.\n"
-"\n"
-"This section is intended to make thoroughly clear what is believed to\n"
-"be a consequence of the rest of this License.\n"
-"\n"
-"  8. If the distribution and/or use of the Program is restricted in\n"
-"certain countries either by patents or by copyrighted interfaces, the\n"
-"original copyright holder who places the Program under this License\n"
-"may add an explicit geographical distribution limitation excluding\n"
-"those countries, so that distribution is permitted only in or among\n"
-"countries not thus excluded.  In such case, this License incorporates\n"
-"the limitation as if written in the body of this License.\n"
-"\n"
-"  9. The Free Software Foundation may publish revised and/or new versions\n"
-"of the General Public License from time to time.  Such new versions will\n"
-"be similar in spirit to the present version, but may differ in detail to\n"
-"address new problems or concerns.\n"
-"\n"
-"Each version is given a distinguishing version number.  If the Program\n"
-"specifies a version number of this License which applies to it and \"any\n"
-"later version\", you have the option of following the terms and conditions\n"
-"either of that version or of any later version published by the Free\n"
-"Software Foundation.  If the Program does not specify a version number of\n"
-"this License, you may choose any version ever published by the Free "
-"Software\n"
-"Foundation.\n"
-"\n"
-"  10. If you wish to incorporate parts of the Program into other free\n"
-"programs whose distribution conditions are different, write to the author\n"
-"to ask for permission.  For software which is copyrighted by the Free\n"
-"Software Foundation, write to the Free Software Foundation; we sometimes\n"
-"make exceptions for this.  Our decision will be guided by the two goals\n"
-"of preserving the free status of all derivatives of our free software and\n"
-"of promoting the sharing and reuse of software generally.\n"
-"\n"
-"\t\t\t    NO WARRANTY\n"
-"\n"
-"  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n"
-"FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN\n"
-"OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n"
-"PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER "
-"EXPRESSED\n"
-"OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n"
-"MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS\n"
-"TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE\n"
-"PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n"
-"REPAIR OR CORRECTION.\n"
-"\n"
-"  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n"
-"WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n"
-"REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n"
-"INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n"
-"OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n"
-"TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n"
-"YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n"
-"PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n"
-"POSSIBILITY OF SUCH DAMAGES.\n"
-"\n"
-"\t\t     END OF TERMS AND CONDITIONS\n"
-"\n"
-"\t    How to Apply These Terms to Your New Programs\n"
-"\n"
-"  If you develop a new program, and you want it to be of the greatest\n"
-"possible use to the public, the best way to achieve this is to make it\n"
-"free software which everyone can redistribute and change under these terms.\n"
-"\n"
-"  To do so, attach the following notices to the program.  It is safest\n"
-"to attach them to the start of each source file to most effectively\n"
-"convey the exclusion of warranty; and each file should have at least\n"
-"the \"copyright\" line and a pointer to where the full notice is found.\n"
-"\n"
-"    <one line to give the program's name and a brief idea of what it does.>\n"
-"    Copyright (C) <year>  <name of author>\n"
-"\n"
-"    This program is free software; you can redistribute it and/or modify\n"
-"    it under the terms of the GNU General Public License as published by\n"
-"    the Free Software Foundation; either version 2 of the License, or\n"
-"    (at your option) any later version.\n"
-"\n"
-"    This program is distributed in the hope that it will be useful,\n"
-"    but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"    GNU General Public License for more details.\n"
-"\n"
-"    You should have received a copy of the GNU General Public License\n"
-"    along with this program; if not, write to the Free Software\n"
-"    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  "
-"USA\n"
-"\n"
-"\n"
-"Also add information on how to contact you by electronic and paper mail.\n"
-"\n"
-"If the program is interactive, make it output a short notice like this\n"
-"when it starts in an interactive mode:\n"
-"\n"
-"    Gnomovision version 69, Copyright (C) year  name of author\n"
-"    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show "
-"w'.\n"
-"    This is free software, and you are welcome to redistribute it\n"
-"    under certain conditions; type `show c' for details.\n"
-"\n"
-"The hypothetical commands `show w' and `show c' should show the appropriate\n"
-"parts of the General Public License.  Of course, the commands you use may\n"
-"be called something other than `show w' and `show c'; they could even be\n"
-"mouse-clicks or menu items--whatever suits your program.\n"
-"\n"
-"You should also get your employer (if you work as a programmer) or your\n"
-"school, if any, to sign a \"copyright disclaimer\" for the program, if\n"
-"necessary.  Here is a sample; alter the names:\n"
-"\n"
-"  Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n"
-"  `Gnomovision' (which makes passes at compilers) written by James Hacker.\n"
-"\n"
-"  <signature of Ty Coon>, 1 April 1989\n"
-"  Ty Coon, President of Vice\n"
-"\n"
-"This General Public License does not permit incorporating your program into\n"
-"proprietary programs.  If your program is a subroutine library, you may\n"
-"consider it more useful to permit linking proprietary applications with the\n"
-"library.  If this is what you want to do, use the GNU Library General\n"
-"Public License instead of this License.\n"
+#: src/util/string/string.c:267
+msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/conf/wizard.glade:4458
-msgid "Not for English ;-)"
-msgstr ""
-
-#: src/conf/gnunet-setup.c:82
+#: src/setup/gnunet-setup.c:82
 msgid "generate configuration for gnunetd, the GNUnet daemon"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:90
+#: src/setup/gnunet-setup.c:90
 msgid "Tool to setup GNUnet."
 msgstr ""
 
-#: src/conf/gnunet-setup.c:91
+#: src/setup/gnunet-setup.c:91
 #, c-format
 msgid "Available MODEs:\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:92
+#: src/setup/gnunet-setup.c:92
 #, fuzzy, c-format
 msgid " config\t\ttext-based configuration\n"
 msgstr "Cấu hình GNUnet"
 
-#: src/conf/gnunet-setup.c:94
+#: src/setup/gnunet-setup.c:94
 #, c-format
 msgid " menuconfig\ttext-based menu\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:96
+#: src/setup/gnunet-setup.c:96
 #, c-format
 msgid " wizard-curses\tBasic text-based graphical configuration\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:99
+#: src/setup/gnunet-setup.c:99
 #, fuzzy, c-format
 msgid " gconfig\tGTK configuration\n"
 msgstr "Cấu hình GNUnet"
 
-#: src/conf/gnunet-setup.c:100
+#: src/setup/gnunet-setup.c:100
 #, c-format
 msgid ""
 " wizard-gtk\tBasic GTK configuration\n"
 "\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:167
+#: src/setup/gnunet-setup.c:167
 #, c-format
 msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:176 src/server/gnunet-peer-info.c:113
-#: src/server/gnunet-transport-check.c:527 src/server/gnunet-update.c:152
-#, c-format
-msgid "Invalid arguments: "
-msgstr "Tham số sai: "
-
-#: src/conf/gnunet-setup.c:224
+#: src/setup/gnunet-setup.c:224
 #, fuzzy
 msgid "No interface specified, using default\n"
 msgstr "Chưa chỉ ra tên bảng, đang dùng '%s'.\n"
 
-#: src/conf/gnunet-setup.c:237 src/conf/gnunet-setup.c:251
-#: src/conf/gnunet-setup.c:270 src/conf/gnunet-setup.c:281
+#: src/setup/gnunet-setup.c:237 src/setup/gnunet-setup.c:251
+#: src/setup/gnunet-setup.c:270 src/setup/gnunet-setup.c:281
 #, fuzzy, c-format
 msgid "`%s' is not available."
 msgstr "'%s' không phải là một tập tin thông thường.\n"
 
-#: src/conf/gnunet-setup.c:264 src/conf/gnunet-setup.c:275
+#: src/setup/gnunet-setup.c:264 src/setup/gnunet-setup.c:275
 #, c-format
 msgid ""
 "Can only run wizard to configure gnunetd.\n"
 "Did you forget the `%s' option?\n"
 msgstr ""
 
-#: src/conf/gnunet-setup.c:285
+#: src/setup/gnunet-setup.c:285
 #, fuzzy, c-format
 msgid "Unknown operation `%s'\n"
 msgstr "Lỗi không rõ.\n"
 
-#: src/conf/gnunet-win-tool.c:109
+#: src/setup/wizard_gtk.c:429
+#, fuzzy, c-format
+msgid "Unable to save configuration file `%s':"
+msgstr "Không ghi được tập tin cấu hình %s:"
+
+#: src/setup/wizard_gtk.c:475 src/setup/wizard_curs.c:616
+msgid "Unable to create user account:"
+msgstr "Không tạo được tài khoản người dùng:"
+
+#: src/setup/wizard_gtk.c:482 src/setup/wizard_curs.c:619
+msgid "Unable to change startup process:"
+msgstr "Không thay đổi được tiến trình khởi động:"
+
+#: src/setup/gnunet-win-tool.c:109
 #, c-format
 msgid "GNUnet service installed successfully.\n"
 msgstr "Dịch vụ GNUnet đã cài đặt thành công.\n"
 
-#: src/conf/gnunet-win-tool.c:112 src/conf/gnunet-win-tool.c:139
+#: src/setup/gnunet-win-tool.c:112 src/setup/gnunet-win-tool.c:139
 #, c-format
 msgid "This version of Windows doesn't support services.\n"
 msgstr "Phiên bản này của Windows không hỗ trợ các dịch vụ.\n"
 
-#: src/conf/gnunet-win-tool.c:116 src/conf/gnunet-win-tool.c:143
+#: src/setup/gnunet-win-tool.c:116 src/setup/gnunet-win-tool.c:143
 #, c-format
 msgid "Error: can't open Service Control Manager: %s\n"
 msgstr "Lỗi: không mở được Trình Quản lý Dịch vụ: %s\n"
 
-#: src/conf/gnunet-win-tool.c:121
+#: src/setup/gnunet-win-tool.c:121
 #, c-format
 msgid "Error: can't create service: %s\n"
 msgstr "Lỗi: không tạo được dịch vụ: %s\n"
 
-#: src/conf/gnunet-win-tool.c:124 src/conf/gnunet-win-tool.c:155
+#: src/setup/gnunet-win-tool.c:124 src/setup/gnunet-win-tool.c:155
 #, c-format
 msgid "Unknown error.\n"
 msgstr "Lỗi không rõ.\n"
 
-#: src/conf/gnunet-win-tool.c:136
+#: src/setup/gnunet-win-tool.c:136
 #, c-format
 msgid "Service deleted.\n"
 msgstr "Đã xóa bỏ dịch vụ.\n"
 
-#: src/conf/gnunet-win-tool.c:148
+#: src/setup/gnunet-win-tool.c:148
 #, c-format
 msgid "Error: can't access service: %s\n"
 msgstr "Lỗi: không truy cập được dịch vụ: %s\n"
 
-#: src/conf/gnunet-win-tool.c:152
+#: src/setup/gnunet-win-tool.c:152
 #, c-format
 msgid "Error: can't delete service: %s\n"
 msgstr "Lỗi: không xóa được dịch vụ: %s\n"
 
-#: src/conf/wizard_gtk.c:429
+#: src/setup/conf.c:522 src/setup/recreate.c:135
 #, fuzzy, c-format
-msgid "Unable to save configuration file `%s':"
-msgstr "Không ghi được tập tin cấu hình %s:"
+msgid "Unable to save configuration file `%s': %s.\n"
+msgstr "Không ghi được các tập tin cấu hình: %s.\n"
 
-#: src/conf/wizard_gtk.c:475 src/conf/wizard_curs.c:616
-msgid "Unable to create user account:"
-msgstr "Không tạo được tài khoản người dùng:"
+#: src/setup/conf.c:529
+#, fuzzy, c-format
+msgid "Configuration file `%s' created.\n"
+msgstr "Đã tạo (lại) các tập tin cấu hình.\n"
 
-#: src/conf/wizard_gtk.c:482 src/conf/wizard_curs.c:619
-msgid "Unable to change startup process:"
-msgstr "Không thay đổi được tiến trình khởi động:"
+#: src/setup/wizard_curs.c:58 src/setup/wizard_util.c:150
+#: src/setup/wizard_util.c:193
+msgid "Error"
+msgstr "Lỗi"
 
-#: src/conf/wizard_curs.c:116 src/conf/wizard_curs.c:131
-#: src/conf/wizard_curs.c:184 src/conf/wizard_curs.c:221
-#: src/conf/wizard_curs.c:251 src/conf/wizard_curs.c:277
-#: src/conf/wizard_curs.c:310 src/conf/wizard_curs.c:337
-#: src/conf/wizard_curs.c:369 src/conf/wizard_curs.c:394
-#: src/conf/wizard_curs.c:423 src/conf/wizard_curs.c:446
-#: src/conf/wizard_curs.c:501 src/conf/wizard_curs.c:563
-#: src/conf/wizard_curs.c:594 src/conf/wizard_curs.c:638
+#: src/setup/wizard_curs.c:116 src/setup/wizard_curs.c:131
+#: src/setup/wizard_curs.c:184 src/setup/wizard_curs.c:221
+#: src/setup/wizard_curs.c:251 src/setup/wizard_curs.c:277
+#: src/setup/wizard_curs.c:310 src/setup/wizard_curs.c:337
+#: src/setup/wizard_curs.c:369 src/setup/wizard_curs.c:394
+#: src/setup/wizard_curs.c:423 src/setup/wizard_curs.c:446
+#: src/setup/wizard_curs.c:501 src/setup/wizard_curs.c:563
+#: src/setup/wizard_curs.c:594 src/setup/wizard_curs.c:638
 msgid "GNUnet configuration"
 msgstr "Cấu hình GNUnet"
 
-#: src/conf/wizard_curs.c:117
+#: src/setup/wizard_curs.c:117
 #, fuzzy
 msgid ""
 "Welcome to GNUnet!\n"
@@ -3349,20 +3833,20 @@
 "\n"
 "đội GNUnet"
 
-#: src/conf/wizard_curs.c:132
+#: src/setup/wizard_curs.c:132
 msgid ""
 "Choose the network interface that connects your computer to the internet "
 "from the list below."
 msgstr ""
 "Chọn giao diện mạng kết nối máy tính tới internet từ danh sách dưới đây."
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:191
-#: src/conf/wizard_curs.c:228 src/conf/wizard_curs.c:283
-#: src/conf/wizard_curs.c:315 src/conf/wizard_curs.c:375
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:191
+#: src/setup/wizard_curs.c:228 src/setup/wizard_curs.c:283
+#: src/setup/wizard_curs.c:315 src/setup/wizard_curs.c:375
 msgid "Help"
 msgstr "Trợ giúp"
 
-#: src/conf/wizard_curs.c:138 src/conf/wizard_curs.c:192
+#: src/setup/wizard_curs.c:138 src/setup/wizard_curs.c:192
 msgid ""
 "The \"Network interface\" is the device that connects your computer to the "
 "internet. This is usually a modem, an ISDN card or a network card in case "
@@ -3371,13 +3855,13 @@
 "\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường là "
 "một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL."
 
-#: src/conf/wizard_curs.c:185
+#: src/setup/wizard_curs.c:185
 msgid ""
 "What is the name of the network interface that connects your computer to the "
 "Internet?"
 msgstr "Tên của giao diện mạng kết nối máy tính tới Internet là gì?"
 
-#: src/conf/wizard_curs.c:222
+#: src/setup/wizard_curs.c:222
 msgid ""
 "What is this computer's public IP address or hostname?\n"
 "\n"
@@ -3387,7 +3871,7 @@
 "\n"
 "Nếu không biết, hãy để trống."
 
-#: src/conf/wizard_curs.c:229
+#: src/setup/wizard_curs.c:229
 msgid ""
 "If your provider always assigns the same IP-Address to you (a \"static\" IP-"
 "Address), enter it into the \"IP-Address\" field. If your IP-Address changes "
@@ -3405,7 +3889,7 @@
 "Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra địa "
 "chỉ IP."
 
-#: src/conf/wizard_curs.c:252
+#: src/setup/wizard_curs.c:252
 msgid ""
 "Is this machine behind NAT?\n"
 "\n"
@@ -3422,11 +3906,11 @@
 "thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu kết nối "
 "thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp cổng\")."
 
-#: src/conf/wizard_curs.c:278
+#: src/setup/wizard_curs.c:278
 msgid "How much upstream (Bytes/s) may be used?"
 msgstr "Tốc độ ra giới hạn là bao nhiêu (Byte/giây)?"
 
-#: src/conf/wizard_curs.c:283
+#: src/setup/wizard_curs.c:283
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3443,11 +3927,11 @@
 "chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
 "internet lớn nhất."
 
-#: src/conf/wizard_curs.c:310
+#: src/setup/wizard_curs.c:310
 msgid "How much downstream (Bytes/s) may be used?"
 msgstr "Dùng bao nhiêu (Byte/giây) cho dòng vào?"
 
-#: src/conf/wizard_curs.c:316
+#: src/setup/wizard_curs.c:316
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3464,7 +3948,7 @@
 "chỉ ra nó sau này. Nếu có tốc độ đều, thì có thể đặt thành tốc độ kết nối "
 "internet lớn nhất."
 
-#: src/conf/wizard_curs.c:338
+#: src/setup/wizard_curs.c:338
 msgid ""
 "Share denoted bandwidth with other applications?\n"
 "\n"
@@ -3486,11 +3970,11 @@
 "người dùng không nên giới hạn truyền tải GNUnet phải chịu trên kết nối "
 "internet mỗi khi sử dụng LAN tốc độ cao (ví dụ bởi NFS)."
 
-#: src/conf/wizard_curs.c:370
+#: src/setup/wizard_curs.c:370
 msgid "How much CPU (in %) may be used?"
 msgstr "Sử dụng bao nhiêu CPU (tính theo %)?"
 
-#: src/conf/wizard_curs.c:376
+#: src/setup/wizard_curs.c:376
 msgid ""
 "You can limit GNUnet's resource usage here.\n"
 "\n"
@@ -3500,7 +3984,7 @@
 "\n"
 "Đây là phần trăm thời gian của bộ xử lý cho phép GNUnet sử dụng."
 
-#: src/conf/wizard_curs.c:395
+#: src/setup/wizard_curs.c:395
 msgid ""
 "Store migrated content?\n"
 "\n"
@@ -3522,7 +4006,7 @@
 "Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để dễ "
 "dàng truy cập."
 
-#: src/conf/wizard_curs.c:424
+#: src/setup/wizard_curs.c:424
 msgid ""
 "What's the maximum datastore size in MB?\n"
 "\n"
@@ -3534,7 +4018,7 @@
 "Kho dữ liệu GNUnet chứa tất cả các dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, "
 "nội dung chèn và nhập vào)."
 
-#: src/conf/wizard_curs.c:447
+#: src/setup/wizard_curs.c:447
 msgid ""
 "Do you want to launch GNUnet as a system service?\n"
 "\n"
@@ -3547,7 +4031,7 @@
 "Nếu chọn \"yes\", tiến trình nền sau GNUnet sẽ tự động chạy khi bật máy "
 "tính. Nếu chọn \"no\", thì cần chạy GNUnet mỗi khi muốn sử dụng."
 
-#: src/conf/wizard_curs.c:502
+#: src/setup/wizard_curs.c:502
 msgid ""
 "Define the user owning the GNUnet service.\n"
 "\n"
@@ -3574,7 +4058,7 @@
 "Để trống để chạy GNUnet với quyền hệ thống.\n"
 "Người dùng GNUnet:"
 
-#: src/conf/wizard_curs.c:564
+#: src/setup/wizard_curs.c:564
 msgid ""
 "Define the group owning the GNUnet service.\n"
 "\n"
@@ -3600,7 +4084,7 @@
 "\n"
 "Nhóm GNUnet:"
 
-#: src/conf/wizard_curs.c:595
+#: src/setup/wizard_curs.c:595
 msgid ""
 "If you are an experienced user, you may want to tweak your GNUnet "
 "installation using the enhanced configurator.\n"
@@ -3612,7 +4096,7 @@
 "\n"
 "Chạy nó sau khi ghi cấu hình?"
 
-#: src/conf/wizard_curs.c:632
+#: src/setup/wizard_curs.c:632
 #, c-format
 msgid ""
 "Unable to save configuration file %s: %s.\n"
@@ -3623,1155 +4107,546 @@
 "\n"
 "Thử lại?"
 
-#: src/conf/wizard_util.c:89
+#: src/setup/confdata.c:93
+#, c-format
+msgid "%s: symbol value `%s' invalid for %s\n"
+msgstr ""
+
+#: src/setup/wizard_util.c:119
 msgid "Can't open Service Control Manager"
 msgstr "Không mở được Trình Quản Lý Điều Khiển Dịch Vụ"
 
-#: src/conf/wizard_util.c:94
+#: src/setup/wizard_util.c:124
 msgid "Can't create service"
 msgstr "Không tạo được dịch vụ"
 
-#: src/conf/wizard_util.c:99
+#: src/setup/wizard_util.c:129
 msgid "Error changing the permissions of the GNUnet directory"
 msgstr "Lỗi thay đổi quyền hạn của thư mục GNUnet"
 
-#: src/conf/wizard_util.c:104
+#: src/setup/wizard_util.c:134
 msgid "Cannot write to the regisitry"
 msgstr "Không ghi được tới bản ghi"
 
-#: src/conf/wizard_util.c:107
+#: src/setup/wizard_util.c:137
 msgid "Can't access the service"
 msgstr "Không truy cập được dịch vụ"
 
-#: src/conf/wizard_util.c:111
+#: src/setup/wizard_util.c:141
 msgid "Can't delete the service"
 msgstr "Không xóa được dịch vụ"
 
-#: src/conf/wizard_util.c:115
+#: src/setup/wizard_util.c:145
 msgid "Unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/conf/wizard_util.c:146
+#: src/setup/wizard_util.c:176
 msgid "This version of Windows does not support multiple users."
 msgstr "Phiên bản này của Windows không hỗ trợ nhiều người dùng."
 
-#: src/conf/wizard_util.c:150
+#: src/setup/wizard_util.c:180
 msgid "Error creating user"
 msgstr "Lỗi tạo người dùng"
 
-#: src/conf/wizard_util.c:153
+#: src/setup/wizard_util.c:183
 msgid "Error accessing local security policy"
 msgstr "Lỗi truy cập chính sách bảo mật nội bộ"
 
-#: src/conf/wizard_util.c:156
+#: src/setup/wizard_util.c:186
 msgid "Error granting service right to user"
 msgstr "Lỗi chuyển quyền hạn dịch vụ tới cho người dùng"
 
-#: src/conf/wizard_util.c:159
+#: src/setup/wizard_util.c:189
 msgid "Unknown error while creating a new user"
 msgstr "Lỗi không rõ khi tạo một người dùng mới"
 
-#: src/server/connection.c:979
-#, fuzzy, c-format
-msgid "`%s' selected %d out of %d messages (MTU: %d).\n"
-msgstr "'%s' đã chọn %d vượt quá %d thông báo (MTU: %d).\n"
-
-#: src/server/connection.c:986
-#, c-format
-msgid "Message details: %u: length %d, priority: %d\n"
-msgstr "Chi tiết về thông báo: %u: dài %d, ưu tiên: %d\n"
-
-#: src/server/connection.c:2243
-#, fuzzy, c-format
-msgid "Message from `%s' discarded: invalid format.\n"
-msgstr "Bỏ đi thông báo từ '%s': định dạng sai.\n"
-
-#: src/server/connection.c:2309
-#, c-format
-msgid "Invalid sequence number %u <= %u, dropping message.\n"
-msgstr "Số của chuỗi sai %u <= %u, đang bỏ đi thông báo.\n"
-
-#: src/server/connection.c:2324
-msgid "Message received more than one day old. Dropped.\n"
-msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
-
-#: src/server/connection.c:2690
-msgid "# outgoing messages dropped"
-msgstr "# thông báo đi ra đã loại bỏ"
-
-#: src/server/connection.c:2692
-msgid "# bytes of outgoing messages dropped"
-msgstr "# byte của các thông báo đi ra đã loại bỏ"
-
-#: src/server/connection.c:2694
-msgid "# connections closed (HANGUP sent)"
-msgstr "# các kết nối đã đóng (gửi HANGUP)"
-
-#: src/server/connection.c:2695
+#: src/setup/gconf.c:73
 #, fuzzy
-msgid "# bytes encrypted"
-msgstr "# byte nhận được của dạng %d"
+msgid "Sorry, no help is available for this option.\n"
+msgstr "Rất tiếc, chưa có trợ giúp cho tùy chọn này."
 
-#: src/server/connection.c:2696
-#, fuzzy
-msgid "# bytes decrypted"
-msgstr "# byte nhận được của dạng %d"
-
-#: src/server/connection.c:2697
-#, fuzzy
-msgid "# bytes noise sent"
-msgstr "# byte nhận được do nhiễu đường truyền"
-
-#: src/server/core.c:114
+#: src/setup/glade_support.c:75
 #, fuzzy, c-format
-msgid "Application module `%s' already initialized!\n"
-msgstr "Đã chạy môđun ứng dụng '%s'!\n"
+msgid "Failed to find handler for `%s'\n"
+msgstr "Đọc danh sách bạn bè từ '%s' không thành công\n"
 
-#: src/server/core.c:167
+#: src/setup/glade_support.c:93 src/setup/glade_support.c:124
 #, fuzzy, c-format
-msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
-msgstr "Nạp plugin '%s' không thành công tại %s: %d.  Đang bỏ nạp plugin.\n"
+msgid "Failed to open `%s'.\n"
+msgstr "Tập tin chứa với tên '%s'.\n"
 
-#: src/server/core.c:214
+#: src/include/gnunet_util_error.h:166 src/include/gnunet_util_error.h:168
+#: src/include/gnunet_util_error.h:170 src/include/gnunet_util_error.h:172
 #, fuzzy, c-format
-msgid "Could not shutdown `%s': application not loaded\n"
-msgstr "Không tắt được '%s': chưa nạp ứng dụng\n"
+msgid "Assertion failed at %s:%d in %s.\n"
+msgstr "Xác nhận thất bại tại %s:%d.\n"
 
-#: src/server/core.c:221
+#: src/include/gnunet_util_error.h:179 src/include/gnunet_util_error.h:186
+#: src/include/gnunet_util_error.h:193 src/include/gnunet_util_error.h:200
 #, fuzzy, c-format
-msgid "Could not shutdown application `%s': not initialized\n"
-msgstr "Không tắt được ứng dụng '%s': chưa chạy\n"
+msgid "`%s' failed at %s:%d in %s with error: %s\n"
+msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
 
-#: src/server/core.c:230 src/server/core.c:419
+#: src/include/gnunet_util_error.h:207
 #, fuzzy, c-format
-msgid "Could not find '%s%s' method in library `%s'.\n"
-msgstr "Không tìm thấy phương pháp '%s%s' trong thư viện '%s'.\n"
+msgid "`%s' failed on file `%s' at %s:%d in %s with error: %s\n"
+msgstr "'%s' thất bại trên tập tin'%s' tại %s:%d với lỗi: %s\n"
 
-#: src/server/core.c:397
-#, c-format
-msgid "Could not release %p: service not loaded\n"
-msgstr "Không phát hành được %p: chưa nạp dịch vụ\n"
+#: src/include/gnunet_util_getopt.h:145
+msgid "print this help"
+msgstr "in trợ giúp này"
 
-#: src/server/core.c:475 src/server/gnunet-update.c:232
-msgid "No applications defined in configuration!\n"
-msgstr "Không có ứng dụng định nghĩa trong cấu hình!\n"
+#: src/include/gnunet_util_getopt.h:154
+msgid "print the version number"
+msgstr "in số của phiên bản"
 
-#: src/server/core.c:498
-#, fuzzy, c-format
-msgid "Could not initialize application `%s'\n"
-msgstr "Không chạy được ứng dụng '%s'\n"
+#: src/include/gnunet_util_getopt.h:160
+msgid "configure logging to use LOGRULES"
+msgstr ""
 
-#: src/server/core.c:515
-#, fuzzy, c-format
-msgid "Could not properly shutdown application `%s'.\n"
-msgstr "Không tắt đúng được ứng dụng '%s'.\n"
+#: src/include/gnunet_util_getopt.h:166
+msgid "be verbose"
+msgstr "thông báo chi tiết"
 
-#: src/server/core.c:574
-msgid "FATAL: Identity plugin not found!\n"
-msgstr "LỖI NẶNG: Không tìm thấy plugin đồng nhất!\n"
+#: src/include/gnunet_util_getopt.h:172
+msgid "use configuration file FILENAME"
+msgstr "dùng tập tin cấu hình FILENAME"
 
-#: src/server/core.c:632
-#, fuzzy, c-format
-msgid "Could not properly unload service `%s'!\n"
-msgstr "Không hủy nạp đúng được dịch vụ '%s'!\n"
+#: src/include/gnunet_util_getopt.h:178
+msgid "specify host on which gnunetd is running"
+msgstr "chỉ ra máy đang chạy gnunetd"
 
-#: src/server/gnunet-peer-info.c:95
-msgid "Print information about GNUnet peers."
-msgstr "In thông tin về các đầu peer của GNUnet."
+#~ msgid "GNUnet configuration assistant"
+#~ msgstr "Trình giúp cấu hình GNUnet"
 
-#: src/server/gnunet-peer-info.c:144 src/server/gnunet-peer-info.c:159
-#, fuzzy, c-format
-msgid "Could not get address of peer `%s'.\n"
-msgstr "Không nhận được địa chỉ của đầu peer '%s'.\n"
-
-#: src/server/gnunet-peer-info.c:153
 #, fuzzy
-msgid "hello message invalid (signature invalid).\n"
-msgstr "Thông báo HELO sai (sai chữ ký).\n"
+#~ msgid ""
+#~ "Welcome to GNUnet!\n"
+#~ "\n"
+#~ "This assistant will ask you a few basic questions in order to configure "
+#~ "GNUnet.\n"
+#~ "\n"
+#~ "Please visit our homepage at\n"
+#~ "\thttp://gnunet.org\n";
+#~ "and join our community at\n"
+#~ "\thttps://gnunet.org/drupal/\n";
+#~ "\n"
+#~ "Have a lot of fun,\n"
+#~ "\n"
+#~ "The GNUnet team"
+#~ msgstr ""
+#~ "Xin chào mừng tới GNUnet!\n"
+#~ "\n"
+#~ "Trình giúp đỡ này sẽ hỏi bạn vài câu cơ bản để cấu hình GNUnet.\n"
+#~ "\n"
+#~ "Xin hãy thăm trang chủ của chúng tôi tại\n"
+#~ "\thttp://www.gnunet.org\n";
+#~ "và tham gia cộng đồng tại\n"
+#~ "\thttp://www.gnunet.org/drupal/\n";
+#~ "\n"
+#~ "Chúc có nhiều niềm vui,\n"
+#~ "\n"
+#~ "đội GNUnet"
 
-#: src/server/gnunet-peer-info.c:164
-#, fuzzy, c-format
-msgid "Peer `%s' with trust %8u and address `%s'\n"
-msgstr "Đầu peer '%s' với tin tưởng %8u và địa chỉ '%s'\n"
+#~ msgid "Next"
+#~ msgstr "Tiếp"
 
-#: src/server/gnunet-transport-check.c:109
-#, fuzzy, c-format
-msgid "`%s': Could not create hello.\n"
-msgstr "'%s': Không tạo được HELO.\n"
+#~ msgid "Cancel"
+#~ msgstr "Dừng"
 
-#: src/server/gnunet-transport-check.c:118
-#, fuzzy, c-format
-msgid "`%s': Could not connect.\n"
-msgstr "'%s': Không kết nối được.\n"
+#~ msgid ""
+#~ "Enter information about your network connection here.\n"
+#~ "\n"
+#~ "The \"Network interface\" is the device that connects your computer to "
+#~ "the internet. This is usually a modem, an ISDN card or a network card in "
+#~ "case you are using DSL.\n"
+#~ "\n"
+#~ "If your provider always assigns the same IP-Address to you (a \"static\" "
+#~ "IP-Address), enter it into the \"IP-Address\" field. If your IP-Address "
+#~ "changes every now and then (\"dynamic\" IP-Address) but there's a "
+#~ "hostname that always points to your actual IP-Address (\"Dynamic DNS\"), "
+#~ "you can also enter it here.\n"
+#~ "If in doubt, leave the field empty. GNUnet will then try to determine "
+#~ "your IP-Address.\n"
+#~ "\n"
+#~ "If you are connected to the internet through another computer doing SNAT, "
+#~ "a router or a \"hardware firewall\" and other computers on the internet "
+#~ "cannot connect to this computer, check the last option on this page. "
+#~ "Leave it unchecked on direct connections through modems, ISDN cards and "
+#~ "DNAT (also known as \"port forwarding\")."
+#~ msgstr ""
+#~ "Nhập thông tin về kết nối mạng tại đây.\n"
+#~ "\n"
+#~ "\"Giao diện mạng\" là thiết bị kết nối máy tính với internet. Đây thường "
+#~ "là một môđem, một thẻ ISDN hay một thẻ mạng nếu dùng DSL.\n"
+#~ "\n"
+#~ "Nếu nhà cung cấp luôn luôn gán cùng một địa chỉ IP (một địa chỉ IP \"tĩnh"
+#~ "\"), thì hãy nhập địa chỉ đó vào vùng \"IP-Address\". Nếu địa chỉ IP thay "
+#~ "đổi sau mỗi lần kết nối (địa chỉ IP \"động\") nhưng có một tên máy luôn "
+#~ "luôn chỉ tới địa chỉ IP thực của bạn (\"DNS động\"), thì cũng có thể nhập "
+#~ "nó ở đây.\n"
+#~ "Nếu không biết phải làm gì, thì hãy để trống. GNUnet sẽ thử để nhận ra "
+#~ "địa chỉ IP. \n"
+#~ "Nếu kết nối internet qua một máy khác thực hiện SNAT, một bộ định tuyến "
+#~ "router hay một \"phần cứng tường lửa\" và các máy khác trong internet "
+#~ "không thể kết nối tới máy này, thì hãy chọn \"yes\". Trả lời \"no\" nếu "
+#~ "kết nối thẳng qua môđem, thẻ ISDN, và DNAT (hay còng gọi là \"chuyển tiếp "
+#~ "cổng\")."
 
-#: src/server/gnunet-transport-check.c:148
-#, fuzzy, c-format
-msgid "`%s': Could not send.\n"
-msgstr "'%s': Không gửi được.\n"
+#~ msgid "Network interface:"
+#~ msgstr "Giao diện mạng:"
 
-#: src/server/gnunet-transport-check.c:168
-#, fuzzy, c-format
-msgid "`%s': Did not receive message within %llu ms.\n"
-msgstr "'%s': Không nhận được thông báo trong %llu mili giây.\n"
+#~ msgid "IP-Address/Hostname:"
+#~ msgstr "Địa chỉ IP/Tên máy:"
 
-#: src/server/gnunet-transport-check.c:182
-#, fuzzy, c-format
-msgid "`%s': Could not disconnect.\n"
-msgstr "'%s': Không ngắt kết nối được.\n"
+#~ msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
+#~ msgstr "Máy không thể nhận được kết nối đi vào (SNAT/Firewall)"
 
-#: src/server/gnunet-transport-check.c:189
-#, fuzzy, c-format
-msgid ""
-"`%s' transport OK.  It took %ums to transmit %d messages of %d bytes each.\n"
-msgstr ""
-"'%s' truyền tải OK.  Cần %umiligiây để truyền đi %d thông báo với %d byte "
-"mỗi cái.\n"
+#~ msgid "Network connection"
+#~ msgstr "Kết nối mạng"
 
-#: src/server/gnunet-transport-check.c:219
-#, fuzzy, c-format
-msgid " Transport %d is not being tested\n"
-msgstr " Giao thông %d là không thể\n"
+#~ msgid ""
+#~ "You can limit GNUnet's ressource usage here.\n"
+#~ "\n"
+#~ "\"Bandwidth limitation\" is how much data may be sent per second. If you "
+#~ "have a flatrate you can set it to the maximum speed of your internet "
+#~ "connection.\n"
+#~ "\n"
+#~ "The \"Max. CPU usage\" is the percentage of processor time GNUnet is "
+#~ "allowed to use."
+#~ msgstr ""
+#~ "Có thể giới hạn sử dụng tài nguyên của GNUnet ở đây.\n"
+#~ "\n"
+#~ "\"Giới hạn băng thông\" cho biết bao nhiêu dữ liệu có thể gửi mỗi giây. "
+#~ "Nếu có một tốc độ đều thì có thể đặt thành tốc độ lớn nhất của kết nối "
+#~ "internet.\n"
+#~ "\n"
+#~ "\"Sử dụng CPU lớn nhất\" là phần trăm thời gian của bộ xử lý cho phép "
+#~ "GNUnet sử dụng."
 
-#: src/server/gnunet-transport-check.c:230
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Contacting `%s'."
-msgstr ""
-"\n"
-"Đang liên hệ '%s'."
+#~ msgid "Upstream (Bytes/s):"
+#~ msgstr "Đi ra (Byte/giây):"
 
-#: src/server/gnunet-transport-check.c:253
-#, c-format
-msgid " Connection failed\n"
-msgstr " Kết nối không thành công\n"
+#~ msgid "Downstream (Bytes/s):"
+#~ msgstr "Đi vào (Byte/giây):"
 
-#: src/server/gnunet-transport-check.c:259
-#, c-format
-msgid " Connection failed (bug?)\n"
-msgstr " Kết nối thất bại (lỗi bug?)\n"
+#~ msgid "Bandwidth limitation"
+#~ msgstr "Giới hạn băng thông"
 
-#: src/server/gnunet-transport-check.c:320
-#, c-format
-msgid "No reply received within %llums.\n"
-msgstr "Không nhận được trả lời trong %llu miligiây.\n"
+#~ msgid "Use denoted bandwidth for GNUnet"
+#~ msgstr "Sử dụng băng thông chỉ ra cho GNUnet"
 
-#: src/server/gnunet-transport-check.c:396
-msgid "ping peers from HOSTLISTURL that match transports"
-msgstr "ping các đầu peer từ HOSTLISTURL tương ứng với truyền tải"
+#~ msgid "Share denoted bandwidth with other applications"
+#~ msgstr "Chia sẻ băng thông chỉ ra với các ứng dụng khác"
 
-#: src/server/gnunet-transport-check.c:398
-msgid "send COUNT messages"
-msgstr "gửi COUNT thông báo"
+#~ msgid "Bandwidth sharing"
+#~ msgstr "Chia sẻ băng thông"
 
-#: src/server/gnunet-transport-check.c:400
-msgid "send messages with SIZE bytes payload"
-msgstr "gửi các thông báo với SIZE byte nạp trả"
+#~ msgid "Max. CPU usage (%):"
+#~ msgstr "Sử dụng CPU lớn nhất (%):"
 
-#: src/server/gnunet-transport-check.c:402
-msgid "specifies which TRANSPORT should be tested"
-msgstr "chỉ ra TRANSPORT cần được thử nghiệm"
+#~ msgid "CPU usage"
+#~ msgstr "Sử dụng CPU"
 
-#: src/server/gnunet-transport-check.c:404
-msgid "specifies after how many MS to time-out"
-msgstr "chỉ ra hết thời gian chờ sau bao nhiên MS"
+#~ msgid "Load limitation"
+#~ msgstr "Giới hạn nạp"
 
-#: src/server/gnunet-transport-check.c:407 src/server/gnunet-update.c:55
-#: src/server/startup.c:450
-msgid "run as user LOGIN"
-msgstr "chạy dưới người dùng LOGIN"
+#~ msgid "Back"
+#~ msgstr "Quay lại"
 
-#: src/server/gnunet-transport-check.c:414
-msgid "Tool to test if GNUnet transport services are operational."
-msgstr ""
-"Công cụ để thử nghiệm xem dịch vụ truyền tải GNUnet có hoạt động không."
-
-#: src/server/gnunet-transport-check.c:565
-msgid "You must specify a non-empty set of transports to test!\n"
-msgstr ""
-"Người dùng phải chỉ ra một bộ không rỗng của truyền tải để thử nghiệm!\n"
-
-#: src/server/gnunet-transport-check.c:570
-#, c-format
-msgid "Testing transport(s) %s\n"
-msgstr "Đang thử nghiệm (các) truyền tải %s\n"
-
-#: src/server/gnunet-transport-check.c:573
-#, c-format
-msgid "Available transport(s): %s\n"
-msgstr "(Các) truyền tải có: %s\n"
-
-#: src/server/gnunet-transport-check.c:617
-#, c-format
-msgid ""
-"%d out of %d peers contacted successfully (%d times transport unavailable).\n"
-msgstr "đã kết nối thành công %d từ %d đầu peer (có %d lần truyền tải).\n"
-
-#: src/server/gnunet-update.c:50
-msgid "print a value from the configuration file to stdout"
-msgstr "in một giá trị từ tập tin cấu hình ra stdout"
-
-#: src/server/gnunet-update.c:58
 #, fuzzy
-msgid "run in client mode (for getting client configuration values)"
-msgstr "chạy trong chế độ người dùng (để lấy giá trị cấu hình của người dùng)"
+#~ msgid ""
+#~ "GNUnet is able to store data from other peers in your datastore. This is "
+#~ "useful if an adversary has access to your inserted content and you need "
+#~ "to deny that the content is yours. With \"content migration\" on, the "
+#~ "content could have \"migrated\" over the internet to your node without "
+#~ "your knowledge.\n"
+#~ "It also helps to spread popular content over different peers to enhance "
+#~ "availability.\n"
+#~ "\n"
+#~ "The GNUnet datastore contains all data that GNUnet generates (index data, "
+#~ "inserted and migrated content). Its maximum size can be specified below.\n"
+#~ "\n"
+#~ "If you are an experienced user, you may want to tweak your GNUnet "
+#~ "installation using the enhanced configurator.\n"
+#~ "\n"
+#~ "After changing the configuration and/or updating GNUnet, it is sometimes "
+#~ "required to run gnunet-update to update internal data structures. "
+#~ "Depending on the changes made, this may take some time."
+#~ msgstr ""
+#~ "GNUnet có thể chứa ghi nhớ dữ liệu từ các đầu peer khác trong kho dữ "
+#~ "liệu. Tính năng này có ích nếu một đối tượng xấu truy cập tới nội dung đã "
+#~ "chèn và người dùng cần loại bỏ nội dung đó. Khi \"nhập nội dung\" bật "
+#~ "dùng, nội dung có thể \"nhập\" qua internet tới nút của người dùng mà "
+#~ "người dùng không biết.\n"
+#~ "Nó đồng thời giúp chia sẻ nội dung phổ biến qua các đầu peer khác nhau để "
+#~ "dễ dàng truy cập.\n"
+#~ "Kho dữ liệu GNUnet chứa mọi dữ liệu GNUnet tạo ra (dữ liệu chỉ mục, nội "
+#~ "dung chèn và nhập vào). Có thể chỉ ra kích thước lớn nhất ở dưới\n"
+#~ "\n"
+#~ "Nếu là một người dùng có kinh nghiệm, bạn có thể chỉnh sửa cài đặt GNUnet "
+#~ "của mình bằng trình cấu hình nâng cấp."
 
-#: src/server/gnunet-update.c:64
-msgid "Updates GNUnet datastructures after version change."
-msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
+#~ msgid "Store migrated content"
+#~ msgstr "Chứa nội dung đã nhập"
 
-#: src/server/gnunet-update.c:147
-#, fuzzy, c-format
-msgid "Option `%s' makes no sense without option `%s'."
-msgstr "Tùy chọn '%s' không có ý nghĩa khi không có tùy chọn '%s'."
+#~ msgid "Maximum datastore size (MB):"
+#~ msgstr "Kích thước kho dữ liệu lớn nhất (MB):"
 
-#: src/server/gnunet-update.c:155
-#, c-format
-msgid ""
-"\n"
-"Exiting.\n"
-msgstr ""
-"\n"
-"Đang thoát.\n"
+#~ msgid "Start the GNUnet background process on computer startup"
+#~ msgstr "Chạy tiến trình GNUnet trong nền sau khi khởi động máy tính"
 
-#: src/server/gnunet-update.c:249
-#, fuzzy, c-format
-msgid "Updating data for module `%s'\n"
-msgstr "Đang cập nhật dữ liệu cho môđun '%s'\n"
+#~ msgid "Open the enhanced configurator"
+#~ msgstr "Mở trình cấu hình nâng cao"
 
-#: src/server/gnunet-update.c:253
-#, fuzzy, c-format
-msgid "Failed to update data for module `%s'\n"
-msgstr "Cập nhật dữ liệu cho môđun '%s' không thành công\n"
+#~ msgid "Other settings"
+#~ msgstr "Thiết lập khác"
 
-#: src/server/gnunet-update.c:309
-#, c-format
-msgid "Updated data for %d applications.\n"
-msgstr "Cập nhật dữ liệu cho %d ứng dụng.\n"
+#~ msgid "Finish"
+#~ msgstr "Kết thúc"
 
-#: src/server/gnunetd.c:76
-#, fuzzy, c-format
-msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
-msgstr ""
-"Cấu hình hoặc phiên bản GNUnet đã thay đổi.  Người dùng cần chạy '%s'!\n"
+#~ msgid "Question"
+#~ msgstr "Câu hỏi"
 
-#: src/server/gnunetd.c:84
-#, fuzzy, c-format
-msgid "`%s' starting\n"
-msgstr "'%s' đang khởi động\n"
+#~ msgid "Do you want to save your settings?"
+#~ msgstr "Ghi thiết lập?"
 
-#: src/server/gnunetd.c:106
-#, fuzzy, c-format
-msgid "`%s' startup complete.\n"
-msgstr "'%s' khởi động thành công.\n"
+#~ msgid "Unable to save configuration!"
+#~ msgstr "Không ghi được thiết lập!"
 
-#: src/server/gnunetd.c:111
-#, fuzzy, c-format
-msgid "`%s' is shutting down.\n"
-msgstr "'%s' đang tắt.\n"
+#~ msgid "OK"
+#~ msgstr "Ừ"
 
-#: src/server/handler.c:367
-#, fuzzy, c-format
-msgid "Received corrupt message from peer `%s'in %s:%d.\n"
-msgstr "Nhận được thông báo không đúng từ đầu peer '%s' trong '%s': %d.\n"
+#~ msgid ""
+#~ "Define the user and the group owning the GNUnet service here.\n"
+#~ "\n"
+#~ "For security reasons, it is a good idea to let this setup create a new "
+#~ "user account and a new group under which the GNUnet service is started at "
+#~ "system startup.\n"
+#~ "\n"
+#~ "However, GNUnet may not be able to access files other than its own. This "
+#~ "includes files you want to publish in GNUnet. You'll have to grant read "
+#~ "permissions to the user specified below.\n"
+#~ "\n"
+#~ "Leave the fields empty to run GNUnet with system privileges."
+#~ msgstr ""
+#~ "Xác định người dùng và nhóm sở hữu dịch vụ GNUnet ở đây.\n"
+#~ "\n"
+#~ "Vì lý do bảo mật, nên cho phép tạo một tài khoản người dùng và một nhóm "
+#~ "mới sở hữu dịch vụ GNUnet chạy mỗi khi khởi động máy tính.\n"
+#~ "\n"
+#~ "Tuy nhiên, GNUnet chỉ có thể truy cập tới các tập tin mà nó sở hữu, bao "
+#~ "gồm các tập tin người dùng muốn đưa ra chia sẻ trong GNUnet. Sẽ cần cho "
+#~ "phép người dùng chỉ ra dưới đây quyền đọc chúng.\n"
+#~ "\n"
+#~ "Để trống để chạy GNUnet với quyền hệ thống."
 
-#: src/server/startup.c:196
-#, fuzzy, c-format
-msgid "The `%s' request received from client is malformed.\n"
-msgstr "Yêu cầu '%s' nhận được từ máy khác là hỏng.\n"
+#~ msgid "Group:"
+#~ msgstr "Nhóm:"
 
-#: src/server/startup.c:324
-#, fuzzy, c-format
-msgid "You must specify a name for the PID file in section `%s' under `%s'.\n"
-msgstr ""
-"Người dùng phải chỉ ra một tên cho tập tin PID trong phần '%s' dưới '%s'.\n"
+#~ msgid "User account:"
+#~ msgstr "Tài khoản người dùng:"
 
-#: src/server/startup.c:339
-#, fuzzy, c-format
-msgid "Could not write PID to file `%s': %s.\n"
-msgstr "Không ghi được PID tới tập tin '%s': %s.\n"
+#~ msgid "Gtk GNUnet Configurator"
+#~ msgstr "Trình cấu hình Gtk của GNUnet"
 
-#: src/server/startup.c:443
-msgid ""
-"run in debug mode; gnunetd will not daemonize and error messages will be "
-"written to stderr instead of a logfile"
-msgstr ""
-"chạy trong chế độ tìm sửa lỗi debug; gnunetd sẽ không tạo daemon và sẽ ghi "
-"thông báo lỗi ra stderr thay vì vào một tập tin bản ghi log"
+#~ msgid "_File"
+#~ msgstr "_Tập tin"
 
-#: src/server/startup.c:456
-msgid "Starts the gnunetd daemon."
-msgstr "Chạy daemon gnunetd."
+#~ msgid "Load a config file"
+#~ msgstr "Nạp một tập tin cấu hình"
 
-#: src/server/startup.c:470
-#, fuzzy, c-format
-msgid "User `%s' not known, cannot change UID to it.\n"
-msgstr "Người dùng '%s' không rõ, không thay đổi được UID thành nó."
+#~ msgid "_Load"
+#~ msgstr "_Nạp"
 
-#: src/server/startup.c:479
-#, fuzzy, c-format
-msgid "Cannot change user/group to `%s': %s\n"
-msgstr "Không thay đổi được người dùng/nhóm thành '%s': %s"
+#~ msgid "Save the config in .config"
+#~ msgstr "Ghi cấu hình vào .config"
 
-#: src/server/startup.c:580
-msgid "Invalid command-line arguments:\n"
-msgstr "Sai tham số dòng lệnh:\n"
+#~ msgid "_Save"
+#~ msgstr "_Ghi"
 
-#: src/server/startup.c:583
-#, fuzzy, c-format
-msgid "Argument %d: `%s'\n"
-msgstr "Tham số %d: '%s'\n"
+#~ msgid "_Quit"
+#~ msgstr "Th_oát"
 
-#: src/server/startup.c:589
-msgid "Invalid command-line arguments.\n"
-msgstr "Sai tham số dòng lệnh.\n"
+#~ msgid "_Options"
+#~ msgstr "Tùy _chọn"
 
-#: src/server/tcpserver.c:422
-#, fuzzy, c-format
-msgid "`%s' failed for port %d: %s. Is gnunetd already running?\n"
-msgstr "'%s' thất bại cho cổng %d: %s. Sẽ thử lại trong %d giây.\n"
+#~ msgid "Show name"
+#~ msgstr "Hiển thị tên"
 
-#: src/server/tcpserver.c:688
-#, fuzzy, c-format
-msgid ""
-"Malformed network specification in the configuration in section `%s' for "
-"entry `%s': %s\n"
-msgstr ""
-"Sự xác định mạng không đúng trong phần '%s' của cấu hình cho mục '%s': %s\n"
+#~ msgid "Show _name"
+#~ msgstr "_Hiện tên"
 
-#: src/server/tcpserver.c:798
-#, c-format
-msgid "%s failed, message type %d already in use.\n"
-msgstr "%s thất bại, dạng thông báo %d đã sử dụng.\n"
+#~ msgid "Show range (Y/M/N)"
+#~ msgstr "Hiển thị xếp hạng (Y/M/N)"
 
-#: src/transports/ip6.c:60 src/util/configuration.c:925
-#, 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"
+#~ msgid "Show _range"
+#~ msgstr "Hiện _xếp hạng"
 
-#: src/transports/ip6.c:100
-#, fuzzy, c-format
-msgid "Could not resolve `%s': %s\n"
-msgstr "Không tìm thấy '%s': %s\n"
+#~ msgid "Show value of the option"
+#~ msgstr "Hiển thị giá trị của tùy chọn"
 
-#: src/transports/ip6.c:138
-msgid "Failed to obtain my (external) IPv6 address!\n"
-msgstr "Không lấy được địa chỉ IPv6 (ngoài) của tôi!\n"
+#~ msgid "Show _data"
+#~ msgstr "Hiển thị _dữ liệu"
 
-#: src/transports/http.c:601
-msgid "Expected welcome on http connection, got garbage. Closing connection.\n"
-msgstr "Mong chào mừng từ kết nối http, nhận được rác. Đang đóng kết nối.\n"
+#~ msgid "Show all options"
+#~ msgstr "Hiển thị mọi tùy chọn"
 
-#: src/transports/http.c:817 src/transports/tcp.c:698 src/transports/udp.c:345
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
-msgstr "%s: Nhả ra kết nối có trong danh sách đen từ %u.%u.%u.%u.\n"
+#~ msgid "Show all _options"
+#~ msgstr "Hiển thị mọi _tùy chọn"
 
-#: src/transports/http.c:1101
-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"
+#~ msgid "_Help"
+#~ msgstr "Trợ _giúp"
 
-#: src/transports/http.c:1177 src/transports/tcp.c:1150 src/util/tcpio.c:158
-#: src/util/tcpio.c:188
-#, 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"
+#~ msgid "_Introduction"
+#~ msgstr "_Giới thiệu"
 
-#: src/transports/http.c:1333
-#, c-format
-msgid ""
-"Could not bind the HTTP listener to port %d. No transport service started.\n"
-msgstr ""
-"Không kết gắn được trình nghe HTTP tới cổng %d. Dịch vụ truyền tải chưa "
-"chạy.\n"
+#~ msgid "_About"
+#~ msgstr "_Nói về"
 
-#: src/transports/http.c:1478
-msgid "# bytes received via HTTP"
-msgstr "# byte nhận được qua HTTP"
+#~ msgid "Goes up of one level (single view)"
+#~ msgstr "Đi lên một mức độ (xem đơn)"
 
-#: src/transports/http.c:1480
-msgid "# bytes sent via HTTP"
-msgstr "# byte gửi qua HTTP"
+#~ msgid "Up"
+#~ msgstr "Lên"
 
-#: src/transports/http.c:1482
-msgid "# bytes dropped by HTTP (outgoing)"
-msgstr "# byte loại bỏ bởi HTTP (đi ra)"
+#~ msgid "Load"
+#~ msgstr "Nạp"
 
-#: src/transports/smtp.c:297
-#, fuzzy, c-format
-msgid "Could not resolve name of SMTP server `%s': %s"
-msgstr "Không tìm thấy tên của máy chủ SMTP '%s': %s"
+#~ msgid "Save a config file"
+#~ msgstr "Ghi một tập tin cấu hình"
 
-#: src/transports/smtp.c:416 src/transports/smtp.c:877
-#, fuzzy, c-format
-msgid ""
-"You must specify the name of a pipe for the SMTP transport in section `%s' "
-"under `%s'.\n"
-msgstr ""
-"Người dùng phải chỉ ra tên của ống pipe cho truyền tải SMTP trong phần '%s' "
-"dưới '%s'.\n"
+#~ msgid "Save"
+#~ msgstr "Ghi"
 
-#: src/transports/smtp.c:489
-msgid "Received malformed message via SMTP (size mismatch).\n"
-msgstr "Nhận được thông báo bị hỏng qua SMTP (kích thước không tương ứng).\n"
+#~ msgid "Single view"
+#~ msgstr "Xem đơn"
 
-#: src/transports/smtp.c:584
-msgid "No filter for E-mail specified, cannot create SMTP advertisement.\n"
-msgstr "Không chỉ ra đầu lọc cho E-mail, không tạo được quảng cáo SMTP.\n"
+#~ msgid "Single"
+#~ msgstr "Đơn"
 
-#: src/transports/smtp.c:591
-#, fuzzy, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr "Đầu lọc SMTP quá dài, đổi thành '%s'\n"
+#~ msgid "Split view"
+#~ msgstr "Xem kép"
 
-#: src/transports/smtp.c:764
-#, fuzzy, c-format
-msgid "Sending E-mail to `%s' failed.\n"
-msgstr "Gửi E-mail tới '%s' thất bại.\n"
+#~ msgid "Split"
+#~ msgstr "Chia"
 
-#: src/transports/smtp.c:815
-#, c-format
-msgid "SMTP server send unexpected response at %s:%d.\n"
-msgstr "Máy chủ SMTP gửi cầu trả lời không mong đợi tại %s: %d.\n"
+#~ msgid "Full view"
+#~ msgstr "Xem đầy đủ"
 
-#: src/transports/smtp.c:838
-#, c-format
-msgid ""
-"SMTP server failed to respond with 250 confirmation code to `%s' request.\n"
-msgstr ""
+#~ msgid "Full"
+#~ msgstr "Đầy đủ"
 
-#: src/transports/smtp.c:844
-#, fuzzy, c-format
-msgid "Failed to send `%s' request to SMTP server.\n"
-msgstr "Gửi yêu cầu HTTP tới máy '%s' không thành công: %s\n"
+#~ msgid "Collapse the whole tree in the right frame"
+#~ msgstr "Cuộn lên toàn bộ cây trong khung bên phải"
 
-#: src/transports/smtp.c:903
-#, c-format
-msgid "%.*s filter %s (SMTP)"
-msgstr "%.*s đầu lọc %s (SMTP)"
+#~ msgid "Collapse"
+#~ msgstr "Cuộn lên"
 
-#: src/transports/smtp.c:932 src/transports/udp.c:722
-#: src/transports/udp6.c:699
-#, fuzzy, c-format
-msgid "MTU for `%s' is probably too low (fragmentation not implemented!)\n"
-msgstr "MTU cho '%s' có thể quá thấp (chưa phát triển sự phân mảnh!)\n"
+#~ msgid "Expand the whole tree in the right frame"
+#~ msgstr "Mở ra toàn bộ cây trong khung bên phải"
 
-#: src/transports/tcp.c:465
-#, c-format
-msgid ""
-"Expected welcome message on tcp connection, got garbage (%u, %u). Closing.\n"
-msgstr ""
-"Mong đợi chào mừng trên kết nối tcp, nhận được rác (%u, %u). Đang đóng.\n"
+#~ msgid "Expand"
+#~ msgstr "Mở ra"
 
-#: src/transports/tcp.c:499
-#, c-format
-msgid ""
-"Received malformed message (size %u) from tcp-peer connection. Closing.\n"
-msgstr ""
-"Nhận được thông báo bị hỏng (kích thước %u) từ kết nối tcp-đầu peer. Đang "
-"đóng.\n"
+#, fuzzy
+#~ msgid "Introduction"
+#~ msgstr "_Giới thiệu"
 
-#: src/transports/tcp.c:1082
-msgid "Could not determine my public IP address.\n"
-msgstr "Không nhận ra địa chỉ IP công cộng của tôi.\n"
+#, fuzzy
+#~ msgid "inlining configration file `%s'\n"
+#~ msgstr "đang chạy nạp tập tin cấu hình '%s'\n"
 
-#: src/transports/tcp.c:1332 src/transports/tcp6.c:1200
-#, 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"
+#, fuzzy
+#~ msgid "Could not parse configuration file `%s'.\n"
+#~ msgstr "Không phân tích được tập tin cấu hình '%s'.\n"
 
-#: src/transports/tcp.c:1449
-msgid "# bytes received via TCP"
-msgstr "# byte nhận được qua TCP"
+#, fuzzy
+#~ msgid ""
+#~ "Configuration file not found. Please run GNUnet Setup (Client "
+#~ "Configuration) first."
+#~ msgstr ""
+#~ "Không tìm thấy tập tin cấu hình '%s'. Chương trình sẽ thử tạo tập tin cấu "
+#~ "hình mặc định tại vị trí đó.\n"
 
-#: src/transports/tcp.c:1451
-msgid "# bytes sent via TCP"
-msgstr "# Byte gửi qua TCP"
+#, fuzzy
+#~ msgid "Cannot open configuration file `%s'.\n"
+#~ msgstr "Không mở được tập tin cấu hình '%s'\n"
 
-#: src/transports/tcp.c:1453
-msgid "# bytes dropped by TCP (outgoing)"
-msgstr "# byte loại đi bởi TCP (đi ra)"
+#~ msgid "Cron stopped\n"
+#~ msgstr "Đã dừng cron\n"
 
-#: src/transports/tcp6.c:439
-msgid "Expected welcome message on tcp connection, got garbage. Closing.\n"
-msgstr "Mong chào mừng từ kết nối tcp, nhận được rác. Đang đóng.\n"
+#~ msgid "Shutdown complete.\n"
+#~ msgstr "Tắt xong.\n"
 
-#: src/transports/tcp6.c:469
-msgid ""
-"Received malformed message from tcp6-peer connection. Closing connection.\n"
-msgstr ""
-"Nhận được thông báo bị hỏng từ kết nối tcp6-đầu peer. Đang đóng kết nối.\n"
+#~ msgid "Caught signal %d.\n"
+#~ msgstr "Bắt được tín hiệu %d.\n"
 
-#: src/transports/tcp6.c:657 src/transports/udp6.c:334
-#, c-format
-msgid "%s: Rejected connection from blacklisted address %s.\n"
-msgstr "%s: Nhả ra kết nối có trong danh sách đen từ địa chỉ %s.\n"
+#, fuzzy
+#~ msgid "Invalid network notation (additional characters: `%s')."
+#~ msgstr "Ký hiệu mạng sai (các ký tự phụ: '%s')."
 
-#: src/transports/tcp6.c:958
-msgid "Could not determine my public IPv6 address.\n"
-msgstr "Không nhận ra địa chỉ IPv6 của tôi.\n"
+#~ msgid "FAILURE"
+#~ msgstr "THẤT BẠI"
 
-#: src/transports/tcp6.c:1002
-#, fuzzy, c-format
-msgid "`%s': unknown service: %s\n"
-msgstr "'%s': không rõ dịch vụ: %s\n"
+#~ msgid "MESSAGE"
+#~ msgstr "TIN NHẮN"
 
-#: src/transports/udp.c:145 src/transports/udp6.c:128
-#, fuzzy, c-format
-msgid ""
-"Cannot determine port to bind to.  Define in configuration file in section `%"
-"s' under `%s' or in `%s' under %s/%s.\n"
-msgstr ""
-"Không nhận ra cổng để kết gắn tới.  Hãy xác định trong tập tin cấu hình phần "
-"'%s' dưới '%s' hoặc phần '%s' dưới %s/%s.\n"
+#~ msgid "INFO"
+#~ msgstr "THÔNGTIN"
 
-#: src/transports/udp.c:179
-#, c-format
-msgid "Failed to bind to UDP port %d.\n"
-msgstr "Không kết gắn được tới cổng UDP %d.\n"
+#~ msgid "CRON"
+#~ msgstr "CRON"
 
-#: src/transports/udp.c:250
-#, c-format
-msgid "UDP: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
+#~ msgid "EVERYTHING"
+#~ msgstr "MỌITHỨ"
 
-#: src/transports/udp.c:307
-#, c-format
-msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
-msgstr "Nhận được thông báo UDP sai từ %u.%u.%u.%u:%u, đang loại bỏ.\n"
+#, fuzzy
+#~ msgid "Invalid LOGLEVEL `%s' specified.\n"
+#~ msgstr "Đưa ra LOGLEVEL sai '%s'.\n"
 
-#: src/transports/udp.c:332
-#, c-format
-msgid "Packet received from %u.%u.%u.%u:%u (UDP) failed format check.\n"
-msgstr ""
-"Kiểm tra định dạng gói nhận được từ %u.%u.%u.%u:%u (UDP) không thành công.\n"
+#~ msgid "Failure at %s:%d.\n"
+#~ msgstr "Thất bại tại %s: %d.\n"
 
-#: src/transports/udp.c:417
-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"
+#, fuzzy
+#~ msgid ""
+#~ "Cannot determine port of gnunetd server. Define in configuration file in "
+#~ "section `%s' under `%s'.\n"
+#~ msgstr ""
+#~ "Không nhận ra cổng của máy chủ gnunetd. Hãy xác định trong phần '%s' của "
+#~ "tập tin cấu hình dưới '%s'.\n"
 
-#: src/transports/udp.c:551
-#, 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"
+#~ msgid ""
+#~ "Usage: %s\n"
+#~ "%s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Sử dụng: %s\n"
+#~ "%s\n"
+#~ "\n"
 
-#: src/transports/udp.c:707
-msgid "# bytes received via UDP"
-msgstr "# byte nhận được qua UDP"
+#, fuzzy
+#~ msgid "Invalid argument for `%s' at %s:%d.\n"
+#~ msgstr "Sai tham số cho '%s' tại %s: %d.\n"
 
-#: src/transports/udp.c:709
-msgid "# bytes sent via UDP"
-msgstr "# byte gửi qua UDP"
+#, fuzzy
+#~ msgid "unknown"
+#~ msgstr "Lỗi không rõ"
 
-#: src/transports/udp.c:711
-msgid "# bytes dropped by UDP (outgoing)"
-msgstr "# byte loại bỏ bởi UDP (đi ra)"
-
-#: src/transports/ip.c:124
-#, fuzzy, c-format
-msgid ""
-"Could not find interface `%s' in `%s', trying to find another interface.\n"
-msgstr ""
-"Không tìm thấy giao diện '%s' trong '%s', đang thử kết gắn tới giao diện "
-"khác.\n"
-
-#: src/transports/ip.c:149
-#, fuzzy, c-format
-msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-msgstr "Không lấy được IP cho giao diện '%s' đang dùng '%s'.\n"
-
-#: src/transports/ip.c:193
-#, fuzzy, c-format
-msgid "Could not find an IP address for interface `%s'.\n"
-msgstr "Không tìm thấy một địa chỉ IP cho giao diện '%s'.\n"
-
-#: src/transports/ip.c:203
-#, fuzzy, c-format
-msgid ""
-"There is more than one IP address specified for interface `%s'.\n"
-"GNUnet will use %u.%u.%u.%u.\n"
-msgstr ""
-"Có vài địa chỉ IP chỉ ra cho giao diện '%s'.\n"
-"GNUnet sẽ dùng %u.%u.%u.%u.\n"
-
-#: src/transports/ip.c:224
-#, fuzzy, c-format
-msgid "Could not resolve `%s' to determine our IP address: %s\n"
-msgstr "Không tìm thấy '%s' để nhận ra địa chỉ IP của chúng ta: %s\n"
-
-#: src/transports/ip.c:256
-#, c-format
-msgid "GNUnet now uses the IP address %u.%u.%u.%u.\n"
-msgstr "GNUnet bây giờ sử dụng địa chỉ IP %u.%u.%u.%u.\n"
-
-#: src/transports/ip.c:306
-msgid "Failed to obtain my (external) IP address!\n"
-msgstr "Lấy địa chỉ IP (ngoài) của tôi không thành công!\n"
-
-#: src/transports/udp6.c:164
-#, c-format
-msgid "Failed to bind to UDP6 port %d.\n"
-msgstr "Kết gắn bind tới cổng UDP6 %d không thành công.\n"
-
-#: src/transports/udp6.c:235
-#, c-format
-msgid "UDP6: select returned, but ioctl reports %d bytes available!\n"
-msgstr ""
-
-#: src/transports/udp6.c:290
-#, c-format
-msgid "Received invalid UDP6 message from %s:%d, dropping.\n"
-msgstr "Nhận được thông báo UDP6 sai từ %s: %d, đang loại bỏ.\n"
-
-#: src/transports/udp6.c:321
-#, c-format
-msgid "Packet received from %s:%d (UDP6) failed format check."
-msgstr "Kiểm tra định dạng gói nhận được từ %s:%d (UDP6) thất bại."
-
-#: src/transports/udp6.c:415
-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/util/configuration.c:182
-#, fuzzy, c-format
-msgid "inlining configration file `%s'\n"
-msgstr "đang chạy nạp tập tin cấu hình '%s'\n"
-
-#: src/util/configuration.c:186
-#, fuzzy, c-format
-msgid "Could not parse configuration file `%s'.\n"
-msgstr "Không phân tích được tập tin cấu hình '%s'.\n"
-
-#: src/util/configuration.c:222
-#, fuzzy, c-format
-msgid "Syntax error in configuration file `%s' at line %d.\n"
-msgstr "Lỗi cú pháp trong tập tin cấu hình '%s' trên dòng %d.\n"
-
-#: src/util/configuration.c:515 src/util/configuration.c:524
-#, c-format
-msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
-msgstr ""
-
-#: src/util/configuration.c:521
 #, fuzzy
-msgid ""
-"Configuration file not found. Please run GNUnet Setup (Client Configuration) "
-"first."
-msgstr ""
-"Không tìm thấy tập tin cấu hình '%s'. Chương trình sẽ thử tạo tập tin cấu "
-"hình mặc định tại vị trí đó.\n"
+#~ msgid "`%s' failed, other side closed connection.\n"
+#~ msgstr "'%s' thất bại, phía bên kia đóng kết nối.\n"
 
-#: src/util/configuration.c:528
-#, c-format
-msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
-msgstr ""
-
-#: src/util/configuration.c:532
-#, fuzzy, c-format
-msgid "Cannot open configuration file `%s'.\n"
-msgstr "Không mở được tập tin cấu hình '%s'\n"
-
-#: src/util/cron.c:189
-msgid "Stopping cron\n"
-msgstr ""
-
-#: src/util/cron.c:199
-msgid "Cron stopped\n"
-msgstr "Đã dừng cron\n"
-
-#: src/util/cron.c:348
-#, fuzzy, c-format
-msgid ""
-"`%s' called with cron job not in queue, adding.  This may not be what you "
-"want.\n"
-msgstr ""
-"'%s' gọi với công việc cron không trong hàng đợi, đang thêm.  Đây có thể "
-"không phải cái người dùng muốn.\n"
-
-#: src/util/dso.c:43
-#, c-format
-msgid "Initialization of plugin mechanism failed: %s!\n"
-msgstr "Chạy cơ chế plugin không thành công: %s!\n"
-
-#: src/util/dso.c:98
-#, fuzzy, c-format
-msgid "`%s' failed for library `%s' at %s:%d with error: %s\n"
-msgstr "'%s' thất bại cho thư viện '%s' tại %s:%d với lỗi: %s\n"
-
-#: src/util/dso.c:152
-#, fuzzy, c-format
-msgid "`%s' failed to resolve method '%s%s' at %s:%d with error: %s\n"
-msgstr ""
-"'%s' thất bại khi giải quyết phương pháp '%s%s' tại %s:%d với lỗi: %s\n"
-
-#: src/util/getopt.c:641
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: tùy chọn '%s' không rõ ràng\n"
-
-#: src/util/getopt.c:665
-#, c-format
-msgid "%s: option `--%s' does not allow an argument\n"
-msgstr "%s: tùy chọn `--%s' không cho phép một tham số\n"
-
-#: src/util/getopt.c:670
-#, c-format
-msgid "%s: option `%c%s' does not allow an argument\n"
-msgstr "%s: tùy chọn `%c%s' không cho phép một tham số\n"
-
-#: src/util/getopt.c:687 src/util/getopt.c:861
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: tùy chọn `%s' cần một tham số\n"
-
-#: src/util/getopt.c:717
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: tùy chọn không nhận ra `--%s'\n"
-
-#: src/util/getopt.c:721
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: tùy chọn không nhận ra `%c%s'\n"
-
-#: src/util/getopt.c:747
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: tùy chọn không hợp lệ -- %c\n"
-
-#: src/util/getopt.c:750
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: tùy chọn sai -- %c\n"
-
-#: src/util/getopt.c:780 src/util/getopt.c:910
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: tùy chọn cần một tham số -- %c\n"
-
-#: src/util/getopt.c:827
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn `-W %s' không rõ ràng\n"
-
-#: src/util/getopt.c:845
-#, c-format
-msgid "%s: option `-W %s' does not allow an argument\n"
-msgstr "%s: tùy chọn `-W %s' không cho phép một tham số\n"
-
-#: src/util/hostkey_gcrypt.c:937
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "Kiểm tra chữ ký RSA thất bại tại %s:%d: %s\n"
-
-#: src/util/initialize.c:229
-msgid "Shutdown complete.\n"
-msgstr "Tắt xong.\n"
-
-#: src/util/io.c:35
-#, c-format
-msgid "Caught signal %d.\n"
-msgstr "Bắt được tín hiệu %d.\n"
-
-#: src/util/random.c:38
-#, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
-msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
-
-#: src/util/ipcheck.c:100
-#, fuzzy, c-format
-msgid "Invalid format for IP: `%s'\n"
-msgstr "Định dạng sai cho IP: '%s'\n"
-
-#: src/util/ipcheck.c:150
-#, c-format
-msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
-msgstr "Ký hiệu mạng sai ('/%d' không hợp lệ trong CIDR IPv4)."
-
-#: src/util/ipcheck.c:164
-#, fuzzy, c-format
-msgid "Invalid network notation (additional characters: `%s')."
-msgstr "Ký hiệu mạng sai (các ký tự phụ: '%s')."
-
-#: src/util/ipcheck.c:235
-#, fuzzy, c-format
-msgid "Invalid network notation (does not end with ';': `%s')\n"
-msgstr "Ký hiệu mạng sai (không kết thúc với ';': '%s')\n"
-
-#: src/util/ipcheck.c:267
-#, fuzzy, c-format
-msgid "Wrong format `%s' for netmask: %s\n"
-msgstr "Định dạng sai '%s' cho mặt nạ mạng: %s\n"
-
-#: src/util/ipcheck.c:281
-#, fuzzy, c-format
-msgid "Wrong format `%s' for network: %s\n"
-msgstr "Định dạng sai '%s' cho mạng: %s\n"
-
-#: src/util/logging.c:90
-msgid "NOTHING"
-msgstr "KHÔNGCÓGÌ"
-
-#: src/util/logging.c:91
-msgid "FATAL"
-msgstr "LỖI NẶNG"
-
-#: src/util/logging.c:92
-msgid "ERROR"
-msgstr "LỖI"
-
-#: src/util/logging.c:93
-msgid "FAILURE"
-msgstr "THẤT BẠI"
-
-#: src/util/logging.c:94
-msgid "WARNING"
-msgstr "CẢNH BÁO"
-
-#: src/util/logging.c:95
-msgid "MESSAGE"
-msgstr "TIN NHẮN"
-
-#: src/util/logging.c:96
-msgid "INFO"
-msgstr "THÔNGTIN"
-
-#: src/util/logging.c:97
-msgid "DEBUG"
-msgstr "TÌMLỖI"
-
-#: src/util/logging.c:98
-msgid "CRON"
-msgstr "CRON"
-
-#: src/util/logging.c:99
-msgid "EVERYTHING"
-msgstr "MỌITHỨ"
-
-#: src/util/logging.c:285
-#, fuzzy, c-format
-msgid "Invalid LOGLEVEL `%s' specified.\n"
-msgstr "Đưa ra LOGLEVEL sai '%s'.\n"
-
-#: src/util/logging.c:377 src/util/logging.c:383
-#, c-format
-msgid "Failure at %s:%d.\n"
-msgstr "Thất bại tại %s: %d.\n"
-
-#: src/util/port.c:47
-#, fuzzy, c-format
-msgid ""
-"Cannot determine port of gnunetd server. Define in configuration file in "
-"section `%s' under `%s'.\n"
-msgstr ""
-"Không nhận ra cổng của máy chủ gnunetd. Hãy xác định trong phần '%s' của tập "
-"tin cấu hình dưới '%s'.\n"
-
-#: src/util/printhelp.c:42
-#, c-format
-msgid ""
-"Usage: %s\n"
-"%s\n"
-"\n"
-msgstr ""
-"Sử dụng: %s\n"
-"%s\n"
-"\n"
-
-#: src/util/printhelp.c:45
-#, c-format
-msgid ""
-"Arguments mandatory for long options are also mandatory for short options.\n"
-msgstr "Tham số cho tùy chọn dài cũng là tham số cho tùy chọn ngắn.\n"
-
-#: src/util/semaphore.c:172 src/util/semaphore.c:198
-#, fuzzy, c-format
-msgid "Invalid argument for `%s' at %s:%d.\n"
-msgstr "Sai tham số cho '%s' tại %s: %d.\n"
-
-#: src/util/semaphore.c:176
-#, fuzzy, c-format
-msgid "Deadlock due to `%s' at %s:%d.\n"
-msgstr "Khóa chết theo '%s' tại %s: %d.\n"
-
-#: src/util/semaphore.c:202
-#, fuzzy, c-format
-msgid "Permission denied for `%s' at %s:%d.\n"
-msgstr "Không đủ quyền hạn cho '%s' tại %s:%d.\n"
-
-#: src/util/semaphore.c:452 src/util/semaphore.c:459
-#, fuzzy, c-format
-msgid "`%s' failed with error code %s: %s"
-msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
-
-#: src/util/semaphore.c:466
-#, fuzzy, c-format
-msgid "`%s' failed with error code %d: %s"
-msgstr "'%s' thất bại tại %s:%d với lỗi: %s\n"
-
-#: src/util/semaphore.c:604
-#, c-format
-msgid "Can't create semaphore: %i"
-msgstr "Không tạo được đèn tín hiệu: %i"
-
-#: src/util/state.c:86
-#, c-format
-msgid ""
-"Configuration file must specify a directory for GNUnet to store per-peer "
-"data under %s\\%s.\n"
-msgstr ""
-"Tập tin cấu hình phải chỉ ra một thư mục để GNUnet chứa các dữ liệu per-peer "
-"dưới %s\\%s.\n"
-
-#: src/util/statuscalls.c:185
-#, fuzzy, c-format
-msgid "Failed to parse interface data from `%s' at %s:%d.\n"
-msgstr "Thất bại khi phân tích dữ liệu giao diện từ '%s' tại %s:%d.\n"
-
-#: src/util/statuscalls.c:489
-msgid "Cannot query the CPU usage (Windows NT).\n"
-msgstr "Không hỏi được sự sử dụng CPU (Windows NT).\n"
-
-#: src/util/statuscalls.c:507
-msgid "Cannot query the CPU usage (Win 9x)\n"
-msgstr "Không hỏi được sự sử dụng CPU (Windows 9x).\n"
-
-#: src/util/statuscalls.c:600
-#, fuzzy, c-format
-msgid ""
-"No network interfaces defined in configuration section `%s' under `%s'!\n"
-msgstr ""
-"Không có giao diện mạng được xác định trong cấu hình phần '%s' dưới '%s'!\n"
-
-#: src/util/storage.c:212
-#, fuzzy, c-format
-msgid "`%s' failed for drive %s: %u\n"
-msgstr "'%s' thất bại cho ổ %s: %u\n"
-
-#: src/util/storage.c:310
-#, fuzzy, c-format
-msgid "`%s' is not a regular file.\n"
-msgstr "'%s' không phải là một tập tin thông thường.\n"
-
-#: src/util/storage.c:564
-#, fuzzy, c-format
-msgid "`%s' expected `%s' to be a directory!\n"
-msgstr "'%s' mong đợi '%s' là một thư mục!\n"
-
-#: src/util/storage.c:670
-msgid "b"
-msgstr ""
-
-#: src/util/storage.c:675
-msgid "k"
-msgstr ""
-
-#: src/util/storage.c:678 src/util/timer.c:198
-msgid "m"
-msgstr "phút"
-
-#: src/util/storage.c:681
-msgid "g"
-msgstr ""
-
-#: src/util/storage.c:684
-msgid "t"
-msgstr ""
-
-#: src/util/string.c:108
 #, fuzzy
-msgid "unknown"
-msgstr "Lỗi không rõ"
+#~ msgid "Attempted path to `%s' was `%s'.\n"
+#~ msgstr "Đường dẫn đã thử tới '%s' là '%s'.\n"
 
-#: src/util/string.c:111
-msgid "GiB"
-msgstr ""
+#~ msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
+#~ msgstr "Không mong đợi một phân phối rất rộng (%u) tại %s:%d!\n"
 
-#: src/util/string.c:114
-msgid "MiB"
-msgstr ""
+#~ msgid "set verbosity to LEVEL"
+#~ msgstr "đặt mức độ thông báo chi tiết thành LEVEL"
 
-#: src/util/string.c:117
-msgid "KiB"
-msgstr ""
-
-#: src/util/string.c:120
-msgid "Bytes"
-msgstr ""
-
-#: src/util/tcp_return.c:51
-#, fuzzy, c-format
-msgid "`%s' failed, other side closed connection.\n"
-msgstr "'%s' thất bại, phía bên kia đóng kết nối.\n"
-
-#: src/util/tcp_return.c:58
-#, fuzzy, c-format
-msgid "`%s' failed, reply invalid!\n"
-msgstr "'%s' thất bại, câu trả lời sai!\n"
-
-#: src/util/timer.c:190
-msgid "ms"
-msgstr "mili giây"
-
-#: src/util/timer.c:195
-msgid "s"
-msgstr "giây"
-
-#: src/util/timer.c:201
-msgid "h"
-msgstr "giờ"
-
-#: src/util/timer.c:204
-msgid " days"
-msgstr " ngày"
-
-#: src/util/daemon.c:142
-#, fuzzy, c-format
-msgid "Attempted path to `%s' was `%s'.\n"
-msgstr "Đường dẫn đã thử tới '%s' là '%s'.\n"
-
-#: src/util/xmalloc.c:52
-#, c-format
-msgid "Unexpected very large allocation (%u bytes) at %s:%d!\n"
-msgstr "Không mong đợi một phân phối rất rộng (%u) tại %s:%d!\n"
-
-#: src/include/gnunet_util.h:167
-msgid "print this help"
-msgstr "in trợ giúp này"
-
-#: src/include/gnunet_util.h:170
-msgid "set verbosity to LEVEL"
-msgstr "đặt mức độ thông báo chi tiết thành LEVEL"
-
-#: src/include/gnunet_util.h:173
-msgid "use configuration file FILENAME"
-msgstr "dùng tập tin cấu hình FILENAME"
-
-#: src/include/gnunet_util.h:176
-msgid "specify host on which gnunetd is running"
-msgstr "chỉ ra máy đang chạy gnunetd"
-
-#: src/include/gnunet_util.h:179
-msgid "print the version number"
-msgstr "in số của phiên bản"
-
-#: src/include/gnunet_util.h:182
-msgid "be verbose"
-msgstr "thông báo chi tiết"
-
-#: src/include/gnunet_util.h:637 src/include/gnunet_util.h:639
-#, c-format
-msgid "Assertion failed at %s:%d.\n"
-msgstr "Xác nhận thất bại tại %s:%d.\n"
-
-#: src/include/gnunet_util.h:1058 src/include/gnunet_util.h:1060
-#: src/include/gnunet_util.h:1067
-#, fuzzy, c-format
-msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
-msgstr "'%s' thất bại trên tập tin'%s' tại %s:%d với lỗi: %s\n"
-
 #, fuzzy
 #~ msgid "Not connected to gnunetd."
 #~ msgstr "Không kết nối được tới gnunetd.\n"





reply via email to

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